767 files changed, 0 insertions, 122805 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaAnnotationProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaAnnotationProvider.java
deleted file mode 100644
index 1297ca2eea..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaAnnotationProvider.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.core;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-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.jdt.Attribute;
-import org.eclipse.jpt.core.utility.jdt.Type;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JpaAnnotationProvider
-{
-	/**
-	 * Build an Annotation with the given fully qualififed annotation name.
-	 * @param type
-	 * @param mappingAnnotationName
-	 * @return
-	 */
-	Annotation buildTypeMappingAnnotation(JavaResourcePersistentType parent, Type type, String mappingAnnotationName);
-
-	Annotation buildNullTypeMappingAnnotation(JavaResourcePersistentType parent, Type type, String mappingAnnotationName);
-
-	/**
-	 * Build an Annotation with the given fully qualififed annotation name.
-	 * @param type
-	 * @param annotationName
-	 * @return
-	 */
-	Annotation buildTypeAnnotation(JavaResourcePersistentType parent, Type type, String annotationName);
-	
-	Annotation buildNullTypeAnnotation(JavaResourcePersistentType parent, Type type, String annotationName);
-	
-	/**
-	 * Ordered iterator of fully qualified annotation names that can apply to a Type
-	 */
-	ListIterator<String> typeMappingAnnotationNames();
-	
-	/**
-	 * Iterator of fully qualified annotation(non-mapping) names that can apply to a Type
-	 */
-	Iterator<String> typeAnnotationNames();
-	
-	/**
-	 * Build a Annotation with the given fully qualififed annotation name.
-	 * @param attribute
-	 * @param mappingAnnotationName
-	 * @return
-	 */
-	Annotation buildAttributeMappingAnnotation(JavaResourcePersistentAttribute parent, Attribute attribute, String mappingAnnotationName);
-	
-	Annotation buildNullAttributeMappingAnnotation(JavaResourcePersistentAttribute parent, Attribute attribute, String mappingAnnotationName);
-
-	/**
-	 * Build an Annotation with the given fully qualififed annotation name.
-	 * @param attribute
-	 * @param annotationName
-	 * @return
-	 */
-	Annotation buildAttributeAnnotation(JavaResourcePersistentAttribute parent, Attribute attribute, String annotationName);
-	
-	Annotation buildNullAttributeAnnotation(JavaResourcePersistentAttribute parent, Attribute attribute, String annotationName);
-
-	
-	/**
-	 * Ordered iterator of fully qualified annotation names that can apply to an Attribute
-	 */
-	ListIterator<String> attributeMappingAnnotationNames();
-	
-	/**
-	 * Iterator of fully qualified annotation(non-mapping) names that can apply to an Attribute
-	 */
-	Iterator<String>  attributeAnnotationNames();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaDataSource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaDataSource.java
deleted file mode 100644
index 9cd640ce66..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaDataSource.java
+++ /dev/null
@@ -1,61 +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.core;
-
-import org.eclipse.jpt.db.ConnectionProfile;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JpaDataSource extends JpaNode {
-
-	/**
-	 * Return the data source's connection profile name.
-	 * The connection profile is looked up based on this setting.
-	 */
-	String getConnectionProfileName();
-	
-	/**
-	 * Set the data source's connection profile name.
-	 * The connection profile is looked up based on this setting.
-	 */
-	void setConnectionProfileName(String connectionProfileName);
-	
-	/**
-	 * ID string used when connectionProfileName property is changed
-	 * @see org.eclipse.jpt.utility.model.Model#addPropertyChangeListener(String, org.eclipse.jpt.utility.model.listener.PropertyChangeListener)
-	 */
-	public static final String CONNECTION_PROFILE_NAME_PROPERTY = "connectionProfileName";
-	
-	/**
-	 * The data source's connection profile should never be null.
-	 * If we do not have a connection, return a "null" connection profile.
-	 */
-	ConnectionProfile getConnectionProfile();
-	
-	/**
-	 * ID string used when connectionProfile property is changed
-	 * @see org.eclipse.jpt.utility.model.Model#addPropertyChangeListener(String, org.eclipse.jpt.utility.model.listener.PropertyChangeListener)
-	 */
-	public static final String CONNECTION_PROFILE_PROPERTY = "connectionProfile";
-	
-	boolean connectionProfileIsActive();
-	
-	boolean hasAConnection();
-	
-	void dispose();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFactory.java
deleted file mode 100644
index 7ba14028ea..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFactory.java
+++ /dev/null
@@ -1,347 +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.core;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jpt.core.context.AssociationOverride;
-import org.eclipse.jpt.core.context.AttributeOverride;
-import org.eclipse.jpt.core.context.JpaContextNode;
-import org.eclipse.jpt.core.context.JpaRootContextNode;
-import org.eclipse.jpt.core.context.UniqueConstraint;
-import org.eclipse.jpt.core.context.java.JavaAssociationOverride;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaAttributeOverride;
-import org.eclipse.jpt.core.context.java.JavaBaseJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaBasicMapping;
-import org.eclipse.jpt.core.context.java.JavaColumn;
-import org.eclipse.jpt.core.context.java.JavaDiscriminatorColumn;
-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.JavaEntity;
-import org.eclipse.jpt.core.context.java.JavaGeneratedValue;
-import org.eclipse.jpt.core.context.java.JavaIdMapping;
-import org.eclipse.jpt.core.context.java.JavaJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaJoinTable;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.context.java.JavaManyToManyMapping;
-import org.eclipse.jpt.core.context.java.JavaManyToOneMapping;
-import org.eclipse.jpt.core.context.java.JavaMappedSuperclass;
-import org.eclipse.jpt.core.context.java.JavaNamedColumn;
-import org.eclipse.jpt.core.context.java.JavaNamedNativeQuery;
-import org.eclipse.jpt.core.context.java.JavaNamedQuery;
-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.JavaPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaQuery;
-import org.eclipse.jpt.core.context.java.JavaQueryHint;
-import org.eclipse.jpt.core.context.java.JavaRelationshipMapping;
-import org.eclipse.jpt.core.context.java.JavaSecondaryTable;
-import org.eclipse.jpt.core.context.java.JavaSequenceGenerator;
-import org.eclipse.jpt.core.context.java.JavaTable;
-import org.eclipse.jpt.core.context.java.JavaTableGenerator;
-import org.eclipse.jpt.core.context.java.JavaTransientMapping;
-import org.eclipse.jpt.core.context.java.JavaTypeMapping;
-import org.eclipse.jpt.core.context.java.JavaUniqueConstraint;
-import org.eclipse.jpt.core.context.java.JavaVersionMapping;
-import org.eclipse.jpt.core.context.orm.EntityMappings;
-import org.eclipse.jpt.core.context.orm.OrmAssociationOverride;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeOverride;
-import org.eclipse.jpt.core.context.orm.OrmBaseJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmBasicMapping;
-import org.eclipse.jpt.core.context.orm.OrmColumn;
-import org.eclipse.jpt.core.context.orm.OrmDiscriminatorColumn;
-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.OrmGeneratedValue;
-import org.eclipse.jpt.core.context.orm.OrmIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmJoinTable;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-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.OrmNamedColumn;
-import org.eclipse.jpt.core.context.orm.OrmNamedNativeQuery;
-import org.eclipse.jpt.core.context.orm.OrmNamedQuery;
-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.OrmPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmQuery;
-import org.eclipse.jpt.core.context.orm.OrmQueryHint;
-import org.eclipse.jpt.core.context.orm.OrmRelationshipMapping;
-import org.eclipse.jpt.core.context.orm.OrmSecondaryTable;
-import org.eclipse.jpt.core.context.orm.OrmSequenceGenerator;
-import org.eclipse.jpt.core.context.orm.OrmTable;
-import org.eclipse.jpt.core.context.orm.OrmTableGenerator;
-import org.eclipse.jpt.core.context.orm.OrmTransientMapping;
-import org.eclipse.jpt.core.context.orm.OrmUniqueConstraint;
-import org.eclipse.jpt.core.context.orm.OrmVersionMapping;
-import org.eclipse.jpt.core.context.orm.OrmXml;
-import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults;
-import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata;
-import org.eclipse.jpt.core.context.persistence.ClassRef;
-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.context.persistence.PersistenceXml;
-import org.eclipse.jpt.core.context.persistence.Property;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.resource.orm.OrmResource;
-import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.core.resource.orm.XmlSecondaryTable;
-import org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint;
-import org.eclipse.jpt.core.resource.persistence.PersistenceResource;
-import org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef;
-import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
-import org.eclipse.jpt.core.resource.persistence.XmlPersistence;
-import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
-import org.eclipse.jpt.core.resource.persistence.XmlProperty;
-
-/**
- * Use JpaFactory to create any core (e.g. JpaProject), resource 
- * (e.g. PersistenceResource), or context (e.g. AttributeMapping) model objects.
- * 
- * Assumes a base JPA project context structure 
- * corresponding to the JPA spec:
- * 
- * 	RootContent
- * 	 |- persistence.xml
- * 	     |- persistence unit(s)
- *           |- mapping file(s)  (e.g. orm.xml)
- *           |   |- persistent type mapping(s)  (e.g. Entity)
- *           |        |- persistent attribute mapping(s)  (e.g. Basic)
- *           |- persistent type mapping(s)
- *   
- *   ... and associated objects.
- *
- * @see org.eclipse.jpt.core.internal.platform.GenericJpaFactory
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JpaFactory 
-{
-	// **************** core objects *******************************************
-	
-	/**
-	 * Construct a JpaProject for the specified config, to be
-	 * added to the specified JPA project. Return null if unable to create
-	 * the JPA file (e.g. the content type is unrecognized).
-	 */
-	JpaProject buildJpaProject(JpaProject.Config config) throws CoreException;
-	
-	JpaDataSource buildJpaDataSource(JpaProject jpaProject, String connectionProfileName);
-	
-	/**
-	 * Construct a JPA file for the specified file and with the specified resource
-	 * model, to be added to the specified JPA project.
-	 * This should be non-null iff (if and only if) {@link #hasRelevantContent(IFile)}
-	 * returns true.
-	 */
-	JpaFile buildJpaFile(JpaProject jpaProject, IFile file, ResourceModel resourceModel);
-	
-	/**
-	 * Return true if a resource model will be provided for the given file
-	 * (this method should be moved to JpaPlatform)
-	 */
-	boolean hasRelevantContent(IFile file);
-	
-	/**
-	 * Build a resource model to be associated with the given file.
-	 * This should be non-null iff (if and only if) {@link #hasRelevantContent(IFile)}
-	 * returns true. 
-	 */
-	ResourceModel buildResourceModel(JpaProject jpaProject, IFile file);
-	
-	/**
-	 * Build a (/an updated) root context node to be associated with the given 
-	 * JPA project.
-	 * The root context node will be built once, but updated many times.
-	 * @see JpaProject.update(ProgressMonitor)
-	 */
-	JpaRootContextNode buildRootContext(JpaProject jpaProject);
-	
-	
-	// **************** persistence context objects ****************************
-	
-	PersistenceXml buildPersistenceXml(JpaRootContextNode parent, PersistenceResource persistenceResource);
-	
-	Persistence buildPersistence(PersistenceXml parent, XmlPersistence xmlPersistence);
-	
-	PersistenceUnit buildPersistenceUnit(Persistence parent, XmlPersistenceUnit persistenceUnit);
-	
-	/**
-	 * xmlMappingFileRef is allowed to be null, this would be used for the implied mapping file ref
-	 */
-	MappingFileRef buildMappingFileRef(PersistenceUnit parent, XmlMappingFileRef xmlMappingFileRef);
-	
-	ClassRef buildClassRef(PersistenceUnit parent, XmlJavaClassRef xmlClassRef);
-	
-	ClassRef buildClassRef(PersistenceUnit parent, String className);
-
-	Property buildProperty(PersistenceUnit parent, XmlProperty property);
-	
-	
-	// **************** orm context objects ************************************
-	
-	OrmXml buildOrmXml(MappingFileRef parent, OrmResource ormResource);
-
-	EntityMappings buildEntityMappings(OrmXml parent, XmlEntityMappings entityMappings);
-	
-	PersistenceUnitMetadata buildPersistenceUnitMetadata(EntityMappings parent, XmlEntityMappings entityMappings);
-	
-	PersistenceUnitDefaults buildPersistenceUnitDefaults(PersistenceUnitMetadata parent, XmlEntityMappings entityMappings);
-	
-	OrmPersistentType buildOrmPersistentType(EntityMappings parent, String mappingKey);
-	
-	OrmEntity buildOrmEntity(OrmPersistentType parent);
-	
-	OrmMappedSuperclass buildOrmMappedSuperclass(OrmPersistentType parent);
-	
-	OrmEmbeddable buildOrmEmbeddable(OrmPersistentType parent);
-	
-	OrmPersistentAttribute buildOrmPersistentAttribute(OrmPersistentType parent, String mappingKey);
-	
-	OrmTable buildOrmTable(OrmEntity parent);
-	
-	OrmSecondaryTable buildOrmSecondaryTable(OrmEntity parent, XmlSecondaryTable xmlSecondaryTable);
-	
-	OrmPrimaryKeyJoinColumn buildOrmPrimaryKeyJoinColumn(OrmJpaContextNode parent, OrmBaseJoinColumn.Owner owner);
-	
-	OrmJoinTable buildOrmJoinTable(OrmRelationshipMapping parent);
-	
-	OrmJoinColumn buildOrmJoinColumn(OrmJpaContextNode parent, OrmJoinColumn.Owner owner);
-	
-	OrmAttributeOverride buildOrmAttributeOverride(OrmJpaContextNode parent, AttributeOverride.Owner owner, XmlAttributeOverride xmlAttributeOverride);
-	
-	OrmAssociationOverride buildOrmAssociationOverride(OrmJpaContextNode parent, AssociationOverride.Owner owner, XmlAssociationOverride associationOverride);
-
-	OrmDiscriminatorColumn buildOrmDiscriminatorColumn(OrmEntity parent, OrmNamedColumn.Owner owner);
-	
-	OrmColumn buildOrmColumn(OrmJpaContextNode parent, OrmColumn.Owner owner);
-	
-	OrmGeneratedValue buildOrmGeneratedValue(OrmJpaContextNode parent);
-	
-	OrmSequenceGenerator buildOrmSequenceGenerator(OrmJpaContextNode parent);
-	
-	OrmTableGenerator buildOrmTableGenerator(OrmJpaContextNode parent);
-	
-	OrmNamedNativeQuery buildOrmNamedNativeQuery(OrmJpaContextNode parent);
-
-	OrmNamedQuery buildOrmNamedQuery(OrmJpaContextNode parent);
-	
-	OrmQueryHint buildOrmQueryHint(OrmQuery parent);
-
-	OrmBasicMapping buildOrmBasicMapping(OrmPersistentAttribute parent);
-	
-	OrmManyToManyMapping buildOrmManyToManyMapping(OrmPersistentAttribute parent);
-	
-	OrmOneToManyMapping buildOrmOneToManyMapping(OrmPersistentAttribute parent);
-	
-	OrmManyToOneMapping buildOrmManyToOneMapping(OrmPersistentAttribute parent);
-	
-	OrmOneToOneMapping buildOrmOneToOneMapping(OrmPersistentAttribute parent);
-	
-	OrmEmbeddedIdMapping buildOrmEmbeddedIdMapping(OrmPersistentAttribute parent);
-	
-	OrmEmbeddedMapping buildOrmEmbeddedMapping(OrmPersistentAttribute parent);
-	
-	OrmIdMapping buildOrmIdMapping(OrmPersistentAttribute parent);
-	
-	OrmTransientMapping buildOrmTransientMapping(OrmPersistentAttribute parent);
-	
-	OrmVersionMapping buildOrmVersionMapping(OrmPersistentAttribute parent);
-	
-	OrmAttributeMapping buildOrmNullAttributeMapping(OrmPersistentAttribute parent);
-	
-	OrmUniqueConstraint buildOrmUniqueConstraint(OrmJpaContextNode parent, UniqueConstraint.Owner owner, XmlUniqueConstraint xmlUniqueConstraint);
-	
-	// **************** java context objects ***********************************
-	
-	JavaPersistentType buildJavaPersistentType(JpaContextNode parent, JavaResourcePersistentType resourcePersistentType);
-	
-	JavaEntity buildJavaEntity(JavaPersistentType parent);
-	
-	JavaMappedSuperclass buildJavaMappedSuperclass(JavaPersistentType parent);
-	
-	JavaEmbeddable buildJavaEmbeddable(JavaPersistentType parent);
-	
-	JavaTypeMapping buildJavaNullTypeMapping(JavaPersistentType parent);
-	
-	JavaPersistentAttribute buildJavaPersistentAttribute(JavaPersistentType parent);
-
-	JavaBasicMapping buildJavaBasicMapping(JavaPersistentAttribute parent);
-	
-	JavaEmbeddedIdMapping buildJavaEmbeddedIdMapping(JavaPersistentAttribute parent);
-	
-	JavaEmbeddedMapping buildJavaEmbeddedMapping(JavaPersistentAttribute parent);
-	
-	JavaIdMapping buildJavaIdMapping(JavaPersistentAttribute parent);
-	
-	JavaManyToManyMapping buildJavaManyToManyMapping(JavaPersistentAttribute parent);
-	
-	JavaManyToOneMapping buildJavaManyToOneMapping(JavaPersistentAttribute parent);
-	
-	JavaOneToManyMapping buildJavaOneToManyMapping(JavaPersistentAttribute parent);
-	
-	JavaOneToOneMapping buildJavaOneToOneMapping(JavaPersistentAttribute parent);
-
-	JavaTransientMapping buildJavaTransientMapping(JavaPersistentAttribute parent);
-	
-	JavaVersionMapping buildJavaVersionMapping(JavaPersistentAttribute parent);
-	
-	JavaAttributeMapping buildJavaNullAttributeMapping(JavaPersistentAttribute parent);
-	
-	JavaTable buildJavaTable(JavaEntity parent);
-	
-	JavaJoinTable buildJavaJoinTable(JavaRelationshipMapping parent);
-	
-	JavaColumn buildJavaColumn(JavaJpaContextNode parent, JavaColumn.Owner owner);
-
-	JavaDiscriminatorColumn buildJavaDiscriminatorColumn(JavaEntity parent, JavaNamedColumn.Owner owner);
-	
-	JavaJoinColumn buildJavaJoinColumn(JavaJpaContextNode parent, JavaJoinColumn.Owner owner);
-
-	JavaSecondaryTable buildJavaSecondaryTable(JavaEntity parent);
-	
-	JavaSequenceGenerator buildJavaSequenceGenerator(JavaJpaContextNode parent);
-	
-	JavaTableGenerator buildJavaTableGenerator(JavaJpaContextNode parent);
-	
-	JavaGeneratedValue buildJavaGeneratedValue(JavaAttributeMapping parent);
-	
-	JavaPrimaryKeyJoinColumn buildJavaPrimaryKeyJoinColumn(JavaJpaContextNode parent, JavaBaseJoinColumn.Owner owner);
-	
-	JavaAttributeOverride buildJavaAttributeOverride(JavaJpaContextNode parent, AttributeOverride.Owner owner);
-	
-	JavaAssociationOverride buildJavaAssociationOverride(JavaJpaContextNode parent, AssociationOverride.Owner owner);
-
-	JavaNamedQuery buildJavaNamedQuery(JavaJpaContextNode parent);
-	
-	JavaNamedNativeQuery buildJavaNamedNativeQuery(JavaJpaContextNode parent);
-	
-	JavaQueryHint buildJavaQueryHint(JavaQuery parent);
-	
-	JavaUniqueConstraint buildJavaUniqueConstraint(JavaJpaContextNode parent, UniqueConstraint.Owner owner);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFile.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFile.java
deleted file mode 100644
index ca1473ff10..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFile.java
+++ /dev/null
@@ -1,100 +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.core;
-
-import java.util.Iterator;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.core.ElementChangedEvent;
-
-/**
- * A JpaProject contains Jpa files for all IFiles in the project that
- * are relevant to the JpaPlatform.
- * @see JpaFactory#hasRelevantContent(IFile), this method should be moved to JpaPlatform
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JpaFile extends JpaNode
-{
-	/**
-	 * Return the type of resource represented by this JPA file
-	 * @see ResourceModel#getResourceType()
-	 */
-	String getResourceType();
-
-	/**
-	 * Return the IFile associated with this JPA file
-	 */
-	IFile getFile();
-
-	/**
-	 * Return the resource model represented by this JPA file
-	 */
-	ResourceModel getResourceModel();
-	
-	/**
-	 * Forward the Java element changed event to the JPA file's content.
-	 */
-	void javaElementChanged(ElementChangedEvent event);
-
-	/**
-	 * Update the JPA resource model from the underlying resource.
-	 */
-	void updateFromResource();
-
-	/**
-	 * The JPA file has been removed from the JPA project. Clean up any
-	 * hooks to external resources etc.
-	 */
-	void dispose();
-	
-
-	// **************** root structure nodes *************************************
-	
-	/**
-	 * String constant associated with changes to the root structure nodes collection
-	 */
-	String ROOT_STRUCTURE_NODES_COLLECTION = "rootStructureNodes";
-	
-	/**
-	 * Return the root context model objects represented by this JPA file.
-	 */
-	Iterator<JpaStructureNode> rootStructureNodes();
-	
-	/**
-	 * Return the number of root context model objects represented by this JPA file.
-	 */
-	int rootStructureNodesSize();
-
-	/**
-	 * Add a root context model object represented by this JPA file.
-	 * There is the potential for multiple root structure nodes 
-	 * for a particular key.  For example a java file that is listed
-	 * both as a <class> in the persistence.xml and as an <entity> in
-	 * an orm.xml file.  In this case the orm.xml file needs to set
-	 * the root structure node after the java class reference.
-	 * Last one in during project update wins.
-	 * 
-	 * Call removeRootStructureNode(Object) to clean up when a file is
-	 * deleted.
-	 */
-	void addRootStructureNode(Object key, JpaStructureNode rootStructureNode);	
-	
-	void removeRootStructureNode(Object key);
-
-	/**
-	 * Return the structure node best represented by the location in the file.
-	 */
-	JpaStructureNode getStructureNode(int textOffset);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaModel.java
deleted file mode 100644
index 842134f82c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaModel.java
+++ /dev/null
@@ -1,60 +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.core;
-
-import java.util.Iterator;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jpt.utility.model.Model;
-
-/**
- * The JPA model holds all the JPA projects.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JpaModel extends Model {
-
-	/**
-	 * Return the JPA project corresponding to the specified Eclipse project.
-	 * Return null if unable to associate the specified Eclipse project
-	 * with a JPA project.
-	 */
-	JpaProject getJpaProject(IProject project) throws CoreException;
-
-	/**
-	 * Return whether the JPA model contains a JPA project corresponding
-	 * to the specified Eclipse project.
-	 */
-	boolean containsJpaProject(IProject project);
-
-	/**
-	 * Return the JPA model's JPA projects. This has performance implications,
-	 * it will build all the JPA projects.
-	 */
-	Iterator<JpaProject> jpaProjects() throws CoreException;
-		public static final String JPA_PROJECTS_COLLECTION = "jpaProjects";
-
-	/**
-	 * Return the size of the JPA model's list of JPA projects.
-	 */
-	int jpaProjectsSize();
-	
-	/**
-	 * Return the JPA file corresponding to the specified Eclipse file,
-	 * or null if unable to associate the specified file with a JPA file.
-	 */
-	JpaFile getJpaFile(IFile file) throws CoreException;
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaNode.java
deleted file mode 100644
index 69e3729e55..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaNode.java
+++ /dev/null
@@ -1,44 +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.core;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jpt.utility.model.Model;
-
-/**
- * JPA-specific protocol.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JpaNode extends Model, IAdaptable
-{
-
-	/**
-	 * Return the JPA project the node belongs to.
-	 */
-	JpaProject getJpaProject();
-
-	/**
-	 * Return the resource that most directly contains the node.
-	 * This is used by JpaHelper.
-	 */
-	IResource getResource();
-
-	/**
-	 * Return the JPA node's parent. The JPA project will not have a parent.
-	 */
-	JpaNode getParent();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaPlatform.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaPlatform.java
deleted file mode 100644
index 7ebc79fbf4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaPlatform.java
+++ /dev/null
@@ -1,140 +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.core;
-
-import java.util.List;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.context.java.JavaTypeMapping;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * This interface is to be implemented by a JPA vendor to provide extensions to 
- * the core JPA model.  The core JPA model will provide functionality for JPA
- * spec annotations in java, persistence.xml and (orm.xml) mapping files.
- * The org.eclipse.jpt.core.genericPlatform extension supplies 
- * resource models for those file types.  As another vendor option you 
- * will have to supply those resource models as well or different ones 
- * as necessary.
- * 
- * See the org.eclipse.jpt.core.jpaPlatform extension point
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JpaPlatform
-{
-	/**
-	 * Get the ID for this platform
-	 */
-	String getId();
-
-	/**
-	 * Set the ID for this platform.  This is an extension
-	 * so you can't use a non-default constructor.
-	 * 
-	 * *************
-	 * * IMPORTANT *  For INTERNAL use only!!
-	 * *************
-	 */
-	void setId(String theId);
-
-	
-	// **************** Model construction / updating **************************
-	
-	/**
-	 * Construct a JPA file for the specified file, to be added to the specified 
-	 * JPA project. (Defer to the factory for actual object creation.)  
-	 * Return null if unable to create the JPA file (e.g. the content type is 
-	 * unrecognized).
-	 */
-	JpaFile buildJpaFile(JpaProject jpaProject, IFile file);
-	
-	/**
-	 * Return a factory responsible for creating core (e.g. JpaProject), resource
-	 * (e.g. PersistenceResource), and context (e.g. PersistenceUnit) model
-	 * objects
-	 */
-	JpaFactory getJpaFactory();
-	
-	
-	// **************** Java annotation support ********************************
-	
-	/**
-	 * Return an annotation provider responsible for determining what annotations
-	 * are supported and constructing java resource model objects
-	 */
-	JpaAnnotationProvider getAnnotationProvider();
-	
-	
-	// **************** Java type mapping support ********************************
-	
-	/**
-	 * Build a Java type mapping with the given mapping key and parent.  Throws a IllegalArgumentException
-	 * if the typeMappingKey is not supported by this platform.
-	 * Override {@link #GenericJpaPlatform.addJavaTypeMappingProvidersTo(Collection<JavaTypeMappingProvider>)}
-	 * to add new supported type mappings to the platform
-	 */
-	JavaTypeMapping buildJavaTypeMappingFromMappingKey(String typeMappingKey, JavaPersistentType parent);
-	
-	/**
-	 * Build a Java type mapping with the given mapping annotation and parent.  Throws a IllegalArgumentException
-	 * if the mapping annotation is not supported by this platform.
-	 * Override {@link #GenericJpaPlatform.addJavaTypeMappingProvidersTo(Collection<JavaTypeMappingProvider>)}
-	 * to add new supported type mappings to the platform
-	 */
-	JavaTypeMapping buildJavaTypeMappingFromAnnotation(String mappingAnnotationName, JavaPersistentType parent);
-
-	// **************** Java attribute mapping support ********************************
-
-	/**
-	 * Build a Java attribute mapping with the given mapping key and parent.  Throws a IllegalArgumentException
-	 * if the attributeMappingKey is not supported by this platform.
-	 * Override {@link #GenericJpaPlatform.addJavaAttributeMappingProvidersTo(Collection<JavaAttributeMappingProvider>)}
-	 * to add new supported attribute mappings to the platform
-	 */
-	JavaAttributeMapping buildJavaAttributeMappingFromMappingKey(String attributeMappingKey, JavaPersistentAttribute parent);
-	
-	/**
-	 * Build a Java attribute mapping with the given mapping annotation and parent.  Throws a IllegalArgumentException
-	 * if the mapping annotation is not supported by this platform.
-	 * Override {@link #GenericJpaPlatform.addJavaAttributeMappingProvidersTo(Collection<JavaAttributeMappingProvider>)}
-	 * to add new supported attribute mappings to the platform
-	 */
-	JavaAttributeMapping buildJavaAttributeMappingFromAnnotation(String mappingAnnotationName, JavaPersistentAttribute parent);
-	
-	/**
-	 * Build a default Java attribute mapping with the given mapping annotation and parent.  Throws a IllegalArgumentException
-	 * if the mapping annotation is not supported by this platform.
-	 * Override {@link #GenericJpaPlatform.addDefaultJavaAttributeMappingProvidersTo(Collection<DefaultJavaAttributeMappingProvider>)}
-	 * to add new supported attribute mappings to the platform
-	 */
-	JavaAttributeMapping buildDefaultJavaAttributeMapping(JavaPersistentAttribute parent);
-	
-	/**
-	 * Return the attribute mapping key corresponding to the default atribute mapping
-	 * that applies to the Java persistent attribute.  This will be based on the attribute's
-	 * type.  See {@link DefaultJavaAttributeMappingProvider.#defaultApplies(JavaPersistentAttribute)}
-	 */
-	String defaultJavaAttributeMappingKey(JavaPersistentAttribute persistentAttribute);
-	
-	// *************************************************************************
-	
-	/**
-	 * Adds validation messages to the growing list of messages for a given project
-	 */
-	void addToMessages(JpaProject project, List<IMessage> messages);
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaProject.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaProject.java
deleted file mode 100644
index 2b4abb5adb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaProject.java
+++ /dev/null
@@ -1,374 +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.core;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jpt.core.context.JpaRootContextNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.db.ConnectionProfile;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.utility.CommandExecutor;
-import org.eclipse.jpt.utility.CommandExecutorProvider;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JpaProject extends JpaNode {
-
-	/**
-	 * Return the JPA project's name, which is the Eclipse project's name.
-	 */
-	String getName();
-
-	/**
-	 * Return the Eclipse project associated with the JPA project.
-	 */
-	IProject getProject();
-
-	/**
-	 * Return the Java project associated with the JPA project.
-	 */
-	IJavaProject getJavaProject();
-
-	/**
-	 * Return the vendor-specific JPA platform that builds the JPA project
-	 * and its contents.
-	 */
-	JpaPlatform getJpaPlatform();
-
-	/**
-	 * Return the project's connection
-	 */
-	ConnectionProfile getConnectionProfile();
-
-	/**
-	 * Return the primary schema associated with this project, which unless overridden, 
-	 * is the default schema from the connection
-	 * @see JpaProject#getUserOverrideDefaultSchema()
-	 * @return The default schema.  May be null if the connection is not connected.
-	 */
-	Schema getDefaultSchema();
-	
-	/**
-	 * Return the user specified schema to be used as a default for this project.
-	 * @see JpaProject#getUserOverrideDefaultSchemaName()
-	 * @return  The user specified default schema. May be null if the connection
-	 *   is not connected or if the user has not overridden the schema (implies 
-	 *   the default schema associated with the connection profile should be used).
-	 */
-	Schema getUserOverrideDefaultSchema();
-	
-	/**
-	 * Return the data source the JPA project is mapped to.
-	 */
-	JpaDataSource getDataSource();
-	
-	
-	// **************** user override default schema name **********************
-	
-	/** 
-	 * ID string used when userOverrideDefaultSchemaName property is changed.
-	 * @see org.eclipse.jpt.utility.model.Model#addPropertyChangeListener(String, org.eclipse.jpt.utility.model.listener.PropertyChangeListener)
-	 */
-	String USER_OVERRIDE_DEFAULT_SCHEMA_NAME_PROPERTY = "userOverrideDefaultSchemaName";
-	
-	/**
-	 * Return the name of the schema to be used as a default for the project
-	 * instead of the one that is defaultly associated with the connection profile.
-	 * @return The schema name. May be null (implies that the connection profile
-	 *   default schema should be used).
-	 */
-	String getUserOverrideDefaultSchemaName();
-	
-	/**
-	 * Set the name of the schema to be used as a default for the project
-	 * instead of the one that is defaultly associated with the connection profile.
-	 * @parameter defaultSchemaName - The default schema name to use instead of
-	 *   the default schema of the connection profile. May be null (implies that
-	 *   the connection profile default schema should be used).
-	 */
-	void setUserOverrideDefaultSchemaName(String defaultSchemaName);
-	
-	
-	// **************** discover annotated classes *****************************
-	
-	/** 
-	 * ID string used when discoversAnnotatedClasses property is changed.
-	 * @see org.eclipse.jpt.utility.model.Model#addPropertyChangeListener(String, org.eclipse.jpt.utility.model.listener.PropertyChangeListener)
-	 */
-	String DISCOVERS_ANNOTATED_CLASSES_PROPERTY = "discoversAnnotatedClasses";
-	
-	/**
-	 * Return whether the JPA project will "discover" annotated classes
-	 * automatically, as opposed to requiring the classes to be
-	 * listed in persistence.xml.
-	 */
-	boolean discoversAnnotatedClasses();
-	
-	/**
-	 * Set whether the JPA project will "discover" annotated classes
-	 * automatically, as opposed to requiring the classes to be
-	 * listed in persistence.xml.
-	 */
-	void setDiscoversAnnotatedClasses(boolean discoversAnnotatedClasses);
-	
-	
-	// **************** jpa files **********************************************
-	
-	/** 
-	 * ID string used when jpaFiles collection is changed.
-	 * @see org.eclipse.jpt.utility.model.Model#addCollectionChangeListener(String, org.eclipse.jpt.utility.model.listener.CollectionChangeListener)
-	 */
-	String JPA_FILES_COLLECTION = "jpaFiles";
-
-	/**
-	 * Return the JPA project's JPA files.
-	 */
-	Iterator<JpaFile> jpaFiles();
-	
-	/**
-	 * Return the size of the JPA project's JPA files.
-	 */
-	int jpaFilesSize();
-
-	/**
-	 * Return the JPA file corresponding to the specified file.
-	 * Return null if unable to associate the given file
-	 * with a JPA file.
-	 */
-	JpaFile getJpaFile(IFile file);
-
-	/**
-	 * Return the JPA project's JPA files for the specified content type ID.
-	 * The content type ID should match that given in the
-	 * JPA file content provider.
-	 */
-	Iterator<JpaFile> jpaFiles(String contentTypeId);
-	
-	
-	// **************** various queries ****************************************
-	
-	/**
-	 * Return the JPA project's root "deploy path".
-	 * JPA projects associated with Web projects return "WEB-INF/classes";
-	 * all others simply return an empty string.
-	 */
-	String getRootDeployLocation();
-	
-	/**
-	 * Return the {@link JpaRootContextNode} representing the JPA content of this project
-	 */
-	JpaRootContextNode getRootContext();
-	
-	/**
-	 * Return the names of the JPA project's annotated classes.
-	 */
-	Iterator<String> annotatedClassNames();
-	
-	/**
-	 * Return the Java persistent type resource for the specified fully qualified type name;
-	 * null, if none exists.
-	 */
-	// TODO rename getJavaResourcePersistentType(String)
-	JavaResourcePersistentType getJavaPersistentTypeResource(String typeName);
-	
-	
-	// **************** jpa model synchronization and lifecycle ****************
-	
-	/**
-	 * Synchronize the JPA project's JPA files with the specified resource
-	 * delta, watching for added and removed files.
-	 */
-	void synchronizeJpaFiles(IResourceDelta delta) throws CoreException;
-
-	/**
-	 * Forward the Java element change event to the JPA project's JPA files.
-	 */
-	void javaElementChanged(ElementChangedEvent event);
-
-	/**
-	 * The JPA project has been removed from the JPA model. Clean up any
-	 * hooks to external resources etc.
-	 */
-	void dispose();
-	
-	
-	// **************** validation *********************************************
-	
-	/**
-	 * Return project's validation messages.
-	 */
-	Iterator<IMessage> validationMessages();
-
-	/**
-	 * Add to the list of current validation messages
-	 */
-	void addToMessages(List<IMessage> messages);
-
-
-	// **************** support for modifying shared documents *****************
-
-	/**
-	 * Set a thread-specific implementation of the CommandExecutor
-	 * interface that will be used to execute a command to modify a shared
-	 * document. If necessary, the command executor can be cleared by
-	 * setting it to null.
-	 * This allows background clients to modify documents that are
-	 * already present in the UI. See implementations of CommandExecutor.
-	 */
-	void setThreadLocalModifySharedDocumentCommandExecutor(CommandExecutor commandExecutor);
-
-	/**
-	 * Return the project-wide implementation of the CommandExecutorProvider
-	 * interface.
-	 */
-	CommandExecutorProvider getModifySharedDocumentCommandExecutorProvider();
-
-
-	// **************** project "update" ***************************************
-
-	/**
-	 * Return the implementation of the Updater
-	 * interface that will be used to "update" a JPA project.
-	 */
-	Updater getUpdater();
-
-	/**
-	 * Set the implementation of the Updater
-	 * interface that will be used to "update" a JPA project.
-	 * Before setting the updater, Clients should save the current updater so
-	 * it can be restored later.
-	 */
-	void setUpdater(Updater updater);
-
-	/**
-	 * Something in the JPA project has changed, "update" those parts of the
-	 * JPA project that are dependent on other parts of the JPA project.
-	 * This is called when
-	 * - The JPA project updater is changed {@link JpaProject#setUpdater(Updater)}
-	 * - anything in the JPA project changes
-	 * - the JPA project's database connection is changed, opened, or closed
-	 */
-	void update();
-
-	/**
-	 * This is the callback used by the updater to perform the actual
-	 * "update".
-	 */
-	IStatus update(IProgressMonitor monitor);
-
-
-	/**
-	 * Define a strategy that can be used to "update" a JPA project whenever
-	 * something changes.
-	 */
-	interface Updater {
-
-		/**
-		 * The updater has just been assigned to its JPA project.
-		 */
-		void start();
-
-		/**
-		 * Update the JPA project.
-		 */
-		void update();
-
-		/**
-		 * The JPA project is disposed; dispose the updater.
-		 */
-		void dispose();
-
-		/**
-		 * This updater does nothing. Useful for testing.
-		 */
-		final class Null implements Updater {
-			private static final Updater INSTANCE = new Null();
-			public static Updater instance() {
-				return INSTANCE;
-			}
-			// ensure single instance
-			private Null() {
-				super();
-			}
-			public void start() {
-				// do nothing
-			}
-			public void update() {
-				// do nothing
-			}
-			public void dispose() {
-				// do nothing
-			}
-			@Override
-			public String toString() {
-				return "IJpaProject.Updater.Null";
-			}
-		}
-
-	}
-
-
-	// **************** config that can be used to construct a JPA project *****
-
-	/**
-	 * The settings used to construct a JPA project.
-	 */
-	interface Config {
-
-		/**
-		 * Return the Eclipse project to be associated with the new JPA project.
-		 */
-		IProject getProject();
-
-		/**
-		 * Return the JPA platform to be associated with the new JPA project.
-		 */
-		JpaPlatform getJpaPlatform();
-
-		/**
-		 * Return the name of the connection profile to be associated
-		 * with the new JPA project. (This connection profile wraps a DTP
-		 * connection profile.)
-		 */
-		String getConnectionProfileName();
-		
-		/**
-		 * Return the name of the schema to use instead of the default schema
-		 * of the connection profile.
-		 * May be null.
-		 */
-		String getUserOverrideDefaultSchemaName();
-
-		/**
-		 * Return whether the new JPA project is to "discover" annotated
-		 * classes.
-		 */
-		boolean discoverAnnotatedClasses();
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaStructureNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaStructureNode.java
deleted file mode 100644
index 13acbcb8f6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaStructureNode.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.core;
-
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-/**
- * Implement this interface for objects that appear in the Structure view
- * This is used by JpaSelection to determine selection in the editor.
- * Details pages are also provided for each JpaStructureNode.
- * 
- * I did not implement JpaContextNode and I'm not even sure we should implement
- * JpaNode.  It is possibly someone could want a structure node that is
- * not actually a contextNode in the model.//TODO
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JpaStructureNode extends JpaNode
-{
-	/**
-	 * Return the structure node at the given offset.
-	 */
-	JpaStructureNode getStructureNode(int textOffset);
-	
-	/**
-	 * Return the text range to be used to select text in the editor
-	 * corresponding to this node.
-	 */
-	TextRange getSelectionTextRange();
-	
-	/**
-	 * Return a unique identifier for all of this class of structure nodes
-	 */
-	String getId();
-
-	/**
-	 * Dispose of this structureNode and dispose of chil structureNodes.
-	 * Typically this would be used to update the JpaFile rootStructureNodes.
-	 */
-	void dispose();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JptCorePlugin.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JptCorePlugin.java
deleted file mode 100644
index 317c8959cc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JptCorePlugin.java
+++ /dev/null
@@ -1,451 +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.core;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jpt.core.internal.JpaModelManager;
-import org.eclipse.jpt.core.internal.platform.GenericJpaPlatform;
-import org.eclipse.jpt.core.internal.platform.JpaPlatformRegistry;
-import org.eclipse.jpt.core.internal.prefs.JpaPreferenceConstants;
-import org.eclipse.jpt.core.internal.prefs.JpaPreferenceInitializer;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.prefs.BackingStoreException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * The JPT plug-in lifecycle implementation.
- * A number of globally-available constants and methods.
- * 
- * 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.
- */
-// TODO keep preferences in synch with the JPA project
-// (connection profile name, "discover" flag)
-// use listeners?
-public class JptCorePlugin extends Plugin {
-
-
-	// ********** public constants **********
-
-	/**
-	 * The plug-in identifier of the persistence support
-	 * (value <code>"org.eclipse.jpt.core"</code>).
-	 */
-	public static final String PLUGIN_ID = "org.eclipse.jpt.core";  //$NON-NLS-1$
-
-	/**
-	 * The identifier for the JPA facet
-	 * (value <code>"jpt.jpa"</code>).
-	 */
-	public static final String FACET_ID = "jpt.jpa";  //$NON-NLS-1$
-
-	/**
-	 * The key for storing a JPA project's platform in the Eclipse
-	 * project's preferences.
-	 */
-	public static final String JPA_PLATFORM = PLUGIN_ID + ".platform";  //$NON-NLS-1$
-	
-	/**
-	 * The key for storing a JPA project's "discover" flag in the Eclipse
-	 * project's preferences.
-	 */
-	public static final String DISCOVER_ANNOTATED_CLASSES = PLUGIN_ID + ".discoverAnnotatedClasses";  //$NON-NLS-1$
-
-	/**
-	 * The key for storing a JPA project's data source connection profile name
-	 * in the Eclipse project's persistent properties.
-	 */
-	public static final QualifiedName DATA_SOURCE_CONNECTION_PROFILE_NAME = 
-			new QualifiedName(PLUGIN_ID, "dataSource.connectionProfileName");  //$NON-NLS-1$
-
-	/**
-	 * The key for storing a JPA project's user overridden default schema name
-	 * in the Eclipse project's persistent properties.
-	 */
-	public static final QualifiedName USER_OVERRIDE_DEFAULT_SCHEMA_NAME = 
-			new QualifiedName(PLUGIN_ID, "userOverrideDefaultSchemaName");  //$NON-NLS-1$
-	
-	/**
-	 * The identifier for the JPA validation marker
-	 * (value <code>"org.eclipse.jpt.core.jpaProblemMarker"</code>).
-	 */
-	public static final String VALIDATION_MARKER_ID = PLUGIN_ID + ".jpaProblemMarker";  //$NON-NLS-1$
-
-	/**
-	 * Value of the content-type for orm.xml mappings files. Use this value to retrieve 
-	 * the ORM xml content type from the content type manager and to add new 
-	 * orm.xml-like extensions to this content type.
-	 * 
-	 * @see org.eclipse.core.runtime.content.IContentTypeManager#getContentType(String)
-	 */
-	public static final String ORM_XML_CONTENT_TYPE = PLUGIN_ID + ".content.orm"; //$NON-NLS-1$
-
-	/**
-	 * Ditto for persistence.xml.
-	 * @see #ORM_XML_CONTENT_TYPE
-	 */
-	public static final String PERSISTENCE_XML_CONTENT_TYPE = PLUGIN_ID + ".content.persistence"; //$NON-NLS-1$
-
-	/**
-	 * Web projects have some special exceptions.
-	 */
-	public static final String WEB_PROJECT_FACET_ID = IModuleConstants.JST_WEB_MODULE;
-
-	/**
-	 * Web projects have some special exceptions.
-	 */
-	public static final String WEB_PROJECT_DEPLOY_PREFIX = J2EEConstants.WEB_INF_CLASSES;
-
-	public static final String DEFAULT_PERSISTENCE_XML_FILE_PATH = "META-INF/persistence.xml";
-
-	public static final String DEFAULT_ORM_XML_FILE_PATH = "META-INF/orm.xml";
-
-
-	// ********** singleton **********
-
-	private static JptCorePlugin INSTANCE;
-
-	/**
-	 * Return the singleton JPT plug-in.
-	 */
-	public static JptCorePlugin instance() {
-		return INSTANCE;
-	}
-
-
-	// ********** public static methods **********
-
-	/**
-	 * Return the singular JPA model corresponding to the current workspace.
-	 */
-	public static JpaModel getJpaModel() {
-		return JpaModelManager.instance().getJpaModel();
-	}
-
-	/**
-	 * Return the JPA project corresponding to the specified Eclipse project,
-	 * or null if unable to associate the specified project with a
-	 * JPA project.
-	 */
-	public static JpaProject getJpaProject(IProject project) {
-		try {
-			return JpaModelManager.instance().getJpaProject(project);
-		} catch (CoreException ex) {
-			log(ex);
-			return null;
-		}
-	}
-
-	/**
-	 * Return the JPA file corresponding to the specified Eclipse file,
-	 * or null if unable to associate the specified file with a JPA file.
-	 */
-	public static JpaFile getJpaFile(IFile file) {
-		try {
-			return JpaModelManager.instance().getJpaFile(file);
-		} catch (CoreException ex) {
-			log(ex);
-			return null;
-		}
-	}
-
-	/**
-	 * Return whether the specified Eclipse project has a JPA facet.
-	 */
-	public static boolean projectHasJpaFacet(IProject project) {
-		return projectHasFacet(project, FACET_ID);
-	}
-
-	/**
-	 * Return whether the specified Eclipse project has a JPA facet.
-	 */
-	public static boolean projectHasWebFacet(IProject project) {
-		return projectHasFacet(project, WEB_PROJECT_FACET_ID);
-	}
-
-	/**
-	 * Checked exceptions bite.
-	 */
-	private static boolean projectHasFacet(IProject project, String facetId) {
-		try {
-			return FacetedProjectFramework.hasProjectFacet(project, facetId);
-		} catch (CoreException ex) {
-			log(ex);  // problems reading the project metadata - assume facet doesn't exist - return 'false'
-			return false;
-		}
-	}
-
-	/**
-	 * Return the persistence.xml (specified as "META-INF/persistence.xml")
-	 * deployment URI for the specified project.
-	 */
-	public static String getPersistenceXmlDeploymentURI(IProject project) {
-		return getDeploymentURI(project, DEFAULT_PERSISTENCE_XML_FILE_PATH);
-	}
-
-	/**
-	 * Return the default mapping file (specified as "META-INF/orm.xml")
-	 * deployment URI for the specified project.
-	 */
-	public static String getDefaultOrmXmlDeploymentURI(IProject project) {
-		return getDeploymentURI(project, DEFAULT_ORM_XML_FILE_PATH);
-	}
-	
-	/**
-	 * Return the mapping file (specified as "META-INF/<mappingFileName>")
-	 * deployment URI for the specified project.
-	 */
-	public static String getOrmXmlDeploymentURI(IProject project, String mappingFileName) {
-		return getDeploymentURI(project, mappingFileName);
-	}
-	
-	/**
-	 * Tweak the specified deployment URI if the specified project
-	 * has a web facet.
-	 */
-	private static String getDeploymentURI(IProject project, String defaultURI) {
-		return projectHasWebFacet(project) ?
-				WEB_PROJECT_DEPLOY_PREFIX + "/" + defaultURI
-			:
-				defaultURI;
-	}
-	
-	/**
-	 * Return the default JPA preferences
-	 * @see JpaPreferenceInitializer
-	 */
-	public static IEclipsePreferences getDefaultPreferences() {
-		IScopeContext context = new DefaultScope();
-		return context.getNode(PLUGIN_ID);
-	}
-	
-	/**
-	 * Return the JPA preferences for the current workspace instance.
-	 */
-	public static IEclipsePreferences getWorkspacePreferences() {
-		IScopeContext context = new InstanceScope();
-		return context.getNode(PLUGIN_ID);
-	}
-	
-	/**
-	 * Return the JPA preferences for the specified Eclipse project.
-	 */
-	public static IEclipsePreferences getProjectPreferences(IProject project) {
-		IScopeContext context = new ProjectScope(project);
-		return context.getNode(PLUGIN_ID);
-	}
-	
-	/**
-	 * Return the default JPA library for creating new JPA projects
-	 */
-	public static String getDefaultJpaLibrary() {
-		return Platform.getPreferencesService().get(
-				JpaPreferenceConstants.PREF_DEFAULT_JPA_LIB, null,
-				new Preferences[] {getWorkspacePreferences(), getDefaultPreferences()});
-	}
-	
-	/**
-	 * Return the default JPA platform ID for creating new JPA projects
-	 */
-	public static String getDefaultJpaPlatformId() {
-		String platformId = 
-			Platform.getPreferencesService().get(
-				JpaPreferenceConstants.PREF_DEFAULT_JPA_PLATFORM, GenericJpaPlatform.ID,
-				new Preferences[] {getWorkspacePreferences(), getDefaultPreferences()});
-		if (! JpaPlatformRegistry.instance().containsPlatform(platformId)) {
-			platformId = 
-				Platform.getPreferencesService().get(
-					JpaPreferenceConstants.PREF_DEFAULT_JPA_PLATFORM, GenericJpaPlatform.ID,
-					new Preferences[] {getDefaultPreferences()});
-		}
-		return platformId;
-	}
-	
-	/**
-	 * Set the default JPA platform ID for creating new JPA projects
-	 */
-	public static void setDefaultJpaPlatformId(String platformId) {
-		IEclipsePreferences prefs = getWorkspacePreferences();
-		prefs.put(JpaPreferenceConstants.PREF_DEFAULT_JPA_PLATFORM, platformId);
-		flush(prefs);
-	}
-
-	/**
-	 * Return the JPA platform associated with the specified Eclipse project.
-	 */
-	public static JpaPlatform getJpaPlatform(IProject project) {
-		return JpaPlatformRegistry.instance().getJpaPlatform(getJpaPlatformId(project));
-	}
-	
-	/**
-	 * Return the JPA platform ID associated with the specified Eclipse project.
-	 */
-	public static String getJpaPlatformId(IProject project) {
-		return getProjectPreferences(project).get(JPA_PLATFORM, GenericJpaPlatform.ID);
-	}
-
-	/**
-	 * Set the JPA platform ID associated with the specified Eclipse project.
-	 */
-	public static void setJpaPlatformId(IProject project, String jpaPlatformId) {
-		IEclipsePreferences prefs = getProjectPreferences(project);
-		prefs.put(JPA_PLATFORM, jpaPlatformId);
-		flush(prefs);
-	}
-	
-	/**
-	 * Return the JPA "discover" flag associated with the specified
-	 * Eclipse project.
-	 */
-	public static boolean discoverAnnotatedClasses(IProject project) {
-		return getProjectPreferences(project).getBoolean(DISCOVER_ANNOTATED_CLASSES, false);
-	}
-
-	/**
-	 * Set the JPA "discover" flag associated with the specified
-	 * Eclipse project.
-	 */
-	public static void setDiscoverAnnotatedClasses(IProject project, boolean discoverAnnotatedClasses) {
-		IEclipsePreferences prefs = getProjectPreferences(project);
-		prefs.putBoolean(DISCOVER_ANNOTATED_CLASSES, discoverAnnotatedClasses);
-		flush(prefs);
-	}
-
-	/**
-	 * checked exceptions bite
-	 */
-	private static void flush(IEclipsePreferences prefs) {
-		try {
-			prefs.flush();
-		} catch(BackingStoreException ex) {
-			log(ex);
-		}
-	}
-
-	/**
-	 * Return the name of the connection profile associated with the specified
-	 * Eclipse project.
-	 */
-	public static String getConnectionProfileName(IProject project) {
-		try {
-			return project.getPersistentProperty(DATA_SOURCE_CONNECTION_PROFILE_NAME);
-		} catch (CoreException ex) {
-			log(ex);
-			return null;
-		}
-	}
-
-	/**
-	 * Set the name of the connection profile associated with the specified
-	 * Eclipse project.
-	 */
-	public static void setConnectionProfileName(IProject project, String connectionProfileName) {
-		try {
-			project.setPersistentProperty(DATA_SOURCE_CONNECTION_PROFILE_NAME, connectionProfileName);
-		} catch (CoreException ex) {
-			log(ex);
-		}
-	}
-	
-	/**
-	 * Return the default schema name associated with the specified Eclipse project.
-	 * @see JpaProject#getUserOverrideDefaultSchemaName()
-	 */
-	public static String getUserOverrideDefaultSchemaName(IProject project) {
-		try {
-			return project.getPersistentProperty(USER_OVERRIDE_DEFAULT_SCHEMA_NAME);
-		}
-		catch (CoreException ce) {
-			log(ce);
-			return null;
-		}
-	}
-	
-	/**
-	 * Set the default schema name associated with the specified Eclipse project.
-	 * @see JpaProject#setUserOverrideDefaultSchemaName()
-	 */
-	public static void setUserOverrideDefaultSchemaName(IProject project, String defaultSchemaName) {
-		try {
-			project.setPersistentProperty(USER_OVERRIDE_DEFAULT_SCHEMA_NAME, defaultSchemaName);
-		}
-		catch (CoreException ce) {
-			log(ce);
-		}
-	}
-
-	/**
-	 * 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 JptCorePlugin() {
-		super();
-		if (INSTANCE != null) {
-			throw new IllegalStateException();
-		}
-		// this convention is *wack*...  ~bjv
-		INSTANCE = this;
-	}
-
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		JpaModelManager.instance().start();
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		try {
-			JpaModelManager.instance().stop();
-		} finally {
-			super.stop(context);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/MappingKeys.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/MappingKeys.java
deleted file mode 100644
index 5f87c92672..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/MappingKeys.java
+++ /dev/null
@@ -1,39 +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.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.
- */
-public interface MappingKeys
-{
-	String ENTITY_TYPE_MAPPING_KEY = "entity";
-	String MAPPED_SUPERCLASS_TYPE_MAPPING_KEY = "mappedSuperclass";
-	String EMBEDDABLE_TYPE_MAPPING_KEY = "embeddable";
-	String NULL_TYPE_MAPPING_KEY = null;
-
-	String BASIC_ATTRIBUTE_MAPPING_KEY = "basic";
-	String ID_ATTRIBUTE_MAPPING_KEY = "id";
-	String VERSION_ATTRIBUTE_MAPPING_KEY = "version";
-	String ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY  = "oneToOne";
-	String ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY = "oneToMany";
-	String MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY = "manyToOne";
-	String MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY = "manyToMany";
-	String EMBEDDED_ATTRIBUTE_MAPPING_KEY = "embedded";
-	String EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY = "embeddedId";
-	String TRANSIENT_ATTRIBUTE_MAPPING_KEY = "transient";
-	String NULL_ATTRIBUTE_MAPPING_KEY = null;
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/ResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/ResourceModel.java
deleted file mode 100644
index c2c1f6908a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/ResourceModel.java
+++ /dev/null
@@ -1,76 +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.core;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jpt.utility.model.Model;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- */
-public interface ResourceModel extends Model
-{
-	/**
-	 * Constant representing a Java resource type
-	 * @see ResourceModel#getResourceType()
-	 */
-	static final String JAVA_RESOURCE_TYPE = "JAVA_RESOURCE_TYPE";
-	
-	/**
-	 * Constant representing a persistence.xml resource type
-	 * @see ResourceModel#getResourceType()
-	 */
-	static final String PERSISTENCE_RESOURCE_TYPE = "PERSISTENCE_RESOURCE_TYPE";
-	
-	/**
-	 * Constant representing a mapping file (e.g. orm.xml) resource type
-	 * @see ResourceModel#getResourceType()
-	 */
-	static final String ORM_RESOURCE_TYPE = "ORM_RESOURCE_TYPE";
-	
-	
-	/**
-	 * Return a unique identifier for all resource models of this type
-	 */
-	String getResourceType();
-	
-	/**
-	 * Return the IFile that this resource model represents
-	 */
-	IFile getFile();
-	
-	void javaElementChanged(ElementChangedEvent event);
-	
-	/**
-	 * Update the resource model from the underlying resource.
-	 */
-	void updateFromResource();
-
-	
-	void addResourceModelChangeListener(ResourceModelListener listener);
-	
-	void removeResourceModelChangeListener(ResourceModelListener listener);
-	
-	
-	void dispose();
-	
-	/**
-	 * Used to resolve type information that could be dependent on other files being added/removed.
-	 */
-	void resolveTypes();
-}
-
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/ResourceModelListener.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/ResourceModelListener.java
deleted file mode 100644
index d5882d8b3b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/ResourceModelListener.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.core;
-
-import org.eclipse.jpt.utility.model.listener.ChangeListener;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 ResourceModelListener extends ChangeListener
-{
-	void resourceModelChanged();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AccessType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AccessType.java
deleted file mode 100644
index e57caa5d32..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AccessType.java
+++ /dev/null
@@ -1,69 +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.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.
- */
-public enum AccessType {
-
-	FIELD,
-	PROPERTY;
-
-
-	public static AccessType fromJavaResourceModel(org.eclipse.jpt.core.resource.java.AccessType javaAccessType) {
-		if (javaAccessType == null) {
-			return null;
-		}
-		switch (javaAccessType) {
-			case FIELD:
-				return FIELD;
-			case PROPERTY:
-				return PROPERTY;
-			default:
-				throw new IllegalArgumentException("unknown access type: " + javaAccessType);
-		}
-	}
-	
-	public static AccessType fromXmlResourceModel(org.eclipse.jpt.core.resource.orm.AccessType ormAccessType) {
-		if (ormAccessType == null) {
-			return null;
-		}
-		switch (ormAccessType) {
-			case FIELD:
-				return FIELD;
-			case PROPERTY:
-				return PROPERTY;
-			default:
-				throw new IllegalArgumentException("unknown access type: " + ormAccessType);
-		}
-	}
-	
-	public static org.eclipse.jpt.core.resource.orm.AccessType toXmlResourceModel(AccessType accessType) {
-		if (accessType == null) {
-			return null;
-		}
-		switch (accessType) {
-			case FIELD:
-				return org.eclipse.jpt.core.resource.orm.AccessType.FIELD;
-			case PROPERTY:
-				return org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY;
-			default:
-				throw new IllegalArgumentException("unknown access type: " + accessType);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AssociationOverride.java
deleted file mode 100644
index 0d6e42d95f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AssociationOverride.java
+++ /dev/null
@@ -1,52 +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.core.context;
-
-import java.util.ListIterator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 AssociationOverride extends BaseOverride
-{
-	<T extends JoinColumn> ListIterator<T> joinColumns();
-	<T extends JoinColumn> ListIterator<T> specifiedJoinColumns();
-	<T extends JoinColumn> ListIterator<T> defaultJoinColumns();
-	int joinColumnsSize();
-	int specifiedJoinColumnsSize();
-	int defaultJoinColumnsSize();
-	JoinColumn addSpecifiedJoinColumn(int index);
-	void removeSpecifiedJoinColumn(int index);
-	void moveSpecifiedJoinColumn(int targetIndex, int sourceIndex);
-		String SPECIFIED_JOIN_COLUMNS_LIST = "specifiedJoinColumnsList";
-		String DEFAULT_JOIN_COLUMNS_LIST = "defaultJoinColumnsList";
-		
-	boolean containsSpecifiedJoinColumns();
-
-	AssociationOverride.Owner getOwner();
-	
-	AssociationOverride setVirtual(boolean virtual);
-	
-	interface Owner extends BaseOverride.Owner
-	{
-		/**
-		 * Return the relationship mapping with the given attribute name.
-		 * Return null if it does not exist.  This relationship mapping
-		 * will be found in the mapped superclass, not in the owning entity
-		 */
-		RelationshipMapping getRelationshipMapping(String attributeName);
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AttributeMapping.java
deleted file mode 100644
index aec90ff35d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AttributeMapping.java
+++ /dev/null
@@ -1,58 +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.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.
- */
-public interface AttributeMapping extends JpaContextNode
-{
-	PersistentAttribute getPersistentAttribute();
-
-	boolean isDefault();
-
-	/**
-	 * Return a unique key for the IPersistentAttributeMapping.  If this is defined in
-	 * an extension they should be equal.
-	 */
-	String getKey();
-
-	/**
-	 * If the mapping is for a primary key column, return the column's name,
-	 * otherwise return null.
-	 */
-	String getPrimaryKeyColumnName();
-
-	/**
-	 * Return the mapping for the attribute mapping's attribute's type.
-	 */
-	TypeMapping getTypeMapping();
-
-	/**
-	 * Return whether the "attribute" mapping can be overridden.
-	 */
-	boolean isOverridableAttributeMapping();
-
-	/**
-	 * Return whether the "association" mapping can be overridden.
-	 */
-	boolean isOverridableAssociationMapping();
-
-	/**
-	 * Return whether the "attribute" mapping is for an ID.
-	 */
-	boolean isIdMapping();
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AttributeOverride.java
deleted file mode 100644
index 604636dc98..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AttributeOverride.java
+++ /dev/null
@@ -1,38 +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.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.
- */
-public interface AttributeOverride extends BaseOverride, Column.Owner
-{
-	Column getColumn();
-
-	AttributeOverride.Owner getOwner();
-	
-	AttributeOverride setVirtual(boolean virtual);
-	
-	interface Owner extends BaseOverride.Owner
-	{
-		/**
-		 * Return the column mapping with the given attribute name.
-		 * Return null if it does not exist.  This column mapping
-		 * will be found in the mapped superclass (or embeddable), not in the owning entity
-		 */
-		ColumnMapping getColumnMapping(String attributeName);
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseColumn.java
deleted file mode 100644
index b814c2a24e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseColumn.java
+++ /dev/null
@@ -1,89 +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.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.
- */
-public interface BaseColumn extends NamedColumn
-{
-
-	String getTable();
-
-	String getDefaultTable();
-		String DEFAULT_TABLE_PROPERTY = "defaultTableProperty";
-
-	String getSpecifiedTable();
-	void setSpecifiedTable(String value);
-		String SPECIFIED_TABLE_PROPERTY = "specifiedTableProperty";
-
-	
-	Boolean getUnique();
-	
-	Boolean getDefaultUnique();
-		String DEFAULT_UNIQUE_PROPERTY = "defaultUniqueProperty";
-		Boolean DEFAULT_UNIQUE = Boolean.FALSE;
-	Boolean getSpecifiedUnique();
-	void setSpecifiedUnique(Boolean newSpecifiedUnique);
-		String SPECIFIED_UNIQUE_PROPERTY = "specifiedUniqueProperty";
-	
-
-	Boolean getNullable();
-		
-	Boolean getDefaultNullable();
-		String DEFAULT_NULLABLE_PROPERTY = "defaultNullableProperty";
-		Boolean DEFAULT_NULLABLE = Boolean.TRUE;
-	Boolean getSpecifiedNullable();
-	void setSpecifiedNullable(Boolean newSpecifiedNullable);
-		String SPECIFIED_NULLABLE_PROPERTY = "specifiedNullableProperty";
-
-
-	Boolean getInsertable();
-	
-	Boolean getDefaultInsertable();
-		String DEFAULT_INSERTABLE_PROPERTY = "defaulInsertableProperty";
-		Boolean DEFAULT_INSERTABLE = Boolean.TRUE;
-	Boolean getSpecifiedInsertable();
-	void setSpecifiedInsertable(Boolean newSpecifiedInsertable);
-		String SPECIFIED_INSERTABLE_PROPERTY = "specifiedInsertableProperty";
-	
-	
-	Boolean getUpdatable();
-	
-	Boolean getDefaultUpdatable();
-		String DEFAULT_UPDATABLE_PROPERTY = "defaulUpdatableProperty";
-		Boolean DEFAULT_UPDATABLE = Boolean.TRUE;
-	Boolean getSpecifiedUpdatable();
-	void setSpecifiedUpdatable(Boolean newSpecifiedUpdatable);
-		String SPECIFIED_UPDATABLE_PROPERTY = "specifiedUpdatableProperty";
-
-	//TODO not sure we really need/want this to be public.  This
-	//is used by ColumnComposite to get a list of possible associated tables, but
-	//right now that list isn't going to update in the UI except when we repopulate
-	Owner getOwner();
-	
-	/**
-	 * interface allowing columns to be used in multiple places
-	 * (e.g. basic mappings and attribute overrides)
-	 */
-	interface Owner extends NamedColumn.Owner
-	{
-		/**
-		 * Return the name of the persistent attribute that contains the column.
-		 */
-		String getDefaultTableName();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseEmbeddedMapping.java
deleted file mode 100644
index ced177aef7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseEmbeddedMapping.java
+++ /dev/null
@@ -1,72 +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.core.context;
-
-import java.util.ListIterator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 BaseEmbeddedMapping extends AttributeMapping, AttributeOverride.Owner
-{
-
-	/**
-	 * Return a list iterator of the attribute overrides whether specified or virtual.
-	 * This will not be null.
-	 */
-	<T extends AttributeOverride> ListIterator<T> attributeOverrides();
-	
-	/**
-	 * Return the number of attribute overrides, both specified and default.
-	 */
-	int attributeOverridesSize();
-
-	/**
-	 * Return a list iterator of the specified attribute overrides.
-	 * This will not be null.
-	 */
-	<T extends AttributeOverride> ListIterator<T> specifiedAttributeOverrides();
-		String SPECIFIED_ATTRIBUTE_OVERRIDES_LIST = "specifiedAttributeOverridesList";
-	
-	/**
-	 * Return the number of specified attribute overrides.
-	 */
-	int specifiedAttributeOverridesSize();
-
-	/**
-	 * Return a list iterator of the virtual attribute overrides.
-	 * This will not be null.
-	 */
-	<T extends AttributeOverride> ListIterator<T> virtualAttributeOverrides();
-		String VIRTUAL_ATTRIBUTE_OVERRIDES_LIST = "virtualAttributeOverridesList";
-
-	/**
-	 * Return the number of virtual attribute overrides.
-	 */
-	int virtualAttributeOverridesSize();
-		
-	/**
-	 * Move the specified attribute override from the source index to the target index.
-	 */
-	void moveSpecifiedAttributeOverride(int targetIndex, int sourceIndex);
-	
-	/**
-	 * Return the attribute overrides, whether specified or default,
-	 * with the given name.
-	 */
-	AttributeOverride getAttributeOverrideNamed(String name);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseJoinColumn.java
deleted file mode 100644
index 6b79430c97..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseJoinColumn.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.core.context;
-
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.db.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.
- */
-public interface BaseJoinColumn extends NamedColumn
-{
-	String getReferencedColumnName();
-	String getDefaultReferencedColumnName();
-	String getSpecifiedReferencedColumnName();
-	void setSpecifiedReferencedColumnName(String value);
-		String SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY = "specifiedReferencedColumnName";
-		String DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY = "defaultReferencedColumnName";
-	
-	/**
-	 * Return the wrapper for the datasource referenced column
-	 */
-	Column getDbReferencedColumn();
-
-	/**
-	 * Return whether the reference column is found on the datasource
-	 */
-	boolean isReferencedColumnResolved();
-
-	boolean isVirtual();
-
-	interface Owner extends NamedColumn.Owner
-	{
-		/**
-		 * Return the wrapper for the datasource table for the referenced column
-		 */
-		Table getDbReferencedColumnTable();
-		
-		boolean isVirtual(BaseJoinColumn joinColumn);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseOverride.java
deleted file mode 100644
index fa2abedcb3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseOverride.java
+++ /dev/null
@@ -1,59 +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.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.
- */
-public interface BaseOverride extends JpaContextNode
-{
-
-	String getName();
-	void setName(String value);
-		String NAME_PROPERTY = "nameProperty";
-	
-	/**
-	 * Return true if override exists as specified on the owning object, or false
-	 * if the override is "gotten for free" as a result of defaults calculation
-	 */
-	boolean isVirtual();
-
-	BaseOverride setVirtual(boolean virtual);
-	
-	interface Owner
-	{
-		/**
-		 * Return the type mapping that this override is contained in
-		 * @return
-		 */
-		TypeMapping getTypeMapping();
-
-		/**
-		 * Return whether the given override is virtual. Virtual means that
-		 * it is not specified, but defaulted in from the mapped superclass or
-		 * embeddable.
-		 */
-		boolean isVirtual(BaseOverride override);
-		
-		/**
-		 * If false, add the give override as a specified override and remove
-		 * it from the list of virtual overrides.  If true, then remove it
-		 * from the specified overrides and add it to the virtual overrides
-		 * as applicable.  Return the new override (whether virtual or specified)
-		 */
-		BaseOverride setVirtual(boolean virtual, BaseOverride override);	
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BasicMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BasicMapping.java
deleted file mode 100644
index 44005adb88..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BasicMapping.java
+++ /dev/null
@@ -1,40 +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.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.
- */
-public interface BasicMapping extends AttributeMapping, ColumnMapping, Fetchable, Nullable
-{
-	FetchType DEFAULT_FETCH_TYPE = FetchType.EAGER;
-
-	boolean isLob();
-
-	void setLob(boolean value);
-		String LOB_PROPERTY = "lobProperty";
-	
-	EnumType getEnumerated();
-	
-	EnumType getDefaultEnumerated();
-		String DEFAULT_ENUMERATED_PROPERTY = "defaultEnumeratedProperty";
-		EnumType DEFAULT_ENUMERATED = EnumType.ORDINAL;
-
-	EnumType getSpecifiedEnumerated();
-	void setSpecifiedEnumerated(EnumType newSpecifiedEnumerated);
-		String SPECIFIED_ENUMERATED_PROPERTY = "specifiedEnumeratedProperty";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Cascade.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Cascade.java
deleted file mode 100644
index af68654463..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Cascade.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.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.
- */
-public interface Cascade extends JpaContextNode
-{
-
-	boolean isAll();
-	void setAll(boolean value);
-		String ALL_PROPERTY = "allProperty";
-
-	boolean isPersist();
-	void setPersist(boolean value);
-		String PERSIST_PROPERTY = "persistProperty";
-
-	boolean isMerge();
-	void setMerge(boolean value);
-		String MERGE_PROPERTY = "mergeProperty";
-
-	boolean isRemove();
-	void setRemove(boolean value);
-		String REMOVE_PROPERTY = "removeProperty";
-
-	boolean isRefresh();
-	void setRefresh(boolean value);
-		String REFRESH_PROPERTY = "refreshProperty";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Column.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Column.java
deleted file mode 100644
index 55834c2f59..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Column.java
+++ /dev/null
@@ -1,59 +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.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.
- */
-public interface Column extends BaseColumn
-{
-	Integer getLength();
-
-	Integer getDefaultLength();
-	Integer DEFAULT_LENGTH = Integer.valueOf(255);
-		String DEFAULT_LENGTH_PROPERTY = "defaultLengthProperty";
-
-	Integer getSpecifiedLength();
-	void setSpecifiedLength(Integer newSpecifiedLength);
-		String SPECIFIED_LENGTH_PROPERTY = "spcifiedLengthProperty";
-		
-	Integer getPrecision();
-
-	Integer getDefaultPrecision();
-		Integer DEFAULT_PRECISION = Integer.valueOf(0);
-		String DEFAULT_PRECISION_PROPERTY = "defaultPrecisionProperty";
-
-	Integer getSpecifiedPrecision();
-	void setSpecifiedPrecision(Integer newSpecifiedPrecision);
-		String SPECIFIED_PRECISION_PROPERTY = "spcifiedPrecisionProperty";
-
-	
-	Integer getScale();
-
-	Integer getDefaultScale();
-		Integer DEFAULT_SCALE = Integer.valueOf(0);
-		String DEFAULT_SCALE_PROPERTY = "defaultScaleProperty";
-
-	Integer getSpecifiedScale();
-	void setSpecifiedScale(Integer newSpecifiedScale);
-		String SPECIFIED_SCALE_PROPERTY = "spcifiedScaleProperty";
-
-	/**
-	 * Return whether the column is found on the datasource
-	 */
-	boolean isResolved();
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/ColumnMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/ColumnMapping.java
deleted file mode 100644
index a96ad2248c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/ColumnMapping.java
+++ /dev/null
@@ -1,29 +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.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.
- */
-public interface ColumnMapping extends JpaContextNode, Column.Owner
-{
-	Column getColumn();
-	
-	TemporalType getTemporal();
-	void setTemporal(TemporalType value);
-		String TEMPORAL_PROPERTY = "temporalProperty";
-
-} 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/DiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/DiscriminatorColumn.java
deleted file mode 100644
index 07be31c89b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/DiscriminatorColumn.java
+++ /dev/null
@@ -1,46 +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.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.
- */
-public interface DiscriminatorColumn extends NamedColumn
-{
-	String DEFAULT_NAME = "DTYPE";
-
-	DiscriminatorType getDiscriminatorType();
-
-	DiscriminatorType getDefaultDiscriminatorType();
-		String DEFAULT_DISCRIMINATOR_TYPE_PROPERTY = "defaultDiscriminatorTypeProperty";
-		DiscriminatorType DEFAULT_DISCRIMINATOR_TYPE = DiscriminatorType.STRING;
-		
-	DiscriminatorType getSpecifiedDiscriminatorType();
-	void setSpecifiedDiscriminatorType(DiscriminatorType newSpecifiedDiscriminatorType);
-		String SPECIFIED_DISCRIMINATOR_TYPE_PROPERTY = "specifiedDiscriminatorTypeProperty";
-
-
-	Integer getLength();
-
-	Integer getDefaultLength();
-		Integer DEFAULT_LENGTH = Integer.valueOf(31);
-		String DEFAULT_LENGTH_PROPERTY = "defaultLengthProperty";
-
-	Integer getSpecifiedLength();
-	void setSpecifiedLength(Integer value);
-		String SPECIFIED_LENGTH_PROPERTY = "spcifiedLengthProperty";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/DiscriminatorType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/DiscriminatorType.java
deleted file mode 100644
index ee146f5c98..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/DiscriminatorType.java
+++ /dev/null
@@ -1,92 +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.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.
- */
-public enum DiscriminatorType {
-
-	STRING,
-	CHAR,
-	INTEGER;
-	
-
-	public static DiscriminatorType fromJavaResourceModel(org.eclipse.jpt.core.resource.java.DiscriminatorType javaDiscriminatorType) {
-		if (javaDiscriminatorType == null) {
-			return null;
-		}
-		switch (javaDiscriminatorType) {
-			case STRING:
-				return STRING;
-			case CHAR:
-				return CHAR;
-			case INTEGER:
-				return INTEGER;
-			default:
-				throw new IllegalArgumentException("unknown discriminator type: " + javaDiscriminatorType);
-		}
-	}
-	
-	public static org.eclipse.jpt.core.resource.java.DiscriminatorType toJavaResourceModel(DiscriminatorType discriminatorType) {
-		if (discriminatorType == null) {
-			return null;
-		}
-		switch (discriminatorType) {
-			case STRING:
-				return org.eclipse.jpt.core.resource.java.DiscriminatorType.STRING;
-			case CHAR:
-				return org.eclipse.jpt.core.resource.java.DiscriminatorType.CHAR;
-			case INTEGER:
-				return org.eclipse.jpt.core.resource.java.DiscriminatorType.INTEGER;
-			default:
-				throw new IllegalArgumentException("unknown discriminator type: " + discriminatorType);
-		}
-	}
-
-	public static DiscriminatorType fromOrmResourceModel(org.eclipse.jpt.core.resource.orm.DiscriminatorType ormDiscriminatorType) {
-		if (ormDiscriminatorType == null) {
-			return null;
-		}
-		switch (ormDiscriminatorType) {
-			case STRING:
-				return STRING;
-			case CHAR:
-				return CHAR;
-			case INTEGER:
-				return INTEGER;
-			default:
-				throw new IllegalArgumentException("unknown discriminator type: " + ormDiscriminatorType);
-		}
-	}
-	
-	public static org.eclipse.jpt.core.resource.orm.DiscriminatorType toOrmResourceModel(DiscriminatorType discriminatorType) {
-		if (discriminatorType == null) {
-			return null;
-		}
-		switch (discriminatorType) {
-			case STRING:
-				return org.eclipse.jpt.core.resource.orm.DiscriminatorType.STRING;
-			case CHAR:
-				return org.eclipse.jpt.core.resource.orm.DiscriminatorType.CHAR;
-			case INTEGER:
-				return org.eclipse.jpt.core.resource.orm.DiscriminatorType.INTEGER;
-			default:
-				throw new IllegalArgumentException("unknown discriminator type: " + discriminatorType);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Embeddable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Embeddable.java
deleted file mode 100644
index e5f4d18328..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Embeddable.java
+++ /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
- ******************************************************************************/
-package org.eclipse.jpt.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.
- */
-public interface Embeddable extends TypeMapping {
-	// nothing yet
-}
-
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/EmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/EmbeddedIdMapping.java
deleted file mode 100644
index 98f71d1f56..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/EmbeddedIdMapping.java
+++ /dev/null
@@ -1,24 +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.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.
- */
-public interface EmbeddedIdMapping extends BaseEmbeddedMapping
-{
-	//nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/EmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/EmbeddedMapping.java
deleted file mode 100644
index 98fa513f0f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/EmbeddedMapping.java
+++ /dev/null
@@ -1,24 +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.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.
- */
-public interface EmbeddedMapping extends BaseEmbeddedMapping
-{
-	//nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Entity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Entity.java
deleted file mode 100644
index f77db82793..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Entity.java
+++ /dev/null
@@ -1,285 +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.core.context;
-
-import java.util.ListIterator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 Entity extends TypeMapping, GeneratorHolder, QueryHolder, IdClass
-{
-	// **************** name **************************************
-
-	/**
-	 * Return the name, specified or default if not specified.
-	 */
-	String getName();
-	
-	/**
-	 * Return the specified name.
-	 */
-	String getSpecifiedName();
-	
-	/**
-	 * Set the specified name on the entity.
-	 */
-	void setSpecifiedName(String value);
-		String SPECIFIED_NAME_PROPERTY = "specifiedNameProperty";
-	
-	/**
-	 * Return the default name, based on the class name.
-	 */
-	String getDefaultName();
-		String DEFAULT_NAME_PROPERTY = "defaultNameProperty";
-
-	
-	// **************** table **************************************
-	
-	/**
-	 * Return the table for this entity, either specified or default.
-	 * This will not be null.
-	 */
-	Table getTable();
-
-
-	// **************** secondary tables **************************************
-
-	/**
-	 * Return a list iterator of the secondary tables whether specified or default.
-	 * This will not be null.
-	 */
-	<T extends SecondaryTable> ListIterator<T> secondaryTables();
-	
-	/**
-	 * Return the number of secondary tables, both specified and default.
-	 */
-	int secondaryTablesSize();
-	
-	/**
-	 * Return a list iterator of the specified secondary tables.
-	 * This will not be null.
-	 */
-	<T extends SecondaryTable> ListIterator<T> specifiedSecondaryTables();
-	
-	/**
-	 * Return the number of specified secondary tables.
-	 */
-	int specifiedSecondaryTablesSize();
-	
-	/**
-	 * Add a specified secondary table to the entity return the object 
-	 * representing it.
-	 */
-	SecondaryTable addSpecifiedSecondaryTable(int index);
-	
-	/**
-	 * Remove the specified secondary table from the entity.
-	 */
-	void removeSpecifiedSecondaryTable(int index);
-	
-	/**
-	 * Remove the specified secondary table at the index from the entity.
-	 */
-	void removeSpecifiedSecondaryTable(SecondaryTable secondaryTable);
-	
-	/**
-	 * Move the specified secondary table from the source index to the target index.
-	 */
-	void moveSpecifiedSecondaryTable(int targetIndex, int sourceIndex);
-		String SPECIFIED_SECONDARY_TABLES_LIST = "specifiedSecondaryTablesList";
-	
-		
-	// **************** inheritance strategy **************************************
-	
-	InheritanceType getInheritanceStrategy();
-	
-	InheritanceType getDefaultInheritanceStrategy();
-		String DEFAULT_INHERITANCE_STRATEGY_PROPERTY = "defaultInheritanceStrategyProperty";
-		
-	InheritanceType getSpecifiedInheritanceStrategy();
-	void setSpecifiedInheritanceStrategy(InheritanceType newInheritanceType);
-		String SPECIFIED_INHERITANCE_STRATEGY_PROPERTY = "specifiedInheritanceStrategyProperty";
-	
-		
-	// **************** discriminator column **************************************
-		
-	DiscriminatorColumn getDiscriminatorColumn();
-
-	
-	// **************** discriminator value **************************************
-	
-	String getDiscriminatorValue();
-	
-	String getDefaultDiscriminatorValue();
-		String DEFAULT_DISCRIMINATOR_VALUE_PROPERTY = "defaultDiscriminatorValueProperty";
-
-	String getSpecifiedDiscriminatorValue();
-	void setSpecifiedDiscriminatorValue(String value);
-		String SPECIFIED_DISCRIMINATOR_VALUE_PROPERTY = "specifiedDiscriminatorValueProperty";
-
-	/**
-	 * Return whether a DiscriminatorValue is allowed for this Entity
-	 * It is allowed if the IType is concrete (not abstract)
-	 */
-	boolean isDiscriminatorValueAllowed();
- 		String DISCRIMINATOR_VALUE_ALLOWED_PROPERTY = "discriminatorValueAllowedProperty";
-
-	
-	// **************** primary key join columns **************************************
-
-	<T extends PrimaryKeyJoinColumn> ListIterator<T> primaryKeyJoinColumns();
-
-	int primaryKeyJoinColumnsSize();
-
-	<T extends PrimaryKeyJoinColumn> ListIterator<T> specifiedPrimaryKeyJoinColumns();
-		String SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST = "specifiedPrimaryKeyJoinColumnsList";
-
-	int specifiedPrimaryKeyJoinColumnsSize();
-
-	PrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn();
-		String DEFAULT_PRIMARY_KEY_JOIN_COLUMN = "defaultPrimaryKeyJoinColumn";
-
-	PrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index);
-
-	void removeSpecifiedPrimaryKeyJoinColumn(int index);
-
-	void removeSpecifiedPrimaryKeyJoinColumn(PrimaryKeyJoinColumn primaryKeyJoinColumn);
-
-	void moveSpecifiedPrimaryKeyJoinColumn(int targetIndex, int sourceIndex);
-
-	
-	// **************** attribute overrides **************************************
-
-	/**
-	 * Return a list iterator of the attribute overrides whether specified or default.
-	 * This will not be null.
-	 */
-	<T extends AttributeOverride> ListIterator<T> attributeOverrides();
-	
-	/**
-	 * Return the number of attribute overrides, both specified and default.
-	 */
-	int attributeOverridesSize();
-
-	/**
-	 * Return a list iterator of the specified attribute overrides.
-	 * This will not be null.  No add/remove for specified attribute overrides, the
-	 * virtual attribute overrides will be populated from superclasses, then use
-	 * {@link AttributeOverride#setVirtual(boolean)} to add/remove the attribute
-	 * override from the source
-	 */
-	<T extends AttributeOverride> ListIterator<T> specifiedAttributeOverrides();
-	
-	/**
-	 * Return the number of specified attribute overrides.
-	 */
-	int specifiedAttributeOverridesSize();
-
-	/**
-	 * Return a list iterator of the virtual attribute overrides, those not specified.
-	 * This will not be null.
-	 */
-	<T extends AttributeOverride> ListIterator<T> virtualAttributeOverrides();
-
-	/**
-	 * Return the number of default attribute overrides.
-	 */
-	int virtualAttributeOverridesSize();
-	
-	/**
-	 * Move the specified attribute override from the source index to the target index.
-	 */
-	void moveSpecifiedAttributeOverride(int targetIndex, int sourceIndex);
-		String SPECIFIED_ATTRIBUTE_OVERRIDES_LIST = "specifiedAttributeOverridesList";
-		String VIRTUAL_ATTRIBUTE_OVERRIDES_LIST = "virtualAttributeOverridesList";
-
-	/**
-	 * Return the attribute overrides, whether specified or default,
-	 * with the given name.
-	 */
-	AttributeOverride getAttributeOverrideNamed(String name);
-
-	// **************** association overrides **************************************
-	
-	/**
-	 * Return a list iterator of the association overrides whether specified or default.
-	 * This will not be null.
-	 */
-	<T extends AssociationOverride> ListIterator<T> associationOverrides();
-	
-	/**
-	 * Return the number of association overrides, both specified and default.
-	 */
-	int associationOverridesSize();
-	
-	/**
-	 * Return a list iterator of the specified association overrides.
-	 * This will not be null.  No add/remove for specified association overrides, the
-	 * virtual association overrides will be populated from superclasses, then use
-	 * {@link AssociationOverride#setVirtual(boolean)} to add/remove the association
-	 * override from the source
-	 */
-	<T extends AssociationOverride> ListIterator<T> specifiedAssociationOverrides();
-	
-	/**
-	 * Return the number of specified association overrides.
-	 */
-	int specifiedAssociationOverridesSize();
-
-	/**
-	 * Return the number of default association overrides.
-	 */
-	<T extends AssociationOverride> ListIterator<T> virtualAssociationOverrides();
-
-	/**
-	 * Return the number of default association overrides.
-	 */
-	int virtualAssociationOverridesSize();
-
-	/**
-	 * Move the specified association override from the source index to the target index.
-	 */
-	void moveSpecifiedAssociationOverride(int targetIndex, int sourceIndex);
-		String SPECIFIED_ASSOCIATION_OVERRIDES_LIST = "specifiedAssociationOverridesList";
-		String VIRTUAL_ASSOCIATION_OVERRIDES_LIST = "virtualAssociationOverridesList";
-
-	/**
-	 * Return the ultimate top of the inheritance hierarchy 
-	 * This method should never return null. The root
-	 * is defined as the persistent type in the inheritance hierarchy
-	 * that has no parent.  The root should be an entity
-	 *  
-	 * Non-entities in the hierarchy should be ignored, ie skip
-	 * over them in the search for the root. 
-	 */
-	Entity getRootEntity();
-
-	/**
-	 * The first parent in the class hierarchy that is an entity. 
-	 * This is the parent in the entity (persistent) inheritance hierarchy
-	 * (vs class inheritance hierarchy)
-	 */
-	Entity getParentEntity();
-
-	/**
-	 * Return the name of the entity's primary key column.
-	 * Return null if the entity's primary key is "compound"
-	 * (i.e. the primary key is composed of multiple columns).
-	 */
-	String getPrimaryKeyColumnName();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/EnumType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/EnumType.java
deleted file mode 100644
index 09fab0ab60..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/EnumType.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.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.
- */
-public enum EnumType {
-
-	ORDINAL,
-	STRING;
-	
-
-	public static EnumType fromJavaResourceModel(org.eclipse.jpt.core.resource.java.EnumType javaEnumType) {
-		if (javaEnumType == null) {
-			return null;
-		}
-		switch (javaEnumType) {
-			case ORDINAL:
-				return ORDINAL;
-			case STRING:
-				return STRING;
-			default:
-				throw new IllegalArgumentException("unknown enum type: " + javaEnumType);
-		}
-	}
-	
-	public static org.eclipse.jpt.core.resource.java.EnumType toJavaResourceModel(EnumType enumType) {
-		if (enumType == null) {
-			return null;
-		}
-		switch (enumType) {
-			case ORDINAL:
-				return org.eclipse.jpt.core.resource.java.EnumType.ORDINAL;
-			case STRING:
-				return org.eclipse.jpt.core.resource.java.EnumType.STRING;
-			default:
-				throw new IllegalArgumentException("unknown enum type: " + enumType);
-		}
-	}
-	
-
-	public static EnumType fromOrmResourceModel(org.eclipse.jpt.core.resource.orm.EnumType ormEnumType) {
-		if (ormEnumType == null) {
-			return null;
-		}
-		switch (ormEnumType) {
-			case ORDINAL:
-				return ORDINAL;
-			case STRING:
-				return STRING;
-			default:
-				throw new IllegalArgumentException("unknown enum type: " + ormEnumType);
-		}
-	}
-	
-	public static org.eclipse.jpt.core.resource.orm.EnumType toOrmResourceModel(EnumType enumType) {
-		if (enumType == null) {
-			return null;
-		}
-		switch (enumType) {
-			case ORDINAL:
-				return org.eclipse.jpt.core.resource.orm.EnumType.ORDINAL;
-			case STRING:
-				return org.eclipse.jpt.core.resource.orm.EnumType.STRING;
-			default:
-				throw new IllegalArgumentException("unknown enum type: " + enumType);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/FetchType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/FetchType.java
deleted file mode 100644
index 86aadee6d3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/FetchType.java
+++ /dev/null
@@ -1,84 +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.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.
- */
-public enum FetchType {
-
-	EAGER,
-	LAZY;
-	
-
-	public static FetchType fromJavaResourceModel(org.eclipse.jpt.core.resource.java.FetchType javaFetchType) {
-		if (javaFetchType == null) {
-			return null;
-		}
-		switch (javaFetchType) {
-			case EAGER:
-				return EAGER;
-			case LAZY:
-				return LAZY;
-			default:
-				throw new IllegalArgumentException("unknown fetch type: " + javaFetchType);
-		}
-	}
-
-	public static org.eclipse.jpt.core.resource.java.FetchType toJavaResourceModel(FetchType fetchType) {
-		if (fetchType == null) {
-			return null;
-		}
-		switch (fetchType) {
-			case EAGER:
-				return org.eclipse.jpt.core.resource.java.FetchType.EAGER;
-			case LAZY:
-				return org.eclipse.jpt.core.resource.java.FetchType.LAZY;
-			default:
-				throw new IllegalArgumentException("unknown fetch type: " + fetchType);
-		}
-	}
-	
-
-	public static FetchType fromOrmResourceModel(org.eclipse.jpt.core.resource.orm.FetchType ormFetchType) {
-		if (ormFetchType == null) {
-			return null;
-		}
-		switch (ormFetchType) {
-			case EAGER:
-				return EAGER;
-			case LAZY:
-				return LAZY;
-			default:
-				throw new IllegalArgumentException("unknown fetch type: " + ormFetchType);
-		}
-	}
-	
-	public static org.eclipse.jpt.core.resource.orm.FetchType toOrmResourceModel(FetchType fetchType) {
-		if (fetchType == null) {
-			return null;
-		}
-		switch (fetchType) {
-			case EAGER:
-				return org.eclipse.jpt.core.resource.orm.FetchType.EAGER;
-			case LAZY:
-				return org.eclipse.jpt.core.resource.orm.FetchType.LAZY;
-			default:
-				throw new IllegalArgumentException("unknown fetch type: " + fetchType);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Fetchable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Fetchable.java
deleted file mode 100644
index 87e3d2adfc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Fetchable.java
+++ /dev/null
@@ -1,32 +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.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.
- */
-public interface Fetchable extends AttributeMapping
-{
-	FetchType getFetch();
-
-	FetchType getDefaultFetch();
-		String DEFAULT_FETCH_PROPERTY = "defaultFetchProperty";
-		
-	FetchType getSpecifiedFetch();
-	void setSpecifiedFetch(FetchType newSpecifiedFetch);
-		String SPECIFIED_FETCH_PROPERTY = "specifiedFetchProperty";
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/GeneratedValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/GeneratedValue.java
deleted file mode 100644
index bfd873f0f8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/GeneratedValue.java
+++ /dev/null
@@ -1,39 +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.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.
- */
-public interface GeneratedValue extends JpaContextNode
-{
-
-	GenerationType getStrategy();
-	GenerationType getDefaultStrategy();
-	GenerationType getSpecifiedStrategy();
-	void setSpecifiedStrategy(GenerationType value);
-		String SPECIFIED_STRATEGY_PROPERTY = "specifiedStrategyProperty";
-		String DEFAULT_STRATEGY_PROPERTY = "defaultStrategyProperty";
-	
-	String getGenerator();
-	String getDefaultGenerator();
-		GenerationType DEFAULT_STRATEGY = GenerationType.AUTO;
-	String getSpecifiedGenerator();
-	void setSpecifiedGenerator(String value);
-		String SPECIFIED_GENERATOR_PROPERTY = "specifiedGeneratorProperty";
-		String DEFAULT_GENERATOR_PROPERTY = "defaultGeneratorProperty";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/GenerationType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/GenerationType.java
deleted file mode 100644
index d46990d054..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/GenerationType.java
+++ /dev/null
@@ -1,100 +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.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.
- */
-public enum GenerationType {
-
-	TABLE,
-	SEQUENCE,
-	IDENTITY,
-	AUTO;
-	
-
-	public static GenerationType fromJavaResourceModel(org.eclipse.jpt.core.resource.java.GenerationType javaGenerationType) {
-		if (javaGenerationType == null) {
-			return null;
-		}
-		switch (javaGenerationType) {
-			case TABLE:
-				return TABLE;
-			case SEQUENCE:
-				return SEQUENCE;
-			case IDENTITY:
-				return IDENTITY;
-			case AUTO:
-				return AUTO;
-			default:
-				throw new IllegalArgumentException("unknown generation type: " + javaGenerationType);
-		}
-	}
-	
-	public static org.eclipse.jpt.core.resource.java.GenerationType toJavaResourceModel(GenerationType generationType) {
-		if (generationType == null) {
-			return null;
-		}
-		switch (generationType) {
-			case TABLE:
-				return org.eclipse.jpt.core.resource.java.GenerationType.TABLE;
-			case SEQUENCE:
-				return org.eclipse.jpt.core.resource.java.GenerationType.SEQUENCE;
-			case IDENTITY:
-				return org.eclipse.jpt.core.resource.java.GenerationType.IDENTITY;
-			case AUTO:
-				return org.eclipse.jpt.core.resource.java.GenerationType.AUTO;
-			default:
-				throw new IllegalArgumentException("unknown generation type: " + generationType);
-		}
-	}
-
-	public static GenerationType fromOrmResourceModel(org.eclipse.jpt.core.resource.orm.GenerationType ormGenerationType) {
-		if (ormGenerationType == null) {
-			return null;
-		}
-		switch (ormGenerationType) {
-			case TABLE:
-				return TABLE;
-			case SEQUENCE:
-				return SEQUENCE;
-			case IDENTITY:
-				return IDENTITY;
-			case AUTO:
-				return AUTO;
-			default:
-				throw new IllegalArgumentException("unknown generation type: " + ormGenerationType);
-		}
-	}
-	
-	public static org.eclipse.jpt.core.resource.orm.GenerationType toOrmResourceModel(GenerationType generationType) {
-		if (generationType == null) {
-			return null;
-		}
-		switch (generationType) {
-			case TABLE:
-				return org.eclipse.jpt.core.resource.orm.GenerationType.TABLE;
-			case SEQUENCE:
-				return org.eclipse.jpt.core.resource.orm.GenerationType.SEQUENCE;
-			case IDENTITY:
-				return org.eclipse.jpt.core.resource.orm.GenerationType.IDENTITY;
-			case AUTO:
-				return org.eclipse.jpt.core.resource.orm.GenerationType.AUTO;
-			default:
-				throw new IllegalArgumentException("unknown generation type: " + generationType);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Generator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Generator.java
deleted file mode 100644
index 8380acf985..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Generator.java
+++ /dev/null
@@ -1,77 +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.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.
- */
-public interface Generator extends JpaContextNode
-{
-	// **************** name ***************************************************
-	
-	String NAME_PROPERTY = "nameProperty";
-	
-	String getName();
-	
-	void setName(String value);
-	
-	
-	// **************** initial value ******************************************
-	
-	Integer getInitialValue();
-	
-	String DEFAULT_INITIAL_VALUE_PROPERTY = "defaultInitialValueProperty";
-	
-	Integer getDefaultInitialValue();
-	
-	String SPECIFIED_INITIAL_VALUE_PROPERTY = "specifiedInitialValueProperty";
-	
-	Integer getSpecifiedInitialValue();
-	
-	void setSpecifiedInitialValue(Integer value);
-	
-	
-	// **************** allocation size ****************************************
-	
-	Integer getAllocationSize();
-	
-	String DEFAULT_ALLOCATION_SIZE_PROPERTY = "defaultAllocationSizeProperty";
-	
-	Integer DEFAULT_ALLOCATION_SIZE = Integer.valueOf(50);
-	
-	Integer getDefaultAllocationSize();
-		
-	String SPECIFIED_ALLOCATION_SIZE_PROPERTY = "specifiedAllocationSizeProperty";
-	
-	Integer getSpecifiedAllocationSize();
-	
-	void setSpecifiedAllocationSize(Integer value);
-	
-	
-	// **************** validation *********************************************
-	
-	/**
-	 * Return true if this generator overrides the definition of the specified
-	 * generator
-	 * (for example, a generator defined in orm.xml overrides one defined in java)
-	 */
-	boolean overrides(Generator generator);
-	
-	
-	boolean isVirtual();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/GeneratorHolder.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/GeneratorHolder.java
deleted file mode 100644
index 6964efd961..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/GeneratorHolder.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.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.
- */
-public interface GeneratorHolder extends JpaContextNode
-{
-	//******************** table generator *****************
-	TableGenerator getTableGenerator();
-
-	TableGenerator addTableGenerator();
-
-	void removeTableGenerator();
-
-	String TABLE_GENERATOR_PROPERTY = "tableGeneratorProperty";
-
-	
-	//******************** sequence generator *****************
-	SequenceGenerator getSequenceGenerator();
-
-	SequenceGenerator addSequenceGenerator();
-
-	void removeSequenceGenerator();
-
-	String SEQUENCE_GENERATOR_PROPERTY = "sequenceGeneratorProperty";
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/IdClass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/IdClass.java
deleted file mode 100644
index 352ae27e6e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/IdClass.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.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.
- */
-public interface IdClass extends JpaContextNode
-{
-	String getIdClass();
-	
-	void setIdClass(String value);
-	
-		String ID_CLASS_PROPERTY = "idClassProperty";
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/IdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/IdMapping.java
deleted file mode 100644
index 5f3f7d75df..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/IdMapping.java
+++ /dev/null
@@ -1,28 +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.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.
- */
-public interface IdMapping extends AttributeMapping, ColumnMapping, GeneratorHolder
-{
-	GeneratedValue getGeneratedValue();
-	GeneratedValue addGeneratedValue();
-	void removeGeneratedValue();
-		String GENERATED_VALUE_PROPERTY = "generatedValueProperty";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/InheritanceType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/InheritanceType.java
deleted file mode 100644
index a84b805c12..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/InheritanceType.java
+++ /dev/null
@@ -1,94 +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.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.
- */
-public enum InheritanceType {
-
-
-	SINGLE_TABLE,
-	JOINED,
-	TABLE_PER_CLASS;
-
-
-	public static InheritanceType fromJavaResourceModel(org.eclipse.jpt.core.resource.java.InheritanceType javaInheritanceType) {
-		if (javaInheritanceType == null) {
-			return null;
-		}
-		switch (javaInheritanceType) {
-			case SINGLE_TABLE:
-				return SINGLE_TABLE;
-			case JOINED:
-				return JOINED;
-			case TABLE_PER_CLASS:
-				return TABLE_PER_CLASS;
-			default:
-				throw new IllegalArgumentException("unknown inheritance type: " + javaInheritanceType);
-		}
-	}
-	
-	public static org.eclipse.jpt.core.resource.java.InheritanceType toJavaResourceModel(InheritanceType inheritanceType) {
-		if (inheritanceType == null) {
-			return null;
-		}
-		switch (inheritanceType) {
-			case SINGLE_TABLE:
-				return org.eclipse.jpt.core.resource.java.InheritanceType.SINGLE_TABLE;
-			case JOINED:
-				return org.eclipse.jpt.core.resource.java.InheritanceType.JOINED;
-			case TABLE_PER_CLASS:
-				return org.eclipse.jpt.core.resource.java.InheritanceType.TABLE_PER_CLASS;
-			default:
-				throw new IllegalArgumentException("unknown inheritance type: " + inheritanceType);
-		}
-	}
-	
-
-	public static InheritanceType fromOrmResourceModel(org.eclipse.jpt.core.resource.orm.InheritanceType ormInheritanceType) {
-		if (ormInheritanceType == null) {
-			return null;
-		}
-		switch (ormInheritanceType) {
-			case SINGLE_TABLE:
-				return SINGLE_TABLE;
-			case JOINED:
-				return JOINED;
-			case TABLE_PER_CLASS:
-				return TABLE_PER_CLASS;
-			default:
-				throw new IllegalArgumentException("unknown inheritance type: " + ormInheritanceType);
-		}
-	}
-	
-	public static org.eclipse.jpt.core.resource.orm.InheritanceType toOrmResourceModel(InheritanceType inheritanceType) {
-		if (inheritanceType == null) {
-			return null;
-		}
-		switch (inheritanceType) {
-			case SINGLE_TABLE:
-				return org.eclipse.jpt.core.resource.orm.InheritanceType.SINGLE_TABLE;
-			case JOINED:
-				return org.eclipse.jpt.core.resource.orm.InheritanceType.JOINED;
-			case TABLE_PER_CLASS:
-				return org.eclipse.jpt.core.resource.orm.InheritanceType.TABLE_PER_CLASS;
-			default:
-				throw new IllegalArgumentException("unknown inheritance type: " + inheritanceType);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinColumn.java
deleted file mode 100644
index 948a12016d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinColumn.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.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.
- */
-public interface JoinColumn extends BaseColumn, BaseJoinColumn
-{
-	JoinColumn.Owner getOwner();
-
-	/**
-	 * interface allowing join columns to be used in multiple places
-	 * (e.g. 1:1 mappings and join tables)
-	 */
-	interface Owner extends BaseJoinColumn.Owner, BaseColumn.Owner
-	{
-		/**
-		 * return whether the specified table cannot be explicitly specified
-		 * in the join column's 'table' element
-		 */
-		boolean tableNameIsInvalid(String tableName);
-
-		/**
-		 * return whether the join column's table can be specified explicitly
-		 */
-		boolean tableIsAllowed();
-
-		/**
-		 * return the entity referenced by the join column
-		 */
-		Entity getTargetEntity();
-
-		/**
-		 * return the join column's attribute name
-		 */
-		String getAttributeName();
-
-		/**
-		 * return the relationship mapping for this join column
-		 */
-		RelationshipMapping getRelationshipMapping();
-		
-		/**
-		 * return the size of the joinColumns collection this join column is a part of
-		 */
-		int joinColumnsSize();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinTable.java
deleted file mode 100644
index ce132fe7be..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinTable.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.core.context;
-
-import java.util.ListIterator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JoinTable extends Table
-{
-
-	RelationshipMapping getParent();
-	
-	// **************** join columns **************************************
-	
-	/**
-	 * Return a list iterator of the join columns whether specified or default.
-	 * This will not be null.
-	 */
-	<T extends JoinColumn> ListIterator<T> joinColumns();
-
-	/**
-	 * Return the number of join columns, both specified and default.
-	 */
-	int joinColumnsSize();
-	
-	/**
-	 * Return a list iterator of the specified join columns.
-	 * This will not be null.
-	 */
-	<T extends JoinColumn> ListIterator<T> specifiedJoinColumns();
-		String SPECIFIED_JOIN_COLUMNS_LIST = "specifiedJoinColumnsList";
-	
-	/**
-	 * Return the number of specified join columns.
-	 */
-	int specifiedJoinColumnsSize();
-
-	/**
-	 * Return the default join column or null.  A default join column
-	 * only exists if there are no specified join columns.
-	 */
-	JoinColumn getDefaultJoinColumn();
-		String DEFAULT_JOIN_COLUMN = "defaultJoinColumn";
-		
-	/**
-	 * Add a specified join column to the join table return the object 
-	 * representing it.
-	 */
-	JoinColumn addSpecifiedJoinColumn(int index);
-	
-	/**
-	 * Remove the specified join column from the join table.
-	 */
-	void removeSpecifiedJoinColumn(int index);
-	
-	/**
-	 * Remove the specified join column at the index from the join table.
-	 */
-	void removeSpecifiedJoinColumn(JoinColumn joinColumn);
-	
-	/**
-	 * Move the specified join column from the source index to the target index.
-	 */
-	void moveSpecifiedJoinColumn(int targetIndex, int sourceIndex);
-	
-	boolean containsSpecifiedJoinColumns();
-	
-
-	// **************** inverse join columns **************************************
-	
-	/**
-	 * Return a list iterator of the inverse join columns whether specified or default.
-	 * This will not be null.
-	 */
-	<T extends JoinColumn> ListIterator<T> inverseJoinColumns();
-	
-	/**
-	 * Return the number of inverse join columns, both specified and default.
-	 */
-	int inverseJoinColumnsSize();
-	
-	/**
-	 * Return a list iterator of the specified inverse join columns.
-	 * This will not be null.
-	 */
-	<T extends JoinColumn> ListIterator<T> specifiedInverseJoinColumns();
-		String SPECIFIED_INVERSE_JOIN_COLUMNS_LIST = "specifiedInverseJoinColumnsList";
-	
-	/**
-	 * Return the number of specified inverse join columns.
-	 */
-	int specifiedInverseJoinColumnsSize();
-
-	/**
-	 * Return the default inverse join column or null.  A default inverse join column
-	 * only exists if there are no specified inverse join columns.
-	 */
-	JoinColumn getDefaultInverseJoinColumn();
-		String DEFAULT_INVERSE_JOIN_COLUMN = "defaultInverseJoinColumn";
-	
-	/**
-	 * Add a specified inverse join column to the join table return the object 
-	 * representing it.
-	 */
-	JoinColumn addSpecifiedInverseJoinColumn(int index);
-	
-	/**
-	 * Remove the specified inverse join column from the join table.
-	 */
-	void removeSpecifiedInverseJoinColumn(int index);
-	
-	/**
-	 * Remove the specified inverse join column at the index from the join table.
-	 */
-	void removeSpecifiedInverseJoinColumn(JoinColumn joinColumn);
-	
-	
-	/**
-	 * Move the specified inverse join column from the source index to the target index.
-	 */
-	void moveSpecifiedInverseJoinColumn(int targetIndex, int sourceIndex);
-
-	boolean containsSpecifiedInverseJoinColumns();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JpaContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JpaContextNode.java
deleted file mode 100644
index c1cf53d5de..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JpaContextNode.java
+++ /dev/null
@@ -1,37 +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.core.context;
-
-import org.eclipse.jpt.core.JpaNode;
-import org.eclipse.jpt.core.context.orm.EntityMappings;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JpaContextNode extends JpaNode
-{
-	PersistenceUnit getPersistenceUnit();
-	
-	/**
-	 * Return the EntityMappings if this contextNode is within an orm.xml context
-	 * Return null otherwise.
-	 */
-	EntityMappings getEntityMappings();
-
-	OrmPersistentType getOrmPersistentType();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JpaRootContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JpaRootContextNode.java
deleted file mode 100644
index fa73eef97f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JpaRootContextNode.java
+++ /dev/null
@@ -1,69 +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.core.context;
-
-import java.util.List;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jpt.core.context.persistence.PersistenceXml;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JpaRootContextNode extends JpaContextNode
-{
-	/**
-	 * String constant associated with changes to the persistenceXml property
-	 */
-	public final static String PERSISTENCE_XML_PROPERTY = "persistenceXml";
-	
-	/** 
-	 * Return the content represented by the persistence.xml file associated with 
-	 * this project.
-	 * This may be null. 
-	 */
-	PersistenceXml getPersistenceXml();
-	
-	/**
-	 * Add a persistence.xml file to this content and return the content associated
-	 * with it.
-	 * Throws {@link IllegalStateException} if a persistence.xml already exists.
-	 */
-	PersistenceXml addPersistenceXml();
-	
-	/**
-	 * Remove the persistence.xml file from this content.
-	 * Throws {@link IllegalStateException} if a persistence.xml does not exist.
-	 */
-	void removePersistenceXml();
-	
-	
-	// **************** updating ***********************************************
-	
-	/**
-	 * Update the context model with the content of the JPA project
-	 */
-	void update(IProgressMonitor monitor);
-	
-	
-	// **************** validation *********************************************
-	
-	/**
-	 * All subclass implementations {@link #addToMessages(List<IMessage>)} 
-	 * should be preceded by a "super" call to this method
-	 */
-	public void addToMessages(List<IMessage> messages);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/ManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/ManyToManyMapping.java
deleted file mode 100644
index 7fac7a8a83..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/ManyToManyMapping.java
+++ /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
- ******************************************************************************/
-package org.eclipse.jpt.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.
- */
-public interface ManyToManyMapping extends MultiRelationshipMapping
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/ManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/ManyToOneMapping.java
deleted file mode 100644
index c28576c1a9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/ManyToOneMapping.java
+++ /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
- ******************************************************************************/
-package org.eclipse.jpt.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.
- */
-public interface ManyToOneMapping extends SingleRelationshipMapping
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/MappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/MappedSuperclass.java
deleted file mode 100644
index af4ec25b87..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/MappedSuperclass.java
+++ /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
- ******************************************************************************/
-package org.eclipse.jpt.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.
- */
-public interface MappedSuperclass extends TypeMapping, IdClass
-{
-	//nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/MultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/MultiRelationshipMapping.java
deleted file mode 100644
index dd1141aff4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/MultiRelationshipMapping.java
+++ /dev/null
@@ -1,55 +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.core.context;
-
-import java.util.Iterator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 MultiRelationshipMapping extends NonOwningMapping
-{
-	FetchType DEFAULT_FETCH_TYPE = FetchType.LAZY;
-
-	String getOrderBy();
-	void setOrderBy(String value);
-		String ORDER_BY_PROPERTY = "orderByProperty";
-
-
-	boolean isNoOrdering();
-	void setNoOrdering(boolean newNoOrdering);
-		String NO_ORDERING_PROPERTY = "noOrderingProperty";
-
-	boolean isPkOrdering();
-	void setPkOrdering(boolean newPkOrdering);
-	String PK_ORDERING_PROPERTY = "pkOrderingProperty";
-
-	boolean isCustomOrdering();
-	void setCustomOrdering(boolean newCustomOrdering);
-	String CUSTOM_ORDERING_PROPERTY = "customOrderingProperty";
-
-	
-	JoinTable getJoinTable();
-	
-	boolean isJoinTableSpecified();
-
-
-	String getMapKey();
-	void setMapKey(String value);
-		String MAP_KEY_PROPERTY = "mapKeyProperty";
-
-	Iterator<String> candidateMapKeyNames();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedColumn.java
deleted file mode 100644
index f9ca8245e1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedColumn.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.core.context;
-
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.db.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.
- */
-public interface NamedColumn extends JpaContextNode
-{
-	String getName();
-
-	String getDefaultName();
-		String DEFAULT_NAME_PROPERTY = "defaultNameProperty";
-
-	String getSpecifiedName();
-	void setSpecifiedName(String value);
-		String SPECIFIED_NAME_PROPERTY = "specifiedNameProperty";
-
-
-	String getColumnDefinition();
-
-	void setColumnDefinition(String value);
-		String COLUMN_DEFINITION_PROPERTY = "columnDefinitionProperty";
-
-
-	/**
-	 * Return the wrapper for the datasource column
-	 */
-	Column getDbColumn();
-
-	/**
-	 * Return the wrapper for the datasource table
-	 */
-	Table getDbTable();
-
-	/**
-	 * Return whether the column is found on the datasource.
-	 */
-	boolean isResolved();
-
-	Owner getOwner();
-	
-	/**
-	 * interface allowing columns to be used in multiple places
-	 * (e.g. basic mappings and attribute overrides)
-	 */
-	interface Owner
-	{
-		/**
-		 * Return the type mapping that contains the column.
-		 */
-		TypeMapping getTypeMapping();
-
-		/**
-		 * Return the wrapper for the datasource table for the given table name
-		 */
-		Table getDbTable(String tableName);
-		
-		/**
-		 * Return the default column name
-		 */
-		String getDefaultColumnName();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedNativeQuery.java
deleted file mode 100644
index f93e9ee565..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedNativeQuery.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.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.
- */
-public interface NamedNativeQuery extends Query
-{
-	String getResultClass();
-	void setResultClass(String value);
-		String RESULT_CLASS_PROPERTY = "resultClassProperty";
-
-	String getResultSetMapping();
-	void setResultSetMapping(String value);
-		String RESULT_SET_MAPPING_PROPERTY = "resultSetMappingProperty";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedQuery.java
deleted file mode 100644
index 8e9520c307..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedQuery.java
+++ /dev/null
@@ -1,23 +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.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.
- */
-public interface NamedQuery extends Query {
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NonOwningMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NonOwningMapping.java
deleted file mode 100644
index e83031bd0d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NonOwningMapping.java
+++ /dev/null
@@ -1,33 +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.core.context;
-
-import java.util.Iterator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 NonOwningMapping extends RelationshipMapping
-{
-	String getMappedBy();
-	void setMappedBy(String value);
-		String MAPPED_BY_PROPERTY = "mappedByProperty";
-
-	Iterator<String> candidateMappedByAttributeNames();
-
-	boolean mappedByIsValid(AttributeMapping mappedByMapping);
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Nullable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Nullable.java
deleted file mode 100644
index cc292f61a8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Nullable.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.core.context;
-
-
-/**
- * This interface is used for mappings that support the optional element.
- * From the JPA spec:
- * 		Whether the value of the field or property may be null. This is a hint 
- * 		and is disregarded for primitive types; it may be used in schema generation.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 Nullable extends AttributeMapping
-{
-	Boolean getOptional();
-	
-	Boolean getDefaultOptional();
-		String DEFAULT_OPTIONAL_PROPERTY = "defaultOptionalProperty";
-		Boolean DEFAULT_OPTIONAL = Boolean.TRUE;
-	
-	Boolean getSpecifiedOptional();
-	void setSpecifiedOptional(Boolean newSpecifiedOptional);
-		String SPECIFIED_OPTIONAL_PROPERTY = "specifiedOptionalProperty";
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/OneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/OneToManyMapping.java
deleted file mode 100644
index 339f2b8e98..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/OneToManyMapping.java
+++ /dev/null
@@ -1,23 +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.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.
- */
-public interface OneToManyMapping extends MultiRelationshipMapping {
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/OneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/OneToOneMapping.java
deleted file mode 100644
index c61607fbe8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/OneToOneMapping.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.core.context;
-
-import java.util.ListIterator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OneToOneMapping
-	extends SingleRelationshipMapping, NonOwningMapping
-{
-	// **************** primary key join columns **************************************
-
-	/**
-	 * Return a list iterator of the primary key join columns.
-	 * This will not be null.
-	 */
-	<T extends PrimaryKeyJoinColumn> ListIterator<T> primaryKeyJoinColumns();
-
-	/**
-	 * Return the number of join columns, both specified and default.
-	 */
-	int primaryKeyJoinColumnsSize();
-	/**
-	 * Add a specified join column to the join table return the object 
-	 * representing it.
-	 */
-	PrimaryKeyJoinColumn addPrimaryKeyJoinColumn(int index);
-	
-	/**
-	 * Remove the specified join column from the join table.
-	 */
-	void removePrimaryKeyJoinColumn(int index);
-	
-	/**
-	 * Remove the specified join column at the index from the join table.
-	 */
-	void removePrimaryKeyJoinColumn(PrimaryKeyJoinColumn primaryKeyJoinColumn);
-	
-	/**
-	 * Move the specified join column from the source index to the target index.
-	 */
-	void movePrimaryKeyJoinColumn(int targetIndex, int sourceIndex);
-
-	boolean containsPrimaryKeyJoinColumns();
-		String PRIMAY_KEY_JOIN_COLUMNS_LIST = "primaryKeyJoinColumnsList";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PersistentAttribute.java
deleted file mode 100644
index 4e5205fb4a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PersistentAttribute.java
+++ /dev/null
@@ -1,91 +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.core.context;
-
-import org.eclipse.jpt.core.JpaStructureNode;
-
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 PersistentAttribute extends JpaContextNode, JpaStructureNode
-{
-	String getName();
-		String NAME_PROPERTY = "nameProperty";
-
-	/**
-	 * Return the key for the attribute's mapping.
-	 * The key may be for either the "specified" mapping or, if the "specified"
-	 * mapping is missing, the "default" mapping.
-	 */
-	String getMappingKey();
-
-	/**
-	 * Return the key for the attribute's "default" mapping.
-	 */
-	String getDefaultMappingKey();
-
-	/**
-	 * Return the attribute's "specified" mapping, or if it is null
-	 * return the "default" mapping.  WIll not return null.
-	 */
-	AttributeMapping getMapping();
-
-	/**
-	 * Return the attribute's "specified" mapping, could be null
-	 */
-	AttributeMapping getSpecifiedMapping();
-	
-	/**
-	 * Clients should call this method to set the attribute's mapping.
-	 * Passing in a null key will cause the "specified" mapping to be
-	 * cleared and the attribute's mapping to be its "default" mapping.
-	 */
-	void setSpecifiedMappingKey(String key);
-		String SPECIFIED_MAPPING_PROPERTY = "specifiedMappingProperty";
-		String DEFAULT_MAPPING_PROPERTY = "defaultMappingProperty";
-	
-	TypeMapping getTypeMapping();
-
-	PersistentType getPersistentType();
-	
-	/**
-	 * If the attribute is mapped to a primary key column, return the
-	 * column's name, otherwise return null.
-	 */
-	String getPrimaryKeyColumnName();
-
-	/**
-	 * Return whether the attribute's "attribute" mapping can be overridden.
-	 */
-	boolean isOverridableAttribute();
-
-	/**
-	 * Return whether the attribute's "association" mapping can be overridden.
-	 */
-	boolean isOverridableAssociation();
-
-	/**
-	 * Return whether the attribute's "attribute" mapping is for an ID.
-	 */
-	boolean isIdAttribute();
-	
-	/**
-	 * Return whether this attribute actually has a textual representation
-	 * in its underlying resource (false = no)
-	 */
-	boolean isVirtual();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PersistentType.java
deleted file mode 100644
index 5d71d21075..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PersistentType.java
+++ /dev/null
@@ -1,109 +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.core.context;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 PersistentType extends JpaContextNode, JpaStructureNode
-{
-	String getName();
-		String NAME_PROPERTY = "nameProperty";
-	
-	AccessType getAccess();
-		String ACCESS_PROPERTY = "accessProperty";
-		
-	TypeMapping getMapping();
-	String getMappingKey();
-	void setMappingKey(String key);
-		String MAPPING_PROPERTY = "mappingProperty";
-
-	boolean isMapped();
-	
-
-	/**
-	 * Return the parent {@link PersistentType} from the inheritance hierarchy.
-	 * If the java inheritance parent is not a {@link PersistentType} then continue
-	 * up the hierarchy(the JPA spec allows non-persistent types to be part of the hierarchy.)  
-	 * Return null if this persistentType is the root persistent type. 
-	 * Example:
-	 * <pre>
-	 * &#64;Entity
-	 * public abstract class Model {}
-	 * <a>
-	 * public abstract class Animal extends Model {}
-	 * <a>
-	 * &#64;Entity
-	 * public class Cat extends Animal {}
-	 * </pre> 
-	 * 
-	 * If this is the Cat JavaPersistentType then parentPersistentType is the Model JavaPersistentType
-	 * The parentPersistentType could be found in java or xml.
-	 */
-	PersistentType getParentPersistentType();
-		String PARENT_PERSISTENT_TYPE_PROPERTY = "parentPersistentTypeProperty";
-
-	/**
-	 * Return a read-only iterator of the contained {@link PersistentAttribute}
-	 */
-	<T extends PersistentAttribute> ListIterator<T> attributes();
-	
-	/**
-	 * Return the size of {@link PersistentAttribute}s list
-	 * @return
-	 */
-	int attributesSize();
-		String SPECIFIED_ATTRIBUTES_LIST = "specifiedAttributesList";
-	
-	Iterator<String> attributeNames();
-
-	/**
-	 * Return a read-only iterator of the all the {@link PersistentAttribute}s
-	 * in the hierarchy
-	 */
-	Iterator<PersistentAttribute> allAttributes();
-
-	Iterator<String> allAttributeNames();
-
-	/**
-	 * Return the attribute named <code>attributeName</code> if
-	 * it exists locally on this type
-	 */
-	PersistentAttribute getAttributeNamed(String attributeName);
-
-	/**
-	 * Resolve and return the attribute named <code>attributeName</code> if it
-	 * is distinct and exists within the context of this type
-	 */
-	PersistentAttribute resolveAttribute(String attributeName);
-
-	Iterator<PersistentType> inheritanceHierarchy();
-	
-	
-	// **************** validation **************************************
-
-	/**
-	 * Add to the list of current validation messages
-	 */
-	void addToMessages(List<IMessage> messages);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PrimaryKeyJoinColumn.java
deleted file mode 100644
index 499917198d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PrimaryKeyJoinColumn.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.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.
- */
-public interface PrimaryKeyJoinColumn
-	extends BaseJoinColumn
-{
-	// nothing yet
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Query.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Query.java
deleted file mode 100644
index bc367f9ba4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Query.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.core.context;
-
-import java.util.ListIterator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 Query extends JpaContextNode
-{
-	// **************** name ***************************************************
-	
-	String NAME_PROPERTY = "nameProperty";
-	
-	String getName();
-	
-	void setName(String value);
-	
-	
-	//************************ query ***********************
-	
-	String QUERY_PROPERTY = "queryProperty";
-	
-	String getQuery();
-	
-	void setQuery(String value);
-	
-	
-	//************************ hints ***********************
-	
-	String HINTS_LIST = "hintsList";
-	
-	/**
-	 * Return a list iterator of the hints.  This will not be null.
-	 */
-	<T extends QueryHint> ListIterator<T> hints();
-	
-	/**
-	 * Return the number of hints.
-	 */
-	int hintsSize();
-	
-	/**
-	 * Add a hint to the query and return the object representing it.
-	 */
-	QueryHint addHint(int index);
-	
-	/**
-	 * Remove the hint from the query.
-	 */
-	void removeHint(int index);
-	
-	/**
-	 * Remove the hint at the index from the query.
-	 */
-	void removeHint(QueryHint queryHint);
-	
-	/**
-	 * Move the hint from the source index to the target index.
-	 */
-	void moveHint(int targetIndex, int sourceIndex);
-	
-	
-	// **************** validation *********************************************
-	
-	/**
-	 * Return true if this query overrides the definition of the specified
-	 * query
-	 * (for example, a query defined in orm.xml overrides one defined in java)
-	 */
-	boolean overrides(Query query);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/QueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/QueryHint.java
deleted file mode 100644
index a4f51c808e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/QueryHint.java
+++ /dev/null
@@ -1,32 +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.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.
- */
-public interface QueryHint extends JpaContextNode
-{
-
-	String getName();
-	void setName(String value);
-		String NAME_PROPERTY = "nameProperty";
-
-	String getValue();
-	void setValue(String value);
-		String VALUE_PROPERTY = "valueProperty";
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/QueryHolder.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/QueryHolder.java
deleted file mode 100644
index 97f0183066..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/QueryHolder.java
+++ /dev/null
@@ -1,90 +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.core.context;
-
-import java.util.ListIterator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 QueryHolder extends JpaContextNode
-{
-	/**
-	 * Return a list iterator of the named queries.
-	 * This will not be null.
-	 */
-	<T extends NamedQuery> ListIterator<T> namedQueries();
-
-	/**
-	 * Return the number of named queries.
-	 */
-	int namedQueriesSize();
-
-	/**
-	 * Add a named query to the entity return the object representing it.
-	 */
-	NamedQuery addNamedQuery(int index);
-
-	/**
-	 * Remove the named query at the index from the entity.
-	 */
-	void removeNamedQuery(int index);
-
-	/**
-	 * Remove the named query at from the entity.
-	 */
-	void removeNamedQuery(NamedQuery namedQuery);
-
-	/**
-	 * Move the named query from the source index to the target index.
-	 */
-	void moveNamedQuery(int targetIndex, int sourceIndex);
-
-	String NAMED_QUERIES_LIST = "namedQueriesList";
-
-	/**
-	 * Return a list iterator of the specified named native queries.
-	 * This will not be null.
-	 */
-	<T extends NamedNativeQuery> ListIterator<T> namedNativeQueries();
-
-	/**
-	 * Return the number of named native queries.
-	 */
-	int namedNativeQueriesSize();
-
-	/**
-	 * Add a named native query to the entity return the object representing it.
-	 */
-	NamedNativeQuery addNamedNativeQuery(int index);
-
-	/**
-	 * Remove the named native query at the index from the entity.
-	 */
-	void removeNamedNativeQuery(int index);
-
-	/**
-	 * Remove the named native query at from the entity.
-	 */
-	void removeNamedNativeQuery(NamedNativeQuery namedNativeQuery);
-
-	/**
-	 * Move the named native query from the source index to the target index.
-	 */
-	void moveNamedNativeQuery(int targetIndex, int sourceIndex);
-
-	String NAMED_NATIVE_QUERIES_LIST = "namedNativeQueriesList";
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/RelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/RelationshipMapping.java
deleted file mode 100644
index e4164dddb4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/RelationshipMapping.java
+++ /dev/null
@@ -1,62 +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.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.
- */
-public interface RelationshipMapping extends AttributeMapping, Fetchable
-{
-
-	// **************** target entity **************************************
-	
-	String getTargetEntity();
-
-	String getSpecifiedTargetEntity();
-	void setSpecifiedTargetEntity(String value);
-		String SPECIFIED_TARGET_ENTITY_PROPERTY = "specifiedTargetEntityProperty";
-
-	String getDefaultTargetEntity();
-		String DEFAULT_TARGET_ENTITY_PROPERTY = "defaultTargetEntityProperty";
-
-	Entity getResolvedTargetEntity();
-		String RESOLVED_TARGET_ENTITY_PROPERTY = "resolvedTargetEntityProperty";
-	
-	/**
-	 * Return whether the specified 'targetEntity' is valid.
-	 */
-	boolean targetEntityIsValid(String targetEntity);
-
-	
-	// **************** cascade **************************************
-
-	Cascade getCascade();
-
-
-	/**
-	 * Return the Entity that owns this relationship mapping
-	 * @return
-	 */
-	Entity getEntity();
-
-	/**
-	 * Return whether this mapping is the owning side of the relationship.
-	 * Either this is a unidirectional mapping or it is the owning side of a bidirectional
-	 * relationship.  If bidirectional, the owning side is the side that doesn't specify
-	 * mappedBy.  This is the side where a join table would be specified
-	 */
-	boolean isRelationshipOwner();
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SecondaryTable.java
deleted file mode 100644
index f60a0ac964..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SecondaryTable.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.core.context;
-
-import java.util.ListIterator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 SecondaryTable extends Table
-{
-
-	public Entity getParent();
-	
-	/**
-	 * Return a list iterator of the primary key join columns whether specified or default.
-	 * This will not be null.
-	 */
-	<T extends PrimaryKeyJoinColumn> ListIterator<T> primaryKeyJoinColumns();
-		String SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST = "specifiedPrimaryKeyJoinColumnsList";
-
-	/**
-	 * Return the number of primary key join columns, both specified and default.
-	 */
-	int primaryKeyJoinColumnsSize();
-
-	/**
-	 * Return a list iterator of the specified primary key join columns.
-	 * This will not be null.
-	 */
-	<T extends PrimaryKeyJoinColumn> ListIterator<T> specifiedPrimaryKeyJoinColumns();
-
-	/**
-	 * Return the number of specified primary key join columns.
-	 */
-	int specifiedPrimaryKeyJoinColumnsSize();
-
-	/**
-	 * Return the default primary key join column or null.  A default primary key join column
-	 * only exists if there are no specified primary key join columns.
-	 */
-	PrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn();
-		String DEFAULT_PRIMARY_KEY_JOIN_COLUMN = "defaultPrimaryKeyJoinColumn";
-
-	/**
-	 * Add a specified primary key join column to the secondary table return the object 
-	 * representing it.
-	 */
-	PrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index);
-
-	/**
-	 * Remove the specified primary key join column from the secondary table.
-	 */
-	void removeSpecifiedPrimaryKeyJoinColumn(int index);
-
-	/**
-	 * Remove the specified primary key join column at the index from the secondary table.
-	 */
-	void removeSpecifiedPrimaryKeyJoinColumn(PrimaryKeyJoinColumn pkJoinColumn);
-
-	/**
-	 * Move the specified primary key join column from the source index to the target index.
-	 */
-	void moveSpecifiedPrimaryKeyJoinColumn(int targetIndex, int sourceIndex);
-
-	/**
-	 * Return true if the secondary table exists as specified on the owning object, 
-	 * or false if the secondary table is a result of defaults calculation
-	 */
-	boolean isVirtual();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SequenceGenerator.java
deleted file mode 100644
index 2c0a252b2c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SequenceGenerator.java
+++ /dev/null
@@ -1,32 +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.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.
- */
-public interface SequenceGenerator extends Generator
-{
-	Integer DEFAULT_INITIAL_VALUE = Integer.valueOf(1);
-
-	String getSequenceName();
-	
-	String getDefaultSequenceName();
-		String DEFAULT_SEQUENCE_NAME_PROPERTY = "defaultSequenceNameProperty";
-	String getSpecifiedSequenceName();
-	void setSpecifiedSequenceName(String value);
-		String SPECIFIED_SEQUENCE_NAME_PROPERTY = "specifiedSequenceNameProperty";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SingleRelationshipMapping.java
deleted file mode 100644
index 4b0962e396..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SingleRelationshipMapping.java
+++ /dev/null
@@ -1,85 +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.core.context;
-
-import java.util.ListIterator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 SingleRelationshipMapping extends RelationshipMapping, Nullable
-{
-	
-	// **************** fetch type **************************************
-
-	FetchType DEFAULT_FETCH_TYPE = FetchType.EAGER;
-
-	// **************** join columns **************************************
-
-	/**
-	 * Return a list iterator of the join columns whether specified or default.
-	 * This will not be null.
-	 */
-	<T extends JoinColumn> ListIterator<T> joinColumns();
-
-	/**
-	 * Return the number of join columns, both specified and default.
-	 */
-	int joinColumnsSize();
-
-	/**
-	 * Return a list iterator of the specified join columns.
-	 * This will not be null.
-	 */
-	<T extends JoinColumn> ListIterator<T> specifiedJoinColumns();
-		String SPECIFIED_JOIN_COLUMNS_LIST = "specifiedJoinColumnsList";
-
-	/**
-	 * Return the number of specified join columns.
-	 */
-	int specifiedJoinColumnsSize();
-
-	/**
-	 * Return the default join column or null.  A default join column
-	 * only exists if there are no specified join columns.
-	 */
-	JoinColumn getDefaultJoinColumn();
-		String DEFAULT_JOIN_COLUMN = "defaultJoinColumn";
-
-	/**
-	 * Add a specified join column to the join table return the object 
-	 * representing it.
-	 */
-	JoinColumn addSpecifiedJoinColumn(int index);
-	
-	/**
-	 * Remove the specified join column from the join table.
-	 */
-	void removeSpecifiedJoinColumn(int index);
-	
-	/**
-	 * Remove the specified join column at the index from the join table.
-	 */
-	void removeSpecifiedJoinColumn(JoinColumn joinColumn);
-	
-	/**
-	 * Move the specified join column from the source index to the target index.
-	 */
-	void moveSpecifiedJoinColumn(int targetIndex, int sourceIndex);
-
-	boolean containsSpecifiedJoinColumns();
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Table.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Table.java
deleted file mode 100644
index 5f3954e61a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Table.java
+++ /dev/null
@@ -1,110 +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.core.context;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.db.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.
- */
-public interface Table extends JpaContextNode
-{
-	String getName();
-	
-	String getDefaultName();
-		String DEFAULT_NAME_PROPERTY = "defaultNameProperty";
-
-	String getSpecifiedName();
-	void setSpecifiedName(String value);
-		String SPECIFIED_NAME_PROPERTY = "specifiedNameProperty";
-
-	String getCatalog();
-
-	String getDefaultCatalog();
-		String DEFAULT_CATALOG_PROPERTY = "defaultCatalogProperty";
-
-	String getSpecifiedCatalog();
-	void setSpecifiedCatalog(String value);
-		String SPECIFIED_CATALOG_PROPERTY = "specifiedCatalogProperty";
-
-
-	String getSchema();
-
-	String getDefaultSchema();
-		String DEFAULT_SCHEMA_PROPERTY = "defaultSchemaProperty";
-
-	String getSpecifiedSchema();
-	void setSpecifiedSchema(String value);
-		String SPECIFIED_SCHEMA_PROPERTY = "specifiedSchemaProperty";
-
-
-	// **************** unique constraints **************************************
-
-	/**
-	 * Return a list iterator of the unique constraints.
-	 * This will not be null.
-	 */
-	<T extends UniqueConstraint> ListIterator<T> uniqueConstraints();
-	
-	/**
-	 * Return the number of unique constraints.
-	 */
-	int uniqueConstraintsSize();
-		
-	/**
-	 * Add a unique constraint to the table and return the object 
-	 * representing it.
-	 */
-	UniqueConstraint addUniqueConstraint(int index);
-	
-	/**
-	 * Remove unique constraint at the given index from the Table
-	 */
-	void removeUniqueConstraint(int index);
-	
-	/**
-	 * Remove the unique constraint from the Table
-	 */
-	void removeUniqueConstraint(UniqueConstraint uniqueConstraint);
-	
-	/**
-	 * Move the unique constraint from the source index to the target index.
-	 */
-	void moveUniqueConstraint(int targetIndex, int sourceIndex);
-		String UNIQUE_CONSTRAINTS_LIST = "uniqueConstraintsList";
-
-
-
-	org.eclipse.jpt.db.Table getDbTable();
-
-	Schema getDbSchema();
-	
-	/**
-	 * Return true if this table is connected to a datasource
-	 */
-	boolean connectionProfileIsActive();
-
-	/** 
-	 * Return true if this table's schema can be resolved to a schema on the active connection
-	 */
-	boolean hasResolvedSchema();
-
-	/** 
-	 * Return true if this can be resolved to a table on the active connection
-	 */
-	boolean isResolved();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TableGenerator.java
deleted file mode 100644
index f554809347..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TableGenerator.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.core.context;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.db.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.
- */
-public interface TableGenerator extends Generator
-{
-	Integer DEFAULT_INITIAL_VALUE = Integer.valueOf(0);
-
-	String getTable();
-	
-	String getDefaultTable();
-		String DEFAULT_TABLE_PROPERTY = "defaultTableProperty";
-	String getSpecifiedTable();
-	void setSpecifiedTable(String value);
-		String SPECIFIED_TABLE_PROPERTY = "specifiedTableProperty";
-
-
-
-	String getCatalog();
-
-	String getDefaultCatalog();
-		String DEFAULT_CATALOG_PROPERTY = "defaultCatalogProperty";
-
-	String getSpecifiedCatalog();
-	void setSpecifiedCatalog(String value);
-		String SPECIFIED_CATALOG_PROPERTY = "specifiedCatalogProperty";
-
-
-
-	String getSchema();
-
-	String getDefaultSchema();
-		String DEFAULT_SCHEMA_PROPERTY = "defaultSchemaProperty";
-
-	String getSpecifiedSchema();
-	void setSpecifiedSchema(String value);
-		String SPECIFIED_SCHEMA_PROPERTY = "specifiedSchemaProperty";
-
-
-
-	String getPkColumnName();
-
-	String getDefaultPkColumnName();
-		String DEFAULT_PK_COLUMN_NAME_PROPERTY = "defaultPkColumnNameProperty";
-
-	String getSpecifiedPkColumnName();
-	void setSpecifiedPkColumnName(String value);
-		String SPECIFIED_PK_COLUMN_NAME_PROPERTY = "specifiedPkColumnNameProperty";
-
-
-	String getValueColumnName();
-
-	String getDefaultValueColumnName();
-		String DEFAULT_VALUE_COLUMN_NAME_PROPERTY = "defaultValueColumnNameProperty";
-	
-	String getSpecifiedValueColumnName();
-	void setSpecifiedValueColumnName(String value);
-		String SPECIFIED_VALUE_COLUMN_NAME_PROPERTY = "specifiedValueColumnNameProperty";
-
-
-	String getPkColumnValue();
-
-	String getDefaultPkColumnValue();
-		String DEFAULT_PK_COLUMN_VALUE_PROPERTY = "defaultPkColummValueProperty";
-
-	String getSpecifiedPkColumnValue();
-	void setSpecifiedPkColumnValue(String value);
-		String SPECIFIED_PK_COLUMN_VALUE_PROPERTY = "specifiedPkColummValueProperty";
-
-
-	// **************** unique constraints **************************************
-
-	/**
-	 * Return a list iterator of the unique constraints.
-	 * This will not be null.
-	 */
-	<T extends UniqueConstraint> ListIterator<T> uniqueConstraints();
-	
-	/**
-	 * Return the number of unique constraints.
-	 */
-	int uniqueConstraintsSize();
-		
-	/**
-	 * Add a unique constraint to the table and return the object 
-	 * representing it.
-	 */
-	UniqueConstraint addUniqueConstraint(int index);
-	
-	/**
-	 * Remove unique constraint at the given index from the Table
-	 */
-	void removeUniqueConstraint(int index);
-	
-	/**
-	 * Remove the unique constraint from the Table
-	 */
-	void removeUniqueConstraint(UniqueConstraint uniqueConstraint);
-	
-	/**
-	 * Move the unique constraint from the source index to the target index.
-	 */
-	void moveUniqueConstraint(int targetIndex, int sourceIndex);
-		String UNIQUE_CONSTRAINTS_LIST = "uniqueConstraintsList";
-
-	/**
-	 * Return a db Schema object with the specified/default schema name.
-	 * This can return null if no Schema exists on the database with that name.
-	 */
-	Schema getDbSchema();
-
-	/**
-	 * Return a db Table object with the specified/default table name.
-	 * This can return null if no Table exists on the database with that name.
-	 */
-	Table getDbTable();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TemporalType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TemporalType.java
deleted file mode 100644
index bc10bbb5f4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TemporalType.java
+++ /dev/null
@@ -1,93 +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.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.
- */
-public enum TemporalType {
-
-	DATE,
-	TIME,
-	TIMESTAMP;
-	
-
-	public static TemporalType fromJavaResourceModel(org.eclipse.jpt.core.resource.java.TemporalType javaTemporalType) {
-		if (javaTemporalType == null) {
-			return null;
-		}
-		switch (javaTemporalType) {
-			case DATE:
-				return DATE;
-			case TIME:
-				return TIME;
-			case TIMESTAMP:
-				return TIMESTAMP;
-			default:
-				throw new IllegalArgumentException("unknown temporal type: " + javaTemporalType);
-		}
-	}
-	
-	public static org.eclipse.jpt.core.resource.java.TemporalType toJavaResourceModel(TemporalType temporalType) {
-		if (temporalType == null) {
-			return null;
-		}
-		switch (temporalType) {
-			case DATE:
-				return org.eclipse.jpt.core.resource.java.TemporalType.DATE;
-			case TIME:
-				return org.eclipse.jpt.core.resource.java.TemporalType.TIME;
-			case TIMESTAMP:
-				return org.eclipse.jpt.core.resource.java.TemporalType.TIMESTAMP;
-			default:
-				throw new IllegalArgumentException("unknown temporal type: " + temporalType);
-		}
-	}
-	
-
-	public static TemporalType fromOrmResourceModel(org.eclipse.jpt.core.resource.orm.TemporalType ormTemporalType) {
-		if (ormTemporalType == null) {
-			return null;
-		}
-		switch (ormTemporalType) {
-			case DATE:
-				return DATE;
-			case TIME:
-				return TIME;
-			case TIMESTAMP:
-				return TIMESTAMP;
-			default:
-				throw new IllegalArgumentException("unknown temporal type: " + ormTemporalType);
-		}
-	}
-	
-	public static org.eclipse.jpt.core.resource.orm.TemporalType toOrmResourceModel(TemporalType temporalType) {
-		if (temporalType == null) {
-			return null;
-		}
-		switch (temporalType) {
-			case DATE:
-				return org.eclipse.jpt.core.resource.orm.TemporalType.DATE;
-			case TIME:
-				return org.eclipse.jpt.core.resource.orm.TemporalType.TIME;
-			case TIMESTAMP:
-				return org.eclipse.jpt.core.resource.orm.TemporalType.TIMESTAMP;
-			default:
-				throw new IllegalArgumentException("unknown temporal type: " + temporalType);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TransientMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TransientMapping.java
deleted file mode 100644
index 3ebd4cf788..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TransientMapping.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.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.
- */
-public interface TransientMapping
-	extends AttributeMapping
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TypeMapping.java
deleted file mode 100644
index 48881841e7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TypeMapping.java
+++ /dev/null
@@ -1,140 +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.core.context;
-
-import java.util.Iterator;
-
-import org.eclipse.jpt.db.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.
- */
-public interface TypeMapping extends JpaContextNode
-{
-	/**
-	 * Return a unique key for the ITypeMapping.  If this is defined in
-	 * an extension they should be equal.
-	 * @return
-	 */
-	String getKey();
-
-	PersistentType getPersistentType();
-
-	boolean isMapped();
-	
-	/**
-	 * Return the type mapping's primary table name, null if a primary table does not apply
-	 */
-	String getTableName();
-
-	/**
-	 * Return the type mapping's "associated" tables, which includes the
-	 * primary table and the collection of secondary tables.
-	 */
-	Iterator<Table> associatedTables();
-
-	/**
-	 * Return the type mapping's "associated" tables, which includes the
-	 * primary table and the collection of secondary tables, as well as all
-	 * inherited "associated" tables.
-	 */
-	Iterator<Table> associatedTablesIncludingInherited();
-
-	/**
-	 * Return the names of the type mapping's "associated" tables,
-	 * which includes the primary table and the collection of secondary
-	 * tables, as well as the names of all the inherited "associated" tables.
-	 */
-	Iterator<String> associatedTableNamesIncludingInherited();
-
-	/**
-	 * return the resolved primary db table
-	 */
-	org.eclipse.jpt.db.Table getPrimaryDbTable();
-
-	Schema getDbSchema();
-
-	/**
-	 * return the resolved associated db table with the passed in name
-	 */
-	org.eclipse.jpt.db.Table getDbTable(String tableName);
-
-	/**
-	 * Return whether the specified table is invalid for any annotations
-	 * associated with the type mapping.
-	 */
-	boolean tableNameIsInvalid(String tableName);
-
-	/**
-	 * Return an Iterator of attributes.  The attributes must be BasicMappings or IdMappings
-	 * found in this type mapping
-	 */
-	<T extends PersistentAttribute> Iterator<T> overridableAttributes();
-
-	/**
-	 * Return an Iterator of attributes names.  The attributes must be BasicMappings or IdMappings
-	 * found in this type mapping
-	 */
-	Iterator<String> overridableAttributeNames();
-
-	/**
-	 * Return an Iterator of attributes.  The attributes must be BasicMappings or IdMappings
-	 * found in any MappedSuperclass in the inheritance hierarchy. 
-	 * See {@link TypeMapping#overridableAttributes()} and {@link PersistentType#inheritanceHierarchy()}
-	 */
-	Iterator<PersistentAttribute> allOverridableAttributes();
-
-	/**
-	 * Return an Iterator of attributes names.  The attributes must be BasicMappings or IdMappings
-	 * found in any MappedSuperclass in the inheritance hierarchy.  
-	 * See {@link TypeMapping#overridableAttributeNames()} and {@link PersistentType#inheritanceHierarchy()}
-	 */
-	Iterator<String> allOverridableAttributeNames();
-
-	
-	/**
-	 * Return an Iterator of associations that can be overriden.  The associations must be 
-	 * OneToOneMappings or ManyToOneMappings found in this type mapping
-	 */
-	<T extends PersistentAttribute> Iterator<T> overridableAssociations();
-
-	/**
-	 * Return an Iterator of association names.  The associations must be OneToOneMappings or ManyToOneMappings
-	 * found in any MappedSuperclass in the inheritance hierarchy
-	 */
-	Iterator<String> overridableAssociationNames();
-
-	/**
-	 * Return an Iterator of associations.  The associations must be OneToOneMappings or ManyToOneMappings
-	 * found in any MappedSuperclass in the inheritance hierarchy
-	 * See {@link TypeMapping#overridableAssociations()} and {@link PersistentType#inheritanceHierarchy()}
-	 */
-	Iterator<PersistentAttribute> allOverridableAssociations();
-
-	/**
-	 * Return an Iterator of association names.  The associations must be OneToOneMappings or ManyToOneMappings
-	 * found in any MappedSuperclass in the inheritance hierarchy
-	 * See {@link TypeMapping#overridableAssociationNames()} and {@link PersistentType#inheritanceHierarchy()}
-	 */
-	Iterator<String> allOverridableAssociationNames();
-
-	/**
-	 * Return whether the given attribute mapping key is valid for this particular
-	 * type mapping
-	 * (for example, id's are not valid for an embeddable type mapping)
-	 */
-	boolean attributeMappingKeyAllowed(String attributeMappingKey);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/UniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/UniqueConstraint.java
deleted file mode 100644
index 94db69939a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/UniqueConstraint.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.core.context;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 UniqueConstraint extends JpaContextNode
-{
-	
-	// **************** column names **************************************
-
-	/**
-	 * Return a list iterator of the column names.
-	 * This will not be null.
-	 */
-	ListIterator<String> columnNames();
-	
-	/**
-	 * Return the number of column names.
-	 */
-	int columnNamesSize();
-		
-	/**
-	 * Add a column name to the list at the given index
-	 */
-	void addColumnName(int index, String columnName);
-	
-	/**
-	 * Remove the column name at the given index from the unique constraint
-	 */
-	void removeColumnName(int index);
-	
-	/**
-	 * Remove the column name from the unique constraint
-	 */
-	void removeColumnName(String columnName);
-	
-	/**
-	 * Move the column name from the source index to the target index.
-	 */
-	void moveColumnName(int targetIndex, int sourceIndex);
-		String COLUMN_NAMES_LIST = "columnNamesList";
-		
-	/**
-	 * All containers must implement this interface.
-	 */
-	interface Owner
-	{
-		Iterator<String> candidateUniqueConstraintColumnNames();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/VersionMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/VersionMapping.java
deleted file mode 100644
index 333d0de0e6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/VersionMapping.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.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.
- */
-public interface VersionMapping
-	extends AttributeMapping, ColumnMapping
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/DefaultJavaAttributeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/DefaultJavaAttributeMappingProvider.java
deleted file mode 100644
index 43f3700ba4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/DefaultJavaAttributeMappingProvider.java
+++ /dev/null
@@ -1,32 +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.core.context.java;
-
-
-/**
- * Map a string key to an attribute mapping and its corresponding
- * Java annotation adapter.  
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 DefaultJavaAttributeMappingProvider extends JavaAttributeMappingProvider {
-
-	/**
-	 * Given the IJavaPersistentAttribute return whether the default mapping applies.
-	 * This will be used to determine the default mapping in the case where no 
-	 * mapping has been specified.
-	 */
-	boolean defaultApplies(JavaPersistentAttribute persistentAttribute);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAssociationOverride.java
deleted file mode 100644
index 8e015b48de..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAssociationOverride.java
+++ /dev/null
@@ -1,39 +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.core.context.java;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.AssociationOverride;
-import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaAssociationOverride extends AssociationOverride, JavaJpaContextNode
-{
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaJoinColumn> joinColumns();
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaJoinColumn> specifiedJoinColumns();
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaJoinColumn> defaultJoinColumns();
-	JavaJoinColumn addSpecifiedJoinColumn(int index);
-	
-	void initializeFromResource(AssociationOverrideAnnotation associationOverride);
-	
-	void update(AssociationOverrideAnnotation associationOverride);
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeMapping.java
deleted file mode 100644
index 7725d1737b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeMapping.java
+++ /dev/null
@@ -1,41 +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.core.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.context.AttributeMapping;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaAttributeMapping extends AttributeMapping, JavaJpaContextNode
-{
-	JavaPersistentAttribute getPersistentAttribute();
-	
-	void initializeFromResource(JavaResourcePersistentAttribute resourcePersistentAttribute);
-
-	void update(JavaResourcePersistentAttribute resourcePersistentAttribute);
-	
-	String getAnnotationName();
-	
-	/**
-	 * Return all fully qualfied annotation names that are supported with this mapping type.
-	 * This includes all possible annotations, not just the ones that currently exist on the attribute.
-	 */
-	Iterator<String> correspondingAnnotationNames();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeMappingProvider.java
deleted file mode 100644
index c50d4f01ae..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeMappingProvider.java
+++ /dev/null
@@ -1,40 +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.core.context.java;
-
-import org.eclipse.jpt.core.JpaFactory;
-
-/**
- * Map a string key to a type mapping and its corresponding
- * Java annotation adapter.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaAttributeMappingProvider {
-
-	/**
-	 * A unique String that corresponds to the IJavaAttributeMapping key 
-	 */
-	String getKey();
-
-	String getAnnotationName();
-	
-	/**
-	 * Create an {@link JavaAttributeMapping} for the given attribute.  Use the {@link JpaFactory}
-	 * for creation so that extenders can create their own {@link JpaFactory} instead of 
-	 * creating their own {@link JavaAttributeMappingProvider}.
-	 */
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaFactory factory);
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeOverride.java
deleted file mode 100644
index de69eb701a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeOverride.java
+++ /dev/null
@@ -1,32 +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.core.context.java;
-
-import org.eclipse.jpt.core.context.AttributeOverride;
-import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaAttributeOverride extends AttributeOverride, JavaJpaContextNode, JavaColumn.Owner
-{
-	JavaColumn getColumn();
-	
-	void initializeFromResource(AttributeOverrideAnnotation attributeOverride);
-	
-	void update(AttributeOverrideAnnotation attributeOverride);
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBaseColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBaseColumn.java
deleted file mode 100644
index 10de0a7f99..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBaseColumn.java
+++ /dev/null
@@ -1,43 +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.core.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.BaseColumn;
-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.
- */
-public interface JavaBaseColumn extends BaseColumn, JavaNamedColumn
-{
-
-	/**
-	 * Return the (best guess) text location of the column's table.
-	 */
-	TextRange getTableTextRange(CompilationUnit astRoot);
-
-	Owner getOwner();
-	
-	/**
-	 * interface allowing columns to be used in multiple places
-	 * (e.g. basic mappings and attribute overrides)
-	 */
-	interface Owner extends JavaNamedColumn.Owner, BaseColumn.Owner
-	{
-		// nothing?
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBaseEmbeddedMapping.java
deleted file mode 100644
index 58356ff62a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBaseEmbeddedMapping.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.core.context.java;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.BaseEmbeddedMapping;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaBaseEmbeddedMapping extends JavaAttributeMapping, BaseEmbeddedMapping
-{
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaAttributeOverride> attributeOverrides();
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaAttributeOverride> virtualAttributeOverrides();
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaAttributeOverride> specifiedAttributeOverrides();
-	
-	JavaAttributeOverride getAttributeOverrideNamed(String name);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBaseJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBaseJoinColumn.java
deleted file mode 100644
index 382af8033a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBaseJoinColumn.java
+++ /dev/null
@@ -1,43 +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.core.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.BaseJoinColumn;
-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.
- */
-public interface JavaBaseJoinColumn extends BaseJoinColumn, JavaNamedColumn
-{
-
-	/**
-	 * Return the (best guess) text location of the referenced column name
-	 */
-	TextRange getReferencedColumnNameTextRange(CompilationUnit astRoot);
-
-	
-	Owner getOwner();
-	/**
-	 * interface allowing join columns to be used in multiple places
-	 * (e.g. 1:1 mappings and join tables)
-	 */
-	interface Owner extends BaseJoinColumn.Owner, JavaNamedColumn.Owner
-	{
-		// nothing?
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBasicMapping.java
deleted file mode 100644
index 1c68a451c6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBasicMapping.java
+++ /dev/null
@@ -1,27 +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.core.context.java;
-
-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.
- */
-public interface JavaBasicMapping
-	extends JavaAttributeMapping, BasicMapping, JavaColumnMapping
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaColumn.java
deleted file mode 100644
index d209d1db6d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaColumn.java
+++ /dev/null
@@ -1,42 +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.core.context.java;
-
-import org.eclipse.jpt.core.context.Column;
-import org.eclipse.jpt.core.resource.java.ColumnAnnotation;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaColumn extends Column, JavaBaseColumn
-{
-	void initializeFromResource(ColumnAnnotation columnResource);
-	
-	void update(ColumnAnnotation columnResource);
-	
-	boolean connectionProfileIsActive();
-	
-	Owner getOwner();
-	/**
-	 * interface allowing columns to be used in multiple places
-	 * (e.g. basic mappings and attribute overrides)
-	 */
-	interface Owner extends JavaBaseColumn.Owner
-	{
-		ColumnAnnotation getColumnResource();
-	}
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaColumnMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaColumnMapping.java
deleted file mode 100644
index 99d1248b1b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaColumnMapping.java
+++ /dev/null
@@ -1,26 +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.core.context.java;
-
-import org.eclipse.jpt.core.context.ColumnMapping;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaColumnMapping extends JavaJpaContextNode, ColumnMapping, JavaColumn.Owner
-{
-	JavaColumn getColumn();
-} 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaDiscriminatorColumn.java
deleted file mode 100644
index a31f1c8c39..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaDiscriminatorColumn.java
+++ /dev/null
@@ -1,30 +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.core.context.java;
-
-import org.eclipse.jpt.core.context.DiscriminatorColumn;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaDiscriminatorColumn extends JavaNamedColumn, DiscriminatorColumn
-{	
-	void initializeFromResource(JavaResourcePersistentMember persistentResource);
-	
-	void update(JavaResourcePersistentMember persistentResource);
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEmbeddable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEmbeddable.java
deleted file mode 100644
index 5d67f223ae..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEmbeddable.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.core.context.java;
-
-import java.util.Iterator;
-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.
- */
-public interface JavaEmbeddable
-	extends JavaTypeMapping, Embeddable
-{
-	Iterator<JavaPersistentAttribute> overridableAttributes();
-	
-	Iterator<JavaPersistentAttribute> overridableAssociations();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEmbeddedIdMapping.java
deleted file mode 100644
index 81eb4c764d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEmbeddedIdMapping.java
+++ /dev/null
@@ -1,29 +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.core.context.java;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.EmbeddedIdMapping;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaEmbeddedIdMapping extends JavaBaseEmbeddedMapping, EmbeddedIdMapping
-{
-	ListIterator<JavaAttributeOverride> attributeOverrides();
-	ListIterator<JavaAttributeOverride> virtualAttributeOverrides();
-	ListIterator<JavaAttributeOverride> specifiedAttributeOverrides();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEmbeddedMapping.java
deleted file mode 100644
index ef965d21be..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEmbeddedMapping.java
+++ /dev/null
@@ -1,29 +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.core.context.java;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.EmbeddedMapping;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaEmbeddedMapping extends JavaBaseEmbeddedMapping, EmbeddedMapping
-{
-	ListIterator<JavaAttributeOverride> attributeOverrides();
-	ListIterator<JavaAttributeOverride> virtualAttributeOverrides();
-	ListIterator<JavaAttributeOverride> specifiedAttributeOverrides();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEntity.java
deleted file mode 100644
index 4f4818e770..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEntity.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.core.context.java;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-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.
- */
-public interface JavaEntity extends JavaTypeMapping, Entity, JavaGeneratorHolder
-{
-	JavaTable getTable();
-	
-	JavaDiscriminatorColumn getDiscriminatorColumn();
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaSecondaryTable> secondaryTables();	
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaSecondaryTable> specifiedSecondaryTables();
-	JavaSecondaryTable addSpecifiedSecondaryTable(int index);
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaPrimaryKeyJoinColumn> primaryKeyJoinColumns();
-	JavaPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn();
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns();
-	JavaPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index);
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaAttributeOverride> attributeOverrides();
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaAttributeOverride> specifiedAttributeOverrides();
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaAttributeOverride> virtualAttributeOverrides();
-	JavaAttributeOverride getAttributeOverrideNamed(String name);
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaAssociationOverride> associationOverrides();
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaAssociationOverride> specifiedAssociationOverrides();
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaAssociationOverride> virtualAssociationOverrides();
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaNamedQuery> namedQueries();
-	JavaNamedQuery addNamedQuery(int index);
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaNamedNativeQuery> namedNativeQueries();
-	JavaNamedNativeQuery addNamedNativeQuery(int index);
-	
-	Iterator<JavaPersistentAttribute> overridableAttributes();
-	
-	Iterator<JavaPersistentAttribute> overridableAssociations();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGeneratedValue.java
deleted file mode 100644
index f1b602e1cc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGeneratedValue.java
+++ /dev/null
@@ -1,38 +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.core.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.GeneratedValue;
-import org.eclipse.jpt.core.resource.java.GeneratedValueAnnotation;
-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.
- */
-public interface JavaGeneratedValue extends GeneratedValue, JavaJpaContextNode
-{
-
-	/**
-	 * Return the (best guess) text location of the generator.
-	 */
-	TextRange getGeneratorTextRange(CompilationUnit astRoot);
-	
-	void initializeFromResource(GeneratedValueAnnotation generatedValue);
-	
-	void update(GeneratedValueAnnotation generatedValue);
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGenerator.java
deleted file mode 100644
index fcee398d59..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGenerator.java
+++ /dev/null
@@ -1,28 +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.core.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.Generator;
-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.
- */
-public interface JavaGenerator extends Generator, JavaJpaContextNode
-{
-	TextRange getNameTextRange(CompilationUnit astRoot);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGeneratorHolder.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGeneratorHolder.java
deleted file mode 100644
index 80ce3e41b0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGeneratorHolder.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.core.context.java;
-
-import org.eclipse.jpt.core.context.GeneratorHolder;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaGeneratorHolder extends GeneratorHolder
-{
-	JavaSequenceGenerator getSequenceGenerator();
-
-	JavaSequenceGenerator addSequenceGenerator();
-
-	JavaTableGenerator getTableGenerator();
-
-	JavaTableGenerator addTableGenerator();
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaIdMapping.java
deleted file mode 100644
index 506bfa4167..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaIdMapping.java
+++ /dev/null
@@ -1,27 +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.core.context.java;
-
-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.
- */
-public interface JavaIdMapping extends JavaAttributeMapping, IdMapping, JavaColumnMapping, JavaGeneratorHolder
-{
-	JavaGeneratedValue getGeneratedValue();
-	JavaGeneratedValue addGeneratedValue();
-} 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJoinColumn.java
deleted file mode 100644
index 026267cfcd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJoinColumn.java
+++ /dev/null
@@ -1,42 +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.core.context.java;
-
-import org.eclipse.jpt.core.context.JoinColumn;
-import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaJoinColumn extends JoinColumn, JavaBaseJoinColumn, JavaBaseColumn
-{
-	void initializeFromResource(JoinColumnAnnotation joinColumn);
-	
-	boolean connectionProfileIsActive();
-	
-	void update(JoinColumnAnnotation joinColumn);
-
-	Owner getOwner();
-	
-	/**
-	 * interface allowing join columns to be used in multiple places
-	 * (e.g. 1:1 mappings and join tables)
-	 */
-	interface Owner extends JoinColumn.Owner, JavaBaseJoinColumn.Owner, JavaBaseColumn.Owner
-	{
-		// nothing yet
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJoinTable.java
deleted file mode 100644
index 7746ab16d0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJoinTable.java
+++ /dev/null
@@ -1,61 +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.core.context.java;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.JoinTable;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaJoinTable extends JoinTable, JavaJpaContextNode
-{
-	void initializeFromResource(JavaResourcePersistentAttribute attributeResource);
-	
-	void update(JavaResourcePersistentAttribute attributeResource);
-	
-	boolean isSpecified();
-	
-	
-	//****************** covariant overrides *******************
-
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaJoinColumn> joinColumns();
-	
-	JavaJoinColumn getDefaultJoinColumn();
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaJoinColumn> specifiedJoinColumns();
-	
-	JavaJoinColumn addSpecifiedJoinColumn(int index);
-	
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaJoinColumn> inverseJoinColumns();
-	
-	JavaJoinColumn getDefaultInverseJoinColumn();
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaJoinColumn> specifiedInverseJoinColumns();
-	
-	JavaJoinColumn addSpecifiedInverseJoinColumn(int index);
-
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaUniqueConstraint> uniqueConstraints();
-	
-	JavaUniqueConstraint addUniqueConstraint(int index);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJpaContextNode.java
deleted file mode 100644
index 03012331ca..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJpaContextNode.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.core.context.java;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.JpaContextNode;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaJpaContextNode extends JpaContextNode
-{
-	
-	/**
-	 * Return the Java code-completion proposals for the specified position
-	 * in the source code.
-	 */
-	Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot);
-	
-
-	// ******************** validation ***************************8
-	
-	/**
-	 * Adds to the list of current validation messages
-	 */
-	void addToMessages(List<IMessage> messages, CompilationUnit astRoot);
-
-	TextRange getValidationTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaManyToManyMapping.java
deleted file mode 100644
index c9c6e68e3b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaManyToManyMapping.java
+++ /dev/null
@@ -1,27 +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.core.context.java;
-
-import org.eclipse.jpt.core.context.ManyToManyMapping;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaManyToManyMapping
-	extends JavaMultiRelationshipMapping, ManyToManyMapping
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaManyToOneMapping.java
deleted file mode 100644
index ef3411b539..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaManyToOneMapping.java
+++ /dev/null
@@ -1,33 +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.core.context.java;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.ManyToOneMapping;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaManyToOneMapping
-	extends JavaSingleRelationshipMapping, ManyToOneMapping
-{
-	// ********** covariant overrides **********
-	
-	ListIterator<JavaJoinColumn> joinColumns();
-
-	ListIterator<JavaJoinColumn> specifiedJoinColumns();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaMappedSuperclass.java
deleted file mode 100644
index 97b8db2e75..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaMappedSuperclass.java
+++ /dev/null
@@ -1,30 +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.core.context.java;
-
-import java.util.Iterator;
-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.
- */
-public interface JavaMappedSuperclass
-	extends JavaTypeMapping, MappedSuperclass
-{
-	Iterator<JavaPersistentAttribute> overridableAttributes();
-	
-	Iterator<JavaPersistentAttribute> overridableAssociations();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaMultiRelationshipMapping.java
deleted file mode 100644
index fb47f8886b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaMultiRelationshipMapping.java
+++ /dev/null
@@ -1,27 +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.core.context.java;
-
-import org.eclipse.jpt.core.context.MultiRelationshipMapping;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaMultiRelationshipMapping extends JavaRelationshipMapping, MultiRelationshipMapping
-{
-
-	JavaJoinTable getJoinTable();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedColumn.java
deleted file mode 100644
index 7281b298ff..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedColumn.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.core.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.NamedColumn;
-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.
- */
-public interface JavaNamedColumn extends NamedColumn, JavaJpaContextNode
-{
-
-	Owner getOwner();
-	
-	/**
-	 * Return the (best guess) text location of the column's name.
-	 */
-	TextRange getNameTextRange(CompilationUnit astRoot);
-
-	/**
-	 * interface allowing columns to be used in multiple places
-	 * (e.g. basic mappings and attribute overrides)
-	 */
-	interface Owner extends NamedColumn.Owner
-	{
-		/**
-		 * Return the column owner's text range. This can be returned by the
-		 * column when its annotation is not present.
-		 */
-		TextRange getValidationTextRange(CompilationUnit astRoot);
-
-	}
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedNativeQuery.java
deleted file mode 100644
index 1fb5b8ae22..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedNativeQuery.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.core.context.java;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.NamedNativeQuery;
-import org.eclipse.jpt.core.resource.java.NamedNativeQueryAnnotation;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaNamedNativeQuery
-	extends NamedNativeQuery, JavaQuery
-{
-
-	ListIterator<JavaQueryHint> hints();
-
-	void initializeFromResource(NamedNativeQueryAnnotation queryResource);
-
-	void update(NamedNativeQueryAnnotation queryResource);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedQuery.java
deleted file mode 100644
index 33f05873ca..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedQuery.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.core.context.java;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.NamedQuery;
-import org.eclipse.jpt.core.resource.java.NamedQueryAnnotation;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaNamedQuery
-	extends NamedQuery, JavaQuery
-{
-
-	ListIterator<JavaQueryHint> hints();
-
-	void initializeFromResource(NamedQueryAnnotation queryResource);
-
-	void update(NamedQueryAnnotation queryResource);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaOneToManyMapping.java
deleted file mode 100644
index 1bdb12383f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaOneToManyMapping.java
+++ /dev/null
@@ -1,27 +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.core.context.java;
-
-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.
- */
-public interface JavaOneToManyMapping
-	extends JavaMultiRelationshipMapping, OneToManyMapping
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaOneToOneMapping.java
deleted file mode 100644
index 8d8a1adcf7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaOneToOneMapping.java
+++ /dev/null
@@ -1,37 +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.core.context.java;
-
-import java.util.ListIterator;
-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.
- */
-public interface JavaOneToOneMapping
-	extends JavaSingleRelationshipMapping, OneToOneMapping
-{
-	// ********** covariant overrides **********
-	
-	ListIterator<JavaJoinColumn> joinColumns();
-
-	ListIterator<JavaJoinColumn> specifiedJoinColumns();
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaPrimaryKeyJoinColumn> primaryKeyJoinColumns();
-	
-	JavaPrimaryKeyJoinColumn addPrimaryKeyJoinColumn(int index);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaPersistentAttribute.java
deleted file mode 100644
index 17124a7d26..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaPersistentAttribute.java
+++ /dev/null
@@ -1,49 +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.core.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaPersistentAttribute extends PersistentAttribute, JavaJpaContextNode
-{
-	
-	JavaAttributeMapping getMapping();
-	
-	JavaAttributeMapping getSpecifiedMapping();
-	
-	JavaAttributeMapping getDefaultMapping();
-	
-	JavaTypeMapping getTypeMapping();
-	
-	JavaPersistentType getPersistentType();
-	
-	void initializeFromResource(JavaResourcePersistentAttribute resourcePersistentAttribute);
-
-	void update(JavaResourcePersistentAttribute resourcePersistentAttribute);
-	
-	JavaResourcePersistentAttribute getResourcePersistentAttribute();
-	
-	/**
-	 * Return whether the attribute contains the given offset into the text file.
-	 */
-	boolean contains(int offset, CompilationUnit astRoot);
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaPersistentType.java
deleted file mode 100644
index ead375e1cd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaPersistentType.java
+++ /dev/null
@@ -1,50 +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.core.context.java;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.context.PersistentType;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaPersistentType extends PersistentType, JavaJpaContextNode
-{
-	JavaTypeMapping getMapping();
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaPersistentAttribute> attributes();
-	
-	JavaPersistentAttribute getAttributeNamed(String attributeName);
-
-	/**
-	 * Resolve and return the attribute named <code>attributeName</code> if it
-	 * is distinct and exists within the context of this type
-	 */
-	PersistentAttribute resolveAttribute(String attributeName);
-	
-	/**
-	 * Return whether any attribute in this persistent type contains a mapping annotation
-	 * @return
-	 */
-	boolean hasAnyAttributeMappingAnnotations();
-
-	
-	void update(JavaResourcePersistentType persistentTypeResource);
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaPrimaryKeyJoinColumn.java
deleted file mode 100644
index d8d9c267d7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaPrimaryKeyJoinColumn.java
+++ /dev/null
@@ -1,30 +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.core.context.java;
-
-import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaPrimaryKeyJoinColumn extends PrimaryKeyJoinColumn, JavaBaseJoinColumn
-{
-	void initializeFromResource(PrimaryKeyJoinColumnAnnotation primaryKeyJoinColumn);
-	
-	void update(PrimaryKeyJoinColumnAnnotation primaryKeyJoinColumn);
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQuery.java
deleted file mode 100644
index 080efe7d5c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQuery.java
+++ /dev/null
@@ -1,37 +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.core.context.java;
-
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.Query;
-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.
- */
-public interface JavaQuery extends Query, JavaJpaContextNode
-{
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaQueryHint> hints();
-
-	JavaQueryHint addHint(int index);
-	
-	
-	// **************** validation *********************************************
-	
-	TextRange getNameTextRange(CompilationUnit astRoot);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQueryHint.java
deleted file mode 100644
index 21018d6703..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQueryHint.java
+++ /dev/null
@@ -1,29 +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.core.context.java;
-
-import org.eclipse.jpt.core.context.QueryHint;
-import org.eclipse.jpt.core.resource.java.QueryHintAnnotation;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaQueryHint extends QueryHint, JavaJpaContextNode
-{
-	void initializeFromResource(QueryHintAnnotation queryHint);
-	
-	void update(QueryHintAnnotation queryHint);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaRelationshipMapping.java
deleted file mode 100644
index 1d791e8e41..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaRelationshipMapping.java
+++ /dev/null
@@ -1,27 +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.core.context.java;
-
-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.
- */
-public interface JavaRelationshipMapping
-	extends JavaAttributeMapping, RelationshipMapping
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSecondaryTable.java
deleted file mode 100644
index eb1f76ef04..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSecondaryTable.java
+++ /dev/null
@@ -1,50 +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.core.context.java;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.SecondaryTable;
-import org.eclipse.jpt.core.resource.java.SecondaryTableAnnotation;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaSecondaryTable extends SecondaryTable, JavaJpaContextNode
-{
-
-	void initializeFromResource(SecondaryTableAnnotation secondaryTable);
-	
-	void update(SecondaryTableAnnotation secondaryTable);
-
-
-	//****************** covariant overrides *******************
-
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaPrimaryKeyJoinColumn> primaryKeyJoinColumns();
-	
-	JavaPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn();
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns();
-	
-	JavaPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index);
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaUniqueConstraint> uniqueConstraints();
-	
-	JavaUniqueConstraint addUniqueConstraint(int index);
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSequenceGenerator.java
deleted file mode 100644
index 7867b9eaab..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSequenceGenerator.java
+++ /dev/null
@@ -1,32 +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.core.context.java;
-
-import org.eclipse.jpt.core.context.SequenceGenerator;
-import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaSequenceGenerator
-	extends JavaGenerator, SequenceGenerator
-{
-
-	void initializeFromResource(SequenceGeneratorAnnotation generator);
-	
-	void update(SequenceGeneratorAnnotation generator);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSingleRelationshipMapping.java
deleted file mode 100644
index 2c929644cc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSingleRelationshipMapping.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.core.context.java;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.SingleRelationshipMapping;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaSingleRelationshipMapping extends JavaRelationshipMapping, SingleRelationshipMapping
-{
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaJoinColumn> joinColumns();
-	
-	JavaJoinColumn getDefaultJoinColumn();
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaJoinColumn> specifiedJoinColumns();
-	
-	JavaJoinColumn addSpecifiedJoinColumn(int index);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaStructureNodes.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaStructureNodes.java
deleted file mode 100644
index 534de78258..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaStructureNodes.java
+++ /dev/null
@@ -1,33 +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.core.context.java;
-
-import org.eclipse.jpt.core.JptCorePlugin;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaStructureNodes 
-{
-	String COMPILATION_UNIT_ID = 
-		JptCorePlugin.PLUGIN_ID + ".java.compilationUnit";
-	
-	String PERSISTENT_TYPE_ID = 
-		JptCorePlugin.PLUGIN_ID + ".java.persistentType";
-	
-	String PERSISTENT_ATTRIBUTE_ID = 
-		JptCorePlugin.PLUGIN_ID + ".java.persistentAttribute";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTable.java
deleted file mode 100644
index da74feecd7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTable.java
+++ /dev/null
@@ -1,38 +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.core.context.java;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.Table;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaTable extends Table, JavaJpaContextNode
-{
-	void initializeFromResource(JavaResourcePersistentMember persistentResource);
-	
-	void update(JavaResourcePersistentMember persistentResource);
-
-	
-	//****************** covariant overrides *******************
-
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaUniqueConstraint> uniqueConstraints();
-	
-	JavaUniqueConstraint addUniqueConstraint(int index);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTableGenerator.java
deleted file mode 100644
index 25fdd1911c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTableGenerator.java
+++ /dev/null
@@ -1,40 +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.core.context.java;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.TableGenerator;
-import org.eclipse.jpt.core.resource.java.TableGeneratorAnnotation;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaTableGenerator
-	extends JavaGenerator, TableGenerator
-{
-	void initializeFromResource(TableGeneratorAnnotation generator);
-	
-	void update(TableGeneratorAnnotation generator);
-	
-	
-	//****************** covariant overrides *******************
-
-	@SuppressWarnings("unchecked")
-	ListIterator<JavaUniqueConstraint> uniqueConstraints();
-	
-	JavaUniqueConstraint addUniqueConstraint(int index);
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTransientMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTransientMapping.java
deleted file mode 100644
index 9accaaa6a9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTransientMapping.java
+++ /dev/null
@@ -1,27 +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.core.context.java;
-
-import org.eclipse.jpt.core.context.TransientMapping;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaTransientMapping
-	extends JavaAttributeMapping, TransientMapping
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTypeMapping.java
deleted file mode 100644
index 37de5673b7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTypeMapping.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.core.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.context.TypeMapping;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaTypeMapping extends TypeMapping, JavaJpaContextNode
-{
-	void initializeFromResource(JavaResourcePersistentType persistentTypeResource);
-	
-	void update(JavaResourcePersistentType persistentTypeResource);
-	
-	String getAnnotationName();
-	
-	Iterator<String> correspondingAnnotationNames();
-	
-	JavaPersistentType getPersistentType();
-	
-	@SuppressWarnings("unchecked")
-	Iterator<JavaPersistentAttribute> overridableAttributes();
-	
-	@SuppressWarnings("unchecked")
-	Iterator<JavaPersistentAttribute> overridableAssociations();
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTypeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTypeMappingProvider.java
deleted file mode 100644
index f8e9e9405b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTypeMappingProvider.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.core.context.java;
-
-import org.eclipse.jpt.core.JpaFactory;
-
-/**
- * Map a string key to a type mapping and its corresponding
- * Java annotation adapter.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaTypeMappingProvider {
-
-	/**
-	 * A unique String that corresponds to the IJavaTypeMapping key 
-	 */
-	String getKey();
-
-	String getAnnotationName();
-	
-	/**
-	 * Create an IJavaTypeMapping for the given attribute.  Use the IJpaFactory
-	 * for creation so that extenders can create their own IJpaFactory instead of 
-	 * creating their own typeMappingProvider.
-	 * @param type
-	 * @param jpaFactory
-	 */
-	public JavaTypeMapping buildMapping(JavaPersistentType parent, JpaFactory factory);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaUniqueConstraint.java
deleted file mode 100644
index 4a26ef2829..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaUniqueConstraint.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.core.context.java;
-
-import org.eclipse.jpt.core.context.UniqueConstraint;
-import org.eclipse.jpt.core.resource.java.UniqueConstraintAnnotation;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaUniqueConstraint extends UniqueConstraint, JavaJpaContextNode
-{
-	void initialize(UniqueConstraintAnnotation uniqueConstraintAnnotation);
-	
-	void update(UniqueConstraintAnnotation uniqueConstraintAnnotation);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaVersionMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaVersionMapping.java
deleted file mode 100644
index 1077b1f7ad..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaVersionMapping.java
+++ /dev/null
@@ -1,27 +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.core.context.java;
-
-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.
- */
-public interface JavaVersionMapping
-	extends JavaAttributeMapping, VersionMapping, JavaColumnMapping
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/EntityMappings.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/EntityMappings.java
deleted file mode 100644
index bb87aa4188..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/EntityMappings.java
+++ /dev/null
@@ -1,133 +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.core.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.context.AccessType;
-import org.eclipse.jpt.core.context.QueryHolder;
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 EntityMappings extends OrmJpaContextNode, JpaStructureNode, QueryHolder
-{
-	
-	String getVersion();
-		
-	String getDescription();
-	void setDescription(String newDescription);
-		String DESCRIPTION_PROPERTY = "descriptionProperty";
-
-	String getPackage();
-	void setPackage(String newPackage);
-		String PACKAGE_PROPERTY = "packageProperty";
-
-	/**
-	 * Return the specifiedSchema if not null, otherwise return the defaultSchema.
-	 */
-	String getSchema();
-	String getDefaultSchema();
-		String DEFAULT_SCHEMA_PROPERTY = "defaultSchemaProperty";
-	String getSpecifiedSchema();
-	void setSpecifiedSchema(String newSpecifiedSchema);
-		String SPECIFIED_SCHEMA_PROPERTY = "specifiedSchemaProperty";
-
-	/**
-	 * Return the specifiedCatalog if not null, otherwise return the defaultCatalog.
-	 */
-	String getCatalog();
-	String getDefaultCatalog();
-		String DEFAULT_CATALOG_PROPERTY = "defaultCatalogProperty";
-	String getSpecifiedCatalog();
-	void setSpecifiedCatalog(String newSpecifiedCatalog);
-		String SPECIFIED_CATALOG_PROPERTY = "specifiedCatalogProperty";
-
-	/**
-	 * Return the specifiedAccess if not null, otherwise return the defaultAccess.
-	 */
-	AccessType getAccess();
-	AccessType getDefaultAccess();
-		String DEFAULT_ACCESS_PROPERTY = "defaultAccessProperty";
-	AccessType getSpecifiedAccess();
-	void setSpecifiedAccess(AccessType newSpecifiedAccess);
-		String SPECIFIED_ACCESS_PROPERTY = "specifiedAccessProperty";
-
-		
-	PersistenceUnitMetadata getPersistenceUnitMetadata();
-	
-	
-	ListIterator<OrmPersistentType> ormPersistentTypes();
-	int ormPersistentTypesSize();
-	OrmPersistentType addOrmPersistentType(String mappingKey, String className);
-	void removeOrmPersistentType(int index);
-	void removeOrmPersistentType(OrmPersistentType ormPersistentType);
-	//void moveOrmPersistentType(int targetIndex, int sourceIndex);
-	boolean containsPersistentType(String className);
-		String PERSISTENT_TYPES_LIST = "persistentTypes";
-	
-
-	ListIterator<OrmSequenceGenerator> sequenceGenerators();
-	int sequenceGeneratorsSize();
-	OrmSequenceGenerator addSequenceGenerator(int index);
-	void removeSequenceGenerator(int index);
-	void removeSequenceGenerator(OrmSequenceGenerator sequenceGenerator);
-	void moveSequenceGenerator(int targetIndex, int sourceIndex);
-		String SEQUENCE_GENERATORS_LIST = "sequenceGeneratorsList";
-
-	ListIterator<OrmTableGenerator> tableGenerators();
-	int tableGeneratorsSize();
-	OrmTableGenerator addTableGenerator(int index);
-	void removeTableGenerator(int index);
-	void removeTableGenerator(OrmTableGenerator tableGenerator);
-	void moveTableGenerator(int targetIndex, int sourceIndex);
-		String TABLE_GENERATORS_LIST = "tableGeneratorsList";
-
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmNamedQuery> namedQueries();
-	int namedQueriesSize();
-	OrmNamedQuery addNamedQuery(int index);
-	void removeNamedQuery(int index);
-	void moveNamedQuery(int targetIndex, int sourceIndex);
-
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmNamedNativeQuery> namedNativeQueries();
-	int namedNativeQueriesSize();
-	OrmNamedNativeQuery addNamedNativeQuery(int index);
-	void removeNamedNativeQuery(int index);
-	void moveNamedNativeQuery(int targetIndex, int sourceIndex);
-
-		
-	
-	PersistenceUnitDefaults getPersistenceUnitDefaults();
-	
-	/**
-	 * Return the {@link OrmPersistentType) listed in this mapping file
-	 * with the given fullyQualifiedTypeName.  Return null if none exists.
-	 */
-	OrmPersistentType getPersistentType(String fullyQualifiedTypeName);
-	
-	void changeMapping(OrmPersistentType ormPersistentType, OrmTypeMapping oldMapping, OrmTypeMapping newMapping);
-	
-	// **************** updating ***********************************************
-		
-	void update(XmlEntityMappings entityMappings);
-	
-	// *************************************************************************
-	
-	boolean containsOffset(int textOffset);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAssociationOverride.java
deleted file mode 100644
index 322aef911d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAssociationOverride.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.core.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.AssociationOverride;
-import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmAssociationOverride extends AssociationOverride, OrmJpaContextNode
-{
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmJoinColumn> joinColumns();
-
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmJoinColumn> defaultJoinColumns();
-
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmJoinColumn> specifiedJoinColumns();
-
-	OrmJoinColumn addSpecifiedJoinColumn(int index);
-
-	void update(XmlAssociationOverride associationOverride);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeMapping.java
deleted file mode 100644
index 25f10c5b20..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeMapping.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.core.context.orm;
-
-import org.eclipse.jpt.core.context.AttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-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.
- */
-public interface OrmAttributeMapping extends AttributeMapping, OrmJpaContextNode
-{
-	OrmPersistentAttribute getPersistentAttribute();
-
-	String getName();
-	void setName(String newName);
-	String NAME_PROPERTY = "nameProperty";
-
-
-	JavaPersistentAttribute getJavaPersistentAttribute();
-	String JAVA_PERSISTENT_ATTRIBUTE_PROPERTY = "javaPersistentAttributeProperty";
-	
-	/**
-	 * Attributes are a sequence in the orm schema. We must keep
-	 * the list of attributes in the appropriate order so the wtp xml 
-	 * translators will write them to the xml in that order and they
-	 * will adhere to the schema.  
-	 * 
-	 * Each concrete subclass of XmlAttributeMapping must implement this
-	 * method and return an int that matches it's order in the schema
-	 * @return
-	 */
-	int getXmlSequence();
-
-	void removeFromResourceModel(AbstractXmlTypeMapping typeMapping);
-	
-	XmlAttributeMapping addToResourceModel(AbstractXmlTypeMapping typeMapping);
-
-
-	void initializeOn(OrmAttributeMapping newMapping);
-
-	void initializeFromOrmAttributeMapping(OrmAttributeMapping oldMapping);
-
-	void initializeFromOrmBasicMapping(OrmBasicMapping oldMapping);
-
-	void initializeFromOrmIdMapping(OrmIdMapping oldMapping);
-
-	void initializeFromOrmTransientMapping(OrmTransientMapping oldMapping);
-
-	void initializeFromOrmEmbeddedMapping(OrmEmbeddedMapping oldMapping);
-
-	void initializeFromOrmEmbeddedIdMapping(OrmEmbeddedIdMapping oldMapping);
-
-	void initializeFromOrmVersionMapping(OrmVersionMapping oldMapping);
-
-	void initializeFromOrmOneToManyMapping(OrmOneToManyMapping oldMapping);
-
-	void initializeFromOrmManyToOneMapping(OrmManyToOneMapping oldMapping);
-
-	void initializeFromOrmOneToOneMapping(OrmOneToOneMapping oldMapping);
-
-	void initializeFromOrmManyToManyMapping(OrmManyToManyMapping oldMapping);
-
-	boolean contains(int textOffset);
-
-	TextRange getSelectionTextRange();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeMappingProvider.java
deleted file mode 100644
index c50462333a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeMappingProvider.java
+++ /dev/null
@@ -1,29 +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.core.context.orm;
-
-import org.eclipse.jpt.core.JpaFactory;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmAttributeMappingProvider
-{
-	String getKey();
-	
-	OrmAttributeMapping buildAttributeMapping(JpaFactory factory, OrmPersistentAttribute parent);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeOverride.java
deleted file mode 100644
index 81646f55d3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeOverride.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.core.context.orm;
-
-import org.eclipse.jpt.core.context.AttributeOverride;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmAttributeOverride extends AttributeOverride, OrmJpaContextNode
-{
-	OrmColumn getColumn();
-
-	void update(XmlAttributeOverride attributeOverride);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBaseColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBaseColumn.java
deleted file mode 100644
index ed2b20af5e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBaseColumn.java
+++ /dev/null
@@ -1,43 +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.core.context.orm;
-
-import org.eclipse.jpt.core.context.BaseColumn;
-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.
- */
-public interface OrmBaseColumn extends BaseColumn, OrmNamedColumn
-{
-
-	/**
-	 * Return the (best guess) text location of the column's table.
-	 */
-	TextRange getTableTextRange();
-
-	Owner getOwner();
-	
-	/**
-	 * interface allowing columns to be used in multiple places
-	 * (e.g. basic mappings and attribute overrides)
-	 */
-	interface Owner extends OrmNamedColumn.Owner, BaseColumn.Owner
-	{
-		// nothing?
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBaseEmbeddedMapping.java
deleted file mode 100644
index 584b69c1d1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBaseEmbeddedMapping.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.core.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.BaseEmbeddedMapping;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmBaseEmbeddedMapping extends BaseEmbeddedMapping, OrmAttributeMapping
-{
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmAttributeOverride> attributeOverrides();
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmAttributeOverride> virtualAttributeOverrides();
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmAttributeOverride> specifiedAttributeOverrides();
-
-	OrmAttributeOverride getAttributeOverrideNamed(String name);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBaseJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBaseJoinColumn.java
deleted file mode 100644
index 8f141568a0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBaseJoinColumn.java
+++ /dev/null
@@ -1,42 +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.core.context.orm;
-
-import org.eclipse.jpt.core.context.BaseJoinColumn;
-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.
- */
-public interface OrmBaseJoinColumn extends BaseJoinColumn, OrmNamedColumn
-{
-
-	/**
-	 * Return the (best guess) text location of the referenced column name
-	 */
-	TextRange getReferencedColumnNameTextRange();
-
-	
-	Owner getOwner();
-	/**
-	 * interface allowing join columns to be used in multiple places
-	 * (e.g. 1:1 mappings and join tables)
-	 */
-	interface Owner extends BaseJoinColumn.Owner, OrmNamedColumn.Owner
-	{
-
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBasicMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBasicMapping.java
deleted file mode 100644
index 13f90b1bae..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBasicMapping.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.core.context.orm;
-
-import org.eclipse.jpt.core.context.BasicMapping;
-import org.eclipse.jpt.core.resource.orm.XmlBasic;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmBasicMapping extends BasicMapping, OrmAttributeMapping, OrmColumnMapping
-{
-	void initialize(XmlBasic basic);
-
-	void update(XmlBasic basic);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmColumn.java
deleted file mode 100644
index a96705e928..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmColumn.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.core.context.orm;
-
-import org.eclipse.jpt.core.context.Column;
-import org.eclipse.jpt.core.resource.orm.XmlColumn;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmColumn extends Column, OrmBaseColumn
-{
-	
-	Owner getOwner();
-	
-	void initializeFrom(Column oldColumn);
-	void initialize(XmlColumn column);
-	void update(XmlColumn column);
-
-		/**
-	 * interface allowing columns to be used in multiple places
-	 * (e.g. basic mappings and attribute overrides)
-	 */
-	interface Owner extends OrmBaseColumn.Owner
-	{
-		XmlColumn getColumnResource();
-		
-		void addColumnResource();
-		
-		void removeColumnResource();
-	}
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmColumnMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmColumnMapping.java
deleted file mode 100644
index b3ba8d0359..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmColumnMapping.java
+++ /dev/null
@@ -1,27 +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.core.context.orm;
-
-import org.eclipse.jpt.core.context.ColumnMapping;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmColumnMapping extends ColumnMapping, OrmColumn.Owner
-{
-
-	OrmColumn getColumn();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmDiscriminatorColumn.java
deleted file mode 100644
index a600159205..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmDiscriminatorColumn.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.core.context.orm;
-
-import org.eclipse.jpt.core.context.DiscriminatorColumn;
-import org.eclipse.jpt.core.resource.orm.XmlEntity;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmDiscriminatorColumn extends DiscriminatorColumn, OrmNamedColumn
-{
-	void initialize(XmlEntity entity);
-
-	void update(XmlEntity entity);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmEmbeddable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmEmbeddable.java
deleted file mode 100644
index f4b8b08b08..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmEmbeddable.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.core.context.orm;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.context.Embeddable;
-import org.eclipse.jpt.core.resource.orm.XmlEmbeddable;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmEmbeddable extends Embeddable, OrmTypeMapping
-{
-	void initialize(XmlEmbeddable mappedSuperclass);
-
-	void update(XmlEmbeddable mappedSuperclass);
-	
-	Iterator<OrmPersistentAttribute> overridableAttributes();
-
-	Iterator<OrmPersistentAttribute> overridableAssociations();
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmEmbeddedIdMapping.java
deleted file mode 100644
index 992298aa4b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmEmbeddedIdMapping.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.core.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.EmbeddedIdMapping;
-import org.eclipse.jpt.core.resource.orm.XmlEmbeddedId;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmEmbeddedIdMapping extends EmbeddedIdMapping, OrmBaseEmbeddedMapping
-{
-	ListIterator<OrmAttributeOverride> attributeOverrides();
-	ListIterator<OrmAttributeOverride> virtualAttributeOverrides();
-	ListIterator<OrmAttributeOverride> specifiedAttributeOverrides();
-
-	void initialize(XmlEmbeddedId embeddedId);
-
-	 void update(XmlEmbeddedId embeddedId);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmEmbeddedMapping.java
deleted file mode 100644
index f460a6f186..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmEmbeddedMapping.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.core.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.EmbeddedMapping;
-import org.eclipse.jpt.core.resource.orm.XmlEmbedded;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmEmbeddedMapping extends EmbeddedMapping, OrmBaseEmbeddedMapping
-{
-	ListIterator<OrmAttributeOverride> attributeOverrides();
-	ListIterator<OrmAttributeOverride> virtualAttributeOverrides();
-	ListIterator<OrmAttributeOverride> specifiedAttributeOverrides();
-
-	void initialize(XmlEmbedded embedded);
-
-	void update(XmlEmbedded embedded);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmEntity.java
deleted file mode 100644
index 1d848475ea..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmEntity.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.core.context.orm;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.java.JavaEntity;
-import org.eclipse.jpt.core.resource.orm.XmlEntity;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmEntity extends OrmTypeMapping, Entity, OrmGeneratorHolder
-{
-
-	/**
-	 * Return a list iterator of the virtual(not specified) secondary tables.
-	 * This will not be null.
-	 */
-	ListIterator<OrmSecondaryTable> virtualSecondaryTables();
-		String VIRTUAL_SECONDARY_TABLES_LIST = "virtualSecondaryTablesList";
-	
-	/**
-	 * Return the number of virtual secondary tables.
-	 */
-	int virtualSecondaryTablesSize();
-	
-	/**
-	 * Return whether the entity contains the given secondary table in its list of
-	 * virtual secondary tables
-	 */	
-	boolean containsVirtualSecondaryTable(OrmSecondaryTable secondaryTable);
-	
-	/**
-	 * Return true if there are no virtual secondary tables on the orm entity.
-	 * This is used to determine whether you can add specified secondary tables.
-	 * You must first make sure all virtual secondary tables have been specified
-	 * in xml before adding more.  This is because adding one secondary table to xml
-	 * will override all the secondary tables specified in the java entity
-	 */
-	boolean secondaryTablesDefinedInXml();
-	
-	/**
-	 * If true, then all virtual secondary tables are added in as specified secondary tables to the xml.
-	 * If false, then all the specified secondary tables are remvoed from the xml.
-	 */
-	void setSecondaryTablesDefinedInXml(boolean defineInXml);
-	
-	/**
-	 * Return the Java Entity this ORM Entity corresponds to.  Return null if there is no
-	 * java entity.
-	 */
-	JavaEntity getJavaEntity();
-
-	void initialize(XmlEntity entity);
-
-	void update(XmlEntity entity);
-	
-	
-	//************ covariant overrides *************
-	
-	OrmTable getTable();
-	
-	OrmDiscriminatorColumn getDiscriminatorColumn();
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmSecondaryTable> secondaryTables();	
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmSecondaryTable> specifiedSecondaryTables();
-	OrmSecondaryTable addSpecifiedSecondaryTable(int index);
-
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmPrimaryKeyJoinColumn> primaryKeyJoinColumns();
-	OrmPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn();
-	ListIterator<OrmPrimaryKeyJoinColumn> defaultPrimaryKeyJoinColumns();
-		String DEFAULT_PRIMARY_KEY_JOIN_COLUMNS_LIST = "defaultPrimaryKeyJoinColumnsList";
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns();
-	OrmPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index);
-
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmAttributeOverride> attributeOverrides();
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmAttributeOverride> specifiedAttributeOverrides();
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmAttributeOverride> virtualAttributeOverrides();
-	OrmAttributeOverride getAttributeOverrideNamed(String name);
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmAssociationOverride> associationOverrides();
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmAssociationOverride> specifiedAssociationOverrides();
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmAssociationOverride> virtualAssociationOverrides();
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmNamedQuery> namedQueries();
-	OrmNamedQuery addNamedQuery(int index);
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmNamedNativeQuery> namedNativeQueries();
-	OrmNamedNativeQuery addNamedNativeQuery(int index);
-	
-	Iterator<OrmPersistentAttribute> overridableAttributes();
-
-	Iterator<OrmPersistentAttribute> overridableAssociations();
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmGeneratedValue.java
deleted file mode 100644
index 3c031e191e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmGeneratedValue.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.core.context.orm;
-
-import org.eclipse.jpt.core.context.GeneratedValue;
-import org.eclipse.jpt.core.resource.orm.XmlGeneratedValue;
-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.
- */
-public interface OrmGeneratedValue extends GeneratedValue, OrmJpaContextNode
-{
-	/**
-	 * Return the (best guess) text location of the generator.
-	 */
-	TextRange getGeneratorTextRange();
-
-	void initialize(XmlGeneratedValue generatedValue);
-
-	void update(XmlGeneratedValue generatedValue);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmGenerator.java
deleted file mode 100644
index 1cfa6a6053..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmGenerator.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.core.context.orm;
-
-import org.eclipse.jpt.core.context.Generator;
-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.
- */
-public interface OrmGenerator extends Generator
-{
-	
-	// **************** validation *********************************************
-	
-	TextRange getNameTextRange();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmGeneratorHolder.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmGeneratorHolder.java
deleted file mode 100644
index 5bc5d7050f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmGeneratorHolder.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.core.context.orm;
-
-import org.eclipse.jpt.core.context.GeneratorHolder;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmGeneratorHolder extends GeneratorHolder
-{
-	OrmSequenceGenerator getSequenceGenerator();
-
-	OrmSequenceGenerator addSequenceGenerator();
-
-	OrmTableGenerator getTableGenerator();
-
-	OrmTableGenerator addTableGenerator();
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmIdMapping.java
deleted file mode 100644
index e76327388a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmIdMapping.java
+++ /dev/null
@@ -1,32 +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.core.context.orm;
-
-import org.eclipse.jpt.core.context.IdMapping;
-import org.eclipse.jpt.core.resource.orm.XmlId;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmIdMapping extends IdMapping, OrmColumnMapping, OrmAttributeMapping, OrmGeneratorHolder
-{
-	OrmGeneratedValue getGeneratedValue();
-	OrmGeneratedValue addGeneratedValue();	
-	
-	void initialize(XmlId id);
-
-	void update(XmlId id);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJoinColumn.java
deleted file mode 100644
index a5f6d1e561..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJoinColumn.java
+++ /dev/null
@@ -1,42 +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.core.context.orm;
-
-import org.eclipse.jpt.core.context.JoinColumn;
-import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmJoinColumn extends JoinColumn, OrmBaseJoinColumn, OrmBaseColumn
-{
-	void initializeFrom(JoinColumn oldColumn);
-	
-	void initialize(XmlJoinColumn column);
-	
-	void update(XmlJoinColumn column);
-	
-	Owner getOwner();
-
-	/**
-	 * interface allowing join columns to be used in multiple places
-	 * (e.g. 1:1 mappings and join tables)
-	 */
-	interface Owner extends JoinColumn.Owner, OrmBaseJoinColumn.Owner, OrmBaseColumn.Owner
-	{
-
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJoinTable.java
deleted file mode 100644
index 717941f229..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJoinTable.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.core.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.JoinTable;
-import org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmJoinTable extends JoinTable, OrmJpaContextNode
-{
-
-	boolean isSpecified();
-
-	void initialize(XmlRelationshipMapping relationshipMapping);
-
-	void update(XmlRelationshipMapping relationshipMapping);
-		
-	void initializeFrom(JoinTable oldJoinTable);
-
-	
-	//****************** covariant overrides *******************
-	
-	OrmRelationshipMapping getParent();
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmJoinColumn> joinColumns();
-
-	OrmJoinColumn getDefaultJoinColumn();
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmJoinColumn> specifiedJoinColumns();
-
-	OrmJoinColumn addSpecifiedJoinColumn(int index);
-
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmJoinColumn> inverseJoinColumns();
-
-	OrmJoinColumn getDefaultInverseJoinColumn();
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmJoinColumn> specifiedInverseJoinColumns();
-
-	OrmJoinColumn addSpecifiedInverseJoinColumn(int index);
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmUniqueConstraint> uniqueConstraints();
-	
-	OrmUniqueConstraint addUniqueConstraint(int index);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJpaContextNode.java
deleted file mode 100644
index fba346368d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJpaContextNode.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.core.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.JpaContextNode;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmJpaContextNode extends JpaContextNode
-{
-	// **************** validation **************************************
-
-	/**
-	 * Add to the list of current validation messages
-	 */
-	void addToMessages(List<IMessage> messages);
-
-	TextRange getValidationTextRange();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmManyToManyMapping.java
deleted file mode 100644
index 3d0fa79d34..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmManyToManyMapping.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.core.context.orm;
-
-import org.eclipse.jpt.core.context.ManyToManyMapping;
-import org.eclipse.jpt.core.resource.orm.XmlManyToMany;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmManyToManyMapping extends ManyToManyMapping, OrmMultiRelationshipMapping
-{
-
-	void initialize(XmlManyToMany xmlManyToMany);
-
-	void update(XmlManyToMany xmlManyToMany);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmManyToOneMapping.java
deleted file mode 100644
index 9b33b8974f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmManyToOneMapping.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.core.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.ManyToOneMapping;
-import org.eclipse.jpt.core.resource.orm.XmlManyToOne;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmManyToOneMapping extends ManyToOneMapping, OrmSingleRelationshipMapping
-{
-	ListIterator<OrmJoinColumn> joinColumns();
-	
-	ListIterator<OrmJoinColumn> specifiedJoinColumns();
-
-	void initialize(XmlManyToOne xmlManyToOne);
-
-	void update(XmlManyToOne xmlManyToOne);
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmMappedSuperclass.java
deleted file mode 100644
index 458a889016..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmMappedSuperclass.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.core.context.orm;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.context.MappedSuperclass;
-import org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmMappedSuperclass extends MappedSuperclass, OrmTypeMapping
-{
-	void initialize(XmlMappedSuperclass mappedSuperclass);
-
-	void update(XmlMappedSuperclass mappedSuperclass);
-	
-	Iterator<OrmPersistentAttribute> overridableAttributes();
-
-	Iterator<OrmPersistentAttribute> overridableAssociations();
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmMultiRelationshipMapping.java
deleted file mode 100644
index a65523a338..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmMultiRelationshipMapping.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.core.context.orm;
-
-import org.eclipse.jpt.core.context.MultiRelationshipMapping;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmMultiRelationshipMapping extends OrmRelationshipMapping, MultiRelationshipMapping
-{
-
-	OrmJoinTable getJoinTable();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmNamedColumn.java
deleted file mode 100644
index b36a9d5c14..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmNamedColumn.java
+++ /dev/null
@@ -1,48 +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.core.context.orm;
-
-import org.eclipse.jpt.core.context.NamedColumn;
-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.
- */
-public interface OrmNamedColumn extends NamedColumn, OrmJpaContextNode
-{
-
-	Owner getOwner();
-	
-	/**
-	 * Return the (best guess) text location of the column's name.
-	 */
-	TextRange getNameTextRange();
-
-	/**
-	 * interface allowing columns to be used in multiple places
-	 * (e.g. basic mappings and attribute overrides)
-	 */
-	interface Owner extends NamedColumn.Owner
-	{
-		/**
-		 * Return the column owner's text range. This can be returned by the
-		 * column when its annotation is not present.
-		 */
-		TextRange getValidationTextRange();
-
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmNamedNativeQuery.java
deleted file mode 100644
index d80e1138ee..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmNamedNativeQuery.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.core.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.NamedNativeQuery;
-import org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmNamedNativeQuery extends OrmQuery, NamedNativeQuery
-{
-	ListIterator<OrmQueryHint> hints();
-
-	void initialize(XmlNamedNativeQuery queryResource);
-
-	void update(XmlNamedNativeQuery queryResource);
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmNamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmNamedQuery.java
deleted file mode 100644
index 8d37ba5722..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmNamedQuery.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.core.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.NamedQuery;
-import org.eclipse.jpt.core.resource.orm.XmlNamedQuery;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmNamedQuery extends OrmQuery, NamedQuery
-{	
-	ListIterator<OrmQueryHint> hints();
-	
-	void initialize(XmlNamedQuery queryResource);
-
-	void update(XmlNamedQuery queryResource);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmOneToManyMapping.java
deleted file mode 100644
index bb0560abf4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmOneToManyMapping.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.core.context.orm;
-
-import org.eclipse.jpt.core.context.OneToManyMapping;
-import org.eclipse.jpt.core.resource.orm.XmlOneToMany;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmOneToManyMapping extends OneToManyMapping, OrmMultiRelationshipMapping
-{
-
-	void initialize(XmlOneToMany xmlOneToMany);
-
-	void update(XmlOneToMany xmlOneToMany);
-	
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmOneToOneMapping.java
deleted file mode 100644
index 9be2aabad9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmOneToOneMapping.java
+++ /dev/null
@@ -1,43 +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.core.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.OneToOneMapping;
-import org.eclipse.jpt.core.resource.orm.XmlOneToOne;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmOneToOneMapping extends OneToOneMapping, OrmSingleRelationshipMapping
-{
-
-	void initialize(XmlOneToOne oneToOne);
-
-	void update(XmlOneToOne oneToOne);
-	
-	
-	// ********** covariant overrides **********
-	ListIterator<OrmJoinColumn> joinColumns();
-
-	ListIterator<OrmJoinColumn> specifiedJoinColumns();
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmPrimaryKeyJoinColumn> primaryKeyJoinColumns();
-	
-	OrmPrimaryKeyJoinColumn addPrimaryKeyJoinColumn(int index);
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPersistentAttribute.java
deleted file mode 100644
index 0cadf3e218..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPersistentAttribute.java
+++ /dev/null
@@ -1,139 +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.core.context.orm;
-
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.resource.orm.XmlBasic;
-import org.eclipse.jpt.core.resource.orm.XmlEmbedded;
-import org.eclipse.jpt.core.resource.orm.XmlEmbeddedId;
-import org.eclipse.jpt.core.resource.orm.XmlId;
-import org.eclipse.jpt.core.resource.orm.XmlManyToMany;
-import org.eclipse.jpt.core.resource.orm.XmlManyToOne;
-import org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlOneToMany;
-import org.eclipse.jpt.core.resource.orm.XmlOneToOne;
-import org.eclipse.jpt.core.resource.orm.XmlTransient;
-import org.eclipse.jpt.core.resource.orm.XmlVersion;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmPersistentAttribute extends PersistentAttribute, OrmJpaContextNode
-{
-	
-	/**
-	 * Overriden to return {@link OrmAttributeMapping}s
-	 */
-	OrmAttributeMapping getMapping();
-	
-	/**
-	 * Overriden to return {@link OrmAttributeMapping}s
-	 */
-	OrmAttributeMapping getSpecifiedMapping();
-	
-	/**
-	 * Overriden to return {@link OrmTypeMapping}s
-	 */
-	OrmTypeMapping getTypeMapping();
-	
-	/**
-	 * Overriden to return {@link OrmPersistentType}s
-	 */
-	OrmPersistentType getPersistentType();
-	
-	boolean contains(int textOffset);
-
-	/**
-	 * Make the persistent attribute virtual. The attribute will be removed
-	 * from the list of specified persistent attributes on the {@link OrmPersistentType} 
-	 * and removed from the orm.xml file.
-	 * 
-	 * If the persistent attribute is already virtual, an IllegalStateException is thrown
-	 * @see PersistentAttribute#isVirtual()
-	 */
-	void makeVirtual();
-	
-	/**
-	 * Take a virtual persistent attribute and specify it.
-	 * The attribute will be added to the list of specified persistent attributes
-	 * and added to the orm.xml file. The mappingKey will remain the same.
-	 * 
-	 * If the persistent attribute is already specified, an IllegalStateException is thrown
-	 * @see PersistentAttribute#isVirtual()
-	 */
-	void makeSpecified();
-	
-	/**
-	 * Take a virtual persistent attribute and specify it.
-	 * The attribute will be added to the list of specified persistent attributes
-	 * and added to the orm.xml file. The mappingKey will determine the type of mapping added
-	 * instead of the mappingKey already on the persistent attribute
-	 * 
-	 * If the persistent attribute is already specified, an IllegalStateException is thrown
-	 * @see PersistentAttribute#isVirtual()
-	 */
-	void makeSpecified(String mappingKey);
-	
-	void nameChanged(String oldName, String newName);
-
-	
-	//******************* initialization/updating *******************
-
-	void initialize(XmlBasic basic);
-	
-	void initialize(XmlEmbedded embedded);
-	
-	void initialize(XmlVersion version);
-	
-	void initialize(XmlManyToOne manyToOne);
-	
-	void initialize(XmlOneToMany oneToMany);
-	
-	void initialize(XmlOneToOne oneToOne);
-	
-	void initialize(XmlManyToMany manyToMany);
-	
-	void initialize(XmlId id);
-	
-	void initialize(XmlEmbeddedId embeddedId);
-	
-	void initialize(XmlTransient transientResource);
-	
-	void initialize(XmlNullAttributeMapping xmlNullAttributeMapping);
-	
-	void update(XmlId id);
-	
-	void update(XmlEmbeddedId embeddedId);
-
-	void update(XmlBasic basic);
-	
-	void update(XmlVersion version);
-	
-	void update(XmlManyToOne manyToOne);
-	
-	void update(XmlOneToMany oneToMany);
-	
-	void update(XmlOneToOne oneToOne);
-	
-	void update(XmlManyToMany manyToMany);
-
-	void update(XmlEmbedded embedded);
-	
-	void update(XmlTransient transientResource);
-	
-	void update(XmlNullAttributeMapping xmlNullAttributeMapping);
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPersistentType.java
deleted file mode 100644
index ed07de1582..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPersistentType.java
+++ /dev/null
@@ -1,142 +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.core.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.PersistentType;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.resource.orm.XmlEmbeddable;
-import org.eclipse.jpt.core.resource.orm.XmlEntity;
-import org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmPersistentType extends PersistentType, OrmJpaContextNode
-{
-	/**
-	 * Overriden to return {@link OrmPersistentAttribute}s
-	 */
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmPersistentAttribute> attributes();
-	
-	/**
-	 * Overriden to return an {@link OrmPersistentAttribute}
-	 */
-	OrmPersistentAttribute getAttributeNamed(String attributeName);
-
-	/**
-	 * Overriden to return an {@link OrmTypeMapping}
-	 */
-	OrmTypeMapping getMapping();
-
-	//******************* specified attributes *******************
-
-	/**
-	 * Return a read only iterator of the specified {@link OrmPersistentAttribute}s.
-	 */
-	ListIterator<OrmPersistentAttribute> specifiedAttributes();
-	
-	/**
-	 * Return the number of specified {@link OrmPersistentAttribute}s.
-	 */
-	int specifiedAttributesSize();
-
-	//TODO these are currently only used by tests, possibly remove them.  OrmPersistenAttributes.setVirtual(boolean) is used by the UI
-	OrmPersistentAttribute addSpecifiedPersistentAttribute(String mappingKey, String attributeName);
-	void removeSpecifiedPersistentAttribute(OrmPersistentAttribute ormPersistentAttribute);
-
-	
-	//******************* vritual attributes *******************
-	String VIRTUAL_ATTRIBUTES_LIST = "virtualAttributesList";
-
-	/**
-	 * Return a read only iterator of the virtual orm persistent attributes.  These
-	 * are attributes that exist in the underyling java class, but are not specified
-	 * in the orm.xml
-	 */
-	ListIterator<OrmPersistentAttribute> virtualAttributes();
-	
-	/**
-	 * Return the number of virtual orm persistent attributes.  These are attributes that 
-	 * exist in the underyling java class, but are not specified in the orm.xml
-	 */
-	int virtualAttributesSize();
-	
-	/**
-	 * Return whether this persistent type contains the given virtual persistent attribute.
-	 */
-	boolean containsVirtualPersistentAttribute(OrmPersistentAttribute ormPersistentAttribute);
-	
-	/**
-	 * Remove the given specified orm persistent attribute from the orm.xml. The attribute 
-	 * will be removed from the orm.xml and moved from the list of specified attributes 
-	 * to the list of virtual attributes.
-	 */
-	void makePersistentAttributeVirtual(OrmPersistentAttribute ormPersistentAttribute);
-		
-	/**
-	 * Add the given virtual orm persistent attribute to the orm.xml. The attribute will
-	 * be added to the orm.xml and moved from the list of virtual attributes to the list
-	 * of specified attributes
-	 */
-	void makePersistentAttributeSpecified(OrmPersistentAttribute ormPersistentAttribute);
-
-	/**
-	 * Add the given virtual orm persistent attribute to the orm.xml with a mapping of 
-	 * type mappingKey. The attribute will be added to the orm.xml and moved from 
-	 * the list of virtual attributes to the list of specified attributes
-	 */
-	void makePersistentAttributeSpecified(OrmPersistentAttribute ormPersistentAttribute, String mappingKey);
-
-	//******************* mapping morphing *******************
-	void changeMapping(OrmPersistentAttribute ormPersistentAttribute, OrmAttributeMapping oldMapping, OrmAttributeMapping newMapping);
-	
-	
-	//******************* initialization/updating *******************
-
-	void initialize(XmlEntity entity);
-	
-	void initialize(XmlMappedSuperclass mappedSuperclass);
-		
-	void initialize(XmlEmbeddable embeddable);
-	
-	void update(XmlEntity entity);
-	
-	void update(XmlMappedSuperclass mappedSuperclass);
-	
-	void update(XmlEmbeddable embeddable);
-
-	
-	
-	boolean contains(int textOffset);
-	
-	/**
-	 * Return whether this {@link OrmPersistentType) applies to the
-	 * given fullyQualifiedTypeName.
-	 */
-	boolean isFor(String fullyQualifiedTypeName);
-	
-	void classChanged(String oldClass, String newClass);
-	
-	/**
-	 * Return the Java persistent type that is referred to by this orm.xml persistent type.
-	 * If there is no underlying java persistent type, then null is returned.
-	 * @return
-	 */
-	JavaPersistentType getJavaPersistentType();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPrimaryKeyJoinColumn.java
deleted file mode 100644
index 83efee2974..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPrimaryKeyJoinColumn.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.core.context.orm;
-
-import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmPrimaryKeyJoinColumn extends PrimaryKeyJoinColumn, OrmBaseJoinColumn
-{
-	void initialize(XmlPrimaryKeyJoinColumn column);
-	
-	void update(XmlPrimaryKeyJoinColumn column);
-	
-	void initializeFrom(PrimaryKeyJoinColumn oldPkJoinColumn);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmQuery.java
deleted file mode 100644
index f3790cc3b4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmQuery.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.core.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.Query;
-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.
- */
-public interface OrmQuery extends Query, OrmJpaContextNode
-{
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmQueryHint> hints();
-	
-	OrmQueryHint addHint(int index);
-	
-	
-	// **************** validation *********************************************
-	
-	TextRange getNameTextRange();
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmQueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmQueryHint.java
deleted file mode 100644
index 3031ff6f63..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmQueryHint.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.core.context.orm;
-
-import org.eclipse.jpt.core.context.QueryHint;
-import org.eclipse.jpt.core.resource.orm.XmlQueryHint;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmQueryHint extends QueryHint, OrmJpaContextNode
-{
-	void initialize(XmlQueryHint queryHint);
-
-	void update(XmlQueryHint queryHint);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmRelationshipMapping.java
deleted file mode 100644
index 6e35ea582e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmRelationshipMapping.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.core.context.orm;
-
-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.
- */
-public interface OrmRelationshipMapping
-	extends OrmAttributeMapping, RelationshipMapping
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmSecondaryTable.java
deleted file mode 100644
index 47e5cb48f4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmSecondaryTable.java
+++ /dev/null
@@ -1,51 +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.core.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.SecondaryTable;
-import org.eclipse.jpt.core.resource.orm.XmlSecondaryTable;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmSecondaryTable extends SecondaryTable, OrmJpaContextNode
-{
-
-	void update(XmlSecondaryTable secondaryTable);
-
-	void initializeFrom(SecondaryTable oldSecondaryTable);
-
-	
-	//************ covariant overrides *************
-
-	OrmEntity getParent();
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmPrimaryKeyJoinColumn> primaryKeyJoinColumns();
-	
-	OrmPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn();
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns();
-	
-	OrmPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index);
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmUniqueConstraint> uniqueConstraints();
-	
-	OrmUniqueConstraint addUniqueConstraint(int index);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmSequenceGenerator.java
deleted file mode 100644
index ed75a3be8c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmSequenceGenerator.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.core.context.orm;
-
-import org.eclipse.jpt.core.context.SequenceGenerator;
-import org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmSequenceGenerator extends SequenceGenerator, OrmGenerator, OrmJpaContextNode
-{
-	void initialize(XmlSequenceGenerator sequenceGenerator);
-
-	void update(XmlSequenceGenerator sequenceGenerator);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmSingleRelationshipMapping.java
deleted file mode 100644
index bfced13c1c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmSingleRelationshipMapping.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.core.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.SingleRelationshipMapping;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmSingleRelationshipMapping extends OrmRelationshipMapping, SingleRelationshipMapping
-{
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmJoinColumn> joinColumns();
-	
-	OrmJoinColumn getDefaultJoinColumn();
-	
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmJoinColumn> specifiedJoinColumns();
-	
-	OrmJoinColumn addSpecifiedJoinColumn(int index);
-	
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmStructureNodes.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmStructureNodes.java
deleted file mode 100644
index f6e5dba9db..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmStructureNodes.java
+++ /dev/null
@@ -1,34 +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.core.context.orm;
-
-import org.eclipse.jpt.core.JptCorePlugin;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmStructureNodes 
-{
-	
-	String ENTITY_MAPPINGS_ID = 
-		JptCorePlugin.PLUGIN_ID + ".orm.entityMappings";
-	
-	String PERSISTENT_TYPE_ID = 
-		JptCorePlugin.PLUGIN_ID + ".orm.persistentType";
-	
-	String PERSISTENT_ATTRIBUTE_ID =
-		JptCorePlugin.PLUGIN_ID + ".orm.persistentAttribute";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTable.java
deleted file mode 100644
index ca0d2b794a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTable.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.core.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.Table;
-import org.eclipse.jpt.core.resource.orm.XmlEntity;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmTable extends Table, OrmJpaContextNode
-{
-	void initialize(XmlEntity entity);
-
-	void update(XmlEntity entity);
-
-	
-	//****************** covariant overrides *******************
-
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmUniqueConstraint> uniqueConstraints();
-	
-	OrmUniqueConstraint addUniqueConstraint(int index);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTableGenerator.java
deleted file mode 100644
index 9f3183a4fe..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTableGenerator.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.core.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.TableGenerator;
-import org.eclipse.jpt.core.resource.orm.XmlTableGenerator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmTableGenerator extends TableGenerator, OrmGenerator, OrmJpaContextNode
-{
-	void initialize(XmlTableGenerator tableGenerator);
-
-	void update(XmlTableGenerator tableGenerator);
-	
-	//****************** covariant overrides *******************
-
-	@SuppressWarnings("unchecked")
-	ListIterator<OrmUniqueConstraint> uniqueConstraints();
-	
-	OrmUniqueConstraint addUniqueConstraint(int index);
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTransientMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTransientMapping.java
deleted file mode 100644
index 48ffec4f57..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTransientMapping.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.core.context.orm;
-
-import org.eclipse.jpt.core.context.TransientMapping;
-import org.eclipse.jpt.core.resource.orm.XmlTransient;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmTransientMapping extends TransientMapping, OrmAttributeMapping
-{
-	void initialize(XmlTransient transientResource);
-
-	void update(XmlTransient transientResource);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMapping.java
deleted file mode 100644
index af424ab142..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMapping.java
+++ /dev/null
@@ -1,90 +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.core.context.orm;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.context.AccessType;
-import org.eclipse.jpt.core.context.TypeMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-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.
- */
-public interface OrmTypeMapping extends TypeMapping, OrmJpaContextNode
-{
-	String JAVA_PERSISTENT_TYPE_PROPERTY = "javaPersistentTypeProperty";
-
-	String getClass_();
-	void setClass(String newClass);
-	String CLASS_PROPERTY = "classProperty";
-
-	AccessType getAccess();
-	AccessType getDefaultAccess();
-	String DEFAULT_ACCESS_PROPERTY = "defaultAccessProperty";
-
-	AccessType getSpecifiedAccess();
-	void setSpecifiedAccess(AccessType newSpecifiedAccess);
-	String SPECIFIED_ACCESS_PROPERTY = "specifiedAccessProperty";
-
-	
-	boolean isMetadataComplete();
-	Boolean getSpecifiedMetadataComplete();
-	void setSpecifiedMetadataComplete(Boolean newSpecifiedMetadataComplete);
-		String SPECIFIED_METADATA_COMPLETE_PROPERTY = "specifiedMetadataCompleteProperty";
-
-	boolean isDefaultMetadataComplete();
-		String DEFAULT_METADATA_COMPLETE_PROPERTY = "defaultMetadataCompleteProperty";
-
-	
-	/**
-	 * type mappings are a sequence in the orm schema. We must keep
-	 * the list of type mappings in the appropriate order so the wtp xml 
-	 * translators will write them to the xml in that order and they
-	 * will adhere to the schema.  
-	 * 
-	 * Each concrete subclass of XmlTypeMapping must implement this
-	 * method and return an int that matches it's order in the schema
-	 * @return
-	 */
-	int getXmlSequence();
-
-	void removeFromResourceModel(XmlEntityMappings entityMappings);
-		
-	AbstractXmlTypeMapping addToResourceModel(XmlEntityMappings entityMappings);
-
-	void initializeFrom(OrmTypeMapping oldMapping);
-
-	AbstractXmlTypeMapping getTypeMappingResource();
-	
-	JavaPersistentType getJavaPersistentType();
-
-	TextRange getSelectionTextRange();
-
-	TextRange getAttributesTextRange();
-	
-	boolean containsOffset(int textOffset);
-	
-	OrmPersistentType getPersistentType();
-	
-	@SuppressWarnings("unchecked")
-	Iterator<OrmPersistentAttribute> overridableAttributes();
-	
-	@SuppressWarnings("unchecked")
-	Iterator<OrmPersistentAttribute> overridableAssociations();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMappingProvider.java
deleted file mode 100644
index 2260f62550..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMappingProvider.java
+++ /dev/null
@@ -1,29 +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.core.context.orm;
-
-import org.eclipse.jpt.core.JpaFactory;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmTypeMappingProvider
-{
-	String getKey();
-	
-	OrmTypeMapping buildTypeMapping(JpaFactory factory, OrmPersistentType parent);
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmUniqueConstraint.java
deleted file mode 100644
index 99abcc5fc0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmUniqueConstraint.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.core.context.orm;
-
-import org.eclipse.jpt.core.context.UniqueConstraint;
-import org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmUniqueConstraint extends UniqueConstraint, OrmJpaContextNode
-{
-	void update(XmlUniqueConstraint uniqueConstraint);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmVersionMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmVersionMapping.java
deleted file mode 100644
index 36192c804f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmVersionMapping.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.core.context.orm;
-
-import org.eclipse.jpt.core.context.VersionMapping;
-import org.eclipse.jpt.core.resource.orm.XmlVersion;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmVersionMapping extends VersionMapping, OrmColumnMapping, OrmAttributeMapping
-{
-	void initialize(XmlVersion version);
-
-	void update(XmlVersion version);
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmXml.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmXml.java
deleted file mode 100644
index 5eb6af8db0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmXml.java
+++ /dev/null
@@ -1,67 +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.core.context.orm;
-
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.core.resource.orm.OrmResource;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmXml extends OrmJpaContextNode, JpaStructureNode
-{
-	
-	MappingFileRef getParent();
-	
-	// **************** persistence *******************************************
-	
-	/**
-	 * String constant associated with changes to the entity-mappings property
-	 */
-	public final static String ENTITY_MAPPINGS_PROPERTY = "entityMappingsProperty";
-	
-	/** 
-	 * Return the content represented by the root of the orm.xml file.
-	 * This may be null.
-	 */
-	EntityMappings getEntityMappings();
-	
-	/**
-	 * Add a entity-mappings node to the orm.xml file and return the object 
-	 * representing it.
-	 * Throws {@link IllegalStateException} if a entity-mappings node already exists.
-	 */
-	EntityMappings addEntityMappings();
-	
-	/**
-	 * Remove the entity-mappings node from the orm.xml file.
-	 * Throws {@link IllegalStateException} if a persistence node does not exist.
-	 */
-	void removeEntityMappings();
-	
-	PersistenceUnitDefaults getPersistenceUnitDefaults();
-	
-	/**
-	 * Return the OrmPersistentType listed in this mapping file
-	 * with the given fullyQualifiedTypeName.  Return null if none exists.
-	 */
-	OrmPersistentType getPersistentType(String fullyQualifiedTypeName);
-
-	// **************** updating **********************************************
-	
-	void update(OrmResource ormResource);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/PersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/PersistenceUnitDefaults.java
deleted file mode 100644
index 8522fbc117..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/PersistenceUnitDefaults.java
+++ /dev/null
@@ -1,59 +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.core.context.orm;
-
-import org.eclipse.jpt.core.context.AccessType;
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 PersistenceUnitDefaults extends OrmJpaContextNode
-{
-
-	/**
-	 * Return the specifiedSchema if not null, otherwise return the defaultSchema.
-	 */
-	String getSchema();
-	String getDefaultSchema();
-		String DEFAULT_SCHEMA_PROPERTY = "defaultSchemaProperty";
-	String getSpecifiedSchema();
-	void setSpecifiedSchema(String newSpecifiedSchema);
-		String SPECIFIED_SCHEMA_PROPERTY = "specifiedSchemaProperty";
-
-	/**
-	 * Return the specifiedCatalog if not null, otherwise return the defaultCatalog.
-	 */
-	String getCatalog();
-	String getDefaultCatalog();
-		String DEFAULT_CATALOG_PROPERTY = "defaultCatalogProperty";
-	String getSpecifiedCatalog();
-	void setSpecifiedCatalog(String newSpecifiedCatalog);
-		String SPECIFIED_CATALOG_PROPERTY = "specifiedCatalogProperty";
-
-	AccessType getAccess();
-	void setAccess(AccessType value);
-		String ACCESS_PROPERTY = "accessProperty";
-
-	boolean isCascadePersist();
-
-	void setCascadePersist(boolean value);
-	String CASCADE_PERSIST_PROPERTY = "cascadePersistProperty";
-	
-	
-	void update(XmlEntityMappings entityMappings);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/PersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/PersistenceUnitMetadata.java
deleted file mode 100644
index 4b00f0561f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/PersistenceUnitMetadata.java
+++ /dev/null
@@ -1,33 +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.core.context.orm;
-
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 PersistenceUnitMetadata extends OrmJpaContextNode
-{
-	boolean isXmlMappingMetadataComplete();
-	void setXmlMappingMetadataComplete(boolean value);
-		String XML_MAPPING_METADATA_COMPLETE_PROPERTY = "xmlMappingMetadataCompleteProperty";
-
-	PersistenceUnitDefaults getPersistenceUnitDefaults();
-		
-	void update(XmlEntityMappings entityMappings);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/ClassRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/ClassRef.java
deleted file mode 100644
index 5340a0bd83..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/ClassRef.java
+++ /dev/null
@@ -1,87 +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.core.context.persistence;
-
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 ClassRef extends PersistenceJpaContextNode, JpaStructureNode
-{
-	/**
-	 * Return true if the IClassRef matches the fullyQualfiedTypeName
-	 */
-	boolean isFor(String fullyQualifiedTypeName);
-	
-	/**
-	 * Return whether this mapping file ref is represented by an entry in the
-	 * persistence.xml (false) or if it is instead virtual
-	 */
-	boolean isVirtual();
-	
-	
-	// **************** class name *********************************************
-	
-	/**
-	 * String constant associated with changes to the class name
-	 */
-	final static String CLASS_NAME_PROPERTY = "className";
-	
-	/**
-	 * Return the class name of the class ref.
-	 */
-	String getClassName();
-	
-	/**
-	 * Set the class name of the class ref.
-	 */
-	void setClassName(String className);
-	
-	
-	// **************** java persistent type ***********************************
-	
-	/**
-	 * String constant associated with changes to the java persistent type
-	 */
-	final static String JAVA_PERSISTENT_TYPE_PROPERTY = "javaPersistentType";
-	
-	/**
-	 * Return the JavaPersistentType that corresponds to this IClassRef.
-	 * This can be null.
-	 * This is not settable by users of this API.
-	 */
-	JavaPersistentType getJavaPersistentType();
-	
-	
-	// **************** update **************************************
-	
-	void update(XmlJavaClassRef classRef);
-	
-	void update(String className);
-	
-	
-	// *************************************************************************
-	
-	/**
-	 * Return whether the text representation of this persistence unit contains
-	 * the given text offset
-	 */
-	boolean containsOffset(int textOffset);
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/MappingFileRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/MappingFileRef.java
deleted file mode 100644
index 9e6fa15a5c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/MappingFileRef.java
+++ /dev/null
@@ -1,82 +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.core.context.persistence;
-
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.orm.OrmXml;
-import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults;
-import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 MappingFileRef extends PersistenceJpaContextNode, JpaStructureNode
-{
-	/**
-	 * Return whether this mapping file ref is represented by an entry in the
-	 * persistence.xml (false) or if it is instead virtual
-	 */
-	boolean isVirtual();
-	
-	
-	// **************** file name **********************************************
-	
-	/**
-	 * String constant associated with changes to the file name
-	 */
-	String FILE_NAME_PROPERTY = "fileNameProperty";
-	
-	/**
-	 * Return the file name of the mapping file ref.
-	 */
-	String getFileName();
-	
-	/**
-	 * Set the file name of the mapping file ref.
-	 */
-	void setFileName(String fileName);
-	
-	
-	// **************** orm xml ************************************************
-	
-	String ORM_XML_PROPERTY = "ormXmlProperty";
-	
-	OrmXml getOrmXml();	
-	
-	
-	// **************** udpating ***********************************************
-	
-	void update(XmlMappingFileRef mappingFileRef);
-	
-	
-	// *************************************************************************
-	
-	PersistenceUnitDefaults getPersistenceUnitDefaults();
-	
-	/**
-	 * Return the OrmPersistentType listed in this mapping file
-	 * with the given fullyQualifiedTypeName.  Return null if none exists.
-	 */
-	OrmPersistentType getPersistentType(String fullyQualifiedTypeName);
-	
-	/**
-	 * Return whether the text representation of this persistence unit contains
-	 * the given text offset
-	 */
-	boolean containsOffset(int textOffset);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/Persistence.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/Persistence.java
deleted file mode 100644
index a421f0976a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/Persistence.java
+++ /dev/null
@@ -1,82 +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.core.context.persistence;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.resource.persistence.XmlPersistence;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 Persistence extends PersistenceJpaContextNode, JpaStructureNode
-{
-	// **************** persistence units **************************************
-	
-	/**
-	 * String constant associated with changes to the persistence units list
-	 */
-	public final static String PERSISTENCE_UNITS_LIST = "persistenceUnits";
-	
-	/**
-	 * Return an iterator on the list of persistence units.
-	 * This will not be null.
-	 */
-	ListIterator<PersistenceUnit> persistenceUnits();
-	
-	/**
-	 * Return the size of the persistence unit list.
-	 * @return
-	 */
-	int persistenceUnitsSize();
-	
-	/**
-	 * Add a persistence unit to the persistence node and return the object 
-	 * representing it.
-	 */
-	PersistenceUnit addPersistenceUnit();
-	
-	/**
-	 * Add a persistence unit to the persistence node at the specified index and 
-	 * return the object representing it.
-	 */
-	PersistenceUnit addPersistenceUnit(int index);
-	
-	/**
-	 * Remove the persistence unit from the persistence node.
-	 */
-	void removePersistenceUnit(PersistenceUnit persistenceUnit);
-	
-	/**
-	 * Remove the persistence unit at the specified index from the persistence node.
-	 */
-	void removePersistenceUnit(int index);
-	
-	
-	// **************** updating ***********************************************
-		
-	void update(XmlPersistence persistence);
-	
-	
-	// **************** text range *********************************************
-	
-	/**
-	 * Return whether the text representation of this persistence contains
-	 * the given text offset
-	 */
-	boolean containsOffset(int textOffset);
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceJpaContextNode.java
deleted file mode 100644
index 46468ce8b6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceJpaContextNode.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.core.context.persistence;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.JpaContextNode;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 PersistenceJpaContextNode extends JpaContextNode
-{
-	// **************** validation **************************************
-
-	/**
-	 * Add to the list of current validation messages
-	 */
-	void addToMessages(List<IMessage> messages);
-
-	TextRange getValidationTextRange();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceStructureNodes.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceStructureNodes.java
deleted file mode 100644
index 1a7eefe923..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceStructureNodes.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.core.context.persistence;
-
-import org.eclipse.jpt.core.JptCorePlugin;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 PersistenceStructureNodes 
-{
-	
-	String PERSISTENCE_ID = 
-		JptCorePlugin.PLUGIN_ID + ".persistence.persistence";
-	
-	String PERSISTENCE_UNIT_ID = 
-		JptCorePlugin.PLUGIN_ID + ".persistence.persistenceUnit";
-	
-	String CLASS_REF_ID =
-		JptCorePlugin.PLUGIN_ID + ".persistence.classRef";
-	
-	String MAPPING_FILE_REF_ID =
-		JptCorePlugin.PLUGIN_ID + ".persistence.mappingFileRef";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnit.java
deleted file mode 100644
index c4d7b24fee..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnit.java
+++ /dev/null
@@ -1,470 +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.core.context.persistence;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.context.AccessType;
-import org.eclipse.jpt.core.context.Generator;
-import org.eclipse.jpt.core.context.PersistentType;
-import org.eclipse.jpt.core.context.Query;
-import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 PersistenceUnit extends PersistenceJpaContextNode, JpaStructureNode
-{
-	// **************** parent *************************************************
-	
-	Persistence getParent();
-	
-	
-	// **************** name ***************************************************
-	
-	/**
-	 * String constant associated with changes to the persistence unit's name
-	 */
-	final static String NAME_PROPERTY = "name";
-	
-	/**
-	 * Return the name of the persistence unit.
-	 */
-	String getName();
-	
-	/**
-	 * Set the name of the persistence unit.
-	 */
-	void setName(String name);
-	
-	
-	// **************** transaction type ***************************************
-	
-	PersistenceUnitTransactionType getTransactionType();
-
-	/**
-	 * String constant associated with changes to the persistence unit's 
-	 * specified transaction type
-	 */
-	String SPECIFIED_TRANSACTION_TYPE_PROPERTY = "transactionType";
-	
-	/** 
-	 * Return the transaction type of the persistence unit, one of the values of 
-	 * {@link PersistenceUnitTransactionType} 
-	 */
-	PersistenceUnitTransactionType getSpecifiedTransactionType();
-	
-	/** 
-	 * Set the transaction type of the persistence unit, one of the values of 
-	 * {@link PersistenceUnitTransactionType} 
-	 */
-	void setSpecifiedTransactionType(PersistenceUnitTransactionType transactionType);
-	
-	/**
-	 * String constant associated with changes to the persistence unit's 
-	 * default transaction type (not typically changed)
-	 */
-	final static String DEFAULT_TRANSACTION_TYPE_PROPERTY = "defaultTransactionType";
-	
-	/** 
-	 * Return the default transaction type 
-	 */
-	PersistenceUnitTransactionType getDefaultTransactionType();
-	
-	
-	
-	// **************** description ********************************************
-	
-	/**
-	 * String constant associated with changes to the persistence unit's description
-	 */
-	final static String DESCRIPTION_PROPERTY = "description";
-	
-	/**
-	 * Return the description of the persistence unit.
-	 */
-	String getDescription();
-	
-	/**
-	 * Set the description of the persistence unit.
-	 */
-	void setDescription(String description);
-	
-	
-	// **************** provider ********************************************
-	
-	/**
-	 * String constant associated with changes to the persistence unit's provider
-	 */
-	final static String PROVIDER_PROPERTY = "provider";
-	
-	/**
-	 * Return the provider of the persistence unit.
-	 */
-	String getProvider();
-	
-	/**
-	 * Set the provider of the persistence unit.
-	 */
-	void setProvider(String provider);
-	
-	
-	// **************** jta data source ****************************************
-	
-	/**
-	 * String constant associated with changes to the persistence unit's JTA data source
-	 */
-	final static String JTA_DATA_SOURCE_PROPERTY = "jtaDataSource";
-	
-	/**
-	 * Return the JTA data source of the persistence unit.
-	 */
-	String getJtaDataSource();
-	
-	/**
-	 * Set the JTA data source of the persistence unit.
-	 */
-	void setJtaDataSource(String jtaDataSource);
-	
-	
-	// **************** non-jta data source ************************************
-	
-	/**
-	 * String constant associated with changes to the persistence unit's non-JTA data source
-	 */
-	final static String NON_JTA_DATA_SOURCE_PROPERTY = "nonJtaDataSource";
-	
-	/**
-	 * Return the non-JTA data source of the persistence unit.
-	 */
-	String getNonJtaDataSource();
-	
-	/**
-	 * Set the non-JTA data source of the persistence unit.
-	 */
-	void setNonJtaDataSource(String nonJtaDataSource);
-	
-	
-	// **************** mapping file refs **************************************
-	
-	/**
-	 * Return an iterator on the list of mapping file refs, whether specified or
-	 * implied.
-	 * This will not be null.
-	 */
-	ListIterator<MappingFileRef> mappingFileRefs();
-	
-	/**
-	 * Return of mapping file refs, specified and implied.
-	 */
-	int mappingFileRefsSize();
-	
-	// **************** specified mapping file refs ****************************
-	
-	/**
-	 * String constant associated with changes to the specified mapping file refs list
-	 */
-	final static String SPECIFIED_MAPPING_FILE_REF_LIST = "specifiedMappingFileRefs";
-	
-	/**
-	 * Return an iterator on the list of specified mapping file refs.
-	 * This will not be null.
-	 */
-	ListIterator<MappingFileRef> specifiedMappingFileRefs();
-	
-	/**
-	 * Return of specified mapping file refs.
-	 */
-	int specifiedMappingFileRefsSize();
-
-	/**
-	 * Add a specified mapping file ref to the persistence unit and return the object 
-	 * representing it.
-	 */
-	MappingFileRef addSpecifiedMappingFileRef();
-	
-	/**
-	 * Add a specified mapping file ref to the persistence unit at the specified index and 
-	 * return the object representing it.
-	 */
-	MappingFileRef addSpecifiedMappingFileRef(int index);
-	
-	/**
-	 * Remove the specified mapping file ref from the persistence unit.
-	 */
-	void removeSpecifiedMappingFileRef(MappingFileRef mappingFileRef);
-	
-	/**
-	 * Remove the specified mapping file ref at the specified index from the persistence unit.
-	 */
-	void removeSpecifiedMappingFileRef(int index);
-	
-	
-	// **************** implied mapping file ref *******************************
-	
-	/**
-	 * String constant associated with changes to the implied mapping file ref
-	 */
-	final static String IMPLIED_MAPPING_FILE_REF_PROPERTY = "impliedMappingFileRef";
-	
-	/**
-	 * Return the current implied mapping file ref.
-	 * This may be null.
-	 */
-	MappingFileRef getImpliedMappingFileRef();
-	
-	
-	// **************** class refs *********************************************
-	
-	/**
-	 * Return an iterator on the list of class refs, whether specified or implied.
-	 * This will not be null.
-	 */
-	ListIterator<ClassRef> classRefs();
-	
-	/**
-	 * Return the number of specified and implied class refs.
-	 */
-	int classRefsSize();
-	
-	// **************** specified class refs ***********************************
-	
-	/**
-	 * String constant associated with changes to the specified class refs list
-	 */
-	final static String SPECIFIED_CLASS_REF_LIST = "specifiedClassRefs";
-	
-	/**
-	 * Return an iterator on the list of specified class refs.
-	 * This will not be null.
-	 */
-	ListIterator<ClassRef> specifiedClassRefs();
-	
-	/**
-	 * Return the number of specified class refs.
-	 */
-	int specifiedClassRefsSize();
-	
-	/**
-	 * Add a specified class ref to the persistence unit and return the object 
-	 * representing it.
-	 */
-	ClassRef addSpecifiedClassRef();
-	
-	/**
-	 * Add a specified class ref to the persistence unit at the specified index and 
-	 * return the object representing it.
-	 */
-	ClassRef addSpecifiedClassRef(int index);
-	
-	/**
-	 * Remove the specified class ref from the persistence unit.
-	 */
-	void removeSpecifiedClassRef(ClassRef classRef);
-	
-	/**
-	 * Remove the specified class ref at the specified index from the persistence unit.
-	 */
-	void removeSpecifiedClassRef(int index);
-	
-	
-	// **************** implied class refs *************************************
-	
-	/**
-	 * String constant associated with changes to the implied class refs list
-	 */
-	final static String IMPLIED_CLASS_REF_LIST = "impliedClassRefs";
-	
-	/**
-	 * Return an iterator on the list of implied class refs.
-	 * This will not be null.
-	 */
-	ListIterator<ClassRef> impliedClassRefs();
-	
-	/**
-	 * Return the number of implied class refs.
-	 */
-	int impliedClassRefsSize();
-	
-	
-	// **************** exclude unlisted classes *******************************
-	
-	/** 
-	 * Return the "exclude unlisted classes" setting of the persistence unit.
-	 */
-	boolean isExcludeUnlistedClasses();
-
-	/**
-	 * String constant associated with changes to the persistence unit's 
-	 * "exclude unlisted classes" setting
-	 */
-	final static String SPECIFIED_EXCLUDE_UNLISTED_CLASSED_PROPERTY = "specifiedExcludeUnlistedClasses";
-	
-	/** 
-	 * Return the "exclude unlisted classes" setting of the persistence unit.
-	 */
-	Boolean getSpecifiedExcludeUnlistedClasses();
-	
-	/** 
-	 * Set the "exclude unlisted classes" setting of the persistence unit.
-	 */
-	void setSpecifiedExcludeUnlistedClasses(Boolean excludeUnlistedClasses);
-		
-	/**
-	 * String constant associated with changes to the persistence unit's 
-	 * default "exclude unlisted classes" setting (not typically changed)
-	 */
-	final static String DEFAULT_EXCLUDE_UNLISTED_CLASSED_PROPERTY = "defaultExcludeUnlistedClasses";
-	
-	/** 
-	 * Return the default "exclude unlisted classes" setting
-	 */
-	boolean getDefaultExcludeUnlistedClasses();
-	
-	
-	// **************** properties *********************************************
-	
-	/**
-	 * String constant associated with changes to the properties list
-	 */
-	final static String PROPERTIES_LIST = "properties";
-	
-	/**
-	 * Return an iterator on the list of properties.
-	 * This will not be null.
-	 */
-	ListIterator<Property> properties();
-	
-	int propertiesSize();
-	
-	/**
-	 * Add a property to the persistence unit and return the object 
-	 * representing it.
-	 */
-	Property addProperty();
-	
-	Property addProperty(int index);
-
-	Property getProperty(String key);
-	
-	Property getProperty(String key, String value);
-
-	ListIterator<Property> propertiesWithPrefix(String keyPrefix);
-	
-	void putProperty(String key, String value, boolean allowDuplicates);
-	
-	void replacePropertyValue(String key, String oldValue, String newValue);
-	
-	boolean containsProperty(String key);
-
-	/**
-	 * Remove the property from the persistence unit.
-	 */
-	void removeProperty(Property property);
-	
-	/**
-	 * Remove the property with the given key from the persistence unit.
-	 */
-	void removeProperty(String key);
-	
-	/**
-	 * Remove the property with the given key and valuefrom the persistence unit.
-	 */
-	void removeProperty(String key, String value);
-	
-	
-	// **************** PersistenceUnitDefaults ********************************
-	
-	String getDefaultSchema();
-		String DEFAULT_SCHEMA_PROPERTY = "defaultSchema";
-		
-	String getDefaultCatalog();
-		String DEFAULT_CATALOG_PROPERTY = "defaultCatalog";
-	
-	AccessType getDefaultAccess();
-		String DEFAULT_ACCESS_PROPERTY = "defaultAccess";
-	
-	boolean getDefaultCascadePersist();
-		String DEFAULT_CASCADE_PERSIST_PROPERTY = "defaultCascadePersist";
-	
-	
-	// **************** global generator and query support *********************
-	
-	/**
-	 * Identifier for changes to the list of global generators.
-	 * Note that there are no granular changes to this list.  There is only
-	 * notification that the entire list has changed.
-	 */
-	String GENERATORS_LIST = "generators";
-	
-	/**
-	 * Add the generator (defined elsewhere) to the list of generators defined
-	 * within this persistence unit.
-	 * Note that this should only be called during the process of updating the
-	 * local generator definition.
-	 * No change notification accompanies this action specifically.
-	 */
-	void addGenerator(Generator generator);
-	
-	/**
-	 * Return an iterator on all generators defined within this persistence unit,
-	 * included duplicately named generators.
-	 */
-	ListIterator<Generator> allGenerators();
-	
-	/**
-	 * Identifier for changes to the list of global queries.
-	 * Note that there are no granular changes to this list.  There is only
-	 * notification that the entire list has changed.
-	 */
-	String QUERIES_LIST = "queries";
-	
-	/**
-	 * Add the query (defined elsewhere) to the list of queries defined 
-	 * within this persistence unit.
-	 * Note that this should only be called during the process of updating the
-	 * local query definition.
-	 * No change notification accompanies this action specifically.
-	 */
-	void addQuery(Query query);
-	
-	/**
-	 * Return an iterator on all queries defined within this persistence unit,
-	 * included duplicately named queries.
-	 */
-	ListIterator<Query> allQueries();
-	
-	
-	// **************** updating ***********************************************
-	
-	void update(XmlPersistenceUnit persistenceUnit);
-	
-	
-	// *************************************************************************
-	
-	/**
-	 * Return the PersistentType specified in this PersistenceUnit with the given
-	 * fully qualified type name
-	 */
-	PersistentType getPersistentType(String fullyQualifiedTypeName);
-	
-	/**
-	 * Return whether the text representation of this persistence unit contains
-	 * the given text offset
-	 */
-	boolean containsOffset(int textOffset);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnitTransactionType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnitTransactionType.java
deleted file mode 100644
index 55f52fd535..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnitTransactionType.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.core.context.persistence;
-
-import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 enum PersistenceUnitTransactionType 
-{
-	/** Corresponds to JTA transaction type **/
-	JTA,
-	
-	/** Corresponds to RESOURCE_LOCAL transaction type **/
-	RESOURCE_LOCAL;
-	
-	public static PersistenceUnitTransactionType fromXmlResourceModel(XmlPersistenceUnitTransactionType transactionType) {
-		if (transactionType == null) {
-			return null;
-		}
-		switch (transactionType) {
-			case JTA:
-				return JTA;
-			case RESOURCE_LOCAL:
-				return RESOURCE_LOCAL;
-			default:
-				throw new IllegalArgumentException("unknown transaction type: " + transactionType);
-		}
-	}
-	
-	public static XmlPersistenceUnitTransactionType toXmlResourceModel(PersistenceUnitTransactionType transactionType) {
-		if (transactionType == null) {
-			return null;
-		}
-		switch (transactionType) {
-			case JTA:
-				return XmlPersistenceUnitTransactionType.JTA;
-			case RESOURCE_LOCAL:
-				return XmlPersistenceUnitTransactionType.RESOURCE_LOCAL;
-			default:
-				throw new IllegalArgumentException("unknown transaction type: " + transactionType);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceXml.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceXml.java
deleted file mode 100644
index c0cbcdbc58..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceXml.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.core.context.persistence;
-
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.resource.persistence.PersistenceResource;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 PersistenceXml extends PersistenceJpaContextNode, JpaStructureNode
-{
-	// **************** persistence *******************************************
-	
-	/**
-	 * String constant associated with changes to the persistence property
-	 */
-	public final static String PERSISTENCE_PROPERTY = "persistence";
-	
-	/** 
-	 * Return the content represented by the root of the persistence.xml file.
-	 * This may be null.
-	 */
-	Persistence getPersistence();
-	
-	/**
-	 * Add a persistence node to the persistence.xml file and return the object 
-	 * representing it.
-	 * Throws {@link IllegalStateException} if a persistence node already exists.
-	 */
-	Persistence addPersistence();
-	
-	/**
-	 * Remove the persistence node from the persistence.xml file.
-	 * Throws {@link IllegalStateException} if a persistence node does not exist.
-	 */
-	void removePersistence();
-	
-	
-	// **************** updating **********************************************
-	
-	void update(PersistenceResource persistenceResource);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/Property.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/Property.java
deleted file mode 100644
index 272e0a3d27..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/Property.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.core.context.persistence;
-
-import org.eclipse.jpt.core.resource.persistence.XmlProperty;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 Property extends PersistenceJpaContextNode
-{
-	// **************** name ***************************************************
-	
-	final static String NAME_PROPERTY = "name";
-	
-	String getName();
-	
-	void setName(String name);
-	
-	
-	// **************** value **************************************************
-	
-	final static String VALUE_PROPERTY = "value";
-	
-	void setValue(String value);
-	
-	String getValue();
-	
-	
-	// **************** updating ***********************************************
-		
-	void update(XmlProperty property);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaNode.java
deleted file mode 100644
index cbc6bca2c4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaNode.java
+++ /dev/null
@@ -1,162 +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.core.internal;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.JpaFile;
-import org.eclipse.jpt.core.JpaNode;
-import org.eclipse.jpt.core.JpaPlatform;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.ResourceModel;
-import org.eclipse.jpt.db.ConnectionProfile;
-import org.eclipse.jpt.db.Database;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.internal.model.CallbackChangeSupport;
-import org.eclipse.jpt.utility.internal.model.ChangeSupport;
-
-/**
- * 
- */
-public abstract class AbstractJpaNode
-	extends AbstractModel
-	implements JpaNode, CallbackChangeSupport.Source
-{
-	private final JpaNode parent;
-
-
-	// ********** constructor **********
-
-	protected AbstractJpaNode(JpaNode parent) {
-		super();
-		this.checkParent(parent);
-		this.parent = parent;
-	}
-	
-	protected void checkParent(JpaNode p) {
-		if (p == null) {
-			if (this.requiresParent()) {
-				throw new IllegalArgumentException("'parent' cannot be null");
-			}
-		} else {
-			if (this.forbidsParent()) {
-				throw new IllegalArgumentException("'parent' must be null");
-			}
-		}
-	}
-
-	protected boolean requiresParent() {
-		return true;
-	}
-
-	protected boolean forbidsParent() {
-		return ! this.requiresParent();  // assume 'parent' is not optional
-	}
-
-	@Override
-	protected ChangeSupport buildChangeSupport() {
-		return new CallbackChangeSupport(this);
-	}
-
-	
-	// ********** IAdaptable implementation **********
-	
-	@SuppressWarnings("unchecked")
-	public Object getAdapter(Class adapter) {
-		return Platform.getAdapterManager().getAdapter(this, adapter);
-	}
-
-
-	// ********** IJpaNode implementation **********
-
-	public JpaNode getParent() {
-		return this.parent;
-	}
-	
-	public IResource getResource() {
-		return this.parent.getResource();
-	}
-
-	public JpaProject getJpaProject() {
-		return this.parent.getJpaProject();
-	}
-
-	public String displayString() {
-		return this.toString();
-	}
-
-
-	// ********** convenience methods **********
-
-	protected JpaPlatform getJpaPlatform() {
-		return this.getJpaProject().getJpaPlatform();
-	}
-
-	protected JpaFactory getJpaFactory() {
-		return this.getJpaPlatform().getJpaFactory();
-	}
-
-	protected JpaFile getJpaFile(ResourceModel resourceModel) {
-		return getJpaProject().getJpaFile(resourceModel.getFile());
-	}
-
-	protected ConnectionProfile getConnectionProfile() {
-		return this.getJpaProject().getConnectionProfile();
-	}
-
-	protected Database getDatabase() {
-		return this.getConnectionProfile().getDatabase();
-	}
-
-	public boolean connectionProfileIsActive() {
-		return this.getConnectionProfile().isActive();
-	}
-
-	// ********** update model **********
-
-	private static final HashMap<Class<? extends AbstractJpaNode>, HashSet<String>> nonUpdateAspectNameSets = new HashMap<Class<? extends AbstractJpaNode>, HashSet<String>>();
-
-	public void aspectChanged(String aspectName) {
-		if (this.aspectTriggersUpdate(aspectName)) {
-			// System.out.println(Thread.currentThread() + " \"update\" change: " + this + ": " + aspectName);
-			this.getJpaProject().update();
-		}
-	}
-
-	private boolean aspectTriggersUpdate(String aspectName) {
-		return ! this.aspectDoesNotTriggerUpdate(aspectName);
-	}
-
-	private boolean aspectDoesNotTriggerUpdate(String aspectName) {
-		return this.nonUpdateAspectNames().contains(aspectName);
-	}
-
-	protected final Set<String> nonUpdateAspectNames() {
-		synchronized (nonUpdateAspectNameSets) {
-			HashSet<String> nonUpdateAspectNames = nonUpdateAspectNameSets.get(this.getClass());
-			if (nonUpdateAspectNames == null) {
-				nonUpdateAspectNames = new HashSet<String>();
-				this.addNonUpdateAspectNamesTo(nonUpdateAspectNames);
-				nonUpdateAspectNameSets.put(this.getClass(), nonUpdateAspectNames);
-			}
-			return nonUpdateAspectNames;
-		}
-	}
-
-	protected void addNonUpdateAspectNamesTo(Set<String> nonUpdateAspectNames) {
-	// when you override this method, don't forget to include:
-	//	super.addNonUpdateAspectNamesTo(nonUpdateAspectNames);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractResourceModel.java
deleted file mode 100644
index 4b67456ff2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractResourceModel.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.core.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jpt.core.ResourceModel;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-
-public abstract class AbstractResourceModel
-	extends AbstractModel
-	implements ResourceModel
-{
-	protected final IFile file;
-
-	protected AbstractResourceModel(IFile file) {
-		super();
-		this.file = file;
-	}
-	
-	public IFile getFile() {
-		return this.file;
-	}
-	
-	public void dispose() {
-		// do nothing by default
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AsynchronousJpaProjectUpdater.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AsynchronousJpaProjectUpdater.java
deleted file mode 100644
index aa1f5c8f73..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AsynchronousJpaProjectUpdater.java
+++ /dev/null
@@ -1,116 +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.core.internal;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * This updater will "update" the project in a job that executes in a separate
- * thread and allows calls to #update() to return immediately.
- */
-public class AsynchronousJpaProjectUpdater implements JpaProject.Updater {
-	protected final JpaProject jpaProject;
-	protected final UpdateJob job;
-
-	public AsynchronousJpaProjectUpdater(JpaProject jpaProject) {
-		super();
-		this.jpaProject = jpaProject;
-		this.job = this.buildJob();
-	}
-
-	protected UpdateJob buildJob() {
-		return new UpdateJob();
-	}
-
-	/**
-	 * Allow the job to be scheduled and execute an "update".
-	 */
-	public void start() {
-		this.job.start();
-		this.update();
-	}
-
-	/**
-	 * Let the job run to completion (i.e. do not cancel it).
-	 * This should reduce the number of times the job is re-scheduled.
-	 */
-	public void update() {
-		this.job.schedule();
-	}
-
-	public void dispose() {
-		this.job.dispose();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.jpaProject);
-	}
-
-
-	/**
-	 * This is the job that gets scheduled by the asynchronous updater.
-	 * When the job is run it tells the JPA project to "update".
-	 * Only a single instance of this job per project can run at a time.
-	 */
-	protected class UpdateJob extends Job {
-		/**
-		 * When this flag is set to false, the job does not stop immediately;
-		 * but it cannot be scheduled to run again.
-		 */
-		protected boolean shouldSchedule;
-
-		protected UpdateJob() {
-			super("Update JPA project: " + AsynchronousJpaProjectUpdater.this.jpaProject.getName());  // TODO i18n
-			this.shouldSchedule = false;
-			this.setRule(AsynchronousJpaProjectUpdater.this.jpaProject.getProject());
-		}
-
-		@Override
-		protected IStatus run(IProgressMonitor monitor) {
-			return AsynchronousJpaProjectUpdater.this.jpaProject.update(monitor);
-		}
-
-		@Override
-		public boolean shouldSchedule() {
-			return this.shouldSchedule;
-		}
-
-		protected void start() {
-			if (this.shouldSchedule) {
-				throw new IllegalStateException("The Updater was not stopped.");
-			}
-			this.shouldSchedule = true;
-		}
-
-		/**
-		 * Prevent the job from running again and wait for the current
-		 * execution, if there is any, to end before returning.
-		 */
-		protected void dispose() {
-			// this will prevent the job from being scheduled to run again
-			this.shouldSchedule = false;
-			// this will cancel the job if it has already been scheduled, but is currently WAITING
-			this.cancel();
-			try {
-				// if the job is currently RUNNING, wait until it is done before returning
-				this.join();
-			} catch (InterruptedException ex) {
-				// the job thread was interrupted while waiting - ignore
-			}
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaDataSource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaDataSource.java
deleted file mode 100644
index 37aa54691f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaDataSource.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.core.internal;
-
-import org.eclipse.jpt.core.JpaDataSource;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.db.ConnectionAdapter;
-import org.eclipse.jpt.db.ConnectionListener;
-import org.eclipse.jpt.db.ConnectionProfile;
-import org.eclipse.jpt.db.ConnectionProfileListener;
-import org.eclipse.jpt.db.ConnectionProfileRepository;
-import org.eclipse.jpt.db.JptDbPlugin;
-
-/**
- * GenericJpaDataSource
- */
-public class GenericJpaDataSource
-	extends AbstractJpaNode
-	implements JpaDataSource
-{
-	/**
-	 * cache the connection profile name so we can detect when
-	 * it changes and notify listeners
-	 */
-	protected String connectionProfileName;
-
-	/**
-	 * this should never be null; if we do not have a connection, this will be
-	 * a "null" connection profile
-	 */
-	protected transient ConnectionProfile connectionProfile;
-
-	/**
-	 * listen for the connection to be added or removed or its name changed
-	 */
-	protected final ConnectionProfileListener connectionProfileListener;
-
-	/**
-	 * listen for the connection to be opened or closed
-	 */
-	protected final ConnectionListener connectionListener;
-
-	private static final long serialVersionUID = 1L;
-
-	// ********** constructor/initialization **********
-
-	private ConnectionProfileRepository getConnectionProfileRepository() {
-		return JptDbPlugin.instance().getConnectionProfileRepository();
-	}
-
-	public GenericJpaDataSource(JpaProject jpaProject, String connectionProfileName) {
-		super(jpaProject);
-
-		this.connectionProfileListener = this.buildConnectionProfileListener();
-		this.getConnectionProfileRepository().addConnectionProfileListener(this.connectionProfileListener);
-
-		this.connectionListener = this.buildConnectionListener();
-		this.connectionProfileName = connectionProfileName;
-		this.connectionProfile = this.connectionProfileNamed(connectionProfileName);
-		this.connectionProfile.addConnectionListener(this.connectionListener);
-	}
-
-	protected ConnectionProfileListener buildConnectionProfileListener() {
-		return new LocalConnectionProfileListener();
-	}
-
-	protected ConnectionListener buildConnectionListener() {
-		return new LocalConnectionListener();
-	}
-
-
-	// ********** IJpaDataSource implementation **********
-
-	public String getConnectionProfileName() {
-		return this.connectionProfileName;
-	}
-
-	public void setConnectionProfileName(String connectionProfileName) {
-		String old = this.connectionProfileName;
-		this.connectionProfileName = connectionProfileName;
-		this.firePropertyChanged(CONNECTION_PROFILE_NAME_PROPERTY, old, connectionProfileName);
-		 // synch the connection profile when the name changes
-		this.setConnectionProfile(this.connectionProfileNamed(connectionProfileName));
-	}
-
-	@Override
-	public ConnectionProfile getConnectionProfile() {
-		return this.connectionProfile;
-	}
-
-	public boolean hasAConnection() {
-		return ! this.connectionProfile.isNull();
-	}
-
-	public void dispose() {
-		this.connectionProfile.removeConnectionListener(this.connectionListener);
-		this.getConnectionProfileRepository().removeConnectionProfileListener(this.connectionProfileListener);
-	}
-
-
-	// ********** internal methods **********
-
-	private ConnectionProfile connectionProfileNamed(String name) {
-		return this.getConnectionProfileRepository().connectionProfileNamed(name);
-	}
-
-	protected void setConnectionProfile(ConnectionProfile connectionProfile) {
-		ConnectionProfile old = this.connectionProfile;
-		this.connectionProfile.removeConnectionListener(this.connectionListener);
-		this.connectionProfile = connectionProfile;
-		this.connectionProfile.addConnectionListener(this.connectionListener);
-		this.firePropertyChanged(CONNECTION_PROFILE_PROPERTY, old, connectionProfile);
-	}
-
-
-	// ********** overrides **********
-
-	@Override
-	public boolean connectionProfileIsActive() {
-		return this.connectionProfile.isActive();
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.connectionProfileName);
-	}
-
-
-	// ********** member classes **********
-
-	/**
-	 * Listen for a connection profile with our name being added or removed.
-	 * Also listen for our connection's name being changed.
-	 */
-	protected class LocalConnectionProfileListener implements ConnectionProfileListener {
-		protected LocalConnectionProfileListener() {
-			super();
-		}
-
-		// possible name change
-		public void connectionProfileChanged(ConnectionProfile profile) {
-			if (profile == GenericJpaDataSource.this.connectionProfile) {
-				GenericJpaDataSource.this.setConnectionProfileName(profile.getName());
-				// bug 232225 - also update project setting when connection profile
-				//   name has changed
-				JptCorePlugin.setConnectionProfileName(getJpaProject().getProject(), profile.getName());
-			}
-		}
-
-		// profile added or removed
-		public void connectionProfileReplaced(ConnectionProfile oldProfile, ConnectionProfile newProfile) {
-			if (GenericJpaDataSource.this.hasAConnection() &&
-				(oldProfile == GenericJpaDataSource.this.connectionProfile)) {
-					GenericJpaDataSource.this.setConnectionProfile(newProfile);
-			}
-		}
-
-	}
-
-
-	/**
-	 * Whenever the connection is opened or closed trigger a project update.
-	 */
-	protected class LocalConnectionListener extends ConnectionAdapter {
-
-		@Override
-		public void opened(ConnectionProfile profile) {
-			GenericJpaDataSource.this.getJpaProject().update();
-		}
-
-		@Override
-		public void closed(ConnectionProfile profile) {
-			GenericJpaDataSource.this.getJpaProject().update();
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaFile.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaFile.java
deleted file mode 100644
index 80ae72945f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaFile.java
+++ /dev/null
@@ -1,139 +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.core.internal;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jpt.core.JpaFile;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.ResourceModel;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneIterator;
-
-public class GenericJpaFile extends AbstractJpaNode implements JpaFile
-{
-	/**
-	 * The IFile associated with this JPA file
-	 */
-	protected final IFile file;
-	
-	/**
-	 * The resource model represented by this JPA file
-	 */
-	protected final ResourceModel resourceModel;
-	
-	/**
-	 * The context model root nodes represented by this JPA file
-	 */
-	protected final Hashtable<Object, JpaStructureNode> rootStructureNodes;
-	
-	public GenericJpaFile(JpaProject jpaProject, IFile file, ResourceModel resourceModel) {
-		super(jpaProject);
-		this.file = file;
-		this.resourceModel = resourceModel;
-		this.rootStructureNodes = new Hashtable<Object, JpaStructureNode>();
-	}
-
-	@Override
-	protected void addNonUpdateAspectNamesTo(Set<String> nonUpdateAspectNames) {
-		super.addNonUpdateAspectNamesTo(nonUpdateAspectNames);
-		//JpaFile.ROOT_STRUCTURE_NODES_COLLECTION does not need to trigger a project update, 
-		//only the UI cares about the rootStructureNode.
-		//If you do a project update on this you get in an infinite loop if you
-		//specify a java class in more than one location in your persistence unit.
-		nonUpdateAspectNames.add(JpaFile.ROOT_STRUCTURE_NODES_COLLECTION);
-	}
-	
-	public IFile getFile() {
-		return this.file;
-	}
-	
-	public ResourceModel getResourceModel() {
-		return this.resourceModel;
-	}
-	
-	public Iterator<JpaStructureNode> rootStructureNodes() {
-		return new CloneIterator<JpaStructureNode>(this.rootStructureNodes.values());
-	}
-
-	public int rootStructureNodesSize() {
-		return this.rootStructureNodes.size();
-	}
-
-	// TODO move events outside of 'synchronized' block?
-	// need fireItemReplaced(String, Object, Object) for Collection?
-	public void addRootStructureNode(Object key, JpaStructureNode rootStructureNode) {
-		synchronized (this.rootStructureNodes) {
-			JpaStructureNode node = this.rootStructureNodes.get(key);
-			if (node == rootStructureNode) {
-				return;  // no duplicates
-			}
-			if (node != null) {
-				this.rootStructureNodes.remove(key);
-				this.fireItemRemoved(JpaFile.ROOT_STRUCTURE_NODES_COLLECTION, node);
-			}
-			this.rootStructureNodes.put(key, rootStructureNode);
-			this.fireItemAdded(JpaFile.ROOT_STRUCTURE_NODES_COLLECTION, rootStructureNode);
-		}
-	}
-	
-	public void removeRootStructureNode(Object key) {
-		JpaStructureNode removedStructureNode = this.rootStructureNodes.remove(key);
-		fireItemRemoved(JpaFile.ROOT_STRUCTURE_NODES_COLLECTION, removedStructureNode);
-	}
-	
-	public JpaStructureNode getStructureNode(int textOffset) {
-		for (JpaStructureNode rootNode : CollectionTools.iterable(rootStructureNodes())) {
-			JpaStructureNode node = rootNode.getStructureNode(textOffset);
-			if (node != null) {
-				return node;
-			}
-		}
-		return null;
-	}
-	
-	protected Iterator<Object> rootStructureNodeKeys() {
-		return new CloneIterator<Object>(this.rootStructureNodes.keySet());
-	}
-
-	public String getResourceType() {
-		return getResourceModel().getResourceType();
-	}
-	
-	public void dispose() {
-		getResourceModel().dispose();
-
-		for (Iterator<Object> stream = this.rootStructureNodeKeys(); stream.hasNext(); ) {
-			this.removeRootStructureNode(stream.next());
-		}
-	}
-	
-	public void javaElementChanged(ElementChangedEvent event) {
-		getResourceModel().javaElementChanged(event);
-	}
-	
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(getFile().toString());
-		sb.append(" (resourceType: ");
-		sb.append(getResourceType());
-		sb.append(")");
-	}
-
-	public void updateFromResource() {
-		this.resourceModel.updateFromResource();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaModel.java
deleted file mode 100644
index 90316ea2ce..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaModel.java
+++ /dev/null
@@ -1,553 +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.core.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jpt.core.JpaFile;
-import org.eclipse.jpt.core.JpaModel;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.JpaProject.Config;
-import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProperties;
-import org.eclipse.jpt.core.resource.orm.OrmArtifactEdit;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.OrmResource;
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.core.resource.persistence.PersistenceArtifactEdit;
-import org.eclipse.jpt.core.resource.persistence.PersistenceResource;
-import org.eclipse.jpt.utility.internal.ClassTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.events.IProjectFacetActionEvent;
-
-/**
- * The JPA model is synchronized so all changes to the list of JPA projects
- * are thread-safe.
- * 
- * The JPA model holds on to a list of JPA project configs and only instantiates
- * their associated JPA projects when necessary. Other than performance,
- * this should be transparent to clients.
- */
-public class GenericJpaModel
-	extends AbstractModel
-	implements JpaModel
-{
-
-	/** maintain a list of all the current JPA projects */
-	private final ArrayList<JpaProjectHolder> jpaProjectHolders = new ArrayList<JpaProjectHolder>();
-
-
-	// ********** constructor **********
-
-	/**
-	 * Construct a JPA model and populate it with JPA projects for all the
-	 * current Eclipse projects with JPA facets.
-	 * The JPA model can only be instantiated by the JPA model manager.
-	 */
-	GenericJpaModel() throws CoreException {
-		super();
-		ResourcesPlugin.getWorkspace().getRoot().accept(new ResourceProxyVisitor(), IResource.NONE);
-	}
-
-
-	// ********** IJpaModel implementation **********
-
-	/**
-	 * This will trigger the instantiation of the JPA project associated with the
-	 * specified Eclipse project.
-	 */
-	public synchronized JpaProject getJpaProject(IProject project) throws CoreException {
-		return this.getJpaProjectHolder(project).jpaProject();
-	}
-
-	/**
-	 * We can answer this question without instantiating the
-	 * associated JPA project.
-	 */
-	public synchronized boolean containsJpaProject(IProject project) {
-		return this.getJpaProjectHolder(project).holdsJpaProjectFor(project);
-	}
-
-	/**
-	 * This will trigger the instantiation of all the JPA projects.
-	 */
-	public synchronized Iterator<JpaProject> jpaProjects() throws CoreException {
-		// force the CoreException to occur here (instead of later, in Iterator#next())
-		ArrayList<JpaProject> jpaProjects = new ArrayList<JpaProject>(this.jpaProjectHolders.size());
-		for (JpaProjectHolder holder : this.jpaProjectHolders) {
-			jpaProjects.add(holder.jpaProject());
-		}
-		return jpaProjects.iterator();
-	}
-
-	/**
-	 * We can answer this question without instantiating any JPA projects.
-	 */
-	public synchronized int jpaProjectsSize() {
-		return this.jpaProjectHolders.size();
-	}
-
-	/**
-	 * This will trigger the instantiation of the JPA project associated with the
-	 * specified file.
-	 */
-	public synchronized JpaFile getJpaFile(IFile file) throws CoreException {
-		JpaProject jpaProject = this.getJpaProject(file.getProject());
-		return (jpaProject == null) ? null : jpaProject.getJpaFile(file);
-	}
-
-
-	// ********** internal methods **********
-
-	/**
-	 * never return null
-	 */
-	private JpaProjectHolder getJpaProjectHolder(IProject project) {
-		for (JpaProjectHolder holder : this.jpaProjectHolders) {
-			if (holder.holdsJpaProjectFor(project)) {
-				return holder;
-			}
-		}
-		return NullJpaProjectHolder.instance();
-	}
-
-	private JpaProject.Config buildJpaProjectConfig(IProject project) {
-		SimpleJpaProjectConfig config = new SimpleJpaProjectConfig();
-		config.setProject(project);
-		config.setJpaPlatform(JptCorePlugin.getJpaPlatform(project));
-		config.setConnectionProfileName(JptCorePlugin.getConnectionProfileName(project));
-		config.setUserOverrideDefaultSchemaName(JptCorePlugin.getUserOverrideDefaultSchemaName(project));
-		config.setDiscoverAnnotatedClasses(JptCorePlugin.discoverAnnotatedClasses(project));
-		return config;
-	}
-
-	/* private */ void addJpaProject(IProject project) {
-		this.addJpaProject(this.buildJpaProjectConfig(project));
-	}
-
-	/**
-	 * Add a JPA project to the JPA model for the specified Eclipse project.
-	 * JPA projects can only be added by the JPA model manager.
-	 * The JPA project will only be instantiated later, on demand.
-	 */
-	private void addJpaProject(JpaProject.Config config) {
-		dumpStackTrace();  // figure out exactly when JPA projects are added
-		this.jpaProjectHolders.add(this.getJpaProjectHolder(config.getProject()).buildJpaProjectHolder(this, config));
-	}
-
-	/**
-	 * Remove the JPA project corresponding to the specified Eclipse project
-	 * from the JPA model. Return whether the removal actually happened.
-	 * JPA projects can only be removed by the JPA model manager.
-	 */
-	private void removeJpaProject(IProject project) {
-		dumpStackTrace();  // figure out exactly when JPA projects are removed
-		this.getJpaProjectHolder(project).remove();
-	}
-
-
-	// ********** Resource events **********
-
-	/**
-	 * A project is being deleted. Remove its corresponding
-	 * JPA project if appropriate.
-	 */
-	synchronized void projectPreDelete(IProject project) {
-		this.removeJpaProject(project);
-	}
-
-	/**
-	 * Forward the specified resource delta to the JPA project corresponding
-	 * to the specified Eclipse project.
-	 */
-	synchronized void synchronizeFiles(IProject project, IResourceDelta delta)  throws CoreException {
-		this.getJpaProjectHolder(project).synchronizeJpaFiles(delta);
-	}
-
-
-	// ********** Resource and/or Facet events **********
-
-	/**
-	 * Check whether the JPA facet has been added or removed.
-	 */
-	synchronized void checkForTransition(IProject project) {
-		boolean jpaFacet = JptCorePlugin.projectHasJpaFacet(project);
-		boolean jpaProject = this.containsJpaProject(project);
-
-		if (jpaFacet) {
-			if ( ! jpaProject) {  // JPA facet added
-				this.addJpaProject(project);
-			}
-		} else {
-			if (jpaProject) {  // JPA facet removed
-				this.removeJpaProject(project);
-			}
-		}
-	}
-
-
-	// ********** Facet events **********
-
-	// create persistence.xml and orm.xml in jobs so we don't deadlock
-	// with the Resource Change Event that comes in from another
-	// thread after the Eclipse project is created by the project facet
-	// wizard (which happens before the wizard notifies us); the Artifact
-	// Edits will hang during #save(), waiting for the workspace lock held
-	// by the Resource Change Notification loop
-	synchronized void jpaFacetedProjectPostInstall(IProjectFacetActionEvent event) {
-		IProject project = event.getProject().getProject();
-		IDataModel dataModel = (IDataModel) event.getActionConfig();
-
-		boolean buildOrmXml = dataModel.getBooleanProperty(JpaFacetDataModelProperties.CREATE_ORM_XML);
-		this.buildProjectXmlJob(project, buildOrmXml).schedule();
-
-		// assume(?) this is the first event to indicate we need to add the JPA project to the JPA model
-		this.addJpaProject(project);
-	}
-
-	private Job buildProjectXmlJob(final IProject project, final boolean buildOrmXml) {
-		Job job = new Job("Create Project XML files") {
-			@Override
-			protected IStatus run(IProgressMonitor monitor) {
-				GenericJpaModel.this.createProjectXml(project, buildOrmXml);
-				return Status.OK_STATUS;
-			}
-		};
-		job.setRule(ResourcesPlugin.getWorkspace().getRoot());
-		return job;
-	}
-
-	/* private */ void createProjectXml(IProject project, boolean buildOrmXml) {
-		this.createPersistenceXml(project);
-
-		if (buildOrmXml) {
-			this.createOrmXml(project);
-		}
-
-	}
-
-	private void createPersistenceXml(IProject project) {
-		PersistenceArtifactEdit pae = PersistenceArtifactEdit.getArtifactEditForWrite(project);
-		
-		// 202811 - do not add content if it is already present
-		PersistenceResource resource = pae.getResource();
-		if (! resource.getFile().exists()) {
-			pae.createDefaultResource();
-		}
-		
-		pae.dispose();
-	}
-
-	private void createOrmXml(IProject project) {
-		OrmArtifactEdit oae = OrmArtifactEdit.getArtifactEditForWrite(project);
-		OrmResource resource = oae.getResource(JptCorePlugin.getDefaultOrmXmlDeploymentURI(project));
-
-		// 202811 - do not add content if it is already present
-		if (resource.getEntityMappings() == null) {
-			XmlEntityMappings entityMappings = OrmFactory.eINSTANCE.createXmlEntityMappings();
-			entityMappings.setVersion("1.0");
-			this.getResourceContents(resource).add(entityMappings);
-			oae.save(null);
-		}
-		
-		oae.dispose();
-	}
-
-	/**
-	 * minimize the scope of the suppressed warnings
-	 */
-	@SuppressWarnings("unchecked")
-	private EList<EObject> getResourceContents(OrmResource resource) {
-		return resource.getContents();
-	}
-
-	// TODO remove classpath items? persistence.xml? orm.xml?
-	synchronized void jpaFacetedProjectPreUninstall(IProjectFacetActionEvent event) {
-		// assume(?) this is the first event to indicate we need to remove the JPA project to the JPA model
-		this.removeJpaProject(event.getProject().getProject());
-	}
-
-
-	// ********** Java events **********
-
-	/**
-	 * Forward the Java element changed event to all the JPA projects
-	 * because the event could affect multiple projects.
-	 */
-	synchronized void javaElementChanged(ElementChangedEvent event) {
-		for (JpaProjectHolder jpaProjectHolder : this.jpaProjectHolders) {
-			jpaProjectHolder.javaElementChanged(event);
-		}
-	}
-
-
-	// ********** miscellaneous **********
-
-	/**
-	 * The JPA settings associated with the specified Eclipse project
-	 * have changed in such a way as to require the associated
-	 * JPA project to be completely rebuilt
-	 * (e.g. when the user changes a project's JPA platform).
-	 */
-	synchronized void rebuildJpaProject(IProject project) {
-		this.removeJpaProject(project);
-		this.addJpaProject(project);
-	}
-
-	/**
-	 * Dispose the JPA model by disposing and removing all its JPA projects.
-	 * The JPA model can only be disposed by the JPA model manager.
-	 */
-	synchronized void dispose() {
-		// clone the list to prevent concurrent modification exceptions
-		JpaProjectHolder[] holders = this.jpaProjectHolders.toArray(new JpaProjectHolder[this.jpaProjectHolders.size()]);
-		for (JpaProjectHolder holder : holders) {
-			holder.remove();
-		}
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append("JPA projects size: " + this.jpaProjectsSize());
-	}
-
-
-	// ********** holder callbacks **********
-
-	/**
-	 * called by the JPA project holder when the JPA project is actually
-	 * instantiated
-	 */
-	/* private */ void jpaProjectBuilt(JpaProject jpaProject) {
-		this.fireItemAdded(JPA_PROJECTS_COLLECTION, jpaProject);
-	}
-
-	/**
-	 * called by the JPA project holder if the JPA project has been
-	 * instantiated and we need to remove it
-	 */
-	/* private */ void jpaProjectRemoved(JpaProject jpaProject) {
-		this.fireItemRemoved(JPA_PROJECTS_COLLECTION, jpaProject);
-	}
-
-	/**
-	 * called by the JPA project holder
-	 */
-	/* private */ void removeJpaProjectHolder(JpaProjectHolder jpaProjectHolder) {
-		this.jpaProjectHolders.remove(jpaProjectHolder);
-	}
-
-
-	// ********** JPA project holders **********
-
-	private interface JpaProjectHolder {
-
-		boolean holdsJpaProjectFor(IProject project);
-
-		JpaProject jpaProject() throws CoreException;
-
-		void synchronizeJpaFiles(IResourceDelta delta) throws CoreException;
-
-		void javaElementChanged(ElementChangedEvent event);
-
-		JpaProjectHolder buildJpaProjectHolder(GenericJpaModel jpaModel, JpaProject.Config config);
-
-		void remove();
-
-	}
-
-	private static class NullJpaProjectHolder implements JpaProjectHolder {
-		private static final JpaProjectHolder INSTANCE = new NullJpaProjectHolder();
-
-		static JpaProjectHolder instance() {
-			return INSTANCE;
-		}
-
-		// ensure single instance
-		private NullJpaProjectHolder() {
-			super();
-		}
-
-		public boolean holdsJpaProjectFor(IProject project) {
-			return false;
-		}
-
-		public JpaProject jpaProject() throws CoreException {
-			return null;
-		}
-
-		public void synchronizeJpaFiles(IResourceDelta delta) throws CoreException {
-			// do nothing
-		}
-
-		public void javaElementChanged(ElementChangedEvent event) {
-			// do nothing
-		}
-
-		public JpaProjectHolder buildJpaProjectHolder(GenericJpaModel jpaModel, Config config) {
-			return new DefaultJpaProjectHolder(jpaModel, config);
-		}
-
-		public void remove() {
-			// do nothing
-		}
-
-		@Override
-		public String toString() {
-			return ClassTools.shortClassNameForObject(this);
-		}
-	}
-
-	/**
-	 * Pair a JPA project config with its lazily-initialized JPA project.
-	 */
-	private static class DefaultJpaProjectHolder implements JpaProjectHolder {
-		private final GenericJpaModel jpaModel;
-		private final JpaProject.Config config;
-		private JpaProject jpaProject;
-
-		DefaultJpaProjectHolder(GenericJpaModel jpaModel, JpaProject.Config config) {
-			super();
-			this.jpaModel = jpaModel;
-			this.config = config;
-		}
-
-		public boolean holdsJpaProjectFor(IProject project) {
-			return this.config.getProject().equals(project);
-		}
-
-		public JpaProject jpaProject() throws CoreException {
-			if (this.jpaProject == null) {
-				this.jpaProject = this.buildJpaProject();
-				// notify listeners of the JPA model
-				this.jpaModel.jpaProjectBuilt(this.jpaProject);
-			}
-			return this.jpaProject;
-		}
-
-		private JpaProject buildJpaProject() throws CoreException {
-			JpaProject jpaProject = this.config.getJpaPlatform().getJpaFactory().buildJpaProject(this.config);
-			jpaProject.setUpdater(new AsynchronousJpaProjectUpdater(jpaProject));
-			return jpaProject;
-		}
-
-		public void synchronizeJpaFiles(IResourceDelta delta) throws CoreException {
-			if (this.jpaProject != null) {
-				this.jpaProject.synchronizeJpaFiles(delta);
-			}
-		}
-
-		public void javaElementChanged(ElementChangedEvent event) {
-			if (this.jpaProject != null) {
-				this.jpaProject.javaElementChanged(event);
-			}
-		}
-
-		public JpaProjectHolder buildJpaProjectHolder(GenericJpaModel jm, Config c) {
-			throw new IllegalArgumentException(c.getProject().getName());
-		}
-
-		public void remove() {
-			this.jpaModel.removeJpaProjectHolder(this);
-			if (this.jpaProject != null) {
-				this.jpaModel.jpaProjectRemoved(this.jpaProject);
-				this.jpaProject.dispose();
-			}
-		}
-
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this, this.config.getProject().getName());
-		}
-
-	}
-
-
-	// ********** resource proxy visitor **********
-
-	/**
-	 * Visit the workspace resource tree, adding a JPA project to the
-	 * JPA model for each open Eclipse project that has a JPA facet.
-	 */
-	private class ResourceProxyVisitor implements IResourceProxyVisitor {
-
-		ResourceProxyVisitor() {
-			super();
-		}
-
-		public boolean visit(IResourceProxy resourceProxy) throws CoreException {
-			switch (resourceProxy.getType()) {
-				case IResource.ROOT :
-					return true;  // all projects are in the "root"
-				case IResource.PROJECT :
-					this.checkProject(resourceProxy);
-					return false;  // no nested projects
-				default :
-					return false;
-			}
-		}
-
-		private void checkProject(IResourceProxy resourceProxy) {
-			if (resourceProxy.isAccessible()) {  // the project exists and is open
-				IProject project = (IProject) resourceProxy.requestResource();
-				if (JptCorePlugin.projectHasJpaFacet(project)) {
-					GenericJpaModel.this.addJpaProject(project);
-				}
-			}
-		}
-
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this);
-		}
-
-	}
-
-
-	// ********** DEBUG **********
-
-	// @see JpaModelTests#testDEBUG()
-	private static final boolean DEBUG = false;
-
-	private static void dumpStackTrace() {
-		if (DEBUG) {
-			// lock System.out so the stack elements are printed out contiguously
-			synchronized (System.out) {
-				StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
-				// skip the first 3 elements - those are this method and 2 methods in Thread
-				for (int i = 3; i < stackTrace.length; i++) {
-					StackTraceElement element = stackTrace[i];
-					if (element.getMethodName().equals("invoke0")) {
-						break;  // skip all elements outside of the JUnit test
-					}
-					System.out.println("\t" + element);
-				}
-			}
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaProject.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaProject.java
deleted file mode 100644
index 5add930069..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaProject.java
+++ /dev/null
@@ -1,730 +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.core.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jpt.core.JpaDataSource;
-import org.eclipse.jpt.core.JpaFile;
-import org.eclipse.jpt.core.JpaPlatform;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.ResourceModel;
-import org.eclipse.jpt.core.ResourceModelListener;
-import org.eclipse.jpt.core.context.JpaRootContextNode;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.JavaResourceModel;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.resource.java.JpaCompilationUnit;
-import org.eclipse.jpt.db.ConnectionProfile;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.utility.CommandExecutor;
-import org.eclipse.jpt.utility.CommandExecutorProvider;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneIterator;
-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;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * 
- */
-public class GenericJpaProject extends AbstractJpaNode implements JpaProject {
-
-	/**
-	 * The Eclipse project corresponding to the JPA project.
-	 */
-	protected final IProject project;
-
-	/**
-	 * The vendor-specific JPA platform that builds the JPA project
-	 * and all its contents.
-	 */
-	protected final JpaPlatform jpaPlatform;
-
-	/**
-	 * The data source that wraps the DTP model.
-	 */
-	protected final JpaDataSource dataSource;
-	
-	/**
-	 * A schema name used to override the connection's default schema
-	 */
-	protected String userOverrideDefaultSchemaName;
-
-	/**
-	 * Flag indicating whether the project should "discover" annotated
-	 * classes automatically, as opposed to requiring the classes to be
-	 * listed in persistence.xml.
-	 */
-	protected boolean discoversAnnotatedClasses;
-
-	/**
-	 * The JPA files associated with the JPA project.
-	 */
-	protected final Vector<JpaFile> jpaFiles;
-
-	/**
-	 * The root of the model representing the collated resources associated with 
-	 * the JPA project.
-	 */
-	protected JpaRootContextNode rootContextNode;
-
-	/**
-	 * Support for modifying documents shared with the UI.
-	 */
-	protected final ThreadLocal<CommandExecutor> threadLocalModifySharedDocumentCommandExecutor;
-	protected final CommandExecutorProvider modifySharedDocumentCommandExecutorProvider;
-
-	/**
-	 * A pluggable updater that can be used to "update" the project either
-	 * synchronously or asynchronously (or not at all). An asynchronous
-	 * updater is the default and is used when the project is being manipulated
-	 * by the UI. A synchronous updater is used when the project is being
-	 * manipulated by a "batch" (or non-UI) client (e.g. when testing the
-	 * "update" behavior). A null updater is used during tests that
-	 * do not care whether "updates" occur. Clients will need to explicitly
-	 * configure the updater if they require something other than an
-	 * asynchronous updater.
-	 */
-	protected Updater updater;
-
-	/**
-	 * Resource models notify this listener when they change. A project update
-	 * should occur any time a resource model changes.
-	 */
-	protected ResourceModelListener resourceModelListener;
-
-
-	// ********** constructor/initialization **********
-
-	/**
-	 * The project and JPA platform are required.
-	 */
-	public GenericJpaProject(JpaProject.Config config) throws CoreException {
-		super(null);  // JPA project is the root of the containment tree
-		if ((config.getProject() == null) || (config.getJpaPlatform() == null)) {
-			throw new NullPointerException();
-		}
-		this.project = config.getProject();
-		this.jpaPlatform = config.getJpaPlatform();
-		this.dataSource = this.getJpaFactory().buildJpaDataSource(this, config.getConnectionProfileName());
-		this.userOverrideDefaultSchemaName = config.getUserOverrideDefaultSchemaName();
-		this.discoversAnnotatedClasses = config.discoverAnnotatedClasses();
-		this.jpaFiles = this.buildEmptyJpaFiles();
-
-		this.threadLocalModifySharedDocumentCommandExecutor = this.buildThreadLocalModifySharedDocumentCommandExecutor();
-		this.modifySharedDocumentCommandExecutorProvider = this.buildModifySharedDocumentCommandExecutorProvider();
-
-		this.resourceModelListener = this.buildResourceModelListener();
-		// build the JPA files corresponding to the Eclipse project's files
-		this.project.accept(this.buildInitialResourceProxyVisitor(), IResource.NONE);
-
-		this.rootContextNode = this.buildRootContextNode();
-	}
-
-	@Override
-	protected boolean requiresParent() {
-		return false;
-	}
-	
-	@Override
-	public IResource getResource() {
-		return getProject();
-	}
-
-	protected Vector<JpaFile> buildEmptyJpaFiles() {
-		return new Vector<JpaFile>();
-	}
-
-	protected ResourceDeltaVisitor buildResourceDeltaVisitor() {
-		return new ResourceDeltaVisitor();
-	}
-
-	protected ThreadLocal<CommandExecutor> buildThreadLocalModifySharedDocumentCommandExecutor() {
-		return new ThreadLocal<CommandExecutor>();
-	}
-
-	protected CommandExecutorProvider buildModifySharedDocumentCommandExecutorProvider() {
-		return new ModifySharedDocumentCommandExecutorProvider();
-	}
-
-	protected ResourceModelListener buildResourceModelListener() {
-		return new DefaultResourceModelListener();
-	}
-
-	protected IResourceProxyVisitor buildInitialResourceProxyVisitor() {
-		return new InitialResourceProxyVisitor();
-	}
-
-	protected JpaRootContextNode buildRootContextNode() {
-		return this.getJpaFactory().buildRootContext(this);
-	}
-
-	// ***** inner class
-	protected class InitialResourceProxyVisitor implements IResourceProxyVisitor {
-		protected InitialResourceProxyVisitor() {
-			super();
-		}
-		// add a JPA file for every [appropriate] file encountered by the visitor
-		public boolean visit(IResourceProxy resource) throws CoreException {
-			switch (resource.getType()) {
-				case IResource.ROOT :  // shouldn't happen
-				case IResource.PROJECT :
-				case IResource.FOLDER :
-					return true;  // visit children
-				case IResource.FILE :
-					GenericJpaProject.this.addJpaFileInternal((IFile) resource.requestResource());
-					return false;  // no children
-				default :
-					return false;  // no children
-			}
-		}
-	}
-
-
-	// ********** general queries **********
-
-	@Override
-	public JpaProject getJpaProject() {
-		return this;
-	}
-
-	public String getName() {
-		return this.project.getName();
-	}
-	
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.getName());
-	}
-
-	public IProject getProject() {
-		return this.project;
-	}
-
-	public IJavaProject getJavaProject() {
-		return JavaCore.create(this.project);
-	}
-
-	@Override
-	public JpaPlatform getJpaPlatform() {
-		return this.jpaPlatform;
-	}
-
-	public JpaDataSource getDataSource() {
-		return this.dataSource;
-	}
-
-	@Override
-	public ConnectionProfile getConnectionProfile() {
-		return this.dataSource.getConnectionProfile();
-	}
-	
-	public Schema getDefaultSchema() {
-		Schema defaultSchema = getUserOverrideDefaultSchema();
-		if (defaultSchema != null) {
-			return defaultSchema;
-		}
-		return getConnectionProfile().getDefaultSchema();
-	}
-	
-	public Schema getUserOverrideDefaultSchema() {
-		if (this.userOverrideDefaultSchemaName == null) {
-			return null;
-		}
-		return getConnectionProfile().getDatabase().schemaNamed(this.userOverrideDefaultSchemaName);
-	}
-	
-	
-	// **************** user override default schema name **********************
-	
-	public String getUserOverrideDefaultSchemaName() {
-		return this.userOverrideDefaultSchemaName;
-	}
-	
-	public void setUserOverrideDefaultSchemaName(String newDefaultSchemaName) {
-		String oldDefaultSchemaName = this.userOverrideDefaultSchemaName;
-		this.userOverrideDefaultSchemaName = newDefaultSchemaName;
-		this.firePropertyChanged(USER_OVERRIDE_DEFAULT_SCHEMA_NAME_PROPERTY, 
-				oldDefaultSchemaName, newDefaultSchemaName);
-	}
-	
-	
-	// **************** discover annotated classes *****************************
-	
-	public boolean discoversAnnotatedClasses() {
-		return this.discoversAnnotatedClasses;
-	}
-	
-	public void setDiscoversAnnotatedClasses(boolean discoversAnnotatedClasses) {
-		boolean old = this.discoversAnnotatedClasses;
-		this.discoversAnnotatedClasses = discoversAnnotatedClasses;
-		this.firePropertyChanged(DISCOVERS_ANNOTATED_CLASSES_PROPERTY, old, discoversAnnotatedClasses);
-	}
-	
-	
-	// **************** JPA files **********************************************
-
-	public Iterator<JpaFile> jpaFiles() {
-		return new CloneIterator<JpaFile>(this.jpaFiles);  // read-only
-	}
-
-	public int jpaFilesSize() {
-		return this.jpaFiles.size();
-	}
-
-	public JpaFile getJpaFile(IFile file) {
-		synchronized (this.jpaFiles) {
-			for (JpaFile jpaFile : this.jpaFiles) {
-				if (jpaFile.getFile().equals(file)) {
-					return jpaFile;
-				}
-			}
-		}
-		return null;
-	}
-
-	public Iterator<JpaFile> jpaFiles(final String resourceType) {
-		return new FilteringIterator<JpaFile, JpaFile>(this.jpaFiles()) {
-			@Override
-			protected boolean accept(JpaFile o) {
-				return o.getResourceType().equals(resourceType);
-			}
-		};
-	}
-
-	/**
-	 * Add a JPA file for the specified file, if appropriate.
-	 * Return true if a JPA File was created and added, false otherwise
-	 */
-	protected boolean addJpaFile(IFile file) {
-		JpaFile jpaFile = this.addJpaFileInternal(file);
-		if (jpaFile != null) {
-			this.fireItemAdded(JPA_FILES_COLLECTION, jpaFile);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Add a JPA file for the specified file, if appropriate, without firing
-	 * an event; useful during construction.
-	 * Return the new JPA file, null if it was not created.
-	 */
-	protected JpaFile addJpaFileInternal(IFile file) {
-		JpaFile jpaFile = this.jpaPlatform.buildJpaFile(this, file);
-		if (jpaFile == null) {
-			return null;
-		}
-		this.jpaFiles.add(jpaFile);
-		jpaFile.getResourceModel().addResourceModelChangeListener(this.resourceModelListener);
-		return jpaFile;
-	}
-
-	/**
-	 * Remove the JPA file corresponding to the specified IFile, if it exists.
-	 * Return true if a JPA File was removed, false otherwise
-	 */
-	protected boolean removeJpaFile(IFile file) {
-		JpaFile jpaFile = this.getJpaFile(file);
-		if (jpaFile != null) { //a JpaFile is not added for every IFile
-			removeJpaFile(jpaFile);
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Remove the JPA file and dispose of it
-	 */
-	protected void removeJpaFile(JpaFile jpaFile) {
-		jpaFile.getResourceModel().removeResourceModelChangeListener(this.resourceModelListener);
-		jpaFile.dispose();
-		if ( ! this.removeItemFromCollection(jpaFile, this.jpaFiles, JPA_FILES_COLLECTION)) {
-			throw new IllegalArgumentException("JPA file: " + jpaFile.getFile().getName());
-		}
-	}
-
-	protected boolean containsJpaFile(IFile file) {
-		return (this.getJpaFile(file) != null);
-	}
-
-
-	// ********** context model **********
-
-	public JpaRootContextNode getRootContext() {
-		return this.rootContextNode;
-	}
-
-
-	// ********** more queries **********
-
-	public Iterator<String> annotatedClassNames() {
-		return new TransformationIterator<JavaResourcePersistentType, String>(this.annotatedJavaPersistentTypes()) {
-			@Override
-			protected String transform(JavaResourcePersistentType next) {
-				return next.getQualifiedName();
-			}
-		};
-	}
-	
-	protected Iterator<JavaResourcePersistentType> annotatedJavaPersistentTypes() {
-		return new FilteringIterator<JavaResourcePersistentType, JavaResourcePersistentType>(this.javaResourcePersistentTypes()) {
-			@Override
-			protected boolean accept(JavaResourcePersistentType persistentType) {
-				return (persistentType == null) ? false : persistentType.isPersisted();
-			}
-		};
-	}
-	
-	protected Iterator<JavaResourcePersistentType> javaResourcePersistentTypes() {
-		return new CompositeIterator<JavaResourcePersistentType>(
-			new TransformationIterator<JpaCompilationUnit, Iterator<JavaResourcePersistentType>>(jpaCompilationUnitResources()) {
-				@Override
-				protected Iterator<JavaResourcePersistentType> transform(JpaCompilationUnit next) {
-					if (next.getPersistentType() == null) {
-						return EmptyIterator.instance();
-					}
-					return new CompositeIterator<JavaResourcePersistentType>(next.getPersistentType(), next.getPersistentType().nestedTypes());
-				}
-			});
-	}
-
-	public Iterator<JpaFile> javaJpaFiles() {
-		return this.jpaFiles(ResourceModel.JAVA_RESOURCE_TYPE);
-	}
-	
-	protected Iterator<JpaCompilationUnit> jpaCompilationUnitResources() {
-		return new TransformationIterator<JpaFile, JpaCompilationUnit>(this.javaJpaFiles()) {
-			@Override
-			protected JpaCompilationUnit transform(JpaFile jpaFile) {
-				return ((JavaResourceModel) jpaFile.getResourceModel()).getJpaCompilationUnit();
-			}
-		};
-	}
-
-	// look for binary stuff here...
-	public JavaResourcePersistentType getJavaPersistentTypeResource(String typeName) {
-		for (JpaCompilationUnit jpCompilationUnitResource : CollectionTools.iterable(this.jpaCompilationUnitResources())) {
-			JavaResourcePersistentType jptr =  jpCompilationUnitResource.getJavaPersistentTypeResource(typeName);
-			if (jptr != null) {
-				return jptr;
-			}
-		}
-//		this.javaProject().findType(typeName);
-		return null;
-	}
-
-
-	// ********** Java change **********
-
-	public void javaElementChanged(ElementChangedEvent event) {
-		for (Iterator<JpaFile> stream = this.jpaFiles(); stream.hasNext(); ) {
-			stream.next().javaElementChanged(event);
-		}
-	}
-
-
-	// ********** validation **********
-	
-	public Iterator<IMessage> validationMessages() {
-		List<IMessage> messages = new ArrayList<IMessage>();
-		this.jpaPlatform.addToMessages(this, messages);
-		return messages.iterator();
-	}
-	
-	/* If this is true, it may be assumed that all the requirements are valid 
-	 * for further validation.  For example, if this is true at the point we
-	 * are validating persistence units, it may be assumed that there is a 
-	 * single persistence.xml and that it has valid content down to the 
-	 * persistence unit level.  */
-	private boolean okToContinueValidation = true;
-	
-	public void addToMessages(List<IMessage> messages) {
-		//start with the project - then down
-		//project validation
-		addProjectLevelMessages(messages);
-		
-		//context model validation
-		getRootContext().addToMessages(messages);
-	}
-
-	protected void addProjectLevelMessages(List<IMessage> messages) {
-		addConnectionMessages(messages);
-		addMultiplePersistenceXmlMessage(messages);
-	}
-	
-	protected void addConnectionMessages(List<IMessage> messages) {
-		addNoConnectionMessage(messages);
-		addInvalidConnectionMessage(messages);
-		addInactiveConnectionMessage(messages);
-	}
-	
-	protected boolean okToProceedForConnectionValidation = true;
-	
-	protected void addNoConnectionMessage(List<IMessage> messages) {
-		if (StringTools.stringIsEmpty(this.getDataSource().getConnectionProfileName())) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.NORMAL_SEVERITY,
-						JpaValidationMessages.PROJECT_NO_CONNECTION,
-						this)
-				);
-			okToProceedForConnectionValidation = false;
-		}
-	}
-	
-	protected void addInvalidConnectionMessage(List<IMessage> messages) {
-		if (okToProceedForConnectionValidation && ! this.getDataSource().hasAConnection()) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.NORMAL_SEVERITY,
-						JpaValidationMessages.PROJECT_INVALID_CONNECTION,
-						new String[] {this.getDataSource().getConnectionProfileName()},
-						this)
-				);
-			okToProceedForConnectionValidation = false;
-		}
-	}
-	
-	protected void addInactiveConnectionMessage(List<IMessage> messages) {
-		if (okToProceedForConnectionValidation && ! this.getDataSource().connectionProfileIsActive()) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.NORMAL_SEVERITY,
-						JpaValidationMessages.PROJECT_INACTIVE_CONNECTION,
-						new String[] {this.getDataSource().getConnectionProfileName()},
-						this)
-				);
-		}
-		okToProceedForConnectionValidation = true;
-	}
-	
-	protected void addMultiplePersistenceXmlMessage(List<IMessage> messages) {
-//		if (validPersistenceXmlFiles.size() > 1) {
-//			messages.add(
-//					JpaValidationMessages.buildMessage(
-//						IMessage.HIGH_SEVERITY,
-//						IJpaValidationMessages.PROJECT_MULTIPLE_PERSISTENCE_XML,
-//						jpaProject)
-//				);
-//			okToContinueValidation = false;
-//		}
-	}
-	
-	
-	// ********** root deploy location **********
-
-	protected static final String WEB_PROJECT_ROOT_DEPLOY_LOCATION = J2EEConstants.WEB_INF_CLASSES;
-
-	public String getRootDeployLocation() {
-		return this.isWebProject() ? WEB_PROJECT_ROOT_DEPLOY_LOCATION : "";
-	}
-
-	protected static final String JST_WEB_MODULE = IModuleConstants.JST_WEB_MODULE;
-
-	protected boolean isWebProject() {
-		return JptCorePlugin.projectHasWebFacet(this.project);
-	}
-
-
-	// ********** dispose **********
-
-	public void dispose() {
-		if (this.updater != null) {
-			this.updater.dispose();
-		}
-		// use clone iterator while deleting JPA files
-		for (Iterator<JpaFile> stream = this.jpaFiles(); stream.hasNext(); ) {
-			this.removeJpaFile(stream.next());
-		}
-		this.dataSource.dispose();
-	}
-
-
-	// ********** resource model listener **********
-
-	protected class DefaultResourceModelListener implements ResourceModelListener {
-		protected DefaultResourceModelListener() {
-			super();
-		}
-		public void resourceModelChanged() {
-			GenericJpaProject.this.update();
-		}
-	}
-
-
-	// ********** handling resource deltas **********
-
-	public void synchronizeJpaFiles(IResourceDelta delta) throws CoreException {
-		ResourceDeltaVisitor resourceDeltaVisitor = this.buildResourceDeltaVisitor();
-		delta.accept(resourceDeltaVisitor);
-		if (resourceDeltaVisitor.jpaFilesChanged()) {
-			for(JpaFile jpaFile : CollectionTools.iterable(jpaFiles())) {
-				jpaFile.getResourceModel().resolveTypes();
-			}
-		}
-	}
-
-	/**
-	 * resource delta visitor callback
-	 * Return true if a JpaFile was either added or removed
-	 */
-	protected boolean synchronizeJpaFiles(IFile file, int deltaKind) {
-		switch (deltaKind) {
-			case IResourceDelta.ADDED :
-				return this.addJpaFile(file);
-			case IResourceDelta.REMOVED :
-				return this.removeJpaFile(file);
-			case IResourceDelta.CHANGED :
-			case IResourceDelta.ADDED_PHANTOM :
-			case IResourceDelta.REMOVED_PHANTOM :
-			default :
-				break;  // only worried about added and removed files
-		}
-
-		return false;
-	}
-
-	// ***** inner class
-	/**
-	 * add a JPA file for every [appropriate] file encountered by the visitor
-	 */
-	protected class ResourceDeltaVisitor implements IResourceDeltaVisitor {
-		private boolean jpaFilesChanged = false;
-		
-		protected ResourceDeltaVisitor() {
-			super();
-		}
-		public boolean visit(IResourceDelta delta) throws CoreException {
-			IResource res = delta.getResource();
-			switch (res.getType()) {
-				case IResource.ROOT :
-				case IResource.PROJECT :
-				case IResource.FOLDER :
-					return true;  // visit children
-				case IResource.FILE :
-					if (GenericJpaProject.this.synchronizeJpaFiles((IFile) res, delta.getKind())) {
-						this.jpaFilesChanged = true;
-					}
-					return false;  // no children
-				default :
-					return false;  // no children
-			}
-		}
-		/**
-		 * Used to determine if the JPA files collection was modified while
-		 * traversing the IResourceDelta.  Return true if a JPA file was added/removed
-		 */
-		protected boolean jpaFilesChanged() {
-			return this.jpaFilesChanged;
-		}
-	}
-
-
-	// ********** support for modifying documents shared with the UI **********
-
-	/**
-	 * If there is no thread-specific command executor, use the default
-	 * implementation, which simply executes the command directly.
-	 */
-	protected CommandExecutor getThreadLocalModifySharedDocumentCommandExecutor() {
-		CommandExecutor ce = this.threadLocalModifySharedDocumentCommandExecutor.get();
-		return (ce != null) ? ce : CommandExecutor.Default.instance();
-	}
-
-	public void setThreadLocalModifySharedDocumentCommandExecutor(CommandExecutor commandExecutor) {
-		this.threadLocalModifySharedDocumentCommandExecutor.set(commandExecutor);
-	}
-
-	public CommandExecutorProvider getModifySharedDocumentCommandExecutorProvider() {
-		return this.modifySharedDocumentCommandExecutorProvider;
-	}
-
-	// ***** inner class
-	protected class ModifySharedDocumentCommandExecutorProvider implements CommandExecutorProvider {
-		protected ModifySharedDocumentCommandExecutorProvider() {
-			super();
-		}
-		public CommandExecutor getCommandExecutor() {
-			return GenericJpaProject.this.getThreadLocalModifySharedDocumentCommandExecutor();
-		}
-	}
-
-
-	// ********** project "update" **********
-
-	public Updater getUpdater() {
-		return this.updater;
-	}
-
-	public void setUpdater(Updater updater) {
-		if (this.updater != null) {  // first time through, the updater will be null
-			this.updater.dispose();
-		}
-		this.updater = updater;
-		this.updater.start();
-	}
-
-	/**
-	 * Delegate to the updater so clients can configure how updates occur.
-	 */
-	public void update() {
-		if (this.updater == null) {
-			throw new IllegalStateException("updater is null, use setUpdater(Updater) after construction of GenericJpaProject");
-		}
-		this.updater.update();
-	}
-
-	/**
-	 * Called by the updater.
-	 */
-	public IStatus update(IProgressMonitor monitor) {
-		try {
-			this.getRootContext().update(monitor);
-		} catch (OperationCanceledException ex) {
-			return Status.CANCEL_STATUS;
-		} catch (Throwable ex) {
-			// Exceptions can occur when the update is running and changes are
-			// made concurrently to the Java source. When that happens, our
-			// model might be in an inconsistent state because it is not yet in
-			// sync with the changed Java source.
-			// Log these exceptions and assume they won't happen when the
-			// update runs again as a result of the concurrent Java source changes.
-			JptCorePlugin.log(ex);
-		}
-		return Status.OK_STATUS;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModelManager.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModelManager.java
deleted file mode 100644
index 1e21e392ef..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModelManager.java
+++ /dev/null
@@ -1,564 +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.core.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IOpenable;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jpt.core.JpaFile;
-import org.eclipse.jpt.core.JpaModel;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.internal.prefs.JpaPreferenceConstants;
-import org.eclipse.jpt.utility.internal.BitTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent;
-import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener;
-import org.eclipse.wst.common.project.facet.core.events.IProjectFacetActionEvent;
-
-/**
- * "Internal" global stuff.
- * Provide access via a singleton.
- * Hold and manage the JPA model (which holds all the JPA projects)
- * and the various global listeners. We attempt to determine whether events
- * are relevant before forwarding them to the JPA model.
- * 
- * Various things that cause us to add or remove a JPA project:
- * - Startup of the Dali plug-in will trigger all the JPA projects to be added
- * 
- * - Project created and facet installed
- *     facet POST_INSTALL
- * - Project facet uninstalled
- *     facet PRE_UNINSTALL
- * 
- * - Project opened
- *     facet PROJECT_MODIFIED
- * - Project closed
- *     facet PROJECT_MODIFIED
- * 
- * - Pre-existing project imported (created and opened)
- *     resource POST_CHANGE -> PROJECT -> CHANGED -> OPEN
- * - Project deleted
- *     resource PRE_DELETE
- * 
- * - Project facet installed by editing the facets settings file directly
- *     facet PROJECT_MODIFIED
- * - Project facet uninstalled by editing the facets settings file directly
- *     facet PROJECT_MODIFIED
- */
-public class JpaModelManager {
-
-	/**
-	 * The JPA model - null until the plug-in is started.
-	 */
-	private GenericJpaModel jpaModel;
-
-	/**
-	 * Listen for changes to projects and files.
-	 */
-	private final IResourceChangeListener resourceChangeListener;
-
-	/**
-	 * Listen for the JPA facet being added or removed from a project.
-	 */
-	private final IFacetedProjectListener facetedProjectListener;
-
-	/**
-	 * Listen for Java changes and forward them to the JPA model,
-	 * which will forward them to the JPA projects.
-	 */
-	private final IElementChangedListener javaElementChangeListener;
-
-	/**
-	 * Listen for changes to the "Default JPA Lib" preference
-	 * so we can update the corresponding classpath variable.
-	 */
-	private final IPropertyChangeListener preferencesListener;
-
-
-	// ********** singleton **********
-
-	private static final JpaModelManager INSTANCE = new JpaModelManager();
-
-	/**
-	 * Return the singleton JPA model manager.
-	 */
-	public static JpaModelManager instance() {
-		return INSTANCE;
-	}
-
-
-	// ********** constructor **********
-
-	/**
-	 * Private - ensure single instance.
-	 */
-	private JpaModelManager() {
-		super();
-		this.resourceChangeListener = new ResourceChangeListener();
-		this.facetedProjectListener = new FacetedProjectListener();
-		this.javaElementChangeListener = new JavaElementChangeListener();
-		this.preferencesListener = new PreferencesListener();
-	}
-
-
-	// ********** plug-in controlled life-cycle **********
-
-	/**
-	 * internal - called by JptCorePlugin
-	 */
-	public synchronized void start() throws Exception {
-		debug("*** START JPA model manager ***");
-		try {
-			this.jpaModel = new GenericJpaModel();
-			ResourcesPlugin.getWorkspace().addResourceChangeListener(this.resourceChangeListener);
-			FacetedProjectFramework.addListener(this.facetedProjectListener, IFacetedProjectEvent.Type.values());
-			JavaCore.addElementChangedListener(this.javaElementChangeListener);
-			JptCorePlugin.instance().getPluginPreferences().addPropertyChangeListener(this.preferencesListener);
-		} catch (RuntimeException ex) {
-			this.log(ex);
-			this.stop();
-		}
-	}
-
-	/**
-	 * internal - called by JptCorePlugin
-	 */
-	public synchronized void stop() throws Exception {
-		debug("*** STOP JPA model manager ***");
-		JptCorePlugin.instance().getPluginPreferences().removePropertyChangeListener(this.preferencesListener);
-		JavaCore.removeElementChangedListener(this.javaElementChangeListener);
-		FacetedProjectFramework.removeListener(this.facetedProjectListener);
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this.resourceChangeListener);
-		this.jpaModel.dispose();
-		this.jpaModel = null;
-	}
-
-
-	// ********** API **********
-
-	/**
-	 * Return the workspace-wide JPA model.
-	 */
-	public JpaModel getJpaModel() {
-		return this.jpaModel;
-	}
-
-	/** 
-	 * Return the JPA project corresponding to the specified Eclipse project,
-	 * or null if unable to associate the specified project with a
-	 * JPA project.
-	 */
-	public JpaProject getJpaProject(IProject project) throws CoreException {
-		return this.jpaModel.getJpaProject(project);
-	}
-
-	/**
-	 * Return the JPA file corresponding to the specified Eclipse file,
-	 * or null if unable to associate the specified file with a JPA file.
-	 */
-	public JpaFile getJpaFile(IFile file) throws CoreException {
-		return this.jpaModel.getJpaFile(file);
-	}
-
-	/**
-	 * The JPA settings associated with the specified Eclipse project
-	 * have changed in such a way as to require the associated
-	 * JPA project to be completely rebuilt
-	 * (e.g. when the user changes a project's JPA platform).
-	 */
-	public void rebuildJpaProject(IProject project) {
-		this.jpaModel.rebuildJpaProject(project);
-	}
-
-	/**
-	 * Log the specified status.
-	 */
-	public void log(IStatus status) {
-		JptCorePlugin.log(status);
-    }
-
-	/**
-	 * Log the specified message.
-	 */
-	public void log(String msg) {
-		JptCorePlugin.log(msg);
-    }
-
-	/**
-	 * Log the specified exception or error.
-	 */
-	public void log(Throwable throwable) {
-		JptCorePlugin.log(throwable);
-	}
-
-
-	// ********** resource changed **********
-
-	/**
-	 * Check for:
-	 *   - project close/delete
-	 *   - file add/remove
-	 */
-	/* private */ void resourceChanged(IResourceChangeEvent event) {
-		if (! (event.getSource() instanceof IWorkspace)) {
-			return;  // this probably shouldn't happen...
-		}
-		switch (event.getType()){
-			case IResourceChangeEvent.PRE_DELETE :  // project-only event
-				this.resourcePreDelete(event);
-				break;
-			case IResourceChangeEvent.POST_CHANGE :
-				this.resourcePostChange(event);
-				break;
-			case IResourceChangeEvent.PRE_CLOSE :  // project-only event
-			case IResourceChangeEvent.PRE_BUILD :
-			case IResourceChangeEvent.POST_BUILD :
-			default :
-				break;
-		}
-	}
-
-	/**
-	 * A project is being deleted. Remove its corresponding
-	 * JPA project if appropriate.
-	 */
-	private void resourcePreDelete(IResourceChangeEvent event) {
-		debug("Resource (Project) PRE_DELETE: " + event.getResource());
-		this.jpaModel.projectPreDelete((IProject) event.getResource());
-	}
-
-	/**
-	 * A resource has changed somehow.
-	 * Check for files being added or removed.
-	 * (The JPA project only handles added and removed files here, ignoring
-	 * changed files.)
-	 */
-	private void resourcePostChange(IResourceChangeEvent event) {
-		debug("Resource POST_CHANGE");
-		this.synchronizeFiles(event.getDelta());
-		this.checkForOpenedProjects(event.getDelta());
-	}
-
-	private void synchronizeFiles(IResourceDelta delta) {
-		IResource resource = delta.getResource();
-		switch (resource.getType()) {
-			case IResource.ROOT :
-				this.synchronizeFiles(delta.getAffectedChildren());  // recurse
-				break;
-			case IResource.PROJECT :
-				this.synchronizeFiles((IProject) resource, delta);
-				break;
-			case IResource.FILE :
-			case IResource.FOLDER :
-			default :
-				break;
-		}
-	}
-
-	private void synchronizeFiles(IResourceDelta[] deltas) {
-		for (int i = 0; i < deltas.length; i++) {
-			this.synchronizeFiles(deltas[i]);  // recurse
-		}
-	}
-
-	/**
-	 * Checked exceptions bite.
-	 */
-	private void synchronizeFiles(IProject project, IResourceDelta delta) {
-		try {
-			this.jpaModel.synchronizeFiles(project, delta);
-		} catch (CoreException ex) {
-			this.log(ex);  // problem traversing the project's resources - not much we can do
-		}
-	}
-
-	/**
-	 * Crawl the specified delta, looking for projects being opened.
-	 * Projects being deleted are handled in IResourceChangeEvent.PRE_DELETE.
-	 * Projects being closed are handled in IFacetedProjectEvent.Type.PROJECT_MODIFIED.
-	 */
-	private void checkForOpenedProjects(IResourceDelta delta) {
-		IResource resource = delta.getResource();
-		switch (resource.getType()) {
-			case IResource.ROOT :
-				this.checkForOpenedProjects(delta.getAffectedChildren());  // recurse
-				break;
-			case IResource.PROJECT :
-				this.checkForOpenedProject((IProject) resource, delta);
-				break;
-			case IResource.FILE :
-			case IResource.FOLDER :
-			default :
-				break;
-		}
-	}
-
-	private void checkForOpenedProjects(IResourceDelta[] deltas) {
-		for (int i = 0; i < deltas.length; i++) {
-			this.checkForOpenedProjects(deltas[i]);  // recurse
-		}
-	}
-
-	private void checkForOpenedProject(IProject project, IResourceDelta delta) {
-		switch (delta.getKind()) {
-			case IResourceDelta.CHANGED : 
-				this.checkDeltaFlagsForOpenedProject(project, delta);
-				break;
-			case IResourceDelta.REMOVED :  // already handled with the PRE_DELETE event
-			case IResourceDelta.ADDED :  // all but project rename handled with the facet POST_INSTALL event
-				this.checkDeltaFlagsForRenamedProject(project, delta);
-				break;
-			case IResourceDelta.ADDED_PHANTOM :  // ignore
-			case IResourceDelta.REMOVED_PHANTOM :  // ignore
-			default :
-				break;
-		}
-	}
-
-	/**
-	 * We don't get any events from the Facets Framework when a pre-existing
-	 * project is imported, so we need to check for the newly imported project here.
-	 * 
-	 * This event also occurs when a project is simply opened. Project opening
-	 * also triggers a Facet PROJECT_MODIFIED event and that is where we add
-	 * the JPA project, not here
-	 */
-	private void checkDeltaFlagsForOpenedProject(IProject project, IResourceDelta delta) {
-		if (BitTools.flagIsSet(delta.getFlags(), IResourceDelta.OPEN) && project.isOpen()) {
-			debug("\tProject CHANGED - OPEN: " + project.getName());
-			this.jpaModel.checkForTransition(project);
-		}
-	}
-	
-	/**
-	 * We don't get any events from the Facets Framework when a project is renamed,
-	 * so we need to check for the renamed projects here.
-	 */
-	private void checkDeltaFlagsForRenamedProject(IProject project, IResourceDelta delta) {
-		if (BitTools.flagIsSet(delta.getFlags(), IResourceDelta.MOVED_FROM) && project.isOpen()) {
-			debug("\tProject ADDED - MOVED_FROM: " + delta.getMovedFromPath());
-			this.jpaModel.checkForTransition(project);
-		}
-	}
-
-
-	// ********** faceted project changed **********
-
-	/**
-	 * Check for:
-	 *   - install of JPA facet
-	 *   - un-install of JPA facet
-	 *   - any other appearance or disappearance of the JPA facet
-	 */
-	/* private */ void facetedProjectChanged(IFacetedProjectEvent event) {
-		switch (event.getType()) {
-			case POST_INSTALL :
-				this.facetedProjectPostInstall((IProjectFacetActionEvent) event);
-				break;
-			case PRE_UNINSTALL :
-				this.facetedProjectPreUninstall((IProjectFacetActionEvent) event);
-				break;
-			case PROJECT_MODIFIED :
-				this.facetedProjectModified(event.getProject().getProject());
-				break;
-			default :
-				break;
-		}
-	}
-
-	private void facetedProjectPostInstall(IProjectFacetActionEvent event) {
-		debug("Facet POST_INSTALL: " + event.getProjectFacet());
-		if (event.getProjectFacet().getId().equals(JptCorePlugin.FACET_ID)) {
-			this.jpaModel.jpaFacetedProjectPostInstall(event);
-		}
-	}
-
-	private void facetedProjectPreUninstall(IProjectFacetActionEvent event) {
-		debug("Facet PRE_UNINSTALL: " + event.getProjectFacet());
-		if (event.getProjectFacet().getId().equals(JptCorePlugin.FACET_ID)) {
-			this.jpaModel.jpaFacetedProjectPreUninstall(event);
-		}
-	}
-
-	/**
-	 * This event is triggered for any change to a faceted project.
-	 * We use the event to watch for the following:
-	 *   - an open project is closed
-	 *   - a closed project is opened
-	 *   - one of a project's (facet) metadata files is edited directly
-	 */
-	private void facetedProjectModified(IProject project) {
-		debug("Facet PROJECT_MODIFIED: " + project.getName());
-		this.jpaModel.checkForTransition(project);
-	}
-
-
-	// ********** Java element changed **********
-
-	/**
-	 * Forward the event to the JPA model.
-	 */
-	/* private */ void javaElementChanged(ElementChangedEvent event) {
-		if (this.eventIndicatesProjectAddedButNotOpen(event)) {
-			return;
-		}
-		this.jpaModel.javaElementChanged(event);
-	}
-
-	//209275 - This particular event only causes problems in a clean workspace the first time a JPA project
-	//is created through the JPA wizard. The second time a JPA project is created, this event occurs, but 
-	//it occurs as the wizard is closing so it does not cause a deadlock.
-	private boolean eventIndicatesProjectAddedButNotOpen(ElementChangedEvent event) {
-		IJavaElementDelta delta = event.getDelta();
-		if (delta.getKind() == IJavaElementDelta.CHANGED) {
-			if (delta.getElement().getElementType() == IJavaElement.JAVA_MODEL) {
-				IJavaElementDelta[] children = delta.getAffectedChildren();
-				if (children.length == 1) {
-					IJavaElementDelta childDelta = children[0];
-					if (childDelta.getKind() == IJavaElementDelta.ADDED) {
-						IJavaElement childElement = childDelta.getElement();
-						if (childElement.getElementType() == IJavaElement.JAVA_PROJECT) {
-							if (childDelta.getAffectedChildren().length == 0) {
-								if (!((IOpenable) childElement).isOpen()) {
-									return true;
-								}
-							}
-						}
-					}
-				}
-			}
-		}	
-		return false;
-	}
-
-	// ********** preference changed **********
-
-	/**
-	 * When the "Default JPA Lib" preference changes,
-	 * update the appropriate JDT Core classpath variable.
-	 */
-	/* private */ void preferenceChanged(PropertyChangeEvent event) {
-		if (event.getProperty() == JpaPreferenceConstants.PREF_DEFAULT_JPA_LIB) {
-			try {
-				JavaCore.setClasspathVariable("DEFAULT_JPA_LIB", new Path((String) event.getNewValue()), null);
-			} catch (JavaModelException ex) {
-				this.log(ex);  // not sure what would cause this...
-			}
-		}
-	}
-
-
-	// ********** resource change listener **********
-
-	/**
-	 * Forward the Resource change event back to the JPA model manager.
-	 */
-	private class ResourceChangeListener implements IResourceChangeListener {
-		ResourceChangeListener() {
-			super();
-		}
-		public void resourceChanged(IResourceChangeEvent event) {
-			JpaModelManager.this.resourceChanged(event);
-		}
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this);
-		}
-	}
-
-
-	// ********** faceted project listener **********
-
-	/**
-	 * Forward the Faceted project change event back to the JPA model manager.
-	 */
-	private class FacetedProjectListener implements IFacetedProjectListener {
-		FacetedProjectListener() {
-			super();
-		}
-		public void handleEvent(IFacetedProjectEvent event) {
-			JpaModelManager.this.facetedProjectChanged(event);
-		}
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this);
-		}
-	}
-
-
-	// ********** Java element change listener **********
-
-	/**
-	 * Forward the Java element change event back to the JPA model manager.
-	 */
-	private class JavaElementChangeListener implements IElementChangedListener {
-		JavaElementChangeListener() {
-			super();
-		}
-		public void elementChanged(ElementChangedEvent event) {
-			JpaModelManager.this.javaElementChanged(event);
-		}
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this);
-		}
-	}
-
-
-	// ********** preferences listener **********
-
-	/**
-	 * Forward the Preferences change event back to the JPA model manager.
-	 */
-	private class PreferencesListener implements IPropertyChangeListener {
-		PreferencesListener() {
-			super();
-		}
-		public void propertyChange(PropertyChangeEvent event) {
-			JpaModelManager.this.preferenceChanged(event);
-		}
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this);
-		}
-	}
-
-
-	// ********** debug **********
-
-	// @see JpaModelTests#testDEBUG()
-	private static final boolean DEBUG = false;
-
-	private static void debug(String message) {
-		if (DEBUG) {
-			System.out.println(Thread.currentThread().getName() + ": " + message);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaProjectAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaProjectAdapterFactory.java
deleted file mode 100644
index 3244d67704..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaProjectAdapterFactory.java
+++ /dev/null
@@ -1,44 +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.core.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.JptCorePlugin;
-
-public class JpaProjectAdapterFactory
-	implements IAdapterFactory
-{
-	private static Class[] PROPERTIES= new Class[] {
-		JpaProject.class
-	};
-		
-	public Class[] getAdapterList() {
-		return PROPERTIES;
-	}
-	
-	public Object getAdapter(Object element, Class key) {
-		IProject project;
-		
-		if (element instanceof IProject) {
-			project = (IProject) element;
-		}
-		else if (element instanceof IJavaProject) {
-			project = ((IJavaProject) element).getProject();
-		}
-		else {
-			return null;
-		}
-		
-		return JptCorePlugin.getJpaProject(project);
-	}	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JptCoreMessages.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JptCoreMessages.java
deleted file mode 100644
index 39c2171588..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JptCoreMessages.java
+++ /dev/null
@@ -1,73 +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.core.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public class JptCoreMessages extends NLS
-{
-	private static final String BUNDLE_NAME = "jpa_core"; //$NON-NLS-1$
-	
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, JptCoreMessages.class);
-	}
-	
-	public static String NONE;
-	
-	public static String VALIDATE_PROJECT_NOT_SPECIFIED;
-	
-	public static String VALIDATE_SOURCE_FOLDER_NOT_SPECIFIED;
-	
-	public static String VALIDATE_SOURCE_FOLDER_ILLEGAL;
-	
-	public static String VALIDATE_SOURCE_FOLDER_DOES_NOT_EXIST;
-	
-	public static String VALIDATE_SOURCE_FOLDER_NOT_IN_PROJECT;
-	
-	public static String VALIDATE_SOURCE_FOLDER_NOT_SOURCE_FOLDER;
-	
-	public static String VALIDATE_ORM_FILE_ALREADY_EXISTS;
-	
-	public static String VALIDATE_PERSISTENCE_UNIT_DOES_NOT_SPECIFIED;
-	
-	public static String VALIDATE_PERSISTENCE_UNIT_NOT_IN_PROJECT;
-	
-	public static String VALIDATE_PLATFORM_NOT_SPECIFIED;
-	
-	public static String VALIDATE_CONNECTION_NOT_SPECIFIED;
-	
-	public static String VALIDATE_CONNECTION_INVALID;
-	
-	public static String VALIDATE_CONNECTION_NOT_CONNECTED;
-	
-	public static String VALIDATE_DEFAULT_SCHEMA_NOT_SPECIFIED;
-	
-	public static String VALIDATE_RUNTIME_NOT_SPECIFIED;
-	
-	public static String VALIDATE_RUNTIME_DOES_NOT_SUPPORT_EJB_30;
-	
-	public static String VALIDATE_LIBRARY_NOT_SPECIFIED;
-	
-	public static String SYNCHRONIZE_CLASSES_JOB;
-	
-	public static String SYNCHRONIZING_CLASSES_TASK;
-	
-	public static String INVALID_PERSISTENCE_XML_CONTENT;
-	
-	public static String ERROR_SYNCHRONIZING_CLASSES_COULD_NOT_VALIDATE;
-	
-	public static String ERROR_WRITING_FILE;
-	
-	
-	private JptCoreMessages() {
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SimpleJpaProjectConfig.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SimpleJpaProjectConfig.java
deleted file mode 100644
index f642ef3ae9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SimpleJpaProjectConfig.java
+++ /dev/null
@@ -1,76 +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.core.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jpt.core.JpaPlatform;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * Straightforward implementation of the JPA project config.
- */
-public class SimpleJpaProjectConfig implements JpaProject.Config {
-	protected IProject project;
-	protected JpaPlatform jpaPlatform;
-	protected String connectionProfileName;
-	protected String userOverrideDefaultSchemaName;
-	protected boolean discoverAnnotatedClasses;
-
-	public SimpleJpaProjectConfig() {
-		super();
-	}
-
-	public IProject getProject() {
-		return this.project;
-	}
-
-	public void setProject(IProject project) {
-		this.project = project;
-	}
-
-	public JpaPlatform getJpaPlatform() {
-		return this.jpaPlatform;
-	}
-
-	public void setJpaPlatform(JpaPlatform jpaPlatform) {
-		this.jpaPlatform = jpaPlatform;
-	}
-
-	public String getConnectionProfileName() {
-		return this.connectionProfileName;
-	}
-
-	public void setConnectionProfileName(String connectionProfileName) {
-		this.connectionProfileName = connectionProfileName;
-	}
-	
-	public String getUserOverrideDefaultSchemaName() {
-		return this.userOverrideDefaultSchemaName;
-	}
-	
-	public void setUserOverrideDefaultSchemaName(String userOverrideDefaultSchemaName) {
-		this.userOverrideDefaultSchemaName = userOverrideDefaultSchemaName;
-	}
-	
-	public boolean discoverAnnotatedClasses() {
-		return this.discoverAnnotatedClasses;
-	}
-
-	public void setDiscoverAnnotatedClasses(boolean discoverAnnotatedClasses) {
-		this.discoverAnnotatedClasses = discoverAnnotatedClasses;
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.project.getName());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SynchronousJpaProjectUpdater.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SynchronousJpaProjectUpdater.java
deleted file mode 100644
index 37a621f36b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SynchronousJpaProjectUpdater.java
+++ /dev/null
@@ -1,132 +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.core.internal;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.SynchronizedBoolean;
-
-/**
- * This updater will "update" the JPA project immediately and not return until
- * the "update" and all resulting "updates" are complete. This implementation
- * should be used sparingly and for as short a time as possible, as it increases
- * the probability of deadlocks. A deadlock can occur when a JPA project is
- * updated from multiple threads and various resources are locked in varying
- * orders.
- */
-public class SynchronousJpaProjectUpdater implements JpaProject.Updater {
-	protected final JpaProject jpaProject;
-	protected final SynchronizedFlags flags;
-
-	protected static final IProgressMonitor NULL_PROGRESS_MONITOR = new NullProgressMonitor();
-
-	public SynchronousJpaProjectUpdater(JpaProject jpaProject) {
-		super();
-		this.jpaProject = jpaProject;
-		this.flags = new SynchronizedFlags();
-	}
-
-	/**
-	 * Initialize the flags and execute an "update".
-	 */
-	public void start() {
-		this.flags.start();
-		this.update();
-	}
-
-	// recursion: we come back here when IJpaProject#update() is called during the "update"
-	public void update() {
-		if (this.flags.updateCanStart()) {
-			do {
-				this.jpaProject.update(NULL_PROGRESS_MONITOR);
-			} while (this.flags.updateMustExecuteAgain());
-		}
-	}
-
-	public void dispose() {
-		this.flags.dispose();
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.jpaProject);
-	}
-
-
-	/**
-	 * synchronize access to the pair of 'updating' and 'again' flags
-	 */
-	protected static class SynchronizedFlags {
-		protected SynchronizedBoolean updating = new SynchronizedBoolean(false, this);
-		protected boolean again = false;
-		protected boolean stop = true;
-
-		protected synchronized void start() {
-			if ( ! this.stop) {
-				throw new IllegalStateException("The Updater was not stopped.");
-			}
-			this.stop = false;
-		}
-
-		/**
-		 * A client has requested an "update";
-		 * return whether the updater can start an "update".
-		 * Side-effects:
-		 *   - If we are currently updating, set the 'again' flag.
-		 *   - If we are not currently updating, set the 'updating' flag and clear the 'again' flag.
-		 */
-		protected synchronized boolean updateCanStart() {
-			if (this.stop) {
-				return false;
-			}
-			if (this.updating.isTrue()) {
-				this.again = true;
-				return false;
-			}
-			this.updating.setTrue();
-			this.again = false;
-			return true;
-		}
-
-		/**
-		 * The "update" has finished;
-		 * return whether the updater must execute another "update".
-		 * Side-effects:
-		 *   - If we are supposed to stop, clear the both the 'updating' and 'again' flags.
-		 *   - If we have to "update" again, clear the 'again' flag and leave the 'updating' flag set.
-		 *   - If we are finished, clear the 'updating' flag.
-		 */
-		protected synchronized boolean updateMustExecuteAgain() {
-			if (this.stop) {
-				return false;
-			}
-			if (this.again) {
-				this.again = false;
-				return true;
-			}
-			this.updating.setFalse();
-			return false;
-		}
-
-		protected synchronized void dispose() {
-			this.stop = true;
-			this.again = false;
-			try {
-				this.updating.waitUntilFalse();
-			} catch (InterruptedException ex) {
-				// the "update" thread was interrupted while waiting - ignore
-			}
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/AbstractJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/AbstractJpaContextNode.java
deleted file mode 100644
index cb7cab0f38..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/AbstractJpaContextNode.java
+++ /dev/null
@@ -1,63 +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.core.internal.context;
-
-import org.eclipse.jpt.core.JpaNode;
-import org.eclipse.jpt.core.context.JpaContextNode;
-import org.eclipse.jpt.core.context.orm.EntityMappings;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.core.internal.AbstractJpaNode;
-
-public abstract class AbstractJpaContextNode extends AbstractJpaNode
-	implements JpaContextNode
-{
-	// **************** constructor ********************************************
-	
-	protected AbstractJpaContextNode(JpaNode parent) {
-		super(parent);
-	}
-	
-	
-	// **************** JpaNode impl *******************************************
-	
-	@Override
-	public JpaContextNode getParent() {
-		return (JpaContextNode) super.getParent();
-	}
-	
-	
-	// **************** JpaContextNode impl ************************************
-	
-	/**
-	 * Overidden in BaseJpaContext, Persistence, PersitsenceXml to throw UnsupportedOperationException
-	 * Overidden in PersistenceUnit to return it.
-	 */
-	public PersistenceUnit getPersistenceUnit() {
-		return getParent().getPersistenceUnit();
-	}
-	
-	/**
-	 * Overidden in BaseJpaContext to return null
-	 * Overidden in EntityMappings to return it.
-	 */
-	public EntityMappings getEntityMappings() {
-		return getParent().getEntityMappings();
-	}
-	
-	/**
-	 * Overidden in BaseJpaContext to return null
-	 * Overidden in OrmPersistentType to return it.
-	 */
-	public OrmPersistentType getOrmPersistentType() {
-		return getParent().getOrmPersistentType();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/GenericRootContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/GenericRootContextNode.java
deleted file mode 100644
index 9151a05981..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/GenericRootContextNode.java
+++ /dev/null
@@ -1,260 +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.core.internal.context;
-
-import java.util.Collection;
-import java.util.List;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.context.JpaContextNode;
-import org.eclipse.jpt.core.context.JpaRootContextNode;
-import org.eclipse.jpt.core.context.orm.EntityMappings;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.persistence.ClassRef;
-import org.eclipse.jpt.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.core.context.persistence.PersistenceXml;
-import org.eclipse.jpt.core.internal.utility.jdt.JDTTools;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.resource.persistence.PersistenceArtifactEdit;
-import org.eclipse.jpt.core.resource.persistence.PersistenceResource;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class GenericRootContextNode extends AbstractJpaContextNode 
-	implements JpaRootContextNode
-{
-	/* This object has no parent, so it must point to the JPA project */
-	protected final JpaProject jpaProject;
-	
-	/* Main context object */
-	protected PersistenceXml persistenceXml;
-	
-	
-	public GenericRootContextNode(JpaProject jpaProject) {
-		super(null);
-		if (jpaProject == null) {
-			throw new IllegalArgumentException("The JPA project must not be null");
-		}
-		this.jpaProject = jpaProject;
-		PersistenceArtifactEdit pae = PersistenceArtifactEdit.getArtifactEditForRead(jpaProject.getProject());
-		PersistenceResource pr = pae.getResource();
-		
-		if (pr.exists()) {
-			this.persistenceXml = this.buildPersistenceXml(pr);
-		}
-		
-		pae.dispose();
-	}
-	
-	@Override
-	protected boolean requiresParent() {
-		return false;
-	}
-	
-	
-	// **************** JpaNode impl *******************************************
-	
-	@Override
-	public JpaProject getJpaProject() {
-		return this.jpaProject;
-	}
-	
-	@Override
-	public IResource getResource() {
-		return getJpaProject().getProject();
-	}
-	
-	@Override
-	public JpaContextNode getParent() {
-		return null;
-	}
-	
-	
-	// **************** JpaContextNode impl ************************************
-	
-	@Override
-	public PersistenceUnit getPersistenceUnit() {
-		// No PersistenceUnit in this context
-		return null;
-	}
-	
-	@Override
-	public EntityMappings getEntityMappings() {
-		// No EntityMappings in this context
-		return null;
-	}
-	
-	@Override
-	public OrmPersistentType getOrmPersistentType() {
-		// No OrmPersistentType in this context
-		return null;
-	}
-	
-	
-	// **************** persistence xml ****************************************
-	
-	public PersistenceXml getPersistenceXml() {
-		return this.persistenceXml;
-	}
-	
-	protected void setPersistenceXml(PersistenceXml persistenceXml) {
-		PersistenceXml old = this.persistenceXml;
-		this.persistenceXml = persistenceXml;
-		this.firePropertyChanged(PERSISTENCE_XML_PROPERTY, old, persistenceXml);
-	}
-	
-	public PersistenceXml addPersistenceXml() {
-		if (this.persistenceXml != null) {
-			throw new IllegalStateException();
-		}
-		PersistenceArtifactEdit pae = PersistenceArtifactEdit.getArtifactEditForWrite(this.getJpaProject().getProject());
-		PersistenceResource pr = pae.createDefaultResource();
-		pae.dispose();
-		PersistenceXml px = this.buildPersistenceXml(pr);
-		this.setPersistenceXml(px);
-		return px;
-	}
-	
-	public void removePersistenceXml() {
-		if (this.persistenceXml == null) {
-			throw new IllegalStateException();
-		}
-		this.persistenceXml.dispose();
-		PersistenceArtifactEdit pae = PersistenceArtifactEdit.getArtifactEditForWrite(getJpaProject().getProject());
-		PersistenceResource pr = pae.getResource();
-		pae.dispose();
-		try {
-			WorkbenchResourceHelper.deleteResource(pr);
-		}
-		catch (CoreException ce) {
-			JptCorePlugin.log(ce);
-		}
-		
-		if (! pr.exists()) {
-			setPersistenceXml(null);
-		}
-	}
-	
-	
-	// **************** updating ***********************************************
-	
-	public void update(IProgressMonitor monitor) {
-		PersistenceArtifactEdit pae = PersistenceArtifactEdit.getArtifactEditForRead(getJpaProject().getProject());
-		PersistenceResource pr = pae.getResource();
-		
-		if (pr.exists()) {
-			if (this.persistenceXml != null) {
-				this.persistenceXml.update(pr);
-			}
-			else {
-				setPersistenceXml(this.buildPersistenceXml(pr));
-			}
-		}
-		else {
-			setPersistenceXml(null);
-		}
-		
-		pae.dispose();
-	}
-
-	protected PersistenceXml buildPersistenceXml(PersistenceResource persistenceResource) {
-		return this.getJpaFactory().buildPersistenceXml(this, persistenceResource);
-	}
-	
-	
-	// **************** Validation *********************************************
-	
-	/* If this is true, it may be assumed that all the requirements are valid 
-	 * for further validation.  For example, if this is true at the point we
-	 * are validating persistence units, it may be assumed that there is a 
-	 * single persistence.xml and that it has valid content down to the 
-	 * persistence unit level.  */
-	private boolean okToContinueValidation = true;
-	
-	public void addToMessages(List<IMessage> messages) {
-		addNoPersistenceXmlMessage(messages);
-		//TODO - multiple persistence unit message
-		addOrphanedJavaClassMessages(messages);
-		
-		if(okToContinueValidation) {
-			getPersistenceXml().addToMessages(messages);
-		}
-		
-	}
-	
-	protected void addNoPersistenceXmlMessage(List<IMessage> messages) {
-		if (persistenceXml == null) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY, 
-						JpaValidationMessages.PROJECT_NO_PERSISTENCE_XML,
-						this)
-				);
-			okToContinueValidation = false;
-		}
-	}
-	
-	
-
-	
-	protected void addOrphanedJavaClassMessages(List<IMessage> messages) {
-		if (getPersistenceXml() == null) {
-			//handled with other validation
-			return;
-		}
-		if (getPersistenceXml().getPersistence() == null) {
-			//handled with other validation
-			return;
-		}
-		if (getJpaProject().discoversAnnotatedClasses()) {
-			return;
-		}
-		Collection<String> orphanedClassNames = CollectionTools.collection(getJpaProject().annotatedClassNames());
-		if (getPersistenceXml().getPersistence().persistenceUnitsSize() != 1) {
-			//context model currently only supports 1 persistenceUnit
-			return;
-		}
-		PersistenceUnit persistenceUnit = getPersistenceXml().getPersistence().persistenceUnits().next();
-		for (String typeName : CollectionTools.iterable(getJpaProject().annotatedClassNames())) {
-			for (ClassRef classRef : CollectionTools.iterable(persistenceUnit.specifiedClassRefs())) {
-				if (classRef.isFor(typeName)) {
-					orphanedClassNames.remove(typeName);
-				}
-			}
-			for (MappingFileRef mappingFileRef : CollectionTools.iterable(persistenceUnit.mappingFileRefs())) {
-				if (mappingFileRef.getOrmXml() == null || mappingFileRef.getOrmXml().getEntityMappings() == null) {
-					continue;
-				}
-				if (mappingFileRef.getOrmXml().getEntityMappings().getPersistentType(typeName) != null) {
-					orphanedClassNames.remove(typeName);
-				}
-			}
-		}
-		
-		for (String orphanedTypeName : orphanedClassNames) {
-			JavaResourcePersistentType javaResourcePersistentType = getJpaProject().getJavaPersistentTypeResource(orphanedTypeName);
-				messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.PERSISTENT_TYPE_UNSPECIFIED_CONTEXT,
-							new String[] {persistenceUnit.getName()},
-							javaResourcePersistentType.getResourceModel().getFile(),
-							javaResourcePersistentType.getMappingAnnotation().getTextRange(JDTTools.buildASTRoot(javaResourcePersistentType.getJpaCompilationUnit().getCompilationUnit())))
-					);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/JpaContextNodeAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/JpaContextNodeAdapterFactory.java
deleted file mode 100644
index eadbca2144..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/JpaContextNodeAdapterFactory.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.core.internal.context;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jpt.core.context.JpaContextNode;
-
-public class JpaContextNodeAdapterFactory
-	implements IAdapterFactory
-{
-	private static Class[] PROPERTIES = 
-		new Class[] { IResource.class, IFile.class };
-	
-	
-	public Class[] getAdapterList() {
-		return PROPERTIES;
-	}
-	
-	public Object getAdapter(Object element, Class key) {
-		JpaContextNode node;
-		
-		if (element instanceof JpaContextNode) {
-			node = (JpaContextNode) element;
-		}
-		else {
-			return null;
-		}
-		
-		IResource resource = node.getResource();
-		
-		if (key.equals(IResource.class)) {
-			return resource;
-		}
-		else if (key.equals(IFile.class) && resource != null && resource.getType() == IResource.FILE) {
-			return (IFile) resource;
-		}
-		
-		return null;
-	}	
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/MappingTools.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/MappingTools.java
deleted file mode 100644
index c19f5e3e63..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/MappingTools.java
+++ /dev/null
@@ -1,163 +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.core.internal.context;
-
-import java.util.Iterator;
-import java.util.StringTokenizer;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.ColumnMapping;
-import org.eclipse.jpt.core.context.Embeddable;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.JoinColumn;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.context.PersistentType;
-import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-
-public class MappingTools
-{	
-	public static boolean targetEntityIsValid(String targetEntity) {
-		if (targetEntity == null) {
-			return true;
-		}
-		// balance is # of name tokens - # of period tokens seen so far
-		// initially 0; finally 1; should never drop < 0 or > 1
-		int balance = 0;
-		for (StringTokenizer t = new StringTokenizer(targetEntity, ".", true); t.hasMoreTokens();) {
-			String s = t.nextToken();
-			if (s.indexOf('.') >= 0) {
-				// this is a delimiter
-				if (s.length() > 1) {
-					// too many periods in a row
-					return false;
-				}
-				balance--;
-				if (balance < 0) {
-					return false;
-				}
-			} else {
-				// this is an identifier segment
-				balance++;
-			}
-		}
-		return (balance == 1);
-	}
-	
-	/**
-	 * Default join table name from the JPA spec:
-	 * 	The concatenated names of the two associated primary
-	 * 	entity tables, separated by a underscore.
-	 * 
-	 * [owning table name]_[target table name]
-	 */
-	public static String buildJoinTableDefaultName(RelationshipMapping relationshipMapping) {
-		if (!relationshipMapping.isRelationshipOwner()) {
-			return null;
-		}
-		String owningTableName = relationshipMapping.getTypeMapping().getTableName();
-		if (owningTableName == null) {
-			return null;
-		}
-		Entity targetEntity = relationshipMapping.getResolvedTargetEntity();
-		if (targetEntity == null) {
-			return null;
-		}
-		String targetTableName = targetEntity.getTableName();
-		if (targetTableName == null) {
-			return null;
-		}
-		return owningTableName + "_" + targetTableName;
-	}
-
-	/**
-	 * return the join column's default name;
-	 * which is typically &lt;attribute name&gt;_&lt;referenced column name&gt;
-	 * but, if we don't have an attribute name (e.g. in a unidirectional
-	 * OneToMany or ManyToMany) is
-	 * &lt;target entity name&gt;_&lt;referenced column name&gt;
-	 */
-	// <attribute name>_<referenced column name>
-	//     or
-	// <target entity name>_<referenced column name>
-	public static String buildJoinColumnDefaultName(JoinColumn joinColumn) {
-		if (joinColumn.getOwner().joinColumnsSize() != 1) {
-			return null;
-		}
-		String prefix = joinColumn.getOwner().getAttributeName();
-		if (prefix == null) {
-			prefix = targetEntityName(joinColumn);
-		}
-		if (prefix == null) {
-			return null;
-		}
-		// TODO not sure which of these is correct...
-		// (the spec implies that the referenced column is always the
-		// primary key column of the target entity)
-		// String targetColumn = this.targetPrimaryKeyColumnName();
-		String targetColumn = joinColumn.getReferencedColumnName();
-		if (targetColumn == null) {
-			return null;
-		}
-		return prefix + "_" + targetColumn;
-	}
-
-	/**
-	 * return the name of the target entity
-	 */
-	protected static String targetEntityName(JoinColumn joinColumn) {
-		Entity targetEntity = joinColumn.getOwner().getTargetEntity();
-		return (targetEntity == null) ? null : targetEntity.getName();
-	}
-
-	public static String buildJoinColumnDefaultReferencedColumnName(JoinColumn joinColumn) {
-		if (joinColumn.getOwner().joinColumnsSize() != 1) {
-			return null;
-		}
-		return targetPrimaryKeyColumnName(joinColumn);
-	}
-
-	/**
-	 * return the name of the single primary key column of the target entity
-	 */
-	protected static String targetPrimaryKeyColumnName(JoinColumn joinColumn) {
-		Entity targetEntity = joinColumn.getOwner().getTargetEntity();
-		return (targetEntity == null) ? null : targetEntity.getPrimaryKeyColumnName();
-	}
-	
-	
-	public static Embeddable getEmbeddableFor(JavaPersistentAttribute persistentAttribute) {
-		String qualifiedTypeName = persistentAttribute.getResourcePersistentAttribute().getQualifiedTypeName();
-		if (qualifiedTypeName == null) {
-			return null;
-		}
-		PersistentType persistentType = persistentAttribute.getPersistenceUnit().getPersistentType(qualifiedTypeName);
-		if (persistentType != null) {
-			if (persistentType.getMappingKey() == MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY) {
-				return (Embeddable) persistentType.getMapping();
-			}
-		}
-		return null;
-	}
-	
-	public static ColumnMapping getColumnMapping(String attributeName, Embeddable embeddable) {
-		if (attributeName == null || embeddable == null) {
-			return null;
-		}
-		for (Iterator<PersistentAttribute> stream = embeddable.getPersistentType().allAttributes(); stream.hasNext();) {
-			PersistentAttribute persAttribute = stream.next();
-			if (attributeName.equals(persAttribute.getName())) {
-				if (persAttribute.getMapping() instanceof ColumnMapping) {
-					return (ColumnMapping) persAttribute.getMapping();
-				}
-			}
-		}
-		return null;		
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/PersistentAttributePropertyTester.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/PersistentAttributePropertyTester.java
deleted file mode 100644
index 80ee5ff187..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/PersistentAttributePropertyTester.java
+++ /dev/null
@@ -1,59 +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.core.internal.context;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-
-public class PersistentAttributePropertyTester extends PropertyTester 
-{
-	public static final String IS_MAPPED = "isMapped";
-	
-	public static final String IS_VIRTUAL = "isVirtual";
-	
-	
-	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
-		if (IS_MAPPED.equals(property)) {
-			Boolean expectedIsMapped;
-			
-			try {
-				expectedIsMapped = (Boolean) expectedValue;
-			}
-			catch (ClassCastException cce) {
-				return false;
-			}
-			
-			Boolean actualIsMapped = ((PersistentAttribute) receiver).getMappingKey() != MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY;
-			
-			return actualIsMapped == expectedIsMapped;
-		}
-		else if (IS_VIRTUAL.equals(property)) {
-			Boolean expectedIsVirtual;
-			
-			try {
-				expectedIsVirtual = (Boolean) expectedValue;
-			}
-			catch (ClassCastException cce) {
-				return false;
-			}
-			
-			Boolean actualIsVirtual = false;
-			if (receiver instanceof OrmPersistentAttribute) {
-				actualIsVirtual = ((OrmPersistentAttribute) receiver).isVirtual();
-			}
-			
-			return actualIsVirtual == expectedIsVirtual;
-		}
-		
-		return false;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaAttributeMapping.java
deleted file mode 100644
index 24ec2e19f3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaAttributeMapping.java
+++ /dev/null
@@ -1,176 +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.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.TypeMapping;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public abstract class AbstractJavaAttributeMapping<T extends JavaResourceNode> extends AbstractJavaJpaContextNode
-	implements JavaAttributeMapping
-{
-	protected JavaResourcePersistentAttribute resourcePersistentAttribute;
-	
-
-	protected AbstractJavaAttributeMapping(JavaPersistentAttribute parent) {
-		super(parent);
-	}
-	
-	@SuppressWarnings("unchecked")
-	protected T getMappingResource() {
-		if (isDefault()) {
-			return (T) this.resourcePersistentAttribute.getNullMappingAnnotation(getAnnotationName());
-		}
-		return (T) this.resourcePersistentAttribute.getMappingAnnotation(getAnnotationName());
-	}
-	
-	public GenericJavaPersistentAttribute getPersistentAttribute() {
-		return (GenericJavaPersistentAttribute) this.getParent();
-	}
-
-	protected JavaResourcePersistentAttribute getResourcePersistentAttribute() {
-		return this.resourcePersistentAttribute;
-	}
-	
-	/**
-	 * the persistent attribute can tell whether there is a "specified" mapping
-	 * or a "default" one
-	 */
-	public boolean isDefault() {
-		return this.getPersistentAttribute().mappingIsDefault(this);
-	}
-
-	protected boolean embeddableOwned() {
-		return this.getTypeMapping().getKey() == MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY;
-	}
-	
-	protected boolean entityOwned() {
-		return this.getTypeMapping().getKey() == MappingKeys.ENTITY_TYPE_MAPPING_KEY;
-	}
-	
-	public TypeMapping getTypeMapping() {
-		return this.getPersistentAttribute().getTypeMapping();
-	}
-
-	public String getAttributeName() {
-		return this.getPersistentAttribute().getName();
-	}
-	
-	public Table getDbTable(String tableName) {
-		return getTypeMapping().getDbTable(tableName);
-	}
-	
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = null;
-		T mappingResource = getMappingResource();
-		if (mappingResource != null) {
-			textRange = mappingResource.getTextRange(astRoot);
-		}
-		return (textRange != null) ? textRange : this.getPersistentAttribute().getValidationTextRange(astRoot);
-	}
-	
-	public String getPrimaryKeyColumnName() {
-		return null;
-	}
-
-	public boolean isOverridableAttributeMapping() {
-		return false;
-	}
-
-	public boolean isOverridableAssociationMapping() {
-		return false;
-	}
-
-	public boolean isIdMapping() {
-		return false;
-	}
-
-	public void initializeFromResource(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		this.resourcePersistentAttribute = resourcePersistentAttribute;
-		initialize(getMappingResource());
-	}
-
-	protected void initialize(T mappingResource) {
-		
-	}
-
-	public void update(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		this.resourcePersistentAttribute = resourcePersistentAttribute;
-		this.update(getMappingResource());
-	}
-	
-	protected void update(T mappingResource) {
-		
-	}
-
-	
-	//************ Validation *************************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-		
-		addModifierMessages(messages, astRoot);
-		addInvalidMappingMessage(messages, astRoot);
-	}
-	
-	protected void addModifierMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		GenericJavaPersistentAttribute attribute = this.getPersistentAttribute();
-		if (attribute.getMappingKey() == MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY) {
-			return;
-		}
-		
-		if ( this.resourcePersistentAttribute.isForField()) {
-			if (this.resourcePersistentAttribute.isFinal()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.PERSISTENT_ATTRIBUTE_FINAL_FIELD,
-						new String[] {attribute.getName()},
-						attribute, attribute.getValidationTextRange(astRoot))
-				);
-			}
-			
-			if (this.resourcePersistentAttribute.isPublic()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.PERSISTENT_ATTRIBUTE_PUBLIC_FIELD,
-						new String[] {attribute.getName()},
-						attribute, attribute.getValidationTextRange(astRoot))
-				);
-			}
-		}
-	}
-	
-	protected void addInvalidMappingMessage(List<IMessage> messages, CompilationUnit astRoot) {
-		if (! getTypeMapping().attributeMappingKeyAllowed(this.getKey())) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					JpaValidationMessages.PERSISTENT_ATTRIBUTE_INVALID_MAPPING,
-					new String[] {this.getPersistentAttribute().getName()},
-					this, this.getValidationTextRange(astRoot))
-			);
-		}
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBaseColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBaseColumn.java
deleted file mode 100644
index 70a120bbfa..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBaseColumn.java
+++ /dev/null
@@ -1,302 +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.core.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.BaseColumn;
-import org.eclipse.jpt.core.context.java.JavaBaseColumn;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.BaseColumnAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-
-public abstract class AbstractJavaBaseColumn<T extends BaseColumnAnnotation> extends AbstractJavaNamedColumn<T>
-	implements JavaBaseColumn
-{
-
-	protected String specifiedTable;
-	
-	protected String defaultTable;
-
-	protected Boolean specifiedUnique;
-	
-	protected Boolean specifiedNullable;
-	
-	protected Boolean specifiedInsertable;
-	
-	protected Boolean specifiedUpdatable;
-
-	protected AbstractJavaBaseColumn(JavaJpaContextNode parent, JavaBaseColumn.Owner owner) {
-		super(parent, owner);
-	}
-	
-	@Override
-	protected void initializeFromResource(T column) {
-		super.initializeFromResource(column);
-		this.defaultTable = this.defaultTable();
-		this.specifiedTable = this.specifiedTable(column);
-		this.specifiedUnique = this.specifiedUnique(column);
-		this.specifiedNullable = this.specifiedNullable(column);
-		this.specifiedInsertable = this.specifiedInsertable(column);
-		this.specifiedUpdatable = this.specifiedUpdatable(column);
-	}
-	
-	@Override
-	public JavaBaseColumn.Owner getOwner() {
-		return (JavaBaseColumn.Owner) super.getOwner();
-	}
-
-	//************** IAbstractColumn implementation *******************
-	
-
-	public String getTable() {
-		return (this.getSpecifiedTable() == null) ? getDefaultTable() : this.getSpecifiedTable();
-	}
-
-	public String getSpecifiedTable() {
-		return this.specifiedTable;
-	}
-
-	public void setSpecifiedTable(String newSpecifiedTable) {
-		String oldSpecifiedTable = this.specifiedTable;
-		this.specifiedTable = newSpecifiedTable;
-		getColumnResource().setTable(newSpecifiedTable);
-		firePropertyChanged(BaseColumn.SPECIFIED_TABLE_PROPERTY, oldSpecifiedTable, newSpecifiedTable);
-	}
-	
-	/**
-	 * 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 setSpecifiedTable_(String newSpecifiedTable) {
-		String oldSpecifiedTable = this.specifiedTable;
-		this.specifiedTable = newSpecifiedTable;
-		firePropertyChanged(BaseColumn.SPECIFIED_TABLE_PROPERTY, oldSpecifiedTable, newSpecifiedTable);
-	}
-
-	public String getDefaultTable() {
-		return this.defaultTable;
-	}
-
-	protected void setDefaultTable(String newDefaultTable) {
-		String oldDefaultTable = this.defaultTable;
-		this.defaultTable = newDefaultTable;
-		firePropertyChanged(BaseColumn.DEFAULT_TABLE_PROPERTY, oldDefaultTable, newDefaultTable);
-	}
-
-	public Boolean getUnique() {
-		return (this.getSpecifiedUnique() == null) ? this.getDefaultUnique() : this.getSpecifiedUnique();
-	}
-	
-	public Boolean getDefaultUnique() {
-		return BaseColumn.DEFAULT_UNIQUE;
-	}
-	
-	public Boolean getSpecifiedUnique() {
-		return this.specifiedUnique;
-	}
-	
-	public void setSpecifiedUnique(Boolean newSpecifiedUnique) {
-		Boolean oldSpecifiedUnique = this.specifiedUnique;
-		this.specifiedUnique = newSpecifiedUnique;
-		this.getColumnResource().setUnique(newSpecifiedUnique);
-		firePropertyChanged(BaseColumn.SPECIFIED_UNIQUE_PROPERTY, oldSpecifiedUnique, newSpecifiedUnique);
-	}
-	
-	/**
-	 * 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 setSpecifiedUnique_(Boolean newSpecifiedUnique) {
-		Boolean oldSpecifiedUnique = this.specifiedUnique;
-		this.specifiedUnique = newSpecifiedUnique;
-		firePropertyChanged(BaseColumn.SPECIFIED_UNIQUE_PROPERTY, oldSpecifiedUnique, newSpecifiedUnique);
-	}
-	
-	public Boolean getNullable() {
-		return (this.getSpecifiedNullable() == null) ? this.getDefaultNullable() : this.getSpecifiedNullable();
-	}
-	
-	public Boolean getDefaultNullable() {
-		return BaseColumn.DEFAULT_NULLABLE;
-	}
-	
-	public Boolean getSpecifiedNullable() {
-		return this.specifiedNullable;
-	}
-	
-	public void setSpecifiedNullable(Boolean newSpecifiedNullable) {
-		Boolean oldSpecifiedNullable = this.specifiedNullable;
-		this.specifiedNullable = newSpecifiedNullable;
-		this.getColumnResource().setNullable(newSpecifiedNullable);
-		firePropertyChanged(BaseColumn.SPECIFIED_NULLABLE_PROPERTY, oldSpecifiedNullable, newSpecifiedNullable);
-	}
-	
-	/**
-	 * 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 setSpecifiedNullable_(Boolean newSpecifiedNullable) {
-		Boolean oldSpecifiedNullable = this.specifiedNullable;
-		this.specifiedNullable = newSpecifiedNullable;
-		firePropertyChanged(BaseColumn.SPECIFIED_NULLABLE_PROPERTY, oldSpecifiedNullable, newSpecifiedNullable);
-	}
-	
-	public Boolean getInsertable() {
-		return (this.getSpecifiedInsertable() == null) ? this.getDefaultInsertable() : this.getSpecifiedInsertable();
-	}
-	
-	public Boolean getDefaultInsertable() {
-		return BaseColumn.DEFAULT_INSERTABLE;
-	}
-	
-	public Boolean getSpecifiedInsertable() {
-		return this.specifiedInsertable;
-	}
-	
-	public void setSpecifiedInsertable(Boolean newSpecifiedInsertable) {
-		Boolean oldSpecifiedInsertable = this.specifiedInsertable;
-		this.specifiedInsertable = newSpecifiedInsertable;
-		this.getColumnResource().setInsertable(newSpecifiedInsertable);
-		firePropertyChanged(BaseColumn.SPECIFIED_INSERTABLE_PROPERTY, oldSpecifiedInsertable, newSpecifiedInsertable);
-	}
-	
-	/**
-	 * 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 setSpecifiedInsertable_(Boolean newSpecifiedInsertable) {
-		Boolean oldSpecifiedInsertable = this.specifiedInsertable;
-		this.specifiedInsertable = newSpecifiedInsertable;
-		firePropertyChanged(BaseColumn.SPECIFIED_INSERTABLE_PROPERTY, oldSpecifiedInsertable, newSpecifiedInsertable);
-	}
-	
-	public Boolean getUpdatable() {
-		return (this.getSpecifiedUpdatable() == null) ? this.getDefaultUpdatable() : this.getSpecifiedUpdatable();
-	}
-	
-	public Boolean getDefaultUpdatable() {
-		return BaseColumn.DEFAULT_UPDATABLE;
-	}
-	
-	public Boolean getSpecifiedUpdatable() {
-		return this.specifiedUpdatable;
-	}
-	
-	public void setSpecifiedUpdatable(Boolean newSpecifiedUpdatable) {
-		Boolean oldSpecifiedUpdatable = this.specifiedUpdatable;
-		this.specifiedUpdatable = newSpecifiedUpdatable;
-		this.getColumnResource().setUpdatable(newSpecifiedUpdatable);
-		firePropertyChanged(BaseColumn.SPECIFIED_UPDATABLE_PROPERTY, oldSpecifiedUpdatable, newSpecifiedUpdatable);
-	}
-
-	/**
-	 * 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 setSpecifiedUpdatable_(Boolean newSpecifiedUpdatable) {
-		Boolean oldSpecifiedUpdatable = this.specifiedUpdatable;
-		this.specifiedUpdatable = newSpecifiedUpdatable;
-		firePropertyChanged(BaseColumn.SPECIFIED_UPDATABLE_PROPERTY, oldSpecifiedUpdatable, newSpecifiedUpdatable);
-	}
-
-	@Override
-	protected String getTableName() {
-		return this.getTable();
-	}
-
-	public TextRange getTableTextRange(CompilationUnit astRoot) {
-		TextRange textRange = this.getColumnResource().getTableTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getOwner().getValidationTextRange(astRoot);
-	}
-
-	public boolean tableTouches(int pos, CompilationUnit astRoot) {
-		return getColumnResource().tableTouches(pos, astRoot);
-	}
-
-	private Iterator<String> candidateTableNames() {
-		return this.tableIsAllowed() ? this.getOwner().getTypeMapping().associatedTableNamesIncludingInherited() : EmptyIterator.<String> instance();
-	}
-
-	private Iterator<String> candidateTableNames(Filter<String> filter) {
-		return new FilteringIterator<String, String>(this.candidateTableNames(), filter);
-	}
-
-	private Iterator<String> quotedCandidateTableNames(Filter<String> filter) {
-		return StringTools.quote(this.candidateTableNames(filter));
-	}
-
-	/**
-	 * Return whether the 'table' element is allowed. It is not allowed for
-	 * join columns inside of join tables.
-	 */
-	public abstract boolean tableIsAllowed();
-
-	@Override
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		if (this.tableTouches(pos, astRoot)) {
-			return this.quotedCandidateTableNames(filter);
-		}
-		return null;
-	}
-	
-	@Override
-	protected void update(T column) {
-		super.update(column);
-		this.setDefaultTable(this.defaultTable());
-		this.setSpecifiedTable_(this.specifiedTable(column));
-		this.setSpecifiedUnique_(this.specifiedUnique(column));
-		this.setSpecifiedNullable_(this.specifiedNullable(column));
-		this.setSpecifiedInsertable_(this.specifiedInsertable(column));
-		this.setSpecifiedUpdatable_(this.specifiedUpdatable(column));
-	}
-
-	protected String defaultTable() {
-		return this.getOwner().getDefaultTableName();
-	}
-	
-	protected String specifiedTable(BaseColumnAnnotation column) {
-		return column.getTable();
-	}
-	
-	protected Boolean specifiedUnique(BaseColumnAnnotation column) {
-		return column.getUnique();
-	}
-	
-	protected Boolean specifiedNullable(BaseColumnAnnotation column) {
-		return column.getNullable();
-	}
-	
-	protected Boolean specifiedInsertable(BaseColumnAnnotation column) {
-		return column.getInsertable();
-	}
-	
-	protected Boolean specifiedUpdatable(BaseColumnAnnotation column) {
-		return column.getUpdatable();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java
deleted file mode 100644
index 64dc6cf3fc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.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.core.internal.context.java;
-
-import java.util.ArrayList;
-import java.util.Collection;
-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.AttributeOverride;
-import org.eclipse.jpt.core.context.BaseEmbeddedMapping;
-import org.eclipse.jpt.core.context.BaseOverride;
-import org.eclipse.jpt.core.context.ColumnMapping;
-import org.eclipse.jpt.core.context.Embeddable;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaAttributeOverride;
-import org.eclipse.jpt.core.context.java.JavaBaseEmbeddedMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.MappingTools;
-import org.eclipse.jpt.core.internal.resource.java.NullColumn;
-import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation;
-import org.eclipse.jpt.core.resource.java.AttributeOverridesAnnotation;
-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.utility.Filter;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.CompositeListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public abstract class AbstractJavaBaseEmbeddedMapping<T extends JavaResourceNode> extends AbstractJavaAttributeMapping<T>
-	implements JavaBaseEmbeddedMapping
-{
-	protected final List<JavaAttributeOverride> specifiedAttributeOverrides;
-
-	protected final List<JavaAttributeOverride> virtualAttributeOverrides;
-
-	private Embeddable embeddable;
-
-	protected AbstractJavaBaseEmbeddedMapping(JavaPersistentAttribute parent) {
-		super(parent);
-		this.specifiedAttributeOverrides = new ArrayList<JavaAttributeOverride>();
-		this.virtualAttributeOverrides = new ArrayList<JavaAttributeOverride>();
-	}
-
-	//****************** JavaAttributeMapping implemenation *******************
-
-	public Iterator<String> correspondingAnnotationNames() {
-		return new ArrayIterator<String>(
-			JPA.ATTRIBUTE_OVERRIDE,
-			JPA.ATTRIBUTE_OVERRIDES);
-	}
-	
-	//****************** AttributeOverride.Owner implemenation *******************
-	
-	public ColumnMapping getColumnMapping(String attributeName) {
-		return MappingTools.getColumnMapping(attributeName, embeddable());
-	}
-
-	public boolean isVirtual(BaseOverride override) {
-		return this.virtualAttributeOverrides.contains(override);
-	}
-	
-	public BaseOverride setVirtual(boolean virtual, BaseOverride override) {
-		// Add a new attribute override
-		if (virtual) {
-			return setAttributeOverrideVirtual((JavaAttributeOverride) override);
-		}
-		return setAttributeOverrideSpecified((JavaAttributeOverride) override);
-	}
-	
-	protected JavaAttributeOverride setAttributeOverrideVirtual(JavaAttributeOverride attributeOverride) {
-		int index = this.specifiedAttributeOverrides.indexOf(attributeOverride);
-		this.specifiedAttributeOverrides.remove(index);
-		String attributeOverrideName = attributeOverride.getName();
-		//add the virtual attribute override so that I can control the order that change notification is sent.
-		//otherwise when we remove the annotation from java we will get an update and add the attribute override
-		//during the udpate.  This causes the UI to be flaky, since change notification might not occur in the correct order
-		JavaAttributeOverride virtualAttributeOverride = null;
-		if (attributeOverrideName != null) {
-			for (PersistentAttribute persistentAttribute : CollectionTools.iterable(allOverridableAttributes())) {
-				if (persistentAttribute.getName().equals(attributeOverrideName)) {
-					//store the virtualAttributeOverride so we can fire change notification later
-					virtualAttributeOverride = buildVirtualAttributeOverride(getResourcePersistentAttribute(), persistentAttribute.getName());
-					this.virtualAttributeOverrides.add(virtualAttributeOverride);
-					break;
-				}
-			}
-		}
-
-		getResourcePersistentAttribute().removeAnnotation(index, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME);
-		fireItemRemoved(Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride);
-		
-		if (virtualAttributeOverride != null) {
-			fireItemAdded(Entity.VIRTUAL_ATTRIBUTE_OVERRIDES_LIST, virtualAttributeOverridesSize() - 1, virtualAttributeOverride);
-		}
-		return virtualAttributeOverride;
-	}
-	
-	protected JavaAttributeOverride setAttributeOverrideSpecified(JavaAttributeOverride oldAttributeOverride) {
-		int index = specifiedAttributeOverridesSize();
-		JavaAttributeOverride newAttributeOverride = getJpaFactory().buildJavaAttributeOverride(this, this);
-		this.specifiedAttributeOverrides.add(index, newAttributeOverride);
-		
-		AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) getResourcePersistentAttribute().addAnnotation(index, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME);
-		newAttributeOverride.initializeFromResource(attributeOverrideResource);
-		
-		int defaultIndex = this.virtualAttributeOverrides.indexOf(oldAttributeOverride);
-		this.virtualAttributeOverrides.remove(defaultIndex);
-
-		newAttributeOverride.setName(oldAttributeOverride.getName());
-		newAttributeOverride.getColumn().setSpecifiedName(oldAttributeOverride.getColumn().getName());
-		
-		this.fireItemRemoved(Entity.VIRTUAL_ATTRIBUTE_OVERRIDES_LIST, defaultIndex, oldAttributeOverride);
-		this.fireItemAdded(Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, newAttributeOverride);		
-
-		return newAttributeOverride;
-	}
-
-	
-	//****************** BaseEmbeddedMapping implemenation *******************
-
-	@SuppressWarnings("unchecked")
-	public ListIterator<JavaAttributeOverride> attributeOverrides() {
-		return new CompositeListIterator<JavaAttributeOverride>(this.specifiedAttributeOverrides(), this.virtualAttributeOverrides());
-	}
-	
-	public int attributeOverridesSize() {
-		return this.specifiedAttributeOverridesSize() + this.virtualAttributeOverridesSize();
-	}
-	
-	public ListIterator<JavaAttributeOverride> virtualAttributeOverrides() {
-		return new CloneListIterator<JavaAttributeOverride>(this.virtualAttributeOverrides);
-	}
-	
-	public int virtualAttributeOverridesSize() {
-		return this.virtualAttributeOverrides.size();
-	}
-	
-	public ListIterator<JavaAttributeOverride> specifiedAttributeOverrides() {
-		return new CloneListIterator<JavaAttributeOverride>(this.specifiedAttributeOverrides);
-	}
-	
-	public int specifiedAttributeOverridesSize() {
-		return this.specifiedAttributeOverrides.size();
-	}
-	
-	protected void addSpecifiedAttributeOverride(int index, JavaAttributeOverride attributeOverride) {
-		addItemToList(index, attributeOverride, this.specifiedAttributeOverrides, BaseEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST);
-	}
-
-	protected void removeSpecifiedAttributeOverride_(JavaAttributeOverride attributeOverride) {
-		removeItemFromList(attributeOverride, this.specifiedAttributeOverrides, BaseEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST);
-	}
-
-	public void moveSpecifiedAttributeOverride(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.specifiedAttributeOverrides, targetIndex, sourceIndex);
-		getResourcePersistentAttribute().move(targetIndex, sourceIndex, AttributeOverridesAnnotation.ANNOTATION_NAME);
-		fireItemMoved(BaseEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, targetIndex, sourceIndex);		
-	}
-	
-	protected void addVirtualAttributeOverride(JavaAttributeOverride attributeOverride) {
-		addItemToList(attributeOverride, this.virtualAttributeOverrides, BaseEmbeddedMapping.VIRTUAL_ATTRIBUTE_OVERRIDES_LIST);
-	}
-	
-	protected void removeVirtualAttributeOverride(JavaAttributeOverride attributeOverride) {
-		removeItemFromList(attributeOverride, this.virtualAttributeOverrides, BaseEmbeddedMapping.VIRTUAL_ATTRIBUTE_OVERRIDES_LIST);
-	}
-
-	public JavaAttributeOverride getAttributeOverrideNamed(String name) {
-		return (JavaAttributeOverride) getOverrideNamed(name, attributeOverrides());
-	}
-
-	public boolean containsAttributeOverride(String name) {
-		return containsOverride(name, attributeOverrides());
-	}
-
-	public boolean containsDefaultAttributeOverride(String name) {
-		return containsOverride(name, virtualAttributeOverrides());
-	}
-
-	public boolean containsSpecifiedAttributeOverride(String name) {
-		return containsOverride(name, specifiedAttributeOverrides());
-	}
-	
-	protected BaseOverride getOverrideNamed(String name, ListIterator<? extends BaseOverride> overrides) {
-		for (BaseOverride override : CollectionTools.iterable(overrides)) {
-			String overrideName = override.getName();
-			if (overrideName == null && name == null) {
-				return override;
-			}
-			if (overrideName != null && overrideName.equals(name)) {
-				return override;
-			}
-		}
-		return null;
-	}
-
-	protected boolean containsOverride(String name, ListIterator<? extends BaseOverride> overrides) {
-		return getOverrideNamed(name, overrides) != null;
-	}
-
-	public Embeddable embeddable() {
-		return this.embeddable;
-	}
-
-	
-	
-	@Override
-	public void initializeFromResource(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		super.initializeFromResource(resourcePersistentAttribute);
-		this.initializeAttributeOverrides(resourcePersistentAttribute);
-		this.initializeDefaultAttributeOverrides(resourcePersistentAttribute);
-		this.embeddable = MappingTools.getEmbeddableFor(getPersistentAttribute());
-	}
-	
-	protected void initializeAttributeOverrides(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		ListIterator<JavaResourceNode> annotations = resourcePersistentAttribute.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME);
-		
-		while(annotations.hasNext()) {
-			JavaAttributeOverride attributeOverride = getJpaFactory().buildJavaAttributeOverride(this, this);
-			attributeOverride.initializeFromResource((AttributeOverrideAnnotation) annotations.next());
-			this.specifiedAttributeOverrides.add(attributeOverride);
-		}
-	}
-	
-	protected void initializeDefaultAttributeOverrides(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		for (Iterator<String> i = allOverridableAttributeNames(); i.hasNext(); ) {
-			String attributeName = i.next();
-			JavaAttributeOverride attributeOverride = getAttributeOverrideNamed(attributeName);
-			if (attributeOverride == null) {
-				this.virtualAttributeOverrides.add(buildVirtualAttributeOverride(resourcePersistentAttribute, attributeName));
-			}
-		}
-	}	@Override
-	public void update(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		super.update(resourcePersistentAttribute);
-		this.embeddable = MappingTools.getEmbeddableFor(getPersistentAttribute());
-		this.updateSpecifiedAttributeOverrides(resourcePersistentAttribute);
-		this.updateVirtualAttributeOverrides(resourcePersistentAttribute);
-		
-	}
-	protected void updateSpecifiedAttributeOverrides(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		ListIterator<JavaAttributeOverride> attributeOverrides = specifiedAttributeOverrides();
-		ListIterator<JavaResourceNode> resourceAttributeOverrides = resourcePersistentAttribute.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME);
-		
-		while (attributeOverrides.hasNext()) {
-			JavaAttributeOverride attributeOverride = attributeOverrides.next();
-			if (resourceAttributeOverrides.hasNext()) {
-				attributeOverride.update((AttributeOverrideAnnotation) resourceAttributeOverrides.next());
-			}
-			else {
-				removeSpecifiedAttributeOverride_(attributeOverride);
-			}
-		}
-		
-		while (resourceAttributeOverrides.hasNext()) {
-			addSpecifiedAttributeOverride(specifiedAttributeOverridesSize(), buildAttributeOverride((AttributeOverrideAnnotation) resourceAttributeOverrides.next()));
-		}	
-	}
-	
-	protected JavaAttributeOverride buildAttributeOverride(AttributeOverrideAnnotation attributeOverrideResource) {
-		JavaAttributeOverride attributeOverride = getJpaFactory().buildJavaAttributeOverride(this, this);
-		attributeOverride.initializeFromResource(attributeOverrideResource);
-		return attributeOverride;
-	}
-	
-	protected JavaAttributeOverride buildVirtualAttributeOverride(JavaResourcePersistentAttribute resourcePersistentAttribute, String attributeName) {
-		return buildAttributeOverride(buildVirtualAttributeOverrideResource(resourcePersistentAttribute, attributeName));
-	}
-
-	protected VirtualAttributeOverride buildVirtualAttributeOverrideResource(JavaResourcePersistentAttribute resourcePersistentAttribute, String attributeName) {
-		ColumnMapping columnMapping = (ColumnMapping) this.embeddable().getPersistentType().getAttributeNamed(attributeName).getMapping();
-		return new VirtualAttributeOverride(resourcePersistentAttribute, attributeName, columnMapping.getColumn());
-	}
-
-	protected void updateVirtualAttributeOverrides(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		for (Iterator<String> i = allOverridableAttributeNames(); i.hasNext(); ) {
-			String attributeName = i.next();
-			JavaAttributeOverride attributeOverride = getAttributeOverrideNamed(attributeName);
-			if (attributeOverride == null) {
-				addVirtualAttributeOverride(buildVirtualAttributeOverride(resourcePersistentAttribute, attributeName));
-			}
-			else if (attributeOverride.isVirtual()) {
-				attributeOverride.getColumn().update(new NullColumn(resourcePersistentAttribute));
-			}
-		}
-		
-		Collection<String> attributeNames = CollectionTools.collection(allOverridableAttributeNames());
-	
-		//remove any default mappings that are not included in the attributeNames collection
-		for (JavaAttributeOverride attributeOverride : CollectionTools.iterable(virtualAttributeOverrides())) {
-			if (!attributeNames.contains(attributeOverride.getName())
-				|| containsSpecifiedAttributeOverride(attributeOverride.getName())) {
-				removeVirtualAttributeOverride(attributeOverride);
-			}
-		}
-	}
-
-
-	public Iterator<String> allOverridableAttributeNames() {
-		return new TransformationIterator<PersistentAttribute, String>(this.allOverridableAttributes()) {
-			@Override
-			protected String transform(PersistentAttribute attribute) {
-				return attribute.getName();
-			}
-		};
-	}
-
-	public Iterator<PersistentAttribute> allOverridableAttributes() {
-		if (this.embeddable() == null) {
-			return EmptyIterator.instance();
-		}
-		return new FilteringIterator<PersistentAttribute, PersistentAttribute>(this.embeddable().getPersistentType().attributes()) {
-			@Override
-			protected boolean accept(PersistentAttribute o) {
-				return o.isOverridableAttribute();
-			}
-		};
-	}
-
-	@Override
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		for (AttributeOverride override : CollectionTools.iterable(this.attributeOverrides())) {
-			result = ((JavaAttributeOverride) override).javaCompletionProposals(pos, filter, astRoot);
-			if (result != null) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	//******** Validation ******************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-		
-		for (Iterator<JavaAttributeOverride> stream = attributeOverrides(); stream.hasNext();) {
-			stream.next().addToMessages(messages, astRoot);
-		}
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaGenerator.java
deleted file mode 100644
index e9acc04916..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaGenerator.java
+++ /dev/null
@@ -1,148 +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.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.Generator;
-import org.eclipse.jpt.core.context.java.JavaGenerator;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.GeneratorAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-public abstract class AbstractJavaGenerator extends AbstractJavaJpaContextNode 
-	implements JavaGenerator
-{
-	protected String name;
-
-	protected Integer specifiedInitialValue;
-	
-	protected Integer specifiedAllocationSize;
-
-	protected GeneratorAnnotation generatorResource;
-	
-	protected AbstractJavaGenerator(JavaJpaContextNode parent) {
-		super(parent);
-	}
-
-	public void initializeFromResource(GeneratorAnnotation generatorResource) {
-		this.generatorResource = generatorResource;
-		this.name = this.name(generatorResource);
-		this.specifiedInitialValue = this.specifiedInitialValue(generatorResource);
-		this.specifiedAllocationSize = this.specifiedAllocationSize(generatorResource);
-	}
-	
-	protected GeneratorAnnotation getGeneratorResource() {
-		return this.generatorResource;
-	}
-	
-	protected String name(GeneratorAnnotation generatorResource) {
-		return generatorResource.getName();
-	}
-	
-	protected Integer specifiedInitialValue(GeneratorAnnotation generatorResource) {
-		return generatorResource.getInitialValue();
-	}
-	
-	protected Integer specifiedAllocationSize(GeneratorAnnotation generatorResource) {
-		return generatorResource.getAllocationSize();
-	}
-	
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		getGeneratorResource().setName(newName);
-		firePropertyChanged(Generator.NAME_PROPERTY, oldName, newName);
-	}
-
-	protected void setName_(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		firePropertyChanged(Generator.NAME_PROPERTY, oldName, newName);
-	}
-
-	public Integer getInitialValue() {
-		return (this.getSpecifiedInitialValue() == null) ? this.getDefaultInitialValue() : this.getSpecifiedInitialValue();
-	}
-
-	public Integer getSpecifiedInitialValue() {
-		return this.specifiedInitialValue;
-	}
-
-	public void setSpecifiedInitialValue(Integer newSpecifiedInitialValue) {
-		Integer oldSpecifiedInitialValue = this.specifiedInitialValue;
-		this.specifiedInitialValue = newSpecifiedInitialValue;
-		getGeneratorResource().setInitialValue(newSpecifiedInitialValue);
-		firePropertyChanged(Generator.SPECIFIED_INITIAL_VALUE_PROPERTY, oldSpecifiedInitialValue, newSpecifiedInitialValue);
-	}
-
-	protected void setSpecifiedInitialValue_(Integer newSpecifiedInitialValue) {
-		Integer oldSpecifiedInitialValue = this.specifiedInitialValue;
-		this.specifiedInitialValue = newSpecifiedInitialValue;
-		firePropertyChanged(Generator.SPECIFIED_INITIAL_VALUE_PROPERTY, oldSpecifiedInitialValue, newSpecifiedInitialValue);
-	}
-
-	public Integer getAllocationSize() {
-		return (this.getSpecifiedAllocationSize() == null) ? this.getDefaultAllocationSize() : this.getSpecifiedAllocationSize();
-	}
-
-	public Integer getSpecifiedAllocationSize() {
-		return this.specifiedAllocationSize;
-	}
-
-	public void setSpecifiedAllocationSize(Integer newSpecifiedAllocationSize) {
-		Integer oldSpecifiedAllocationSize = this.specifiedAllocationSize;
-		this.specifiedAllocationSize = newSpecifiedAllocationSize;
-		getGeneratorResource().setAllocationSize(newSpecifiedAllocationSize);
-		firePropertyChanged(Generator.SPECIFIED_ALLOCATION_SIZE_PROPERTY, oldSpecifiedAllocationSize, newSpecifiedAllocationSize);
-	}
-
-	protected void setSpecifiedAllocationSize_(Integer newSpecifiedAllocationSize) {
-		Integer oldSpecifiedAllocationSize = this.specifiedAllocationSize;
-		this.specifiedAllocationSize = newSpecifiedAllocationSize;
-		firePropertyChanged(Generator.SPECIFIED_ALLOCATION_SIZE_PROPERTY, oldSpecifiedAllocationSize, newSpecifiedAllocationSize);
-	}
-
-	public Integer getDefaultAllocationSize() {
-		return Generator.DEFAULT_ALLOCATION_SIZE;
-	}
-
-	public boolean isVirtual() {
-		return false;
-	}
-	
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return this.getSelectionTextRange(astRoot);
-	}
-
-	public TextRange getSelectionTextRange(CompilationUnit astRoot) {
-		return this.generatorResource.getTextRange(astRoot);
-	}
-	
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return this.generatorResource.getNameTextRange(astRoot);
-	}
-
-	protected void update(GeneratorAnnotation generatorResource) {
-		this.generatorResource = generatorResource;
-		this.setName_(this.name(generatorResource));
-		this.setSpecifiedInitialValue_(this.specifiedInitialValue(generatorResource));
-		this.setSpecifiedAllocationSize_(this.specifiedAllocationSize(generatorResource));
-	}
-	
-	public boolean overrides(Generator generator) {
-		// java is at the base of the tree
-		return false;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaJpaContextNode.java
deleted file mode 100644
index 34bcc085f8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaJpaContextNode.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.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.JpaContextNode;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public abstract class AbstractJavaJpaContextNode extends AbstractJpaContextNode implements JavaJpaContextNode
-{
-	// ********** constructor **********
-
-	protected AbstractJavaJpaContextNode(JpaContextNode parent) {
-		super(parent);
-	}
-
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		if (this.connectionProfileIsActive()) {
-			Iterator<String> result = this.connectedJavaCompletionProposals(pos, filter, astRoot);
-			if (result != null) {
-				return result;
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This method is called if the database is connected, allowing us to
-	 * get candidates from the various database tables etc.
-	 * This method should NOT be cascaded to "child" objects; it should
-	 * only return candidates for the current object. The cascading is
-	 * handled by #javaCompletionProposals(int, Filter, CompilationUnit).
-	 */
-	public Iterator<String> connectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		return null;
-	}
-	
-	// ********** validation **********
-	
-	/**
-	 * All subclass implementations {@link #addToMessages(List, CompilationUnit))} 
-	 * should be preceded by a "super" call to this method
-	 */
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java
deleted file mode 100644
index c755635529..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java
+++ /dev/null
@@ -1,458 +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.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.Entity;
-import org.eclipse.jpt.core.context.FetchType;
-import org.eclipse.jpt.core.context.MultiRelationshipMapping;
-import org.eclipse.jpt.core.context.NonOwningMapping;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaJoinTable;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.MapKeyAnnotation;
-import org.eclipse.jpt.core.resource.java.OrderByAnnotation;
-import org.eclipse.jpt.core.resource.java.RelationshipMappingAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public abstract class AbstractJavaMultiRelationshipMapping<T extends RelationshipMappingAnnotation>
-	extends AbstractJavaRelationshipMapping<T> implements MultiRelationshipMapping
-{
-
-	protected String mappedBy;
-
-	protected String orderBy;
-
-	protected boolean isNoOrdering;
-
-	protected boolean isPkOrdering;
-
-	protected boolean isCustomOrdering;
-	
-	//TODO should this be null if this is the non-owning side of the relationship??
-	protected final JavaJoinTable joinTable; 
-
-	protected String mapKey;
-
-	protected AbstractJavaMultiRelationshipMapping(JavaPersistentAttribute parent) {
-		super(parent);
-		this.joinTable = getJpaFactory().buildJavaJoinTable(this); 
-	}
-
-	public String getMappedBy() {
-		return this.mappedBy;
-	}
-
-	public void setMappedBy(String newMappedBy) {
-		String oldMappedBy = this.mappedBy;
-		this.mappedBy = newMappedBy;
-		this.setMappedByOnResourceModel(newMappedBy);
-		firePropertyChanged(NonOwningMapping.MAPPED_BY_PROPERTY, oldMappedBy, newMappedBy);
-	}
-
-	protected void setMappedBy_(String newMappedBy) {
-		String oldMappedBy = this.mappedBy;
-		this.mappedBy = newMappedBy;
-		firePropertyChanged(NonOwningMapping.MAPPED_BY_PROPERTY, oldMappedBy, newMappedBy);
-	}
-
-	protected abstract void setMappedByOnResourceModel(String mappedBy);
-
-	public String getOrderBy() {
-		return this.orderBy;
-	}
-
-	public void setOrderBy(String newOrderBy) {
-		String oldOrderBy = this.orderBy;
-		this.orderBy = newOrderBy;
-		if (newOrderBy == null) {
-			if (getOrderByResource() != null) { 
-				removeOrderByResource();
-			}
-		}
-		else {
-			if (getOrderByResource() == null) {
-				addOrderByResource();
-			}
-			getOrderByResource().setValue(newOrderBy);
-		}
-		firePropertyChanged(MultiRelationshipMapping.ORDER_BY_PROPERTY, oldOrderBy, newOrderBy);
-	}
-	
-	protected void setOrderBy_(String newOrderBy) {
-		String oldOrderBy = this.orderBy;
-		this.orderBy = newOrderBy;
-		firePropertyChanged(MultiRelationshipMapping.ORDER_BY_PROPERTY, oldOrderBy, newOrderBy);
-	}
-	
-	protected OrderByAnnotation getOrderByResource() {
-		return (OrderByAnnotation) getResourcePersistentAttribute().getAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-	}
-	
-	protected OrderByAnnotation addOrderByResource() {
-		return (OrderByAnnotation) getResourcePersistentAttribute().addAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-	}
-	
-	protected void removeOrderByResource() {
-		getResourcePersistentAttribute().removeAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-	}
-	
-	public boolean isNoOrdering() {
-		return this.isNoOrdering;
-	}
-
-	public void setNoOrdering(boolean newNoOrdering) {
-		boolean oldNoOrdering = this.isNoOrdering;
-		this.isNoOrdering = newNoOrdering;
-		if (newNoOrdering) {
-			if (getOrderByResource() != null) {
-				removeOrderByResource();
-			}
-		}
-		else {
-			//??
-		}
-		firePropertyChanged(NO_ORDERING_PROPERTY, oldNoOrdering, newNoOrdering);
-	}
-	
-	protected void setNoOrdering_(boolean newNoOrdering) {
-		boolean oldNoOrdering = this.isNoOrdering;
-		this.isNoOrdering = newNoOrdering;
-		firePropertyChanged(NO_ORDERING_PROPERTY, oldNoOrdering, newNoOrdering);			
-	}
-
-	public boolean isPkOrdering() {
-		return this.isPkOrdering;
-	}
-	
-	public void setPkOrdering(boolean newPkOrdering) {
-		boolean oldPkOrdering = this.isPkOrdering;
-		this.isPkOrdering = newPkOrdering;
-		if (newPkOrdering) {
-			if (getOrderByResource() == null) {
-				addOrderByResource();
-			}
-			else {
-				getOrderByResource().setValue(null);
-			}
-		}
-		firePropertyChanged(PK_ORDERING_PROPERTY, oldPkOrdering, newPkOrdering);	
-	}
-	
-	protected void setPkOrdering_(boolean newPkOrdering) {
-		boolean oldPkOrdering = this.isPkOrdering;
-		this.isPkOrdering = newPkOrdering;
-		firePropertyChanged(PK_ORDERING_PROPERTY, oldPkOrdering, newPkOrdering);	
-	}
-
-	public boolean isCustomOrdering() {
-		return this.isCustomOrdering;
-	}
-
-	public void setCustomOrdering(boolean newCustomOrdering) {
-		boolean oldCustomOrdering = this.isCustomOrdering;
-		this.isCustomOrdering = newCustomOrdering;
-		if (newCustomOrdering) {
-			setOrderBy("");
-		}
-		firePropertyChanged(CUSTOM_ORDERING_PROPERTY, oldCustomOrdering, newCustomOrdering);
-	}
-	
-	protected void setCustomOrdering_(boolean newCustomOrdering) {
-		boolean oldCustomOrdering = this.isCustomOrdering;
-		this.isCustomOrdering = newCustomOrdering;
-		firePropertyChanged(CUSTOM_ORDERING_PROPERTY, oldCustomOrdering, newCustomOrdering);
-	}
-	
-	public FetchType getDefaultFetch() {
-		return MultiRelationshipMapping.DEFAULT_FETCH_TYPE;
-	}
-
-	public JavaJoinTable getJoinTable() {
-		return this.joinTable;
-	}
-
-	public boolean isJoinTableSpecified() {
-		return getJoinTable().isSpecified();
-	}
-
-	public boolean isRelationshipOwner() {
-		return getMappedBy() == null;
-	}
-	
-	public String getMapKey() {
-		return this.mapKey;
-	}
-
-	public void setMapKey(String newMapKey) {
-		String oldMapKey = this.mapKey;
-		this.mapKey = newMapKey;
-		if (oldMapKey != newMapKey) {
-			if (this.getMapKeyResource(getResourcePersistentAttribute()) != null) {
-				if (newMapKey != null) {
-					this.getMapKeyResource(getResourcePersistentAttribute()).setName(newMapKey);
-				}
-				else {
-					getResourcePersistentAttribute().removeAnnotation(MapKeyAnnotation.ANNOTATION_NAME);				
-				}
-			}
-			else if (newMapKey != null) {
-				getResourcePersistentAttribute().addAnnotation(MapKeyAnnotation.ANNOTATION_NAME);
-				getMapKeyResource(getResourcePersistentAttribute()).setName(newMapKey);
-			}
-		}
-		firePropertyChanged(MultiRelationshipMapping.MAP_KEY_PROPERTY, oldMapKey, newMapKey);
-	}
-
-	protected void setMapKey_(String newMapKey) {
-		String oldMapKey = this.mapKey;
-		this.mapKey = newMapKey;
-		firePropertyChanged(MultiRelationshipMapping.MAP_KEY_PROPERTY, oldMapKey, newMapKey);
-	}
-
-//TODO default orderBy - this wasn't supported in 1.0 either
-//	public void refreshDefaults(DefaultsContext defaultsContext) {
-//		super.refreshDefaults(defaultsContext);
-//		//		if (isOrderByPk()) {
-//		//			refreshDefaultOrderBy(defaultsContext);
-//		//		}
-//	}
-//
-//	//primary key ordering when just the @OrderBy annotation is present
-//	protected void refreshDefaultOrderBy(DefaultsContext defaultsContext) {
-//		IEntity targetEntity = getResolvedTargetEntity();
-//		if (targetEntity != null) {
-//			setOrderBy(targetEntity.primaryKeyAttributeName() + " ASC");
-//		}
-//	}
-
-	@Override
-	protected String defaultTargetEntity(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		if (!resourcePersistentAttribute.typeIsContainer()) {
-			return null;
-		}
-		return resourcePersistentAttribute.getQualifiedReferenceEntityElementTypeName();
-	}
-	
-	protected abstract boolean mappedByTouches(int pos, CompilationUnit astRoot);
-
-	protected boolean mapKeyNameTouches(int pos, CompilationUnit astRoot) {
-		if (getMapKeyResource(getResourcePersistentAttribute()) != null) {
-			return getMapKeyResource(getResourcePersistentAttribute()).nameTouches(pos, astRoot);
-		}
-		return false;
-	}
-	
-	protected MapKeyAnnotation getMapKeyResource(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		return (MapKeyAnnotation) resourcePersistentAttribute.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME);
-	}
-
-	public Iterator<String> candidateMapKeyNames() {
-		return this.allTargetEntityAttributeNames();
-	}
-
-	protected Iterator<String> candidateMapKeyNames(Filter<String> filter) {
-		return new FilteringIterator<String, String>(this.candidateMapKeyNames(), filter);
-	}
-
-	protected Iterator<String> quotedCandidateMapKeyNames(Filter<String> filter) {
-		return StringTools.quote(this.candidateMapKeyNames(filter));
-	}
-
-	@Override
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		result = this.getJoinTable().javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		if (this.mappedByTouches(pos, astRoot)) {
-			return this.quotedCandidateMappedByAttributeNames(filter);
-		}
-		if (this.mapKeyNameTouches(pos, astRoot)) {
-			return this.quotedCandidateMapKeyNames(filter);
-		}
-		return null;
-	}
-	
-	@Override
-	public void initializeFromResource(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		super.initializeFromResource(resourcePersistentAttribute);
-		MapKeyAnnotation mapKey = this.getMapKeyResource(resourcePersistentAttribute);
-		if (mapKey != null) {
-			this.mapKey = mapKey.getName();
-		}
-		this.initializeOrderBy(this.getOrderByResource());
-		this.joinTable.initializeFromResource(resourcePersistentAttribute);
-	}
-	
-	@Override
-	protected void initialize(T relationshipMapping) {
-		super.initialize(relationshipMapping);
-		this.mappedBy = this.mappedBy(relationshipMapping);
-	}
-	
-	protected void initializeOrderBy(OrderByAnnotation orderBy) {
-		if (orderBy != null) {
-			this.orderBy = orderBy.getValue();
-			if (orderBy.getValue() == null) {
-				this.isPkOrdering = true;
-			}
-			else {
-				this.isCustomOrdering = true;
-			}
-		}
-		else {
-			this.isNoOrdering = true;
-		}
-	}
-	
-	@Override
-	public void update(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		super.update(resourcePersistentAttribute);
-		this.updateMapKey(resourcePersistentAttribute);
-		this.updateOrderBy(this.getOrderByResource());
-		this.joinTable.update(resourcePersistentAttribute);
-	}	
-	
-	@Override
-	protected void update(T relationshipMapping) {
-		super.update(relationshipMapping);
-		this.setMappedBy_(this.mappedBy(relationshipMapping));
-	}
-	
-	protected void updateMapKey(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		MapKeyAnnotation mapKey = this.getMapKeyResource(resourcePersistentAttribute);
-		if (mapKey != null) {
-			setMapKey_(mapKey.getName());
-		}
-		else {
-			setMapKey_(null);
-		}
-	}
-	
-	protected void updateOrderBy(OrderByAnnotation orderBy) {
-		if (orderBy != null) {
-			setOrderBy_(orderBy.getValue());
-			if (orderBy.getValue() == null) {
-				setPkOrdering_(true);
-				setCustomOrdering_(false);
-				setNoOrdering_(false);
-			}
-			else {
-				setPkOrdering_(false);
-				setCustomOrdering_(true);
-				setNoOrdering_(false);
-			}
-		}
-		else {
-			setOrderBy_(null);
-			setPkOrdering_(false);
-			setCustomOrdering_(false);
-			setNoOrdering_(true);
-		}
-	}
-	protected abstract String mappedBy(T relationshipMapping);
-
-	//******** Validation ***********************************
-	
-	public abstract TextRange getMappedByTextRange(CompilationUnit astRoot);
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-		
-		if (entityOwned() && (this.isJoinTableSpecified() || isRelationshipOwner())) {
-			getJoinTable().addToMessages(messages, astRoot);
-		}
-		if (this.getMappedBy() != null) {
-			addMappedByMessages(messages, astRoot);
-		}
-	}
-	
-	protected void addMappedByMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		String mappedBy = this.getMappedBy();
-		
-		if (this.isJoinTableSpecified()) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.MAPPING_MAPPED_BY_WITH_JOIN_TABLE,
-						this.getJoinTable(), 
-						this.getJoinTable().getValidationTextRange(astRoot))
-				);
-						
-		}
-		
-		Entity targetEntity = this.getResolvedTargetEntity();
-		
-		if (targetEntity == null) {
-			// already have validation messages for that
-			return;
-		}
-		
-		PersistentAttribute attribute = targetEntity.getPersistentType().resolveAttribute(mappedBy);
-		
-		if (attribute == null) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.MAPPING_UNRESOLVED_MAPPED_BY,
-						new String[] {mappedBy}, 
-						this, 
-						this.getMappedByTextRange(astRoot))
-				);
-			return;
-		}
-		
-		if (! this.mappedByIsValid(attribute.getMapping())) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.MAPPING_INVALID_MAPPED_BY,
-						new String[] {mappedBy}, 
-						this, 
-						this.getMappedByTextRange(astRoot))
-				);
-			return;
-		}
-		
-		NonOwningMapping mappedByMapping;
-		try {
-			mappedByMapping = (NonOwningMapping) attribute.getMapping();
-		} catch (ClassCastException cce) {
-			// there is no error then
-			return;
-		}
-		
-		if (mappedByMapping.getMappedBy() != null) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.MAPPING_MAPPED_BY_ON_BOTH_SIDES,
-						this, 
-						this.getMappedByTextRange(astRoot))
-				);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaNamedColumn.java
deleted file mode 100644
index 4e80363cbc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaNamedColumn.java
+++ /dev/null
@@ -1,189 +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.core.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.NamedColumn;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.context.java.JavaNamedColumn;
-import org.eclipse.jpt.core.resource.java.NamedColumnAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-
-
-public abstract class AbstractJavaNamedColumn<T extends NamedColumnAnnotation> extends AbstractJavaJpaContextNode
-	implements JavaNamedColumn
-{
-
-	protected Owner owner;
-	
-	protected String specifiedName;
-
-	protected String defaultName;
-
-	protected String columnDefinition;
-
-	protected AbstractJavaNamedColumn(JavaJpaContextNode parent, Owner owner) {
-		super(parent);
-		this.owner = owner;
-	}
-
-	// ******************* initialization from java resource model ********************
-	
-	protected void initializeFromResource(T column) {
-		this.specifiedName = column.getName();
-		this.defaultName = this.defaultName();
-		this.columnDefinition = column.getColumnDefinition();	
-	}
-	
-
-	protected abstract T getColumnResource();
-
-	
-	//************** INamedColumn implementation *****************
-	public String getName() {
-		return (this.getSpecifiedName() == null) ? getDefaultName() : this.getSpecifiedName();
-	}
-
-	public String getSpecifiedName() {
-		return this.specifiedName;
-	}
-
-	public void setSpecifiedName(String newSpecifiedName) {
-		String oldSpecifiedName = this.specifiedName;
-		this.specifiedName = newSpecifiedName;
-		getColumnResource().setName(newSpecifiedName);
-		firePropertyChanged(NamedColumn.SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName);
-	}
-	
-	/**
-	 * 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 setSpecifiedName_(String newSpecifiedName) {
-		String oldSpecifiedName = this.specifiedName;
-		this.specifiedName = newSpecifiedName;
-		firePropertyChanged(NamedColumn.SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName);
-	}
-
-	public String getDefaultName() {
-		return this.defaultName;
-	}
-
-	protected void setDefaultName(String newDefaultName) {
-		String oldDefaultName = this.defaultName;
-		this.defaultName = newDefaultName;
-		firePropertyChanged(NamedColumn.DEFAULT_NAME_PROPERTY, oldDefaultName, newDefaultName);
-	}
-
-	public String getColumnDefinition() {
-		return this.columnDefinition;
-	}
-	
-	public void setColumnDefinition(String newColumnDefinition) {
-		String oldColumnDefinition = this.columnDefinition;
-		this.columnDefinition = newColumnDefinition;
-		getColumnResource().setColumnDefinition(newColumnDefinition);
-		firePropertyChanged(NamedColumn.COLUMN_DEFINITION_PROPERTY, oldColumnDefinition, newColumnDefinition);
-	}
-	
-	/**
-	 * 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 setColumnDefinition_(String newColumnDefinition) {
-		String oldColumnDefinition = this.columnDefinition;
-		this.columnDefinition = newColumnDefinition;
-		firePropertyChanged(NamedColumn.COLUMN_DEFINITION_PROPERTY, oldColumnDefinition, newColumnDefinition);
-	}
-
-	public Owner getOwner() {
-		return this.owner;
-	}
-
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		TextRange textRange = this.getColumnResource().getNameTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getOwner().getValidationTextRange(astRoot);
-	}
-
-	public boolean nameTouches(int pos, CompilationUnit astRoot) {
-		return this.getColumnResource().nameTouches(pos, astRoot);
-	}
-	
-	public Column getDbColumn() {
-		Table table = this.getDbTable();
-		return (table == null) ? null : table.columnNamed(this.getName());
-	}
-
-	public Table getDbTable() {
-		return getOwner().getDbTable(this.getTableName());
-	}
-
-	/**
-	 * Return the name of the column's table.
-	 */
-	protected abstract String getTableName();
-
-	public boolean isResolved() {
-		return this.getDbColumn() != null;
-	}
-
-	@Override
-	public Iterator<String> connectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.connectedJavaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		if (this.nameTouches(pos, astRoot)) {
-			return this.quotedCandidateNames(filter);
-		}
-		return null;
-	}
-
-	private Iterator<String> candidateNames() {
-		Table dbTable = this.getDbTable();
-		return (dbTable != null) ? dbTable.columnNames() : EmptyIterator.<String> instance();
-	}
-
-	private Iterator<String> candidateNames(Filter<String> filter) {
-		return new FilteringIterator<String, String>(this.candidateNames(), filter);
-	}
-
-	private Iterator<String> quotedCandidateNames(Filter<String> filter) {
-		return StringTools.quote(this.candidateNames(filter));
-	}
-	
-	
-	// ******************* update from java resource model ********************
-
-	protected void update(T column) {
-		this.setSpecifiedName_(column.getName());
-		this.setDefaultName(this.defaultName());
-		this.setColumnDefinition_(column.getColumnDefinition());
-	}
-	
-	/**
-	 * Return the default column name.
-	 */
-	protected String defaultName() {
-		return this.getOwner().getDefaultColumnName();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOverride.java
deleted file mode 100644
index b9c3824427..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOverride.java
+++ /dev/null
@@ -1,126 +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.core.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.BaseOverride;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.OverrideAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-
-
-public abstract class AbstractJavaOverride extends AbstractJavaJpaContextNode implements BaseOverride
-{
-
-	protected String name;
-
-	protected final Owner owner;
-
-	protected OverrideAnnotation overrideResource;
-	
-	public AbstractJavaOverride(JavaJpaContextNode parent, Owner owner) {
-		super(parent);
-		this.owner = owner;
-	}
-	
-	protected void initializeFromResource(OverrideAnnotation overrideResource) {
-		this.overrideResource = overrideResource;
-		this.name = this.name(overrideResource);
-	}
-
-	protected OverrideAnnotation getOverrideResource() {
-		return this.overrideResource;
-	}
-	
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		this.overrideResource.setName(newName);
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
-	}
-	
-	protected void setName_(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
-	}
-
-	protected void update(OverrideAnnotation overrideResource) {
-		this.overrideResource = overrideResource;
-		this.setName_(this.name(overrideResource));
-	}
-
-	protected String name(OverrideAnnotation overrideResource) {
-		return overrideResource.getName();
-	}
-
-	public boolean isVirtual() {
-		return getOwner().isVirtual(this);
-	}
-
-	public BaseOverride setVirtual(boolean virtual) {
-		return getOwner().setVirtual(virtual, this);
-	}
-	
-	public Owner getOwner() {
-		return this.owner;
-	}
-	
-	@Override
-	public JavaJpaContextNode getParent() {
-		return (JavaJpaContextNode) super.getParent();
-	}
-
-	protected abstract Iterator<String> candidateNames();
-
-	private Iterator<String> candidateNames(Filter<String> filter) {
-		return new FilteringIterator<String, String>(this.candidateNames(), filter);
-	}
-
-	private Iterator<String> quotedCandidateNames(Filter<String> filter) {
-		return StringTools.quote(this.candidateNames(filter));
-	}
-
-	@Override
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		if (this.nameTouches(pos, astRoot)) {
-			return this.quotedCandidateNames(filter);
-		}
-		return null;
-	}
-	
-	public boolean nameTouches(int pos, CompilationUnit astRoot) {
-		return this.overrideResource.nameTouches(pos, astRoot);
-	}
-	
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = this.overrideResource.getTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getParent().getValidationTextRange(astRoot);
-	}
-	
-	@Override
-	public void toString(StringBuilder sb) {
-		super.toString(sb);
-		sb.append(getName());
-	}
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java
deleted file mode 100644
index bbe49882d2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java
+++ /dev/null
@@ -1,181 +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.core.internal.context.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.context.Query;
-import org.eclipse.jpt.core.context.QueryHint;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.context.java.JavaQuery;
-import org.eclipse.jpt.core.context.java.JavaQueryHint;
-import org.eclipse.jpt.core.resource.java.QueryAnnotation;
-import org.eclipse.jpt.core.resource.java.QueryHintAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-
-public abstract class AbstractJavaQuery extends AbstractJavaJpaContextNode 
-	implements JavaQuery
-{
-	protected String name;
-
-	protected String query;
-
-	protected final List<JavaQueryHint> hints;
-
-	protected QueryAnnotation queryAnnotation;
-	
-	protected AbstractJavaQuery(JavaJpaContextNode parent) {
-		super(parent);
-		this.hints = new ArrayList<JavaQueryHint>();
-	}
-
-	protected QueryAnnotation getQueryResource() {
-		return this.queryAnnotation;
-	}
-	
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		this.queryAnnotation.setName(newName);
-		firePropertyChanged(Query.NAME_PROPERTY, oldName, newName);
-	}
-	
-	protected void setName_(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		firePropertyChanged(Query.NAME_PROPERTY, oldName, newName);
-	}
-
-	public String getQuery() {
-		return this.query;
-	}
-
-	public void setQuery(String newQuery) {
-		String oldQuery = this.query;
-		this.query = newQuery;
-		this.queryAnnotation.setQuery(newQuery);
-		firePropertyChanged(Query.QUERY_PROPERTY, oldQuery, newQuery);
-	}
-	
-	protected void setQuery_(String newQuery) {
-		String oldQuery = this.query;
-		this.query = newQuery;
-		firePropertyChanged(Query.QUERY_PROPERTY, oldQuery, newQuery);
-	}
-
-	public ListIterator<JavaQueryHint> hints() {
-		return new CloneListIterator<JavaQueryHint>(this.hints);
-	}
-
-	public int hintsSize() {
-		return this.hints.size();
-	}
-	
-	public JavaQueryHint addHint(int index) {
-		JavaQueryHint hint = getJpaFactory().buildJavaQueryHint(this);
-		this.hints.add(index, hint);
-		this.getQueryResource().addHint(index);
-		this.fireItemAdded(Query.HINTS_LIST, index, hint);
-		return hint;
-	}
-
-	protected void addHint(int index, JavaQueryHint hint) {
-		addItemToList(index, hint, this.hints, Query.HINTS_LIST);
-	}
-	
-	public void removeHint(QueryHint queryHint) {
-		removeHint(this.hints.indexOf(queryHint));
-	}
-	
-	public void removeHint(int index) {
-		JavaQueryHint removedHint = this.hints.remove(index);
-		this.getQueryResource().removeHint(index);
-		fireItemRemoved(Query.HINTS_LIST, index, removedHint);
-	}
-	
-	protected void removeHint_(JavaQueryHint hint) {
-		removeItemFromList(hint, this.hints, Query.HINTS_LIST);
-	}
-	
-	public void moveHint(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.hints, targetIndex, sourceIndex);
-		this.getQueryResource().moveHint(targetIndex, sourceIndex);
-		fireItemMoved(Query.HINTS_LIST, targetIndex, sourceIndex);		
-	}
-	
-	protected void initializeFromResource(QueryAnnotation queryAnnotation) {
-		this.queryAnnotation = queryAnnotation;
-		this.name = queryAnnotation.getName();
-		this.query = queryAnnotation.getQuery();
-		this.initializeQueryHints(queryAnnotation);
-	}
-
-	protected void update(QueryAnnotation queryAnnotation) {
-		this.queryAnnotation = queryAnnotation;
-		this.setName_(queryAnnotation.getName());
-		this.setQuery_(queryAnnotation.getQuery());
-		this.updateQueryHints(queryAnnotation);
-	}
-
-	protected void initializeQueryHints(QueryAnnotation queryResource) {
-		ListIterator<QueryHintAnnotation> annotations = queryResource.hints();
-		
-		while(annotations.hasNext()) {
-			this.hints.add(createQueryHint(annotations.next()));
-		}
-	}
-	
-	protected void updateQueryHints(QueryAnnotation queryResource) {
-		ListIterator<JavaQueryHint> hints = hints();
-		ListIterator<QueryHintAnnotation> resourceHints = queryResource.hints();
-		
-		while (hints.hasNext()) {
-			JavaQueryHint hint = hints.next();
-			if (resourceHints.hasNext()) {
-				hint.update(resourceHints.next());
-			}
-			else {
-				removeHint_(hint);
-			}
-		}
-		
-		while (resourceHints.hasNext()) {
-			addHint(hintsSize(), createQueryHint(resourceHints.next()));
-		}
-	}
-
-	protected JavaQueryHint createQueryHint(QueryHintAnnotation hintResource) {
-		JavaQueryHint queryHint =  getJpaFactory().buildJavaQueryHint(this);
-		queryHint.initializeFromResource(hintResource);
-		return queryHint;
-	}
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return this.queryAnnotation.getTextRange(astRoot);
-	}
-	
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return this.queryAnnotation.getNameTextRange(astRoot);
-	}
-	
-	public boolean overrides(Query query) {
-		// java is at the base of the tree
-		return false;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaRelationshipMapping.java
deleted file mode 100644
index 9be2b4b4b7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaRelationshipMapping.java
+++ /dev/null
@@ -1,198 +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.core.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.FetchType;
-import org.eclipse.jpt.core.context.Fetchable;
-import org.eclipse.jpt.core.context.PersistentType;
-import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaRelationshipMapping;
-import org.eclipse.jpt.core.internal.context.MappingTools;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.RelationshipMappingAnnotation;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-
-public abstract class AbstractJavaRelationshipMapping<T extends RelationshipMappingAnnotation> extends AbstractJavaAttributeMapping<T>
-	implements JavaRelationshipMapping
-{
-
-	protected String specifiedTargetEntity;
-
-	protected String defaultTargetEntity;
-
-	protected Entity resolvedTargetEntity;
-
-	protected final JavaCascade cascade;
-	
-	protected FetchType specifiedFetch;
-	
-	protected AbstractJavaRelationshipMapping(JavaPersistentAttribute parent) {
-		super(parent);
-		this.cascade = new JavaCascade(this);
-	}
-	
-	public String getTargetEntity() {
-		return (this.getSpecifiedTargetEntity() == null) ? getDefaultTargetEntity() : this.getSpecifiedTargetEntity();
-	}
-
-	public String getSpecifiedTargetEntity() {
-		return this.specifiedTargetEntity;
-	}
-
-	public void setSpecifiedTargetEntity(String newSpecifiedTargetEntity) {
-		String oldSpecifiedTargetEntity = this.specifiedTargetEntity;
-		this.specifiedTargetEntity = newSpecifiedTargetEntity;
-		this.getMappingResource().setTargetEntity(newSpecifiedTargetEntity);
-		firePropertyChanged(RelationshipMapping.SPECIFIED_TARGET_ENTITY_PROPERTY, oldSpecifiedTargetEntity, newSpecifiedTargetEntity);
-	}
-	
-	protected void setSpecifiedTargetEntity_(String newSpecifiedTargetEntity) {
-		String oldSpecifiedTargetEntity = this.specifiedTargetEntity;
-		this.specifiedTargetEntity = newSpecifiedTargetEntity;
-		firePropertyChanged(RelationshipMapping.SPECIFIED_TARGET_ENTITY_PROPERTY, oldSpecifiedTargetEntity, newSpecifiedTargetEntity);
-	}
-
-	public String getDefaultTargetEntity() {
-		return this.defaultTargetEntity;
-	}
-
-	protected void setDefaultTargetEntity(String newDefaultTargetEntity) {
-		String oldDefaultTargetEntity = this.defaultTargetEntity;
-		this.defaultTargetEntity = newDefaultTargetEntity;
-		firePropertyChanged(RelationshipMapping.DEFAULT_TARGET_ENTITY_PROPERTY, oldDefaultTargetEntity, newDefaultTargetEntity);
-	}
-
-	public Entity getResolvedTargetEntity() {
-		return this.resolvedTargetEntity;
-	}
-
-	protected void setResolvedTargetEntity(Entity newResolvedTargetEntity) {
-		Entity oldResolvedTargetEntity = this.resolvedTargetEntity;
-		this.resolvedTargetEntity = newResolvedTargetEntity;
-		firePropertyChanged(RelationshipMapping.RESOLVED_TARGET_ENTITY_PROPERTY, oldResolvedTargetEntity, newResolvedTargetEntity);
-	}
-
-	public JavaCascade getCascade() {
-		return this.cascade;
-	}
-
-	public FetchType getFetch() {
-		return (this.getSpecifiedFetch() == null) ? this.getDefaultFetch() : this.getSpecifiedFetch();
-	}
-	
-	public FetchType getSpecifiedFetch() {
-		return this.specifiedFetch;
-	}
-	
-	public void setSpecifiedFetch(FetchType newSpecifiedFetch) {
-		FetchType oldFetch = this.specifiedFetch;
-		this.specifiedFetch = newSpecifiedFetch;
-		this.getMappingResource().setFetch(FetchType.toJavaResourceModel(newSpecifiedFetch));
-		firePropertyChanged(Fetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch);
-	}
-	
-	protected void setSpecifiedFetch_(FetchType newSpecifiedFetch) {
-		FetchType oldFetch = this.specifiedFetch;
-		this.specifiedFetch = newSpecifiedFetch;
-		firePropertyChanged(Fetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch);
-	}
-
-	@Override
-	public void initializeFromResource(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		this.defaultTargetEntity = this.defaultTargetEntity(resourcePersistentAttribute);
-		super.initializeFromResource(resourcePersistentAttribute);
-	}
-	
-	@Override
-	public void update(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		this.setDefaultTargetEntity(this.defaultTargetEntity(resourcePersistentAttribute));
-		super.update(resourcePersistentAttribute);
-	}
-	
-	@Override
-	protected void initialize(T relationshipMapping) {
-		this.specifiedFetch = this.fetch(relationshipMapping);
-		this.cascade.initialize(relationshipMapping);
-		this.specifiedTargetEntity = this.specifiedTargetEntity(relationshipMapping);
-		this.resolvedTargetEntity = this.resolveTargetEntity(relationshipMapping);
-	}
-
-	@Override
-	protected void update(T relationshipMapping) {
-		super.update(relationshipMapping);
-		this.setSpecifiedFetch_(this.fetch(relationshipMapping));
-		this.cascade.update(relationshipMapping);
-		this.setSpecifiedTargetEntity_(this.specifiedTargetEntity(relationshipMapping));
-		this.setResolvedTargetEntity(this.resolveTargetEntity(relationshipMapping));
-	}
-	
-	protected FetchType fetch(T relationshipMapping) {
-		return FetchType.fromJavaResourceModel(relationshipMapping.getFetch());
-	}
-	
-	protected String specifiedTargetEntity(T relationshipMapping) {
-		return relationshipMapping.getTargetEntity();
-	}
-	
-	protected abstract String defaultTargetEntity(JavaResourcePersistentAttribute resourcePersistentAttribute);
-	
-	protected Entity resolveTargetEntity(T relationshipMapping) {
-		String qualifiedTargetEntity = getDefaultTargetEntity();
-		if (getSpecifiedTargetEntity() != null) {
-			qualifiedTargetEntity = relationshipMapping.getFullyQualifiedTargetEntity();
-		}
-		if (qualifiedTargetEntity == null) {
-			return null;
-		}
-		PersistentType persistentType = getPersistenceUnit().getPersistentType(qualifiedTargetEntity);
-		if (persistentType != null && persistentType.getMappingKey() == MappingKeys.ENTITY_TYPE_MAPPING_KEY) {
-			return (Entity) persistentType.getMapping();
-		}
-		return null;
-	}
-
-	public Entity getEntity() {
-		if (getTypeMapping() instanceof Entity) {
-			return (Entity) getTypeMapping();
-		}
-		return null;
-	}
-
-	public Iterator<String> allTargetEntityAttributeNames() {
-		Entity targetEntity = this.getResolvedTargetEntity();
-		return (targetEntity == null) ? EmptyIterator.<String> instance() : targetEntity.getPersistentType().allAttributeNames();
-	}
-
-	public Iterator<String> candidateMappedByAttributeNames() {
-		return this.allTargetEntityAttributeNames();
-	}
-
-	protected Iterator<String> candidateMappedByAttributeNames(Filter<String> filter) {
-		return new FilteringIterator<String, String>(this.candidateMappedByAttributeNames(), filter);
-	}
-
-	protected Iterator<String> quotedCandidateMappedByAttributeNames(Filter<String> filter) {
-		return StringTools.quote(this.candidateMappedByAttributeNames(filter));
-	}
-
-
-	// ********** static methods **********
-
-	public boolean targetEntityIsValid(String targetEntity) {
-		return MappingTools.targetEntityIsValid(targetEntity);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java
deleted file mode 100644
index 1f09a2c559..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java
+++ /dev/null
@@ -1,433 +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.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.BaseJoinColumn;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.FetchType;
-import org.eclipse.jpt.core.context.JoinColumn;
-import org.eclipse.jpt.core.context.Nullable;
-import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.SingleRelationshipMapping;
-import org.eclipse.jpt.core.context.TypeMapping;
-import org.eclipse.jpt.core.context.java.JavaJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaSingleRelationshipMapping;
-import org.eclipse.jpt.core.internal.resource.java.NullJoinColumn;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.JoinColumnsAnnotation;
-import org.eclipse.jpt.core.resource.java.RelationshipMappingAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public abstract class AbstractJavaSingleRelationshipMapping<T extends RelationshipMappingAnnotation>
-	extends AbstractJavaRelationshipMapping<T> implements JavaSingleRelationshipMapping
-{
-	
-	protected final List<JavaJoinColumn> specifiedJoinColumns;
-
-	protected JavaJoinColumn defaultJoinColumn;
-
-	protected Boolean specifiedOptional;
-
-	protected AbstractJavaSingleRelationshipMapping(JavaPersistentAttribute parent) {
-		super(parent);
-		this.specifiedJoinColumns = new ArrayList<JavaJoinColumn>();
-	}
-	
-	public FetchType getDefaultFetch() {
-		return SingleRelationshipMapping.DEFAULT_FETCH_TYPE;
-	}
-	
-	//***************** ISingleRelationshipMapping implementation *****************
-	public ListIterator<JavaJoinColumn> joinColumns() {
-		return this.containsSpecifiedJoinColumns() ? this.specifiedJoinColumns() : this.defaultJoinColumns();
-	}
-
-	public int joinColumnsSize() {
-		return this.containsSpecifiedJoinColumns() ? this.specifiedJoinColumnsSize() : this.defaultJoinColumnsSize();
-	}
-	
-	public JavaJoinColumn getDefaultJoinColumn() {
-		return this.defaultJoinColumn;
-	}
-	
-	protected void setDefaultJoinColumn(JavaJoinColumn newJoinColumn) {
-		JavaJoinColumn oldJoinColumn = this.defaultJoinColumn;
-		this.defaultJoinColumn = newJoinColumn;
-		firePropertyChanged(SingleRelationshipMapping.DEFAULT_JOIN_COLUMN, oldJoinColumn, newJoinColumn);
-	}
-
-	protected ListIterator<JavaJoinColumn> defaultJoinColumns() {
-		if (this.defaultJoinColumn != null) {
-			return new SingleElementListIterator<JavaJoinColumn>(this.defaultJoinColumn);
-		}
-		return EmptyListIterator.instance();
-	}
-	
-	protected int defaultJoinColumnsSize() {
-		return (this.defaultJoinColumn == null) ? 0 : 1;
-	}
-	
-	public ListIterator<JavaJoinColumn> specifiedJoinColumns() {
-		return new CloneListIterator<JavaJoinColumn>(this.specifiedJoinColumns);
-	}
-
-	public int specifiedJoinColumnsSize() {
-		return this.specifiedJoinColumns.size();
-	}
-
-	public boolean containsSpecifiedJoinColumns() {
-		return !this.specifiedJoinColumns.isEmpty();
-	}
-
-	public JavaJoinColumn addSpecifiedJoinColumn(int index) {
-		JavaJoinColumn oldDefaultJoinColumn = this.getDefaultJoinColumn();
-		if (oldDefaultJoinColumn != null) {
-			//null the default join column now if one already exists.
-			//if one does not exist, there is already a specified join column.
-			//Remove it now so that it doesn't get removed during an update and
-			//cause change notifications to be sent to the UI in the wrong order
-			this.defaultJoinColumn = null;
-		}
-		JavaJoinColumn joinColumn = getJpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner());
-		this.specifiedJoinColumns.add(index, joinColumn);
-		JoinColumnAnnotation joinColumnResource = (JoinColumnAnnotation) getResourcePersistentAttribute().addAnnotation(index, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME);
-		joinColumn.initializeFromResource(joinColumnResource);
-		this.fireItemAdded(SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn);
-		if (oldDefaultJoinColumn != null) {
-			this.firePropertyChanged(SingleRelationshipMapping.DEFAULT_JOIN_COLUMN, oldDefaultJoinColumn, null);
-		}
-		return joinColumn;
-	}
-
-	protected void addSpecifiedJoinColumn(int index, JavaJoinColumn joinColumn) {
-		addItemToList(index, joinColumn, this.specifiedJoinColumns, SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST);
-	}
-
-	public void removeSpecifiedJoinColumn(JoinColumn joinColumn) {
-		this.removeSpecifiedJoinColumn(this.specifiedJoinColumns.indexOf(joinColumn));
-	}
-	
-	public void removeSpecifiedJoinColumn(int index) {
-		JavaJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index);
-		if (!containsSpecifiedJoinColumns()) {
-			//create the defaultJoinColumn now or this will happen during project update 
-			//after removing the join column from the resource model. That causes problems 
-			//in the UI because the change notifications end up in the wrong order.
-			this.defaultJoinColumn = buildJoinColumn(new NullJoinColumn(getResourcePersistentAttribute()));
-		}
-		getResourcePersistentAttribute().removeAnnotation(index, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME);
-		fireItemRemoved(SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST, index, removedJoinColumn);
-		if (this.defaultJoinColumn != null) {
-			//fire change notification if a defaultJoinColumn was created above
-			this.firePropertyChanged(SingleRelationshipMapping.DEFAULT_JOIN_COLUMN, null, this.defaultJoinColumn);		
-		}
-	}
-
-	protected void removeSpecifiedJoinColumn_(JavaJoinColumn joinColumn) {
-		removeItemFromList(joinColumn, this.specifiedJoinColumns, SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST);
-	}
-	
-	public void moveSpecifiedJoinColumn(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.specifiedJoinColumns, targetIndex, sourceIndex);
-		getResourcePersistentAttribute().move(targetIndex, sourceIndex, JoinColumnsAnnotation.ANNOTATION_NAME);
-		fireItemMoved(SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST, targetIndex, sourceIndex);		
-	}
-
-	public Boolean getOptional() {
-		return getSpecifiedOptional() == null ? getDefaultOptional() : getSpecifiedOptional();
-	}
-	
-	public Boolean getDefaultOptional() {
-		return Nullable.DEFAULT_OPTIONAL;
-	}
-	
-	public Boolean getSpecifiedOptional() {
-		return this.specifiedOptional;
-	}
-	
-	public void setSpecifiedOptional(Boolean newSpecifiedOptional) {
-		Boolean oldSpecifiedOptional = this.specifiedOptional;
-		this.specifiedOptional = newSpecifiedOptional;
-		setOptionalOnResourceModel(newSpecifiedOptional);
-		firePropertyChanged(Nullable.SPECIFIED_OPTIONAL_PROPERTY, oldSpecifiedOptional, newSpecifiedOptional);
-	}
-	
-	protected void setSpecifiedOptional_(Boolean newSpecifiedOptional) {
-		Boolean oldSpecifiedOptional = this.specifiedOptional;
-		this.specifiedOptional = newSpecifiedOptional;
-		firePropertyChanged(Nullable.SPECIFIED_OPTIONAL_PROPERTY, oldSpecifiedOptional, newSpecifiedOptional);
-	}
-
-	protected abstract void setOptionalOnResourceModel(Boolean newOptional);
-
-
-	@Override
-	public void initializeFromResource(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		super.initializeFromResource(resourcePersistentAttribute);
-		this.initializeSpecifiedJoinColumns(resourcePersistentAttribute);
-		this.initializeDefaultJoinColumn(resourcePersistentAttribute);
-	}
-	
-	@Override
-	protected void initialize(T relationshipMapping) {
-		super.initialize(relationshipMapping);
-		this.specifiedOptional = this.specifiedOptional(relationshipMapping);
-	}
-	
-	protected void initializeSpecifiedJoinColumns(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		ListIterator<JavaResourceNode> annotations = resourcePersistentAttribute.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME);
-		
-		while(annotations.hasNext()) {
-			this.specifiedJoinColumns.add(buildJoinColumn((JoinColumnAnnotation) annotations.next()));
-		}
-	}
-	
-	protected boolean shouldBuildDefaultJoinColumn() {
-		return !containsSpecifiedJoinColumns() && isRelationshipOwner();
-	}
-	
-	protected void initializeDefaultJoinColumn(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		if (!shouldBuildDefaultJoinColumn()) {
-			return;
-		}
-		this.defaultJoinColumn = buildJoinColumn(new NullJoinColumn(resourcePersistentAttribute));
-	}	
-	
-	
-	@Override
-	public void update(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		super.update(resourcePersistentAttribute);
-		this.updateSpecifiedJoinColumns(resourcePersistentAttribute);
-		this.updateDefaultJoinColumn(resourcePersistentAttribute);
-	}
-	
-	@Override
-	protected void update(T relationshipMapping) {
-		super.update(relationshipMapping);
-		this.setSpecifiedOptional_(this.specifiedOptional(relationshipMapping));
-	}
-	
-	protected abstract Boolean specifiedOptional(T relationshipMapping);
-	
-	
-	protected void updateSpecifiedJoinColumns(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		ListIterator<JavaJoinColumn> joinColumns = specifiedJoinColumns();
-		ListIterator<JavaResourceNode> resourceJoinColumns = resourcePersistentAttribute.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME);
-		
-		while (joinColumns.hasNext()) {
-			JavaJoinColumn joinColumn = joinColumns.next();
-			if (resourceJoinColumns.hasNext()) {
-				joinColumn.update((JoinColumnAnnotation) resourceJoinColumns.next());
-			}
-			else {
-				removeSpecifiedJoinColumn_(joinColumn);
-			}
-		}
-		
-		while (resourceJoinColumns.hasNext()) {
-			addSpecifiedJoinColumn(specifiedJoinColumnsSize(), buildJoinColumn((JoinColumnAnnotation) resourceJoinColumns.next()));
-		}
-	}
-	
-	protected void updateDefaultJoinColumn(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		if (!shouldBuildDefaultJoinColumn()) {
-			setDefaultJoinColumn(null);
-			return;
-		}
-		if (getDefaultJoinColumn() == null) {
-			this.setDefaultJoinColumn(buildJoinColumn(new NullJoinColumn(resourcePersistentAttribute)));
-		}
-		else {
-			this.defaultJoinColumn.update(new NullJoinColumn(resourcePersistentAttribute));
-		}
-	}	
-
-	protected JavaJoinColumn buildJoinColumn(JoinColumnAnnotation joinColumnResource) {
-		JavaJoinColumn joinColumn = getJpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner());
-		joinColumn.initializeFromResource(joinColumnResource);
-		return joinColumn;
-	}
-	
-	protected JavaJoinColumn.Owner createJoinColumnOwner() {
-		return new JoinColumnOwner();
-	}
-	
-	/**
-	 * eliminate any "container" types
-	 */
-	@Override
-	protected String defaultTargetEntity(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		if (resourcePersistentAttribute.typeIsContainer()) {
-			return null;
-		}
-		return resourcePersistentAttribute.getQualifiedReferenceEntityTypeName();
-	}
-
-	@Override
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		for (JavaJoinColumn column : CollectionTools.iterable(this.joinColumns())) {
-			result = column.javaCompletionProposals(pos, filter, astRoot);
-			if (result != null) {
-				return result;
-			}
-		}
-		return null;
-	}
-	
-	//************* Validation  **********************************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-		
-		if (addJoinColumnMessages()) {
-			addJoinColumnMessages(messages, astRoot);
-		}
-	}
-	
-	//bug 192287 - do not want joinColumn validation errors on the non-owning side
-	//of a bidirectional relationship.  This is a low risk fix for RC3, but a better
-	//solution would be to not have the default joinColumns on the non-owning side.
-	//This would fix another bug that we show default joinColumns in this situation.
-	protected boolean addJoinColumnMessages() {
-		return (entityOwned() && isRelationshipOwner());
-	}
-		
-	protected void addJoinColumnMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		
-		for (Iterator<JavaJoinColumn> stream = this.joinColumns(); stream.hasNext();) {
-			JavaJoinColumn joinColumn = stream.next();
-			String table = joinColumn.getTable();
-			boolean doContinue = joinColumn.connectionProfileIsActive();
-			
-			if (doContinue && this.getTypeMapping().tableNameIsInvalid(table)) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_TABLE,
-						new String[] {table, joinColumn.getName()}, 
-						joinColumn, joinColumn.getTableTextRange(astRoot))
-				);
-				doContinue = false;
-			}
-			
-			if (doContinue && ! joinColumn.isResolved()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_NAME,
-						new String[] {joinColumn.getName()}, 
-						joinColumn, joinColumn.getNameTextRange(astRoot))
-				);
-			}
-			
-			if (doContinue && ! joinColumn.isReferencedColumnResolved()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME,
-						new String[] {joinColumn.getReferencedColumnName(), joinColumn.getName()}, 
-						joinColumn, joinColumn.getReferencedColumnNameTextRange(astRoot))
-				);
-			}
-		}
-	}
-	
-
-	public class JoinColumnOwner implements JavaJoinColumn.Owner
-	{
-
-		public JoinColumnOwner() {
-			super();
-		}
-
-		/**
-		 * by default, the join column is in the type mapping's primary table
-		 */
-		public String getDefaultTableName() {
-			return AbstractJavaSingleRelationshipMapping.this.getTypeMapping().getTableName();
-		}
-
-		public Entity getTargetEntity() {
-			return AbstractJavaSingleRelationshipMapping.this.getResolvedTargetEntity();
-		}
-
-		public String getAttributeName() {
-			return AbstractJavaSingleRelationshipMapping.this.getPersistentAttribute().getName();
-		}
-
-		public RelationshipMapping getRelationshipMapping() {
-			return AbstractJavaSingleRelationshipMapping.this;
-		}
-
-		public boolean tableNameIsInvalid(String tableName) {
-			return AbstractJavaSingleRelationshipMapping.this.getTypeMapping().tableNameIsInvalid(tableName);
-		}
-
-		/**
-		 * the join column can be on a secondary table
-		 */
-		public boolean tableIsAllowed() {
-			return true;
-		}
-
-		public TypeMapping getTypeMapping() {
-			return AbstractJavaSingleRelationshipMapping.this.getTypeMapping();
-		}
-
-		public Table getDbTable(String tableName) {
-			return getTypeMapping().getDbTable(tableName);
-		}
-
-		public Table getDbReferencedColumnTable() {
-			Entity targetEntity = getTargetEntity();
-			return (targetEntity == null) ? null : targetEntity.getPrimaryDbTable();
-		}
-		
-		public boolean isVirtual(BaseJoinColumn joinColumn) {
-			return AbstractJavaSingleRelationshipMapping.this.defaultJoinColumn == joinColumn;
-		}
-		
-		public String getDefaultColumnName() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-		
-		public TextRange getValidationTextRange(CompilationUnit astRoot) {
-			return AbstractJavaSingleRelationshipMapping.this.getValidationTextRange(astRoot);
-		}
-		
-		public int joinColumnsSize() {
-			return AbstractJavaSingleRelationshipMapping.this.joinColumnsSize();
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTable.java
deleted file mode 100644
index 6ce7369b2b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTable.java
+++ /dev/null
@@ -1,444 +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.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.Table;
-import org.eclipse.jpt.core.context.UniqueConstraint;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.context.java.JavaUniqueConstraint;
-import org.eclipse.jpt.core.resource.java.TableAnnotation;
-import org.eclipse.jpt.core.resource.java.UniqueConstraintAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.utility.Filter;
-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.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-
-public abstract class AbstractJavaTable extends AbstractJavaJpaContextNode implements UniqueConstraint.Owner
-{
-
-	protected String specifiedName;
-	protected String defaultName;
-
-	protected String specifiedCatalog;
-	protected String defaultCatalog;
-
-	protected String specifiedSchema;
-	protected String defaultSchema;
-	
-	protected final List<JavaUniqueConstraint> uniqueConstraints;
-
-
-	protected AbstractJavaTable(JavaJpaContextNode parent) {
-		super(parent);
-		this.uniqueConstraints = new ArrayList<JavaUniqueConstraint>();
-	}
-
-	@Override
-	public JavaJpaContextNode getParent() {
-		return (JavaJpaContextNode) super.getParent();
-	}
-
-	/**
-	 * Return the java table resource, do not return null if the java annotation does not exist.
-	 * Use a null resource object instead of null.
-	 */
-	protected abstract TableAnnotation getTableResource();
-	
-	/**
-	 * Return the fully qualified annotation name of the java table resource
-	 */
-	protected abstract String getAnnotationName();
-	
-	public String getName() {
-		return (this.getSpecifiedName() == null) ? getDefaultName() : this.getSpecifiedName();
-	}
-
-	public String getSpecifiedName() {
-		return this.specifiedName;
-	}
-
-	public void setSpecifiedName(String newSpecifiedName) {
-		String oldSpecifiedName = this.specifiedName;
-		this.specifiedName = newSpecifiedName;
-		getTableResource().setName(newSpecifiedName);
-		firePropertyChanged(Table.SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName);
-	}
-	
-	/**
-	 * 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 setSpecifiedName_(String newSpecifiedName) {
-		String oldSpecifiedName = this.specifiedName;
-		this.specifiedName = newSpecifiedName;
-		firePropertyChanged(Table.SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName);
-	}
-
-	public String getDefaultName() {
-		return this.defaultName;
-	}
-
-	public String getCatalog() {
-		return (this.getSpecifiedCatalog() == null) ? getDefaultCatalog() : this.getSpecifiedCatalog();
-	}
-
-	public String getSpecifiedCatalog() {
-		return this.specifiedCatalog;
-	}
-
-	public void setSpecifiedCatalog(String newSpecifiedCatalog) {
-		String oldSpecifiedCatalog = this.specifiedCatalog;
-		this.specifiedCatalog = newSpecifiedCatalog;
-		getTableResource().setCatalog(newSpecifiedCatalog);
-		firePropertyChanged(Table.SPECIFIED_CATALOG_PROPERTY, oldSpecifiedCatalog, newSpecifiedCatalog);
-	}
-
-	/**
-	 * 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 setSpecifiedCatalog_(String newSpecifiedCatalog) {
-		String oldSpecifiedCatalog = this.specifiedCatalog;
-		this.specifiedCatalog = newSpecifiedCatalog;
-		firePropertyChanged(Table.SPECIFIED_CATALOG_PROPERTY, oldSpecifiedCatalog, newSpecifiedCatalog);
-	}
-
-	public String getDefaultCatalog() {
-		return this.defaultCatalog;
-	}
-
-	public String getSchema() {
-		return (this.getSpecifiedSchema() == null) ? getDefaultSchema() : this.getSpecifiedSchema();
-	}
-
-	public String getSpecifiedSchema() {
-		return this.specifiedSchema;
-	}
-	
-	public void setSpecifiedSchema(String newSpecifiedSchema) {
-		String oldSpecifiedSchema = this.specifiedSchema;
-		this.specifiedSchema = newSpecifiedSchema;
-		getTableResource().setSchema(newSpecifiedSchema);
-		firePropertyChanged(Table.SPECIFIED_SCHEMA_PROPERTY, oldSpecifiedSchema, newSpecifiedSchema);
-	}
-	
-	/**
-	 * 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 setSpecifiedSchema_(String newSpecifiedSchema) {
-		String oldSpecifiedSchema = this.specifiedSchema;
-		this.specifiedSchema = newSpecifiedSchema;
-		firePropertyChanged(Table.SPECIFIED_SCHEMA_PROPERTY, oldSpecifiedSchema, newSpecifiedSchema);
-	}
-
-	public String getDefaultSchema() {
-		return this.defaultSchema;
-	}
-	
-	
-	// ********** unique constraints **********
-	
-	public ListIterator<JavaUniqueConstraint> uniqueConstraints() {
-		return new CloneListIterator<JavaUniqueConstraint>(this.uniqueConstraints);
-	}
-	
-	public int uniqueConstraintsSize() {
-		return this.uniqueConstraints.size();
-	}
-	
-	public JavaUniqueConstraint addUniqueConstraint(int index) {
-		JavaUniqueConstraint uniqueConstraint = getJpaFactory().buildJavaUniqueConstraint(this, this);
-		this.uniqueConstraints.add(index, uniqueConstraint);
-		UniqueConstraintAnnotation uniqueConstraintAnnotation = this.getTableResource().addUniqueConstraint(index);
-		uniqueConstraint.initialize(uniqueConstraintAnnotation);
-		fireItemAdded(Table.UNIQUE_CONSTRAINTS_LIST, index, uniqueConstraint);
-		return uniqueConstraint;
-	}
-		
-	public void removeUniqueConstraint(UniqueConstraint uniqueConstraint) {
-		this.removeUniqueConstraint(this.uniqueConstraints.indexOf(uniqueConstraint));
-	}
-
-	public void removeUniqueConstraint(int index) {
-		JavaUniqueConstraint removedUniqueConstraint = this.uniqueConstraints.remove(index);
-		this.getTableResource().removeUniqueConstraint(index);
-		fireItemRemoved(Table.UNIQUE_CONSTRAINTS_LIST, index, removedUniqueConstraint);
-	}
-	
-	public void moveUniqueConstraint(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.uniqueConstraints, targetIndex, sourceIndex);
-		this.getTableResource().moveUniqueConstraint(targetIndex, sourceIndex);
-		fireItemMoved(Table.UNIQUE_CONSTRAINTS_LIST, targetIndex, sourceIndex);		
-	}
-	
-	protected void addUniqueConstraint(int index, JavaUniqueConstraint uniqueConstraint) {
-		addItemToList(index, uniqueConstraint, this.uniqueConstraints, Table.UNIQUE_CONSTRAINTS_LIST);
-	}
-	
-	protected void removeUniqueConstraint_(JavaUniqueConstraint uniqueConstraint) {
-		removeItemFromList(uniqueConstraint, this.uniqueConstraints, Table.UNIQUE_CONSTRAINTS_LIST);
-	}
-
-
-	// ********** Table implementation **********
-
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		TextRange textRange = getTableResource().getNameTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getParent().getValidationTextRange(astRoot);
-	}
-
-	public boolean nameTouches(int pos, CompilationUnit astRoot) {
-		return getTableResource().nameTouches(pos, astRoot);
-	}
-
-	public TextRange getSchemaTextRange(CompilationUnit astRoot) {
-		TextRange textRange = getTableResource().getSchemaTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getParent().getValidationTextRange(astRoot);
-	}
-
-	public boolean schemaTouches(int pos, CompilationUnit astRoot) {
-		return getTableResource().schemaTouches(pos, astRoot);
-	}
-
-	public TextRange getCatalogTextRange(CompilationUnit astRoot) {
-		return getTableResource().getCatalogTextRange(astRoot);
-	}
-
-	public boolean catalogTouches(int pos, CompilationUnit astRoot) {
-		return getTableResource().catalogTouches(pos, astRoot);
-	}
-
-	protected void setDefaultName(String newDefaultName) {
-		String oldDefaultName = this.defaultName;
-		this.defaultName = newDefaultName;
-		firePropertyChanged(Table.DEFAULT_NAME_PROPERTY, oldDefaultName, newDefaultName);
-	}
-
-	protected void setDefaultCatalog(String newDefaultCatalog) {
-		String oldDefaultCatalog = this.defaultCatalog;
-		this.defaultCatalog = newDefaultCatalog;
-		firePropertyChanged(Table.DEFAULT_CATALOG_PROPERTY, oldDefaultCatalog, newDefaultCatalog);
-	}
-
-	protected void setDefaultSchema(String newDefaultSchema) {
-		String oldDefaultSchema = this.defaultSchema;
-		this.defaultSchema = newDefaultSchema;
-		firePropertyChanged(Table.DEFAULT_SCHEMA_PROPERTY, oldDefaultSchema, newDefaultSchema);
-	}
-	
-
-	
-	protected void initializeFromResource(TableAnnotation table) {
-		this.defaultName = this.defaultName();
-		this.defaultSchema = this.defaultSchema();
-		this.defaultCatalog = this.defaultCatalog();
-		this.specifiedName = table.getName();
-		this.specifiedSchema = table.getSchema();
-		this.specifiedCatalog = table.getCatalog();
-		this.initializeUniqueConstraints(table);
-	}
-
-	protected void initializeUniqueConstraints(TableAnnotation table) {
-		for (UniqueConstraintAnnotation uniqueConstraintAnnotation : CollectionTools.iterable(table.uniqueConstraints())) {
-			this.uniqueConstraints.add(buildUniqueConstraint(uniqueConstraintAnnotation));
-		}
-	}
-	
-	protected void update(TableAnnotation table) {
-		this.setSpecifiedName_(table.getName());
-		this.setSpecifiedSchema_(table.getSchema());
-		this.setSpecifiedCatalog_(table.getCatalog());
-		this.setDefaultName(this.defaultName());
-		this.setDefaultSchema(this.defaultSchema());
-		this.setDefaultCatalog(this.defaultCatalog());
-		this.updateUniqueConstraints(table);
-	}
-	
-	protected abstract String defaultName();
-
-	protected String defaultSchema() {
-		if (getEntityMappings() != null) {
-			return getEntityMappings().getSchema();
-		}
-		return getPersistenceUnit().getDefaultSchema();
-	}
-	
-	protected String defaultCatalog() {
-		if (getEntityMappings() != null) {
-			return getEntityMappings().getCatalog();
-		}
-		return getPersistenceUnit().getDefaultCatalog();
-	}
-	
-	protected void updateUniqueConstraints(TableAnnotation table) {
-		ListIterator<JavaUniqueConstraint> uniqueConstraints = uniqueConstraints();
-		ListIterator<UniqueConstraintAnnotation> resourceUniqueConstraints = table.uniqueConstraints();
-		
-		while (uniqueConstraints.hasNext()) {
-			JavaUniqueConstraint uniqueConstraint = uniqueConstraints.next();
-			if (resourceUniqueConstraints.hasNext()) {
-				uniqueConstraint.update(resourceUniqueConstraints.next());
-			}
-			else {
-				removeUniqueConstraint_(uniqueConstraint);
-			}
-		}
-		
-		while (resourceUniqueConstraints.hasNext()) {
-			addUniqueConstraint(uniqueConstraintsSize(), buildUniqueConstraint(resourceUniqueConstraints.next()));
-		}
-	}
-
-	protected JavaUniqueConstraint buildUniqueConstraint(UniqueConstraintAnnotation uniqueConstraintAnnotation) {
-		JavaUniqueConstraint uniqueConstraint = getJpaFactory().buildJavaUniqueConstraint(this, this);
-		uniqueConstraint.initialize(uniqueConstraintAnnotation);
-		return uniqueConstraint;
-	}
-	
-	
-	//******************* UniqueConstraint.Owner implementation ******************
-	
-	public Iterator<String> candidateUniqueConstraintColumnNames() {
-		org.eclipse.jpt.db.Table dbTable = getDbTable();
-		if (dbTable != null) {
-			return dbTable.columnNames();
-		}
-		return EmptyIterator.instance();
-	}
-	
-	
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = getTableResource().getTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getParent().getValidationTextRange(astRoot);
-	}
-
-	public org.eclipse.jpt.db.Table getDbTable() {
-		Schema schema = this.getDbSchema();
-		return (schema == null) ? null : schema.tableNamed(this.getName());
-	}
-
-	public Schema getDbSchema() {
-		return this.getDatabase().schemaNamed(this.getSchema());
-	}
-
-	public boolean hasResolvedSchema() {
-		return this.getDbSchema() != null;
-	}
-
-	public boolean isResolved() {
-		return this.getDbTable() != null;
-	}
-
-	@Override
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		for (JavaUniqueConstraint constraint : CollectionTools.iterable(this.uniqueConstraints())) {
-			result = constraint.javaCompletionProposals(pos, filter, astRoot);
-			if (result != null) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * called if the database is connected
-	 * name, schema, catalog
-	 */
-	@Override
-	public Iterator<String> connectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.connectedJavaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		if (this.nameTouches(pos, astRoot)) {
-			return this.quotedCandidateNames(filter);
-		}
-		if (this.schemaTouches(pos, astRoot)) {
-			return this.quotedCandidateSchemas(filter);
-		}
-		if (this.catalogTouches(pos, astRoot)) {
-			return this.quotedCandidateCatalogs(filter);
-		}
-		return null;
-	}
-
-	private Iterator<String> candidateNames() {
-		Schema dbSchema = this.getDbSchema();
-		return (dbSchema != null) ? dbSchema.tableNames() : EmptyIterator.<String> instance();
-	}
-
-	private Iterator<String> candidateNames(Filter<String> filter) {
-		return new FilteringIterator<String, String>(this.candidateNames(), filter);
-	}
-
-	private Iterator<String> quotedCandidateNames(Filter<String> filter) {
-		return StringTools.quote(this.candidateNames(filter));
-	}
-
-	private Iterator<String> candidateSchemas() {
-		return this.getDatabase().schemaNames();
-	}
-
-	private Iterator<String> candidateSchemas(Filter<String> filter) {
-		return new FilteringIterator<String, String>(this.candidateSchemas(), filter);
-	}
-
-	private Iterator<String> quotedCandidateSchemas(Filter<String> filter) {
-		return StringTools.quote(this.candidateSchemas(filter));
-	}
-
-	private Iterator<String> candidateCatalogs() {
-		return this.getDatabase().catalogNames();
-	}
-
-	private Iterator<String> candidateCatalogs(Filter<String> filter) {
-		return new FilteringIterator<String, String>(this.candidateCatalogs(), filter);
-	}
-
-	private Iterator<String> quotedCandidateCatalogs(Filter<String> filter) {
-		return StringTools.quote(this.candidateCatalogs(filter));
-	}
-
-	public String getQualifiedName() {
-		return NameTools.buildQualifiedDatabaseObjectName(this.getCatalog(), this.getSchema(), this.getName());
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		super.toString(sb);
-		sb.append(getQualifiedName());
-	}
-
-	@Override
-	public String displayString() {
-		return getQualifiedName();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTypeMapping.java
deleted file mode 100644
index 5ae078e889..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTypeMapping.java
+++ /dev/null
@@ -1,129 +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.core.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.context.Table;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.context.java.JavaTypeMapping;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-
-
-public abstract class AbstractJavaTypeMapping extends AbstractJavaJpaContextNode
-	implements JavaTypeMapping
-{
-	protected JavaResourcePersistentType javaResourcePersistentType;
-	
-
-	protected AbstractJavaTypeMapping(JavaPersistentType parent) {
-		super(parent);
-	}
-	
-	protected JavaResourceNode getMappingResource() {
-		return this.javaResourcePersistentType.getMappingAnnotation(getAnnotationName());
-	}
-
-	//***************** ITypeMapping implementation *****************
-	
-	public JavaPersistentType getPersistentType() {
-		return (JavaPersistentType) getParent();
-	}
-
-	public String getTableName() {
-		return null;
-	}
-
-	public org.eclipse.jpt.db.Table getPrimaryDbTable() {
-		return null;
-	}
-
-	public org.eclipse.jpt.db.Table getDbTable(String tableName) {
-		return null;
-	}
-
-	public Schema getDbSchema() {
-		return null;
-	}
-
-	public boolean attributeMappingKeyAllowed(String attributeMappingKey) {
-		return true;
-	}
-
-	public Iterator<Table> associatedTables() {
-		return EmptyIterator.instance();
-	}
-
-	public Iterator<String> associatedTableNamesIncludingInherited() {
-		return EmptyIterator.instance();
-	}
-
-	public Iterator<Table> associatedTablesIncludingInherited() {
-		return EmptyIterator.instance();
-	}
-
-	public Iterator<JavaPersistentAttribute> overridableAttributes() {
-		return EmptyIterator.instance();
-	}
-	
-	public Iterator<PersistentAttribute> allOverridableAttributes() {
-		return EmptyIterator.instance();
-	}
-	
-	public Iterator<String> overridableAttributeNames() {
-		return EmptyIterator.instance();
-	}
-
-	public Iterator<String> allOverridableAttributeNames() {
-		return EmptyIterator.instance();
-	}
-
-	public Iterator<JavaPersistentAttribute> overridableAssociations() {
-		return EmptyIterator.instance();
-	}
-	
-	public Iterator<String> overridableAssociationNames() {
-		return EmptyIterator.instance();
-	}
-
-	public Iterator<PersistentAttribute> allOverridableAssociations() {
-		return EmptyIterator.instance();
-	}
-	
-	public Iterator<String> allOverridableAssociationNames() {
-		return EmptyIterator.instance();
-	}
-
-	public boolean tableNameIsInvalid(String tableName) {
-		return false;
-	}
-	
-	//******************** updatating *********************
-	public void initializeFromResource(JavaResourcePersistentType javaResourcePersistentType) {
-		this.javaResourcePersistentType = javaResourcePersistentType;
-	}
-
-	public void update(JavaResourcePersistentType javaResourcePersistentType) {
-		this.javaResourcePersistentType = javaResourcePersistentType;
-	}
-	
-	//******************** validation *********************
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = this.getMappingResource().getTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getPersistentType().getValidationTextRange(astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAssociationOverride.java
deleted file mode 100644
index 3e7299264b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAssociationOverride.java
+++ /dev/null
@@ -1,346 +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.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.BaseJoinColumn;
-import org.eclipse.jpt.core.context.AssociationOverride;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.TypeMapping;
-import org.eclipse.jpt.core.context.java.JavaAssociationOverride;
-import org.eclipse.jpt.core.context.java.JavaJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation;
-import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class GenericJavaAssociationOverride extends AbstractJavaOverride
-	implements JavaAssociationOverride
-{
-
-	protected final List<JavaJoinColumn> specifiedJoinColumns;
-
-	protected final List<JavaJoinColumn> defaultJoinColumns;
-
-
-	public GenericJavaAssociationOverride(JavaJpaContextNode parent, AssociationOverride.Owner owner) {
-		super(parent, owner);
-		this.specifiedJoinColumns = new ArrayList<JavaJoinColumn>();
-		this.defaultJoinColumns = new ArrayList<JavaJoinColumn>();
-	}
-
-	@Override
-	public JavaAssociationOverride setVirtual(boolean virtual) {
-		return (JavaAssociationOverride) super.setVirtual(virtual);
-	}
-
-	@Override
-	protected AssociationOverrideAnnotation getOverrideResource() {
-		return (AssociationOverrideAnnotation) super.getOverrideResource();
-	}
-	
-	@Override
-	public AssociationOverride.Owner getOwner() {
-		return (AssociationOverride.Owner) super.getOwner();
-	}
-	
-	public ListIterator<JavaJoinColumn> joinColumns() {
-		return this.specifiedJoinColumns.isEmpty() ? this.defaultJoinColumns() : this.specifiedJoinColumns();
-	}
-	
-	public int joinColumnsSize() {
-		return this.specifiedJoinColumns.isEmpty() ? this.defaultJoinColumnsSize() : this.specifiedJoinColumnsSize();
-	}
-	
-	public ListIterator<JavaJoinColumn> defaultJoinColumns() {
-		return new CloneListIterator<JavaJoinColumn>(this.defaultJoinColumns);
-	}
-	
-	public int defaultJoinColumnsSize() {
-		return this.defaultJoinColumns.size();
-	}
-	
-	public ListIterator<JavaJoinColumn> specifiedJoinColumns() {
-		return new CloneListIterator<JavaJoinColumn>(this.specifiedJoinColumns);
-	}
-	
-	public int specifiedJoinColumnsSize() {
-		return this.specifiedJoinColumns.size();
-	}
-	
-	public JavaJoinColumn addSpecifiedJoinColumn(int index) {
-		JavaJoinColumn joinColumn = getJpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner());
-		this.specifiedJoinColumns.add(index, joinColumn);
-		JoinColumnAnnotation joinColumnResource = getOverrideResource().addJoinColumn(index);
-		joinColumn.initializeFromResource(joinColumnResource);
-		this.fireItemAdded(AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn);
-		return joinColumn;
-	}
-	
-	protected JavaJoinColumn.Owner createJoinColumnOwner() {
-		return new JoinColumnOwner();
-	}
-
-	protected void addSpecifiedJoinColumn(int index, JavaJoinColumn joinColumn) {
-		addItemToList(index, joinColumn, this.specifiedJoinColumns, AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST);
-	}
-	
-	public void removeSpecifiedJoinColumn(int index) {
-		JavaJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index);
-		getOverrideResource().removeJoinColumn(index);
-		fireItemRemoved(Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedJoinColumn);
-	}
-
-	protected void removeSpecifiedJoinColumn(JavaJoinColumn joinColumn) {
-		removeItemFromList(joinColumn, this.specifiedJoinColumns, AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST);
-	}
-	
-	public void moveSpecifiedJoinColumn(int targetIndex, int sourceIndex) {
-		getOverrideResource().moveJoinColumn(targetIndex, sourceIndex);
-		moveItemInList(targetIndex, sourceIndex, this.specifiedJoinColumns, AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST);		
-	}
-
-	public boolean containsSpecifiedJoinColumns() {
-		return !this.specifiedJoinColumns.isEmpty();
-	}
-
-
-	@Override
-	protected Iterator<String> candidateNames() {
-		return this.getOwner().getTypeMapping().allOverridableAssociationNames();
-	}
-
-	@Override
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		for (JavaJoinColumn column : CollectionTools.iterable(this.joinColumns())) {
-			result = column.javaCompletionProposals(pos, filter, astRoot);
-			if (result != null) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	public void initializeFromResource(AssociationOverrideAnnotation associationOverride) {
-		super.initializeFromResource(associationOverride);
-		this.name = associationOverride.getName();
-		initializeSpecifiedJoinColumns(associationOverride);
-	}
-	
-	protected void initializeSpecifiedJoinColumns(AssociationOverrideAnnotation associationOverride) {
-		ListIterator<JoinColumnAnnotation> annotations = associationOverride.joinColumns();
-		
-		while(annotations.hasNext()) {
-			this.specifiedJoinColumns.add(createJoinColumn(annotations.next()));
-		}
-	}
-
-	public void update(AssociationOverrideAnnotation associationOverride) {
-		super.update(associationOverride);
-		updateSpecifiedJoinColumns(associationOverride);
-	}
-
-	protected void updateSpecifiedJoinColumns(AssociationOverrideAnnotation associationOverride) {
-		ListIterator<JavaJoinColumn> joinColumns = specifiedJoinColumns();
-		ListIterator<JoinColumnAnnotation> resourceJoinColumns = associationOverride.joinColumns();
-		
-		while (joinColumns.hasNext()) {
-			JavaJoinColumn joinColumn = joinColumns.next();
-			if (resourceJoinColumns.hasNext()) {
-				joinColumn.update(resourceJoinColumns.next());
-			}
-			else {
-				removeSpecifiedJoinColumn(joinColumn);
-			}
-		}
-		
-		while (resourceJoinColumns.hasNext()) {
-			addSpecifiedJoinColumn(specifiedJoinColumnsSize(), createJoinColumn(resourceJoinColumns.next()));
-		}
-	}
-	
-	
-	protected JavaJoinColumn createJoinColumn(JoinColumnAnnotation joinColumnResource) {
-		JavaJoinColumn joinColumn = getJpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner());
-		joinColumn.initializeFromResource(joinColumnResource);
-		return joinColumn;
-	}
-
-	
-	//******************** validation ********************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-		
-		addJoinColumnMessages(messages, astRoot);
-	}
-	
-	protected void addJoinColumnMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		for (JavaJoinColumn joinColumn : CollectionTools.iterable(joinColumns())) {
-			String table = joinColumn.getTable();
-			boolean doContinue = connectionProfileIsActive();
-			
-			if (doContinue && getOwner().getTypeMapping().tableNameIsInvalid(table)) {
-				if (isVirtual()) {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_UNRESOLVED_TABLE,
-							new String[] {getName(), table, joinColumn.getName()},
-							joinColumn, 
-							joinColumn.getTableTextRange(astRoot))
-					);
-				}
-				else {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_TABLE,
-							new String[] {table, joinColumn.getName()}, 
-							joinColumn, 
-							joinColumn.getTableTextRange(astRoot))
-					);
-				}
-				doContinue = false;
-			}
-			
-			if (doContinue && ! joinColumn.isResolved()) {
-				if (isVirtual()) {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_UNRESOLVED_NAME,
-							new String[] {getName(), joinColumn.getName()}, 
-							joinColumn, 
-							joinColumn.getNameTextRange(astRoot))
-					);
-				}
-				else {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_NAME,
-							new String[] {joinColumn.getName()}, 
-							joinColumn, 
-							joinColumn.getNameTextRange(astRoot))
-					);
-				}
-			}
-			
-			if (doContinue && ! joinColumn.isReferencedColumnResolved()) {
-				if (isVirtual()) {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME,
-							new String[] {getName(), joinColumn.getReferencedColumnName(), joinColumn.getName()}, 
-							joinColumn, 
-							joinColumn.getReferencedColumnNameTextRange(astRoot))
-					);
-				}
-				else {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME,
-							new String[] {joinColumn.getReferencedColumnName(), joinColumn.getName()}, 
-							joinColumn,
-							joinColumn.getReferencedColumnNameTextRange(astRoot))
-					);
-				}
-			}
-		}
-	}
-	public class JoinColumnOwner implements JavaJoinColumn.Owner
-	{
-
-		public JoinColumnOwner() {
-			super();
-		}
-
-		/**
-		 * by default, the join column is in the type mapping's primary table
-		 */
-		public String getDefaultTableName() {
-			return GenericJavaAssociationOverride.this.owner.getTypeMapping().getTableName();
-		}
-		
-		public String getDefaultColumnName() {
-			return null;
-		}
-		
-		public Entity getTargetEntity() {
-			RelationshipMapping relationshipMapping = getRelationshipMapping();
-			return relationshipMapping == null ? null : relationshipMapping.getResolvedTargetEntity();
-		}
-
-		public String getAttributeName() {
-			return GenericJavaAssociationOverride.this.getName();
-		}
-
-		public RelationshipMapping getRelationshipMapping() {
-			return GenericJavaAssociationOverride.this.getOwner().getRelationshipMapping(GenericJavaAssociationOverride.this.getName());
-		}
-
-		public boolean tableNameIsInvalid(String tableName) {
-			return getTypeMapping().tableNameIsInvalid(tableName);
-		}
-
-		/**
-		 * the join column can be on a secondary table
-		 */
-		public boolean tableIsAllowed() {
-			return true;
-		}
-
-		public TextRange getValidationTextRange(CompilationUnit astRoot) {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public TypeMapping getTypeMapping() {
-			return GenericJavaAssociationOverride.this.owner.getTypeMapping();
-		}
-
-		public Table getDbTable(String tableName) {
-			return getTypeMapping().getDbTable(tableName);
-		}
-
-		public Table getDbReferencedColumnTable() {
-			Entity targetEntity = getTargetEntity();
-			return (targetEntity == null) ? null : targetEntity.getPrimaryDbTable();
-		}
-		
-		public boolean isVirtual(BaseJoinColumn joinColumn) {
-			return GenericJavaAssociationOverride.this.defaultJoinColumns.contains(joinColumn);
-		}
-
-		public int joinColumnsSize() {
-			return GenericJavaAssociationOverride.this.joinColumnsSize();
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAttributeOverride.java
deleted file mode 100644
index ac9fc986da..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAttributeOverride.java
+++ /dev/null
@@ -1,192 +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.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.AttributeOverride;
-import org.eclipse.jpt.core.context.ColumnMapping;
-import org.eclipse.jpt.core.context.TypeMapping;
-import org.eclipse.jpt.core.context.java.JavaAttributeOverride;
-import org.eclipse.jpt.core.context.java.JavaColumn;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation;
-import org.eclipse.jpt.core.resource.java.ColumnAnnotation;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericJavaAttributeOverride extends AbstractJavaOverride
-	implements JavaAttributeOverride
-{
-
-	protected final JavaColumn column;
-	
-
-	public GenericJavaAttributeOverride(JavaJpaContextNode parent, AttributeOverride.Owner owner) {
-		super(parent, owner);
-		this.column = getJpaFactory().buildJavaColumn(this, this);
-	}
-	
-	@Override
-	public JavaAttributeOverride setVirtual(boolean virtual) {
-		return (JavaAttributeOverride) super.setVirtual(virtual);
-	}
-	
-	@Override
-	protected AttributeOverrideAnnotation getOverrideResource() {
-		return (AttributeOverrideAnnotation) super.getOverrideResource();
-	}
-	
-	@Override
-	public AttributeOverride.Owner getOwner() {
-		return (AttributeOverride.Owner) super.getOwner();
-	}
-	
-	public ColumnAnnotation getColumnResource() {
-		return this.getOverrideResource().getNonNullColumn();
-	}
-
-	public String getDefaultColumnName() {
-		ColumnMapping columnMapping = getColumnMapping();
-		if (columnMapping == null) {
-			return null;
-		}
-		return columnMapping.getColumn().getName();
-	}
-	
-	public String getDefaultTableName() {
-		ColumnMapping columnMapping = getColumnMapping();
-		if (columnMapping == null) {
-			return null;
-		}
-		String tableName = columnMapping.getColumn().getSpecifiedTable();
-		if (tableName != null) {
-			return tableName;
-		}
-		return getOwner().getTypeMapping().getTableName();
-	}
-	
-	protected ColumnMapping getColumnMapping() {
-		return getOwner().getColumnMapping(getName());
-	}
-
-	//************* IColumn.Owner implementation **************
-	public TypeMapping getTypeMapping() {
-		return this.getOwner().getTypeMapping();
-	}
-	
-	public Table getDbTable(String tableName) {
-		return this.getTypeMapping().getDbTable(tableName);
-	}
-	
-	//************* IAttributeOverride implementation **************
-	
-	public JavaColumn getColumn() {
-		return this.column;
-	}
-
-	//************* JavaOverride implementation **************
-	
-	@Override
-	protected Iterator<String> candidateNames() {
-		return this.getOwner().getTypeMapping().allOverridableAttributeNames();
-	}
-	
-	//************* java resource model -> java context model **************	
-	public void initializeFromResource(AttributeOverrideAnnotation attributeOverrideResource) {
-		super.initializeFromResource(attributeOverrideResource);
-		this.column.initializeFromResource(this.getColumnResource());
-	}
-
-	public void update(AttributeOverrideAnnotation attributeOverrideResource) {
-		super.update(attributeOverrideResource);
-		this.column.update(this.getColumnResource());		
-	}
-
-	@Override
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		result = this.getColumn().javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		return null;
-	}
-	
-	
-	//******************** validation **********************
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-	
-		addColumnMessages(messages, astRoot);
-	}
-	
-	protected void addColumnMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		String table = getColumn().getTable();
-		boolean doContinue = connectionProfileIsActive();
-		
-		if (doContinue && getTypeMapping().tableNameIsInvalid(table)) {
-			if (isVirtual()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_TABLE,
-						new String[] {getName(), table, getColumn().getName()},
-						getColumn(), 
-						getColumn().getTableTextRange(astRoot))
-				);
-			}
-			else {
-				messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.COLUMN_UNRESOLVED_TABLE,
-							new String[] {table, getColumn().getName()}, 
-							getColumn(), 
-							getColumn().getTableTextRange(astRoot))
-					);
-			}
-			doContinue = false;
-		}
-		
-		if (doContinue && ! getColumn().isResolved()) {
-			if (isVirtual()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_NAME,
-						new String[] {getName(), getColumn().getName()}, 
-						getColumn(), 
-						getColumn().getNameTextRange(astRoot))
-				);
-			}
-			else {
-				messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.COLUMN_UNRESOLVED_NAME,
-							new String[] {getColumn().getName()}, 
-							getColumn(), 
-							getColumn().getNameTextRange(astRoot))
-					);
-			}
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaBasicMapping.java
deleted file mode 100644
index 0c90960e2b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaBasicMapping.java
+++ /dev/null
@@ -1,344 +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.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.BasicMapping;
-import org.eclipse.jpt.core.context.ColumnMapping;
-import org.eclipse.jpt.core.context.EnumType;
-import org.eclipse.jpt.core.context.FetchType;
-import org.eclipse.jpt.core.context.Fetchable;
-import org.eclipse.jpt.core.context.Nullable;
-import org.eclipse.jpt.core.context.TemporalType;
-import org.eclipse.jpt.core.context.java.JavaBasicMapping;
-import org.eclipse.jpt.core.context.java.JavaColumn;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.BasicAnnotation;
-import org.eclipse.jpt.core.resource.java.ColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.EnumeratedAnnotation;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.LobAnnotation;
-import org.eclipse.jpt.core.resource.java.TemporalAnnotation;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericJavaBasicMapping extends AbstractJavaAttributeMapping<BasicAnnotation> implements JavaBasicMapping
-{
-	protected FetchType specifiedFetch;
-
-	protected Boolean specifiedOptional;
-	
-	protected EnumType specifiedEnumerated;
-	
-	protected final JavaColumn column;
-	
-	protected boolean lob;
-
-	protected TemporalType temporal;
-
-	public GenericJavaBasicMapping(JavaPersistentAttribute parent) {
-		super(parent);
-		this.column = createJavaColumn();
-	}
-
-	protected JavaColumn createJavaColumn() {
-		return getJpaFactory().buildJavaColumn(this, this);
-	}
-
-	@Override
-	public void initializeFromResource(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		super.initializeFromResource(resourcePersistentAttribute);
-		this.column.initializeFromResource(this.getColumnResource());
-		this.specifiedEnumerated = this.specifiedEnumerated(this.getEnumeratedResource());
-		this.lob = this.lob(resourcePersistentAttribute);
-		this.temporal = this.temporal(this.getTemporalResource());
-	}
-	
-	@Override
-	protected void initialize(BasicAnnotation basicResource) {
-		this.specifiedFetch = this.specifiedFetchType(basicResource);
-		this.specifiedOptional = this.specifiedOptional(basicResource);
-	}
-	
-	protected EnumeratedAnnotation getEnumeratedResource() {
-		return (EnumeratedAnnotation) getResourcePersistentAttribute().getNonNullAnnotation(EnumeratedAnnotation.ANNOTATION_NAME);
-	}
-	
-	protected TemporalAnnotation getTemporalResource() {
-		return (TemporalAnnotation) getResourcePersistentAttribute().getNonNullAnnotation(TemporalAnnotation.ANNOTATION_NAME);
-	}
-
-	public ColumnAnnotation getColumnResource() {
-		return (ColumnAnnotation) getResourcePersistentAttribute().getNonNullAnnotation(ColumnAnnotation.ANNOTATION_NAME);
-	}
-	
-	//************** IJavaAttributeMapping implementation ***************
-	public String getKey() {
-		return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public String getAnnotationName() {
-		return BasicAnnotation.ANNOTATION_NAME;
-	}
-	
-	public Iterator<String> correspondingAnnotationNames() {
-		return new ArrayIterator<String>(
-			JPA.COLUMN,
-			JPA.LOB,
-			JPA.TEMPORAL,
-			JPA.ENUMERATED);
-	}
-	
-	public String getDefaultColumnName() {
-		return getAttributeName();
-	}
-
-	public String getDefaultTableName() {
-		return getTypeMapping().getTableName();
-	}
-	
-	//************** IBasicMapping implementation ***************
-
-	public JavaColumn getColumn() {
-		return this.column;
-	}
-	
-	public FetchType getFetch() {
-		return (this.getSpecifiedFetch() == null) ? this.getDefaultFetch() : this.getSpecifiedFetch();
-	}
-
-	public FetchType getDefaultFetch() {
-		return BasicMapping.DEFAULT_FETCH_TYPE;
-	}
-		
-	public FetchType getSpecifiedFetch() {
-		return this.specifiedFetch;
-	}
-	
-	public void setSpecifiedFetch(FetchType newSpecifiedFetch) {
-		FetchType oldFetch = this.specifiedFetch;
-		this.specifiedFetch = newSpecifiedFetch;
-		this.getMappingResource().setFetch(FetchType.toJavaResourceModel(newSpecifiedFetch));
-		firePropertyChanged(Fetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch);
-	}
-	
-	/**
-	 * 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 setSpecifiedFetch_(FetchType newSpecifiedFetch) {
-		FetchType oldFetch = this.specifiedFetch;
-		this.specifiedFetch = newSpecifiedFetch;
-		firePropertyChanged(Fetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch);
-	}
-
-	public Boolean getOptional() {
-		return (this.getSpecifiedOptional() == null) ? this.getDefaultOptional() : this.getSpecifiedOptional();
-	}
-	
-	public Boolean getDefaultOptional() {
-		return Nullable.DEFAULT_OPTIONAL;
-	}
-	
-	public Boolean getSpecifiedOptional() {
-		return this.specifiedOptional;
-	}
-	
-	public void setSpecifiedOptional(Boolean newSpecifiedOptional) {
-		Boolean oldOptional = this.specifiedOptional;
-		this.specifiedOptional = newSpecifiedOptional;
-		this.getMappingResource().setOptional(newSpecifiedOptional);
-		firePropertyChanged(Nullable.SPECIFIED_OPTIONAL_PROPERTY, oldOptional, newSpecifiedOptional);
-	}
-
-	protected void setSpecifiedOptional_(Boolean newSpecifiedOptional) {
-		Boolean oldOptional = this.specifiedOptional;
-		this.specifiedOptional = newSpecifiedOptional;
-		firePropertyChanged(Nullable.SPECIFIED_OPTIONAL_PROPERTY, oldOptional, newSpecifiedOptional);
-	}
-
-	public boolean isLob() {
-		return this.lob;
-	}
-
-	public void setLob(boolean newLob) {
-		boolean oldLob = this.lob;
-		this.lob = newLob;
-		if (newLob) {
-			if (lobResource(getResourcePersistentAttribute()) == null) {
-				getResourcePersistentAttribute().addAnnotation(LobAnnotation.ANNOTATION_NAME);
-			}
-		}
-		else {
-			if (lobResource(getResourcePersistentAttribute()) != null) {
-				getResourcePersistentAttribute().removeAnnotation(LobAnnotation.ANNOTATION_NAME);
-			}
-		}
-		firePropertyChanged(BasicMapping.LOB_PROPERTY, oldLob, newLob);
-	}
-
-	public TemporalType getTemporal() {
-		return this.temporal;
-	}
-
-	public void setTemporal(TemporalType newTemporal) {
-		TemporalType oldTemporal = this.temporal;
-		this.temporal = newTemporal;
-		this.getTemporalResource().setValue(TemporalType.toJavaResourceModel(newTemporal));
-		firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal);
-	}
-	
-	/**
-	 * 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 setTemporal_(TemporalType newTemporal) {
-		TemporalType oldTemporal = this.temporal;
-		this.temporal = newTemporal;
-		firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal);
-	}
-	
-	public EnumType getEnumerated() {
-		return (this.getSpecifiedEnumerated() == null) ? this.getDefaultEnumerated() : this.getSpecifiedEnumerated();
-	}
-	
-	public EnumType getDefaultEnumerated() {
-		return BasicMapping.DEFAULT_ENUMERATED;
-	}
-	
-	public EnumType getSpecifiedEnumerated() {
-		return this.specifiedEnumerated;
-	}
-	
-	public void setSpecifiedEnumerated(EnumType newSpecifiedEnumerated) {
-		EnumType oldEnumerated = this.specifiedEnumerated;
-		this.specifiedEnumerated = newSpecifiedEnumerated;
-		this.getEnumeratedResource().setValue(EnumType.toJavaResourceModel(newSpecifiedEnumerated));
-		firePropertyChanged(BasicMapping.SPECIFIED_ENUMERATED_PROPERTY, oldEnumerated, newSpecifiedEnumerated);
-	}
-	
-	/**
-	 * 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 setSpecifiedEnumerated_(EnumType newSpecifiedEnumerated) {
-		EnumType oldEnumerated = this.specifiedEnumerated;
-		this.specifiedEnumerated = newSpecifiedEnumerated;
-		firePropertyChanged(BasicMapping.SPECIFIED_ENUMERATED_PROPERTY, oldEnumerated, newSpecifiedEnumerated);
-	}
-
-	@Override
-	public void update(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		super.update(resourcePersistentAttribute);
-		this.column.update(this.getColumnResource());
-		this.setSpecifiedEnumerated_(this.specifiedEnumerated(this.getEnumeratedResource()));
-		this.setLob(this.lob(resourcePersistentAttribute));
-		this.setTemporal_(this.temporal(this.getTemporalResource()));
-	}
-	
-	@Override
-	protected void update(BasicAnnotation basicResource) {
-		this.setSpecifiedFetch_(this.specifiedFetchType(basicResource));
-		this.setSpecifiedOptional_(this.specifiedOptional(basicResource));
-	}
-	
-	protected FetchType specifiedFetchType(BasicAnnotation basic) {
-		return FetchType.fromJavaResourceModel(basic.getFetch());
-	}
-	
-	protected Boolean specifiedOptional(BasicAnnotation basic) {
-		return basic.getOptional();
-	}
-	
-	protected EnumType specifiedEnumerated(EnumeratedAnnotation enumerated) {
-		return EnumType.fromJavaResourceModel(enumerated.getValue());
-	}
-	
-	protected boolean lob(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		return lobResource(resourcePersistentAttribute) != null;
-	}
-	
-	protected LobAnnotation lobResource(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		return (LobAnnotation) resourcePersistentAttribute.getAnnotation(LobAnnotation.ANNOTATION_NAME);
-	}
-	
-	protected TemporalType temporal(TemporalAnnotation temporal) {
-		return TemporalType.fromJavaResourceModel(temporal.getValue());
-	}
-
-
-	@Override
-	public boolean isOverridableAttributeMapping() {
-		return true;
-	}
-
-	@Override
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		result = this.getColumn().javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		return null;
-	}
-	
-	// ************** Validation *************************************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages ,astRoot);
-		
-		addColumnMessages(messages, astRoot);
-	}
-	
-	protected void addColumnMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		JavaColumn column = this.getColumn();
-		String table = column.getTable();
-		boolean doContinue = entityOwned() && column.connectionProfileIsActive();
-		
-		if (doContinue && this.getTypeMapping().tableNameIsInvalid(table)) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.COLUMN_UNRESOLVED_TABLE,
-						new String[] {table, column.getName()}, 
-						column, column.getTableTextRange(astRoot))
-				);
-			doContinue = false;
-		}
-		
-		if (doContinue && ! column.isResolved()) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.COLUMN_UNRESOLVED_NAME,
-						new String[] {column.getName()}, 
-						column, column.getNameTextRange(astRoot))
-				);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaColumn.java
deleted file mode 100644
index 031a7717bc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaColumn.java
+++ /dev/null
@@ -1,154 +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.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.Column;
-import org.eclipse.jpt.core.context.java.JavaColumn;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.resource.java.ColumnAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-
-public class GenericJavaColumn extends AbstractJavaBaseColumn<ColumnAnnotation> implements JavaColumn
-{
-
-	protected Integer specifiedLength;
-
-	protected Integer specifiedPrecision;
-
-	protected Integer specifiedScale;
-	
-	public GenericJavaColumn(JavaJpaContextNode parent, JavaColumn.Owner owner) {
-		super(parent, owner);
-	}
-	
-	@Override
-	public void initializeFromResource(ColumnAnnotation column) {
-		super.initializeFromResource(column);
-		this.specifiedLength = this.specifiedLength(column);
-		this.specifiedPrecision = this.specifiedPrecision(column);
-		this.specifiedScale = this.specifiedScale(column);
-	}
-	
-	@Override
-	public JavaColumn.Owner getOwner() {
-		return (JavaColumn.Owner) super.getOwner();
-	}
-
-	@Override
-	protected ColumnAnnotation getColumnResource() {
-		return this.getOwner().getColumnResource();
-	}
-	
-	public Integer getLength() {
-		return (this.getSpecifiedLength() == null) ? getDefaultLength() : this.getSpecifiedLength();
-	}
-
-	public Integer getDefaultLength() {
-		return Column.DEFAULT_LENGTH;
-	}
-	
-	public Integer getSpecifiedLength() {
-		return this.specifiedLength;
-	}
-
-	public void setSpecifiedLength(Integer newSpecifiedLength) {
-		Integer oldSpecifiedLength = this.specifiedLength;
-		this.specifiedLength = newSpecifiedLength;
-		getColumnResource().setLength(newSpecifiedLength);
-		firePropertyChanged(SPECIFIED_LENGTH_PROPERTY, oldSpecifiedLength, newSpecifiedLength);
-	}
-	
-	protected void setSpecifiedLength_(Integer newSpecifiedLength) {
-		Integer oldSpecifiedLength = this.specifiedLength;
-		this.specifiedLength = newSpecifiedLength;
-		firePropertyChanged(SPECIFIED_LENGTH_PROPERTY, oldSpecifiedLength, newSpecifiedLength);
-	}
-
-	public Integer getPrecision() {
-		return (this.getSpecifiedPrecision() == null) ? getDefaultPrecision() : this.getSpecifiedPrecision();
-	}
-
-	public Integer getDefaultPrecision() {
-		return Column.DEFAULT_PRECISION;
-	}
-	
-	public Integer getSpecifiedPrecision() {
-		return this.specifiedPrecision;
-	}
-
-	public void setSpecifiedPrecision(Integer newSpecifiedPrecision) {
-		Integer oldSpecifiedPrecision = this.specifiedPrecision;
-		this.specifiedPrecision = newSpecifiedPrecision;
-		getColumnResource().setPrecision(newSpecifiedPrecision);
-		firePropertyChanged(SPECIFIED_PRECISION_PROPERTY, oldSpecifiedPrecision, newSpecifiedPrecision);
-	}
-	
-	protected void setSpecifiedPrecision_(Integer newSpecifiedPrecision) {
-		Integer oldSpecifiedPrecision = this.specifiedPrecision;
-		this.specifiedPrecision = newSpecifiedPrecision;
-		firePropertyChanged(SPECIFIED_PRECISION_PROPERTY, oldSpecifiedPrecision, newSpecifiedPrecision);
-	}
-
-	public Integer getScale() {
-		return (this.getSpecifiedScale() == null) ? getDefaultScale() : this.getSpecifiedScale();
-	}
-
-	public Integer getDefaultScale() {
-		return Column.DEFAULT_SCALE;
-	}
-	
-	public Integer getSpecifiedScale() {
-		return this.specifiedScale;
-	}
-
-	public void setSpecifiedScale(Integer newSpecifiedScale) {
-		Integer oldSpecifiedScale = this.specifiedScale;
-		this.specifiedScale = newSpecifiedScale;
-		getColumnResource().setScale(newSpecifiedScale);
-		firePropertyChanged(SPECIFIED_SCALE_PROPERTY, oldSpecifiedScale, newSpecifiedScale);
-	}
-	
-	protected void setSpecifiedScale_(Integer newSpecifiedScale) {
-		Integer oldSpecifiedScale = this.specifiedScale;
-		this.specifiedScale = newSpecifiedScale;
-		firePropertyChanged(SPECIFIED_SCALE_PROPERTY, oldSpecifiedScale, newSpecifiedScale);
-	}
-
-	@Override
-	public boolean tableIsAllowed() {
-		return true;
-	}
-	
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = getColumnResource().getTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getOwner().getValidationTextRange(astRoot);	
-	}
-	
-	@Override
-	public void update(ColumnAnnotation column) {
-		super.update(column);
-		this.setSpecifiedLength_(this.specifiedLength(column));
-		this.setSpecifiedPrecision_(this.specifiedPrecision(column));
-		this.setSpecifiedScale_(this.specifiedScale(column));
-	}
-	
-	protected Integer specifiedLength(ColumnAnnotation column) {
-		return column.getLength();
-	}
-	
-	protected Integer specifiedPrecision(ColumnAnnotation column) {
-		return column.getPrecision();
-	}
-	
-	protected Integer specifiedScale(ColumnAnnotation column) {
-		return column.getScale();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaDiscriminatorColumn.java
deleted file mode 100644
index e983bd18f5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaDiscriminatorColumn.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.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.DiscriminatorColumn;
-import org.eclipse.jpt.core.context.DiscriminatorType;
-import org.eclipse.jpt.core.context.java.JavaDiscriminatorColumn;
-import org.eclipse.jpt.core.context.java.JavaEntity;
-import org.eclipse.jpt.core.context.java.JavaNamedColumn;
-import org.eclipse.jpt.core.resource.java.DiscriminatorColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-
-public class GenericJavaDiscriminatorColumn extends AbstractJavaNamedColumn<DiscriminatorColumnAnnotation>
-	implements JavaDiscriminatorColumn
-{
-
-	protected DiscriminatorType specifiedDiscriminatorType;
-
-	protected Integer specifiedLength;
-	
-	protected JavaResourcePersistentMember persistenceResource;
-	
-	public GenericJavaDiscriminatorColumn(JavaEntity parent, JavaNamedColumn.Owner owner) {
-		super(parent, owner);
-	}
-
-	public void initializeFromResource(JavaResourcePersistentMember persistentResource) {
-		this.persistenceResource = persistentResource;
-		this.initializeFromResource(this.getColumnResource());
-	}
-	
-	@Override
-	public void initializeFromResource(DiscriminatorColumnAnnotation column) {
-		super.initializeFromResource(column);
-		this.specifiedDiscriminatorType = this.discriminatorType(column);
-		this.specifiedLength = this.length(column);
-	}
-	
-	protected JavaEntity getJavaEntity() {
-		return (JavaEntity) super.getParent();
-	}
-
-	@Override
-	protected DiscriminatorColumnAnnotation getColumnResource() {
-		return (DiscriminatorColumnAnnotation) this.persistenceResource.getNonNullAnnotation(DiscriminatorColumnAnnotation.ANNOTATION_NAME);
-	}
-	
-	public DiscriminatorType getDiscriminatorType() {
-		return (this.getSpecifiedDiscriminatorType() == null) ? this.getDefaultDiscriminatorType() : this.getSpecifiedDiscriminatorType();
-	}
-
-	public DiscriminatorType getDefaultDiscriminatorType() {
-		return DiscriminatorColumn.DEFAULT_DISCRIMINATOR_TYPE;
-	}
-		
-	public DiscriminatorType getSpecifiedDiscriminatorType() {
-		return this.specifiedDiscriminatorType;
-	}
-	
-	public void setSpecifiedDiscriminatorType(DiscriminatorType newSpecifiedDiscriminatorType) {
-		DiscriminatorType oldDiscriminatorType = this.specifiedDiscriminatorType;
-		this.specifiedDiscriminatorType = newSpecifiedDiscriminatorType;
-		getColumnResource().setDiscriminatorType(DiscriminatorType.toJavaResourceModel(newSpecifiedDiscriminatorType));
-		firePropertyChanged(DiscriminatorColumn.SPECIFIED_DISCRIMINATOR_TYPE_PROPERTY, oldDiscriminatorType, newSpecifiedDiscriminatorType);
-	}
-	
-	/**
-	 * 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 setSpecifiedDiscriminatorType_(DiscriminatorType newSpecifiedDiscriminatorType) {
-		DiscriminatorType oldDiscriminatorType = this.specifiedDiscriminatorType;
-		this.specifiedDiscriminatorType = newSpecifiedDiscriminatorType;
-		firePropertyChanged(DiscriminatorColumn.SPECIFIED_DISCRIMINATOR_TYPE_PROPERTY, oldDiscriminatorType, newSpecifiedDiscriminatorType);
-	}
-		
-	public Integer getLength() {
-		return (this.getSpecifiedLength() == null) ? this.getDefaultLength() : this.getSpecifiedLength();
-	}
-
-	public Integer getDefaultLength() {
-		return DiscriminatorColumn.DEFAULT_LENGTH;
-	}
-
-	public Integer getSpecifiedLength() {
-		return this.specifiedLength;
-	}
-
-	public void setSpecifiedLength(Integer newSpecifiedLength) {
-		Integer oldSpecifiedLength = this.specifiedLength;
-		this.specifiedLength = newSpecifiedLength;
-		getColumnResource().setLength(newSpecifiedLength);
-		firePropertyChanged(DiscriminatorColumn.SPECIFIED_LENGTH_PROPERTY, oldSpecifiedLength, newSpecifiedLength);
-	}
-
-	/**
-	 * 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 setSpecifiedLength_(Integer newSpecifiedLength) {
-		Integer oldSpecifiedLength = this.specifiedLength;
-		this.specifiedLength = newSpecifiedLength;
-		firePropertyChanged(DiscriminatorColumn.SPECIFIED_LENGTH_PROPERTY, oldSpecifiedLength, newSpecifiedLength);
-	}
-
-	@Override
-	protected String getTableName() {
-		return getJavaEntity().getTableName();
-	}
-	
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = getColumnResource().getTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getOwner().getValidationTextRange(astRoot);	
-	}
-
-	
-	// ********** java annotations -> persistence model **********
-	
-	public void update(JavaResourcePersistentMember persistentResource) {
-		this.persistenceResource = persistentResource;
-		this.update(this.getColumnResource());
-	}
-	
-	@Override
-	public void update(DiscriminatorColumnAnnotation discriminatorColumn) {
-		super.update(discriminatorColumn);
-		this.setSpecifiedDiscriminatorType_(this.discriminatorType(discriminatorColumn));
-		this.setSpecifiedLength_(this.length(discriminatorColumn));
-	}
-	
-	protected DiscriminatorType discriminatorType(DiscriminatorColumnAnnotation discriminatorColumn) {
-		return DiscriminatorType.fromJavaResourceModel(discriminatorColumn.getDiscriminatorType());
-	}
-	
-	protected Integer length(DiscriminatorColumnAnnotation discriminatorColumn) {
-		return discriminatorColumn.getLength();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddable.java
deleted file mode 100644
index 21d2bcab97..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddable.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.core.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaEmbeddable;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.resource.java.EmbeddableAnnotation;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-
-
-public class GenericJavaEmbeddable extends AbstractJavaTypeMapping implements JavaEmbeddable
-{
-	public GenericJavaEmbeddable(JavaPersistentType parent) {
-		super(parent);
-	}
-
-	public String getKey() {
-		return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY;
-	}
-
-	public String getAnnotationName() {
-		return EmbeddableAnnotation.ANNOTATION_NAME;
-	}
-
-	public Iterator<String> correspondingAnnotationNames() {
-		return EmptyIterator.instance();
-	}
-	
-	public boolean isMapped() {
-		return true;
-	}
-	
-	@Override
-	public boolean attributeMappingKeyAllowed(String attributeMappingKey) {
-		return attributeMappingKey == MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY || attributeMappingKey == MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddedIdMapping.java
deleted file mode 100644
index 4ae4b5648f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddedIdMapping.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.core.internal.context.java;
-
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaEmbeddedIdMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.resource.java.EmbeddedIdAnnotation;
-
-
-public class GenericJavaEmbeddedIdMapping extends AbstractJavaBaseEmbeddedMapping<EmbeddedIdAnnotation>
-	implements JavaEmbeddedIdMapping
-{
-
-	public GenericJavaEmbeddedIdMapping(JavaPersistentAttribute parent) {
-		super(parent);
-	}
-
-	//****************** IJavaAttributeMapping implemenation *******************
-
-	public String getKey() {
-		return MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return EmbeddedIdAnnotation.ANNOTATION_NAME;
-	}
-
-	@Override
-	public boolean isIdMapping() {
-		return true;
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddedMapping.java
deleted file mode 100644
index b0fe9c987b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddedMapping.java
+++ /dev/null
@@ -1,33 +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.core.internal.context.java;
-
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaEmbeddedMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.resource.java.EmbeddedAnnotation;
-
-
-public class GenericJavaEmbeddedMapping extends AbstractJavaBaseEmbeddedMapping<EmbeddedAnnotation> implements JavaEmbeddedMapping
-{
-	public GenericJavaEmbeddedMapping(JavaPersistentAttribute parent) {
-		super(parent);
-	}
-	
-	//****************** IJavaAttributeMapping implemenation *******************
-
-	public String getKey() {
-		return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return EmbeddedAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEntity.java
deleted file mode 100644
index 9faaa496ef..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEntity.java
+++ /dev/null
@@ -1,1963 +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.core.internal.context.java;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.AssociationOverride;
-import org.eclipse.jpt.core.context.AttributeOverride;
-import org.eclipse.jpt.core.context.BaseJoinColumn;
-import org.eclipse.jpt.core.context.BaseOverride;
-import org.eclipse.jpt.core.context.ColumnMapping;
-import org.eclipse.jpt.core.context.DiscriminatorColumn;
-import org.eclipse.jpt.core.context.DiscriminatorType;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.Generator;
-import org.eclipse.jpt.core.context.IdClass;
-import org.eclipse.jpt.core.context.InheritanceType;
-import org.eclipse.jpt.core.context.NamedNativeQuery;
-import org.eclipse.jpt.core.context.NamedQuery;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.context.PersistentType;
-import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.Query;
-import org.eclipse.jpt.core.context.QueryHolder;
-import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.SecondaryTable;
-import org.eclipse.jpt.core.context.Table;
-import org.eclipse.jpt.core.context.TypeMapping;
-import org.eclipse.jpt.core.context.java.JavaAssociationOverride;
-import org.eclipse.jpt.core.context.java.JavaAttributeOverride;
-import org.eclipse.jpt.core.context.java.JavaBaseJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaDiscriminatorColumn;
-import org.eclipse.jpt.core.context.java.JavaEntity;
-import org.eclipse.jpt.core.context.java.JavaGenerator;
-import org.eclipse.jpt.core.context.java.JavaNamedColumn;
-import org.eclipse.jpt.core.context.java.JavaNamedNativeQuery;
-import org.eclipse.jpt.core.context.java.JavaNamedQuery;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.context.java.JavaPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaQuery;
-import org.eclipse.jpt.core.context.java.JavaSecondaryTable;
-import org.eclipse.jpt.core.context.java.JavaSequenceGenerator;
-import org.eclipse.jpt.core.context.java.JavaTable;
-import org.eclipse.jpt.core.context.java.JavaTableGenerator;
-import org.eclipse.jpt.core.internal.resource.java.NullAssociationOverride;
-import org.eclipse.jpt.core.internal.resource.java.NullPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation;
-import org.eclipse.jpt.core.resource.java.AssociationOverridesAnnotation;
-import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation;
-import org.eclipse.jpt.core.resource.java.AttributeOverridesAnnotation;
-import org.eclipse.jpt.core.resource.java.DiscriminatorValueAnnotation;
-import org.eclipse.jpt.core.resource.java.EntityAnnotation;
-import org.eclipse.jpt.core.resource.java.IdClassAnnotation;
-import org.eclipse.jpt.core.resource.java.InheritanceAnnotation;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.resource.java.NamedNativeQueriesAnnotation;
-import org.eclipse.jpt.core.resource.java.NamedNativeQueryAnnotation;
-import org.eclipse.jpt.core.resource.java.NamedQueriesAnnotation;
-import org.eclipse.jpt.core.resource.java.NamedQueryAnnotation;
-import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumns;
-import org.eclipse.jpt.core.resource.java.SecondaryTableAnnotation;
-import org.eclipse.jpt.core.resource.java.SecondaryTablesAnnotation;
-import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation;
-import org.eclipse.jpt.core.resource.java.TableGeneratorAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.CompositeIterator;
-import org.eclipse.jpt.utility.internal.iterators.CompositeListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-import org.eclipse.jpt.utility.internal.iterators.SingleElementIterator;
-import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEntity
-{
-	protected EntityAnnotation entityResource;
-	
-	protected String specifiedName;
-
-	protected String defaultName;
-
-	protected final JavaTable table;
-
-	protected final List<JavaSecondaryTable> specifiedSecondaryTables;
-
-	protected final List<JavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns;
-
-	protected JavaPrimaryKeyJoinColumn defaultPrimaryKeyJoinColumn;
-
-	protected InheritanceType specifiedInheritanceStrategy;
-	
-	protected InheritanceType defaultInheritanceStrategy;
-
-	protected String defaultDiscriminatorValue;
-
-	protected boolean discriminatorValueAllowed;
-	
-	protected String specifiedDiscriminatorValue;
-	
-	protected final JavaDiscriminatorColumn discriminatorColumn;
-
-	protected JavaSequenceGenerator sequenceGenerator;
-
-	protected JavaTableGenerator tableGenerator;
-
-	protected final List<JavaAttributeOverride> specifiedAttributeOverrides;
-
-	protected final List<JavaAttributeOverride> virtualAttributeOverrides;
-
-	protected final List<JavaAssociationOverride> specifiedAssociationOverrides;
-
-	protected final List<JavaAssociationOverride> virtualAssociationOverrides;
-
-	protected final List<JavaNamedQuery> namedQueries;
-
-	protected final List<JavaNamedNativeQuery> namedNativeQueries;
-
-	protected String idClass;
-
-	
-	public GenericJavaEntity(JavaPersistentType parent) {
-		super(parent);
-		this.table = getJpaFactory().buildJavaTable(this);
-		this.discriminatorColumn = buildJavaDiscriminatorColumn();
-		this.specifiedSecondaryTables = new ArrayList<JavaSecondaryTable>();
-		this.specifiedPrimaryKeyJoinColumns = new ArrayList<JavaPrimaryKeyJoinColumn>();
-		this.specifiedAttributeOverrides = new ArrayList<JavaAttributeOverride>();
-		this.virtualAttributeOverrides = new ArrayList<JavaAttributeOverride>();
-		this.namedQueries = new ArrayList<JavaNamedQuery>();
-		this.namedNativeQueries = new ArrayList<JavaNamedNativeQuery>();
-		this.specifiedAssociationOverrides = new ArrayList<JavaAssociationOverride>();
-		this.virtualAssociationOverrides = new ArrayList<JavaAssociationOverride>();
-	}
-	
-	protected JavaBaseJoinColumn.Owner createPrimaryKeyJoinColumnOwner() {
-		return new PrimaryKeyJoinColumnOwner();
-	}
-	
-	protected JavaDiscriminatorColumn buildJavaDiscriminatorColumn() {
-		return getJpaFactory().buildJavaDiscriminatorColumn(this, buildDiscriminatorColumnOwner());
-	}
-	
-	protected JavaNamedColumn.Owner buildDiscriminatorColumnOwner() {
-		return new JavaNamedColumn.Owner(){
-			public org.eclipse.jpt.db.Table getDbTable(String tableName) {
-				return GenericJavaEntity.this.getDbTable(tableName);
-			}
-
-			public TextRange getValidationTextRange(CompilationUnit astRoot) {
-				return GenericJavaEntity.this.getValidationTextRange(astRoot);
-			}
-
-			public TypeMapping getTypeMapping() {
-				return GenericJavaEntity.this;
-			}
-			
-			public String getDefaultColumnName() {
-				return DiscriminatorColumn.DEFAULT_NAME;
-			}
-		};
-	}
-
-	@Override
-	public void initializeFromResource(JavaResourcePersistentType resourcePersistentType) {
-		super.initializeFromResource(resourcePersistentType);
-		this.entityResource = (EntityAnnotation) resourcePersistentType.getMappingAnnotation(EntityAnnotation.ANNOTATION_NAME);
-		
-		this.specifiedName = this.specifiedName(this.entityResource);
-		this.defaultName = this.defaultName(resourcePersistentType);
-		this.defaultInheritanceStrategy = this.defaultInheritanceStrategy();
-		this.specifiedInheritanceStrategy = this.specifiedInheritanceStrategy(getInheritanceResource());
-		this.specifiedDiscriminatorValue = this.getDiscriminatorValueResource().getValue();
-		this.defaultDiscriminatorValue = this.javaDefaultDiscriminatorValue();
-		this.discriminatorValueAllowed = this.discriminatorValueIsAllowed(resourcePersistentType);
-		this.discriminatorColumn.initializeFromResource(resourcePersistentType);
-		this.table.initializeFromResource(resourcePersistentType);
-		this.initializeSecondaryTables(resourcePersistentType);
-		this.initializeTableGenerator(resourcePersistentType);
-		this.initializeSequenceGenerator(resourcePersistentType);
-		this.initializePrimaryKeyJoinColumns(resourcePersistentType);
-		this.initializeDefaultPrimaryKeyJoinColumn(resourcePersistentType);
-		this.initializeSpecifiedAttributeOverrides(resourcePersistentType);
-		this.initializeVirtualAttributeOverrides(resourcePersistentType);
-		this.initializeSpecifiedAssociationOverrides(resourcePersistentType);
-		this.initializeDefaultAssociationOverrides(resourcePersistentType);
-		this.initializeNamedQueries(resourcePersistentType);
-		this.initializeNamedNativeQueries(resourcePersistentType);
-		this.initializeIdClass(resourcePersistentType);
-		this.updatePersistenceUnitGeneratorsAndQueries();
-	}
-	
-	protected void initializeSecondaryTables(JavaResourcePersistentType resourcePersistentType) {
-		ListIterator<JavaResourceNode> annotations = resourcePersistentType.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME);
-		
-		while(annotations.hasNext()) {
-			this.specifiedSecondaryTables.add(buildSecondaryTable((SecondaryTableAnnotation) annotations.next()));
-		}
-	}
-	
-	protected void initializeTableGenerator(JavaResourcePersistentType resourcePersistentType) {
-		TableGeneratorAnnotation tableGeneratorResource = tableGenerator(resourcePersistentType);
-		if (tableGeneratorResource != null) {
-			this.tableGenerator = buildTableGenerator(tableGeneratorResource);
-		}
-	}
-	
-	protected void initializeSequenceGenerator(JavaResourcePersistentType resourcePersistentType) {
-		SequenceGeneratorAnnotation sequenceGeneratorResource = sequenceGenerator(resourcePersistentType);
-		if (sequenceGeneratorResource != null) {
-			this.sequenceGenerator = buildSequenceGenerator(sequenceGeneratorResource);
-		}
-	}
-	
-	protected void initializePrimaryKeyJoinColumns(JavaResourcePersistentType resourcePersistentType) {
-		ListIterator<JavaResourceNode> annotations = resourcePersistentType.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumns.ANNOTATION_NAME);
-		
-		while(annotations.hasNext()) {
-			this.specifiedPrimaryKeyJoinColumns.add(buildPrimaryKeyJoinColumn((PrimaryKeyJoinColumnAnnotation) annotations.next()));
-		}
-	}
-	
-	protected boolean shouldBuildDefaultPrimaryKeyJoinColumn() {
-		return !containsSpecifiedPrimaryKeyJoinColumns();
-	}
-
-	protected void initializeDefaultPrimaryKeyJoinColumn(JavaResourcePersistentType persistentTypeResource) {
-		if (!shouldBuildDefaultPrimaryKeyJoinColumn()) {
-			return;
-		}
-		this.defaultPrimaryKeyJoinColumn = buildPrimaryKeyJoinColumn(new NullPrimaryKeyJoinColumn(persistentTypeResource));
-	}	
-
-	protected void initializeSpecifiedAttributeOverrides(JavaResourcePersistentType persistentTypeResource) {
-		ListIterator<JavaResourceNode> annotations = persistentTypeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME);
-		
-		while(annotations.hasNext()) {
-			this.specifiedAttributeOverrides.add(buildAttributeOverride((AttributeOverrideAnnotation) annotations.next()));
-		}
-	}
-	
-	protected void initializeVirtualAttributeOverrides(JavaResourcePersistentType persistentTypeResource) {
-		for (PersistentAttribute persistentAttribute : CollectionTools.iterable(allOverridableAttributes())) {
-			JavaAttributeOverride attributeOverride = getAttributeOverrideNamed(persistentAttribute.getName());
-			if (attributeOverride == null) {
-				this.virtualAttributeOverrides.add(buildVirtualAttributeOverride(persistentTypeResource, persistentAttribute));
-			}
-		}
-	}
-	
-	protected void initializeSpecifiedAssociationOverrides(JavaResourcePersistentType resourcePersistentType) {
-		ListIterator<JavaResourceNode> annotations = resourcePersistentType.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME);
-		
-		while(annotations.hasNext()) {
-			this.specifiedAssociationOverrides.add(buildAssociationOverride((AssociationOverrideAnnotation) annotations.next()));
-		}
-	}
-	
-	protected void initializeDefaultAssociationOverrides(JavaResourcePersistentType resourcePersistentType) {
-		for (Iterator<String> i = allOverridableAssociationNames(); i.hasNext(); ) {
-			String associationName = i.next();
-			JavaAssociationOverride associationOverride = getAssociationOverrideNamed(associationName);
-			if (associationOverride == null) {
-				this.virtualAssociationOverrides.add(buildAssociationOverride(new NullAssociationOverride(resourcePersistentType, associationName)));
-			}
-		}
-	}
-
-	protected void initializeNamedQueries(JavaResourcePersistentType resourcePersistentType) {
-		ListIterator<JavaResourceNode> annotations = resourcePersistentType.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME);
-		
-		while(annotations.hasNext()) {
-			this.namedQueries.add(buildNamedQuery((NamedQueryAnnotation) annotations.next()));
-		}
-	}
-	
-	protected void initializeNamedNativeQueries(JavaResourcePersistentType resourcePersistentType) {
-		ListIterator<JavaResourceNode> annotations = resourcePersistentType.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME);
-		
-		while(annotations.hasNext()) {
-			this.namedNativeQueries.add(buildNamedNativeQuery((NamedNativeQueryAnnotation) annotations.next()));
-		}
-	}
-
-	//query for the inheritance resource every time on setters.
-	//call one setter and the inheritanceResource could change. 
-	//You could call more than one setter before this object has received any notification
-	//from the java resource model
-	protected InheritanceAnnotation getInheritanceResource() {
-		return (InheritanceAnnotation) this.javaResourcePersistentType.getNonNullAnnotation(InheritanceAnnotation.ANNOTATION_NAME);
-	}
-	
-	protected DiscriminatorValueAnnotation getDiscriminatorValueResource() {
-		return (DiscriminatorValueAnnotation) this.javaResourcePersistentType.getNonNullAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME);
-	}
-
-	protected void initializeIdClass(JavaResourcePersistentType typeResource) {
-		IdClassAnnotation idClassResource = (IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME);
-		if (idClassResource != null) {
-			this.idClass = idClassResource.getValue();
-		}
-	}
-	
-	//****************** ITypeMapping implemenation *******************
-	
-	public String getKey() {
-		return MappingKeys.ENTITY_TYPE_MAPPING_KEY;
-	}
-
-	public boolean isMapped() {
-		return true;
-	}
-
-	@Override
-	public String getTableName() {
-		return getTable().getName();
-	}
-
-	@Override
-	public org.eclipse.jpt.db.Table getPrimaryDbTable() {
-		return getTable().getDbTable();
-	}
-
-	@Override
-	public org.eclipse.jpt.db.Table getDbTable(String tableName) {
-		for (Iterator<Table> stream = this.associatedTablesIncludingInherited(); stream.hasNext();) {
-			org.eclipse.jpt.db.Table dbTable = stream.next().getDbTable();
-			if (dbTable != null && dbTable.matchesShortJavaClassName(tableName)) {
-				return dbTable;
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public Schema getDbSchema() {
-		return getTable().getDbSchema();
-	}
-
-
-	//****************** IJavaTypeMapping implemenation *******************
-
-	public String getAnnotationName() {
-		return EntityAnnotation.ANNOTATION_NAME;
-	}
-
-	public Iterator<String> correspondingAnnotationNames() {
-		return new ArrayIterator<String>(
-			JPA.TABLE,
-			JPA.SECONDARY_TABLE,
-			JPA.SECONDARY_TABLES,
-			JPA.PRIMARY_KEY_JOIN_COLUMN,
-			JPA.PRIMARY_KEY_JOIN_COLUMNS,
-			JPA.ID_CLASS,
-			JPA.INHERITANCE,
-			JPA.DISCRIMINATOR_VALUE,
-			JPA.DISCRIMINATOR_COLUMN,
-			JPA.SEQUENCE_GENERATOR,
-			JPA.TABLE_GENERATOR,
-			JPA.NAMED_QUERY,
-			JPA.NAMED_QUERIES,
-			JPA.NAMED_NATIVE_QUERY,
-			JPA.NAMED_NATIVE_QUERIES,
-			JPA.SQL_RESULT_SET_MAPPING,
-			JPA.EXCLUDE_DEFAULT_LISTENERS,
-			JPA.EXCLUDE_SUPERCLASS_LISTENERS,
-			JPA.ENTITY_LISTENERS,
-			JPA.PRE_PERSIST,
-			JPA.POST_PERSIST,
-			JPA.PRE_REMOVE,
-			JPA.POST_REMOVE,
-			JPA.PRE_UPDATE,
-			JPA.POST_UPDATE,
-			JPA.POST_LOAD,
-			JPA.ATTRIBUTE_OVERRIDE,
-			JPA.ATTRIBUTE_OVERRIDES,
-			JPA.ASSOCIATION_OVERRIDE,
-			JPA.ASSOCIATION_OVERRIDES);
-	}
-
-	//****************** IEntity implemenation *******************
-	
-	public String getName() {
-		return (this.getSpecifiedName() == null) ? this.getDefaultName() : this.getSpecifiedName();
-	}
-
-	public String getSpecifiedName() {
-		return this.specifiedName;
-	}
-
-	public void setSpecifiedName(String newSpecifiedName) {
-		String oldSpecifiedName = this.specifiedName;
-		this.specifiedName = newSpecifiedName;
-		this.entityResource.setName(newSpecifiedName);
-		firePropertyChanged(Entity.SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName);
-	}
-	
-	protected void setSpecifiedName_(String newSpecifiedName) {
-		String oldSpecifiedName = this.specifiedName;
-		this.specifiedName = newSpecifiedName;
-		firePropertyChanged(Entity.SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName);
-	}
-
-	public String getDefaultName() {
-		return this.defaultName;
-	}
-	
-	protected/*private-protected*/ void setDefaultName(String newDefaultName) {
-		String oldDefaultName = this.defaultName;
-		this.defaultName = newDefaultName;
-		firePropertyChanged(Entity.DEFAULT_NAME_PROPERTY, oldDefaultName, newDefaultName);
-	}
-
-	public JavaTable getTable() {
-		return this.table;
-	}
-
-	public ListIterator<JavaSecondaryTable> specifiedSecondaryTables() {
-		return new CloneListIterator<JavaSecondaryTable>(this.specifiedSecondaryTables);
-	}
-	
-	public int specifiedSecondaryTablesSize() {
-		return this.specifiedSecondaryTables.size();
-	}
-	
-	public JavaSecondaryTable addSpecifiedSecondaryTable(int index) {
-		JavaSecondaryTable secondaryTable = getJpaFactory().buildJavaSecondaryTable(this);
-		this.specifiedSecondaryTables.add(index, secondaryTable);
-		SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) this.javaResourcePersistentType.addAnnotation(index, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME);
-		secondaryTable.initializeFromResource(secondaryTableResource);
-		fireItemAdded(Entity.SPECIFIED_SECONDARY_TABLES_LIST, index, secondaryTable);
-		return secondaryTable;
-	}
-	
-	protected void addSpecifiedSecondaryTable(int index, JavaSecondaryTable secondaryTable) {
-		addItemToList(index, secondaryTable, this.specifiedSecondaryTables, Entity.SPECIFIED_SECONDARY_TABLES_LIST);
-	}
-	
-	public void removeSpecifiedSecondaryTable(SecondaryTable secondaryTable) {
-		this.removeSpecifiedSecondaryTable(this.specifiedSecondaryTables.indexOf(secondaryTable));
-	}
-	
-	public void removeSpecifiedSecondaryTable(int index) {
-		JavaSecondaryTable removedSecondaryTable = this.specifiedSecondaryTables.remove(index);
-		this.javaResourcePersistentType.removeAnnotation(index, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME);
-		fireItemRemoved(Entity.SPECIFIED_SECONDARY_TABLES_LIST, index, removedSecondaryTable);
-	}
-	
-	protected void removeSpecifiedSecondaryTable_(JavaSecondaryTable secondaryTable) {
-		removeItemFromList(secondaryTable, this.specifiedSecondaryTables, Entity.SPECIFIED_SECONDARY_TABLES_LIST);
-	}
-	
-	public void moveSpecifiedSecondaryTable(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.specifiedSecondaryTables, targetIndex, sourceIndex);
-		this.javaResourcePersistentType.move(targetIndex, sourceIndex, SecondaryTablesAnnotation.ANNOTATION_NAME);
-		fireItemMoved(Entity.SPECIFIED_SECONDARY_TABLES_LIST, targetIndex, sourceIndex);		
-	}
-	
-	public ListIterator<JavaSecondaryTable> secondaryTables() {
-		return specifiedSecondaryTables();
-	}
-
-	public int secondaryTablesSize() {
-		return specifiedSecondaryTablesSize();
-	}
-
-	public InheritanceType getInheritanceStrategy() {
-		return (this.getSpecifiedInheritanceStrategy() == null) ? this.getDefaultInheritanceStrategy() : this.getSpecifiedInheritanceStrategy();
-	}
-	
-	public InheritanceType getDefaultInheritanceStrategy() {
-		return this.defaultInheritanceStrategy;
-	}
-	
-	protected void setDefaultInheritanceStrategy(InheritanceType newInheritanceType) {
-		InheritanceType oldInheritanceType = this.defaultInheritanceStrategy;
-		this.defaultInheritanceStrategy = newInheritanceType;
-		firePropertyChanged(DEFAULT_INHERITANCE_STRATEGY_PROPERTY, oldInheritanceType, newInheritanceType);
-	}
-	
-	public InheritanceType getSpecifiedInheritanceStrategy() {
-		return this.specifiedInheritanceStrategy;
-	}
-	
-	public void setSpecifiedInheritanceStrategy(InheritanceType newInheritanceType) {
-		InheritanceType oldInheritanceType = this.specifiedInheritanceStrategy;
-		this.specifiedInheritanceStrategy = newInheritanceType;
-		getInheritanceResource().setStrategy(InheritanceType.toJavaResourceModel(newInheritanceType));
-		firePropertyChanged(SPECIFIED_INHERITANCE_STRATEGY_PROPERTY, oldInheritanceType, newInheritanceType);
-	}
-	
-	/**
-	 * 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 setSpecifiedInheritanceStrategy_(InheritanceType newInheritanceType) {
-		InheritanceType oldInheritanceType = this.specifiedInheritanceStrategy;
-		this.specifiedInheritanceStrategy = newInheritanceType;
-		firePropertyChanged(SPECIFIED_INHERITANCE_STRATEGY_PROPERTY, oldInheritanceType, newInheritanceType);
-	}
-
-	public JavaDiscriminatorColumn getDiscriminatorColumn() {
-		return this.discriminatorColumn;
-	}
-
-	public String getDefaultDiscriminatorValue() {
-		return this.defaultDiscriminatorValue;
-	}
-
-	protected void setDefaultDiscriminatorValue(String newDefaultDiscriminatorValue) {
-		String oldDefaultDiscriminatorValue = this.defaultDiscriminatorValue;
-		this.defaultDiscriminatorValue = newDefaultDiscriminatorValue;
-		firePropertyChanged(DEFAULT_DISCRIMINATOR_VALUE_PROPERTY, oldDefaultDiscriminatorValue, newDefaultDiscriminatorValue);
-	}
-
-	public String getSpecifiedDiscriminatorValue() {
-		return this.specifiedDiscriminatorValue;
-	}
-
-	public void setSpecifiedDiscriminatorValue(String newSpecifiedDiscriminatorValue) {
-		String oldSpecifiedDiscriminatorValue = this.specifiedDiscriminatorValue;
-		this.specifiedDiscriminatorValue = newSpecifiedDiscriminatorValue;
-		getDiscriminatorValueResource().setValue(newSpecifiedDiscriminatorValue);
-		firePropertyChanged(SPECIFIED_DISCRIMINATOR_VALUE_PROPERTY, oldSpecifiedDiscriminatorValue, newSpecifiedDiscriminatorValue);
-	}
-
-	/**
-	 * 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 setSpecifiedDiscriminatorValue_(String newSpecifiedDiscriminatorValue) {
-		String oldSpecifiedDiscriminatorValue = this.specifiedDiscriminatorValue;
-		this.specifiedDiscriminatorValue = newSpecifiedDiscriminatorValue;
-		firePropertyChanged(SPECIFIED_DISCRIMINATOR_VALUE_PROPERTY, oldSpecifiedDiscriminatorValue, newSpecifiedDiscriminatorValue);
-	}
-
-	public String getDiscriminatorValue() {
-		return (this.getSpecifiedDiscriminatorValue() == null) ? getDefaultDiscriminatorValue() : this.getSpecifiedDiscriminatorValue();
-	}
-
-	public boolean isDiscriminatorValueAllowed() {
-		return this.discriminatorValueAllowed;
-	}
-	
-	protected void setDiscriminatorValueAllowed(boolean newDiscriminatorValueAllowed) {
-		boolean oldDiscriminatorValueAllowed = this.discriminatorValueAllowed;
-		this.discriminatorValueAllowed = newDiscriminatorValueAllowed;
-		firePropertyChanged(Entity.DISCRIMINATOR_VALUE_ALLOWED_PROPERTY, oldDiscriminatorValueAllowed, newDiscriminatorValueAllowed);
-	}
-	
-	public JavaTableGenerator addTableGenerator() {
-		if (getTableGenerator() != null) {
-			throw new IllegalStateException("tableGenerator already exists");
-		}
-		this.tableGenerator = getJpaFactory().buildJavaTableGenerator(this);
-		TableGeneratorAnnotation tableGeneratorResource = (TableGeneratorAnnotation) this.javaResourcePersistentType.addAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME);
-		this.tableGenerator.initializeFromResource(tableGeneratorResource);
-		firePropertyChanged(TABLE_GENERATOR_PROPERTY, null, this.tableGenerator);
-		return this.tableGenerator;
-	}
-	
-	public void removeTableGenerator() {
-		if (getTableGenerator() == null) {
-			throw new IllegalStateException("tableGenerator does not exist, cannot be removed");
-		}
-		JavaTableGenerator oldTableGenerator = this.tableGenerator;
-		this.tableGenerator = null;
-		this.javaResourcePersistentType.removeAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME);
-		firePropertyChanged(TABLE_GENERATOR_PROPERTY, oldTableGenerator, null);
-	}
-	
-	public JavaTableGenerator getTableGenerator() {
-		return this.tableGenerator;
-	}
-	
-	protected void setTableGenerator(JavaTableGenerator newTableGenerator) {
-		JavaTableGenerator oldTableGenerator = this.tableGenerator;
-		this.tableGenerator = newTableGenerator;
-		firePropertyChanged(TABLE_GENERATOR_PROPERTY, oldTableGenerator, newTableGenerator);
-	}
-
-	public JavaSequenceGenerator addSequenceGenerator() {
-		if (getSequenceGenerator() != null) {
-			throw new IllegalStateException("sequenceGenerator already exists");
-		}
-		this.sequenceGenerator = getJpaFactory().buildJavaSequenceGenerator(this);
-		SequenceGeneratorAnnotation sequenceGeneratorResource = (SequenceGeneratorAnnotation) this.javaResourcePersistentType.addAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME);
-		this.sequenceGenerator.initializeFromResource(sequenceGeneratorResource);
-		firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, null, this.sequenceGenerator);
-		return this.sequenceGenerator;
-	}
-	
-	public void removeSequenceGenerator() {
-		if (getSequenceGenerator() == null) {
-			throw new IllegalStateException("sequenceGenerator does not exist, cannot be removed");
-		}
-		JavaSequenceGenerator oldSequenceGenerator = this.sequenceGenerator;
-		this.sequenceGenerator = null;
-		this.javaResourcePersistentType.removeAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME);
-		firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, oldSequenceGenerator,null);
-	}
-	
-	public JavaSequenceGenerator getSequenceGenerator() {
-		return this.sequenceGenerator;
-	}
-
-	protected void setSequenceGenerator(JavaSequenceGenerator newSequenceGenerator) {
-		JavaSequenceGenerator oldSequenceGenerator = this.sequenceGenerator;
-		this.sequenceGenerator = newSequenceGenerator;
-		firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, oldSequenceGenerator, newSequenceGenerator);
-	}
-	
-	@SuppressWarnings("unchecked")
-	protected Iterator<JavaGenerator> generators() {
-		return new CompositeIterator<JavaGenerator>(
-			(getSequenceGenerator() == null) ? EmptyIterator.instance() : new SingleElementIterator(getSequenceGenerator()),
-			(getTableGenerator() == null) ? EmptyIterator.instance() : new SingleElementIterator(getTableGenerator()));
-	}
-
-	public ListIterator<JavaPrimaryKeyJoinColumn> primaryKeyJoinColumns() {
-		return this.containsSpecifiedPrimaryKeyJoinColumns() ? this.specifiedPrimaryKeyJoinColumns() : this.defaultPrimaryKeyJoinColumns();
-	}
-	
-	public int primaryKeyJoinColumnsSize() {
-		return this.containsSpecifiedPrimaryKeyJoinColumns() ? this.specifiedPrimaryKeyJoinColumnsSize() : this.defaultPrimaryKeyJoinColumnsSize();
-	}
-	
-	public ListIterator<JavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns() {
-		return new CloneListIterator<JavaPrimaryKeyJoinColumn>(this.specifiedPrimaryKeyJoinColumns);
-	}
-	
-	public int specifiedPrimaryKeyJoinColumnsSize() {
-		return this.specifiedPrimaryKeyJoinColumns.size();
-	}
-	
-	public boolean containsSpecifiedPrimaryKeyJoinColumns() {
-		return !this.specifiedPrimaryKeyJoinColumns.isEmpty();
-	}	
-	
-	public JavaPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn() {
-		return this.defaultPrimaryKeyJoinColumn;
-	}
-	
-	protected void setDefaultPrimaryKeyJoinColumn(JavaPrimaryKeyJoinColumn newPkJoinColumn) {
-		JavaPrimaryKeyJoinColumn oldPkJoinColumn = this.defaultPrimaryKeyJoinColumn;
-		this.defaultPrimaryKeyJoinColumn = newPkJoinColumn;
-		firePropertyChanged(Entity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, oldPkJoinColumn, newPkJoinColumn);
-	}
-
-	protected ListIterator<JavaPrimaryKeyJoinColumn> defaultPrimaryKeyJoinColumns() {
-		if (this.defaultPrimaryKeyJoinColumn != null) {
-			return new SingleElementListIterator<JavaPrimaryKeyJoinColumn>(this.defaultPrimaryKeyJoinColumn);
-		}
-		return EmptyListIterator.instance();
-	}
-	
-	protected int defaultPrimaryKeyJoinColumnsSize() {
-		return (this.defaultPrimaryKeyJoinColumn == null) ? 0 : 1;
-	}
-
-	public JavaPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index) {
-		JavaPrimaryKeyJoinColumn oldDefaultPkJoinColumn = this.getDefaultPrimaryKeyJoinColumn();
-		if (oldDefaultPkJoinColumn != null) {
-			//null the default join column now if one already exists.
-			//if one does not exist, there is already a specified join column.
-			//Remove it now so that it doesn't get removed during an update and
-			//cause change notifications to be sent to the UI in the wrong order
-			this.defaultPrimaryKeyJoinColumn = null;
-		}
-		JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = getJpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner());
-		this.specifiedPrimaryKeyJoinColumns.add(index, primaryKeyJoinColumn);
-		PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = (PrimaryKeyJoinColumnAnnotation) this.javaResourcePersistentType.addAnnotation(index, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumns.ANNOTATION_NAME);
-		primaryKeyJoinColumn.initializeFromResource(pkJoinColumnResource);
-		this.fireItemAdded(Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, primaryKeyJoinColumn);
-		if (oldDefaultPkJoinColumn != null) {
-			this.firePropertyChanged(Entity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, oldDefaultPkJoinColumn, null);
-		}
-		return primaryKeyJoinColumn;
-	}
-
-	protected void addSpecifiedPrimaryKeyJoinColumn(int index, JavaPrimaryKeyJoinColumn primaryKeyJoinColumn) {
-		addItemToList(index, primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST);
-	}
-		
-	public void removeSpecifiedPrimaryKeyJoinColumn(PrimaryKeyJoinColumn primaryKeyJoinColumn) {
-		removeSpecifiedPrimaryKeyJoinColumn(this.specifiedPrimaryKeyJoinColumns.indexOf(primaryKeyJoinColumn));
-	}
-	
-	public void removeSpecifiedPrimaryKeyJoinColumn(int index) {
-		JavaPrimaryKeyJoinColumn removedPrimaryKeyJoinColumn = this.specifiedPrimaryKeyJoinColumns.remove(index);
-		if (!containsSpecifiedPrimaryKeyJoinColumns()) {
-			//create the defaultJoinColumn now or this will happen during project update 
-			//after removing the join column from the resource model. That causes problems 
-			//in the UI because the change notifications end up in the wrong order.
-			this.defaultPrimaryKeyJoinColumn = buildPrimaryKeyJoinColumn(new NullPrimaryKeyJoinColumn(this.javaResourcePersistentType));
-		}
-		this.javaResourcePersistentType.removeAnnotation(index, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumns.ANNOTATION_NAME);
-		fireItemRemoved(Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedPrimaryKeyJoinColumn);
-		if (this.defaultPrimaryKeyJoinColumn != null) {
-			//fire change notification if a defaultJoinColumn was created above
-			this.firePropertyChanged(Entity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, null, this.defaultPrimaryKeyJoinColumn);
-		}
-	}
-
-	protected void removeSpecifiedPrimaryKeyJoinColumn_(JavaPrimaryKeyJoinColumn primaryKeyJoinColumn) {
-		removeItemFromList(primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST);
-	}
-	
-	public void moveSpecifiedPrimaryKeyJoinColumn(int targetIndex, int sourceIndex) {
-		this.javaResourcePersistentType.move(targetIndex, sourceIndex, PrimaryKeyJoinColumns.ANNOTATION_NAME);
-		moveItemInList(targetIndex, sourceIndex, this.specifiedPrimaryKeyJoinColumns, Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST);		
-	}
-	
-	@SuppressWarnings("unchecked")
-	public ListIterator<JavaAttributeOverride> attributeOverrides() {
-		return new CompositeListIterator<JavaAttributeOverride>(specifiedAttributeOverrides(), virtualAttributeOverrides());
-	}
-	
-	public int attributeOverridesSize() {
-		return this.specifiedAttributeOverridesSize() + this.virtualAttributeOverridesSize();
-	}
-	
-	public ListIterator<JavaAttributeOverride> virtualAttributeOverrides() {
-		return new CloneListIterator<JavaAttributeOverride>(this.virtualAttributeOverrides);
-	}
-	
-	public int virtualAttributeOverridesSize() {
-		return this.virtualAttributeOverrides.size();
-	}
-	
-	public ListIterator<JavaAttributeOverride> specifiedAttributeOverrides() {
-		return new CloneListIterator<JavaAttributeOverride>(this.specifiedAttributeOverrides);
-	}
-	
-	public int specifiedAttributeOverridesSize() {
-		return this.specifiedAttributeOverrides.size();
-	}
-
-	protected JavaAttributeOverride addSpecifiedAttributeOverride(int index) {
-		JavaAttributeOverride attributeOverride = getJpaFactory().buildJavaAttributeOverride(this, createAttributeOverrideOwner());
-		this.specifiedAttributeOverrides.add(index, attributeOverride);
-		AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) this.javaResourcePersistentType.addAnnotation(index, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME);
-		attributeOverride.initializeFromResource(attributeOverrideResource);
-		this.fireItemAdded(Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride);
-		return attributeOverride;
-	}
-	
-	protected JavaAttributeOverride setAttributeOverrideVirtual(boolean virtual, JavaAttributeOverride attributeOverride) {
-		// Add a new attribute override
-		if (virtual) {
-			return setAttributeOverrideVirtual(attributeOverride);
-		}
-		return setAttributeOverrideSpecified(attributeOverride);
-	}
-	
-	protected JavaAttributeOverride setAttributeOverrideVirtual(JavaAttributeOverride attributeOverride) {
-		int index = this.specifiedAttributeOverrides.indexOf(attributeOverride);
-		this.specifiedAttributeOverrides.remove(index);
-		String attributeOverrideName = attributeOverride.getName();
-		//add the virtual attribute override so that I can control the order that change notification is sent.
-		//otherwise when we remove the annotation from java we will get an update and add the attribute override
-		//during the udpate.  This causes the UI to be flaky, since change notification might not occur in the correct order
-		JavaAttributeOverride virtualAttributeOverride = null;
-		if (attributeOverrideName != null) {
-			for (PersistentAttribute persistentAttribute : CollectionTools.iterable(allOverridableAttributes())) {
-				if (persistentAttribute.getName().equals(attributeOverrideName)) {
-					//store the virtualAttributeOverride so we can fire change notification later
-					virtualAttributeOverride = buildVirtualAttributeOverride(this.javaResourcePersistentType, persistentAttribute);
-					this.virtualAttributeOverrides.add(virtualAttributeOverride);
-					break;
-				}
-			}
-		}
-
-		this.javaResourcePersistentType.removeAnnotation(index, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME);
-		fireItemRemoved(Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride);
-		
-		if (virtualAttributeOverride != null) {
-			fireItemAdded(Entity.VIRTUAL_ATTRIBUTE_OVERRIDES_LIST, virtualAttributeOverridesSize() - 1, virtualAttributeOverride);
-		}
-		return virtualAttributeOverride;
-	}
-	
-	protected JavaAttributeOverride setAttributeOverrideSpecified(JavaAttributeOverride oldAttributeOverride) {
-		int index = specifiedAttributeOverridesSize();
-		JavaAttributeOverride newAttributeOverride = getJpaFactory().buildJavaAttributeOverride(this, createAttributeOverrideOwner());
-		this.specifiedAttributeOverrides.add(index, newAttributeOverride);
-		
-		AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) this.javaResourcePersistentType.addAnnotation(index, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME);
-		newAttributeOverride.initializeFromResource(attributeOverrideResource);
-		
-		int defaultIndex = this.virtualAttributeOverrides.indexOf(oldAttributeOverride);
-		this.virtualAttributeOverrides.remove(defaultIndex);
-
-		newAttributeOverride.setName(oldAttributeOverride.getName());
-		newAttributeOverride.getColumn().setSpecifiedName(oldAttributeOverride.getColumn().getName());
-		
-		this.fireItemRemoved(Entity.VIRTUAL_ATTRIBUTE_OVERRIDES_LIST, defaultIndex, oldAttributeOverride);
-		this.fireItemAdded(Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, newAttributeOverride);		
-
-		return newAttributeOverride;
-	}
-	
-	protected AttributeOverride.Owner createAttributeOverrideOwner() {
-		return new AttributeOverrideOwner();
-	}
-	
-	protected void addSpecifiedAttributeOverride(int index, JavaAttributeOverride attributeOverride) {
-		addItemToList(index, attributeOverride, this.specifiedAttributeOverrides, Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST);
-	}
-	
-	protected void removeSpecifiedAttributeOverride_(JavaAttributeOverride attributeOverride) {
-		removeItemFromList(attributeOverride, this.specifiedAttributeOverrides, Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST);
-	}
-
-	public void moveSpecifiedAttributeOverride(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.specifiedAttributeOverrides, targetIndex, sourceIndex);
-		this.javaResourcePersistentType.move(targetIndex, sourceIndex, AttributeOverridesAnnotation.ANNOTATION_NAME);
-		fireItemMoved(Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, targetIndex, sourceIndex);		
-	}
-	
-	protected void addVirtualAttributeOverride(JavaAttributeOverride attributeOverride) {
-		addItemToList(attributeOverride, this.virtualAttributeOverrides, Entity.VIRTUAL_ATTRIBUTE_OVERRIDES_LIST);
-	}
-	
-	protected void removeVirtualAttributeOverride(JavaAttributeOverride attributeOverride) {
-		removeItemFromList(attributeOverride, this.virtualAttributeOverrides, Entity.VIRTUAL_ATTRIBUTE_OVERRIDES_LIST);
-	}
-
-	public JavaAttributeOverride getAttributeOverrideNamed(String name) {
-		return (JavaAttributeOverride) getOverrideNamed(name, attributeOverrides());
-	}
-
-	public boolean containsAttributeOverride(String name) {
-		return containsOverride(name, attributeOverrides());
-	}
-
-	public boolean containsDefaultAttributeOverride(String name) {
-		return containsOverride(name, virtualAttributeOverrides());
-	}
-
-	public boolean containsSpecifiedAttributeOverride(String name) {
-		return containsOverride(name, specifiedAttributeOverrides());
-	}
-
-	public JavaAssociationOverride getAssociationOverrideNamed(String name) {
-		return (JavaAssociationOverride) getOverrideNamed(name, associationOverrides());
-	}
-
-	public boolean containsAssociationOverride(String name) {
-		return containsOverride(name, associationOverrides());
-	}
-
-	public boolean containsSpecifiedAssociationOverride(String name) {
-		return containsOverride(name, specifiedAssociationOverrides());
-	}
-
-	public boolean containsDefaultAssociationOverride(String name) {
-		return containsOverride(name, virtualAssociationOverrides());
-	}
-
-	private BaseOverride getOverrideNamed(String name, ListIterator<? extends BaseOverride> overrides) {
-		for (BaseOverride override : CollectionTools.iterable(overrides)) {
-			String overrideName = override.getName();
-			if (overrideName == null && name == null) {
-				return override;
-			}
-			if (overrideName != null && overrideName.equals(name)) {
-				return override;
-			}
-		}
-		return null;
-	}
-
-	private boolean containsOverride(String name, ListIterator<? extends BaseOverride> overrides) {
-		return getOverrideNamed(name, overrides) != null;
-	}
-
-
-	@SuppressWarnings("unchecked")
-	public ListIterator<JavaAssociationOverride> associationOverrides() {
-		return new CompositeListIterator<JavaAssociationOverride>(specifiedAssociationOverrides(), virtualAssociationOverrides());
-	}
-	
-	public int associationOverridesSize() {
-		return this.specifiedAssociationOverridesSize() + this.virtualAssociationOverridesSize();
-	}
-
-	public  ListIterator<JavaAssociationOverride> virtualAssociationOverrides() {
-		return new CloneListIterator<JavaAssociationOverride>(this.virtualAssociationOverrides);
-	}
-	
-	public int virtualAssociationOverridesSize() {
-		return this.virtualAssociationOverrides.size();
-	}
-	
-	public ListIterator<JavaAssociationOverride> specifiedAssociationOverrides() {
-		return new CloneListIterator<JavaAssociationOverride>(this.specifiedAssociationOverrides);
-	}
-	
-	public int specifiedAssociationOverridesSize() {
-		return this.specifiedAssociationOverrides.size();
-	}
-
-	public JavaAssociationOverride addSpecifiedAssociationOverride(int index) {
-		JavaAssociationOverride associationOverride = getJpaFactory().buildJavaAssociationOverride(this, createAssociationOverrideOwner());
-		this.specifiedAssociationOverrides.add(index, associationOverride);
-		AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) this.javaResourcePersistentType.addAnnotation(index, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME);
-		associationOverride.initializeFromResource(associationOverrideResource);
-		this.fireItemAdded(Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST, index, associationOverride);
-		return associationOverride;
-	}
-	
-	protected AssociationOverride.Owner createAssociationOverrideOwner() {
-		return new AssociationOverrideOwner();
-	}
-	
-	protected void addSpecifiedAssociationOverride(int index, JavaAssociationOverride associationOverride) {
-		addItemToList(index, associationOverride, this.specifiedAssociationOverrides, Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST);
-	}
-	
-	protected void removeSpecifiedAssociationOverride_(JavaAssociationOverride associationOverride) {
-		removeItemFromList(associationOverride, this.specifiedAssociationOverrides, Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST);
-	}
-	
-	public void moveSpecifiedAssociationOverride(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.specifiedAssociationOverrides, targetIndex, sourceIndex);
-		this.javaResourcePersistentType.move(targetIndex, sourceIndex, AssociationOverridesAnnotation.ANNOTATION_NAME);
-		fireItemMoved(Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST, targetIndex, sourceIndex);		
-	}
-
-	protected JavaAssociationOverride setAssociationOverrideVirtual(boolean virtual, JavaAssociationOverride associationOverride) {
-		// Add a new attribute override
-		if (virtual) {
-			return setAssociationOverrideVirtual(associationOverride);
-		}
-		return setAssociationOverrideSpecified(associationOverride);
-	}
-	
-	protected JavaAssociationOverride setAssociationOverrideVirtual(JavaAssociationOverride associationOverride) {
-		int index = this.specifiedAssociationOverrides.indexOf(associationOverride);
-		this.specifiedAssociationOverrides.remove(index);
-		String associationOverrideName = associationOverride.getName();
-		//add the virtual attribute override so that I can control the order that change notification is sent.
-		//otherwise when we remove the annotation from java we will get an update and add the attribute override
-		//during the udpate.  This causes the UI to be flaky, since change notification might not occur in the correct order
-		JavaAssociationOverride virtualAssociationOverride = null;
-		if (associationOverrideName != null) {
-			for (PersistentAttribute persistentAttribute : CollectionTools.iterable(allOverridableAssociations())) {
-				if (persistentAttribute.getName().equals(associationOverrideName)) {
-					//store the virtualAssociationOverride so we can fire change notification later
-					virtualAssociationOverride = buildAssociationOverride(new NullAssociationOverride(this.javaResourcePersistentType, associationOverrideName));
-					this.virtualAssociationOverrides.add(virtualAssociationOverride);
-					break;
-				}
-			}
-		}
-
-		this.javaResourcePersistentType.removeAnnotation(index, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME);
-		fireItemRemoved(Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST, index, associationOverride);
-		
-		if (virtualAssociationOverride != null) {
-			fireItemAdded(Entity.VIRTUAL_ASSOCIATION_OVERRIDES_LIST, virtualAssociationOverridesSize() - 1, virtualAssociationOverride);
-		}
-		return virtualAssociationOverride;
-	}
-	
-	protected JavaAssociationOverride setAssociationOverrideSpecified(JavaAssociationOverride oldAssociationOverride) {
-		int index = specifiedAssociationOverridesSize();
-		JavaAssociationOverride newAssociationOverride = getJpaFactory().buildJavaAssociationOverride(this, createAssociationOverrideOwner());
-		this.specifiedAssociationOverrides.add(index, newAssociationOverride);
-		
-		AssociationOverrideAnnotation attributeOverrideResource = (AssociationOverrideAnnotation) this.javaResourcePersistentType.addAnnotation(index, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME);
-		newAssociationOverride.initializeFromResource(attributeOverrideResource);
-		
-		int virtualIndex = this.virtualAssociationOverrides.indexOf(oldAssociationOverride);
-		this.virtualAssociationOverrides.remove(virtualIndex);
-
-		newAssociationOverride.setName(oldAssociationOverride.getName());
-		
-		this.fireItemRemoved(Entity.VIRTUAL_ASSOCIATION_OVERRIDES_LIST, virtualIndex, oldAssociationOverride);
-		this.fireItemAdded(Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST, index, newAssociationOverride);		
-
-		return newAssociationOverride;
-	}
-	
-	protected void addVirtualAssociationOverride(JavaAssociationOverride associationOverride) {
-		addItemToList(associationOverride, this.virtualAssociationOverrides, Entity.VIRTUAL_ASSOCIATION_OVERRIDES_LIST);
-	}
-	
-	protected void removeVirtualAssociationOverride(JavaAssociationOverride associationOverride) {
-		removeItemFromList(associationOverride, this.virtualAssociationOverrides, Entity.VIRTUAL_ASSOCIATION_OVERRIDES_LIST);
-	}
-
-	public ListIterator<JavaNamedQuery> namedQueries() {
-		return new CloneListIterator<JavaNamedQuery>(this.namedQueries);
-	}
-	
-	public int namedQueriesSize() {
-		return this.namedQueries.size();
-	}
-	
-	public JavaNamedQuery addNamedQuery(int index) {
-		JavaNamedQuery namedQuery = getJpaFactory().buildJavaNamedQuery(this);
-		this.namedQueries.add(index, namedQuery);
-		NamedQueryAnnotation namedQueryAnnotation = (NamedQueryAnnotation) this.javaResourcePersistentType.addAnnotation(index, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME);
-		namedQuery.initializeFromResource(namedQueryAnnotation);
-		fireItemAdded(QueryHolder.NAMED_QUERIES_LIST, index, namedQuery);
-		return namedQuery;
-	}
-	
-	protected void addNamedQuery(int index, JavaNamedQuery namedQuery) {
-		addItemToList(index, namedQuery, this.namedQueries, QueryHolder.NAMED_QUERIES_LIST);
-	}
-	
-	public void removeNamedQuery(NamedQuery namedQuery) {
-		removeNamedQuery(this.namedQueries.indexOf(namedQuery));
-	}
-	
-	public void removeNamedQuery(int index) {
-		JavaNamedQuery removedNamedQuery = this.namedQueries.remove(index);
-		this.javaResourcePersistentType.removeAnnotation(index, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME);
-		fireItemRemoved(QueryHolder.NAMED_QUERIES_LIST, index, removedNamedQuery);
-	}	
-	
-	protected void removeNamedQuery_(JavaNamedQuery namedQuery) {
-		removeItemFromList(namedQuery, this.namedQueries, QueryHolder.NAMED_QUERIES_LIST);
-	}
-	
-	public void moveNamedQuery(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.namedQueries, targetIndex, sourceIndex);
-		this.javaResourcePersistentType.move(targetIndex, sourceIndex, NamedQueriesAnnotation.ANNOTATION_NAME);
-		fireItemMoved(QueryHolder.NAMED_QUERIES_LIST, targetIndex, sourceIndex);		
-	}
-	
-	public ListIterator<JavaNamedNativeQuery> namedNativeQueries() {
-		return new CloneListIterator<JavaNamedNativeQuery>(this.namedNativeQueries);
-	}
-	
-	public int namedNativeQueriesSize() {
-		return this.namedNativeQueries.size();
-	}
-	
-	public JavaNamedNativeQuery addNamedNativeQuery(int index) {
-		JavaNamedNativeQuery namedNativeQuery = getJpaFactory().buildJavaNamedNativeQuery(this);
-		this.namedNativeQueries.add(index, namedNativeQuery);
-		NamedNativeQueryAnnotation namedNativeQueryAnnotation = (NamedNativeQueryAnnotation) this.javaResourcePersistentType.addAnnotation(index, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME);
-		namedNativeQuery.initializeFromResource(namedNativeQueryAnnotation);		
-		fireItemAdded(QueryHolder.NAMED_NATIVE_QUERIES_LIST, index, namedNativeQuery);
-		return namedNativeQuery;
-	}
-	
-	protected void addNamedNativeQuery(int index, JavaNamedNativeQuery namedNativeQuery) {
-		addItemToList(index, namedNativeQuery, this.namedNativeQueries, QueryHolder.NAMED_NATIVE_QUERIES_LIST);
-	}
-	
-	public void removeNamedNativeQuery(NamedNativeQuery namedNativeQuery) {
-		this.removeNamedNativeQuery(this.namedNativeQueries.indexOf(namedNativeQuery));
-	}
-	
-	public void removeNamedNativeQuery(int index) {
-		JavaNamedNativeQuery removedNamedNativeQuery = this.namedNativeQueries.remove(index);
-		this.javaResourcePersistentType.removeAnnotation(index, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME);
-		fireItemRemoved(QueryHolder.NAMED_NATIVE_QUERIES_LIST, index, removedNamedNativeQuery);
-	}	
-	
-	protected void removeNamedNativeQuery_(JavaNamedNativeQuery namedNativeQuery) {
-		removeItemFromList(namedNativeQuery, this.namedNativeQueries, QueryHolder.NAMED_NATIVE_QUERIES_LIST);
-	}
-	
-	public void moveNamedNativeQuery(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.namedNativeQueries, targetIndex, sourceIndex);
-		this.javaResourcePersistentType.move(targetIndex, sourceIndex, NamedNativeQueriesAnnotation.ANNOTATION_NAME);
-		fireItemMoved(QueryHolder.NAMED_NATIVE_QUERIES_LIST, targetIndex, sourceIndex);		
-	}
-	
-	@SuppressWarnings("unchecked")
-	protected Iterator<JavaQuery> queries() {
-		return new CompositeIterator<JavaQuery>(this.namedNativeQueries(), this.namedQueries());
-	}
-
-	public String getIdClass() {
-		return this.idClass;
-	}
-	
-	public void setIdClass(String newIdClass) {
-		String oldIdClass = this.idClass;
-		this.idClass = newIdClass;
-		if (newIdClass != oldIdClass) {
-			if (newIdClass != null) {
-				if (getIdClassResource() == null) {
-					addIdClassResource();
-				}
-				getIdClassResource().setValue(newIdClass);
-			}
-			else {
-				removeIdClassResource();
-			}
-		}
-		firePropertyChanged(IdClass.ID_CLASS_PROPERTY, oldIdClass, newIdClass);
-	}
-	
-	protected void setIdClass_(String newIdClass) {
-		String oldIdClass = this.idClass;
-		this.idClass = newIdClass;
-		firePropertyChanged(IdClass.ID_CLASS_PROPERTY, oldIdClass, newIdClass);
-	}
-
-	protected IdClassAnnotation getIdClassResource() {
-		return (IdClassAnnotation) this.javaResourcePersistentType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME);
-	}
-	
-	protected void addIdClassResource() {
-		this.javaResourcePersistentType.addAnnotation(IdClassAnnotation.ANNOTATION_NAME);
-	}
-	
-	protected void removeIdClassResource() {
-		this.javaResourcePersistentType.removeAnnotation(IdClassAnnotation.ANNOTATION_NAME);
-	}
-
-	public Entity getParentEntity() {
-		for (Iterator<PersistentType> i = getPersistentType().inheritanceHierarchy(); i.hasNext();) {
-			TypeMapping typeMapping = i.next().getMapping();
-			if (typeMapping != this && typeMapping instanceof Entity) {
-				return (Entity) typeMapping;
-			}
-		}
-		return this;
-	}
-
-	public Entity getRootEntity() {
-		Entity rootEntity = this;
-		for (Iterator<PersistentType> i = getPersistentType().inheritanceHierarchy(); i.hasNext();) {
-			PersistentType persistentType = i.next();
-			if (persistentType.getMapping() instanceof Entity) {
-				rootEntity = (Entity) persistentType.getMapping();
-			}
-		}
-		return rootEntity;
-	}
-
-	public String getPrimaryKeyColumnName() {
-		return getPrimaryKeyColumnName(getPersistentType().allAttributes());
-	}
-	
-	//copied in GenericOrmEntity to avoid an API change for fixing bug 229423 in RC1
-	public String getPrimaryKeyColumnName(Iterator<PersistentAttribute> attributes) {
-		String pkColumnName = null;
-		for (Iterator<PersistentAttribute> stream = attributes; stream.hasNext();) {
-			PersistentAttribute attribute = stream.next();
-			String name = attribute.getPrimaryKeyColumnName();
-			if (name != null) {
-				//if the attribute is a primary key then we need to check if there is an attribute override
-				//and use its column name instead (bug 229423)
-				AttributeOverride attributeOverride = getAttributeOverrideNamed(attribute.getName());
-				if (attributeOverride != null) {
-					name = attributeOverride.getColumn().getName();
-				}
-			}
-			if (pkColumnName == null) {
-				pkColumnName = name;
-			}
-			else if (name != null) {
-				// if we encounter a composite primary key, return null
-				return null;
-			}
-		}
-		// if we encounter only a single primary key column name, return it
-		return pkColumnName;
-	}
-
-	@Override
-	public boolean tableNameIsInvalid(String tableName) {
-		return !CollectionTools.contains(this.associatedTableNamesIncludingInherited(), tableName);
-	}
-
-	@Override
-	public Iterator<Table> associatedTables() {
-		return new CompositeIterator<Table>(this.getTable(), this.secondaryTables());
-	}
-
-	@Override
-	public Iterator<Table> associatedTablesIncludingInherited() {
-		return new CompositeIterator<Table>(new TransformationIterator<TypeMapping, Iterator<Table>>(this.inheritanceHierarchy()) {
-			@Override
-			protected Iterator<Table> transform(TypeMapping mapping) {
-				return new FilteringIterator<Table, Table>(mapping.associatedTables()) {
-					@Override
-					protected boolean accept(Table o) {
-						return true;
-						//TODO
-						//filtering these out so as to avoid the duplicate table, root and children share the same table
-						//return !(o instanceof SingleTableInheritanceChildTableImpl);
-					}
-				};
-			}
-		});
-	}
-
-	@Override
-	public Iterator<String> associatedTableNamesIncludingInherited() {
-		return this.nonNullTableNames(this.associatedTablesIncludingInherited());
-	}
-
-	protected Iterator<String> nonNullTableNames(Iterator<Table> tables) {
-		return new FilteringIterator<String, String>(this.tableNames(tables)) {
-			@Override
-			protected boolean accept(String o) {
-				return o != null;
-			}
-		};
-	}
-
-	protected Iterator<String> tableNames(Iterator<Table> tables) {
-		return new TransformationIterator<Table, String>(tables) {
-			@Override
-			protected String transform(Table t) {
-				return t.getName();
-			}
-		};
-	}
-
-	/**
-	 * Return an iterator of Entities, each which inherits from the one before,
-	 * and terminates at the root entity (or at the point of cyclicity).
-	 */
-	protected Iterator<TypeMapping> inheritanceHierarchy() {
-		return new TransformationIterator<PersistentType, TypeMapping>(getPersistentType().inheritanceHierarchy()) {
-			@Override
-			protected TypeMapping transform(PersistentType type) {
-				return type.getMapping();
-			}
-		};
-	}
-
-	@Override
-	public Iterator<String> allOverridableAttributeNames() {
-		return new CompositeIterator<String>(new TransformationIterator<TypeMapping, Iterator<String>>(this.inheritanceHierarchy()) {
-			@Override
-			protected Iterator<String> transform(TypeMapping mapping) {
-				return mapping.overridableAttributeNames();
-			}
-		});
-	}
-
-
-	@Override
-	public Iterator<PersistentAttribute> allOverridableAttributes() {
-		return new CompositeIterator<PersistentAttribute>(new TransformationIterator<TypeMapping, Iterator<PersistentAttribute>>(this.inheritanceHierarchy()) {
-			@Override
-			protected Iterator<PersistentAttribute> transform(TypeMapping mapping) {
-				return mapping.overridableAttributes();
-			}
-		});
-	}
-
-	@Override
-	public Iterator<PersistentAttribute> allOverridableAssociations() {
-		return new CompositeIterator<PersistentAttribute>(new TransformationIterator<TypeMapping, Iterator<PersistentAttribute>>(this.inheritanceHierarchy()) {
-			@Override
-			protected Iterator<PersistentAttribute> transform(TypeMapping mapping) {
-				return mapping.overridableAssociations();
-			}
-		});
-	}
-	
-	@Override
-	public Iterator<String> allOverridableAssociationNames() {
-		return new CompositeIterator<String>(new TransformationIterator<TypeMapping, Iterator<String>>(this.inheritanceHierarchy()) {
-			@Override
-			protected Iterator<String> transform(TypeMapping mapping) {
-				return mapping.overridableAssociationNames();
-			}
-		});
-	}
-	
-	@Override
-	public void update(JavaResourcePersistentType resourcePersistentType) {
-		super.update(resourcePersistentType);
-		this.entityResource = (EntityAnnotation) resourcePersistentType.getMappingAnnotation(EntityAnnotation.ANNOTATION_NAME);
-		
-		this.setSpecifiedName_(this.specifiedName(this.entityResource));
-		this.setDefaultName(this.defaultName(resourcePersistentType));
-		
-		this.updateInheritance(getInheritanceResource());
-		this.updateDiscriminatorColumn(resourcePersistentType);
-		this.updateDiscriminatorValue(getDiscriminatorValueResource());
-		this.setDiscriminatorValueAllowed(discriminatorValueIsAllowed(resourcePersistentType));
-		this.updateTable(resourcePersistentType);
-		this.updateSecondaryTables(resourcePersistentType);
-		this.updateTableGenerator(resourcePersistentType);
-		this.updateSequenceGenerator(resourcePersistentType);
-		this.updateSpecifiedPrimaryKeyJoinColumns(resourcePersistentType);
-		this.updateDefaultPrimaryKeyJoinColumn(resourcePersistentType);
-		this.updateSpecifiedAttributeOverrides(resourcePersistentType);
-		this.updateVirtualAttributeOverrides(resourcePersistentType);
-		this.updateSpecifiedAssociationOverrides(resourcePersistentType);
-		this.updateVirtualAssociationOverrides(resourcePersistentType);
-		this.updateNamedQueries(resourcePersistentType);
-		this.updateNamedNativeQueries(resourcePersistentType);
-		this.updateIdClass(resourcePersistentType);
-		this.updatePersistenceUnitGeneratorsAndQueries();
-	}
-		
-	protected String specifiedName(EntityAnnotation entityResource) {
-		return entityResource.getName();
-	}
-	
-	protected String defaultName(JavaResourcePersistentType persistentTypeResource) {
-		return persistentTypeResource.getName();
-	}
-
-	protected void updateTable(JavaResourcePersistentType persistentTypeResource) {
-		getTable().update(persistentTypeResource);
-	}
-	
-	protected void updateInheritance(InheritanceAnnotation inheritanceResource) {
-		this.setSpecifiedInheritanceStrategy_(this.specifiedInheritanceStrategy(inheritanceResource));
-		this.setDefaultInheritanceStrategy(this.defaultInheritanceStrategy());
-	}
-	
-	protected InheritanceType specifiedInheritanceStrategy(InheritanceAnnotation inheritanceResource) {
-		return InheritanceType.fromJavaResourceModel(inheritanceResource.getStrategy());
-	}
-	
-	protected InheritanceType defaultInheritanceStrategy() {
-		if (getRootEntity() == this) {
-			return InheritanceType.SINGLE_TABLE;
-		}
-		return getRootEntity().getInheritanceStrategy();
-	}
-	
-	protected void updateDiscriminatorColumn(JavaResourcePersistentType persistentTypeResource) {
-		getDiscriminatorColumn().update(persistentTypeResource);
-	}
-	
-	protected void updateDiscriminatorValue(DiscriminatorValueAnnotation discriminatorValueResource) {
-		this.setSpecifiedDiscriminatorValue_(discriminatorValueResource.getValue());
-		this.setDefaultDiscriminatorValue(this.javaDefaultDiscriminatorValue());
-	}
-	
-	/**
-	 * From the Spec:
-	 * If the DiscriminatorValue annotation is not specified, a
-	 * provider-specific function to generate a value representing
-	 * the entity type is used for the value of the discriminator
-	 * column. If the DiscriminatorType is STRING, the discriminator
-	 * value default is the entity name.
-	 * 
-	 * TODO extension point for provider-specific function?
-	 */
-	protected String javaDefaultDiscriminatorValue() {
-		if (this.javaResourcePersistentType.isAbstract()) {
-			return null;
-		}
-		if (this.getDiscriminatorType() != DiscriminatorType.STRING) {
-			return null;
-		}
-		return this.getName();
-	}
-
-	protected DiscriminatorType getDiscriminatorType() {
-		return this.getDiscriminatorColumn().getDiscriminatorType();
-	}
-	
-	protected boolean discriminatorValueIsAllowed(JavaResourcePersistentType persistentTypeResource) {
-		return !persistentTypeResource.isAbstract();
-	}
-	
-	protected void updateSecondaryTables(JavaResourcePersistentType persistentTypeResource) {
-		ListIterator<JavaSecondaryTable> secondaryTables = specifiedSecondaryTables();
-		ListIterator<JavaResourceNode> resourceSecondaryTables = persistentTypeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME);
-		
-		while (secondaryTables.hasNext()) {
-			JavaSecondaryTable secondaryTable = secondaryTables.next();
-			if (resourceSecondaryTables.hasNext()) {
-				secondaryTable.update((SecondaryTableAnnotation) resourceSecondaryTables.next());
-			}
-			else {
-				removeSpecifiedSecondaryTable_(secondaryTable);
-			}
-		}
-		
-		while (resourceSecondaryTables.hasNext()) {
-			addSpecifiedSecondaryTable(specifiedSecondaryTablesSize(), buildSecondaryTable((SecondaryTableAnnotation) resourceSecondaryTables.next()));
-		}
-	}
-
-	protected JavaSecondaryTable buildSecondaryTable(SecondaryTableAnnotation secondaryTableResource) {
-		JavaSecondaryTable secondaryTable = getJpaFactory().buildJavaSecondaryTable(this);
-		secondaryTable.initializeFromResource(secondaryTableResource);
-		return secondaryTable;
-	}
-
-	protected void updateTableGenerator(JavaResourcePersistentType persistentTypeResource) {
-		TableGeneratorAnnotation tableGeneratorResource = tableGenerator(persistentTypeResource);
-		if (tableGeneratorResource == null) {
-			if (getTableGenerator() != null) {
-				setTableGenerator(null);
-			}
-		}
-		else {
-			if (getTableGenerator() == null) {
-				setTableGenerator(buildTableGenerator(tableGeneratorResource));
-			}
-			else {
-				getTableGenerator().update(tableGeneratorResource);
-			}
-		}
-	}
-	
-	protected JavaTableGenerator buildTableGenerator(TableGeneratorAnnotation tableGeneratorResource) {
-		JavaTableGenerator tableGenerator = getJpaFactory().buildJavaTableGenerator(this);
-		tableGenerator.initializeFromResource(tableGeneratorResource);
-		return tableGenerator;
-	}
-	
-	protected TableGeneratorAnnotation tableGenerator(JavaResourcePersistentType persistentTypeResource) {
-		return (TableGeneratorAnnotation) persistentTypeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME);
-	}
-
-	protected void updateSequenceGenerator(JavaResourcePersistentType persistentTypeResource) {
-		SequenceGeneratorAnnotation sequenceGeneratorResource = sequenceGenerator(persistentTypeResource);
-		if (sequenceGeneratorResource == null) {
-			if (getSequenceGenerator() != null) {
-				setSequenceGenerator(null);
-			}
-		}
-		else {
-			if (getSequenceGenerator() == null) {
-				setSequenceGenerator(buildSequenceGenerator(sequenceGeneratorResource));
-			}
-			else {
-				getSequenceGenerator().update(sequenceGeneratorResource);
-			}
-		}
-	}
-	
-	protected JavaSequenceGenerator buildSequenceGenerator(SequenceGeneratorAnnotation sequenceGeneratorResource) {
-		JavaSequenceGenerator sequenceGenerator = getJpaFactory().buildJavaSequenceGenerator(this);
-		sequenceGenerator.initializeFromResource(sequenceGeneratorResource);
-		return sequenceGenerator;
-	}
-	
-	protected SequenceGeneratorAnnotation sequenceGenerator(JavaResourcePersistentType persistentTypeResource) {
-		return (SequenceGeneratorAnnotation) persistentTypeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME);
-	}
-
-	
-	protected void updateSpecifiedPrimaryKeyJoinColumns(JavaResourcePersistentType persistentTypeResource) {
-		ListIterator<JavaPrimaryKeyJoinColumn> primaryKeyJoinColumns = specifiedPrimaryKeyJoinColumns();
-		ListIterator<JavaResourceNode> resourcePrimaryKeyJoinColumns = persistentTypeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumns.ANNOTATION_NAME);
-		
-		while (primaryKeyJoinColumns.hasNext()) {
-			JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = primaryKeyJoinColumns.next();
-			if (resourcePrimaryKeyJoinColumns.hasNext()) {
-				primaryKeyJoinColumn.update((PrimaryKeyJoinColumnAnnotation) resourcePrimaryKeyJoinColumns.next());
-			}
-			else {
-				removeSpecifiedPrimaryKeyJoinColumn_(primaryKeyJoinColumn);
-			}
-		}
-		
-		while (resourcePrimaryKeyJoinColumns.hasNext()) {
-			addSpecifiedPrimaryKeyJoinColumn(specifiedPrimaryKeyJoinColumnsSize(), buildPrimaryKeyJoinColumn((PrimaryKeyJoinColumnAnnotation) resourcePrimaryKeyJoinColumns.next()));
-		}
-	}
-	
-	protected JavaPrimaryKeyJoinColumn buildPrimaryKeyJoinColumn(PrimaryKeyJoinColumnAnnotation primaryKeyJoinColumnResource) {
-		JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = getJpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner());
-		primaryKeyJoinColumn.initializeFromResource(primaryKeyJoinColumnResource);
-		return primaryKeyJoinColumn;
-	}
-
-	protected void updateDefaultPrimaryKeyJoinColumn(JavaResourcePersistentType persistentTypeResource) {
-		if (!shouldBuildDefaultPrimaryKeyJoinColumn()) {
-			setDefaultPrimaryKeyJoinColumn(null);
-			return;
-		}
-		if (getDefaultPrimaryKeyJoinColumn() == null) {
-			this.setDefaultPrimaryKeyJoinColumn(buildPrimaryKeyJoinColumn(new NullPrimaryKeyJoinColumn(this.javaResourcePersistentType)));
-		}
-		else {
-			this.defaultPrimaryKeyJoinColumn.update(new NullPrimaryKeyJoinColumn(persistentTypeResource));
-		}
-	}
-		
-	protected void updateSpecifiedAttributeOverrides(JavaResourcePersistentType persistentTypeResource) {
-		ListIterator<JavaAttributeOverride> attributeOverrides = specifiedAttributeOverrides();
-		ListIterator<JavaResourceNode> resourceAttributeOverrides = persistentTypeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME);
-		
-		while (attributeOverrides.hasNext()) {
-			JavaAttributeOverride attributeOverride = attributeOverrides.next();
-			if (resourceAttributeOverrides.hasNext()) {
-				attributeOverride.update((AttributeOverrideAnnotation) resourceAttributeOverrides.next());
-			}
-			else {
-				removeSpecifiedAttributeOverride_(attributeOverride);
-			}
-		}
-		
-		while (resourceAttributeOverrides.hasNext()) {
-			addSpecifiedAttributeOverride(specifiedAttributeOverridesSize(), buildAttributeOverride((AttributeOverrideAnnotation) resourceAttributeOverrides.next()));
-		}	
-	}
-	
-	protected JavaAttributeOverride buildAttributeOverride(AttributeOverrideAnnotation attributeOverrideResource) {
-		JavaAttributeOverride attributeOverride = getJpaFactory().buildJavaAttributeOverride(this, createAttributeOverrideOwner());
-		attributeOverride.initializeFromResource(attributeOverrideResource);
-		return attributeOverride;
-	}
-	
-	protected JavaAttributeOverride buildVirtualAttributeOverride(JavaResourcePersistentType resourcePersistentType, PersistentAttribute attribute) {
-		return buildAttributeOverride(buildVirtualAttributeOverrideResource(resourcePersistentType, attribute));
-	}
-	
-	protected VirtualAttributeOverride buildVirtualAttributeOverrideResource(JavaResourcePersistentType resourcePersistentType, PersistentAttribute attribute) {
-		ColumnMapping columnMapping = (ColumnMapping) attribute.getMapping();
-		return new VirtualAttributeOverride(resourcePersistentType, attribute.getName(), columnMapping.getColumn());
-	}
-
-	protected void updateVirtualAttributeOverrides(JavaResourcePersistentType resourcePersistentType) {
-		for (PersistentAttribute persistentAttribute : CollectionTools.iterable(allOverridableAttributes())) {
-			JavaAttributeOverride attributeOverride = getAttributeOverrideNamed(persistentAttribute.getName());
-			if (attributeOverride == null) {
-				addVirtualAttributeOverride(buildVirtualAttributeOverride(resourcePersistentType, persistentAttribute));
-			}
-			else if (attributeOverride.isVirtual()) {
-				attributeOverride.update(buildVirtualAttributeOverrideResource(resourcePersistentType, persistentAttribute));
-			}
-		}
-		
-		Collection<String> attributeNames = CollectionTools.collection(allOverridableAttributeNames());
-	
-		//remove any default mappings that are not included in the attributeNames collection
-		for (JavaAttributeOverride attributeOverride : CollectionTools.iterable(virtualAttributeOverrides())) {
-			if (!attributeNames.contains(attributeOverride.getName())
-				|| containsSpecifiedAttributeOverride(attributeOverride.getName())) {
-				removeVirtualAttributeOverride(attributeOverride);
-			}
-		}
-	}
-
-	protected void updateSpecifiedAssociationOverrides(JavaResourcePersistentType resourcePersistentType) {
-		ListIterator<JavaAssociationOverride> associationOverrides = specifiedAssociationOverrides();
-		ListIterator<JavaResourceNode> resourceAssociationOverrides = resourcePersistentType.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME);
-		
-		while (associationOverrides.hasNext()) {
-			JavaAssociationOverride associationOverride = associationOverrides.next();
-			if (resourceAssociationOverrides.hasNext()) {
-				associationOverride.update((AssociationOverrideAnnotation) resourceAssociationOverrides.next());
-			}
-			else {
-				removeSpecifiedAssociationOverride_(associationOverride);
-			}
-		}
-		
-		while (resourceAssociationOverrides.hasNext()) {
-			addSpecifiedAssociationOverride(specifiedAssociationOverridesSize(), buildAssociationOverride((AssociationOverrideAnnotation) resourceAssociationOverrides.next()));
-		}	
-	}
-	
-	protected JavaAssociationOverride buildAssociationOverride(AssociationOverrideAnnotation associationOverrideResource) {
-		JavaAssociationOverride associationOverride = getJpaFactory().buildJavaAssociationOverride(this, createAssociationOverrideOwner());
-		associationOverride.initializeFromResource(associationOverrideResource);
-		return associationOverride;
-	}
-	
-	protected void updateVirtualAssociationOverrides(JavaResourcePersistentType resourcePersistentType) {
-		for (Iterator<String> i = allOverridableAssociationNames(); i.hasNext(); ) {
-			String associationName = i.next();
-			JavaAssociationOverride associationOverride = getAssociationOverrideNamed(associationName);
-			if (associationOverride == null) {
-				associationOverride = buildAssociationOverride(new NullAssociationOverride(resourcePersistentType, associationName));
-				addVirtualAssociationOverride(associationOverride);
-			}
-			else if (associationOverride.isVirtual()) {
-				associationOverride.update(new NullAssociationOverride(resourcePersistentType, associationName));
-			}
-		}
-		
-		Collection<String> associationNames = CollectionTools.collection(allOverridableAssociationNames());
-	
-		//remove any default mappings that are not included in the associationNames collection
-		for (JavaAssociationOverride associationOverride : CollectionTools.iterable(virtualAssociationOverrides())) {
-			if (!associationNames.contains(associationOverride.getName())
-				|| containsSpecifiedAssociationOverride(associationOverride.getName())) {
-				removeVirtualAssociationOverride(associationOverride);
-			}
-		}
-	}
-
-	protected void updateNamedQueries(JavaResourcePersistentType resourcePersistentType) {
-		ListIterator<JavaNamedQuery> namedQueries = namedQueries();
-		ListIterator<JavaResourceNode> resourceNamedQueries = resourcePersistentType.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME);
-		
-		while (namedQueries.hasNext()) {
-			JavaNamedQuery namedQuery = namedQueries.next();
-			if (resourceNamedQueries.hasNext()) {
-				namedQuery.update((NamedQueryAnnotation) resourceNamedQueries.next());
-			}
-			else {
-				removeNamedQuery_(namedQuery);
-			}
-		}
-		
-		while (resourceNamedQueries.hasNext()) {
-			addNamedQuery(namedQueriesSize(), buildNamedQuery((NamedQueryAnnotation) resourceNamedQueries.next()));
-		}
-	}
-	
-	protected void updateNamedNativeQueries(JavaResourcePersistentType resourcePersistentType) {
-		ListIterator<JavaNamedNativeQuery> namedNativeQueries = namedNativeQueries();
-		ListIterator<JavaResourceNode> resourceNamedNativeQueries = resourcePersistentType.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME);
-		
-		while (namedNativeQueries.hasNext()) {
-			JavaNamedNativeQuery namedQuery = namedNativeQueries.next();
-			if (resourceNamedNativeQueries.hasNext()) {
-				namedQuery.update((NamedNativeQueryAnnotation) resourceNamedNativeQueries.next());
-			}
-			else {
-				removeNamedNativeQuery_(namedQuery);
-			}
-		}
-		
-		while (resourceNamedNativeQueries.hasNext()) {
-			addNamedNativeQuery(namedNativeQueriesSize(), buildNamedNativeQuery((NamedNativeQueryAnnotation) resourceNamedNativeQueries.next()));
-		}	
-	}
-	
-	
-	protected JavaNamedQuery buildNamedQuery(NamedQueryAnnotation namedQueryResource) {
-		JavaNamedQuery namedQuery = getJpaFactory().buildJavaNamedQuery(this);
-		namedQuery.initializeFromResource(namedQueryResource);
-		return namedQuery;
-	}
-	
-	protected JavaNamedNativeQuery buildNamedNativeQuery(NamedNativeQueryAnnotation namedNativeQueryResource) {
-		JavaNamedNativeQuery namedNativeQuery = getJpaFactory().buildJavaNamedNativeQuery(this);
-		namedNativeQuery.initializeFromResource(namedNativeQueryResource);
-		return namedNativeQuery;
-	}
-
-	protected void updateIdClass(JavaResourcePersistentType resourcePersistentType) {
-		IdClassAnnotation idClass = (IdClassAnnotation) resourcePersistentType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME);
-		if (idClass != null) {
-			setIdClass_(idClass.getValue());
-		}
-		else {
-			setIdClass_(null);
-		}
-	}
-	
-	protected void updatePersistenceUnitGeneratorsAndQueries() {
-		if (getTableGenerator() != null) {
-			getPersistenceUnit().addGenerator(getTableGenerator());
-		}
-		
-		if (getSequenceGenerator() != null) {
-			getPersistenceUnit().addGenerator(getSequenceGenerator());
-		}
-		
-		for (Query query : CollectionTools.iterable(namedQueries())) {
-			getPersistenceUnit().addQuery(query);
-		}
-		
-		for (Query query : CollectionTools.iterable(namedNativeQueries())) {
-			getPersistenceUnit().addQuery(query);
-		}
-	}
-
-
-	//******************** Code Completion *************************
-
-	@Override
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		result = this.getTable().javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		for (JavaSecondaryTable sTable : CollectionTools.iterable(this.secondaryTables())) {
-			result = sTable.javaCompletionProposals(pos, filter, astRoot);
-			if (result != null) {
-				return result;
-			}
-		}
-		for (JavaPrimaryKeyJoinColumn column : CollectionTools.iterable(this.primaryKeyJoinColumns())) {
-			result = column.javaCompletionProposals(pos, filter, astRoot);
-			if (result != null) {
-				return result;
-			}
-		}
-		for (JavaAttributeOverride override : CollectionTools.iterable(this.attributeOverrides())) {
-			result = override.javaCompletionProposals(pos, filter, astRoot);
-			if (result != null) {
-				return result;
-			}
-		}
-		for (JavaAssociationOverride override : CollectionTools.iterable(this.associationOverrides())) {
-			result = override.javaCompletionProposals(pos, filter, astRoot);
-			if (result != null) {
-				return result;
-			}
-		}
-		result = this.getDiscriminatorColumn().javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		if (this.getTableGenerator() != null) {
-			result = this.getTableGenerator().javaCompletionProposals(pos, filter, astRoot);
-			if (result != null) {
-				return result;
-			}
-		}
-		if (this.getSequenceGenerator() != null) {
-			result = this.getSequenceGenerator().javaCompletionProposals(pos, filter, astRoot);
-			if (result != null) {
-				return result;
-			}
-		}
-		return null;
-	}
-	
-	
-	//********** Validation ********************************************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-		
-		getTable().addToMessages(messages, astRoot);
-		addIdMessages(messages, astRoot);
-		addGeneratorMessages(messages, astRoot);
-		addQueryMessages(messages, astRoot);
-		
-		for (Iterator<JavaSecondaryTable> stream = this.specifiedSecondaryTables(); stream.hasNext();) {
-			stream.next().addToMessages(messages, astRoot);
-		}
-
-		for (Iterator<JavaAttributeOverride> stream = this.attributeOverrides(); stream.hasNext();) {
-			stream.next().addToMessages(messages, astRoot);
-		}
-		
-		for (Iterator<JavaAssociationOverride> stream = this.associationOverrides(); stream.hasNext();) {
-			stream.next().addToMessages(messages, astRoot);
-		}
-		
-	}
-	
-	protected void addIdMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		addNoIdMessage(messages, astRoot);
-	}
-	
-	protected void addNoIdMessage(List<IMessage> messages, CompilationUnit astRoot) {
-		if (entityHasNoId()) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					JpaValidationMessages.ENTITY_NO_ID,
-					new String[] {this.getName()},
-					this, this.getValidationTextRange(astRoot))
-			);
-		}
-	}
-	
-	private boolean entityHasNoId() {
-		return ! this.entityHasId();
-	}
-
-	private boolean entityHasId() {
-		for (Iterator<PersistentAttribute> stream = getPersistentType().allAttributes(); stream.hasNext(); ) {
-			if (stream.next().isIdAttribute()) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	protected void addGeneratorMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		List<Generator> masterList = CollectionTools.list(getPersistenceUnit().allGenerators());
-		
-		for (Iterator<JavaGenerator> stream = this.generators(); stream.hasNext() ; ) {
-			JavaGenerator current = stream.next();
-			masterList.remove(current);
-			
-			for (Generator each : masterList) {
-				if (! each.overrides(current) && each.getName() != null && each.getName().equals(current.getName())) {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.GENERATOR_DUPLICATE_NAME,
-							new String[] {current.getName()},
-							current,
-							current.getNameTextRange(astRoot))
-					);
-				}
-			}
-			
-			masterList.add(current);
-		}
-	}
-	
-	protected void addQueryMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		List<Query> masterList = CollectionTools.list(getPersistenceUnit().allQueries());
-		
-		for (Iterator<JavaQuery> stream = this.queries(); stream.hasNext() ; ) {
-			JavaQuery current = stream.next();
-			masterList.remove(current);
-			
-			for (Query each : masterList) {
-				if (! each.overrides(current) && each.getName() != null && each.getName().equals(current.getName())) {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.QUERY_DUPLICATE_NAME,
-							new String[] {current.getName()},
-							current,
-							current.getNameTextRange(astRoot))
-					);
-				}
-			}
-			
-			masterList.add(current);
-		}
-	}
-	
-	class PrimaryKeyJoinColumnOwner implements JavaBaseJoinColumn.Owner
-	{
-		public TextRange getValidationTextRange(CompilationUnit astRoot) {
-			return GenericJavaEntity.this.getValidationTextRange(astRoot);
-		}
-
-		public TypeMapping getTypeMapping() {
-			return GenericJavaEntity.this;
-		}
-
-		public org.eclipse.jpt.db.Table getDbTable(String tableName) {
-			return GenericJavaEntity.this.getDbTable(tableName);
-		}
-
-		public org.eclipse.jpt.db.Table getDbReferencedColumnTable() {
-			Entity parentEntity = GenericJavaEntity.this.getParentEntity();
-			return (parentEntity == null) ? null : parentEntity.getPrimaryDbTable();
-		}
-
-		public int joinColumnsSize() {
-			return GenericJavaEntity.this.primaryKeyJoinColumnsSize();
-		}
-		
-		public boolean isVirtual(BaseJoinColumn joinColumn) {
-			return GenericJavaEntity.this.defaultPrimaryKeyJoinColumn == joinColumn;
-		}
-		
-		public String getDefaultColumnName() {
-			if (joinColumnsSize() != 1) {
-				return null;
-			}
-			return GenericJavaEntity.this.getParentEntity().getPrimaryKeyColumnName();
-		}
-	}
-	
-	class AttributeOverrideOwner implements AttributeOverride.Owner {
-
-		public ColumnMapping getColumnMapping(String attributeName) {
-			if (attributeName == null) {
-				return null;
-			}
-			for (Iterator<PersistentAttribute> stream = getPersistentType().allAttributes(); stream.hasNext();) {
-				PersistentAttribute persAttribute = stream.next();
-				if (attributeName.equals(persAttribute.getName())) {
-					if (persAttribute.getMapping() instanceof ColumnMapping) {
-						return (ColumnMapping) persAttribute.getMapping();
-					}
-				}
-			}
-			return null;
-		}
-
-		public boolean isVirtual(BaseOverride override) {
-			return GenericJavaEntity.this.virtualAttributeOverrides.contains(override);
-		}
-
-		public BaseOverride setVirtual(boolean virtual, BaseOverride attributeOverride) {
-			return GenericJavaEntity.this.setAttributeOverrideVirtual(virtual, (JavaAttributeOverride) attributeOverride);
-		}
-
-		public TypeMapping getTypeMapping() {
-			return GenericJavaEntity.this;
-		}
-
-		public TextRange validationTextRange(CompilationUnit astRoot) {
-			// TODO Auto-generated method stub
-			return null;
-		}
-	}
-
-	class AssociationOverrideOwner implements AssociationOverride.Owner {
-
-		public RelationshipMapping getRelationshipMapping(String attributeName) {
-			if (attributeName == null) {
-				return null;
-			}
-			for (Iterator<PersistentAttribute> stream = getPersistentType().allAttributes(); stream.hasNext();) {
-				PersistentAttribute persAttribute = stream.next();
-				if (attributeName.equals(persAttribute.getName())) {
-					if (persAttribute.getMapping() instanceof RelationshipMapping) {
-						return (RelationshipMapping) persAttribute.getMapping();
-					}
-				}
-			}
-			return null;
-		}
-
-		public boolean isVirtual(BaseOverride override) {
-			return GenericJavaEntity.this.virtualAssociationOverrides.contains(override);
-		}
-		
-		public BaseOverride setVirtual(boolean virtual, BaseOverride attributeOverride) {
-			return GenericJavaEntity.this.setAssociationOverrideVirtual(virtual, (JavaAssociationOverride) attributeOverride);
-		}
-
-		public TypeMapping getTypeMapping() {
-			return GenericJavaEntity.this;
-		}
-
-		public TextRange validationTextRange(CompilationUnit astRoot) {
-			// TODO Auto-generated method stub
-			return null;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaGeneratedValue.java
deleted file mode 100644
index 7db737a10f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaGeneratedValue.java
+++ /dev/null
@@ -1,114 +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.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.GeneratedValue;
-import org.eclipse.jpt.core.context.GenerationType;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaGeneratedValue;
-import org.eclipse.jpt.core.resource.java.GeneratedValueAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-public class GenericJavaGeneratedValue extends AbstractJavaJpaContextNode implements JavaGeneratedValue
-{
-	protected GenerationType strategy;
-
-	protected String generator;
-
-	protected String defaultGenerator;
-	
-	protected GeneratedValueAnnotation generatedValueResource;
-	
-	public GenericJavaGeneratedValue(JavaAttributeMapping parent) {
-		super(parent);
-	}
-
-	public void initializeFromResource(GeneratedValueAnnotation generatedValue) {
-		this.generatedValueResource = generatedValue;
-		this.strategy = this.strategy(generatedValue);
-		this.generator = this.generator(generatedValue);
-	}
-	
-	public GenerationType getStrategy() {
-		return (this.getSpecifiedStrategy() == null) ? this.getDefaultStrategy() : this.getSpecifiedStrategy();
-	}
-
-	public GenerationType getDefaultStrategy() {
-		return GeneratedValue.DEFAULT_STRATEGY;
-	}
-	
-	public GenerationType getSpecifiedStrategy() {
-		return this.strategy;
-	}
-
-	public void setSpecifiedStrategy(GenerationType newStrategy) {
-		GenerationType oldStrategy = this.strategy;
-		this.strategy = newStrategy;
-		this.generatedValueResource.setStrategy(GenerationType.toJavaResourceModel(newStrategy));
-		firePropertyChanged(GeneratedValue.SPECIFIED_STRATEGY_PROPERTY, oldStrategy, newStrategy);
-	}
-
-	protected void setSpecifiedStrategy_(GenerationType newStrategy) {
-		GenerationType oldStrategy = this.strategy;
-		this.strategy = newStrategy;
-		firePropertyChanged(GeneratedValue.SPECIFIED_STRATEGY_PROPERTY, oldStrategy, newStrategy);
-	}
-
-	public String getGenerator() {
-		return (this.getSpecifiedGenerator() == null) ? this.getDefaultGenerator() : this.getSpecifiedGenerator();
-	}
-
-	public String getSpecifiedGenerator() {
-		return this.generator;
-	}
-
-	public String getDefaultGenerator() {
-		return this.defaultGenerator;
-	}
-	
-	public void setSpecifiedGenerator(String newGenerator) {
-		String oldGenerator = this.generator;
-		this.generator = newGenerator;
-		this.generatedValueResource.setGenerator(newGenerator);
-		firePropertyChanged(GeneratedValue.SPECIFIED_GENERATOR_PROPERTY, oldGenerator, newGenerator);
-	}
-
-	protected void setSpecifiedGenerator_(String newGenerator) {
-		String oldGenerator = this.generator;
-		this.generator = newGenerator;
-		firePropertyChanged(GeneratedValue.SPECIFIED_GENERATOR_PROPERTY, oldGenerator, newGenerator);
-	}
-	
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return this.generatedValueResource.getTextRange(astRoot);
-	}
-
-	public TextRange getGeneratorTextRange(CompilationUnit astRoot) {
-		return this.generatedValueResource.getGeneratorTextRange(astRoot);
-	}
-
-	// ********** resource model -> java context model **********
-
-	public void update(GeneratedValueAnnotation generatedValue) {
-		this.generatedValueResource = generatedValue;
-		this.setSpecifiedStrategy_(this.strategy(generatedValue));
-		this.setSpecifiedGenerator_(this.generator(generatedValue));
-	}
-
-	protected GenerationType strategy(GeneratedValueAnnotation generatedValue) {
-		return GenerationType.fromJavaResourceModel(generatedValue.getStrategy());
-	}
-	
-	protected String generator(GeneratedValueAnnotation generatedValue) {
-		return generatedValue.getGenerator();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaIdMapping.java
deleted file mode 100644
index 0f3b1b3391..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaIdMapping.java
+++ /dev/null
@@ -1,487 +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.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.ColumnMapping;
-import org.eclipse.jpt.core.context.Generator;
-import org.eclipse.jpt.core.context.TemporalType;
-import org.eclipse.jpt.core.context.java.JavaColumn;
-import org.eclipse.jpt.core.context.java.JavaGeneratedValue;
-import org.eclipse.jpt.core.context.java.JavaGenerator;
-import org.eclipse.jpt.core.context.java.JavaIdMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaSequenceGenerator;
-import org.eclipse.jpt.core.context.java.JavaTableGenerator;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.ColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.GeneratedValueAnnotation;
-import org.eclipse.jpt.core.resource.java.IdAnnotation;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation;
-import org.eclipse.jpt.core.resource.java.TableGeneratorAnnotation;
-import org.eclipse.jpt.core.resource.java.TemporalAnnotation;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-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.SingleElementIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<IdAnnotation> implements JavaIdMapping
-{
-	protected final JavaColumn column;
-
-	protected JavaGeneratedValue generatedValue;
-
-	protected TemporalType temporal;
-
-	protected JavaTableGenerator tableGenerator;
-
-	protected JavaSequenceGenerator sequenceGenerator;
-
-	public GenericJavaIdMapping(JavaPersistentAttribute parent) {
-		super(parent);
-		this.column = createJavaColumn();
-	}
-
-	protected JavaColumn createJavaColumn() {
-		return getJpaFactory().buildJavaColumn(this, this);
-	}
-
-	@Override
-	public void initializeFromResource(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		super.initializeFromResource(resourcePersistentAttribute);
-		this.column.initializeFromResource(this.getColumnResource());
-		this.temporal = this.temporal(this.getTemporalResource());
-		this.initializeTableGenerator(resourcePersistentAttribute);
-		this.initializeSequenceGenerator(resourcePersistentAttribute);
-		this.initializeGeneratedValue(resourcePersistentAttribute);
-		this.updatePersistenceUnitGenerators();
-	}
-	
-	protected void initializeTableGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		TableGeneratorAnnotation tableGeneratorResource = tableGenerator(resourcePersistentAttribute);
-		if (tableGeneratorResource != null) {
-			this.tableGenerator = buildTableGenerator(tableGeneratorResource);
-		}
-	}
-	
-	protected void initializeSequenceGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		SequenceGeneratorAnnotation sequenceGeneratorResource = sequenceGenerator(resourcePersistentAttribute);
-		if (sequenceGeneratorResource != null) {
-			this.sequenceGenerator = buildSequenceGenerator(sequenceGeneratorResource);
-		}
-	}
-	
-	protected void initializeGeneratedValue(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		GeneratedValueAnnotation generatedValueResource = generatedValue(resourcePersistentAttribute);
-		if (generatedValueResource != null) {
-			this.generatedValue = buildGeneratedValue(generatedValueResource);
-		}
-	}
-	
-	protected TemporalAnnotation getTemporalResource() {
-		return (TemporalAnnotation) getResourcePersistentAttribute().getNonNullAnnotation(TemporalAnnotation.ANNOTATION_NAME);
-	}
-	
-	public ColumnAnnotation getColumnResource() {
-		return (ColumnAnnotation) getResourcePersistentAttribute().getNonNullAnnotation(ColumnAnnotation.ANNOTATION_NAME);
-	}
-
-	//************** IJavaAttributeMapping implementation ***************
-
-	public String getKey() {
-		return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public String getAnnotationName() {
-		return IdAnnotation.ANNOTATION_NAME;
-	}
-	
-	public Iterator<String> correspondingAnnotationNames() {
-		return new ArrayIterator<String>(
-			JPA.COLUMN,
-			JPA.GENERATED_VALUE,
-			JPA.TEMPORAL,
-			JPA.TABLE_GENERATOR,
-			JPA.SEQUENCE_GENERATOR);
-	}
-
-	public String getDefaultColumnName() {
-		return getAttributeName();
-	}
-	
-	public String getDefaultTableName() {
-		return getTypeMapping().getTableName();
-	}
-
-	//************** IIdMapping implementation ***************
-	
-	public JavaColumn getColumn() {
-		return this.column;
-	}
-
-	public TemporalType getTemporal() {
-		return this.temporal;
-	}
-
-	public void setTemporal(TemporalType newTemporal) {
-		TemporalType oldTemporal = this.temporal;
-		this.temporal = newTemporal;
-		this.getTemporalResource().setValue(TemporalType.toJavaResourceModel(newTemporal));
-		firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal);
-	}
-	
-	/**
-	 * 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 setTemporal_(TemporalType newTemporal) {
-		TemporalType oldTemporal = this.temporal;
-		this.temporal = newTemporal;
-		firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal);
-	}
-	
-	public JavaGeneratedValue addGeneratedValue() {
-		if (getGeneratedValue() != null) {
-			throw new IllegalStateException("gemeratedValue already exists");
-		}
-		this.generatedValue = getJpaFactory().buildJavaGeneratedValue(this);
-		GeneratedValueAnnotation generatedValueResource = (GeneratedValueAnnotation) getResourcePersistentAttribute().addAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME);
-		this.generatedValue.initializeFromResource(generatedValueResource);
-		firePropertyChanged(GENERATED_VALUE_PROPERTY, null, this.generatedValue);
-		return this.generatedValue;
-	}
-	
-	public void removeGeneratedValue() {
-		if (getGeneratedValue() == null) {
-			throw new IllegalStateException("gemeratedValue does not exist, cannot be removed");
-		}
-		JavaGeneratedValue oldGeneratedValue = this.generatedValue;
-		this.generatedValue = null;
-		getResourcePersistentAttribute().removeAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME);
-		firePropertyChanged(GENERATED_VALUE_PROPERTY, oldGeneratedValue, null);
-	}
-	
-	public JavaGeneratedValue getGeneratedValue() {
-		return this.generatedValue;
-	}
-	
-	protected void setGeneratedValue(JavaGeneratedValue newGeneratedValue) {
-		JavaGeneratedValue oldGeneratedValue = this.generatedValue;
-		this.generatedValue = newGeneratedValue;
-		firePropertyChanged(GENERATED_VALUE_PROPERTY, oldGeneratedValue, newGeneratedValue);
-	}
-
-	public JavaTableGenerator addTableGenerator() {
-		if (getTableGenerator() != null) {
-			throw new IllegalStateException("tableGenerator already exists");
-		}
-		this.tableGenerator = getJpaFactory().buildJavaTableGenerator(this);
-		TableGeneratorAnnotation tableGeneratorResource = (TableGeneratorAnnotation) getResourcePersistentAttribute().addAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME);
-		this.tableGenerator.initializeFromResource(tableGeneratorResource);
-		firePropertyChanged(TABLE_GENERATOR_PROPERTY, null, this.tableGenerator);
-		return this.tableGenerator;
-	}
-	
-	public void removeTableGenerator() {
-		if (getTableGenerator() == null) {
-			throw new IllegalStateException("tableGenerator does not exist, cannot be removed");
-		}
-		JavaTableGenerator oldTableGenerator = this.tableGenerator;
-		this.tableGenerator = null;
-		getResourcePersistentAttribute().removeAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME);
-		firePropertyChanged(TABLE_GENERATOR_PROPERTY, oldTableGenerator, null);
-	}
-	
-	public JavaTableGenerator getTableGenerator() {
-		return this.tableGenerator;
-	}
-	
-	protected void setTableGenerator(JavaTableGenerator newTableGenerator) {
-		JavaTableGenerator oldTableGenerator = this.tableGenerator;
-		this.tableGenerator = newTableGenerator;
-		firePropertyChanged(TABLE_GENERATOR_PROPERTY, oldTableGenerator, newTableGenerator);
-	}
-
-	public JavaSequenceGenerator addSequenceGenerator() {
-		if (getSequenceGenerator() != null) {
-			throw new IllegalStateException("sequenceGenerator already exists");
-		}
-		
-		this.sequenceGenerator = getJpaFactory().buildJavaSequenceGenerator(this);
-		SequenceGeneratorAnnotation sequenceGeneratorResource = (SequenceGeneratorAnnotation) getResourcePersistentAttribute().addAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME);
-		this.sequenceGenerator.initializeFromResource(sequenceGeneratorResource);
-		firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, null, this.sequenceGenerator);
-		return this.sequenceGenerator;
-	}
-	
-	public void removeSequenceGenerator() {
-		if (getSequenceGenerator() == null) {
-			throw new IllegalStateException("sequenceGenerator does not exist, cannot be removed");
-		}
-		JavaSequenceGenerator oldSequenceGenerator = this.sequenceGenerator;
-		this.sequenceGenerator = null;
-		getResourcePersistentAttribute().removeAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME);
-		firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, oldSequenceGenerator, null);
-	}
-	
-	public JavaSequenceGenerator getSequenceGenerator() {
-		return this.sequenceGenerator;
-	}
-
-	protected void setSequenceGenerator(JavaSequenceGenerator newSequenceGenerator) {
-		JavaSequenceGenerator oldSequenceGenerator = this.sequenceGenerator;
-		this.sequenceGenerator = newSequenceGenerator;
-		firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, oldSequenceGenerator, newSequenceGenerator);
-	}
-	
-	@SuppressWarnings("unchecked")
-	protected Iterator<JavaGenerator> generators() {
-		return new CompositeIterator<JavaGenerator>(
-			(getSequenceGenerator() == null) ? EmptyIterator.instance() : new SingleElementIterator(getSequenceGenerator()),
-			(getTableGenerator() == null) ? EmptyIterator.instance() : new SingleElementIterator(getTableGenerator()));
-	}
-	
-	@Override
-	public void update(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		super.update(resourcePersistentAttribute);
-		this.column.update(this.getColumnResource());
-		this.setTemporal_(this.temporal(this.getTemporalResource()));
-		this.updateTableGenerator(resourcePersistentAttribute);
-		this.updateSequenceGenerator(resourcePersistentAttribute);
-		this.updateGeneratedValue(resourcePersistentAttribute);
-		this.updatePersistenceUnitGenerators();
-	}
-	
-	protected TemporalType temporal(TemporalAnnotation temporal) {
-		return TemporalType.fromJavaResourceModel(temporal.getValue());
-	}
-
-	protected void updateTableGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		TableGeneratorAnnotation tableGeneratorResource = tableGenerator(resourcePersistentAttribute);
-		if (tableGeneratorResource == null) {
-			if (getTableGenerator() != null) {
-				setTableGenerator(null);
-			}
-		}
-		else {
-			if (getTableGenerator() == null) {
-				setTableGenerator(buildTableGenerator(tableGeneratorResource));
-			}
-			else {
-				getTableGenerator().update(tableGeneratorResource);
-			}
-		}
-	}
-	
-	protected JavaTableGenerator buildTableGenerator(TableGeneratorAnnotation tableGeneratorResource) {
-		JavaTableGenerator tableGenerator = getJpaFactory().buildJavaTableGenerator(this);
-		tableGenerator.initializeFromResource(tableGeneratorResource);
-		return tableGenerator;
-	}
-	
-	protected void updateSequenceGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		SequenceGeneratorAnnotation sequenceGeneratorResource = sequenceGenerator(resourcePersistentAttribute);
-		if (sequenceGeneratorResource == null) {
-			if (getSequenceGenerator() != null) {
-				setSequenceGenerator(null);
-			}
-		}
-		else {
-			if (getSequenceGenerator() == null) {
-				setSequenceGenerator(buildSequenceGenerator(sequenceGeneratorResource));
-			}
-			else {
-				getSequenceGenerator().update(sequenceGeneratorResource);
-			}
-		}
-	}
-	
-	protected JavaSequenceGenerator buildSequenceGenerator(SequenceGeneratorAnnotation sequenceGeneratorResource) {
-		JavaSequenceGenerator sequenceGenerator = getJpaFactory().buildJavaSequenceGenerator(this);
-		sequenceGenerator.initializeFromResource(sequenceGeneratorResource);
-		return sequenceGenerator;
-	}
-	
-	protected void updateGeneratedValue(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		GeneratedValueAnnotation generatedValueResource = generatedValue(resourcePersistentAttribute);
-		if (generatedValueResource == null) {
-			if (getGeneratedValue() != null) {
-				setGeneratedValue(null);
-			}
-		}
-		else {
-			if (getGeneratedValue() == null) {
-				setGeneratedValue(buildGeneratedValue(generatedValueResource));
-			}
-			else {
-				getGeneratedValue().update(generatedValueResource);
-			}
-		}
-	}
-	
-	protected JavaGeneratedValue buildGeneratedValue(GeneratedValueAnnotation generatedValueResource) {
-		JavaGeneratedValue generatedValue = getJpaFactory().buildJavaGeneratedValue(this);
-		generatedValue.initializeFromResource(generatedValueResource);
-		return generatedValue;
-	}
-
-	protected TableGeneratorAnnotation tableGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		return (TableGeneratorAnnotation) resourcePersistentAttribute.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME);
-	}
-	
-	protected SequenceGeneratorAnnotation sequenceGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		return (SequenceGeneratorAnnotation) resourcePersistentAttribute.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME);
-	}
-	
-	protected GeneratedValueAnnotation generatedValue(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		return (GeneratedValueAnnotation) resourcePersistentAttribute.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME);
-	}
-	
-	protected void updatePersistenceUnitGenerators() {
-		if (getTableGenerator() != null) {
-			getPersistenceUnit().addGenerator(getTableGenerator());
-		}
-		
-		if (getSequenceGenerator() != null) {
-			getPersistenceUnit().addGenerator(getSequenceGenerator());
-		}
-	}
-	
-	
-	// *************************************************************************
-
-	@Override
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		result = this.getColumn().javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		return null;
-	}
-
-	@Override
-	public String getPrimaryKeyColumnName() {
-		return this.getColumn().getName();
-	}
-
-	@Override
-	public boolean isOverridableAttributeMapping() {
-		return true;
-	}
-
-	@Override
-	public boolean isIdMapping() {
-		return true;
-	}
-
-	//*********** Validation ************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-		
-		addColumnMessages(messages, astRoot);
-		addGeneratedValueMessages(messages, astRoot);
-		addGeneratorMessages(messages, astRoot);
-	}
-		
-	protected void addColumnMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		JavaColumn column = this.getColumn();
-		String table = column.getTable();
-		boolean doContinue = entityOwned() && column.connectionProfileIsActive();
-		
-		if (doContinue && this.getTypeMapping().tableNameIsInvalid(table)) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.COLUMN_UNRESOLVED_TABLE,
-						new String[] {table, column.getName()}, 
-						column, column.getTableTextRange(astRoot))
-				);
-			doContinue = false;
-		}
-		
-		if (doContinue && ! column.isResolved()) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.COLUMN_UNRESOLVED_NAME,
-						new String[] {column.getName()}, 
-						column, column.getNameTextRange(astRoot))
-				);
-		}
-	}
-	
-	protected void addGeneratedValueMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		JavaGeneratedValue generatedValue = this.getGeneratedValue();
-		if (generatedValue == null) {
-			return;
-		}
-		String generatorName = generatedValue.getGenerator();
-		if (generatorName == null) {
-			return;
-		}
-		
-		for (Generator nextMasterGenerator : CollectionTools.iterable(getPersistenceUnit().allGenerators())) {
-			if (generatorName.equals(nextMasterGenerator.getName())) {
-				return;
-			}
-		}
-		
-		messages.add(
-			DefaultJpaValidationMessages.buildMessage(
-				IMessage.HIGH_SEVERITY,
-				JpaValidationMessages.ID_MAPPING_UNRESOLVED_GENERATOR_NAME,
-				new String[] {generatorName},
-				this,
-				generatedValue.getGeneratorTextRange(astRoot))
-			);
-	}
-	
-	protected void addGeneratorMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		List<Generator> masterList = CollectionTools.list(getPersistenceUnit().allGenerators());
-		
-		for (Iterator<JavaGenerator> stream = this.generators(); stream.hasNext() ; ) {
-			JavaGenerator current = stream.next();
-			masterList.remove(current);
-			
-			for (Generator each : masterList) {
-				if (! each.overrides(current) && each.getName() != null && each.getName().equals(current.getName())) {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.GENERATOR_DUPLICATE_NAME,
-							new String[] {current.getName()},
-							current,
-							current.getNameTextRange(astRoot))
-					);
-				}
-			}
-			
-			masterList.add(current);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaJoinColumn.java
deleted file mode 100644
index 35d5029cef..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaJoinColumn.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.core.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.BaseJoinColumn;
-import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.java.JavaJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.internal.context.MappingTools;
-import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-
-
-public class GenericJavaJoinColumn extends AbstractJavaBaseColumn<JoinColumnAnnotation> implements JavaJoinColumn
-{
-
-	protected String specifiedReferencedColumnName;
-
-	protected String defaultReferencedColumnName;
-
-	protected JoinColumnAnnotation joinColumn;
-	
-	public GenericJavaJoinColumn(JavaJpaContextNode parent, JavaJoinColumn.Owner owner) {
-		super(parent, owner);
-	}
-
-	@Override
-	protected JoinColumnAnnotation getColumnResource() {
-		return this.joinColumn;
-	}
-	
-	public String getReferencedColumnName() {
-		return (this.specifiedReferencedColumnName == null) ? this.defaultReferencedColumnName : this.specifiedReferencedColumnName;
-	}
-
-	public String getSpecifiedReferencedColumnName() {
-		return this.specifiedReferencedColumnName;
-	}
-
-	public void setSpecifiedReferencedColumnName(String newSpecifiedReferencedColumnName) {
-		String oldSpecifiedReferencedColumnName = this.specifiedReferencedColumnName;
-		this.specifiedReferencedColumnName = newSpecifiedReferencedColumnName;
-		this.joinColumn.setReferencedColumnName(newSpecifiedReferencedColumnName);
-		firePropertyChanged(BaseJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, oldSpecifiedReferencedColumnName, newSpecifiedReferencedColumnName);
-	}
-
-	protected void setSpecifiedReferencedColumnName_(String newSpecifiedReferencedColumnName) {
-		String oldSpecifiedReferencedColumnName = this.specifiedReferencedColumnName;
-		this.specifiedReferencedColumnName = newSpecifiedReferencedColumnName;
-		firePropertyChanged(BaseJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, oldSpecifiedReferencedColumnName, newSpecifiedReferencedColumnName);
-	}
-
-	public String getDefaultReferencedColumnName() {
-		return this.defaultReferencedColumnName;
-	}
-
-	protected void setDefaultReferencedColumnName(String newDefaultReferencedColumnName) {
-		String oldDefaultReferencedColumnName = this.defaultReferencedColumnName;
-		this.defaultReferencedColumnName = newDefaultReferencedColumnName;
-		firePropertyChanged(BaseJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY, oldDefaultReferencedColumnName, newDefaultReferencedColumnName);
-	}
-
-
-	@Override
-	public JavaJoinColumn.Owner getOwner() {
-		return (JavaJoinColumn.Owner) super.getOwner();
-	}
-
-	public boolean isVirtual() {
-		return getOwner().isVirtual(this);
-	}
-
-	public Table getDbReferencedColumnTable() {
-		return getOwner().getDbReferencedColumnTable();
-	}
-
-	public Column getDbReferencedColumn() {
-		Table table = this.getDbReferencedColumnTable();
-		return (table == null) ? null : table.columnNamed(this.getReferencedColumnName());
-	}
-
-	@Override
-	public boolean tableIsAllowed() {
-		return this.getOwner().tableIsAllowed();
-	}
-
-	public boolean referencedColumnNameTouches(int pos, CompilationUnit astRoot) {
-		return getColumnResource().referencedColumnNameTouches(pos, astRoot);
-	}
-
-	private Iterator<String> candidateReferencedColumnNames() {
-		Table table = this.getOwner().getDbReferencedColumnTable();
-		return (table != null) ? table.columnNames() : EmptyIterator.<String> instance();
-	}
-
-	private Iterator<String> candidateReferencedColumnNames(Filter<String> filter) {
-		return new FilteringIterator<String, String>(this.candidateReferencedColumnNames(), filter);
-	}
-
-	private Iterator<String> quotedCandidateReferencedColumnNames(Filter<String> filter) {
-		return StringTools.quote(this.candidateReferencedColumnNames(filter));
-	}
-
-	@Override
-	public Iterator<String> connectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.connectedJavaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		if (this.referencedColumnNameTouches(pos, astRoot)) {
-			return this.quotedCandidateReferencedColumnNames(filter);
-		}
-		return null;
-	}
-
-	public boolean isReferencedColumnResolved() {
-		return getDbReferencedColumn() != null;
-	}
-
-	public TextRange getReferencedColumnNameTextRange(CompilationUnit astRoot) {
-		TextRange textRange = getColumnResource().getReferencedColumnNameTextRange(astRoot);
-		return (textRange != null) ? textRange : getOwner().getValidationTextRange(astRoot);
-	}
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	@Override
-	public void initializeFromResource(JoinColumnAnnotation joinColumn) {
-		this.joinColumn = joinColumn;
-		super.initializeFromResource(joinColumn);
-		this.specifiedReferencedColumnName = joinColumn.getReferencedColumnName();
-		this.defaultReferencedColumnName = this.defaultReferencedColumnName();
-	}
-	
-	@Override
-	public void update(JoinColumnAnnotation joinColumn) {
-		this.joinColumn = joinColumn;
-		super.update(joinColumn);
-		this.setSpecifiedReferencedColumnName_(joinColumn.getReferencedColumnName());
-		this.setDefaultReferencedColumnName(this.defaultReferencedColumnName());
-	}
-	
-	@Override
-	protected String defaultName() {
-		RelationshipMapping relationshipMapping = getOwner().getRelationshipMapping();
-		if (relationshipMapping == null) {
-			return null;
-		}
-		if (!getOwner().getRelationshipMapping().isRelationshipOwner()) {
-			return null;
-		}
-		return MappingTools.buildJoinColumnDefaultName(this);
-	}
-	
-	protected String defaultReferencedColumnName() {
-		RelationshipMapping relationshipMapping = getOwner().getRelationshipMapping();
-		if (relationshipMapping == null) {
-			return null;
-		}
-		if (!getOwner().getRelationshipMapping().isRelationshipOwner()) {
-			return null;
-		}
-		return MappingTools.buildJoinColumnDefaultReferencedColumnName(this);
-	}
-	
-	@Override
-	protected String defaultTable() {
-		RelationshipMapping relationshipMapping = getOwner().getRelationshipMapping();
-		if (relationshipMapping == null) {
-			return null;
-		}
-		if (!getOwner().getRelationshipMapping().isRelationshipOwner()) {
-			return null;
-		}
-		return super.defaultTable();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaJoinTable.java
deleted file mode 100644
index b759f0e36f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaJoinTable.java
+++ /dev/null
@@ -1,739 +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.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.AttributeMapping;
-import org.eclipse.jpt.core.context.BaseJoinColumn;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.JoinColumn;
-import org.eclipse.jpt.core.context.JoinTable;
-import org.eclipse.jpt.core.context.NonOwningMapping;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.TypeMapping;
-import org.eclipse.jpt.core.context.java.JavaJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaJoinTable;
-import org.eclipse.jpt.core.context.java.JavaRelationshipMapping;
-import org.eclipse.jpt.core.internal.context.MappingTools;
-import org.eclipse.jpt.core.internal.resource.java.NullJoinColumn;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.JoinTableAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinTable
-{
-	protected final List<JavaJoinColumn> specifiedJoinColumns;
-
-	protected JavaJoinColumn defaultJoinColumn;
-
-	protected final List<JavaJoinColumn> specifiedInverseJoinColumns;
-
-	protected JavaJoinColumn defaultInverseJoinColumn;
-	
-	protected JavaResourcePersistentAttribute attributeResource;
-	
-	public GenericJavaJoinTable(JavaRelationshipMapping parent) {
-		super(parent);
-		this.specifiedJoinColumns = new ArrayList<JavaJoinColumn>();
-		this.specifiedInverseJoinColumns = new ArrayList<JavaJoinColumn>();
-	}
-	
-	@Override
-	public JavaRelationshipMapping getParent() {
-		return (JavaRelationshipMapping) super.getParent();
-	}
-	
-	//******************* AbstractJavaTable implementation *****************
-
-	@Override
-	protected String getAnnotationName() {
-		return JoinTableAnnotation.ANNOTATION_NAME;
-	}
-	
-	/**
-	 * Default join table name from the JPA spec:
-	 * 	The concatenated names of the two associated primary
-	 * 	entity tables, separated by a underscore.
-	 * 
-	 * [owning table name]_[target table name]
-	 */
-	@Override
-	protected String defaultName() {
-		return MappingTools.buildJoinTableDefaultName(getRelationshipMapping());
-	}
-
-	@Override
-	protected String defaultCatalog() {
-		if (!getRelationshipMapping().isRelationshipOwner()) {
-			return null;
-		}
-		return super.defaultCatalog();
-	}
-	
-	@Override
-	protected String defaultSchema() {
-		if (!getRelationshipMapping().isRelationshipOwner()) {
-			return null;
-		}
-		return super.defaultSchema();
-	}
-	
-	@Override
-	protected JoinTableAnnotation getTableResource() {
-		return (JoinTableAnnotation) this.attributeResource.getNonNullAnnotation(JoinTableAnnotation.ANNOTATION_NAME);
-	}
-	
-	/**
-	 * Return the join table java resource, null if the annotation does not exist.
-	 * Use tableResource() if you want a non null implementation
-	 */
-	protected JoinTableAnnotation getJoinTableResource() {
-		return (JoinTableAnnotation) this.attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME);
-	}
-	
-	protected void addJoinTableResource() {
-		this.attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME);
-	}
-	
-	
-	//******************* IJoinTable implementation *****************
-
-	public ListIterator<JavaJoinColumn> joinColumns() {
-		return this.containsSpecifiedJoinColumns() ? this.specifiedJoinColumns() : this.defaultJoinColumns();
-	}
-
-	public int joinColumnsSize() {
-		return this.containsSpecifiedJoinColumns() ? this.specifiedJoinColumnsSize() : this.defaultJoinColumnsSize();
-	}
-	
-	public JavaJoinColumn getDefaultJoinColumn() {
-		return this.defaultJoinColumn;
-	}
-	
-	protected void setDefaultJoinColumn(JavaJoinColumn newJoinColumn) {
-		JavaJoinColumn oldJoinColumn = this.defaultJoinColumn;
-		this.defaultJoinColumn = newJoinColumn;
-		firePropertyChanged(JoinTable.DEFAULT_JOIN_COLUMN, oldJoinColumn, newJoinColumn);
-	}
-
-	protected ListIterator<JavaJoinColumn> defaultJoinColumns() {
-		if (this.defaultJoinColumn != null) {
-			return new SingleElementListIterator<JavaJoinColumn>(this.defaultJoinColumn);
-		}
-		return EmptyListIterator.instance();
-	}
-	
-	protected int defaultJoinColumnsSize() {
-		return (this.defaultJoinColumn == null) ? 0 : 1;
-	}
-	
-	public ListIterator<JavaJoinColumn> specifiedJoinColumns() {
-		return new CloneListIterator<JavaJoinColumn>(this.specifiedJoinColumns);
-	}
-
-	public int specifiedJoinColumnsSize() {
-		return this.specifiedJoinColumns.size();
-	}
-
-	public boolean containsSpecifiedJoinColumns() {
-		return !this.specifiedJoinColumns.isEmpty();
-	}
-
-	public JavaJoinColumn addSpecifiedJoinColumn(int index) {
-		JoinColumn oldDefaultJoinColumn = this.getDefaultJoinColumn();
-		if (oldDefaultJoinColumn != null) {
-			//null the default join column now if one already exists.
-			//if one does not exist, there is already a specified join column.
-			//Remove it now so that it doesn't get removed during an update and
-			//cause change notifications to be sent to the UI in the wrong order
-			this.defaultJoinColumn = null;
-		}
-		if (getJoinTableResource() == null) {
-			//Add the JoinTable before creating the specifiedJoinColumn.
-			//Otherwise we will remove it and create another during an update
-			//from the java resource model
-			addJoinTableResource();
-		}
-		JavaJoinColumn joinColumn = getJpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner());
-		this.specifiedJoinColumns.add(index, joinColumn);
-		JoinColumnAnnotation joinColumnResource = this.getTableResource().addJoinColumn(index);
-		joinColumn.initializeFromResource(joinColumnResource);
-		this.fireItemAdded(JoinTable.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn);
-		if (oldDefaultJoinColumn != null) {
-			this.firePropertyChanged(JoinTable.DEFAULT_JOIN_COLUMN, oldDefaultJoinColumn, null);
-		}
-		return joinColumn;
-	}
-
-	protected void addSpecifiedJoinColumn(int index, JavaJoinColumn joinColumn) {
-		addItemToList(index, joinColumn, this.specifiedJoinColumns, JoinTable.SPECIFIED_JOIN_COLUMNS_LIST);
-	}
-		
-	public void removeSpecifiedJoinColumn(JoinColumn joinColumn) {
-		this.removeSpecifiedJoinColumn(this.specifiedJoinColumns.indexOf(joinColumn));
-	}
-	
-	public void removeSpecifiedJoinColumn(int index) {
-		JavaJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index);
-		if (!containsSpecifiedJoinColumns()) {
-			//create the defaultJoinColumn now or this will happen during project update 
-			//after removing the join column from the resource model. That causes problems 
-			//in the UI because the change notifications end up in the wrong order.
-			this.defaultJoinColumn = buildJoinColumn(new NullJoinColumn(getTableResource()));
-		}
-		this.getTableResource().removeJoinColumn(index);
-		fireItemRemoved(JoinTable.SPECIFIED_JOIN_COLUMNS_LIST, index, removedJoinColumn);
-		if (this.defaultJoinColumn != null) {
-			//fire change notification if a defaultJoinColumn was created above
-			this.firePropertyChanged(JoinTable.DEFAULT_JOIN_COLUMN, null, this.defaultJoinColumn);		
-		}
-	}
-
-	protected void removeSpecifiedJoinColumn_(JavaJoinColumn joinColumn) {
-		removeItemFromList(joinColumn, this.specifiedJoinColumns, JoinTable.SPECIFIED_JOIN_COLUMNS_LIST);
-	}
-	
-	public void moveSpecifiedJoinColumn(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.specifiedJoinColumns, targetIndex, sourceIndex);
-		this.getTableResource().moveJoinColumn(targetIndex, sourceIndex);
-		fireItemMoved(JoinTable.SPECIFIED_JOIN_COLUMNS_LIST, targetIndex, sourceIndex);		
-	}
-
-	public ListIterator<JavaJoinColumn> inverseJoinColumns() {
-		return this.containsSpecifiedInverseJoinColumns() ? this.specifiedInverseJoinColumns() : this.defaultInverseJoinColumns();
-	}
-
-	public int inverseJoinColumnsSize() {
-		return this.containsSpecifiedInverseJoinColumns() ? this.specifiedInverseJoinColumnsSize() : this.defaultInverseJoinColumnsSize();
-	}
-	
-	public JavaJoinColumn getDefaultInverseJoinColumn() {
-		return this.defaultInverseJoinColumn;
-	}
-	
-	protected void setDefaultInverseJoinColumn(JavaJoinColumn newInverseJoinColumn) {
-		JavaJoinColumn oldInverseJoinColumn = this.defaultInverseJoinColumn;
-		this.defaultInverseJoinColumn = newInverseJoinColumn;
-		firePropertyChanged(JoinTable.DEFAULT_INVERSE_JOIN_COLUMN, oldInverseJoinColumn, newInverseJoinColumn);
-	}
-	
-	protected ListIterator<JavaJoinColumn> defaultInverseJoinColumns() {
-		if (this.defaultInverseJoinColumn != null) {
-			return new SingleElementListIterator<JavaJoinColumn>(this.defaultInverseJoinColumn);
-		}
-		return EmptyListIterator.instance();
-	}
-
-	protected int defaultInverseJoinColumnsSize() {
-		return (this.defaultInverseJoinColumn == null) ? 0 : 1;
-	}
-	
-	public ListIterator<JavaJoinColumn> specifiedInverseJoinColumns() {
-		return new CloneListIterator<JavaJoinColumn>(this.specifiedInverseJoinColumns);
-	}
-
-	public int specifiedInverseJoinColumnsSize() {
-		return this.specifiedInverseJoinColumns.size();
-	}
-
-	public boolean containsSpecifiedInverseJoinColumns() {
-		return !this.specifiedInverseJoinColumns.isEmpty();
-	}
-
-	public JavaJoinColumn addSpecifiedInverseJoinColumn(int index) {
-		JoinColumn oldDefaultInverseJoinColumn = this.getDefaultInverseJoinColumn();
-		if (oldDefaultInverseJoinColumn != null) {
-			//null the default join column now if one already exists.
-			//if one does not exist, there is already a specified join column.
-			//Remove it now so that it doesn't get removed during an update and
-			//cause change notifications to be sent to the UI in the wrong order
-			this.defaultInverseJoinColumn = null;
-		}
-		if (getJoinTableResource() == null) {
-			//Add the JoinTable before creating the specifiedJoinColumn.
-			//Otherwise we will remove it and create another during an update
-			//from the java resource model
-			addJoinTableResource();
-		}
-		JavaJoinColumn inverseJoinColumn = getJpaFactory().buildJavaJoinColumn(this, createInverseJoinColumnOwner());
-		this.specifiedInverseJoinColumns.add(index, inverseJoinColumn);
-		JoinColumnAnnotation joinColumnResource = this.getTableResource().addInverseJoinColumn(index);
-		inverseJoinColumn.initializeFromResource(joinColumnResource);
-		this.fireItemAdded(JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST, index, inverseJoinColumn);
-		if (oldDefaultInverseJoinColumn != null) {
-			this.firePropertyChanged(JoinTable.DEFAULT_INVERSE_JOIN_COLUMN, oldDefaultInverseJoinColumn, null);
-		}
-		return inverseJoinColumn;
-	}
-	
-	protected void addSpecifiedInverseJoinColumn(int index, JavaJoinColumn inverseJoinColumn) {
-		addItemToList(index, inverseJoinColumn, this.specifiedInverseJoinColumns, JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST);
-	}
-	
-	public void removeSpecifiedInverseJoinColumn(JoinColumn inverseJoinColumn) {
-		this.removeSpecifiedInverseJoinColumn(this.specifiedInverseJoinColumns.indexOf(inverseJoinColumn));
-	}
-
-	public void removeSpecifiedInverseJoinColumn(int index) {
-		JavaJoinColumn removedJoinColumn = this.specifiedInverseJoinColumns.remove(index);
-		if (!containsSpecifiedInverseJoinColumns()) {
-			//create the defaultJoinColumn now or this will happen during project update 
-			//after removing the join column from the resource model. That causes problems 
-			//in the UI because the change notifications end up in the wrong order.
-			this.defaultInverseJoinColumn = buildInverseJoinColumn(new NullJoinColumn(getTableResource()));
-		}
-		this.getTableResource().removeInverseJoinColumn(index);
-		fireItemRemoved(JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST, index, removedJoinColumn);
-		if (this.defaultInverseJoinColumn != null) {
-			//fire change notification if a defaultJoinColumn was created above
-			this.firePropertyChanged(JoinTable.DEFAULT_INVERSE_JOIN_COLUMN, null, this.defaultInverseJoinColumn);		
-		}
-	}
-
-	protected void removeSpecifiedInverseJoinColumn_(JavaJoinColumn joinColumn) {
-		removeItemFromList(joinColumn, this.specifiedInverseJoinColumns, JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST);
-	}
-	
-	public void moveSpecifiedInverseJoinColumn(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.specifiedInverseJoinColumns, targetIndex, sourceIndex);
-		this.getTableResource().moveInverseJoinColumn(targetIndex, sourceIndex);
-		fireItemMoved(JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST, targetIndex, sourceIndex);		
-	}
-
-
-	public RelationshipMapping getRelationshipMapping() {
-		return this.getParent();
-	}
-
-	public boolean isSpecified() {
-		return getJoinTableResource() != null;
-	}
-
-	@Override
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		for (JavaJoinColumn column : CollectionTools.iterable(this.joinColumns())) {
-			result = column.javaCompletionProposals(pos, filter, astRoot);
-			if (result != null) {
-				return result;
-			}
-		}
-		for (JavaJoinColumn column : CollectionTools.iterable(this.inverseJoinColumns())) {
-			result = column.javaCompletionProposals(pos, filter, astRoot);
-			if (result != null) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	protected JavaJoinColumn.Owner createJoinColumnOwner() {
-		return new JoinColumnOwner();
-	}
-	
-	protected JavaJoinColumn.Owner createInverseJoinColumnOwner() {
-		return new InverseJoinColumnOwner();
-	}
-
-	public void initializeFromResource(JavaResourcePersistentAttribute attributeResource) {
-		this.attributeResource = attributeResource;
-		JoinTableAnnotation joinTable = getTableResource();
-		this.initializeFromResource(joinTable);
-		this.initializeSpecifiedJoinColumns(joinTable);
-		this.initializeDefaultJoinColumn(joinTable);
-		this.initializeSpecifiedInverseJoinColumns(joinTable);
-		this.initializeDefaultInverseJoinColumn(joinTable);
-	}
-
-	protected void initializeSpecifiedJoinColumns(JoinTableAnnotation joinTableResource) {
-		ListIterator<JoinColumnAnnotation> annotations = joinTableResource.joinColumns();
-		
-		while(annotations.hasNext()) {
-			this.specifiedJoinColumns.add(buildJoinColumn(annotations.next()));
-		}
-	}
-	
-	protected boolean shouldBuildDefaultJoinColumn() {
-		return !containsSpecifiedJoinColumns() && getRelationshipMapping().isRelationshipOwner();
-	}
-	
-	protected void initializeDefaultJoinColumn(JoinTableAnnotation joinTable) {
-		if (!shouldBuildDefaultJoinColumn()) {
-			return;
-		}
-		this.defaultJoinColumn = buildJoinColumn(new NullJoinColumn(joinTable));
-	}	
-	
-	protected void initializeSpecifiedInverseJoinColumns(JoinTableAnnotation joinTableResource) {
-		ListIterator<JoinColumnAnnotation> annotations = joinTableResource.inverseJoinColumns();
-		
-		while(annotations.hasNext()) {
-			this.specifiedInverseJoinColumns.add(buildInverseJoinColumn(annotations.next()));
-		}
-	}
-	
-	protected boolean shouldBuildDefaultInverseJoinColumn() {
-		return !containsSpecifiedInverseJoinColumns() && getRelationshipMapping().isRelationshipOwner();
-	}
-	
-	protected void initializeDefaultInverseJoinColumn(JoinTableAnnotation joinTable) {
-		if (!shouldBuildDefaultInverseJoinColumn()) {
-			return;
-		}
-		this.defaultInverseJoinColumn = buildInverseJoinColumn(new NullJoinColumn(joinTable));		
-	}
-		
-	public void update(JavaResourcePersistentAttribute attributeResource) {
-		this.attributeResource = attributeResource;
-		JoinTableAnnotation joinTable = getTableResource();
-		this.update(joinTable);
-		this.updateSpecifiedJoinColumns(joinTable);
-		this.updateDefaultJoinColumn(joinTable);
-		this.updateSpecifiedInverseJoinColumns(joinTable);
-		this.updateDefaultInverseJoinColumn(joinTable);
-	}
-	
-	protected void updateSpecifiedJoinColumns(JoinTableAnnotation joinTableResource) {
-		ListIterator<JavaJoinColumn> joinColumns = specifiedJoinColumns();
-		ListIterator<JoinColumnAnnotation> resourceJoinColumns = joinTableResource.joinColumns();
-		
-		while (joinColumns.hasNext()) {
-			JavaJoinColumn joinColumn = joinColumns.next();
-			if (resourceJoinColumns.hasNext()) {
-				joinColumn.update(resourceJoinColumns.next());
-			}
-			else {
-				removeSpecifiedJoinColumn_(joinColumn);
-			}
-		}
-		
-		while (resourceJoinColumns.hasNext()) {
-			addSpecifiedJoinColumn(specifiedJoinColumnsSize(), buildJoinColumn(resourceJoinColumns.next()));
-		}
-	}
-	
-	protected void updateDefaultJoinColumn(JoinTableAnnotation joinTable) {
-		if (!shouldBuildDefaultJoinColumn()) {
-			setDefaultJoinColumn(null);
-			return;
-		}
-		if (getDefaultJoinColumn() == null) {
-			this.setDefaultJoinColumn(buildJoinColumn(new NullJoinColumn(joinTable)));
-		}
-		else {
-			this.defaultJoinColumn.update(new NullJoinColumn(joinTable));
-		}
-	}	
-
-	protected void updateSpecifiedInverseJoinColumns(JoinTableAnnotation joinTableResource) {
-		ListIterator<JavaJoinColumn> joinColumns = specifiedInverseJoinColumns();
-		ListIterator<JoinColumnAnnotation> resourceJoinColumns = joinTableResource.inverseJoinColumns();
-		
-		while (joinColumns.hasNext()) {
-			JavaJoinColumn joinColumn = joinColumns.next();
-			if (resourceJoinColumns.hasNext()) {
-				joinColumn.update(resourceJoinColumns.next());
-			}
-			else {
-				removeSpecifiedInverseJoinColumn_(joinColumn);
-			}
-		}
-		
-		while (resourceJoinColumns.hasNext()) {
-			addSpecifiedInverseJoinColumn(specifiedInverseJoinColumnsSize(), buildInverseJoinColumn(resourceJoinColumns.next()));
-		}
-	}
-	
-	protected void updateDefaultInverseJoinColumn(JoinTableAnnotation joinTable) {
-		if (!shouldBuildDefaultInverseJoinColumn()) {
-			setDefaultInverseJoinColumn(null);
-			return;
-		}
-		if (getDefaultInverseJoinColumn() == null) {
-			this.setDefaultInverseJoinColumn(buildInverseJoinColumn(new NullJoinColumn(joinTable)));
-		}
-		else {
-			this.defaultInverseJoinColumn.update(new NullJoinColumn(joinTable));
-		}
-	}	
-	
-	protected JavaJoinColumn buildJoinColumn(JoinColumnAnnotation joinColumnResource) {
-		JavaJoinColumn joinColumn = getJpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner());
-		joinColumn.initializeFromResource(joinColumnResource);
-		return joinColumn;
-	}
-	
-	protected JavaJoinColumn buildInverseJoinColumn(JoinColumnAnnotation joinColumnResource) {
-		JavaJoinColumn joinColumn = getJpaFactory().buildJavaJoinColumn(this, createInverseJoinColumnOwner());
-		joinColumn.initializeFromResource(joinColumnResource);
-		return joinColumn;
-	}
-
-	
-	//********************* validation ********************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-		boolean doContinue = connectionProfileIsActive();
-		String schema = getSchema();
-		
-		if (doContinue && ! hasResolvedSchema()) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.JOIN_TABLE_UNRESOLVED_SCHEMA,
-						new String[] {schema, getName()}, 
-						this, 
-						getSchemaTextRange(astRoot))
-				);
-			doContinue = false;
-		}
-		
-		if (doContinue && !isResolved()) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.JOIN_TABLE_UNRESOLVED_NAME,
-						new String[] {getName()}, 
-						this, 
-						getNameTextRange(astRoot))
-				);
-			doContinue = false;
-		}
-		
-		for (Iterator<JavaJoinColumn> stream = joinColumns(); stream.hasNext(); ) {
-			JavaJoinColumn joinColumn = stream.next();
-			
-			if (doContinue && ! joinColumn.isResolved()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_NAME,
-						new String[] {joinColumn.getName()}, 
-						joinColumn, joinColumn.getNameTextRange(astRoot))
-				);
-			}
-			
-			if (doContinue && ! joinColumn.isReferencedColumnResolved()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME,
-						new String[] {joinColumn.getReferencedColumnName(), joinColumn.getName()}, 
-						joinColumn, joinColumn.getReferencedColumnNameTextRange(astRoot))
-				);
-			}
-		}
-		
-		for (Iterator<JavaJoinColumn> stream = inverseJoinColumns(); stream.hasNext(); ) {
-			JavaJoinColumn joinColumn = stream.next();
-			
-			if (doContinue && ! joinColumn.isResolved()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_NAME,
-						new String[] {joinColumn.getName()}, 
-						joinColumn, joinColumn.getNameTextRange(astRoot))
-				);
-			}
-			
-			if (doContinue && ! joinColumn.isReferencedColumnResolved()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME,
-						new String[] {joinColumn.getReferencedColumnName(), joinColumn.getName()}, 
-						joinColumn, joinColumn.getReferencedColumnNameTextRange(astRoot))
-				);
-			}
-		}
-	}		
-	
-	/**
-	 * just a little common behavior
-	 */
-	abstract class AbstractJoinColumnOwner implements JavaJoinColumn.Owner
-	{
-		AbstractJoinColumnOwner() {
-			super();
-		}
-
-		public TypeMapping getTypeMapping() {
-			return getRelationshipMapping().getTypeMapping();
-		}
-		
-		public RelationshipMapping getRelationshipMapping() {
-			return GenericJavaJoinTable.this.getRelationshipMapping();
-		}
-
-		/**
-		 * the default table name is always valid and a specified table name
-		 * is prohibited (which will be handled elsewhere)
-		 */
-		public boolean tableNameIsInvalid(String tableName) {
-			return false;
-		}
-
-		/**
-		 * the join column can only be on the join table itself
-		 */
-		public boolean tableIsAllowed() {
-			return false;
-		}
-
-		public org.eclipse.jpt.db.Table getDbTable(String tableName) {
-			if (GenericJavaJoinTable.this.getName() == null) {
-				return null;
-			}
-			return (GenericJavaJoinTable.this.getName().equals(tableName)) ? GenericJavaJoinTable.this.getDbTable() : null;
-		}
-		
-		/**
-		 * by default, the join column is, obviously, in the join table;
-		 * not sure whether it can be anywhere else...
-		 */
-		public String getDefaultTableName() {
-			return GenericJavaJoinTable.this.getName();
-		}
-		
-		public TextRange getValidationTextRange(CompilationUnit astRoot) {
-			return GenericJavaJoinTable.this.getValidationTextRange(astRoot);
-		}
-	}
-
-
-	/**
-	 * owner for "forward-pointer" JoinColumns;
-	 * these point at the target/inverse entity
-	 */
-	class InverseJoinColumnOwner extends AbstractJoinColumnOwner
-	{
-		public InverseJoinColumnOwner() {
-			super();
-		}
-
-		public Entity getTargetEntity() {
-			return GenericJavaJoinTable.this.getRelationshipMapping().getResolvedTargetEntity();
-		}
-
-		public String getAttributeName() {
-			return GenericJavaJoinTable.this.getRelationshipMapping().getPersistentAttribute().getName();
-		}
-
-		@Override
-		public org.eclipse.jpt.db.Table getDbTable(String tableName) {
-			org.eclipse.jpt.db.Table dbTable = super.getDbTable(tableName);
-			if (dbTable != null) {
-				return dbTable;
-			}
-			Entity targetEntity = getTargetEntity();
-			return (targetEntity == null) ? null : targetEntity.getDbTable(tableName);
-		}
-
-		public org.eclipse.jpt.db.Table getDbReferencedColumnTable() {
-			Entity targetEntity = getTargetEntity();
-			return (targetEntity == null) ? null : targetEntity.getPrimaryDbTable();
-		}
-		
-		public boolean isVirtual(BaseJoinColumn joinColumn) {
-			return GenericJavaJoinTable.this.defaultInverseJoinColumn == joinColumn;
-		}
-		
-		public String getDefaultColumnName() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-		
-		public int joinColumnsSize() {
-			return GenericJavaJoinTable.this.inverseJoinColumnsSize();
-		}
-	}
-
-
-	/**
-	 * owner for "back-pointer" JoinColumns;
-	 * these point at the source/owning entity
-	 */
-	class JoinColumnOwner extends AbstractJoinColumnOwner
-	{
-		public JoinColumnOwner() {
-			super();
-		}
-
-		public Entity getTargetEntity() {
-			return GenericJavaJoinTable.this.getRelationshipMapping().getEntity();
-		}
-
-		public String getAttributeName() {
-			Entity targetEntity = GenericJavaJoinTable.this.getRelationshipMapping().getResolvedTargetEntity();
-			if (targetEntity == null) {
-				return null;
-			}
-			String attributeName = GenericJavaJoinTable.this.getRelationshipMapping().getPersistentAttribute().getName();
-			for (Iterator<PersistentAttribute> stream = targetEntity.getPersistentType().allAttributes(); stream.hasNext();) {
-				PersistentAttribute attribute = stream.next();
-				AttributeMapping mapping = attribute.getMapping();
-				if (mapping instanceof NonOwningMapping) {
-					String mappedBy = ((NonOwningMapping) mapping).getMappedBy();
-					if ((mappedBy != null) && mappedBy.equals(attributeName)) {
-						return attribute.getName();
-					}
-				}
-			}
-			return null;
-		}
-
-		@Override
-		public org.eclipse.jpt.db.Table getDbTable(String tableName) {
-			org.eclipse.jpt.db.Table dbTable = super.getDbTable(tableName);
-			if (dbTable != null) {
-				return dbTable;
-			}
-			return getTypeMapping().getDbTable(tableName);
-		}
-
-		public org.eclipse.jpt.db.Table getDbReferencedColumnTable() {
-			return getTypeMapping().getPrimaryDbTable();
-		}
-		
-		public boolean isVirtual(BaseJoinColumn joinColumn) {
-			return GenericJavaJoinTable.this.defaultJoinColumn == joinColumn;
-		}
-		
-		public String getDefaultColumnName() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-		
-		public int joinColumnsSize() {
-			return GenericJavaJoinTable.this.joinColumnsSize();
-		}
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToManyMapping.java
deleted file mode 100644
index 3d9bf0eebe..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToManyMapping.java
+++ /dev/null
@@ -1,83 +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.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.java.JavaManyToManyMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.ManyToManyAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericJavaManyToManyMapping extends AbstractJavaMultiRelationshipMapping<ManyToManyAnnotation>
-	implements JavaManyToManyMapping
-{
-	
-	public GenericJavaManyToManyMapping(JavaPersistentAttribute parent) {
-		super(parent);
-	}
-
-	public String getKey() {
-		return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public String getAnnotationName() {
-		return ManyToManyAnnotation.ANNOTATION_NAME;
-	}
-
-	public Iterator<String> correspondingAnnotationNames() {
-		return new ArrayIterator<String>(
-			JPA.ORDER_BY,
-			JPA.MAP_KEY,
-			JPA.JOIN_TABLE);
-	}
-		
-	// ********** JavaMultiRelationshipMapping implementation **********
-
-	@Override
-	protected boolean mappedByTouches(int pos, CompilationUnit astRoot) {
-		return this.getMappingResource().mappedByTouches(pos, astRoot);
-	}
-	
-	
-	@Override
-	protected void setMappedByOnResourceModel(String mappedBy) {
-		getMappingResource().setMappedBy(mappedBy);
-	}
-	
-	@Override
-	protected String mappedBy(ManyToManyAnnotation relationshipMapping) {
-		return relationshipMapping.getMappedBy();
-	}
-	
-	// ********** INonOwningMapping implementation **********
-	
-	public boolean mappedByIsValid(AttributeMapping mappedByMapping) {
-		String mappedByKey = mappedByMapping.getKey();
-		return (mappedByKey == MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY);
-	}
-	
-	@Override
-	public TextRange getMappedByTextRange(CompilationUnit astRoot) {
-		return this.getMappingResource().getMappedByTextRange(astRoot);
-	}
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToOneMapping.java
deleted file mode 100644
index c11ca44d2c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToOneMapping.java
+++ /dev/null
@@ -1,70 +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.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.java.JavaManyToOneMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.ManyToOneAnnotation;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class GenericJavaManyToOneMapping extends AbstractJavaSingleRelationshipMapping<ManyToOneAnnotation>
-	implements JavaManyToOneMapping
-{
-
-	public GenericJavaManyToOneMapping(JavaPersistentAttribute parent) {
-		super(parent);
-	}
-
-	public Iterator<String> correspondingAnnotationNames() {
-		return new ArrayIterator<String>(
-			JPA.JOIN_COLUMN,
-			JPA.JOIN_COLUMNS,
-			JPA.JOIN_TABLE);
-	}
-
-	public String getAnnotationName() {
-		return ManyToOneAnnotation.ANNOTATION_NAME;
-	}
-
-	public String getKey() {
-		return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	@Override
-	public boolean isOverridableAssociationMapping() {
-		return true;
-	}
-	
-	@Override
-	protected void setOptionalOnResourceModel(Boolean newOptional) {
-		this.getMappingResource().setOptional(newOptional);
-	}
-	
-	@Override
-	protected Boolean specifiedOptional(ManyToOneAnnotation relationshipMapping) {
-		return relationshipMapping.getOptional();
-	}
-	
-	//ManyToOne mapping is always the owning side
-	public boolean isRelationshipOwner() {
-		return true;
-	}
-
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaMappedSuperclass.java
deleted file mode 100644
index 240ee74e52..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaMappedSuperclass.java
+++ /dev/null
@@ -1,170 +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.core.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.IdClass;
-import org.eclipse.jpt.core.context.java.JavaMappedSuperclass;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.resource.java.IdClassAnnotation;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.resource.java.MappedSuperclassAnnotation;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-
-public class GenericJavaMappedSuperclass extends AbstractJavaTypeMapping
-	implements JavaMappedSuperclass
-{
-
-	protected String idClass;
-
-	public GenericJavaMappedSuperclass(JavaPersistentType parent) {
-		super(parent);
-	}
-
-	public boolean isMapped() {
-		return true;
-	}
-
-	public String getKey() {
-		return MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY;
-	}
-
-	public String getAnnotationName() {
-		return MappedSuperclassAnnotation.ANNOTATION_NAME;
-	}
-	
-	public Iterator<String> correspondingAnnotationNames() {
-		return new ArrayIterator<String>(
-			JPA.ID_CLASS,
-			JPA.EXCLUDE_DEFAULT_LISTENERS,
-			JPA.EXCLUDE_SUPERCLASS_LISTENERS,
-			JPA.ENTITY_LISTENERS,
-			JPA.PRE_PERSIST,
-			JPA.POST_PERSIST,
-			JPA.PRE_REMOVE,
-			JPA.POST_REMOVE,
-			JPA.PRE_UPDATE,
-			JPA.POST_UPDATE,
-			JPA.POST_LOAD);
-	}
-	
-	public String getIdClass() {
-		return this.idClass;
-	}
-	
-	public void setIdClass(String newIdClass) {
-		String oldIdClass = this.idClass;
-		this.idClass = newIdClass;
-		if (newIdClass != oldIdClass) {
-			if (newIdClass != null) {
-				if (getIdClassResource() == null) {
-					addIdClassResource();
-				}
-				getIdClassResource().setValue(newIdClass);
-			}
-			else {
-				removeIdClassResource();
-			}
-		}
-		firePropertyChanged(IdClass.ID_CLASS_PROPERTY, oldIdClass, newIdClass);
-	}
-	
-	protected void setIdClass_(String newIdClass) {
-		String oldIdClass = this.idClass;
-		this.idClass = newIdClass;
-		firePropertyChanged(IdClass.ID_CLASS_PROPERTY, oldIdClass, newIdClass);
-	}
-
-	protected IdClassAnnotation getIdClassResource() {
-		return (IdClassAnnotation) this.javaResourcePersistentType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME);
-	}
-	
-	protected void addIdClassResource() {
-		this.javaResourcePersistentType.addAnnotation(IdClassAnnotation.ANNOTATION_NAME);
-	}
-	
-	protected void removeIdClassResource() {
-		this.javaResourcePersistentType.removeAnnotation(IdClassAnnotation.ANNOTATION_NAME);
-	}
-	
-	@Override
-	public Iterator<String> overridableAttributeNames() {
-		return this.namesOf(this.overridableAttributes());
-	}
-
-	@Override
-	public Iterator<JavaPersistentAttribute> overridableAttributes() {
-		return new FilteringIterator<JavaPersistentAttribute, JavaPersistentAttribute>(this.getPersistentType().attributes()) {
-			@Override
-			protected boolean accept(JavaPersistentAttribute o) {
-				return o.isOverridableAttribute();
-			}
-		};
-	}
-
-	@Override
-	public Iterator<String> overridableAssociationNames() {
-		return this.namesOf(this.overridableAssociations());
-	}
-
-	@Override
-	public Iterator<JavaPersistentAttribute> overridableAssociations() {
-		return new FilteringIterator<JavaPersistentAttribute, JavaPersistentAttribute>(this.getPersistentType().attributes()) {
-			@Override
-			protected boolean accept(JavaPersistentAttribute o) {
-				return o.isOverridableAssociation();
-			}
-		};
-	}
-
-	protected Iterator<String> namesOf(Iterator<JavaPersistentAttribute> attributes) {
-		return new TransformationIterator<JavaPersistentAttribute, String>(attributes) {
-			@Override
-			protected String transform(JavaPersistentAttribute attribute) {
-				return attribute.getName();
-			}
-		};
-	}
-
-	@Override
-	public void initializeFromResource(JavaResourcePersistentType persistentTypeResource) {
-		super.initializeFromResource(persistentTypeResource);
-		this.initializeIdClass(persistentTypeResource);
-	}
-
-	protected void initializeIdClass(JavaResourcePersistentType typeResource) {
-		IdClassAnnotation idClassResource = (IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME);
-		if (idClassResource != null) {
-			this.idClass = idClassResource.getValue();
-		}
-	}
-
-	@Override
-	public void update(JavaResourcePersistentType persistentTypeResource) {
-		super.update(persistentTypeResource);
-		this.updateIdClass(persistentTypeResource);
-	}
-	
-	protected void updateIdClass(JavaResourcePersistentType typeResource) {
-		IdClassAnnotation idClass = (IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME);
-		if (idClass != null) {
-			setIdClass_(idClass.getValue());
-		}
-		else {
-			setIdClass_(null);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNamedNativeQuery.java
deleted file mode 100644
index 6b84edd515..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNamedNativeQuery.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.core.internal.context.java;
-
-import org.eclipse.jpt.core.context.NamedNativeQuery;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.context.java.JavaNamedNativeQuery;
-import org.eclipse.jpt.core.resource.java.NamedNativeQueryAnnotation;
-
-
-public class GenericJavaNamedNativeQuery extends AbstractJavaQuery
-	implements JavaNamedNativeQuery
-{
-
-	protected String resultClass;
-
-	protected String resultSetMapping;
-
-	public GenericJavaNamedNativeQuery(JavaJpaContextNode parent) {
-		super(parent);
-	}
-
-	@Override
-	protected NamedNativeQueryAnnotation getQueryResource() {
-		return (NamedNativeQueryAnnotation) super.getQueryResource();
-	}
-	
-	public String getResultClass() {
-		return this.resultClass;
-	}
-
-	public void setResultClass(String newResultClass) {
-		String oldResultClass = this.resultClass;
-		this.resultClass = newResultClass;
-		getQueryResource().setResultClass(newResultClass);
-		firePropertyChanged(NamedNativeQuery.RESULT_CLASS_PROPERTY, oldResultClass, newResultClass);
-	}
-	
-	protected void setResultClass_(String newResultClass) {
-		String oldResultClass = this.resultClass;
-		this.resultClass = newResultClass;
-		firePropertyChanged(NamedNativeQuery.RESULT_CLASS_PROPERTY, oldResultClass, newResultClass);
-	}
-
-	public String getResultSetMapping() {
-		return this.resultSetMapping;
-	}
-
-	public void setResultSetMapping(String newResultSetMapping) {
-		String oldResultSetMapping = this.resultSetMapping;
-		this.resultSetMapping = newResultSetMapping;
-		getQueryResource().setResultSetMapping(newResultSetMapping);
-		firePropertyChanged(NamedNativeQuery.RESULT_SET_MAPPING_PROPERTY, oldResultSetMapping, newResultSetMapping);
-	}
-
-	protected void setResultSetMapping_(String newResultSetMapping) {
-		String oldResultSetMapping = this.resultSetMapping;
-		this.resultSetMapping = newResultSetMapping;
-		firePropertyChanged(NamedNativeQuery.RESULT_SET_MAPPING_PROPERTY, oldResultSetMapping, newResultSetMapping);
-	}
-
-	public void initializeFromResource(NamedNativeQueryAnnotation queryResource) {
-		super.initializeFromResource(queryResource);
-		this.resultClass = queryResource.getResultClass();
-		this.resultSetMapping = queryResource.getResultSetMapping();
-	}
-	
-	public void update(NamedNativeQueryAnnotation queryResource) {
-		super.update(queryResource);
-		this.setResultClass_(queryResource.getResultClass());
-		this.setResultSetMapping_(queryResource.getResultSetMapping());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNamedQuery.java
deleted file mode 100644
index 9b834036b9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNamedQuery.java
+++ /dev/null
@@ -1,37 +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.core.internal.context.java;
-
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.context.java.JavaNamedQuery;
-import org.eclipse.jpt.core.resource.java.NamedQueryAnnotation;
-
-
-
-public class GenericJavaNamedQuery extends AbstractJavaQuery implements JavaNamedQuery
-{
-	
-	public GenericJavaNamedQuery(JavaJpaContextNode parent) {
-		super(parent);
-	}
-	
-	@Override
-	protected NamedQueryAnnotation getQueryResource() {
-		return (NamedQueryAnnotation) super.getQueryResource();
-	}
-
-	public void initializeFromResource(NamedQueryAnnotation queryResource) {
-		super.initializeFromResource(queryResource);
-	}
-	
-	public void update(NamedQueryAnnotation queryResource) {
-		super.update(queryResource);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNullAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNullAttributeMapping.java
deleted file mode 100644
index badb692ade..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNullAttributeMapping.java
+++ /dev/null
@@ -1,50 +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.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.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-
-public class GenericJavaNullAttributeMapping extends AbstractJavaAttributeMapping<JavaResourceNode>
-{
-	public GenericJavaNullAttributeMapping(JavaPersistentAttribute parent) {
-		super(parent);
-	}
-	
-	public String getKey() {
-		return MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return null;
-	}
-	
-	public Iterator<String> correspondingAnnotationNames() {
-		return EmptyIterator.instance();
-	}
-	
-	@Override
-	protected JavaResourceNode getMappingResource() {
-		return null;
-	}
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToManyMapping.java
deleted file mode 100644
index d5682df714..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToManyMapping.java
+++ /dev/null
@@ -1,86 +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.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.java.JavaOneToManyMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.OneToManyAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericJavaOneToManyMapping extends AbstractJavaMultiRelationshipMapping<OneToManyAnnotation>
-	implements JavaOneToManyMapping
-{
-	
-	public GenericJavaOneToManyMapping(JavaPersistentAttribute parent) {
-		super(parent);
-	}
-
-	public Iterator<String> correspondingAnnotationNames() {
-		return new ArrayIterator<String>(
-			JPA.ORDER_BY,
-			JPA.MAP_KEY,
-			JPA.JOIN_TABLE,
-			JPA.JOIN_COLUMN,
-			JPA.JOIN_COLUMNS);
-	}
-	
-	
-	public String getKey() {
-		return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public String getAnnotationName() {
-		return OneToManyAnnotation.ANNOTATION_NAME;
-	}
-
-	// ********** JavaMultiRelationshipMapping implementation **********
-
-	@Override
-	protected boolean mappedByTouches(int pos, CompilationUnit astRoot) {
-		return this.getMappingResource().mappedByTouches(pos, astRoot);
-	}
-
-	@Override
-	protected void setMappedByOnResourceModel(String mappedBy) {
-		this.getMappingResource().setMappedBy(mappedBy);
-	}
-	
-	@Override
-	protected String mappedBy(OneToManyAnnotation relationshipMapping) {
-		return relationshipMapping.getMappedBy();
-	}
-
-	
-	// ********** INonOwningMapping implementation **********
-	public boolean mappedByIsValid(AttributeMapping mappedByMapping) {
-		String mappedByKey = mappedByMapping.getKey();
-		return (mappedByKey == MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY);
-	}
-
-	@Override
-	public TextRange getMappedByTextRange(CompilationUnit astRoot) {
-		return this.getMappingResource().getMappedByTextRange(astRoot);
-	}
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToOneMapping.java
deleted file mode 100644
index 3b4581b171..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToOneMapping.java
+++ /dev/null
@@ -1,308 +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.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.MappingKeys;
-import org.eclipse.jpt.core.context.AttributeMapping;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.NonOwningMapping;
-import org.eclipse.jpt.core.context.OneToOneMapping;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaOneToOneMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-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.OneToOneAnnotation;
-import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumns;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class GenericJavaOneToOneMapping extends AbstractJavaSingleRelationshipMapping<OneToOneAnnotation>
-	implements JavaOneToOneMapping
-{
-	protected String mappedBy;
-	
-	protected final List<JavaPrimaryKeyJoinColumn> primaryKeyJoinColumns;
-	
-	public GenericJavaOneToOneMapping(JavaPersistentAttribute parent) {
-		super(parent);
-		this.primaryKeyJoinColumns = new ArrayList<JavaPrimaryKeyJoinColumn>();
-	}
-	
-	public Iterator<String> correspondingAnnotationNames() {
-		return new ArrayIterator<String>(
-			JPA.PRIMARY_KEY_JOIN_COLUMN,
-			JPA.PRIMARY_KEY_JOIN_COLUMNS,
-			JPA.JOIN_COLUMN,
-			JPA.JOIN_COLUMNS,
-			JPA.JOIN_TABLE);
-	}
-	
-	public String getAnnotationName() {
-		return OneToOneAnnotation.ANNOTATION_NAME;
-	}
-	
-	public String getKey() {
-		return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public boolean isRelationshipOwner() {
-		return getMappedBy() == null;
-	}
-	
-	
-	public ListIterator<JavaPrimaryKeyJoinColumn> primaryKeyJoinColumns() {
-		return new CloneListIterator<JavaPrimaryKeyJoinColumn>(this.primaryKeyJoinColumns);
-	}
-	
-	public int primaryKeyJoinColumnsSize() {
-		return this.primaryKeyJoinColumns.size();
-	}
-	
-	public JavaPrimaryKeyJoinColumn addPrimaryKeyJoinColumn(int index) {
-		JavaPrimaryKeyJoinColumn pkJoinColumn = getJpaFactory().buildJavaPrimaryKeyJoinColumn(this, createJoinColumnOwner());
-		this.primaryKeyJoinColumns.add(index, pkJoinColumn);
-		PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = (PrimaryKeyJoinColumnAnnotation) getResourcePersistentAttribute().addAnnotation(index, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumns.ANNOTATION_NAME);
-		pkJoinColumn.initializeFromResource(pkJoinColumnResource);
-		this.fireItemAdded(OneToOneMapping.PRIMAY_KEY_JOIN_COLUMNS_LIST, index, pkJoinColumn);
-		return pkJoinColumn;
-	}
-
-	protected void addPrimaryKeyJoinColumn(int index, JavaPrimaryKeyJoinColumn joinColumn) {
-		addItemToList(index, joinColumn, this.primaryKeyJoinColumns, OneToOneMapping.PRIMAY_KEY_JOIN_COLUMNS_LIST);
-	}
-
-	public void removePrimaryKeyJoinColumn(PrimaryKeyJoinColumn pkJoinColumn) {
-		this.removePrimaryKeyJoinColumn(this.primaryKeyJoinColumns.indexOf(pkJoinColumn));
-	}
-	
-	public void removePrimaryKeyJoinColumn(int index) {
-		JavaPrimaryKeyJoinColumn removedPkJoinColumn = this.primaryKeyJoinColumns.remove(index);
-		getResourcePersistentAttribute().removeAnnotation(index, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumns.ANNOTATION_NAME);
-		fireItemRemoved(OneToOneMapping.PRIMAY_KEY_JOIN_COLUMNS_LIST, index, removedPkJoinColumn);
-	}
-
-	protected void removePrimaryKeyJoinColumn_(JavaPrimaryKeyJoinColumn joinColumn) {
-		removeItemFromList(joinColumn, this.primaryKeyJoinColumns, OneToOneMapping.PRIMAY_KEY_JOIN_COLUMNS_LIST);
-	}
-	
-	public void movePrimaryKeyJoinColumn(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.primaryKeyJoinColumns, targetIndex, sourceIndex);
-		getResourcePersistentAttribute().move(targetIndex, sourceIndex, PrimaryKeyJoinColumns.ANNOTATION_NAME);
-		fireItemMoved(OneToOneMapping.PRIMAY_KEY_JOIN_COLUMNS_LIST, targetIndex, sourceIndex);		
-	}
-	
-	public boolean containsPrimaryKeyJoinColumns() {
-		return !this.primaryKeyJoinColumns.isEmpty();
-	}
-	
-	public String getMappedBy() {
-		return this.mappedBy;
-	}
-
-	public void setMappedBy(String newMappedBy) {
-		String oldMappedBy = this.mappedBy;
-		this.mappedBy = newMappedBy;
-		this.getMappingResource().setMappedBy(newMappedBy);
-		firePropertyChanged(NonOwningMapping.MAPPED_BY_PROPERTY, oldMappedBy, newMappedBy);
-	}
-
-	protected void setMappedBy_(String newMappedBy) {
-		String oldMappedBy = this.mappedBy;
-		this.mappedBy = newMappedBy;
-		firePropertyChanged(NonOwningMapping.MAPPED_BY_PROPERTY, oldMappedBy, newMappedBy);
-	}
-
-	public boolean mappedByIsValid(AttributeMapping mappedByMapping) {
-		String mappedByKey = mappedByMapping.getKey();
-		return (mappedByKey == MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY);
-	}
-
-	@Override
-	protected void setOptionalOnResourceModel(Boolean newOptional) {
-		this.getMappingResource().setOptional(newOptional);
-	}
-	
-	public TextRange getMappedByTextRange(CompilationUnit astRoot) {
-		return this.getMappingResource().getMappedByTextRange(astRoot);
-	}
-
-	public boolean mappedByTouches(int pos, CompilationUnit astRoot) {
-		return this.getMappingResource().mappedByTouches(pos, astRoot);
-	}
-
-	@Override
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		if (this.mappedByTouches(pos, astRoot)) {
-			return this.quotedCandidateMappedByAttributeNames(filter);
-		}
-		return null;
-	}
-
-	@Override
-	public boolean isOverridableAssociationMapping() {
-		return true;
-	}
-		
-	@Override
-	protected void initialize(OneToOneAnnotation oneToOneResource) {
-		super.initialize(oneToOneResource);
-		this.mappedBy = oneToOneResource.getMappedBy();
-	}
-
-	@Override
-	protected Boolean specifiedOptional(OneToOneAnnotation oneToOneResource) {
-		return oneToOneResource.getOptional();
-	}
-	
-	
-	@Override
-	public void initializeFromResource(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		super.initializeFromResource(resourcePersistentAttribute);
-		this.initializePrimaryKeyJoinColumns(resourcePersistentAttribute);
-	}
-	
-	protected void initializePrimaryKeyJoinColumns(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		ListIterator<JavaResourceNode> annotations = resourcePersistentAttribute.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumns.ANNOTATION_NAME);
-		
-		while(annotations.hasNext()) {
-			this.primaryKeyJoinColumns.add(buildPrimaryKeyJoinColumn((PrimaryKeyJoinColumnAnnotation) annotations.next()));
-		}
-	}
-
-	protected JavaPrimaryKeyJoinColumn buildPrimaryKeyJoinColumn(PrimaryKeyJoinColumnAnnotation primaryKeyJoinColumnResource) {
-		JavaPrimaryKeyJoinColumn pkJoinColumn = getJpaFactory().buildJavaPrimaryKeyJoinColumn(this, createJoinColumnOwner());
-		pkJoinColumn.initializeFromResource(primaryKeyJoinColumnResource);
-		return pkJoinColumn;
-	}
-	
-	@Override
-	protected void update(OneToOneAnnotation oneToOneResource) {
-		super.update(oneToOneResource);
-		this.setMappedBy_(oneToOneResource.getMappedBy());
-	}
-
-	@Override
-	public void update(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		super.update(resourcePersistentAttribute);
-		this.updatePrimaryKeyJoinColumns(resourcePersistentAttribute);
-	}
-	
-	protected void updatePrimaryKeyJoinColumns(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		ListIterator<JavaPrimaryKeyJoinColumn> pkJoinColumns = primaryKeyJoinColumns();
-		ListIterator<JavaResourceNode> resourcePkJoinColumns = resourcePersistentAttribute.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumns.ANNOTATION_NAME);
-		
-		while (pkJoinColumns.hasNext()) {
-			JavaPrimaryKeyJoinColumn pkJoinColumn = pkJoinColumns.next();
-			if (resourcePkJoinColumns.hasNext()) {
-				pkJoinColumn.update((PrimaryKeyJoinColumnAnnotation) resourcePkJoinColumns.next());
-			}
-			else {
-				removePrimaryKeyJoinColumn_(pkJoinColumn);
-			}
-		}
-		
-		while (resourcePkJoinColumns.hasNext()) {
-			addPrimaryKeyJoinColumn(specifiedJoinColumnsSize(), buildPrimaryKeyJoinColumn((PrimaryKeyJoinColumnAnnotation) resourcePkJoinColumns.next()));
-		}
-	}
-	
-
-
-	//***************** Validation ***********************************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-		
-		if (this.getMappedBy() != null) {
-			addMappedByMessages(messages ,astRoot);
-		}
-	}
-	
-	@Override
-	protected boolean addJoinColumnMessages() {
-		if (containsPrimaryKeyJoinColumns() && !containsSpecifiedJoinColumns()) {
-			return false;
-		}
-		return super.addJoinColumnMessages();
-	}
-	
-	protected void addMappedByMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		String mappedBy = this.getMappedBy();
-		Entity targetEntity = this.getResolvedTargetEntity();
-		
-		if (targetEntity == null) {
-			// already have validation messages for that
-			return;
-		}
-		
-		PersistentAttribute attribute = targetEntity.getPersistentType().resolveAttribute(mappedBy);
-		
-		if (attribute == null) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.MAPPING_UNRESOLVED_MAPPED_BY,
-						new String[] {mappedBy}, 
-						this, this.getMappedByTextRange(astRoot))
-				);
-			return;
-		}
-		
-		if (! this.mappedByIsValid(attribute.getMapping())) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.MAPPING_INVALID_MAPPED_BY,
-						new String[] {mappedBy}, 
-						this, this.getMappedByTextRange(astRoot))
-				);
-			return;
-		}
-		
-		NonOwningMapping mappedByMapping;
-		try {
-			mappedByMapping = (NonOwningMapping) attribute.getMapping();
-		} catch (ClassCastException cce) {
-			// there is no error then
-			return;
-		}
-		
-		if (mappedByMapping.getMappedBy() != null) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.MAPPING_MAPPED_BY_ON_BOTH_SIDES,
-						this, this.getMappedByTextRange(astRoot))
-				);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPersistentAttribute.java
deleted file mode 100644
index 7c0cfcd257..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPersistentAttribute.java
+++ /dev/null
@@ -1,328 +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.core.internal.context.java;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.context.java.JavaStructureNodes;
-import org.eclipse.jpt.core.context.java.JavaTypeMapping;
-import org.eclipse.jpt.core.internal.utility.jdt.JDTTools;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class GenericJavaPersistentAttribute extends AbstractJavaJpaContextNode
-	implements JavaPersistentAttribute
-{
-	protected String name;
-
-	protected JavaAttributeMapping defaultMapping;
-
-	protected JavaAttributeMapping specifiedMapping;
-
-	protected JavaResourcePersistentAttribute resourcePersistentAttribute;
-
-	public GenericJavaPersistentAttribute(JavaPersistentType parent) {
-		super(parent);
-	}
-	
-	public String getId() {
-		return JavaStructureNodes.PERSISTENT_ATTRIBUTE_ID;
-	}
-
-	public void initializeFromResource(JavaResourcePersistentAttribute persistentAttributeResource) {
-		this.resourcePersistentAttribute = persistentAttributeResource;
-		this.name = this.name(persistentAttributeResource);
-		initializeDefaultMapping(persistentAttributeResource);
-		initializeSpecifiedMapping(persistentAttributeResource);
-	}
-	
-	protected void initializeDefaultMapping(JavaResourcePersistentAttribute persistentAttributeResource) {
-		this.defaultMapping = getJpaPlatform().buildDefaultJavaAttributeMapping(this);
-		this.defaultMapping.initializeFromResource(persistentAttributeResource);
-	}
-
-	protected void initializeSpecifiedMapping(JavaResourcePersistentAttribute persistentAttributeResource) {
-		String javaMappingAnnotationName = this.javaMappingAnnotationName(persistentAttributeResource);
-		this.specifiedMapping = createJavaAttributeMappingFromAnnotation(javaMappingAnnotationName, persistentAttributeResource);
-	}
-	
-	public JavaResourcePersistentAttribute getResourcePersistentAttribute() {
-		return this.resourcePersistentAttribute;
-	}
-	
-	public JavaPersistentType getPersistentType() {
-		return (JavaPersistentType) this.getParent();
-	}
-
-	public JavaTypeMapping getTypeMapping() {
-		return this.getPersistentType().getMapping();
-	}
-
-	public String getPrimaryKeyColumnName() {
-		return this.getMapping().getPrimaryKeyColumnName();
-	}
-
-	public boolean isOverridableAttribute() {
-		return this.getMapping().isOverridableAttributeMapping();
-	}
-
-	public boolean isOverridableAssociation() {
-		return this.getMapping().isOverridableAssociationMapping();
-	}
-
-	public boolean isIdAttribute() {
-		return this.getMapping().isIdMapping();
-	}
-	
-	public boolean isVirtual() {
-		return false;
-	}
-	
-	public String getName() {
-		return this.name;
-	}
-	
-	protected void setName(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
-	}
-
-	public JavaAttributeMapping getDefaultMapping() {
-		return this.defaultMapping;
-	}
-
-	/**
-	 * clients do not set the "default" mapping
-	 */
-	protected void setDefaultMapping(JavaAttributeMapping newDefaultMapping) {
-		JavaAttributeMapping oldMapping = this.defaultMapping;
-		this.defaultMapping = newDefaultMapping;	
-		firePropertyChanged(PersistentAttribute.DEFAULT_MAPPING_PROPERTY, oldMapping, newDefaultMapping);
-	}
-
-	public JavaAttributeMapping getSpecifiedMapping() {
-		return this.specifiedMapping;
-	}
-
-	/**
-	 * clients do not set the "specified" mapping;
-	 * use #setMappingKey(String)
-	 */
-	protected void setSpecifiedMapping(JavaAttributeMapping newSpecifiedMapping) {
-		JavaAttributeMapping oldMapping = this.specifiedMapping;
-		this.specifiedMapping = newSpecifiedMapping;	
-		firePropertyChanged(PersistentAttribute.SPECIFIED_MAPPING_PROPERTY, oldMapping, newSpecifiedMapping);
-	}
-
-	
-	public JavaAttributeMapping getMapping() {
-		return (this.specifiedMapping != null) ? this.specifiedMapping : this.defaultMapping;
-	}
-
-	public String getMappingKey() {
-		return this.getMapping().getKey();
-	}
-
-	/**
-	 * return null if there is no "default" mapping for the attribute
-	 */
-	public String getDefaultMappingKey() {
-		return this.defaultMapping.getKey();
-	}
-
-	/**
-	 * return null if there is no "specified" mapping for the attribute
-	 */
-	public String getSpecifiedMappingKey() {
-		return (this.specifiedMapping == null) ? null : this.specifiedMapping.getKey();
-	}
-
-	// TODO support morphing mappings, i.e. copying common settings over
-	// to the new mapping; this can't be done in the same was as XmlAttributeMapping
-	// since we don't know all the possible mapping types
-	public void setSpecifiedMappingKey(String newKey) {
-		if (newKey == getSpecifiedMappingKey()) {
-			return;
-		}
-		JavaAttributeMapping oldMapping = getMapping();
-		JavaAttributeMapping newMapping = createJavaAttributeMappingFromMappingKey(newKey);
-
-		this.specifiedMapping = newMapping;	
-		if (newMapping != null) {
-			this.resourcePersistentAttribute.setMappingAnnotation(newMapping.getAnnotationName());
-		}
-		else {
-			this.resourcePersistentAttribute.setMappingAnnotation(null);			
-		}
-		firePropertyChanged(PersistentAttribute.SPECIFIED_MAPPING_PROPERTY, oldMapping, newMapping);
-		
-		if (oldMapping != null) {
-			Collection<String> annotationsToRemove = CollectionTools.collection(oldMapping.correspondingAnnotationNames());
-			if (getMapping() != null) {
-				CollectionTools.removeAll(annotationsToRemove, getMapping().correspondingAnnotationNames());
-			}
-			
-			for (String annotationName : annotationsToRemove) {
-				this.resourcePersistentAttribute.removeAnnotation(annotationName);
-			}
-		}
-	}
-	
-	public JpaStructureNode getStructureNode(int textOffset) {
-		return this;
-	}
-
-	public boolean contains(int offset, CompilationUnit astRoot) {
-		TextRange fullTextRange = this.getFullTextRange(astRoot);
-		// 'fullTextRange' will be null if the attribute no longer exists in the java;
-		// the context model can be out of synch with the resource model
-		// when a selection event occurs before the context model has a
-		// chance to synch with the resource model via the update thread
-		return (fullTextRange == null) ? false : fullTextRange.includes(offset);
-	}
-
-
-	public TextRange getFullTextRange(CompilationUnit astRoot) {
-		return this.resourcePersistentAttribute.getTextRange(astRoot);
-	}
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return this.getSelectionTextRange(astRoot);
-	}
-
-	public TextRange getSelectionTextRange(CompilationUnit astRoot) {
-		return this.resourcePersistentAttribute.getNameTextRange(astRoot);
-	}
-	
-	public TextRange getSelectionTextRange() {
-		return getSelectionTextRange(this.buildASTRoot());
-	}
-
-	protected CompilationUnit buildASTRoot() {
-		return JDTTools.buildASTRoot(this.resourcePersistentAttribute.getJpaCompilationUnit().getCompilationUnit());
-	}
-
-	public void update(JavaResourcePersistentAttribute jrpa) {
-		this.resourcePersistentAttribute = jrpa;
-		this.setName(this.name(jrpa));
-		this.updateDefaultMapping(jrpa);
-		this.updateSpecifiedMapping(jrpa);
-	}
-	
-	protected String name(JavaResourcePersistentAttribute jrpa) {
-		return jrpa.getName();	
-	}
-	
-	public String specifiedMappingAnnotationName() {
-		return (this.specifiedMapping == null) ? null : this.specifiedMapping.getAnnotationName();
-	}
-	
-	protected void updateSpecifiedMapping(JavaResourcePersistentAttribute jrpa) {
-		String javaMappingAnnotationName = this.javaMappingAnnotationName(jrpa);
-		if (specifiedMappingAnnotationName() != javaMappingAnnotationName) {
-			setSpecifiedMapping(createJavaAttributeMappingFromAnnotation(javaMappingAnnotationName, jrpa));
-		}
-		else {
-			if (getSpecifiedMapping() != null) {
-				getSpecifiedMapping().update(jrpa);
-			}
-		}
-	}
-	
-	protected void updateDefaultMapping(JavaResourcePersistentAttribute jrpa) {
-		String defaultMappingKey = getJpaPlatform().defaultJavaAttributeMappingKey(this);
-		if (getDefaultMapping().getKey() != defaultMappingKey) {
-			JavaAttributeMapping oldDefaultMapping = this.defaultMapping;
-			this.defaultMapping = getJpaPlatform().buildDefaultJavaAttributeMapping(this);
-			this.defaultMapping.initializeFromResource(jrpa);
-			firePropertyChanged(PersistentAttribute.DEFAULT_MAPPING_PROPERTY, oldDefaultMapping, this.defaultMapping);
-		}
-		else {
-			getDefaultMapping().update(jrpa);
-		}
-	}
-	
-	protected String javaMappingAnnotationName(JavaResourcePersistentAttribute jrpa) {
-		Annotation mappingAnnotation = (Annotation) jrpa.getMappingAnnotation();
-		if (mappingAnnotation != null) {
-			return mappingAnnotation.getAnnotationName();
-		}
-		return null;
-	}
-	
-	protected JavaAttributeMapping createJavaAttributeMappingFromMappingKey(String key) {
-		if (key == MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY) {
-			return null;
-		}
-		return getJpaPlatform().buildJavaAttributeMappingFromMappingKey(key, this);
-	}
-
-	protected JavaAttributeMapping createJavaAttributeMappingFromAnnotation(String annotationName, JavaResourcePersistentAttribute jrpa) {
-		if (annotationName == null) {
-			return null;
-		}
-		JavaAttributeMapping mapping = getJpaPlatform().buildJavaAttributeMappingFromAnnotation(annotationName, this);
-		mapping.initializeFromResource(jrpa);
-		return mapping;
-	}
-
-	/**
-	 * the mapping might be "default", but it still might be a "null" mapping...
-	 */
-	public boolean mappingIsDefault(JavaAttributeMapping mapping) {
-		return this.defaultMapping == mapping;
-	}
-
-	@Override
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		return this.getMapping().javaCompletionProposals(pos, filter, astRoot);
-	}
-	
-	//************* Validation ******************************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-		
-		if (this.specifiedMapping != null) {
-			this.specifiedMapping.addToMessages(messages, astRoot);
-		}
-		else if (this.defaultMapping != null) {
-			this.defaultMapping.addToMessages(messages, astRoot);
-		}
-	}
-	
-	@Override
-	public void toString(StringBuilder sb) {
-		super.toString(sb);
-		sb.append(getName());
-	}
-	
-	public void dispose() {
-		//nothing to dispose
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPersistentType.java
deleted file mode 100644
index 07e92585fd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPersistentType.java
+++ /dev/null
@@ -1,544 +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.core.internal.context.java;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.JpaFile;
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.context.AccessType;
-import org.eclipse.jpt.core.context.JpaContextNode;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.context.PersistentType;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.context.java.JavaStructureNodes;
-import org.eclipse.jpt.core.context.java.JavaTypeMapping;
-import org.eclipse.jpt.core.internal.utility.jdt.JDTTools;
-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.utility.Filter;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.ChainIterator;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-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;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class GenericJavaPersistentType extends AbstractJavaJpaContextNode implements JavaPersistentType
-{
-	protected String name;
-	
-	protected JavaTypeMapping mapping;
-
-	protected final List<JavaPersistentAttribute> attributes;
-
-	protected AccessType access;
-
-	protected PersistentType parentPersistentType;
-
-	protected JavaResourcePersistentType resourcePersistentType;
-
-	public GenericJavaPersistentType(JpaContextNode parent, JavaResourcePersistentType resourcePersistentType) {
-		super(parent);
-		this.attributes = new ArrayList<JavaPersistentAttribute>();
-		this.initialize(resourcePersistentType);
-	}
-	
-	@Override
-	public IResource getResource() {
-		return this.resourcePersistentType.getResourceModel().getJpaCompilationUnit().getCompilationUnit().getResource();
-	}
-
-	//****************** JpaStructureNode implementation *******************
-	
-	public String getId() {
-		return JavaStructureNodes.PERSISTENT_TYPE_ID;
-	}
-	
-	//****************** PersistentType implementation *******************
-	public String getName() {
-		return this.name;
-	}
-	
-	protected void setName(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
-	}
-	
-	public JavaTypeMapping getMapping() {
-		return this.mapping;
-	}
-
-	public String getMappingKey() {
-		return getMapping().getKey();
-	}
-	
-	public void setMappingKey(String key) {
-		if (key == getMapping().getKey()) {
-			return;
-		}
-		JavaTypeMapping oldMapping = getMapping();
-		JavaTypeMapping newMapping = createJavaTypeMappingFromMappingKey(key);
-	
-		this.mapping = newMapping;	
-		this.resourcePersistentType.setMappingAnnotation(newMapping.getAnnotationName());
-		firePropertyChanged(PersistentType.MAPPING_PROPERTY, oldMapping, newMapping);
-	
-		if (oldMapping != null) {
-			Collection<String> annotationsToRemove = CollectionTools.collection(oldMapping.correspondingAnnotationNames());
-			if (getMapping() != null) {
-				CollectionTools.removeAll(annotationsToRemove, getMapping().correspondingAnnotationNames());
-			}
-			
-			for (String annotationName : annotationsToRemove) {
-				this.resourcePersistentType.removeAnnotation(annotationName);
-			}
-		}
-	}
-	
-	protected void setMapping(JavaTypeMapping newMapping) {
-		JavaTypeMapping oldMapping = this.mapping;
-		this.mapping = newMapping;	
-		firePropertyChanged(PersistentType.MAPPING_PROPERTY, oldMapping, newMapping);
-	}
-	
-	public boolean isMapped() {
-		return getMapping().isMapped();
-	}
-
-	public AccessType getAccess() {
-		return this.access;
-	}
-	
-	protected void setAccess(AccessType newAccess) {
-		AccessType oldAccess = this.access;
-		this.access = newAccess;
-		firePropertyChanged(PersistentType.ACCESS_PROPERTY, oldAccess, newAccess);
-	}
-
-	protected Iterator<JavaPersistentAttribute> attributesNamed(final String attributeName) {
-		return new FilteringIterator<JavaPersistentAttribute, JavaPersistentAttribute>(attributes()) {
-			@Override
-			protected boolean accept(JavaPersistentAttribute o) {
-				return attributeName.equals(o.getName());
-			}
-		};
-	}
-
-	public JavaPersistentAttribute getAttributeNamed(String attributeName) {
-		Iterator<JavaPersistentAttribute> stream = attributesNamed(attributeName);
-		return (stream.hasNext()) ? stream.next() : null;
-	}
-
-	public PersistentAttribute resolveAttribute(String attributeName) {
-		Iterator<JavaPersistentAttribute> stream = attributesNamed(attributeName);
-		if (stream.hasNext()) {
-			JavaPersistentAttribute attribute = stream.next();
-			return (stream.hasNext()) ? null /*more than one*/: attribute;
-		}
-		return (getParentPersistentType() == null) ? null : getParentPersistentType().resolveAttribute(attributeName);
-	}
-	
-	public ListIterator<JavaPersistentAttribute> attributes() {
-		return new CloneListIterator<JavaPersistentAttribute>(this.attributes);
-	}
-	
-	public int attributesSize() {
-		return this.attributes.size();
-	}
-	
-	private void addAttribute(int index, JavaPersistentAttribute attribute) {
-		addItemToList(index, attribute, this.attributes, PersistentType.SPECIFIED_ATTRIBUTES_LIST);
-	}
-
-	private void removeAttribute(JavaPersistentAttribute attribute) {
-		removeItemFromList(attribute, this.attributes, PersistentType.SPECIFIED_ATTRIBUTES_LIST);
-	}
-	
-	private void moveAttribute(int index, JavaPersistentAttribute attribute) {
-		moveItemInList(index, this.attributes.indexOf(attribute), this.attributes, PersistentType.SPECIFIED_ATTRIBUTES_LIST);
-	}
-	
-	public Iterator<String> attributeNames() {
-		return this.attributeNames(this.attributes());
-	}
-	
-	protected Iterator<String> attributeNames(Iterator<? extends PersistentAttribute> attrs) {
-		return new TransformationIterator<PersistentAttribute, String>(attrs) {
-			@Override
-			protected String transform(PersistentAttribute attribute) {
-				return attribute.getName();
-			}
-		};
-	}
-	
-	public Iterator<PersistentAttribute> allAttributes() {
-		return new CompositeIterator<PersistentAttribute>(new TransformationIterator<PersistentType, Iterator<PersistentAttribute>>(this.inheritanceHierarchy()) {
-			@Override
-			protected Iterator<PersistentAttribute> transform(PersistentType pt) {
-				return pt.attributes();
-			}
-		});
-	}
-	
-	public Iterator<String> allAttributeNames() {
-		return this.attributeNames(this.allAttributes());
-	}
-
-	@Override
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		Iterator<String> values = this.mapping.javaCompletionProposals(pos, filter, astRoot);
-		if (values != null) {
-			return values;
-		}
-		for (Iterator<JavaPersistentAttribute> stream = attributes(); stream.hasNext();) {
-			values = stream.next().javaCompletionProposals(pos, filter, astRoot);
-			if (values != null) {
-				return values;
-			}
-		}
-		return EmptyIterator.instance();
-	}
-	
-	// it would be nice if the we passed in an astRoot here, but then we
-	// would need to pass it to the XML structure nodes too...
-	public JpaStructureNode getStructureNode(int offset) {
-		CompilationUnit astRoot = this.buildASTRoot(); 
-		
-		if (this.contains(offset, astRoot)) {
-			for (Iterator<JavaPersistentAttribute> stream = this.attributes(); stream.hasNext();) {
-				JavaPersistentAttribute persistentAttribute = stream.next();
-				if (persistentAttribute.contains(offset, astRoot)) {
-					return persistentAttribute;
-				}
-			}
-			return this;
-		}
-		return null;		
-	}
-
-	protected CompilationUnit buildASTRoot() {
-		return JDTTools.buildASTRoot(this.resourcePersistentType.getJpaCompilationUnit().getCompilationUnit());
-	}
-	
-	public boolean contains(int offset, CompilationUnit astRoot) {
-		TextRange fullTextRange = this.getFullTextRange(astRoot);
-		// 'fullTextRange' will be null if the type no longer exists in the java;
-		// the context model can be out of synch with the resource model
-		// when a selection event occurs before the context model has a
-		// chance to synch with the resource model via the update thread
-		return (fullTextRange == null) ? false : fullTextRange.includes(offset);
-	}
-
-
-	protected TextRange getFullTextRange(CompilationUnit astRoot) {
-		return this.resourcePersistentType.getTextRange(astRoot);
-	}
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return this.getSelectionTextRange(astRoot);
-	}
-
-	public TextRange getSelectionTextRange(CompilationUnit astRoot) {
-		return this.resourcePersistentType.getNameTextRange(astRoot);
-	}
-	
-	public TextRange getSelectionTextRange() {
-		return this.getSelectionTextRange(this.buildASTRoot());
-	}
-	
-	
-	public Iterator<PersistentType> inheritanceHierarchy() {
-		// using a chain iterator to traverse up the inheritance tree
-		return new ChainIterator<PersistentType>(this) {
-			@Override
-			protected PersistentType nextLink(PersistentType pt) {
-				return pt.getParentPersistentType();
-			}
-		};
-	}
-
-	public PersistentType getParentPersistentType() {
-		return this.parentPersistentType;
-	}
-
-	public void setParentPersistentType(PersistentType newParentPersistentType) {
-		if (attributeValueHasNotChanged(this.parentPersistentType, newParentPersistentType)) {
-			return;
-		}
-		PersistentType oldParentPersistentType = this.parentPersistentType;
-		this.parentPersistentType = newParentPersistentType;
-		firePropertyChanged(PersistentType.PARENT_PERSISTENT_TYPE_PROPERTY, oldParentPersistentType, newParentPersistentType);
-	}
-	
-	public boolean hasAnyAttributeMappingAnnotations() {
-		if (this.resourcePersistentType.hasAnyAttributeAnnotations()) {
-			return true;
-		}
-		return false;
-	}
-	
-	// ******************** Updating **********************
-	protected void initialize(JavaResourcePersistentType jrpt) {
-		this.resourcePersistentType = jrpt;
-		this.parentPersistentType = this.parentPersistentType(jrpt);
-		this.access = this.access(jrpt);
-		this.name = this.name(jrpt);
-		this.initializeMapping(jrpt);
-		this.initializePersistentAttributes(jrpt);
-	}
-	
-	protected void initializeMapping(JavaResourcePersistentType persistentTypeResource) {
-		this.mapping  = getJpaPlatform().buildJavaTypeMappingFromAnnotation(this.javaMappingAnnotationName(persistentTypeResource), this);
-		this.mapping.initializeFromResource(persistentTypeResource);
-	}
-	
-	protected void initializePersistentAttributes(JavaResourcePersistentType persistentTypeResource) {
-		Iterator<JavaResourcePersistentAttribute> resourceAttributes = persistentTypeResource.fields();
-		if (getAccess() == AccessType.PROPERTY) {
-			resourceAttributes = persistentTypeResource.properties();
-		}		
-		
-		while (resourceAttributes.hasNext()) {
-			this.attributes.add(createAttribute(resourceAttributes.next()));
-		}
-	}
-
-	public void update(JavaResourcePersistentType jrpt) {
-		this.resourcePersistentType = jrpt;
-		getJpaFile(this.resourcePersistentType.getResourceModel()).addRootStructureNode(this.resourcePersistentType.getQualifiedName(), this);
-		updateParentPersistentType(jrpt);
-		updateAccess(jrpt);
-		updateName(jrpt);
-		updateMapping(jrpt);
-		updatePersistentAttributes(jrpt);
-	}
-	
-	protected void updateAccess(JavaResourcePersistentType jrpt) {
-		this.setAccess(this.access(jrpt));
-	}
-
-	/**
-	 * Check the access "specified" by the java resource model.
-	 * 		Check xml mapping specified access first
-	 * 		If still null check java annotations if the xml is not metadata-complete = true
-	 *		If still null then set to parentPersistentType access.
-	 * 		If still null check entity-mappings specified access setting if this persistent-type is listed in an orm.xml file
-	 * 		If still null check the persistence-unit default Access
-	 * 		Default to FIELD if all else fails.
-	 */
-	protected AccessType access(JavaResourcePersistentType jrpt) {
-		AccessType javaAccess = null;
-		boolean metadataComplete = false;
-		if (getOrmPersistentType() != null) {
-			javaAccess = getOrmPersistentType().getMapping().getSpecifiedAccess();
-			metadataComplete = getOrmPersistentType().getMapping().isMetadataComplete();
-		}
-		if (javaAccess == null && !metadataComplete) {
-			javaAccess = AccessType.fromJavaResourceModel(jrpt.getAccess());
-		}
-		if (javaAccess == null) {
-			if (getParentPersistentType() != null) {
-				javaAccess = getParentPersistentType().getAccess();
-			}
-		}
-		if (javaAccess == null) {
-			if (getEntityMappings() != null) {
-				javaAccess = getEntityMappings().getAccess();
-			}
-		}
-		if (javaAccess == null) {
-			//have to check persistence-unit separately in the case where it is not listed directly in an orm.xml
-			//if it is listed in an orm.xml then the entityMappings().getAccess() check will cover persistence-unit.defaultAccess
-			if (getPersistenceUnit() != null) {
-				javaAccess = getPersistenceUnit().getDefaultAccess();
-			}
-		}
-		if (javaAccess == null) {
-			javaAccess = AccessType.FIELD;
-		}
-		return javaAccess;
-	}
-	
-	protected void updateName(JavaResourcePersistentType jrpt) {
-		this.setName(this.name(jrpt));	
-	}
-	
-	protected String name(JavaResourcePersistentType jrpt) {
-		return jrpt.getQualifiedName();
-	}
-	
-	protected void updateMapping(JavaResourcePersistentType jrpt) {
-		String javaMappingAnnotationName = this.javaMappingAnnotationName(jrpt);
-		if (getMapping().getAnnotationName() != javaMappingAnnotationName) {
-			setMapping(createJavaTypeMappingFromAnnotation(javaMappingAnnotationName, jrpt));
-		}
-		else {
-			getMapping().update(jrpt);
-		}
-	}
-	
-	protected JavaTypeMapping createJavaTypeMappingFromMappingKey(String key) {
-		return getJpaPlatform().buildJavaTypeMappingFromMappingKey(key, this);
-	}
-	
-	protected JavaTypeMapping createJavaTypeMappingFromAnnotation(String annotationName, JavaResourcePersistentType jrpt) {
-		JavaTypeMapping typeMapping = getJpaPlatform().buildJavaTypeMappingFromAnnotation(annotationName, this);
-		typeMapping.initializeFromResource(jrpt);
-		return typeMapping;
-	}
-
-	protected String javaMappingAnnotationName(JavaResourcePersistentType jrpt) {
-		Annotation mappingAnnotation = (Annotation) jrpt.getMappingAnnotation();
-		if (mappingAnnotation != null) {
-			return mappingAnnotation.getAnnotationName();
-		}
-		return null;
-	}
-
-	protected void updatePersistentAttributes(JavaResourcePersistentType jrpt) {
-		Iterator<JavaResourcePersistentAttribute> resourceAttributes = jrpt.fields();
-		if (getAccess() == AccessType.PROPERTY) {
-			resourceAttributes = jrpt.properties();
-		}
-		Collection<JavaPersistentAttribute> contextAttributesToRemove = CollectionTools.collection(attributes());
-		Collection<JavaPersistentAttribute> contextAttributesToUpdate = new ArrayList<JavaPersistentAttribute>();
-		int resourceIndex = 0;
-		
-		while (resourceAttributes.hasNext()) {
-			JavaResourcePersistentAttribute resourceAttribute = resourceAttributes.next();
-			boolean contextAttributeFound = false;
-			for (JavaPersistentAttribute contextAttribute : contextAttributesToRemove) {
-				if (contextAttribute.getResourcePersistentAttribute() == resourceAttribute) {
-					moveAttribute(resourceIndex, contextAttribute);
-					contextAttributesToRemove.remove(contextAttribute);
-					contextAttributesToUpdate.add(contextAttribute);
-					contextAttributeFound = true;
-					break;
-				}
-			}
-			if (!contextAttributeFound) {
-				addAttribute(resourceIndex, createAttribute(resourceAttribute));
-			}
-			resourceIndex++;
-		}
-		for (JavaPersistentAttribute contextAttribute : contextAttributesToRemove) {
-			removeAttribute(contextAttribute);
-		}
-		//first handle adding/removing of the persistent attributes, then update the others last, 
-		//this causes less churn in the update process
-		for (JavaPersistentAttribute contextAttribute : contextAttributesToUpdate) {
-			contextAttribute.update(contextAttribute.getResourcePersistentAttribute());
-		}
-	}
-	
-	protected JavaPersistentAttribute createAttribute(JavaResourcePersistentAttribute persistentAttributeResource) {
-		JavaPersistentAttribute javaPersistentAttribute = getJpaFactory().buildJavaPersistentAttribute(this);
-		javaPersistentAttribute.initializeFromResource(persistentAttributeResource);
-		return javaPersistentAttribute;
-	}
-	
-	public void updateParentPersistentType(JavaResourcePersistentType persistentTypeResource) {
-		setParentPersistentType(parentPersistentType(persistentTypeResource));
-	}
-	
-	protected PersistentType parentPersistentType(JavaResourcePersistentType persistentTypeResource) {
-		return parentPersistentType(persistentTypeResource.getSuperClassQualifiedName());
-	}
-	
-	protected PersistentType parentPersistentType(String fullyQualifiedTypeName) {
-		PersistentType possibleParent = possibleParent(fullyQualifiedTypeName);
-		if (possibleParent == null) {
-			return null;
-		}
-		if (possibleParent.isMapped()) {
-			return possibleParent;
-		}
-		return possibleParent.getParentPersistentType();
-	}
-
-	/**
-	 * JPA spec supports the case where there are non-persistent types in the hierarchy
-	 * This will check for a PersistentType with the given name in this PersistenceUnit.
-	 * If it is not found then find the JavaPersistentTypeResource and look for its parent type
-	 */
-	protected PersistentType possibleParent(String fullyQualifiedTypeName) {
-		PersistentType possibleParent = getPersistentType(fullyQualifiedTypeName);
-		if (possibleParent != null) {
-			return possibleParent;
-		}
-		JavaResourcePersistentType jrpt = getJpaProject().getJavaPersistentTypeResource(fullyQualifiedTypeName);
-		return (jrpt == null) ? null : this.possibleParent(jrpt.getSuperClassQualifiedName());
-	}
-	
-	protected PersistentType getPersistentType(String fullyQualifiedTypeName) {
-		return getPersistenceUnit().getPersistentType(fullyQualifiedTypeName);
-	}
-
-	//*************** Validation ******************************************
-	public void addToMessages(List<IMessage> messages) {
-		//get astRoot here to pass down
-		addToMessages(messages, this.buildASTRoot());	
-	}
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		try {
-			this.mapping.addToMessages(messages, astRoot);
-		} catch(Throwable t) {
-			JptCorePlugin.log(t);
-		}
-		addAttributeMessages(messages, astRoot);
-	}
-	
-	protected void addAttributeMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		for (JavaPersistentAttribute persistentAttribute : this.attributes) {
-			try {
-				persistentAttribute.addToMessages(messages, astRoot);
-			} catch(Throwable t) {
-				JptCorePlugin.log(t);
-			}
-		}
-	}
-	
-	@Override
-	public void toString(StringBuilder sb) {
-		super.toString(sb);
-		sb.append(getName());
-	}
-
-	public void dispose() {
-		JpaFile jpaFile = getJpaFile(this.resourcePersistentType.getResourceModel());
-		
-		if (jpaFile != null) {
-			//jpaFile can be null if the .java file was deleted,
-			//rootStructureNodes are cleared in the dispose of JpaFile
-			jpaFile.removeRootStructureNode(this.resourcePersistentType.getQualifiedName());
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPrimaryKeyJoinColumn.java
deleted file mode 100644
index 42c1f756ad..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPrimaryKeyJoinColumn.java
+++ /dev/null
@@ -1,169 +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.core.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.java.JavaBaseJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.context.java.JavaPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-
-
-public class GenericJavaPrimaryKeyJoinColumn extends AbstractJavaNamedColumn<PrimaryKeyJoinColumnAnnotation>
-	implements JavaPrimaryKeyJoinColumn
-{
-	protected String specifiedReferencedColumnName;
-
-	protected String defaultReferencedColumnName;
-
-	protected PrimaryKeyJoinColumnAnnotation primaryKeyJoinColumnResource;
-	
-	public GenericJavaPrimaryKeyJoinColumn(JavaJpaContextNode parent, JavaBaseJoinColumn.Owner owner) {
-		super(parent, owner);
-	}
-
-	@Override
-	public void initializeFromResource(PrimaryKeyJoinColumnAnnotation column) {
-		this.primaryKeyJoinColumnResource = column;
-		super.initializeFromResource(column);
-		this.specifiedReferencedColumnName = this.specifiedReferencedColumnName(column);
-		this.defaultReferencedColumnName = this.defaultReferencedColumnName();
-	}
-
-	//************** JavaNamedColumn implementation ***************
-	@Override
-	public JavaBaseJoinColumn.Owner getOwner() {
-		return (JavaBaseJoinColumn.Owner) super.getOwner();
-	}
-	
-	@Override
-	protected PrimaryKeyJoinColumnAnnotation getColumnResource() {
-		return this.primaryKeyJoinColumnResource;
-	}
-	
-	//************** IAbstractJoinColumn implementation ***************
-	
-	public String getReferencedColumnName() {
-		return (this.specifiedReferencedColumnName == null) ? this.defaultReferencedColumnName : this.specifiedReferencedColumnName;
-	}
-
-	public String getSpecifiedReferencedColumnName() {
-		return this.specifiedReferencedColumnName;
-	}
-
-	public void setSpecifiedReferencedColumnName(String newSpecifiedReferencedColumnName) {
-		String oldSpecifiedReferencedColumnName = this.specifiedReferencedColumnName;
-		this.specifiedReferencedColumnName = newSpecifiedReferencedColumnName;
-		getColumnResource().setReferencedColumnName(newSpecifiedReferencedColumnName);
-		firePropertyChanged(SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, oldSpecifiedReferencedColumnName, newSpecifiedReferencedColumnName);
-	}
-
-	protected void setSpecifiedReferencedColumnName_(String newSpecifiedReferencedColumnName) {
-		String oldSpecifiedReferencedColumnName = this.specifiedReferencedColumnName;
-		this.specifiedReferencedColumnName = newSpecifiedReferencedColumnName;
-		firePropertyChanged(SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, oldSpecifiedReferencedColumnName, newSpecifiedReferencedColumnName);
-	}
-
-	public String getDefaultReferencedColumnName() {
-		return this.defaultReferencedColumnName;
-	}
-
-	protected void setDefaultReferencedColumnName(String newDefaultReferencedColumnName) {
-		String oldDefaultReferencedColumnName = this.defaultReferencedColumnName;
-		this.defaultReferencedColumnName = newDefaultReferencedColumnName;
-		firePropertyChanged(DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY, oldDefaultReferencedColumnName, newDefaultReferencedColumnName);
-	}
-	
-	public boolean isVirtual() {
-		return getOwner().isVirtual(this);
-	}
-
-	@Override
-	protected String getTableName() {
-		return this.getOwner().getTypeMapping().getTableName();
-	}
-
-	public Column getDbReferencedColumn() {
-		Table table = this.getDbReferencedColumnTable();
-		return (table == null) ? null : table.columnNamed(this.getReferencedColumnName());
-	}
-
-	public Table getDbReferencedColumnTable() {
-		return getOwner().getDbReferencedColumnTable();
-	}
-
-	public boolean referencedColumnNameTouches(int pos, CompilationUnit astRoot) {
-		return this.getColumnResource().referencedColumnNameTouches(pos, astRoot);
-	}
-
-	private Iterator<String> candidateReferencedColumnNames() {
-		Table table = this.getOwner().getDbReferencedColumnTable();
-		return (table != null) ? table.columnNames() : EmptyIterator.<String> instance();
-	}
-
-	private Iterator<String> candidateReferencedColumnNames(Filter<String> filter) {
-		return new FilteringIterator<String, String>(this.candidateReferencedColumnNames(), filter);
-	}
-
-	private Iterator<String> quotedCandidateReferencedColumnNames(Filter<String> filter) {
-		return StringTools.quote(this.candidateReferencedColumnNames(filter));
-	}
-
-	@Override
-	public Iterator<String> connectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.connectedJavaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		if (this.referencedColumnNameTouches(pos, astRoot)) {
-			return this.quotedCandidateReferencedColumnNames(filter);
-		}
-		return null;
-	}
-
-	public boolean isReferencedColumnResolved() {
-		return getDbReferencedColumn() != null;
-	}
-
-	public TextRange getReferencedColumnNameTextRange(CompilationUnit astRoot) {
-		return this.getColumnResource().getReferencedColumnNameTextRange(astRoot);
-	}
-	
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = getColumnResource().getTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getOwner().getValidationTextRange(astRoot);	
-	}
-
-	@Override
-	public void update(PrimaryKeyJoinColumnAnnotation column) {
-		this.primaryKeyJoinColumnResource = column;
-		super.update(column);
-		this.setSpecifiedReferencedColumnName_(this.specifiedReferencedColumnName(column));
-		this.setDefaultReferencedColumnName(this.defaultReferencedColumnName());
-	}
-	
-	protected String specifiedReferencedColumnName(PrimaryKeyJoinColumnAnnotation column) {
-		return column.getReferencedColumnName();
-	}
-	
-	//TODO not correct when we start supporting primaryKeyJoinColumns in 1-1 mappings
-	protected String defaultReferencedColumnName() {
-		return defaultName();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaQueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaQueryHint.java
deleted file mode 100644
index e86a8de5aa..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaQueryHint.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.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.QueryHint;
-import org.eclipse.jpt.core.context.java.JavaQuery;
-import org.eclipse.jpt.core.context.java.JavaQueryHint;
-import org.eclipse.jpt.core.resource.java.QueryHintAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-
-public class GenericJavaQueryHint extends AbstractJavaJpaContextNode implements JavaQueryHint
-{
-	protected String name;
-
-	protected String value;
-
-	protected QueryHintAnnotation queryHint;
-	
-	public GenericJavaQueryHint(JavaQuery parent) {
-		super(parent);
-	}
-
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		this.queryHint.setName(newName);
-		firePropertyChanged(QueryHint.NAME_PROPERTY, oldName, newName);
-	}
-
-	public String getValue() {
-		return this.value;
-	}
-
-	public void setValue(String newValue) {
-		String oldValue = this.value;
-		this.value = newValue;
-		this.queryHint.setValue(newValue);
-		firePropertyChanged(QueryHint.VALUE_PROPERTY, oldValue, newValue);
-	}
-
-
-	public void initializeFromResource(QueryHintAnnotation queryHint) {
-		this.queryHint = queryHint;
-		this.name = queryHint.getName();
-		this.value = queryHint.getValue();
-	}
-	
-	public void update(QueryHintAnnotation queryHint) {
-		this.queryHint = queryHint;
-		this.setName(queryHint.getName());
-		this.setValue(queryHint.getValue());
-	}
-
-	
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaSecondaryTable.java
deleted file mode 100644
index 3dc0480727..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaSecondaryTable.java
+++ /dev/null
@@ -1,344 +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.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.BaseJoinColumn;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.SecondaryTable;
-import org.eclipse.jpt.core.context.TypeMapping;
-import org.eclipse.jpt.core.context.java.JavaBaseJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaEntity;
-import org.eclipse.jpt.core.context.java.JavaPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaSecondaryTable;
-import org.eclipse.jpt.core.internal.resource.java.NullPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.SecondaryTableAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class GenericJavaSecondaryTable extends AbstractJavaTable
-	implements JavaSecondaryTable
-{
-	protected final List<JavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns;
-
-	protected JavaPrimaryKeyJoinColumn defaultPrimaryKeyJoinColumn;
-
-	protected SecondaryTableAnnotation secondaryTableResource;
-	
-	public GenericJavaSecondaryTable(JavaEntity parent) {
-		super(parent);
-		this.specifiedPrimaryKeyJoinColumns = new ArrayList<JavaPrimaryKeyJoinColumn>();
-	}
-	
-	@Override
-	public JavaEntity getParent() {
-		return (JavaEntity) super.getParent();
-	}
-
-	//***************** AbstractJavaTable implementation ********************
-	
-	@Override
-	protected String getAnnotationName() {
-		return SecondaryTableAnnotation.ANNOTATION_NAME;
-	}
-	
-	@Override
-	protected SecondaryTableAnnotation getTableResource() {
-		return this.secondaryTableResource;
-	}
-
-	@Override
-	protected String defaultName() {
-		return null;
-	}
-	
-	//***************** ISecondaryTable implementation ********************
-	
-
-	public ListIterator<JavaPrimaryKeyJoinColumn> primaryKeyJoinColumns() {
-		return this.containsSpecifiedPrimaryKeyJoinColumns() ? this.specifiedPrimaryKeyJoinColumns() : this.defaultPrimaryKeyJoinColumns();
-	}
-	
-	public int primaryKeyJoinColumnsSize() {
-		return this.containsSpecifiedPrimaryKeyJoinColumns() ? this.specifiedPrimaryKeyJoinColumnsSize() : this.defaultPrimaryKeyJoinColumnsSize();
-	}
-	
-	public ListIterator<JavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns() {
-		return new CloneListIterator<JavaPrimaryKeyJoinColumn>(this.specifiedPrimaryKeyJoinColumns);
-	}
-	
-	public int specifiedPrimaryKeyJoinColumnsSize() {
-		return this.specifiedPrimaryKeyJoinColumns.size();
-	}
-	
-	public boolean containsSpecifiedPrimaryKeyJoinColumns() {
-		return !this.specifiedPrimaryKeyJoinColumns.isEmpty();
-	}	
-	
-	public JavaPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn() {
-		return this.defaultPrimaryKeyJoinColumn;
-	}
-	
-	protected void setDefaultPrimaryKeyJoinColumn(JavaPrimaryKeyJoinColumn newPkJoinColumn) {
-		JavaPrimaryKeyJoinColumn oldPkJoinColumn = this.defaultPrimaryKeyJoinColumn;
-		this.defaultPrimaryKeyJoinColumn = newPkJoinColumn;
-		firePropertyChanged(SecondaryTable.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, oldPkJoinColumn, newPkJoinColumn);
-	}
-
-	protected ListIterator<JavaPrimaryKeyJoinColumn> defaultPrimaryKeyJoinColumns() {
-		if (this.defaultPrimaryKeyJoinColumn != null) {
-			return new SingleElementListIterator<JavaPrimaryKeyJoinColumn>(this.defaultPrimaryKeyJoinColumn);
-		}
-		return EmptyListIterator.instance();
-	}
-	
-	protected int defaultPrimaryKeyJoinColumnsSize() {
-		return (this.defaultPrimaryKeyJoinColumn == null) ? 0 : 1;
-	}
-
-	public JavaPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index) {
-		JavaPrimaryKeyJoinColumn oldDefaultPkJoinColumn = this.getDefaultPrimaryKeyJoinColumn();
-		if (oldDefaultPkJoinColumn != null) {
-			//null the default join column now if one already exists.
-			//if one does not exist, there is already a specified join column.
-			//Remove it now so that it doesn't get removed during an update and
-			//cause change notifications to be sent to the UI in the wrong order
-			this.defaultPrimaryKeyJoinColumn = null;
-		}
-		JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = getJpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner());
-		this.specifiedPrimaryKeyJoinColumns.add(index, primaryKeyJoinColumn);
-		PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = this.secondaryTableResource.addPkJoinColumn(index);
-		primaryKeyJoinColumn.initializeFromResource(pkJoinColumnResource);
-		this.fireItemAdded(SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, primaryKeyJoinColumn);
-		if (oldDefaultPkJoinColumn != null) {
-			this.firePropertyChanged(SecondaryTable.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, oldDefaultPkJoinColumn, null);
-		}
-		return primaryKeyJoinColumn;
-	}
-
-	protected void addSpecifiedPrimaryKeyJoinColumn(int index, JavaPrimaryKeyJoinColumn primaryKeyJoinColumn) {
-		addItemToList(index, primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST);
-	}
-	
-	public void removeSpecifiedPrimaryKeyJoinColumn(PrimaryKeyJoinColumn joinColumn) {
-		this.removeSpecifiedPrimaryKeyJoinColumn(this.specifiedPrimaryKeyJoinColumns.indexOf(joinColumn));
-	}
-	
-	public void removeSpecifiedPrimaryKeyJoinColumn(int index) {
-		JavaPrimaryKeyJoinColumn removedPrimaryKeyJoinColumn = this.specifiedPrimaryKeyJoinColumns.remove(index);
-		if (!containsSpecifiedPrimaryKeyJoinColumns()) {
-			//create the defaultJoinColumn now or this will happen during project update 
-			//after removing the join column from the resource model. That causes problems 
-			//in the UI because the change notifications end up in the wrong order.
-			this.defaultPrimaryKeyJoinColumn = buildPrimaryKeyJoinColumn(new NullPrimaryKeyJoinColumn(this.secondaryTableResource));
-		}
-		this.secondaryTableResource.removePkJoinColumn(index);
-		fireItemRemoved(SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedPrimaryKeyJoinColumn);
-		if (this.defaultPrimaryKeyJoinColumn != null) {
-			//fire change notification if a defaultJoinColumn was created above
-			this.firePropertyChanged(Entity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, null, this.defaultPrimaryKeyJoinColumn);
-		}
-	}	
-
-	protected void removeSpecifiedPrimaryKeyJoinColumn_(JavaPrimaryKeyJoinColumn primaryKeyJoinColumn) {
-		removeItemFromList(primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST);
-	}
-	
-	public void moveSpecifiedPrimaryKeyJoinColumn(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.specifiedPrimaryKeyJoinColumns, targetIndex, sourceIndex);
-		this.secondaryTableResource.movePkJoinColumn(targetIndex, sourceIndex);
-		fireItemMoved(SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, targetIndex, sourceIndex);		
-	}
-	
-	public JavaEntity getJavaEntity() {
-		return getParent();
-	}
-	
-	
-	//********************* updating ************************
-	
-	public void initializeFromResource(SecondaryTableAnnotation secondaryTable) {
-		super.initializeFromResource(secondaryTable);
-		this.secondaryTableResource = secondaryTable;
-		this.initializeSpecifiedPrimaryKeyJoinColumns(secondaryTable);
-		this.initializeDefaultPrimaryKeyJoinColumn(secondaryTable);
-	}
-	
-	protected void initializeSpecifiedPrimaryKeyJoinColumns(SecondaryTableAnnotation secondaryTable) {
-		ListIterator<PrimaryKeyJoinColumnAnnotation> annotations = secondaryTable.pkJoinColumns();
-		
-		while(annotations.hasNext()) {
-			this.specifiedPrimaryKeyJoinColumns.add(buildPrimaryKeyJoinColumn(annotations.next()));
-		}
-	}
-	
-	protected boolean shouldBuildDefaultPrimaryKeyJoinColumn() {
-		return !containsSpecifiedPrimaryKeyJoinColumns();
-	}
-	
-	protected void initializeDefaultPrimaryKeyJoinColumn(SecondaryTableAnnotation secondaryTable) {
-		if (!shouldBuildDefaultPrimaryKeyJoinColumn()) {
-			return;
-		}
-		this.defaultPrimaryKeyJoinColumn = buildPrimaryKeyJoinColumn(new NullPrimaryKeyJoinColumn(secondaryTable));
-	}	
-
-	
-	public void update(SecondaryTableAnnotation secondaryTableResource) {
-		this.secondaryTableResource = secondaryTableResource;
-		super.update(secondaryTableResource);
-		this.updateSpecifiedPrimaryKeyJoinColumns(secondaryTableResource);
-		this.updateDefaultPrimaryKeyJoinColumn(secondaryTableResource);
-	}
-	
-	protected void updateSpecifiedPrimaryKeyJoinColumns(SecondaryTableAnnotation secondaryTableResource) {
-		ListIterator<JavaPrimaryKeyJoinColumn> primaryKeyJoinColumns = specifiedPrimaryKeyJoinColumns();
-		ListIterator<PrimaryKeyJoinColumnAnnotation> resourcePrimaryKeyJoinColumns = secondaryTableResource.pkJoinColumns();
-		
-		while (primaryKeyJoinColumns.hasNext()) {
-			JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = primaryKeyJoinColumns.next();
-			if (resourcePrimaryKeyJoinColumns.hasNext()) {
-				primaryKeyJoinColumn.update(resourcePrimaryKeyJoinColumns.next());
-			}
-			else {
-				removeSpecifiedPrimaryKeyJoinColumn_(primaryKeyJoinColumn);
-			}
-		}
-		
-		while (resourcePrimaryKeyJoinColumns.hasNext()) {
-			addSpecifiedPrimaryKeyJoinColumn(specifiedPrimaryKeyJoinColumnsSize(), buildPrimaryKeyJoinColumn(resourcePrimaryKeyJoinColumns.next()));
-		}
-	}
-	
-	protected void updateDefaultPrimaryKeyJoinColumn(SecondaryTableAnnotation secondaryTableResource) {
-		if (!shouldBuildDefaultPrimaryKeyJoinColumn()) {
-			setDefaultPrimaryKeyJoinColumn(null);
-			return;
-		}
-		if (getDefaultPrimaryKeyJoinColumn() == null) {
-			this.setDefaultPrimaryKeyJoinColumn(buildPrimaryKeyJoinColumn(new NullPrimaryKeyJoinColumn(secondaryTableResource)));
-		}
-		else {
-			this.defaultPrimaryKeyJoinColumn.update(new NullPrimaryKeyJoinColumn(secondaryTableResource));
-		}
-	}	
-	
-	protected JavaPrimaryKeyJoinColumn buildPrimaryKeyJoinColumn(PrimaryKeyJoinColumnAnnotation primaryKeyJoinColumnResource) {
-		JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = getJpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner());
-		primaryKeyJoinColumn.initializeFromResource(primaryKeyJoinColumnResource);
-		return primaryKeyJoinColumn;
-	}
-	
-	protected JavaBaseJoinColumn.Owner createPrimaryKeyJoinColumnOwner() {
-		return new PrimaryKeyJoinColumnOwner();
-	}
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-		boolean doContinue = this.connectionProfileIsActive();
-		String schema = getSchema();
-		
-		if (doContinue && ! hasResolvedSchema()) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.SECONDARY_TABLE_UNRESOLVED_SCHEMA,
-						new String[] {schema, getName()}, 
-						this, 
-						getSchemaTextRange(astRoot))
-				);
-			doContinue = false;
-		}
-		
-		if (doContinue && ! isResolved()) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.SECONDARY_TABLE_UNRESOLVED_NAME,
-						new String[] {getName()}, 
-						this, 
-						getNameTextRange(astRoot))
-				);
-		}
-	}
-
-
-	//********************* code completion ************************
-
-	@Override
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		for (JavaPrimaryKeyJoinColumn column : CollectionTools.iterable(this.primaryKeyJoinColumns())) {
-			result = column.javaCompletionProposals(pos, filter, astRoot);
-			if (result != null) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	public boolean isVirtual() {
-		return false;
-	}
-	
-	class PrimaryKeyJoinColumnOwner implements JavaBaseJoinColumn.Owner
-	{
-		public TextRange getValidationTextRange(CompilationUnit astRoot) {
-			return GenericJavaSecondaryTable.this.getValidationTextRange(astRoot);
-		}
-
-		public TypeMapping getTypeMapping() {
-			return GenericJavaSecondaryTable.this.getJavaEntity();
-		}
-
-		public Table getDbTable(String tableName) {
-			return GenericJavaSecondaryTable.this.getDbTable();
-		}
-
-		public Table getDbReferencedColumnTable() {
-			return getTypeMapping().getPrimaryDbTable();
-		}
-
-		public int joinColumnsSize() {
-			return GenericJavaSecondaryTable.this.primaryKeyJoinColumnsSize();
-		}
-		
-		public boolean isVirtual(BaseJoinColumn joinColumn) {
-			return GenericJavaSecondaryTable.this.defaultPrimaryKeyJoinColumn == joinColumn;
-		}
-		
-		public String getDefaultColumnName() {
-			if (joinColumnsSize() != 1) {
-				return null;
-			}
-			return getJavaEntity().getPrimaryKeyColumnName();
-
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaSequenceGenerator.java
deleted file mode 100644
index 4c406448fb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaSequenceGenerator.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.core.internal.context.java;
-
-import org.eclipse.jpt.core.context.SequenceGenerator;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.context.java.JavaSequenceGenerator;
-import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation;
-
-
-public class GenericJavaSequenceGenerator extends AbstractJavaGenerator
-	implements JavaSequenceGenerator
-{
-	protected String specifiedSequenceName;
-
-	public GenericJavaSequenceGenerator(JavaJpaContextNode parent) {
-		super(parent);
-	}
-
-	@Override
-	protected SequenceGeneratorAnnotation getGeneratorResource() {
-		return (SequenceGeneratorAnnotation) super.getGeneratorResource();
-	}
-
-	public void initializeFromResource(SequenceGeneratorAnnotation sequenceGenerator) {
-		super.initializeFromResource(sequenceGenerator);
-		this.specifiedSequenceName = this.specifiedSequenceName(sequenceGenerator);
-	}
-	
-	public Integer getDefaultInitialValue() {
-		return SequenceGenerator.DEFAULT_INITIAL_VALUE;
-	}
-	
-	public String getSequenceName() {
-		return (this.getSpecifiedSequenceName() == null) ? getDefaultSequenceName() : this.getSpecifiedSequenceName();
-	}
-
-	public String getSpecifiedSequenceName() {
-		return this.specifiedSequenceName;
-	}
-
-	public void setSpecifiedSequenceName(String newSpecifiedSequenceName) {
-		String oldSpecifiedSequenceName = this.specifiedSequenceName;
-		this.specifiedSequenceName = newSpecifiedSequenceName;
-		getGeneratorResource().setSequenceName(newSpecifiedSequenceName);
-		firePropertyChanged(SPECIFIED_SEQUENCE_NAME_PROPERTY, oldSpecifiedSequenceName, newSpecifiedSequenceName);
-	}
-
-	protected void setSpecifiedSequenceName_(String newSpecifiedSequenceName) {
-		String oldSpecifiedSequenceName = this.specifiedSequenceName;
-		this.specifiedSequenceName = newSpecifiedSequenceName;
-		firePropertyChanged(SPECIFIED_SEQUENCE_NAME_PROPERTY, oldSpecifiedSequenceName, newSpecifiedSequenceName);
-	}
-
-	public String getDefaultSequenceName() {
-		return null;
-	}
-
-	public void update(SequenceGeneratorAnnotation sequenceGenerator) {
-		super.update(sequenceGenerator);
-		this.setSpecifiedSequenceName_(this.specifiedSequenceName(sequenceGenerator)); 
-	}
-	
-	protected String specifiedSequenceName(SequenceGeneratorAnnotation generatorResource) {
-		return generatorResource.getSequenceName();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTable.java
deleted file mode 100644
index 7b22f2ad57..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTable.java
+++ /dev/null
@@ -1,138 +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.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.InheritanceType;
-import org.eclipse.jpt.core.context.java.JavaEntity;
-import org.eclipse.jpt.core.context.java.JavaTable;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.TableAnnotation;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericJavaTable extends AbstractJavaTable implements JavaTable
-{
-	protected JavaResourcePersistentMember persistentResource;
-
-	public GenericJavaTable(JavaEntity parent) {
-		super(parent);
-	}
-	
-	public void initializeFromResource(JavaResourcePersistentMember persistentResource) {
-		this.persistentResource = persistentResource;
-		initializeFromResource(getTableResource());
-	}
-
-	
-	//query for the table resource every time on setters.
-	//call one setter and the tableResource could change. 
-	//You could call more than one setter before this object has received any notification
-	//from the java resource model
-	@Override
-	protected TableAnnotation getTableResource() {
-		//TODO get the NullTable from the resource model or build it here in the context model??
-		return (TableAnnotation) this.persistentResource.getNonNullAnnotation(getAnnotationName());
-	}
-
-	@Override
-	protected String getAnnotationName() {
-		return TableAnnotation.ANNOTATION_NAME;
-	}
-	
-	@Override
-	public JavaEntity getParent() {
-		return (JavaEntity) super.getParent();
-	}
-	
-	protected JavaEntity getJavaEntity() {
-		return getParent();
-	}
-	
-	protected Entity getRootEntity() {
-		return getJavaEntity().getRootEntity();
-	}
-	
-	@Override
-	/**
-	 * Table name default to the owning java entity name.
-	 * If this entity is part of a single table inheritance hierarchy, table
-	 * name defaults to the root entity's table name.
-	 */
-	protected String defaultName() {
-		if (getJavaEntity().getInheritanceStrategy() == InheritanceType.SINGLE_TABLE) {
-			if (getRootEntity() != getJavaEntity()) {
-				return getRootEntity().getTable().getName();
-			}
-		}
-		return getJavaEntity().getName();
-	}
-	
-	@Override
-	protected String defaultSchema() {
-		if (getJavaEntity().getInheritanceStrategy() == InheritanceType.SINGLE_TABLE) {
-			if (getRootEntity() != getJavaEntity()) {
-				return getRootEntity().getTable().getSchema();
-			}
-		}
-		return super.defaultSchema();
-	}
-	
-	@Override
-	protected String defaultCatalog() {
-		if (getJavaEntity().getInheritanceStrategy() == InheritanceType.SINGLE_TABLE) {
-			if (getRootEntity() != getJavaEntity()) {
-				return getRootEntity().getTable().getCatalog();
-			}
-		}
-		return super.defaultCatalog();
-	}
-	
-	public void update(JavaResourcePersistentMember persistentResource) {
-		this.persistentResource = persistentResource;
-		this.update(getTableResource());
-	}
-
-	//******************* validation **********************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-		boolean doContinue = this.connectionProfileIsActive();
-		String schema = getSchema();
-		
-		if (doContinue && ! hasResolvedSchema()) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.TABLE_UNRESOLVED_SCHEMA,
-						new String[] {schema, getName()}, 
-						this, 
-						getSchemaTextRange(astRoot))
-				);
-			doContinue = false;
-		}
-		
-		if (doContinue && ! isResolved()) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.TABLE_UNRESOLVED_NAME,
-						new String[] {getName()}, 
-						this, 
-						getNameTextRange(astRoot))
-				);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTableGenerator.java
deleted file mode 100644
index 63d687771d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTableGenerator.java
+++ /dev/null
@@ -1,398 +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.core.internal.context.java;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.TableGenerator;
-import org.eclipse.jpt.core.context.UniqueConstraint;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.context.java.JavaTableGenerator;
-import org.eclipse.jpt.core.context.java.JavaUniqueConstraint;
-import org.eclipse.jpt.core.resource.java.TableGeneratorAnnotation;
-import org.eclipse.jpt.core.resource.java.UniqueConstraintAnnotation;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-
-
-public class GenericJavaTableGenerator extends AbstractJavaGenerator
-	implements JavaTableGenerator, UniqueConstraint.Owner
-{
-
-	protected String specifiedTable;
-
-	protected String defaultTable;
-	
-	protected String specifiedCatalog;
-	
-	protected String defaultCatalog;
-	
-	protected String specifiedSchema;
-	
-	protected String defaultSchema;
-	
-	protected String specifiedPkColumnName;
-
-	protected String defaultPkColumnName;
-	
-	protected String specifiedValueColumnName;
-
-	protected String defaultValueColumnName;
-	
-	protected String specifiedPkColumnValue;
-
-	protected String defaultPkColumnValue;
-	
-	protected final List<JavaUniqueConstraint> uniqueConstraints;
-
-	public GenericJavaTableGenerator(JavaJpaContextNode parent) {
-		super(parent);
-		this.uniqueConstraints = new ArrayList<JavaUniqueConstraint>();
-	}
-
-	@Override
-	protected TableGeneratorAnnotation getGeneratorResource() {
-		return (TableGeneratorAnnotation) super.getGeneratorResource();
-	}
-
-	public Integer getDefaultInitialValue() {
-		return TableGenerator.DEFAULT_INITIAL_VALUE;
-	}
-	
-	public String getTable() {
-		return (this.getSpecifiedTable() == null) ? getDefaultTable() : this.getSpecifiedTable();
-	}
-	
-	public String getSpecifiedTable() {
-		return this.specifiedTable;
-	}
-
-	public void setSpecifiedTable(String newSpecifiedTable) {
-		String oldSpecifiedTable = this.specifiedTable;
-		this.specifiedTable = newSpecifiedTable;
-		getGeneratorResource().setTable(newSpecifiedTable);
-		firePropertyChanged(SPECIFIED_TABLE_PROPERTY, oldSpecifiedTable, newSpecifiedTable);
-	}
-
-	protected void setSpecifiedTable_(String newSpecifiedTable) {
-		String oldSpecifiedTable = this.specifiedTable;
-		this.specifiedTable = newSpecifiedTable;
-		firePropertyChanged(SPECIFIED_TABLE_PROPERTY, oldSpecifiedTable, newSpecifiedTable);
-	}
-
-	public String getDefaultTable() {
-		return this.defaultTable;
-	}
-
-	public String getCatalog() {
-		return (this.getSpecifiedCatalog() == null) ? getDefaultCatalog() : this.getSpecifiedCatalog();
-	}
-
-	public String getSpecifiedCatalog() {
-		return this.specifiedCatalog;
-	}
-
-	public void setSpecifiedCatalog(String newSpecifiedCatalog) {
-		String oldSpecifiedCatalog = this.specifiedCatalog;
-		this.specifiedCatalog = newSpecifiedCatalog;
-		getGeneratorResource().setCatalog(newSpecifiedCatalog);
-		firePropertyChanged(SPECIFIED_CATALOG_PROPERTY, oldSpecifiedCatalog, newSpecifiedCatalog);
-	}
-	
-	protected void setSpecifiedCatalog_(String newSpecifiedCatalog) {
-		String oldSpecifiedCatalog = this.specifiedCatalog;
-		this.specifiedCatalog = newSpecifiedCatalog;
-		firePropertyChanged(SPECIFIED_CATALOG_PROPERTY, oldSpecifiedCatalog, newSpecifiedCatalog);
-	}
-
-	public String getDefaultCatalog() {
-		return this.defaultCatalog;
-	}
-
-	protected void setDefaultCatalog(String newDefaultCatalog) {
-		String oldDefaultCatalog = this.defaultCatalog;
-		this.defaultCatalog = newDefaultCatalog;
-		firePropertyChanged(DEFAULT_CATALOG_PROPERTY, oldDefaultCatalog, newDefaultCatalog);
-	}
-
-	public String getSchema() {
-		return (this.getSpecifiedSchema() == null) ? getDefaultSchema() : this.getSpecifiedSchema();
-	}
-
-	public String getSpecifiedSchema() {
-		return this.specifiedSchema;
-	}
-
-	public void setSpecifiedSchema(String newSpecifiedSchema) {
-		String oldSpecifiedSchema = this.specifiedSchema;
-		this.specifiedSchema = newSpecifiedSchema;
-		getGeneratorResource().setSchema(newSpecifiedSchema);
-		firePropertyChanged(SPECIFIED_SCHEMA_PROPERTY, oldSpecifiedSchema, newSpecifiedSchema);
-	}
-
-	protected void setSpecifiedSchema_(String newSpecifiedSchema) {
-		String oldSpecifiedSchema = this.specifiedSchema;
-		this.specifiedSchema = newSpecifiedSchema;
-		firePropertyChanged(SPECIFIED_SCHEMA_PROPERTY, oldSpecifiedSchema, newSpecifiedSchema);
-	}
-
-	public String getDefaultSchema() {
-		return this.defaultSchema;
-	}
-
-	protected void setDefaultSchema(String newDefaultSchema) {
-		String oldDefaultSchema = this.defaultSchema;
-		this.defaultSchema = newDefaultSchema;
-		firePropertyChanged(DEFAULT_SCHEMA_PROPERTY, oldDefaultSchema, newDefaultSchema);
-	}
-
-	public String getPkColumnName() {
-		return (this.getSpecifiedPkColumnName() == null) ? getDefaultPkColumnName() : this.getSpecifiedPkColumnName();
-	}
-
-	public String getSpecifiedPkColumnName() {
-		return this.specifiedPkColumnName;
-	}
-
-	public void setSpecifiedPkColumnName(String newSpecifiedPkColumnName) {
-		String oldSpecifiedPkColumnName = this.specifiedPkColumnName;
-		this.specifiedPkColumnName = newSpecifiedPkColumnName;
-		getGeneratorResource().setPkColumnName(newSpecifiedPkColumnName);
-		firePropertyChanged(SPECIFIED_PK_COLUMN_NAME_PROPERTY, oldSpecifiedPkColumnName, newSpecifiedPkColumnName);
-	}
-
-	protected void setSpecifiedPkColumnName_(String newSpecifiedPkColumnName) {
-		String oldSpecifiedPkColumnName = this.specifiedPkColumnName;
-		this.specifiedPkColumnName = newSpecifiedPkColumnName;
-		firePropertyChanged(SPECIFIED_PK_COLUMN_NAME_PROPERTY, oldSpecifiedPkColumnName, newSpecifiedPkColumnName);
-	}
-
-	public String getDefaultPkColumnName() {
-		return this.defaultPkColumnName;
-	}
-
-	public String getValueColumnName() {
-		return (this.getSpecifiedValueColumnName() == null) ? getDefaultValueColumnName() : this.getSpecifiedValueColumnName();
-	}
-
-	public String getSpecifiedValueColumnName() {
-		return this.specifiedValueColumnName;
-	}
-
-	public void setSpecifiedValueColumnName(String newSpecifiedValueColumnName) {
-		String oldSpecifiedValueColumnName = this.specifiedValueColumnName;
-		this.specifiedValueColumnName = newSpecifiedValueColumnName;
-		getGeneratorResource().setValueColumnName(newSpecifiedValueColumnName);
-		firePropertyChanged(SPECIFIED_VALUE_COLUMN_NAME_PROPERTY, oldSpecifiedValueColumnName, newSpecifiedValueColumnName);
-	}
-
-	protected void setSpecifiedValueColumnName_(String newSpecifiedValueColumnName) {
-		String oldSpecifiedValueColumnName = this.specifiedValueColumnName;
-		this.specifiedValueColumnName = newSpecifiedValueColumnName;
-		firePropertyChanged(SPECIFIED_VALUE_COLUMN_NAME_PROPERTY, oldSpecifiedValueColumnName, newSpecifiedValueColumnName);
-	}
-
-	public String getDefaultValueColumnName() {
-		return this.defaultValueColumnName;
-	}
-
-	public String getPkColumnValue() {
-		return (this.getSpecifiedPkColumnValue() == null) ? getDefaultPkColumnValue() : this.getSpecifiedPkColumnValue();
-	}
-
-	public String getSpecifiedPkColumnValue() {
-		return this.specifiedPkColumnValue;
-	}
-
-	public void setSpecifiedPkColumnValue(String newSpecifiedPkColumnValue) {
-		String oldSpecifiedPkColumnValue = this.specifiedPkColumnValue;
-		this.specifiedPkColumnValue = newSpecifiedPkColumnValue;
-		getGeneratorResource().setPkColumnValue(newSpecifiedPkColumnValue);
-		firePropertyChanged(SPECIFIED_PK_COLUMN_VALUE_PROPERTY, oldSpecifiedPkColumnValue, newSpecifiedPkColumnValue);
-	}
-
-	public void setSpecifiedPkColumnValue_(String newSpecifiedPkColumnValue) {
-		String oldSpecifiedPkColumnValue = this.specifiedPkColumnValue;
-		this.specifiedPkColumnValue = newSpecifiedPkColumnValue;
-		firePropertyChanged(SPECIFIED_PK_COLUMN_VALUE_PROPERTY, oldSpecifiedPkColumnValue, newSpecifiedPkColumnValue);
-	}
-
-	public String getDefaultPkColumnValue() {
-		return this.defaultPkColumnValue;
-	}
-
-
-	// ********** unique constraints **********
-	
-	public ListIterator<JavaUniqueConstraint> uniqueConstraints() {
-		return new CloneListIterator<JavaUniqueConstraint>(this.uniqueConstraints);
-	}
-	
-	public int uniqueConstraintsSize() {
-		return this.uniqueConstraints.size();
-	}
-	
-	public JavaUniqueConstraint addUniqueConstraint(int index) {
-		JavaUniqueConstraint uniqueConstraint = getJpaFactory().buildJavaUniqueConstraint(this, this);
-		this.uniqueConstraints.add(index, uniqueConstraint);
-		UniqueConstraintAnnotation uniqueConstraintAnnotation = this.getGeneratorResource().addUniqueConstraint(index);
-		uniqueConstraint.initialize(uniqueConstraintAnnotation);
-		fireItemAdded(TableGenerator.UNIQUE_CONSTRAINTS_LIST, index, uniqueConstraint);
-		return uniqueConstraint;
-	}
-		
-	public void removeUniqueConstraint(UniqueConstraint uniqueConstraint) {
-		this.removeUniqueConstraint(this.uniqueConstraints.indexOf(uniqueConstraint));
-	}
-
-	public void removeUniqueConstraint(int index) {
-		JavaUniqueConstraint removedUniqueConstraint = this.uniqueConstraints.remove(index);
-		this.getGeneratorResource().removeUniqueConstraint(index);
-		fireItemRemoved(TableGenerator.UNIQUE_CONSTRAINTS_LIST, index, removedUniqueConstraint);
-	}
-	
-	public void moveUniqueConstraint(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.uniqueConstraints, targetIndex, sourceIndex);
-		this.getGeneratorResource().moveUniqueConstraint(targetIndex, sourceIndex);
-		fireItemMoved(TableGenerator.UNIQUE_CONSTRAINTS_LIST, targetIndex, sourceIndex);		
-	}
-	
-	protected void addUniqueConstraint(int index, JavaUniqueConstraint uniqueConstraint) {
-		addItemToList(index, uniqueConstraint, this.uniqueConstraints, TableGenerator.UNIQUE_CONSTRAINTS_LIST);
-	}
-	
-	protected void removeUniqueConstraint_(JavaUniqueConstraint uniqueConstraint) {
-		removeItemFromList(uniqueConstraint, this.uniqueConstraints, TableGenerator.UNIQUE_CONSTRAINTS_LIST);
-	}
-	
-	
-	//******************* UniqueConstraint.Owner implementation ******************
-
-	public Iterator<String> candidateUniqueConstraintColumnNames() {
-		org.eclipse.jpt.db.Table dbTable = getDbTable();
-		if (dbTable != null) {
-			return dbTable.columnNames();
-		}
-		return EmptyIterator.instance();
-	}
-
-
-	// ********** java resource model -> java context model **********
-	
-	public void initializeFromResource(TableGeneratorAnnotation tableGenerator) {
-		super.initializeFromResource(tableGenerator);
-		this.specifiedTable = this.specifiedTable(tableGenerator);
-		this.specifiedCatalog = this.specifiedCatalog(tableGenerator);
-		this.defaultCatalog = this.defaultCatalog();
-		this.specifiedSchema = this.specifiedSchema(tableGenerator);
-		this.defaultSchema = this.defaultSchema();
-		this.specifiedPkColumnName = this.specifiedPkColumnName(tableGenerator);
-		this.specifiedValueColumnName = this.specifiedValueColumnName(tableGenerator);
-		this.specifiedPkColumnValue = this.specifiedPkColumnValue(tableGenerator);
-		this.initializeUniqueConstraints(tableGenerator);
-	}
-
-	protected void initializeUniqueConstraints(TableGeneratorAnnotation tableGenerator) {
-		for (UniqueConstraintAnnotation uniqueConstraintAnnotation : CollectionTools.iterable(tableGenerator.uniqueConstraints())) {
-			this.uniqueConstraints.add(buildUniqueConstraint(uniqueConstraintAnnotation));
-		}
-	}
-
-	public void update(TableGeneratorAnnotation tableGenerator) {
-		super.update(tableGenerator);
-		this.setSpecifiedTable_(this.specifiedTable(tableGenerator));
-		this.setSpecifiedCatalog_(this.specifiedCatalog(tableGenerator));
-		this.setDefaultCatalog(this.defaultCatalog());
-		this.setSpecifiedSchema_(this.specifiedSchema(tableGenerator));
-		this.setDefaultSchema(this.defaultSchema());
-		this.setSpecifiedPkColumnName_(this.specifiedPkColumnName(tableGenerator));
-		this.setSpecifiedValueColumnName_(this.specifiedValueColumnName(tableGenerator));
-		this.setSpecifiedPkColumnValue_(this.specifiedPkColumnValue(tableGenerator));
-		this.updateUniqueConstraints(tableGenerator);
-	}
-	
-	protected void updateUniqueConstraints(TableGeneratorAnnotation tableGenerator) {
-		ListIterator<JavaUniqueConstraint> uniqueConstraints = uniqueConstraints();
-		ListIterator<UniqueConstraintAnnotation> resourceUniqueConstraints = tableGenerator.uniqueConstraints();
-		
-		while (uniqueConstraints.hasNext()) {
-			JavaUniqueConstraint uniqueConstraint = uniqueConstraints.next();
-			if (resourceUniqueConstraints.hasNext()) {
-				uniqueConstraint.update(resourceUniqueConstraints.next());
-			}
-			else {
-				removeUniqueConstraint_(uniqueConstraint);
-			}
-		}
-		
-		while (resourceUniqueConstraints.hasNext()) {
-			addUniqueConstraint(uniqueConstraintsSize(), buildUniqueConstraint(resourceUniqueConstraints.next()));
-		}
-	}
-
-	protected JavaUniqueConstraint buildUniqueConstraint(UniqueConstraintAnnotation uniqueConstraintAnnotation) {
-		JavaUniqueConstraint uniqueConstraint = getJpaFactory().buildJavaUniqueConstraint(this, this);
-		uniqueConstraint.initialize(uniqueConstraintAnnotation);
-		return uniqueConstraint;
-	}
-	
-	protected String specifiedTable(TableGeneratorAnnotation tableGenerator) {
-		return tableGenerator.getTable();
-	}
-	
-	protected String specifiedCatalog(TableGeneratorAnnotation tableGenerator) {
-		return tableGenerator.getCatalog();
-	}
-	
-	protected String specifiedSchema(TableGeneratorAnnotation tableGenerator) {
-		return tableGenerator.getSchema();
-	}
-	
-	protected String specifiedPkColumnName(TableGeneratorAnnotation tableGenerator) {
-		return tableGenerator.getPkColumnName();
-	}
-	
-	protected String specifiedValueColumnName(TableGeneratorAnnotation tableGenerator) {
-		return tableGenerator.getValueColumnName();
-	}
-	
-	protected String specifiedPkColumnValue(TableGeneratorAnnotation tableGenerator) {
-		return tableGenerator.getPkColumnValue();
-	}
-
-	protected String defaultSchema() {
-		if (getEntityMappings() != null) {
-			return getEntityMappings().getSchema();
-		}
-		return getPersistenceUnit().getDefaultSchema();
-	}
-	
-	protected String defaultCatalog() {
-		if (getEntityMappings() != null) {
-			return getEntityMappings().getCatalog();
-		}
-		return getPersistenceUnit().getDefaultCatalog();
-	}
-
-	public Table getDbTable() {
-		Schema schema = this.getDbSchema();
-		return (schema == null) ? null : schema.tableNamed(this.getTable());
-	}
-
-	public Schema getDbSchema() {
-		return this.getDatabase().schemaNamed(this.getSchema());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTransientMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTransientMapping.java
deleted file mode 100644
index d7d919db68..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTransientMapping.java
+++ /dev/null
@@ -1,47 +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.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.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaTransientMapping;
-import org.eclipse.jpt.core.resource.java.TransientAnnotation;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericJavaTransientMapping extends AbstractJavaAttributeMapping<TransientAnnotation>
-	implements JavaTransientMapping
-{
-	public GenericJavaTransientMapping(JavaPersistentAttribute parent) {
-		super(parent);
-	}
-
-	public String getKey() {
-		return MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return TransientAnnotation.ANNOTATION_NAME;
-	}
-	
-	public Iterator<String> correspondingAnnotationNames() {
-		return EmptyIterator.instance();
-	}
-
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaUniqueConstraint.java
deleted file mode 100644
index 47332c31f3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaUniqueConstraint.java
+++ /dev/null
@@ -1,158 +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.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.UniqueConstraint;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.context.java.JavaUniqueConstraint;
-import org.eclipse.jpt.core.resource.java.UniqueConstraintAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-
-public class GenericJavaUniqueConstraint extends AbstractJavaJpaContextNode
-	implements JavaUniqueConstraint
-{
-
-	protected final List<String> columnNames;
-
-	protected UniqueConstraintAnnotation uniqueConstraintAnnotation;
-	
-	protected Owner owner;
-	public GenericJavaUniqueConstraint(JavaJpaContextNode parent, Owner owner) {
-		super(parent);
-		this.owner = owner;
-		this.columnNames = new ArrayList<String>();
-	}
-
-	public Owner getOwner() {
-		return this.owner;
-	}
-	
-	public ListIterator<String> columnNames() {
-		return new CloneListIterator<String>(this.columnNames);
-	}
-
-	public int columnNamesSize() {
-		return this.columnNames.size();
-	}
-
-	public void addColumnName(int index, String columnName) {
-		this.columnNames.add(index, columnName);
-		this.uniqueConstraintAnnotation.addColumnName(index, columnName);
-		fireItemAdded(UniqueConstraint.COLUMN_NAMES_LIST, index, columnName);		
-	}	
-	
-	protected void addColumnName_(int index, String columnName) {
-		this.columnNames.add(index, columnName);
-		fireItemAdded(UniqueConstraint.COLUMN_NAMES_LIST, index, columnName);		
-	}	
-
-	public void removeColumnName(String columnName) {
-		this.removeColumnName(this.columnNames.indexOf(columnName));
-	}
-
-	public void removeColumnName(int index) {
-		String removedColumnName = this.columnNames.remove(index);
-		this.uniqueConstraintAnnotation.removeColumnName(index);
-		fireItemRemoved(UniqueConstraint.COLUMN_NAMES_LIST, index, removedColumnName);
-	}
-	
-	protected void removeColumnName_(int index) {
-		String removedColumnName = this.columnNames.remove(index);
-		fireItemRemoved(UniqueConstraint.COLUMN_NAMES_LIST, index, removedColumnName);
-	}
-
-	public void moveColumnName(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.columnNames, targetIndex, sourceIndex);
-		this.uniqueConstraintAnnotation.moveColumnName(targetIndex, sourceIndex);
-		fireItemMoved(UniqueConstraint.COLUMN_NAMES_LIST, targetIndex, sourceIndex);		
-	}
-
-	public void initialize(UniqueConstraintAnnotation uniqueConstraintAnnotation) {
-		this.uniqueConstraintAnnotation = uniqueConstraintAnnotation;
-		this.initializeColumnNames(uniqueConstraintAnnotation);
-	}
-	
-	protected void initializeColumnNames(UniqueConstraintAnnotation uniqueConstraintAnnotation) {
-		ListIterator<String> annotationColumnNames = uniqueConstraintAnnotation.columnNames();
-		
-		for (String annotationColumnName : CollectionTools.iterable(annotationColumnNames)) {
-			this.columnNames.add(annotationColumnName);
-		}
-	}
-
-	public void update(UniqueConstraintAnnotation uniqueConstraintAnnotation) {
-		this.uniqueConstraintAnnotation = uniqueConstraintAnnotation;
-		this.updateColumnNames(uniqueConstraintAnnotation);
-	}
-
-	protected void updateColumnNames(UniqueConstraintAnnotation uniqueConstraintAnnotation) {
-		ListIterator<String> annotationColumnNames = uniqueConstraintAnnotation.columnNames();
-		
-		int index = 0;
-		for (String annotationColumnName : CollectionTools.iterable(annotationColumnNames)) {
-			if (columnNamesSize() > index) {
-				if (this.columnNames.get(index) != annotationColumnName) {
-					addColumnName_(index, annotationColumnName);
-				}
-			}
-			else {
-				addColumnName_(index, annotationColumnName);			
-			}
-			index++;
-		}
-		
-		for ( ; index < columnNamesSize(); ) {
-			removeColumnName_(index);
-		}
-	}
-
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return this.uniqueConstraintAnnotation.getTextRange(astRoot);
-	}	
-
-	private boolean columnNamesTouches(int pos, CompilationUnit astRoot) {
-		return this.uniqueConstraintAnnotation.columnNamesTouches(pos, astRoot);
-	}
-
-	private Iterator<String> candidateColumnNames() {
-		return this.getOwner().candidateUniqueConstraintColumnNames();
-	}
-
-	private Iterator<String> candidateColumnNames(Filter<String> filter) {
-		return new FilteringIterator<String, String>(this.candidateColumnNames(), filter);
-	}
-
-	private Iterator<String> quotedCandidateColumnNames(Filter<String> filter) {
-		return StringTools.quote(this.candidateColumnNames(filter));
-	}
-
-	@Override
-	public Iterator<String> connectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.connectedJavaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		if (this.columnNamesTouches(pos, astRoot)) {
-			return this.quotedCandidateColumnNames(filter);
-		}
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaVersionMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaVersionMapping.java
deleted file mode 100644
index 36e7f873a3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaVersionMapping.java
+++ /dev/null
@@ -1,166 +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.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.ColumnMapping;
-import org.eclipse.jpt.core.context.TemporalType;
-import org.eclipse.jpt.core.context.java.JavaColumn;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaVersionMapping;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.ColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.TemporalAnnotation;
-import org.eclipse.jpt.core.resource.java.VersionAnnotation;
-import org.eclipse.jpt.utility.Filter;
-import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericJavaVersionMapping extends AbstractJavaAttributeMapping<VersionAnnotation> implements JavaVersionMapping
-{
-	protected final JavaColumn column;
-	
-	protected TemporalType temporal;
-
-	public GenericJavaVersionMapping(JavaPersistentAttribute parent) {
-		super(parent);
-		this.column = createJavaColumn();
-	}
-
-	protected JavaColumn createJavaColumn() {
-		return getJpaFactory().buildJavaColumn(this, this);
-	}
-	
-	@Override
-	public void initializeFromResource(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		super.initializeFromResource(resourcePersistentAttribute);
-		this.column.initializeFromResource(this.getColumnResource());
-		this.temporal = this.temporal(this.temporalResource());
-	}
-	
-	protected TemporalAnnotation temporalResource() {
-		return (TemporalAnnotation) getResourcePersistentAttribute().getNonNullAnnotation(TemporalAnnotation.ANNOTATION_NAME);
-	}
-	
-	public ColumnAnnotation getColumnResource() {
-		return (ColumnAnnotation) getResourcePersistentAttribute().getNonNullAnnotation(ColumnAnnotation.ANNOTATION_NAME);
-	}
-
-	//************** IJavaAttributeMapping implementation ***************
-
-	public String getKey() {
-		return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public String getAnnotationName() {
-		return VersionAnnotation.ANNOTATION_NAME;
-	}
-	
-	public Iterator<String> correspondingAnnotationNames() {
-		return new ArrayIterator<String>(
-			JPA.COLUMN,
-			JPA.TEMPORAL);
-	}
-
-	//************** INamedColumn.Owner implementation ***************
-
-	public String getDefaultColumnName() {
-		return getAttributeName();
-	}
-	
-	public String getDefaultTableName() {
-		return getTypeMapping().getTableName();
-	}
-
-	//************** IVersionMapping implementation ***************
-	
-	public JavaColumn getColumn() {
-		return this.column;
-	}
-
-	public TemporalType getTemporal() {
-		return this.temporal;
-	}
-
-	public void setTemporal(TemporalType newTemporal) {
-		TemporalType oldTemporal = this.temporal;
-		this.temporal = newTemporal;
-		this.temporalResource().setValue(TemporalType.toJavaResourceModel(newTemporal));
-		firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal);
-	}
-
-	@Override
-	public void update(JavaResourcePersistentAttribute resourcePersistentAttribute) {
-		super.update(resourcePersistentAttribute);
-		this.column.update(this.getColumnResource());
-		this.setTemporal(this.temporal(this.temporalResource()));
-	}
-	
-	protected TemporalType temporal(TemporalAnnotation temporal) {
-		return TemporalType.fromJavaResourceModel(temporal.getValue());
-	}
-
-	@Override
-	public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		result = this.getColumn().javaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		return null;
-	}
-	
-	//***********  Validation  ******************************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		super.addToMessages(messages, astRoot);
-		
-		addColumnMessages(messages, astRoot);
-	}
-	
-	protected void addColumnMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		JavaColumn column = this.getColumn();
-		String table = column.getTable();
-		boolean doContinue = entityOwned() && column.connectionProfileIsActive();
-		
-		if (doContinue && this.getTypeMapping().tableNameIsInvalid(table)) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.COLUMN_UNRESOLVED_TABLE,
-						new String[] {table, column.getName()}, 
-						column, column.getTableTextRange(astRoot))
-				);
-			doContinue = false;
-		}
-		
-		if (doContinue && ! column.isResolved()) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.COLUMN_UNRESOLVED_NAME,
-						new String[] {column.getName()}, 
-						column, column.getNameTextRange(astRoot))
-				);
-		}
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaBasicMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaBasicMappingProvider.java
deleted file mode 100644
index 3c37d7b648..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaBasicMappingProvider.java
+++ /dev/null
@@ -1,56 +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.core.internal.context.java;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-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.resource.java.BasicAnnotation;
-
-public class JavaBasicMappingProvider
-	implements DefaultJavaAttributeMappingProvider
-{
-
-	// singleton
-	private static final JavaBasicMappingProvider INSTANCE = new JavaBasicMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static DefaultJavaAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private JavaBasicMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return BasicAnnotation.ANNOTATION_NAME;
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaFactory factory) {
-		return factory.buildJavaBasicMapping(parent);
-	}
-	
-	public boolean defaultApplies(JavaPersistentAttribute persistentAttribute) {
-		return persistentAttribute.getResourcePersistentAttribute().typeIsBasic();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaCascade.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaCascade.java
deleted file mode 100644
index e7a21e46f8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaCascade.java
+++ /dev/null
@@ -1,112 +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.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.Cascade;
-import org.eclipse.jpt.core.context.java.JavaRelationshipMapping;
-import org.eclipse.jpt.core.resource.java.RelationshipMappingAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-
-public class JavaCascade extends AbstractJavaJpaContextNode implements Cascade
-{
-	protected boolean all;
-
-	protected boolean persist;
-
-	protected boolean merge;
-
-	protected boolean remove;
-
-	protected boolean refresh;
-
-	protected RelationshipMappingAnnotation relationshipMapping;
-
-	protected JavaCascade(JavaRelationshipMapping parent) {
-		super(parent);
-	}
-
-	public boolean isAll() {
-		return this.all;
-	}
-
-	public void setAll(boolean newAll) {
-		boolean oldAll = this.all;
-		this.all = newAll;
-		this.relationshipMapping.setCascadeAll(newAll);
-		firePropertyChanged(Cascade.ALL_PROPERTY, oldAll, newAll);
-	}
-
-	public boolean isPersist() {
-		return this.persist;
-	}
-
-	public void setPersist(boolean newPersist) {
-		boolean oldPersist = this.persist;
-		this.persist = newPersist;
-		this.relationshipMapping.setCascadePersist(newPersist);
-		firePropertyChanged(Cascade.PERSIST_PROPERTY, oldPersist, newPersist);
-	}
-
-	public boolean isMerge() {
-		return this.merge;
-	}
-
-	public void setMerge(boolean newMerge) {
-		boolean oldMerge = this.merge;
-		this.merge = newMerge;
-		this.relationshipMapping.setCascadeMerge(newMerge);
-		firePropertyChanged(Cascade.MERGE_PROPERTY, oldMerge, newMerge);
-	}
-
-	public boolean isRemove() {
-		return this.remove;
-	}
-
-	public void setRemove(boolean newRemove) {
-		boolean oldRemove = this.remove;
-		this.remove = newRemove;
-		this.relationshipMapping.setCascadeRemove(newRemove);
-		firePropertyChanged(Cascade.REMOVE_PROPERTY, oldRemove, newRemove);
-	}
-
-	public boolean isRefresh() {
-		return this.refresh;
-	}
-
-	public void setRefresh(boolean newRefresh) {
-		boolean oldRefresh = this.refresh;
-		this.refresh = newRefresh;
-		this.relationshipMapping.setCascadeRefresh(newRefresh);
-		firePropertyChanged(Cascade.REFRESH_PROPERTY, oldRefresh, newRefresh);
-	}
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return this.relationshipMapping.getCascadeTextRange(astRoot);
-	}
-	
-	public void initialize(RelationshipMappingAnnotation relationshipMapping) {
-		this.relationshipMapping = relationshipMapping;
-		this.all = relationshipMapping.isCascadeAll();
-		this.persist = relationshipMapping.isCascadePersist();
-		this.merge = relationshipMapping.isCascadeMerge();
-		this.remove = relationshipMapping.isCascadeRemove();
-		this.refresh = relationshipMapping.isCascadeRefresh();
-	}
-	
-	public void update(RelationshipMappingAnnotation relationshipMapping) {
-		this.relationshipMapping = relationshipMapping;
-		this.setAll(relationshipMapping.isCascadeAll());
-		this.setPersist(relationshipMapping.isCascadePersist());
-		this.setMerge(relationshipMapping.isCascadeMerge());
-		this.setRemove(relationshipMapping.isCascadeRemove());
-		this.setRefresh(relationshipMapping.isCascadeRefresh());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddableProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddableProvider.java
deleted file mode 100644
index 3f8567367a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddableProvider.java
+++ /dev/null
@@ -1,52 +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.core.internal.context.java;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaEmbeddable;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.context.java.JavaTypeMappingProvider;
-import org.eclipse.jpt.core.resource.java.EmbeddableAnnotation;
-
-public class JavaEmbeddableProvider
-	implements JavaTypeMappingProvider
-{
-
-	// singleton
-	private static final JavaEmbeddableProvider INSTANCE = new JavaEmbeddableProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaTypeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private JavaEmbeddableProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return EmbeddableAnnotation.ANNOTATION_NAME;
-	}
-
-	public JavaEmbeddable buildMapping(JavaPersistentType parent, JpaFactory factory) {
-		return factory.buildJavaEmbeddable(parent);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedIdMappingProvider.java
deleted file mode 100644
index bc30accc8f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedIdMappingProvider.java
+++ /dev/null
@@ -1,56 +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.core.internal.context.java;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-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.MappingTools;
-import org.eclipse.jpt.core.resource.java.EmbeddedIdAnnotation;
-
-public class JavaEmbeddedIdMappingProvider
-	implements DefaultJavaAttributeMappingProvider
-{
-
-	// singleton
-	private static final JavaEmbeddedIdMappingProvider INSTANCE = new JavaEmbeddedIdMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static DefaultJavaAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private JavaEmbeddedIdMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return EmbeddedIdAnnotation.ANNOTATION_NAME;
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaFactory factory) {
-		return factory.buildJavaEmbeddedIdMapping(parent);
-	}
-	
-	public boolean defaultApplies(JavaPersistentAttribute persistentAttribute) {
-		return MappingTools.getEmbeddableFor(persistentAttribute) != null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedMappingProvider.java
deleted file mode 100644
index fdd6f131ed..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedMappingProvider.java
+++ /dev/null
@@ -1,56 +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.core.internal.context.java;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-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.MappingTools;
-import org.eclipse.jpt.core.resource.java.EmbeddedAnnotation;
-
-public class JavaEmbeddedMappingProvider
-	implements DefaultJavaAttributeMappingProvider
-{
-
-	// singleton
-	private static final JavaEmbeddedMappingProvider INSTANCE = new JavaEmbeddedMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static DefaultJavaAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private JavaEmbeddedMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return EmbeddedAnnotation.ANNOTATION_NAME;
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaFactory factory) {
-		return factory.buildJavaEmbeddedMapping(parent);
-	}
-	
-	public boolean defaultApplies(JavaPersistentAttribute persistentAttribute) {
-		return MappingTools.getEmbeddableFor(persistentAttribute) != null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEntityProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEntityProvider.java
deleted file mode 100644
index 7114a094ac..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEntityProvider.java
+++ /dev/null
@@ -1,55 +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.core.internal.context.java;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaEntity;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.context.java.JavaTypeMappingProvider;
-import org.eclipse.jpt.core.resource.java.EntityAnnotation;
-
-/**
- * 
- */
-public class JavaEntityProvider
-	implements JavaTypeMappingProvider
-{
-
-	// singleton
-	private static final JavaEntityProvider INSTANCE = new JavaEntityProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaTypeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private JavaEntityProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return MappingKeys.ENTITY_TYPE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return EntityAnnotation.ANNOTATION_NAME;
-	}
-
-	public JavaEntity buildMapping(JavaPersistentType parent, JpaFactory factory) {
-		return factory.buildJavaEntity(parent);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaIdMappingProvider.java
deleted file mode 100644
index 42db79746b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaIdMappingProvider.java
+++ /dev/null
@@ -1,51 +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.core.internal.context.java;
-
-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.JavaAttributeMappingProvider;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.resource.java.IdAnnotation;
-
-public class JavaIdMappingProvider
-	implements JavaAttributeMappingProvider
-{
-
-	// singleton
-	private static final JavaIdMappingProvider INSTANCE = new JavaIdMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private JavaIdMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return IdAnnotation.ANNOTATION_NAME;
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaFactory factory) {
-		return factory.buildJavaIdMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToManyMappingProvider.java
deleted file mode 100644
index 028370fbfa..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToManyMappingProvider.java
+++ /dev/null
@@ -1,51 +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.core.internal.context.java;
-
-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.JavaAttributeMappingProvider;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.resource.java.ManyToManyAnnotation;
-
-public class JavaManyToManyMappingProvider
-	implements JavaAttributeMappingProvider
-{
-
-	// singleton
-	private static final JavaManyToManyMappingProvider INSTANCE = new JavaManyToManyMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private JavaManyToManyMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return ManyToManyAnnotation.ANNOTATION_NAME;
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaFactory factory) {
-		return factory.buildJavaManyToManyMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToOneMappingProvider.java
deleted file mode 100644
index 757a9c1b42..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToOneMappingProvider.java
+++ /dev/null
@@ -1,51 +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.core.internal.context.java;
-
-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.JavaAttributeMappingProvider;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.resource.java.ManyToOneAnnotation;
-
-public class JavaManyToOneMappingProvider
-	implements JavaAttributeMappingProvider
-{
-
-	// singleton
-	private static final JavaManyToOneMappingProvider INSTANCE = new JavaManyToOneMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private JavaManyToOneMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return ManyToOneAnnotation.ANNOTATION_NAME;
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaFactory factory) {
-		return factory.buildJavaManyToOneMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaMappedSuperclassProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaMappedSuperclassProvider.java
deleted file mode 100644
index 8f3317cc07..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaMappedSuperclassProvider.java
+++ /dev/null
@@ -1,52 +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.core.internal.context.java;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaMappedSuperclass;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.context.java.JavaTypeMappingProvider;
-import org.eclipse.jpt.core.resource.java.MappedSuperclassAnnotation;
-
-public class JavaMappedSuperclassProvider
-	implements JavaTypeMappingProvider
-{
-
-	// singleton
-	private static final JavaMappedSuperclassProvider INSTANCE = new JavaMappedSuperclassProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaTypeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private JavaMappedSuperclassProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return MappedSuperclassAnnotation.ANNOTATION_NAME;
-	}
-
-	public JavaMappedSuperclass buildMapping(JavaPersistentType parent, JpaFactory factory) {
-		return factory.buildJavaMappedSuperclass(parent);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullAttributeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullAttributeMappingProvider.java
deleted file mode 100644
index cd209b7683..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullAttributeMappingProvider.java
+++ /dev/null
@@ -1,54 +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.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;
-
-/**
- * This mapping provider implementation is used to create a JavaNullAttributeMapping.
- * A JavaNullAttributeMapping should be used when no "mapping" annotation
- * exists on a Java attribute *and* no default mapping applies.
- */
-public class JavaNullAttributeMappingProvider
-	implements JavaAttributeMappingProvider
-{
-
-	// singleton
-	private static final JavaNullAttributeMappingProvider INSTANCE = new JavaNullAttributeMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private JavaNullAttributeMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return null;
-	}
-
-	public String getAnnotationName() {
-		return null;
-	}
-	
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaFactory factory) {
-		return factory.buildJavaNullAttributeMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMapping.java
deleted file mode 100644
index b3067e7e93..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMapping.java
+++ /dev/null
@@ -1,64 +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.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.java.JavaPersistentType;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class JavaNullTypeMapping extends AbstractJavaTypeMapping
-{
-	public JavaNullTypeMapping(JavaPersistentType parent) {
-		super(parent);
-	}
-
-	public String getAnnotationName() {
-		return null;
-	}
-	
-	public String getKey() {
-		return MappingKeys.NULL_TYPE_MAPPING_KEY;
-	}
-	
-	public boolean isMapped() {
-		return false;
-	}
-	
-	public Iterator<String> correspondingAnnotationNames() {
-		return EmptyIterator.instance();
-	}
-	
-	@Override
-	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		//Adding this message here because the likely solution is to add an annotation to the java file.
-		//This message used to be found on the <class> tag in the persistence.xml.  The other possible
-		//way to fix the error is to remove it from the persistnce.xml.  This can be accomplished
-		//with the Synchronize Classes action.  We could also add a quick fix for this error.
-		messages.add(DefaultJpaValidationMessages.buildMessage(
-			IMessage.HIGH_SEVERITY,
-			JpaValidationMessages.PERSISTENCE_UNIT_INVALID_CLASS,
-			new String[] { this.getPersistentType().getName() },
-			this,
-			this.getValidationTextRange(astRoot)));
-	}
-	
-	@Override
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return this.getPersistentType().getValidationTextRange(astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMappingProvider.java
deleted file mode 100644
index bcc6313964..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMappingProvider.java
+++ /dev/null
@@ -1,55 +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.core.internal.context.java;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.context.java.JavaTypeMapping;
-import org.eclipse.jpt.core.context.java.JavaTypeMappingProvider;
-
-/**
- * This mapping provider implementation is used to create a JavaNullAttributeMapping.
- * A JavaNullAttributeMapping should be used when no "mapping" annotation
- * exists on a Java type. 
- */
-public class JavaNullTypeMappingProvider
-	implements JavaTypeMappingProvider
-{
-
-	// singleton
-	private static final JavaNullTypeMappingProvider INSTANCE = new JavaNullTypeMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaTypeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private JavaNullTypeMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return null;
-	}
-
-	public String getAnnotationName() {
-		return null;
-	}
-	
-	public JavaTypeMapping buildMapping(JavaPersistentType parent, JpaFactory factory) {
-		return factory.buildJavaNullTypeMapping(parent);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToManyMappingProvider.java
deleted file mode 100644
index 15b91f8a6c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToManyMappingProvider.java
+++ /dev/null
@@ -1,51 +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.core.internal.context.java;
-
-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.JavaAttributeMappingProvider;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.resource.java.OneToManyAnnotation;
-
-public class JavaOneToManyMappingProvider
-	implements JavaAttributeMappingProvider
-{
-
-	// singleton
-	private static final JavaOneToManyMappingProvider INSTANCE = new JavaOneToManyMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private JavaOneToManyMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return OneToManyAnnotation.ANNOTATION_NAME;
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaFactory factory) {
-		return factory.buildJavaOneToManyMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToOneMappingProvider.java
deleted file mode 100644
index 319b9ef298..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToOneMappingProvider.java
+++ /dev/null
@@ -1,51 +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.core.internal.context.java;
-
-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.JavaAttributeMappingProvider;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.resource.java.OneToOneAnnotation;
-
-public class JavaOneToOneMappingProvider
-	implements JavaAttributeMappingProvider
-{
-
-	// singleton
-	private static final JavaOneToOneMappingProvider INSTANCE = new JavaOneToOneMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private JavaOneToOneMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return OneToOneAnnotation.ANNOTATION_NAME;
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaFactory factory) {
-		return factory.buildJavaOneToOneMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTransientMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTransientMappingProvider.java
deleted file mode 100644
index 4fb5aa294e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTransientMappingProvider.java
+++ /dev/null
@@ -1,51 +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.core.internal.context.java;
-
-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.JavaAttributeMappingProvider;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.resource.java.TransientAnnotation;
-
-public class JavaTransientMappingProvider
-	implements JavaAttributeMappingProvider
-{
-
-	// singleton
-	private static final JavaTransientMappingProvider INSTANCE = new JavaTransientMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private JavaTransientMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return TransientAnnotation.ANNOTATION_NAME;
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaFactory factory) {
-		return factory.buildJavaTransientMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaVersionMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaVersionMappingProvider.java
deleted file mode 100644
index c17edb669e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaVersionMappingProvider.java
+++ /dev/null
@@ -1,51 +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.core.internal.context.java;
-
-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.JavaAttributeMappingProvider;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.resource.java.VersionAnnotation;
-
-public class JavaVersionMappingProvider
-	implements JavaAttributeMappingProvider
-{
-
-	// singleton
-	private static final JavaVersionMappingProvider INSTANCE = new JavaVersionMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private JavaVersionMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public String getAnnotationName() {
-		return VersionAnnotation.ANNOTATION_NAME;
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaFactory factory) {
-		return factory.buildJavaVersionMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverride.java
deleted file mode 100644
index efbc1d16ae..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverride.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.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.Column;
-import org.eclipse.jpt.core.internal.resource.java.AbstractJavaResourceNode;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation;
-import org.eclipse.jpt.core.resource.java.ColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-public class VirtualAttributeOverride extends AbstractJavaResourceNode implements AttributeOverrideAnnotation, Annotation
-{	
-	private final VirtualAttributeOverrideColumn column;
-	
-	private String name;
-		
-	public VirtualAttributeOverride(JavaResourceNode parent, String name, Column column) {
-		super(parent);
-		this.name = name;
-		this.column = new VirtualAttributeOverrideColumn(this, column);
-	}
-
-	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 AttributeOverrideAnnotation.ANNOTATION_NAME;
-	}
-
-	public String getName() {
-		return this.name;
-	}
-	
-	public void setName(String name) {
-		if (name != null) {
-			createAttributeOverrideResource().setName(name);
-		}		
-	}
-
-	public ColumnAnnotation getNonNullColumn() {
-		return getColumn();
-	}
-	
-	public ColumnAnnotation getColumn() {
-		return this.column;
-	}
-	
-	public ColumnAnnotation addColumn() {
-		throw new UnsupportedOperationException();
-	}
-	
-	public void removeColumn() {
-		throw new UnsupportedOperationException();
-	}
-	
-	@Override
-	public JavaResourcePersistentMember getParent() {
-		return (JavaResourcePersistentMember) super.getParent();
-	}
-	
-	protected AttributeOverrideAnnotation createAttributeOverrideResource() {
-		return (AttributeOverrideAnnotation) getParent().addAnnotation(getAnnotationName());
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	
-	}
-
-	public boolean nameTouches(int pos, CompilationUnit astRoot) {
-		return false;
-	}
-	
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	public TextRange getTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverrideColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverrideColumn.java
deleted file mode 100644
index 3f0e8eff56..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverrideColumn.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.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.Column;
-import org.eclipse.jpt.core.internal.resource.java.NullBaseColumn;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation;
-import org.eclipse.jpt.core.resource.java.ColumnAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-public class VirtualAttributeOverrideColumn extends NullBaseColumn implements ColumnAnnotation, Annotation
-{	
-	private Column column;
-	
-	public VirtualAttributeOverrideColumn(AttributeOverrideAnnotation parent, Column column) {
-		super(parent);
-		this.column = column;
-	}
-
-	@Override
-	public AttributeOverrideAnnotation getParent() {
-		return (AttributeOverrideAnnotation) super.getParent();
-	}
-	
-	public String getAnnotationName() {
-		return ColumnAnnotation.ANNOTATION_NAME;
-	}
-
-	@Override
-	protected ColumnAnnotation createColumnResource() {
-		return getParent().addColumn();
-	}
-
-	@Override
-	public String getName() {
-		if (this.column.getSpecifiedName() != null) {
-			return this.column.getSpecifiedName();
-		}
-		return null;
-	}
-	
-	@Override
-	public String getTable() {
-		if (this.column.getSpecifiedTable() != null) {
-			return this.column.getSpecifiedTable();
-		}
-		return null;
-	}
-	
-	@Override
-	public Boolean getInsertable() {
-		if (this.column.getSpecifiedInsertable() != null) {
-			return this.column.getSpecifiedInsertable();
-		}
-		return null;
-	}
-	
-	@Override
-	public Boolean getUpdatable() {
-		if (this.column.getSpecifiedUpdatable() != null) {
-			return this.column.getSpecifiedUpdatable();
-		}
-		return null;
-	}
-	@Override
-	public Boolean getNullable() {
-		if (this.column.getSpecifiedNullable() != null) {
-			return this.column.getSpecifiedNullable();
-		}
-		return null;
-	}
-	
-	@Override
-	public Boolean getUnique() {
-		if (this.column.getSpecifiedUnique() != null) {
-			return this.column.getSpecifiedUnique();
-		}
-		return null;
-	}
-	
-	@Override
-	public String getColumnDefinition() {
-		return this.column.getColumnDefinition();
-	}
-	
-	public Integer getLength() {
-		if (this.column.getSpecifiedLength() != null) {
-			return this.column.getSpecifiedLength();
-		}
-		return null;
-	}
-	
-	public void setLength(Integer length) {
-		if (length != null) {
-			createColumnResource().setLength(length);
-		}
-	}
-	
-	public Integer getScale() {
-		if (this.column.getSpecifiedScale() != null) {
-			return this.column.getSpecifiedScale();
-		}
-		return null;
-	}
-	
-	public void setScale(Integer scale) {
-		if (scale != null) {
-			createColumnResource().setScale(scale);
-		}
-	}
-	
-	public Integer getPrecision() {
-		if (this.column.getSpecifiedPrecision() != null) {
-			return this.column.getSpecifiedPrecision();
-		}
-		return null;
-	}
-	
-	public void setPrecision(Integer precision) {
-		if (precision != null) {
-			createColumnResource().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.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmAttributeMapping.java
deleted file mode 100644
index ec1153a0bc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmAttributeMapping.java
+++ /dev/null
@@ -1,327 +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.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.NonOwningMapping;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmBaseEmbeddedMapping;
-import org.eclipse.jpt.core.context.orm.OrmBasicMapping;
-import org.eclipse.jpt.core.context.orm.OrmColumnMapping;
-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.OrmMultiRelationshipMapping;
-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.OrmRelationshipMapping;
-import org.eclipse.jpt.core.context.orm.OrmSingleRelationshipMapping;
-import org.eclipse.jpt.core.context.orm.OrmTransientMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.context.orm.OrmVersionMapping;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public abstract class AbstractOrmAttributeMapping<T extends XmlAttributeMapping> extends AbstractOrmJpaContextNode
-	implements OrmAttributeMapping
-{
-	protected String name;
-	
-	protected T attributeMapping;
-
-	protected JavaPersistentAttribute javaPersistentAttribute;
-	
-	protected AbstractOrmAttributeMapping(OrmPersistentAttribute parent) {
-		super(parent);
-	}	
-	
-	public JavaPersistentAttribute getJavaPersistentAttribute() {
-		return this.javaPersistentAttribute;
-	}
-	
-	protected void setJavaPersistentAttribute(JavaPersistentAttribute newJavaPersistentAttribute) {
-		JavaPersistentAttribute oldJavaPersistentAttribute = this.javaPersistentAttribute;
-		this.javaPersistentAttribute = newJavaPersistentAttribute;
-		firePropertyChanged(OrmAttributeMapping.JAVA_PERSISTENT_ATTRIBUTE_PROPERTY, oldJavaPersistentAttribute, newJavaPersistentAttribute);
-		
-	}
-
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		this.attributeMapping.setName(newName);
-		firePropertyChanged(OrmAttributeMapping.NAME_PROPERTY, oldName, newName);
-		getPersistentAttribute().nameChanged(oldName, newName);
-	}
-
-	protected void setName_(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		firePropertyChanged(OrmAttributeMapping.NAME_PROPERTY, oldName, newName);
-		getPersistentAttribute().nameChanged(oldName, newName);
-	}
-	
-	public OrmPersistentAttribute getPersistentAttribute() {
-		return (OrmPersistentAttribute) getParent();
-	}
-
-	public String getAttributeName() {
-		return this.getPersistentAttribute().getName();
-	}
-
-	public boolean isDefault() {
-		return false;
-	}
-	
-	public void initializeFromOrmAttributeMapping(OrmAttributeMapping oldMapping) {
-		setName(oldMapping.getName());
-	}
-
-	public void initializeFromXmlColumnMapping(OrmColumnMapping oldMapping) {
-		initializeFromOrmAttributeMapping((OrmAttributeMapping) oldMapping);
-	}
-
-	public void initializeFromXmlNonOwningMapping(NonOwningMapping oldMapping) {
-		initializeFromOrmAttributeMapping((OrmAttributeMapping) oldMapping);
-	}
-
-	public void initializeFromOrmBasicMapping(OrmBasicMapping oldMapping) {
-		initializeFromXmlColumnMapping(oldMapping);
-	}
-
-	public void initializeFromOrmIdMapping(OrmIdMapping oldMapping) {
-		initializeFromXmlColumnMapping(oldMapping);
-	}
-
-	public void initializeFromOrmTransientMapping(OrmTransientMapping oldMapping) {
-		initializeFromOrmAttributeMapping(oldMapping);
-	}
-
-	public void initializeFromOrmBaseEmbeddedMapping(OrmBaseEmbeddedMapping oldMapping) {
-		initializeFromOrmAttributeMapping(oldMapping);
-	}
-
-	public void initializeFromOrmEmbeddedMapping(OrmEmbeddedMapping oldMapping) {
-		initializeFromOrmBaseEmbeddedMapping(oldMapping);
-	}
-
-	public void initializeFromOrmEmbeddedIdMapping(OrmEmbeddedIdMapping oldMapping) {
-		initializeFromOrmBaseEmbeddedMapping(oldMapping);
-	}
-
-	public void initializeFromOrmVersionMapping(OrmVersionMapping oldMapping) {
-		initializeFromXmlColumnMapping(oldMapping);
-	}
-
-	public void initializeFromXmlRelationshipMapping(OrmRelationshipMapping oldMapping) {
-		initializeFromOrmAttributeMapping(oldMapping);
-	}
-
-	public void initializeFromXmlMulitRelationshipMapping(OrmMultiRelationshipMapping oldMapping) {
-		initializeFromXmlRelationshipMapping(oldMapping);
-	}
-
-	public void initializeFromXmlSingleRelationshipMapping(OrmSingleRelationshipMapping oldMapping) {
-		initializeFromXmlRelationshipMapping(oldMapping);
-	}
-
-	public void initializeFromOrmOneToManyMapping(OrmOneToManyMapping oldMapping) {
-		initializeFromXmlNonOwningMapping(oldMapping);
-		initializeFromXmlMulitRelationshipMapping(oldMapping);
-	}
-
-	public void initializeFromOrmManyToOneMapping(OrmManyToOneMapping oldMapping) {
-		initializeFromXmlSingleRelationshipMapping(oldMapping);
-	}
-
-	public void initializeFromOrmOneToOneMapping(OrmOneToOneMapping oldMapping) {
-		initializeFromXmlNonOwningMapping(oldMapping);
-		initializeFromXmlSingleRelationshipMapping(oldMapping);
-	}
-
-	public void initializeFromOrmManyToManyMapping(OrmManyToManyMapping oldMapping) {
-		initializeFromXmlNonOwningMapping(oldMapping);
-		initializeFromXmlMulitRelationshipMapping(oldMapping);
-	}
-
-	public String getPrimaryKeyColumnName() {
-		return null;
-	}
-
-	public OrmTypeMapping getTypeMapping() {
-		return this.getPersistentAttribute().getTypeMapping();
-	}
-
-
-	public boolean isOverridableAttributeMapping() {
-		return false;
-	}
-
-	public boolean isOverridableAssociationMapping() {
-		return false;
-	}
-
-	public boolean isIdMapping() {
-		return false;
-	}
-
-	protected T getAttributeMapping() {
-		return this.attributeMapping;
-	}
-
-	public void initialize(T attributeMapping) {
-		this.attributeMapping = attributeMapping;
-		this.name = attributeMapping.getName();
-		this.javaPersistentAttribute = findJavaPersistentAttribute();
-	}
-	
-	public void update(T attributeMapping) {
-		this.attributeMapping = attributeMapping;
-		this.setName_(attributeMapping.getName());
-		this.setJavaPersistentAttribute(findJavaPersistentAttribute());
-	}
-	
-	protected JavaPersistentAttribute findJavaPersistentAttribute() {
-		JavaPersistentType javaPersistentType = getPersistentAttribute().getPersistentType().getJavaPersistentType();
-		if (javaPersistentType != null && getName() != null) {
-			return javaPersistentType.getAttributeNamed(getName());
-		}
-		return null;
-	}
-	
-	
-	protected boolean entityOwned() {
-		return getTypeMapping().getKey() == MappingKeys.ENTITY_TYPE_MAPPING_KEY;
-	}
-
-	public boolean contains(int textOffset) {
-		return this.attributeMapping.containsOffset(textOffset);
-	}
-	
-	public TextRange getSelectionTextRange() {
-		return this.attributeMapping.getSelectionTextRange();
-	}	
-	
-	public TextRange getValidationTextRange() {
-		return (this.getPersistentAttribute().isVirtual()) ? this.getTypeMapping().getAttributesTextRange() : this.attributeMapping.getValidationTextRange();
-	}
-	
-	public TextRange getNameTextRange() {
-		return this.attributeMapping.getNameTextRange();
-	}
-	
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		addAttributeMessages(messages);
-		addInvalidMappingMessage(messages);
-	}
-	
-	protected void addAttributeMessages(List<IMessage> messages) {
-		addUnspecifiedAttributeMessage(messages);
-		addUnresolvedAttributeMessage(messages);
-		addModifierMessages(messages);
-	}
-	
-	protected void addUnspecifiedAttributeMessage(List<IMessage> messages) {
-		if (StringTools.stringIsEmpty(getName())) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					JpaValidationMessages.PERSISTENT_ATTRIBUTE_UNSPECIFIED_NAME,
-					this, 
-					getValidationTextRange())
-			);
-		}
-	}
-	
-	protected void addUnresolvedAttributeMessage(List<IMessage> messages) {
-		if (! StringTools.stringIsEmpty(getName())
-				&& findJavaPersistentAttribute() == null) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					JpaValidationMessages.PERSISTENT_ATTRIBUTE_UNRESOLVED_NAME,
-					new String[] {getName(), getPersistentAttribute().getPersistentType().getMapping().getClass_()},
-					this, 
-					getNameTextRange())
-			);
-		}
-	}
-	
-	protected void addModifierMessages(List<IMessage> messages) {
-		if (getKey() == MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY) {
-			return;
-		}
-		
-		if (getJavaPersistentAttribute() == null) {
-			return;
-		}
-		JavaResourcePersistentAttribute resourcePersistentAttribute = getJavaPersistentAttribute().getResourcePersistentAttribute();
-
-		if (resourcePersistentAttribute.isForField()) {
-			//TODO validation : need to have a validation message for final methods as well.
-			//From the JPA spec : No methods or persistent instance variables of the entity class may be final.
-			if (resourcePersistentAttribute.isFinal()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.PERSISTENT_ATTRIBUTE_FINAL_FIELD,
-						new String[] {getName()},
-						getPersistentAttribute(),
-						getPersistentAttribute().getValidationTextRange())
-				);
-			}
-			
-			if (resourcePersistentAttribute.isPublic()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.PERSISTENT_ATTRIBUTE_PUBLIC_FIELD,
-						new String[] {getName()},
-						getPersistentAttribute(), 
-						getPersistentAttribute().getValidationTextRange())
-				);
-				
-			}
-		}
-	}
-
-	//TODO validation message - i think more info is needed in this message.  include type mapping type?
-	protected void addInvalidMappingMessage(List<IMessage> messages) {
-		if (! getTypeMapping().attributeMappingKeyAllowed(getKey())) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					JpaValidationMessages.PERSISTENT_ATTRIBUTE_INVALID_MAPPING,
-					new String[] {getName()},
-					this, 
-					getValidationTextRange())
-			);
-		}
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseColumn.java
deleted file mode 100644
index 6c15616ef3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseColumn.java
+++ /dev/null
@@ -1,308 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.BaseColumn;
-import org.eclipse.jpt.core.context.orm.OrmBaseColumn;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.resource.orm.XmlAbstractColumn;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-public abstract class AbstractOrmBaseColumn<T extends XmlAbstractColumn> extends AbstractOrmNamedColumn<T>
-	implements OrmBaseColumn
-{
-	protected String specifiedTable;
-	
-	protected String defaultTable;
-
-	protected Boolean specifiedUnique;
-	
-	protected Boolean specifiedNullable;
-	
-	protected Boolean specifiedInsertable;
-	
-	protected Boolean specifiedUpdatable;
-
-	protected AbstractOrmBaseColumn(OrmJpaContextNode parent, OrmBaseColumn.Owner owner) {
-		super(parent, owner);
-	}
-	
-	public void initializeFrom(BaseColumn oldColumn) {
-		super.initializeFrom(oldColumn);
-		setSpecifiedTable(oldColumn.getSpecifiedTable());
-		setSpecifiedUnique(oldColumn.getSpecifiedUnique());
-		setSpecifiedNullable(oldColumn.getSpecifiedNullable());
-		setSpecifiedInsertable(oldColumn.getSpecifiedInsertable());
-		setSpecifiedUpdatable(oldColumn.getSpecifiedUpdatable());
-	}
-	
-	@Override
-	public OrmBaseColumn.Owner getOwner() {
-		return (OrmBaseColumn.Owner) super.getOwner();
-	}
-	
-//	@Override
-//	protected void addInsignificantXmlFeatureIdsTo(Set<Integer> insignificantXmlFeatureIds) {
-//		super.addInsignificantXmlFeatureIdsTo(insignificantXmlFeatureIds);
-//		insignificantXmlFeatureIds.add(JpaCoreMappingsPackage.IABSTRACT_COLUMN__DEFAULT_TABLE);
-//		insignificantXmlFeatureIds.add(JpaCoreMappingsPackage.IABSTRACT_COLUMN__TABLE);
-//	}
-	
-	public String getTable() {
-		return (this.getSpecifiedTable() == null) ? getDefaultTable() : this.getSpecifiedTable();
-	}
-
-	public String getSpecifiedTable() {
-		return this.specifiedTable;
-	}
-
-	public void setSpecifiedTable(String newSpecifiedTable) {
-		String oldSpecifiedTable = this.specifiedTable;
-		this.specifiedTable = newSpecifiedTable;
-		if (oldSpecifiedTable != newSpecifiedTable) {
-			if (this.getColumnResource() != null) {
-				this.getColumnResource().setTable(newSpecifiedTable);						
-				if (this.getColumnResource().isAllFeaturesUnset()) {
-					removeColumnResource();
-				}
-			}
-			else if (newSpecifiedTable != null) {
-				addColumnResource();
-				getColumnResource().setTable(newSpecifiedTable);
-			}
-		}
-		firePropertyChanged(BaseColumn.SPECIFIED_TABLE_PROPERTY, oldSpecifiedTable, newSpecifiedTable);
-	}
-	
-	protected void setSpecifiedTable_(String newSpecifiedTable) {
-		String oldSpecifiedTable = this.specifiedTable;
-		this.specifiedTable = newSpecifiedTable;
-		firePropertyChanged(BaseColumn.SPECIFIED_TABLE_PROPERTY, oldSpecifiedTable, newSpecifiedTable);
-	}
-
-	public String getDefaultTable() {
-		return this.defaultTable;
-	}
-
-	protected void setDefaultTable(String newDefaultTable) {
-		String oldDefaultTable = this.defaultTable;
-		this.defaultTable = newDefaultTable;
-		firePropertyChanged(BaseColumn.DEFAULT_TABLE_PROPERTY, oldDefaultTable, newDefaultTable);
-	}
-
-	public Boolean getUnique() {
-		return (this.getSpecifiedUnique() == null) ? this.getDefaultUnique() : this.getSpecifiedUnique();
-	}
-	
-	public Boolean getDefaultUnique() {
-		return BaseColumn.DEFAULT_UNIQUE;
-	}
-	
-	public Boolean getSpecifiedUnique() {
-		return this.specifiedUnique;
-	}
-	
-	public void setSpecifiedUnique(Boolean newSpecifiedUnique) {
-		Boolean oldSpecifiedUnique = this.specifiedUnique;
-		this.specifiedUnique = newSpecifiedUnique;
-		if (oldSpecifiedUnique != newSpecifiedUnique) {
-			if (this.getColumnResource() != null) {
-				this.getColumnResource().setUnique(newSpecifiedUnique);						
-				if (this.getColumnResource().isAllFeaturesUnset()) {
-					removeColumnResource();
-				}
-			}
-			else if (newSpecifiedUnique != null) {
-				addColumnResource();
-				getColumnResource().setUnique(newSpecifiedUnique);
-			}
-		}
-		firePropertyChanged(BaseColumn.SPECIFIED_UNIQUE_PROPERTY, oldSpecifiedUnique, newSpecifiedUnique);
-	}
-	
-	protected void setSpecifiedUnique_(Boolean newSpecifiedUnique) {
-		Boolean oldSpecifiedUnique = this.specifiedUnique;
-		this.specifiedUnique = newSpecifiedUnique;
-		firePropertyChanged(BaseColumn.SPECIFIED_UNIQUE_PROPERTY, oldSpecifiedUnique, newSpecifiedUnique);
-	}
-	
-	public Boolean getNullable() {
-		return (this.getSpecifiedNullable() == null) ? this.getDefaultNullable() : this.getSpecifiedNullable();
-	}
-	
-	public Boolean getDefaultNullable() {
-		return BaseColumn.DEFAULT_NULLABLE;
-	}
-	
-	public Boolean getSpecifiedNullable() {
-		return this.specifiedNullable;
-	}
-	
-	public void setSpecifiedNullable(Boolean newSpecifiedNullable) {
-		Boolean oldSpecifiedNullable = this.specifiedNullable;
-		this.specifiedNullable = newSpecifiedNullable;
-		if (oldSpecifiedNullable != newSpecifiedNullable) {
-			if (this.getColumnResource() != null) {
-				this.getColumnResource().setNullable(newSpecifiedNullable);						
-				if (this.getColumnResource().isAllFeaturesUnset()) {
-					removeColumnResource();
-				}
-			}
-			else if (newSpecifiedNullable != null) {
-				addColumnResource();
-				getColumnResource().setNullable(newSpecifiedNullable);
-			}
-		}
-		firePropertyChanged(BaseColumn.SPECIFIED_NULLABLE_PROPERTY, oldSpecifiedNullable, newSpecifiedNullable);
-	}
-
-	protected void setSpecifiedNullable_(Boolean newSpecifiedNullable) {
-		Boolean oldSpecifiedNullable = this.specifiedNullable;
-		this.specifiedNullable = newSpecifiedNullable;
-		firePropertyChanged(BaseColumn.SPECIFIED_NULLABLE_PROPERTY, oldSpecifiedNullable, newSpecifiedNullable);
-	}
-
-	public Boolean getInsertable() {
-		return (this.getSpecifiedInsertable() == null) ? this.getDefaultInsertable() : this.getSpecifiedInsertable();
-	}
-	
-	public Boolean getDefaultInsertable() {
-		return BaseColumn.DEFAULT_INSERTABLE;
-	}
-	
-	public Boolean getSpecifiedInsertable() {
-		return this.specifiedInsertable;
-	}
-	
-	public void setSpecifiedInsertable(Boolean newSpecifiedInsertable) {
-		Boolean oldSpecifiedInsertable = this.specifiedInsertable;
-		this.specifiedInsertable = newSpecifiedInsertable;
-		if (oldSpecifiedInsertable != newSpecifiedInsertable) {
-			if (this.getColumnResource() != null) {
-				this.getColumnResource().setInsertable(newSpecifiedInsertable);						
-				if (this.getColumnResource().isAllFeaturesUnset()) {
-					removeColumnResource();
-				}
-			}
-			else if (newSpecifiedInsertable != null) {
-				addColumnResource();
-				getColumnResource().setInsertable(newSpecifiedInsertable);
-			}
-		}
-		firePropertyChanged(BaseColumn.SPECIFIED_INSERTABLE_PROPERTY, oldSpecifiedInsertable, newSpecifiedInsertable);
-	}
-	
-	protected void setSpecifiedInsertable_(Boolean newSpecifiedInsertable) {
-		Boolean oldSpecifiedInsertable = this.specifiedInsertable;
-		this.specifiedInsertable = newSpecifiedInsertable;
-		firePropertyChanged(BaseColumn.SPECIFIED_INSERTABLE_PROPERTY, oldSpecifiedInsertable, newSpecifiedInsertable);
-	}
-
-	public Boolean getUpdatable() {
-		return (this.getSpecifiedUpdatable() == null) ? this.getDefaultUpdatable() : this.getSpecifiedUpdatable();
-	}
-	
-	public Boolean getDefaultUpdatable() {
-		return BaseColumn.DEFAULT_UPDATABLE;
-	}
-	
-	public Boolean getSpecifiedUpdatable() {
-		return this.specifiedUpdatable;
-	}
-	
-	public void setSpecifiedUpdatable(Boolean newSpecifiedUpdatable) {
-		Boolean oldSpecifiedUpdatable = this.specifiedUpdatable;
-		this.specifiedUpdatable = newSpecifiedUpdatable;
-		if (oldSpecifiedUpdatable != newSpecifiedUpdatable) {
-			if (this.getColumnResource() != null) {
-				this.getColumnResource().setUpdatable(newSpecifiedUpdatable);						
-				if (this.getColumnResource().isAllFeaturesUnset()) {
-					removeColumnResource();
-				}
-			}
-			else if (newSpecifiedUpdatable != null) {
-				addColumnResource();
-				getColumnResource().setUpdatable(newSpecifiedUpdatable);
-			}
-		}
-		firePropertyChanged(BaseColumn.SPECIFIED_UPDATABLE_PROPERTY, oldSpecifiedUpdatable, newSpecifiedUpdatable);
-	}
-	
-	protected void setSpecifiedUpdatable_(Boolean newSpecifiedUpdatable) {
-		Boolean oldSpecifiedUpdatable = this.specifiedUpdatable;
-		this.specifiedUpdatable = newSpecifiedUpdatable;
-		firePropertyChanged(BaseColumn.SPECIFIED_UPDATABLE_PROPERTY, oldSpecifiedUpdatable, newSpecifiedUpdatable);
-	}
-
-	@Override
-	protected String tableName() {
-		return this.getTable();
-	}
-
-
-	public TextRange getTableTextRange() {
-		if (getColumnResource() != null) {
-			TextRange textRange = getColumnResource().getTableTextRange();
-			if (textRange != null) {
-				return textRange;
-			}
-		}
-		return this.getParent().getValidationTextRange(); 
-	}
-	
-	@Override
-	protected void initialize(T column) {
-		super.initialize(column);
-		this.specifiedTable = this.specifiedTable(column);
-		this.defaultTable = this.defaultTable();
-		//TODO default from java for all of these settings
-		this.specifiedNullable = this.specifiedNullable(column);
-		this.specifiedUpdatable = this.specifiedUpdatable(column);
-		this.specifiedUnique = this.specifiedUnique(column);
-		this.specifiedInsertable = this.specifiedInsertable(column);
-	}
-	
-	@Override
-	protected void update(T column) {
-		super.update(column);
-		setSpecifiedTable_(this.specifiedTable(column));
-		setDefaultTable(this.defaultTable());
-		setSpecifiedNullable_(this.specifiedNullable(column));
-		setSpecifiedUpdatable_(this.specifiedUpdatable(column));
-		setSpecifiedUnique_(this.specifiedUnique(column));
-		setSpecifiedInsertable_(this.specifiedInsertable(column));
-	}
-
-	protected String specifiedTable(T column) {
-		return column == null ? null : column.getTable();
-	}
-
-	protected Boolean specifiedNullable(T column) {
-		return column == null ? null : column.getNullable();
-	}
-	
-	protected Boolean specifiedUpdatable(T column) {
-		return column == null ? null : column.getUpdatable();
-	}
-	
-	protected Boolean specifiedUnique(T column) {
-		return column == null ? null : column.getUnique();
-	}
-	
-	protected Boolean specifiedInsertable(T column) {
-		return column == null ? null : column.getInsertable();
-	}
-	
-	protected String defaultTable() {
-		return getOwner().getDefaultTableName();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java
deleted file mode 100644
index aa9c1baa60..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java
+++ /dev/null
@@ -1,361 +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.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.BaseEmbeddedMapping;
-import org.eclipse.jpt.core.context.BaseOverride;
-import org.eclipse.jpt.core.context.ColumnMapping;
-import org.eclipse.jpt.core.context.Embeddable;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaAttributeOverride;
-import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmAttributeOverride;
-import org.eclipse.jpt.core.context.orm.OrmBaseEmbeddedMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.MappingTools;
-import org.eclipse.jpt.core.internal.context.java.AbstractJavaBaseEmbeddedMapping;
-import org.eclipse.jpt.core.resource.orm.BaseXmlEmbedded;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
-import org.eclipse.jpt.core.resource.orm.XmlColumn;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.CompositeListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public abstract class AbstractOrmBaseEmbeddedMapping<T extends BaseXmlEmbedded> extends AbstractOrmAttributeMapping<T> implements OrmBaseEmbeddedMapping
-{
-	protected final List<OrmAttributeOverride> specifiedAttributeOverrides;
-	
-	protected final List<OrmAttributeOverride> virtualAttributeOverrides;
-
-	private Embeddable embeddable;
-	
-	protected AbstractOrmBaseEmbeddedMapping(OrmPersistentAttribute parent) {
-		super(parent);
-		this.specifiedAttributeOverrides = new ArrayList<OrmAttributeOverride>();
-		this.virtualAttributeOverrides = new ArrayList<OrmAttributeOverride>();
-	}
-
-	@Override
-	public void initializeFromOrmBaseEmbeddedMapping(OrmBaseEmbeddedMapping oldMapping) {
-		super.initializeFromOrmBaseEmbeddedMapping(oldMapping);
-		int index = 0;
-		for (OrmAttributeOverride attributeOverride : CollectionTools.iterable(oldMapping.specifiedAttributeOverrides())) {
-		OrmAttributeOverride newAttributeOverride = addSpecifiedAttributeOverride(index++);
-			newAttributeOverride.setName(attributeOverride.getName());
-			newAttributeOverride.getColumn().initializeFrom(attributeOverride.getColumn());
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	public ListIterator<OrmAttributeOverride> attributeOverrides() {
-		return new CompositeListIterator<OrmAttributeOverride>(specifiedAttributeOverrides(), virtualAttributeOverrides());
-	}
-
-	public int attributeOverridesSize() {
-		return this.specifiedAttributeOverridesSize() + this.virtualAttributeOverridesSize();
-	}
-	
-	public ListIterator<OrmAttributeOverride> virtualAttributeOverrides() {
-		return new CloneListIterator<OrmAttributeOverride>(this.virtualAttributeOverrides);
-	}
-	protected void addVirtualAttributeOverride(OrmAttributeOverride attributeOverride) {
-		addItemToList(attributeOverride, this.virtualAttributeOverrides, BaseEmbeddedMapping.VIRTUAL_ATTRIBUTE_OVERRIDES_LIST);
-	}
-	
-	protected void removeVirtualAttributeOverride(OrmAttributeOverride attributeOverride) {
-		removeItemFromList(attributeOverride, this.virtualAttributeOverrides, BaseEmbeddedMapping.VIRTUAL_ATTRIBUTE_OVERRIDES_LIST);
-	}
-
-	public int virtualAttributeOverridesSize() {
-		return this.virtualAttributeOverrides.size();
-	}
-	
-	public ListIterator<OrmAttributeOverride> specifiedAttributeOverrides() {
-		return new CloneListIterator<OrmAttributeOverride>(this.specifiedAttributeOverrides);
-	}
-
-	public int specifiedAttributeOverridesSize() {
-		return this.specifiedAttributeOverrides.size();
-	}
-
-	protected OrmAttributeOverride addSpecifiedAttributeOverride(int index) {
-		XmlAttributeOverride xmlAttributeOverride = OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl();
-		OrmAttributeOverride attributeOverride = buildAttributeOverride(xmlAttributeOverride);
-		this.specifiedAttributeOverrides.add(index, attributeOverride);
-		this.getAttributeMapping().getAttributeOverrides().add(index, xmlAttributeOverride);
-		this.fireItemAdded(BaseEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride);
-		return attributeOverride;
-	}
-
-	protected void addSpecifiedAttributeOverride(int index, OrmAttributeOverride attributeOverride) {
-		addItemToList(index, attributeOverride, this.specifiedAttributeOverrides, BaseEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST);
-	}
-		
-	protected void removeSpecifiedAttributeOverride_(OrmAttributeOverride attributeOverride) {
-		removeItemFromList(attributeOverride, this.specifiedAttributeOverrides, BaseEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST);
-	}
-	
-	public void moveSpecifiedAttributeOverride(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.specifiedAttributeOverrides, targetIndex, sourceIndex);
-		this.getAttributeMapping().getAttributeOverrides().move(targetIndex, sourceIndex);
-		fireItemMoved(BaseEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, targetIndex, sourceIndex);		
-	}
-
-	public OrmAttributeOverride getAttributeOverrideNamed(String name) {
-		return (OrmAttributeOverride) getOverrideNamed(name, attributeOverrides());
-	}
-
-	protected BaseOverride getOverrideNamed(String name, ListIterator<? extends BaseOverride> overrides) {
-		for (BaseOverride override : CollectionTools.iterable(overrides)) {
-			String overrideName = override.getName();
-			if (overrideName == null && name == null) {
-				return override;
-			}
-			if (overrideName != null && overrideName.equals(name)) {
-				return override;
-			}
-		}
-		return null;
-	}
-
-	//****************** AttributeOverride.Owner implemenation *******************
-
-	public boolean isVirtual(BaseOverride override) {
-		return this.virtualAttributeOverrides.contains(override);
-	}
-
-	public BaseOverride setVirtual(boolean virtual, BaseOverride override) {
-		// Add a new attribute override
-		if (virtual) {
-			return setVirtual((OrmAttributeOverride) override);
-		}
-		return setSpecified((OrmAttributeOverride) override);
-	}
-	
-	protected OrmAttributeOverride setVirtual(OrmAttributeOverride attributeOverride) {
-		int index = this.specifiedAttributeOverrides.indexOf(attributeOverride);
-		this.specifiedAttributeOverrides.remove(index);
-		String attributeOverrideName = attributeOverride.getName();
-		//add the virtual attribute override so that I can control the order that change notification is sent.
-		//otherwise when we remove the annotation from java we will get an update and add the attribute override
-		//during the udpate.  This causes the UI to be flaky, since change notification might not occur in the correct order
-		OrmAttributeOverride virtualAttributeOverride = null;
-		if (attributeOverrideName != null) {
-			for (PersistentAttribute persistentAttribute : CollectionTools.iterable(allOverridableAttributes())) {
-				if (persistentAttribute.getName().equals(attributeOverrideName)) {
-					JavaAttributeOverride javaAttributeOverride = null;
-					if (getJavaEmbeddedMapping() != null) {
-						javaAttributeOverride = getJavaEmbeddedMapping().getAttributeOverrideNamed(attributeOverrideName);
-					}
-					//store the virtualAttributeOverride so we can fire change notification later
-					virtualAttributeOverride = buildVirtualAttributeOverride(persistentAttribute, javaAttributeOverride);
-					this.virtualAttributeOverrides.add(virtualAttributeOverride);
-				}
-			}
-		}
-
-		getAttributeMapping().getAttributeOverrides().remove(index);
-		fireItemRemoved(BaseEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride);
-		
-		if (virtualAttributeOverride != null) {
-			fireItemAdded(BaseEmbeddedMapping.VIRTUAL_ATTRIBUTE_OVERRIDES_LIST, virtualAttributeOverridesSize() - 1, virtualAttributeOverride);
-		}
-		return virtualAttributeOverride;
-	}
-	
-	protected OrmAttributeOverride setSpecified(OrmAttributeOverride oldAttributeOverride) {
-		int index = specifiedAttributeOverridesSize();
-		XmlAttributeOverride xmlAttributeOverride = OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl();
-		OrmAttributeOverride newAttributeOverride = getJpaFactory().buildOrmAttributeOverride(this, this, xmlAttributeOverride);
-		this.specifiedAttributeOverrides.add(index, newAttributeOverride);
-		
-		getAttributeMapping().getAttributeOverrides().add(xmlAttributeOverride);
-		
-		int defaultIndex = this.virtualAttributeOverrides.indexOf(oldAttributeOverride);
-		this.virtualAttributeOverrides.remove(defaultIndex);
-
-		newAttributeOverride.setName(oldAttributeOverride.getName());
-		newAttributeOverride.getColumn().setSpecifiedName(oldAttributeOverride.getColumn().getName());
-		
-		this.fireItemRemoved(BaseEmbeddedMapping.VIRTUAL_ATTRIBUTE_OVERRIDES_LIST, defaultIndex, oldAttributeOverride);
-		this.fireItemAdded(BaseEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, newAttributeOverride);		
-
-		return newAttributeOverride;
-	}
-
-	public ColumnMapping getColumnMapping(String attributeName) {
-		return MappingTools.getColumnMapping(attributeName, getEmbeddable());
-	}
-
-	public Embeddable getEmbeddable() {
-		return this.embeddable;
-	}
-	
-	public Iterator<String> allOverridableAttributeNames() {
-		return new TransformationIterator<PersistentAttribute, String>(this.allOverridableAttributes()) {
-			@Override
-			protected String transform(PersistentAttribute attribute) {
-				return attribute.getName();
-			}
-		};
-	}
-
-	public Iterator<PersistentAttribute> allOverridableAttributes() {
-		if (this.getEmbeddable() == null) {
-			return EmptyIterator.instance();
-		}
-		return new FilteringIterator<PersistentAttribute, PersistentAttribute>(this.getEmbeddable().getPersistentType().attributes()) {
-			@Override
-			protected boolean accept(PersistentAttribute o) {
-				return o.isOverridableAttribute();
-			}
-		};
-	}
-
-	public AbstractJavaBaseEmbeddedMapping<?> getJavaEmbeddedMapping() {
-		JavaPersistentAttribute javaPersistentAttribute = getJavaPersistentAttribute();
-		if (javaPersistentAttribute != null && javaPersistentAttribute.getMappingKey() == getKey()) {
-			return (AbstractJavaBaseEmbeddedMapping<?>) javaPersistentAttribute.getMapping();
-		}
-		return null;
-	}
-	
-	@Override
-	public void initialize(T embedded) {
-		super.initialize(embedded);
-		this.embeddable = embeddableFor(findJavaPersistentAttribute());
-		this.initializeSpecifiedAttributeOverrides(embedded);
-		this.initializeVirtualAttributeOverrides();
-	}
-	
-	protected void initializeSpecifiedAttributeOverrides(T embedded) {
-		for (XmlAttributeOverride attributeOverride : embedded.getAttributeOverrides()) {
-			this.specifiedAttributeOverrides.add(buildAttributeOverride(attributeOverride));
-		}
-	}
-	
-	protected void initializeVirtualAttributeOverrides() {
-		if (getPersistentAttribute().isVirtual()) {
-			//specifiedAttributeOverrides are used if the persistentAttribute is virtual
-			return;
-		}
-		for (PersistentAttribute persistentAttribute : CollectionTools.iterable(allOverridableAttributes())) {
-			OrmAttributeOverride attributeOverride = getAttributeOverrideNamed(persistentAttribute.getName());
-			if (attributeOverride == null) {
-				JavaAttributeOverride javaAttributeOverride = null;
-				if (getJavaEmbeddedMapping() != null) {
-					javaAttributeOverride = getJavaEmbeddedMapping().getAttributeOverrideNamed(persistentAttribute.getName());
-				}
-				this.virtualAttributeOverrides.add(buildVirtualAttributeOverride(persistentAttribute, javaAttributeOverride));
-			}
-		}
-	}
-
-	protected OrmAttributeOverride buildVirtualAttributeOverride(PersistentAttribute persistentAttribute, JavaAttributeOverride javaAttributeOverride) {
-		return buildAttributeOverride(buildVirtualXmlAttributeOverride(persistentAttribute, javaAttributeOverride));
-	}
-	
-	protected XmlAttributeOverride buildVirtualXmlAttributeOverride(PersistentAttribute persistentAttribute, JavaAttributeOverride javaAttributeOverride) {
-		XmlColumn xmlColumn;
-		if (javaAttributeOverride == null) {
-			ColumnMapping columnMapping = (ColumnMapping) persistentAttribute.getMapping();
-			xmlColumn = new VirtualXmlColumn(getTypeMapping(), columnMapping.getColumn(), false);			
-		}
-		else {
-			xmlColumn = new VirtualXmlColumn(getTypeMapping(), javaAttributeOverride.getColumn(), true);
-		}
-		return new VirtualXmlAttributeOverride(persistentAttribute.getName(), xmlColumn);
-	}
-	
-	protected OrmAttributeOverride buildAttributeOverride(XmlAttributeOverride attributeOverride) {
-		return getJpaFactory().buildOrmAttributeOverride(this, this, attributeOverride);
-	}
-	
-	@Override
-	public void update(T embedded) {
-		super.update(embedded);
-		this.embeddable = embeddableFor(findJavaPersistentAttribute());
-		this.updateSpecifiedAttributeOverrides(embedded);
-		this.updateVirtualAttributeOverrides();
-	}
-	
-	protected void updateSpecifiedAttributeOverrides(T embedded) {
-		ListIterator<OrmAttributeOverride> attributeOverrides = specifiedAttributeOverrides();
-		ListIterator<XmlAttributeOverride> resourceAttributeOverrides = new CloneListIterator<XmlAttributeOverride>(embedded.getAttributeOverrides());//prevent ConcurrentModificiationException
-		
-		while (attributeOverrides.hasNext()) {
-			OrmAttributeOverride attributeOverride = attributeOverrides.next();
-			if (resourceAttributeOverrides.hasNext()) {
-				attributeOverride.update(resourceAttributeOverrides.next());
-			}
-			else {
-				removeSpecifiedAttributeOverride_(attributeOverride);
-			}
-		}
-		
-		while (resourceAttributeOverrides.hasNext()) {
-			addSpecifiedAttributeOverride(specifiedAttributeOverridesSize(), buildAttributeOverride(resourceAttributeOverrides.next()));
-		}
-	}
-
-	protected void updateVirtualAttributeOverrides() {
-		Iterator<PersistentAttribute> overridableAttributes = allOverridableAttributes();
-		ListIterator<OrmAttributeOverride> virtualAttributeOverrides = virtualAttributeOverrides();
-		
-		if (!getPersistentAttribute().isVirtual()) {
-			//specifiedAttributeOverrides are used if the persistentAttribute is virtual
-			for (PersistentAttribute persistentAttribute : CollectionTools.iterable(overridableAttributes)) {
-				OrmAttributeOverride ormAttributeOverride = getAttributeOverrideNamed(persistentAttribute.getName());
-				if (ormAttributeOverride != null && !ormAttributeOverride.isVirtual()) {
-					continue;
-				}
-				JavaAttributeOverride javaAttributeOverride = null;
-				if (getJavaEmbeddedMapping() != null) {
-					javaAttributeOverride = getJavaEmbeddedMapping().getAttributeOverrideNamed(persistentAttribute.getName());
-				}
-				if (ormAttributeOverride != null) {
-					if (virtualAttributeOverrides.hasNext()) {
-						OrmAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next();
-						virtualAttributeOverride.update(buildVirtualXmlAttributeOverride(persistentAttribute, javaAttributeOverride));
-					}
-					else {
-						addVirtualAttributeOverride(buildVirtualAttributeOverride(persistentAttribute, javaAttributeOverride));
-					}
-				}
-				else {
-					addVirtualAttributeOverride(buildVirtualAttributeOverride(persistentAttribute, javaAttributeOverride));
-				}
-			}
-		}
-		for (OrmAttributeOverride virtualAttributeOverride : CollectionTools.iterable(virtualAttributeOverrides)) {
-			removeVirtualAttributeOverride(virtualAttributeOverride);
-		}
-		
-	}
-	
-	//************ static methods ************
-	
-	public static Embeddable embeddableFor(JavaPersistentAttribute javaPersistentAttribute) {
-		if (javaPersistentAttribute == null) {
-			return null;
-		}
-		return MappingTools.getEmbeddableFor(javaPersistentAttribute);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmGenerator.java
deleted file mode 100644
index 048751dafa..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmGenerator.java
+++ /dev/null
@@ -1,176 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.Generator;
-import org.eclipse.jpt.core.context.java.JavaGenerator;
-import org.eclipse.jpt.core.context.orm.OrmGenerator;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.resource.orm.XmlGenerator;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-public abstract class AbstractOrmGenerator<T extends XmlGenerator> extends AbstractOrmJpaContextNode 
-	implements OrmGenerator
-{
-
-	protected String name;
-
-	protected Integer specifiedInitialValue;
-	protected Integer defaultInitialValue;
-
-	protected Integer specifiedAllocationSize;
-	protected Integer defaultAllocationSize;
-
-	protected T generatorResource;
-
-	protected AbstractOrmGenerator(OrmJpaContextNode parent) {
-		super(parent);
-	}
-
-	public boolean isVirtual() {
-		return getGeneratorResource().isVirtual();
-	}
-	
-	@Override
-	public OrmJpaContextNode getParent() {
-		return (OrmJpaContextNode) super.getParent();
-	}
-	
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		getGeneratorResource().setName(newName);
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
-	}
-	
-	protected void setName_(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
-	}
-
-	public Integer getInitialValue() {
-		return (this.getSpecifiedInitialValue() == null) ? this.getDefaultInitialValue() : this.getSpecifiedInitialValue();
-	}
-
-	public Integer getSpecifiedInitialValue() {
-		return this.specifiedInitialValue;
-	}
-
-	public void setSpecifiedInitialValue(Integer newSpecifiedInitialValue) {
-		Integer oldSpecifiedInitialValue = this.specifiedInitialValue;
-		this.specifiedInitialValue = newSpecifiedInitialValue;
-		getGeneratorResource().setInitialValue(newSpecifiedInitialValue);
-		firePropertyChanged(SPECIFIED_INITIAL_VALUE_PROPERTY, oldSpecifiedInitialValue, newSpecifiedInitialValue);
-	}
-	
-	protected void setSpecifiedInitialValue_(Integer newSpecifiedInitialValue) {
-		Integer oldSpecifiedInitialValue = this.specifiedInitialValue;
-		this.specifiedInitialValue = newSpecifiedInitialValue;
-		firePropertyChanged(SPECIFIED_INITIAL_VALUE_PROPERTY, oldSpecifiedInitialValue, newSpecifiedInitialValue);
-	}
-	
-	public Integer getDefaultInitialValue() {
-		return this.defaultInitialValue;
-	}
-	
-	protected void setDefaultInitialValue(Integer newDefaultInitialValue) {
-		Integer oldSpecifiedInitialValue = this.defaultInitialValue;
-		this.defaultInitialValue = newDefaultInitialValue;
-		firePropertyChanged(DEFAULT_INITIAL_VALUE_PROPERTY, oldSpecifiedInitialValue, newDefaultInitialValue);
-	}
-	
-	public Integer getAllocationSize() {
-		return (this.getSpecifiedAllocationSize() == null) ? this.getDefaultAllocationSize() : this.getSpecifiedAllocationSize();
-	}
-
-	public Integer getSpecifiedAllocationSize() {
-		return this.specifiedAllocationSize;
-	}
-
-	public void setSpecifiedAllocationSize(Integer newSpecifiedAllocationSize) {
-		Integer oldSpecifiedAllocationSize = this.specifiedAllocationSize;
-		this.specifiedAllocationSize = newSpecifiedAllocationSize;
-		getGeneratorResource().setAllocationSize(newSpecifiedAllocationSize);
-		firePropertyChanged(SPECIFIED_ALLOCATION_SIZE_PROPERTY, oldSpecifiedAllocationSize, newSpecifiedAllocationSize);
-	}
-	
-	protected void setSpecifiedAllocationSize_(Integer newSpecifiedAllocationSize) {
-		Integer oldSpecifiedAllocationSize = this.specifiedAllocationSize;
-		this.specifiedAllocationSize = newSpecifiedAllocationSize;
-		firePropertyChanged(SPECIFIED_ALLOCATION_SIZE_PROPERTY, oldSpecifiedAllocationSize, newSpecifiedAllocationSize);
-	}
-
-	public Integer getDefaultAllocationSize() {
-		return this.defaultAllocationSize;
-	}
-	
-	protected void setDefaultAllocationSize(Integer newDefaultAllocationSize) {
-		Integer oldSpecifiedAllocationSize = this.defaultAllocationSize;
-		this.defaultAllocationSize = newDefaultAllocationSize;
-		firePropertyChanged(DEFAULT_ALLOCATION_SIZE_PROPERTY, oldSpecifiedAllocationSize, newDefaultAllocationSize);
-	}
-
-	
-	public void initialize(T generatorResource) {
-		this.generatorResource = generatorResource;
-		this.name = this.name(generatorResource);
-		this.specifiedInitialValue = this.specifiedInitialValue(generatorResource);
-		this.specifiedAllocationSize = this.specifiedAllocationSize(generatorResource);
-		//TODO defaults
-	}
-	
-	public void update(T generatorResource) {
-		this.generatorResource = generatorResource;
-		this.setName_(this.name(generatorResource));
-		this.setSpecifiedInitialValue_(this.specifiedInitialValue(generatorResource));
-		this.setSpecifiedAllocationSize_(this.specifiedAllocationSize(generatorResource));
-		//TODO defaults
-	}
-	
-	public boolean overrides(Generator generator) {
-		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(generator.getName()) && generator instanceof JavaGenerator;
-	}
-
-	protected T getGeneratorResource() {
-		return this.generatorResource;
-	}
-	
-	protected String name(XmlGenerator generatorResource) {
-		return generatorResource.getName();
-	}
-	
-	protected Integer specifiedInitialValue(XmlGenerator generatorResource) {
-		return generatorResource.getInitialValue();
-	}
-	
-	protected Integer specifiedAllocationSize(XmlGenerator generatorResource) {
-		return generatorResource.getAllocationSize();
-	}
-
-	public TextRange getValidationTextRange() {
-		TextRange validationTextRange = this.getGeneratorResource().getValidationTextRange();
-		return validationTextRange != null ? validationTextRange : getParent().getValidationTextRange();
-	}
-	
-	public TextRange getNameTextRange() {
-		TextRange nameTextRange = this.getGeneratorResource().getNameTextRange();
-		return nameTextRange != null ? nameTextRange : getValidationTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmJpaContextNode.java
deleted file mode 100644
index 6041d883b5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmJpaContextNode.java
+++ /dev/null
@@ -1,36 +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.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.JpaNode;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public abstract class AbstractOrmJpaContextNode extends AbstractJpaContextNode implements OrmJpaContextNode
-{
-	// ********** constructor **********
-
-	protected AbstractOrmJpaContextNode(JpaNode parent) {
-		super(parent);
-	}
-	
-	// ********** validation **********
-	
-	/**
-	 * All subclass implementations {@link #addToMessages(List<IMessage>)} 
-	 * should be preceded by a "super" call to this method
-	 */
-	public void addToMessages(List<IMessage> messages) {
-		
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java
deleted file mode 100644
index e283baf41b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.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.core.internal.context.orm;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jpt.core.context.FetchType;
-import org.eclipse.jpt.core.context.MultiRelationshipMapping;
-import org.eclipse.jpt.core.context.NonOwningMapping;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmJoinTable;
-import org.eclipse.jpt.core.context.orm.OrmMultiRelationshipMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.orm.MapKey;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public abstract class AbstractOrmMultiRelationshipMapping<T extends XmlMultiRelationshipMapping>
-	extends AbstractOrmRelationshipMapping<T>
-	implements OrmMultiRelationshipMapping
-{
-
-	protected String mappedBy;
-
-	protected String orderBy;//TODO change this to defaultOrderBy and specifiedOrderBy?
-
-	protected boolean isNoOrdering;
-
-	protected boolean isPkOrdering;
-
-	protected boolean isCustomOrdering;
-
-	protected final OrmJoinTable joinTable;
-
-	protected String mapKey;
-
-	protected AbstractOrmMultiRelationshipMapping(OrmPersistentAttribute parent) {
-		super(parent);
-		this.joinTable = getJpaFactory().buildOrmJoinTable(this);
-	}
-
-	@Override
-	public void initializeFromXmlMulitRelationshipMapping(OrmMultiRelationshipMapping oldMapping) {
-		super.initializeFromXmlMulitRelationshipMapping(oldMapping);
-		getJoinTable().initializeFrom(oldMapping.getJoinTable());
-	}
-	
-	public boolean isRelationshipOwner() {
-		return getMappedBy() == null;
-	}
-
-	public FetchType getDefaultFetch() {
-		return MultiRelationshipMapping.DEFAULT_FETCH_TYPE;
-	}
-	
-	public String getMappedBy() {
-		return this.mappedBy;
-	}
-
-	public void setMappedBy(String newMappedBy) {
-		String oldMappedBy = this.mappedBy;
-		this.mappedBy = newMappedBy;
-		getAttributeMapping().setMappedBy(newMappedBy);
-		firePropertyChanged(MAPPED_BY_PROPERTY, oldMappedBy, newMappedBy);
-	}
-	
-	protected void setMappedBy_(String newMappedBy) {
-		String oldMappedBy = this.mappedBy;
-		this.mappedBy = newMappedBy;
-		firePropertyChanged(MAPPED_BY_PROPERTY, oldMappedBy, newMappedBy);
-	}
-
-	public String getOrderBy() {
-		return this.orderBy;
-	}
-
-	public void setOrderBy(String newOrderBy) {
-		String oldOrderBy = this.orderBy;
-		this.orderBy = newOrderBy;
-		getAttributeMapping().setOrderBy(newOrderBy);
-		firePropertyChanged(ORDER_BY_PROPERTY, oldOrderBy, newOrderBy);
-	}
-	
-	protected void setOrderBy_(String newOrderBy) {
-		String oldOrderBy = this.orderBy;
-		this.orderBy = newOrderBy;
-		firePropertyChanged(ORDER_BY_PROPERTY, oldOrderBy, newOrderBy);
-	}
-
-	public boolean isNoOrdering() {
-		return this.isNoOrdering;
-	}
-
-	public void setNoOrdering(boolean newNoOrdering) {
-		boolean oldNoOrdering = this.isNoOrdering;
-		this.isNoOrdering = newNoOrdering;
-		if (newNoOrdering) {
-			getAttributeMapping().setOrderBy(null);
-		}
-		firePropertyChanged(NO_ORDERING_PROPERTY, oldNoOrdering, newNoOrdering);			
-	}
-	
-	protected void setNoOrdering_(boolean newNoOrdering) {
-		boolean oldNoOrdering = this.isNoOrdering;
-		this.isNoOrdering = newNoOrdering;
-		firePropertyChanged(NO_ORDERING_PROPERTY, oldNoOrdering, newNoOrdering);			
-	}
-	
-	public boolean isPkOrdering() {
-		return this.isPkOrdering;
-	}
-	
-	public void setPkOrdering(boolean newPkOrdering) {
-		boolean oldPkOrdering = this.isPkOrdering;
-		this.isPkOrdering = newPkOrdering;
-		if (newPkOrdering) {
-			getAttributeMapping().setOrderBy("");
-		}
-		firePropertyChanged(PK_ORDERING_PROPERTY, oldPkOrdering, newPkOrdering);	
-	}
-	
-	protected void setPkOrdering_(boolean newPkOrdering) {
-		boolean oldPkOrdering = this.isPkOrdering;
-		this.isPkOrdering = newPkOrdering;
-		firePropertyChanged(PK_ORDERING_PROPERTY, oldPkOrdering, newPkOrdering);	
-	}
-	
-	public boolean isCustomOrdering() {
-		return this.isCustomOrdering;
-	}
-
-	public void setCustomOrdering(boolean newCustomOrdering) {
-		boolean oldCustomOrdering = this.isCustomOrdering;
-		this.isCustomOrdering = newCustomOrdering;
-		if (newCustomOrdering) {
-			setOrderBy("");
-		}
-		firePropertyChanged(CUSTOM_ORDERING_PROPERTY, oldCustomOrdering, newCustomOrdering);
-	}
-	
-	protected void setCustomOrdering_(boolean newCustomOrdering) {
-		boolean oldCustomOrdering = this.isCustomOrdering;
-		this.isCustomOrdering = newCustomOrdering;
-		firePropertyChanged(CUSTOM_ORDERING_PROPERTY, oldCustomOrdering, newCustomOrdering);
-	}
-	
-	public OrmJoinTable getJoinTable() {
-		return this.joinTable;
-	}
-
-	public boolean isJoinTableSpecified() {
-		return getJoinTable().isSpecified();
-	}
-
-	public String getMapKey() {
-		return this.mapKey;
-	}
-
-	public void setMapKey(String newMapKey) {
-		String oldMapKey = this.mapKey;
-		this.mapKey = newMapKey;
-		if (oldMapKey != newMapKey) {
-			if (this.getMapKeyResource() != null) {
-				this.getMapKeyResource().setName(newMapKey);						
-				if (this.getMapKeyResource().isAllFeaturesUnset()) {
-					removeMapKeyResource();
-				}
-			}
-			else if (newMapKey != null) {
-				addMapKeyResource();
-				getMapKeyResource().setName(newMapKey);
-			}
-		}
-		firePropertyChanged(MAP_KEY_PROPERTY, oldMapKey, newMapKey);
-	}
-	
-	protected void setMapKey_(String newMapKey) {
-		String oldMapKey = this.mapKey;
-		this.mapKey = newMapKey;
-		firePropertyChanged(MAP_KEY_PROPERTY, oldMapKey, newMapKey);
-	}
-	
-	protected MapKey getMapKeyResource() {
-		return getAttributeMapping().getMapKey();
-	}
-	
-	protected void removeMapKeyResource() {
-		getAttributeMapping().setMapKey(null);
-	}
-	
-	protected void addMapKeyResource() {
-		getAttributeMapping().setMapKey(OrmFactory.eINSTANCE.createMapKeyImpl());
-	}
-
-	public Iterator<String> candidateMapKeyNames() {
-		return this.allTargetEntityAttributeNames();
-	}
-
-//	public void refreshDefaults(DefaultsContext defaultsContext) {
-//		super.refreshDefaults(defaultsContext);
-//		// TODO
-//		//		if (isOrderByPk()) {
-//		//			refreshDefaultOrderBy(defaultsContext);
-//		//		}
-//	}
-//
-//	//primary key ordering when just the @OrderBy annotation is present
-//	protected void refreshDefaultOrderBy(DefaultsContext defaultsContext) {
-//		IEntity targetEntity = getResolvedTargetEntity();
-//		if (targetEntity != null) {
-//			setOrderBy(targetEntity.primaryKeyAttributeName() + " ASC");
-//		}
-//	}
-//
-//	//TODO copied from JavaMultiRelationshipMapping
-//	/**
-//	 * extract the element type from the specified container signature and
-//	 * convert it into a reference entity type name;
-//	 * return null if the type is not a valid reference entity type (e.g. it's
-//	 * another container or an array or a primitive or other Basic type)
-//	 */
-//	@Override
-//	protected String javaDefaultTargetEntity(ITypeBinding typeBinding) {
-//		String typeName = super.javaDefaultTargetEntity(typeBinding);
-//		return JavaRelationshipMapping.typeNamedIsContainer(typeName) ? this.javaDefaultTargetEntityFromContainer(typeBinding) : null;
-//	}
-//
-//	protected String javaDefaultTargetEntityFromContainer(ITypeBinding typeBinding) {
-//		return JavaMultiRelationshipMapping.javaDefaultTargetEntityFromContainer(typeBinding);
-//	}
-	
-	public TextRange getMappedByTextRange() {
-		TextRange mappedByTextRange = getAttributeMapping().getMappedByTextRange();
-		return mappedByTextRange != null ? mappedByTextRange : getValidationTextRange();
-	}
-	
-	@Override
-	public void initialize(T multiRelationshipMapping) {
-		super.initialize(multiRelationshipMapping);
-		this.mappedBy = multiRelationshipMapping.getMappedBy();
-		this.mapKey = this.mapKey(multiRelationshipMapping);
-		this.orderBy = this.orderBy(multiRelationshipMapping);
-		if (this.orderBy == null) { 
-			this.isNoOrdering = true;
-		}
-		else {
-			this.isCustomOrdering = true;
-		}
-		this.joinTable.initialize(multiRelationshipMapping);
-	}
-	
-	@Override
-	public void update(T multiRelationshipMapping) {
-		super.update(multiRelationshipMapping);
-		this.setMappedBy_(multiRelationshipMapping.getMappedBy());
-		this.setMapKey_(this.mapKey(multiRelationshipMapping));
-		this.setOrderBy_(this.orderBy(multiRelationshipMapping));
-		if (getOrderBy() == null) { 
-			setNoOrdering_(true);
-			setPkOrdering_(false);
-			setCustomOrdering_(false);
-		}
-		else {
-			setNoOrdering_(false);
-			setPkOrdering_(false);
-			setCustomOrdering_(true);
-		}
-		this.joinTable.update(multiRelationshipMapping);
-	}
-	
-	protected String mapKey(T multiRelationshipMapping) {
-		return multiRelationshipMapping.getMapKey() == null ? null : multiRelationshipMapping.getMapKey().getName();
-	}
-	
-	protected String orderBy(T multiRelationshipMapping) {
-		return multiRelationshipMapping.getOrderBy();
-	}
-	
-	@Override
-	protected String defaultTargetEntity(JavaResourcePersistentAttribute persistentAttributeResource) {
-		if (!persistentAttributeResource.typeIsContainer()) {
-			return null;
-		}
-		return persistentAttributeResource.getQualifiedReferenceEntityElementTypeName();
-	}
-
-	//****************** validation ******************8
-	
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		
-		if (entityOwned() && (this.isJoinTableSpecified() || isRelationshipOwner())) {
-			getJoinTable().addToMessages(messages);
-		}
-		if (getMappedBy() != null) {
-			addMappedByMessages(messages);
-		}
-	}
-	
-	protected void addMappedByMessages(List<IMessage> messages) {	
-		if (isJoinTableSpecified()) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.MAPPING_MAPPED_BY_WITH_JOIN_TABLE,
-						getJoinTable(),
-						getJoinTable().getValidationTextRange())
-				);
-		}
-		
-		if (getResolvedTargetEntity() == null) {
-			// already have validation messages for that
-			return;
-		}
-		
-		PersistentAttribute attribute = getResolvedTargetEntity().getPersistentType().resolveAttribute(getMappedBy());
-		
-		if (attribute == null) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.MAPPING_UNRESOLVED_MAPPED_BY,
-						new String[] {getMappedBy()}, 
-						this,
-						getMappedByTextRange())
-				);
-			return;
-		}
-		
-		if (! mappedByIsValid(attribute.getMapping())) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.MAPPING_INVALID_MAPPED_BY,
-						new String[] {getMappedBy()}, 
-						this,
-						getMappedByTextRange())
-				);
-			return;
-		}
-		
-		NonOwningMapping mappedByMapping;
-		try {
-			mappedByMapping = (NonOwningMapping) attribute.getMapping();
-		} catch (ClassCastException cce) {
-			// there is no error then
-			return;
-		}
-		
-		if (mappedByMapping.getMappedBy() != null) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.MAPPING_MAPPED_BY_ON_BOTH_SIDES,
-						this,
-						getMappedByTextRange())
-				);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmNamedColumn.java
deleted file mode 100644
index f07f27ee7c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmNamedColumn.java
+++ /dev/null
@@ -1,191 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.NamedColumn;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.context.orm.OrmNamedColumn;
-import org.eclipse.jpt.core.resource.orm.XmlNamedColumn;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.db.Table;
-
-
-public abstract class AbstractOrmNamedColumn<T extends XmlNamedColumn>  extends AbstractOrmJpaContextNode
-	implements OrmNamedColumn
-{
-	protected Owner owner;
-	
-	protected String specifiedName;
-	
-	protected String defaultName;
-
-	protected String columnDefinition;
-
-	protected AbstractOrmNamedColumn(OrmJpaContextNode parent, Owner owner) {
-		super(parent);
-		this.owner = owner;
-	}
-
-	@Override
-	public OrmJpaContextNode getParent() {
-		return (OrmJpaContextNode) super.getParent();
-	}
-	
-	public void initializeFrom(NamedColumn oldColumn) {
-		setSpecifiedName(oldColumn.getSpecifiedName());
-		setColumnDefinition(oldColumn.getColumnDefinition());
-	}
-
-	protected abstract T getColumnResource();
-	
-	protected abstract void removeColumnResource();
-	
-	protected abstract void addColumnResource();
-
-	public Owner getOwner() {
-		return this.owner;
-	}
-
-	public String getName() {
-		return (this.specifiedName != null) ? this.specifiedName : this.defaultName;
-	}
-
-	public String getSpecifiedName() {
-		return this.specifiedName;
-	}
-
-	public void setSpecifiedName(String newSpecifiedName) {
-		String oldSpecifiedName = this.specifiedName;
-		this.specifiedName = newSpecifiedName;
-		if (oldSpecifiedName != newSpecifiedName) {
-			if (this.getColumnResource() != null) {
-				this.getColumnResource().setName(newSpecifiedName);						
-				if (this.getColumnResource().isAllFeaturesUnset()) {
-					removeColumnResource();
-				}
-			}
-			else if (newSpecifiedName != null) {
-				addColumnResource();
-				getColumnResource().setName(newSpecifiedName);
-			}
-		}
-		firePropertyChanged(SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName);
-	}
-	
-	protected void setSpecifiedName_(String newSpecifiedName) {
-		String oldSpecifiedName = this.specifiedName;
-		this.specifiedName = newSpecifiedName;
-		firePropertyChanged(SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName);
-	}
-
-	public String getDefaultName() {
-		return this.defaultName;
-	}
-
-	protected void setDefaultName(String newDefaultName) {
-		String oldDefaultName = this.defaultName;
-		this.defaultName = newDefaultName;
-		firePropertyChanged(DEFAULT_NAME_PROPERTY, oldDefaultName, newDefaultName);
-	}
-	
-	public String getColumnDefinition() {
-		return this.columnDefinition;
-	}
-	
-	public void setColumnDefinition(String newColumnDefinition) {
-		String oldColumnDefinition = this.columnDefinition;
-		this.columnDefinition = newColumnDefinition;
-		if (oldColumnDefinition != newColumnDefinition) {
-			if (this.getColumnResource() != null) {
-				this.getColumnResource().setColumnDefinition(newColumnDefinition);						
-				if (this.getColumnResource().isAllFeaturesUnset()) {
-					removeColumnResource();
-				}
-			}
-			else if (newColumnDefinition != null) {
-				addColumnResource();
-				getColumnResource().setColumnDefinition(newColumnDefinition);
-			}
-		}
-		firePropertyChanged(COLUMN_DEFINITION_PROPERTY, oldColumnDefinition, newColumnDefinition);
-	}
-	
-	protected void setColumnDefinition_(String newColumnDefinition) {
-		String oldColumnDefinition = this.columnDefinition;
-		this.columnDefinition = newColumnDefinition;
-		firePropertyChanged(COLUMN_DEFINITION_PROPERTY, oldColumnDefinition, newColumnDefinition);
-	}
-
-	public Column getDbColumn() {
-		Table table = this.getDbTable();
-		return (table == null) ? null : table.columnNamed(getName());
-	}
-
-	public Table getDbTable() {
-		return getOwner().getDbTable(this.tableName());
-	}
-
-	protected abstract String tableName();
-
-	public boolean isResolved() {
-		return getDbColumn() != null;
-	}
-
-	public TextRange getNameTextRange() {
-		if (getColumnResource() != null) {
-			TextRange textRange = getColumnResource().getNameTextRange();
-			if (textRange != null) {
-				return textRange;
-			}
-		}
-		return getOwner().getValidationTextRange();
-	}
-
-	public TextRange getValidationTextRange() {
-		TextRange textRange = getColumnResource().getValidationTextRange();
-		if (textRange != null) {
-			return textRange;
-		}
-		return getOwner().getValidationTextRange();
-	}
-
-	
-	// ******************* initialization from orm xml resource model ********************
-	
-	protected void initialize(T column) {
-		this.specifiedName = this.specifiedName(column);
-		this.defaultName = this.defaultName();
-		this.columnDefinition = this.specifiedColumnDefinition(column);
-	}
-	
-	protected void update(T column) {
-		setSpecifiedName_(this.specifiedName(column));
-		setDefaultName(this.defaultName());
-		setColumnDefinition_(this.specifiedColumnDefinition(column));	
-	}
-
-	protected String specifiedName(T column) {
-		return column == null ? null : column.getName();
-	}
-	
-	protected String specifiedColumnDefinition(T column) {
-		return column == null ? null : column.getColumnDefinition();
-	}
-	
-	/**
-	 * Return the default column name.
-	 */
-	protected String defaultName() {
-		return this.getOwner().getDefaultColumnName();
-	}
-
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmQuery.java
deleted file mode 100644
index a3cf36ff69..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmQuery.java
+++ /dev/null
@@ -1,172 +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.core.internal.context.orm;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.Query;
-import org.eclipse.jpt.core.context.QueryHint;
-import org.eclipse.jpt.core.context.java.JavaQuery;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.context.orm.OrmQuery;
-import org.eclipse.jpt.core.context.orm.OrmQueryHint;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlQuery;
-import org.eclipse.jpt.core.resource.orm.XmlQueryHint;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-
-public abstract class AbstractOrmQuery<E extends XmlQuery> extends AbstractOrmJpaContextNode 
-	implements OrmQuery
-{
-
-	protected String name;
-
-	protected String query;
-
-	protected final List<OrmQueryHint> hints;
-
-	protected E queryResource;
-	
-	protected AbstractOrmQuery(OrmJpaContextNode parent) {
-		super(parent);
-		this.hints = new ArrayList<OrmQueryHint>();
-	}
-
-	protected E getQueryResource() {
-		return this.queryResource;
-	}
-	
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		this.getQueryResource().setName(newName);
-		firePropertyChanged(Query.NAME_PROPERTY, oldName, newName);
-	}
-
-	public String getQuery() {
-		return this.query;
-	}
-
-	public void setQuery(String newQuery) {
-		String oldQuery = this.query;
-		this.query = newQuery;
-		this.getQueryResource().setQuery(newQuery);
-		firePropertyChanged(Query.QUERY_PROPERTY, oldQuery, newQuery);
-	}
-
-	public ListIterator<OrmQueryHint> hints() {
-		return new CloneListIterator<OrmQueryHint>(this.hints);
-	}
-	
-	public int hintsSize() {
-		return this.hints.size();
-	}
-	
-	public OrmQueryHint addHint(int index) {
-		OrmQueryHint queryHint = getJpaFactory().buildOrmQueryHint(this);
-		this.hints.add(index, queryHint);
-		this.getQueryResource().getHints().add(index, OrmFactory.eINSTANCE.createXmlQueryHint());
-		this.fireItemAdded(Query.HINTS_LIST, index, queryHint);
-		return queryHint;
-	}
-
-	protected void addHint(int index, OrmQueryHint queryHint) {
-		addItemToList(index, queryHint, this.hints, Query.HINTS_LIST);
-	}
-	
-	public void removeHint(QueryHint queryHint) {
-		removeHint(this.hints.indexOf(queryHint));
-	}
-	
-	public void removeHint(int index) {
-		OrmQueryHint queryHint = this.hints.remove(index);
-		this.queryResource.getHints().remove(index);
-		fireItemRemoved(Query.HINTS_LIST, index, queryHint);
-	}
-
-	protected void removeHint_(OrmQueryHint queryHint) {
-		removeItemFromList(queryHint, this.hints, Query.HINTS_LIST);
-	}
-	
-	public void moveHint(int targetIndex, int sourceIndex) {
-		this.queryResource.getHints().move(targetIndex, sourceIndex);
-		moveItemInList(targetIndex, sourceIndex, this.hints, Query.HINTS_LIST);		
-		
-	}
-
-	
-	public void initialize(E queryResource) {
-		this.queryResource = queryResource;
-		this.name = queryResource.getName();
-		this.query = queryResource.getQuery();
-		this.initializeHints(queryResource);
-	}
-	
-	protected void initializeHints(E queryResource) {
-		for (XmlQueryHint queryhint : queryResource.getHints()) {
-			this.hints.add(createHint(queryhint));
-		}
-	}
-
-	protected OrmQueryHint createHint(XmlQueryHint queryHint) {
-		OrmQueryHint ormQueryHint = getJpaFactory().buildOrmQueryHint(this);
-		ormQueryHint.initialize(queryHint);
-		return ormQueryHint;
-	}
-	
-	public void update(E queryResource) {
-		this.queryResource = queryResource;
-		this.setName(queryResource.getName());
-		this.setQuery(queryResource.getQuery());
-		this.updateHints(queryResource);
-	}
-	
-	protected void updateHints(E queryResource) {
-		ListIterator<OrmQueryHint> hints = hints();
-		ListIterator<XmlQueryHint> resourceHints = new CloneListIterator<XmlQueryHint>(queryResource.getHints());//prevent ConcurrentModificiationException
-		
-		while (hints.hasNext()) {
-			OrmQueryHint hint = hints.next();
-			if (resourceHints.hasNext()) {
-				hint.update(resourceHints.next());
-			}
-			else {
-				removeHint_(hint);
-			}
-		}
-		
-		while (resourceHints.hasNext()) {
-			addHint(hintsSize(), createHint(resourceHints.next()));
-		}
-	}
-	
-	public boolean overrides(Query query) {
-		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(query.getName()) && query instanceof JavaQuery;
-	}
-
-	public TextRange getValidationTextRange() {
-		return this.getQueryResource().getValidationTextRange();
-	}
-	
-	public TextRange getNameTextRange() {
-		return this.getQueryResource().getNameTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmRelationshipMapping.java
deleted file mode 100644
index 941670e156..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmRelationshipMapping.java
+++ /dev/null
@@ -1,214 +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.core.internal.context.orm;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.AttributeMapping;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.FetchType;
-import org.eclipse.jpt.core.context.Fetchable;
-import org.eclipse.jpt.core.context.PersistentType;
-import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmRelationshipMapping;
-import org.eclipse.jpt.core.internal.context.MappingTools;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-
-
-public abstract class AbstractOrmRelationshipMapping<T extends XmlRelationshipMapping> extends AbstractOrmAttributeMapping<T>
-	implements OrmRelationshipMapping
-{
-	
-	protected String specifiedTargetEntity;
-
-	protected String defaultTargetEntity;
-
-	protected Entity resolvedTargetEntity;
-	
-	protected FetchType specifiedFetch;
-	
-	protected final OrmCascade cascade;
-
-	
-	protected AbstractOrmRelationshipMapping(OrmPersistentAttribute parent) {
-		super(parent);
-		this.cascade = new OrmCascade(this);
-	}
-
-	public String getTargetEntity() {
-		return (this.getSpecifiedTargetEntity() == null) ? getDefaultTargetEntity() : this.getSpecifiedTargetEntity();
-	}
-
-	public String getSpecifiedTargetEntity() {
-		return this.specifiedTargetEntity;
-	}
-
-	public void setSpecifiedTargetEntity(String newSpecifiedTargetEntity) {
-		String oldSpecifiedTargetEntity = this.specifiedTargetEntity;
-		this.specifiedTargetEntity = newSpecifiedTargetEntity;
-		getAttributeMapping().setTargetEntity(newSpecifiedTargetEntity);
-		firePropertyChanged(SPECIFIED_TARGET_ENTITY_PROPERTY, oldSpecifiedTargetEntity, newSpecifiedTargetEntity);
-	}
-
-	protected void setSpecifiedTargetEntity_(String newSpecifiedTargetEntity) {
-		String oldSpecifiedTargetEntity = this.specifiedTargetEntity;
-		this.specifiedTargetEntity = newSpecifiedTargetEntity;
-		firePropertyChanged(SPECIFIED_TARGET_ENTITY_PROPERTY, oldSpecifiedTargetEntity, newSpecifiedTargetEntity);
-	}
-
-	public String getDefaultTargetEntity() {
-		return this.defaultTargetEntity;
-	}
-
-	protected void setDefaultTargetEntity(String newDefaultTargetEntity) {
-		String oldDefaultTargetEntity = this.defaultTargetEntity;
-		this.defaultTargetEntity = newDefaultTargetEntity;
-		firePropertyChanged(DEFAULT_TARGET_ENTITY_PROPERTY, oldDefaultTargetEntity, newDefaultTargetEntity);
-	}
-
-	public Entity getResolvedTargetEntity() {
-		return this.resolvedTargetEntity;
-	}
-
-	protected void setResolvedTargetEntity(Entity newResolvedTargetEntity) {
-		Entity oldResolvedTargetEntity = this.resolvedTargetEntity;
-		this.resolvedTargetEntity = newResolvedTargetEntity;
-		firePropertyChanged(RESOLVED_TARGET_ENTITY_PROPERTY, oldResolvedTargetEntity, newResolvedTargetEntity);
-	}
-
-	public FetchType getFetch() {
-		return (this.getSpecifiedFetch() == null) ? this.getDefaultFetch() : this.getSpecifiedFetch();
-	}
-
-	public FetchType getSpecifiedFetch() {
-		return this.specifiedFetch;
-	}
-	
-	public void setSpecifiedFetch(FetchType newSpecifiedFetch) {
-		FetchType oldFetch = this.specifiedFetch;
-		this.specifiedFetch = newSpecifiedFetch;
-		this.getAttributeMapping().setFetch(FetchType.toOrmResourceModel(newSpecifiedFetch));
-		firePropertyChanged(Fetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch);
-	}
-
-	protected void setSpecifiedFetch_(FetchType newSpecifiedFetch) {
-		FetchType oldFetch = this.specifiedFetch;
-		this.specifiedFetch = newSpecifiedFetch;
-		firePropertyChanged(Fetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch);
-	}
-
-	public OrmCascade getCascade() {
-		return this.cascade;
-	}
-
-
-	@Override
-	public void initializeFromXmlRelationshipMapping(OrmRelationshipMapping oldMapping) {
-		super.initializeFromXmlRelationshipMapping(oldMapping);
-		setSpecifiedTargetEntity(oldMapping.getSpecifiedTargetEntity());
-		setSpecifiedFetch(oldMapping.getSpecifiedFetch());
-		getCascade().initializeFrom(oldMapping.getCascade());
-		//TODO should we set the fetch type from a BasicMapping??
-	}
-
-	public Iterator<String> allTargetEntityAttributeNames() {
-		Entity targetEntity = this.getResolvedTargetEntity();
-		return (targetEntity == null) ? EmptyIterator.<String> instance() : targetEntity.getPersistentType().allAttributeNames();
-	}
-
-	public Iterator<String> candidateMappedByAttributeNames() {
-		return this.allTargetEntityAttributeNames();
-	}
-		
-	public Entity getEntity() {
-		if (getTypeMapping() instanceof Entity) {
-			return (Entity) getTypeMapping();
-		}
-		return null;
-	}
-	
-	public boolean targetEntityIsValid(String targetEntity) {
-		return MappingTools.targetEntityIsValid(targetEntity);
-	}
-	
-	@Override
-	public void initialize(T relationshipMapping) {
-		super.initialize(relationshipMapping);
-		this.specifiedTargetEntity = relationshipMapping.getTargetEntity();
-		this.defaultTargetEntity = this.defaultTargetEntity();
-		this.resolvedTargetEntity = this.resolveTargetEntity();
-		this.specifiedFetch = this.specifiedFetch(relationshipMapping);
-		this.cascade.initialize(relationshipMapping);
-	}
-	
-	@Override
-	public void update(T relationshipMapping) {
-		super.update(relationshipMapping);
-		this.setSpecifiedTargetEntity_(relationshipMapping.getTargetEntity());
-		this.setDefaultTargetEntity(this.defaultTargetEntity());
-		this.setResolvedTargetEntity(this.resolveTargetEntity());
-		this.setSpecifiedFetch_(this.specifiedFetch(relationshipMapping));
-		this.cascade.update(relationshipMapping);
-	}
-	
-	protected FetchType specifiedFetch(XmlRelationshipMapping relationshipMapping) {
-		return FetchType.fromOrmResourceModel(relationshipMapping.getFetch());
-	}
-	
-	protected RelationshipMapping javaRelationshipMapping() {
-		if (findJavaPersistentAttribute() == null) {
-			return null;
-		}
-		AttributeMapping javaAttributeMapping = findJavaPersistentAttribute().getMapping();
-		if (javaAttributeMapping instanceof RelationshipMapping) {
-			return ((RelationshipMapping) javaAttributeMapping);
-		}
-		return null;
-	}
-	
-	protected String defaultTargetEntity() {
-		RelationshipMapping javaMapping = javaRelationshipMapping();
-		if (javaMapping != null) {
-			if (getPersistentAttribute().isVirtual() && !getTypeMapping().isMetadataComplete()) {
-				return javaMapping.getTargetEntity();
-			}
-		}
-		if (findJavaPersistentAttribute() != null) {
-			return defaultTargetEntity(findJavaPersistentAttribute().getResourcePersistentAttribute());
-		}
-		return null;
-	}
-	
-	protected abstract String defaultTargetEntity(JavaResourcePersistentAttribute persistentAttributeResource);
-
-	protected Entity resolveTargetEntity() {
-		if (getTargetEntity() == null) {
-			return null;
-		}
-		PersistentType persistentType = getTargetPersistentType();
-		if (persistentType != null && persistentType.getMappingKey() == MappingKeys.ENTITY_TYPE_MAPPING_KEY) {
-			return (Entity) persistentType.getMapping();
-		}
-		return null;
-	}
-	
-	protected PersistentType getTargetPersistentType() {
-		// try to resolve by only the locally specified name
-		PersistentType persistentType = getPersistenceUnit().getPersistentType(getTargetEntity());
-		if (persistentType == null) {
-			// try to resolve by prepending the global package name
-			persistentType = getPersistenceUnit().getPersistentType(getEntityMappings().getPackage() + "." + getTargetEntity());
-		}
-		return persistentType;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java
deleted file mode 100644
index 5b02eba937..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java
+++ /dev/null
@@ -1,444 +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.core.internal.context.orm;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.BaseJoinColumn;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.FetchType;
-import org.eclipse.jpt.core.context.JoinColumn;
-import org.eclipse.jpt.core.context.Nullable;
-import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.SingleRelationshipMapping;
-import org.eclipse.jpt.core.context.TypeMapping;
-import org.eclipse.jpt.core.context.orm.OrmJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmSingleRelationshipMapping;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
-import org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public abstract class AbstractOrmSingleRelationshipMapping<T extends XmlSingleRelationshipMapping>
-	extends AbstractOrmRelationshipMapping<T> implements OrmSingleRelationshipMapping
-{
-	
-	protected final List<OrmJoinColumn> specifiedJoinColumns;
-
-	protected OrmJoinColumn defaultJoinColumn;
-
-	protected Boolean specifiedOptional;
-
-	protected AbstractOrmSingleRelationshipMapping(OrmPersistentAttribute parent) {
-		super(parent);
-		this.specifiedJoinColumns = new ArrayList<OrmJoinColumn>();
-	}
-	
-	@Override
-	public void initializeFromXmlSingleRelationshipMapping(OrmSingleRelationshipMapping oldMapping) {
-		super.initializeFromXmlSingleRelationshipMapping(oldMapping);
-		int index = 0;
-		for (JoinColumn joinColumn : CollectionTools.iterable(oldMapping.specifiedJoinColumns())) {
-			OrmJoinColumn newJoinColumn = addSpecifiedJoinColumn(index++);
-			newJoinColumn.initializeFrom(joinColumn);
-		}
-	}
-	
-	public FetchType getDefaultFetch() {
-		return SingleRelationshipMapping.DEFAULT_FETCH_TYPE;
-	}
-
-	//***************** ISingleRelationshipMapping implementation *****************
-	public ListIterator<OrmJoinColumn> joinColumns() {
-		return this.specifiedJoinColumns.isEmpty() ? this.defaultJoinColumns() : this.specifiedJoinColumns();
-	}
-
-	public int joinColumnsSize() {
-		return this.specifiedJoinColumns.isEmpty() ? this.defaultJoinColumnsSize() : this.specifiedJoinColumnsSize();
-	}
-	
-	public OrmJoinColumn getDefaultJoinColumn() {
-		return this.defaultJoinColumn;
-	}
-	
-	protected void setDefaultJoinColumn(OrmJoinColumn newJoinColumn) {
-		OrmJoinColumn oldJoinColumn = this.defaultJoinColumn;
-		this.defaultJoinColumn = newJoinColumn;
-		firePropertyChanged(SingleRelationshipMapping.DEFAULT_JOIN_COLUMN, oldJoinColumn, newJoinColumn);
-	}
-
-	protected ListIterator<OrmJoinColumn> defaultJoinColumns() {
-		if (this.defaultJoinColumn != null) {
-			return new SingleElementListIterator<OrmJoinColumn>(this.defaultJoinColumn);
-		}
-		return EmptyListIterator.instance();
-	}
-	
-	protected int defaultJoinColumnsSize() {
-		return (this.defaultJoinColumn == null) ? 0 : 1;
-	}
-	
-	public ListIterator<OrmJoinColumn> specifiedJoinColumns() {
-		return new CloneListIterator<OrmJoinColumn>(this.specifiedJoinColumns);
-	}
-
-	public int specifiedJoinColumnsSize() {
-		return this.specifiedJoinColumns.size();
-	}
-
-	public boolean containsSpecifiedJoinColumns() {
-		return !this.specifiedJoinColumns.isEmpty();
-	}
-
-	public OrmJoinColumn addSpecifiedJoinColumn(int index) {
-		OrmJoinColumn oldDefaultJoinColumn = this.getDefaultJoinColumn();
-		if (oldDefaultJoinColumn != null) {
-			//null the default join column now if one already exists.
-			//if one does not exist, there is already a specified join column.
-			//Remove it now so that it doesn't get removed during an update and
-			//cause change notifications to be sent to the UI in the wrong order
-			this.defaultJoinColumn = null;
-		}
-		XmlJoinColumn xmlJoinColumn = OrmFactory.eINSTANCE.createXmlJoinColumnImpl();
-		OrmJoinColumn joinColumn = buildJoinColumn(xmlJoinColumn);
-		this.specifiedJoinColumns.add(index, joinColumn);
-		this.getAttributeMapping().getJoinColumns().add(index, xmlJoinColumn);
-		this.fireItemAdded(SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn);
-		if (oldDefaultJoinColumn != null) {
-			this.firePropertyChanged(SingleRelationshipMapping.DEFAULT_JOIN_COLUMN, oldDefaultJoinColumn, null);
-		}
-		return joinColumn;
-	}
-
-	protected void addSpecifiedJoinColumn(int index, OrmJoinColumn joinColumn) {
-		addItemToList(index, joinColumn, this.specifiedJoinColumns, SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST);
-	}
-
-	public void removeSpecifiedJoinColumn(JoinColumn joinColumn) {
-		this.removeSpecifiedJoinColumn(this.specifiedJoinColumns.indexOf(joinColumn));
-	}
-	
-	public void removeSpecifiedJoinColumn(int index) {
-		OrmJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index);
-		if (!containsSpecifiedJoinColumns()) {
-			//create the defaultJoinColumn now or this will happen during project update 
-			//after removing the join column from the resource model. That causes problems 
-			//in the UI because the change notifications end up in the wrong order.
-			this.defaultJoinColumn = buildJoinColumn(null);
-		}
-		this.getAttributeMapping().getJoinColumns().remove(index);
-		fireItemRemoved(SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST, index, removedJoinColumn);
-		if (this.defaultJoinColumn != null) {
-			//fire change notification if a defaultJoinColumn was created above
-			this.firePropertyChanged(SingleRelationshipMapping.DEFAULT_JOIN_COLUMN, null, this.defaultJoinColumn);		
-		}
-	}
-
-	protected void removeSpecifiedJoinColumn_(OrmJoinColumn joinColumn) {
-		removeItemFromList(joinColumn, this.specifiedJoinColumns, SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST);
-	}
-	
-	public void moveSpecifiedJoinColumn(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.specifiedJoinColumns, targetIndex, sourceIndex);
-		this.getAttributeMapping().getJoinColumns().move(targetIndex, sourceIndex);
-		fireItemMoved(SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST, targetIndex, sourceIndex);		
-	}
-
-	public Boolean getOptional() {
-		return getSpecifiedOptional() == null ? getDefaultOptional() : getSpecifiedOptional();
-	}
-	
-	public Boolean getDefaultOptional() {
-		return Nullable.DEFAULT_OPTIONAL;
-	}
-
-	public Boolean getSpecifiedOptional() {
-		return this.specifiedOptional;
-	}
-	
-	public void setSpecifiedOptional(Boolean newSpecifiedOptional) {
-		Boolean oldSpecifiedOptional = this.specifiedOptional;
-		this.specifiedOptional = newSpecifiedOptional;
-		getAttributeMapping().setOptional(newSpecifiedOptional);
-		firePropertyChanged(Nullable.SPECIFIED_OPTIONAL_PROPERTY, oldSpecifiedOptional, newSpecifiedOptional);
-	}
-	
-	protected void setSpecifiedOptional_(Boolean newSpecifiedOptional) {
-		Boolean oldSpecifiedOptional = this.specifiedOptional;
-		this.specifiedOptional = newSpecifiedOptional;
-		firePropertyChanged(Nullable.SPECIFIED_OPTIONAL_PROPERTY, oldSpecifiedOptional, newSpecifiedOptional);
-	}
-	
-	@Override
-	public void initialize(T singleRelationshipMapping) {
-		super.initialize(singleRelationshipMapping);
-		this.specifiedOptional = singleRelationshipMapping.getOptional();
-		//TODO defaultOptional
-		this.initializeSpecifiedJoinColumns(singleRelationshipMapping);
-		this.initializeDefaultJoinColumn();
-	}
-	
-	protected void initializeSpecifiedJoinColumns(T singleRelationshipMapping) {
-		if (singleRelationshipMapping == null) {
-			return;
-		}
-		for (XmlJoinColumn joinColumn : singleRelationshipMapping.getJoinColumns()) {
-			this.specifiedJoinColumns.add(buildJoinColumn(joinColumn));
-		}
-	}
-	
-	protected boolean shouldBuildDefaultJoinColumn() {
-		return !containsSpecifiedJoinColumns() && isRelationshipOwner();
-	}
-	
-	protected void initializeDefaultJoinColumn() {
-		if (!shouldBuildDefaultJoinColumn()) {
-			return;
-		}
-		this.defaultJoinColumn = buildJoinColumn(null);
-	}	
-	
-	protected OrmJoinColumn buildJoinColumn(XmlJoinColumn joinColumn) {
-		OrmJoinColumn ormJoinColumn = getJpaFactory().buildOrmJoinColumn(this, new JoinColumnOwner());
-		ormJoinColumn.initialize(joinColumn);
-		return ormJoinColumn;
-	}	
-
-	@Override
-	public void update(T singleRelationshipMapping) {
-		super.update(singleRelationshipMapping);
-		this.setSpecifiedOptional_(singleRelationshipMapping.getOptional());
-		this.updateSpecifiedJoinColumns(singleRelationshipMapping);
-		this.updateDefaultJoinColumn();
-	}
-	
-	protected void updateSpecifiedJoinColumns(T singleRelationshipMapping) {
-		ListIterator<OrmJoinColumn> joinColumns = specifiedJoinColumns();
-		ListIterator<XmlJoinColumn> resourceJoinColumns = EmptyListIterator.instance();
-		if (singleRelationshipMapping != null) {
-			resourceJoinColumns = new CloneListIterator<XmlJoinColumn>(singleRelationshipMapping.getJoinColumns());//prevent ConcurrentModificiationException
-		}
-		
-		while (joinColumns.hasNext()) {
-			OrmJoinColumn joinColumn = joinColumns.next();
-			if (resourceJoinColumns.hasNext()) {
-				joinColumn.update(resourceJoinColumns.next());
-			}
-			else {
-				removeSpecifiedJoinColumn_(joinColumn);
-			}
-		}
-		
-		while (resourceJoinColumns.hasNext()) {
-			addSpecifiedJoinColumn(specifiedJoinColumnsSize(), buildJoinColumn(resourceJoinColumns.next()));
-		}
-	}
-	
-	protected void updateDefaultJoinColumn() {
-		if (!shouldBuildDefaultJoinColumn()) {
-			setDefaultJoinColumn(null);
-			return;
-		}
-		if (getDefaultJoinColumn() == null) {
-			this.setDefaultJoinColumn(buildJoinColumn(null));
-		}
-		else {
-			this.defaultJoinColumn.update(null);
-		}
-	}	
-
-	/**
-	 * eliminate any "container" types
-	 */
-	@Override
-	protected String defaultTargetEntity(JavaResourcePersistentAttribute persistentAttributeResource) {
-		if (persistentAttributeResource.typeIsContainer()) {
-			return null;
-		}
-		return persistentAttributeResource.getQualifiedReferenceEntityTypeName();
-	}
-
-	//********************* validation ******************
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		
-		if (addJoinColumnMessages()) {
-			addJoinColumnMessages(messages);
-		}
-	}
-	
-	//bug 192287 - do not want joinColumn validation errors on the non-owning side
-	//of a bidirectional relationship.  This is a low risk fix for RC3, but a better
-	//solution would be to not have the default joinColumns on the non-owning side.
-	//This would fix another bug that we show default joinColumns in this situation.
-	protected boolean addJoinColumnMessages() {
-		return (entityOwned() && isRelationshipOwner());
-	}
-
-	protected void addJoinColumnMessages(List<IMessage> messages) {
-		boolean doContinue = this.connectionProfileIsActive();
-		
-		for (OrmJoinColumn joinColumn : CollectionTools.iterable(joinColumns())) {
-			String table = joinColumn.getTable();
-			
-			if (doContinue && getTypeMapping().tableNameIsInvalid(table)) {
-				if (getPersistentAttribute().isVirtual()) {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.VIRTUAL_ATTRIBUTE_JOIN_COLUMN_UNRESOLVED_TABLE,
-							new String[] {getName(), table, joinColumn.getName()},
-							joinColumn, 
-							joinColumn.getTableTextRange())
-					);
-				}
-				else {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_TABLE,
-							new String[] {table, joinColumn.getName()}, 
-							joinColumn, 
-							joinColumn.getTableTextRange())
-					);
-				}
-				doContinue = false;
-			}
-			
-			if (doContinue && ! joinColumn.isResolved()) {
-				if (getPersistentAttribute().isVirtual()) {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.VIRTUAL_ATTRIBUTE_JOIN_COLUMN_UNRESOLVED_NAME,
-							new String[] {getName(), joinColumn.getName()}, 
-							joinColumn, 
-							joinColumn.getNameTextRange())
-					);
-				}
-				else {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_NAME,
-							new String[] {joinColumn.getName()}, 
-							joinColumn, 
-							joinColumn.getNameTextRange())
-					);
-				}
-			}
-			
-			if (doContinue && ! joinColumn.isReferencedColumnResolved()) {
-				if (getPersistentAttribute().isVirtual()) {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.VIRTUAL_ATTRIBUTE_JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME,
-							new String[] {getName(), joinColumn.getReferencedColumnName(), joinColumn.getName()}, 
-							joinColumn, 
-							joinColumn.getReferencedColumnNameTextRange())
-					);
-				}
-				else {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME,
-							new String[] {joinColumn.getReferencedColumnName(), joinColumn.getName()}, 
-							joinColumn, 
-							joinColumn.getReferencedColumnNameTextRange())
-					);
-				}
-			}
-		}
-	}
-	
-	
-	public class JoinColumnOwner implements OrmJoinColumn.Owner
-	{
-
-		public JoinColumnOwner() {
-			super();
-		}
-
-		/**
-		 * by default, the join column is in the type mapping's primary table
-		 */
-		public String getDefaultTableName() {
-			return AbstractOrmSingleRelationshipMapping.this.getTypeMapping().getTableName();
-		}
-
-		public Entity getTargetEntity() {
-			return AbstractOrmSingleRelationshipMapping.this.getResolvedTargetEntity();
-		}
-
-		public String getAttributeName() {
-			return AbstractOrmSingleRelationshipMapping.this.getName();
-		}
-
-		public RelationshipMapping getRelationshipMapping() {
-			return AbstractOrmSingleRelationshipMapping.this;
-		}
-
-		public boolean tableNameIsInvalid(String tableName) {
-			return AbstractOrmSingleRelationshipMapping.this.getTypeMapping().tableNameIsInvalid(tableName);
-		}
-
-		/**
-		 * the join column can be on a secondary table
-		 */
-		public boolean tableIsAllowed() {
-			return true;
-		}
-
-		public TypeMapping getTypeMapping() {
-			return AbstractOrmSingleRelationshipMapping.this.getTypeMapping();
-		}
-
-		public Table getDbTable(String tableName) {
-			return getTypeMapping().getDbTable(tableName);
-		}
-
-		public Table getDbReferencedColumnTable() {
-			Entity targetEntity = getTargetEntity();
-			return (targetEntity == null) ? null : targetEntity.getPrimaryDbTable();
-		}
-		
-		public boolean isVirtual(BaseJoinColumn joinColumn) {
-			return AbstractOrmSingleRelationshipMapping.this.defaultJoinColumn == joinColumn;
-		}
-		
-		public String getDefaultColumnName() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public int joinColumnsSize() {
-			return AbstractOrmSingleRelationshipMapping.this.joinColumnsSize();
-		}
-		
-		public TextRange getValidationTextRange() {
-			return AbstractOrmSingleRelationshipMapping.this.getValidationTextRange();
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTable.java
deleted file mode 100644
index c2cc70db36..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTable.java
+++ /dev/null
@@ -1,409 +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.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.Table;
-import org.eclipse.jpt.core.context.UniqueConstraint;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.context.orm.OrmUniqueConstraint;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlBaseTable;
-import org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.NameTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-
-public abstract class AbstractOrmTable extends AbstractOrmJpaContextNode implements UniqueConstraint.Owner
-{
-	protected String specifiedName;
-
-	protected String defaultName;
-
-	protected String specifiedCatalog;
-
-	protected String defaultCatalog;
-
-	protected String specifiedSchema;
-
-	protected String defaultSchema;
-	
-	protected final List<OrmUniqueConstraint> uniqueConstraints;
-
-
-	protected AbstractOrmTable(OrmJpaContextNode parent) {
-		super(parent);
-		this.uniqueConstraints = new ArrayList<OrmUniqueConstraint>();
-	}
-
-	@Override
-	public OrmJpaContextNode getParent() {
-		return (OrmJpaContextNode) super.getParent();
-	}
-	
-	public void initializeFrom(Table oldTable) {
-		setSpecifiedName(oldTable.getSpecifiedName());
-		setSpecifiedCatalog(oldTable.getSpecifiedCatalog());
-		setSpecifiedSchema(oldTable.getSpecifiedSchema());
-	}
-	
-	
-	public String getName() {
-		return (this.getSpecifiedName() == null) ? this.getDefaultName() : this.getSpecifiedName();
-	}
-
-	public String getSpecifiedName() {
-		return this.specifiedName;
-	}
-	
-	/**
-	 * Return null if no table resource element exists
-	 */
-	protected abstract XmlBaseTable getTableResource();
-
-	protected abstract void removeTableResource();
-	
-	protected abstract void addTableResource();
-	
-	public void setSpecifiedName(String newSpecifiedName) {
-		String oldSpecifiedName = this.specifiedName;
-		this.specifiedName = newSpecifiedName;
-		if (oldSpecifiedName != newSpecifiedName) {
-			if (this.getTableResource() != null) {
-				this.getTableResource().setName(newSpecifiedName);						
-				if (this.getTableResource().isAllFeaturesUnset()) {
-					removeTableResource();
-				}
-			}
-			else if (newSpecifiedName != null) {
-				addTableResource();
-				getTableResource().setName(newSpecifiedName);
-			}
-		}
-		firePropertyChanged(Table.SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName);
-	}
-	
-	protected void setSpecifiedName_(String newSpecifiedName) {
-		String oldSpecifiedName = this.specifiedName;
-		this.specifiedName = newSpecifiedName;
-		firePropertyChanged(Table.SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName);
-	}
-
-	public String getDefaultName() {
-		return this.defaultName;
-	}
-
-	protected void setDefaultName(String newDefaultName) {
-		String oldDefaultName = this.defaultName;
-		this.defaultName = newDefaultName;
-		firePropertyChanged(Table.DEFAULT_NAME_PROPERTY, oldDefaultName, newDefaultName);
-	}
-
-	public String getCatalog() {
-		return (this.getSpecifiedCatalog() == null) ? getDefaultCatalog() : this.getSpecifiedCatalog();
-	}
-
-	public String getSpecifiedCatalog() {
-		return this.specifiedCatalog;
-	}
-
-	public void setSpecifiedCatalog(String newSpecifiedCatalog) {
-		String oldSpecifiedCatalog = this.specifiedCatalog;
-		this.specifiedCatalog = newSpecifiedCatalog;
-		if (oldSpecifiedCatalog != newSpecifiedCatalog) {
-			if (this.getTableResource() != null) {
-				this.getTableResource().setCatalog(newSpecifiedCatalog);						
-				if (this.getTableResource().isAllFeaturesUnset()) {
-					removeTableResource();
-				}
-			}
-			else if (newSpecifiedCatalog != null) {
-				addTableResource();
-				getTableResource().setCatalog(newSpecifiedCatalog);
-			}
-		}
-		firePropertyChanged(Table.SPECIFIED_CATALOG_PROPERTY, oldSpecifiedCatalog, newSpecifiedCatalog);
-	}
-	
-	protected void setSpecifiedCatalog_(String newSpecifiedCatalog) {
-		String oldSpecifiedCatalog = this.specifiedCatalog;
-		this.specifiedCatalog = newSpecifiedCatalog;
-		firePropertyChanged(Table.SPECIFIED_CATALOG_PROPERTY, oldSpecifiedCatalog, newSpecifiedCatalog);
-	}
-
-	public String getDefaultCatalog() {
-		return this.defaultCatalog;
-	}
-
-	protected void setDefaultCatalog(String newDefaultCatalog) {
-		String oldDefaultCatalog = this.defaultCatalog;
-		this.defaultCatalog = newDefaultCatalog;
-		firePropertyChanged(Table.DEFAULT_CATALOG_PROPERTY, oldDefaultCatalog, newDefaultCatalog);
-	}
-
-	public String getSchema() {
-		return (this.getSpecifiedSchema() == null) ? getDefaultSchema() : this.getSpecifiedSchema();
-	}
-
-	public String getSpecifiedSchema() {
-		return this.specifiedSchema;
-	}
-
-	public void setSpecifiedSchema(String newSpecifiedSchema) {
-		String oldSpecifiedSchema = this.specifiedSchema;
-		this.specifiedSchema = newSpecifiedSchema;
-		if (oldSpecifiedSchema != newSpecifiedSchema) {
-			if (this.getTableResource() != null) {
-				this.getTableResource().setSchema(newSpecifiedSchema);						
-				if (this.getTableResource().isAllFeaturesUnset()) {
-					removeTableResource();
-				}
-			}
-			else if (newSpecifiedSchema != null) {
-				addTableResource();
-				getTableResource().setSchema(newSpecifiedSchema);
-			}
-		}
-
-		firePropertyChanged(Table.SPECIFIED_SCHEMA_PROPERTY, oldSpecifiedSchema, newSpecifiedSchema);
-	}
-	
-	protected void setSpecifiedSchema_(String newSpecifiedSchema) {
-		String oldSpecifiedSchema = this.specifiedSchema;
-		this.specifiedSchema = newSpecifiedSchema;
-		firePropertyChanged(Table.SPECIFIED_SCHEMA_PROPERTY, oldSpecifiedSchema, newSpecifiedSchema);
-	}
-
-	public String getDefaultSchema() {
-		return this.defaultSchema;
-	}
-	
-	protected void setDefaultSchema(String newDefaultSchema) {
-		String oldDefaultSchema = this.defaultSchema;
-		this.defaultSchema = newDefaultSchema;
-		firePropertyChanged(Table.DEFAULT_SCHEMA_PROPERTY, oldDefaultSchema, newDefaultSchema);
-	}
-
-	
-	// ********** unique constraints **********
-	
-	public ListIterator<OrmUniqueConstraint> uniqueConstraints() {
-		return new CloneListIterator<OrmUniqueConstraint>(this.uniqueConstraints);
-	}
-	
-	public int uniqueConstraintsSize() {
-		return this.uniqueConstraints.size();
-	}
-	
-	public OrmUniqueConstraint addUniqueConstraint(int index) {
-		XmlUniqueConstraint uniqueConstraintResource = OrmFactory.eINSTANCE.createXmlUniqueConstraintImpl();
-		OrmUniqueConstraint uniqueConstraint =  buildUniqueConstraint(uniqueConstraintResource);
-		this.uniqueConstraints.add(index, uniqueConstraint);
-		
-		if (this.getTableResource() == null) {
-			addTableResource();
-		}
-		
-		getTableResource().getUniqueConstraints().add(index, uniqueConstraintResource);
-		fireItemAdded(Table.UNIQUE_CONSTRAINTS_LIST, index, uniqueConstraint);
-		return uniqueConstraint;
-	}
-	
-	protected void addUniqueConstraint(int index, OrmUniqueConstraint uniqueConstraint) {
-		addItemToList(index, uniqueConstraint, this.uniqueConstraints, Table.UNIQUE_CONSTRAINTS_LIST);
-	}
-	
-	
-	public void removeUniqueConstraint(UniqueConstraint uniqueConstraint) {
-		this.removeUniqueConstraint(this.uniqueConstraints.indexOf(uniqueConstraint));
-	}
-	
-	public void removeUniqueConstraint(int index) {
-		OrmUniqueConstraint removedUniqueConstraint = this.uniqueConstraints.remove(index);
-		getTableResource().getUniqueConstraints().remove(index);
-		fireItemRemoved(Table.UNIQUE_CONSTRAINTS_LIST, index, removedUniqueConstraint);
-	}
-	
-	protected void removeUniqueConstraint_(OrmUniqueConstraint uniqueConstraint) {
-		removeItemFromList(uniqueConstraint, this.uniqueConstraints, Table.UNIQUE_CONSTRAINTS_LIST);
-	}
-	
-	public void moveUniqueConstraint(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.uniqueConstraints, targetIndex, sourceIndex);
-		this.getTableResource().getUniqueConstraints().move(targetIndex, sourceIndex);
-		fireItemMoved(Table.UNIQUE_CONSTRAINTS_LIST, targetIndex, sourceIndex);		
-	}
-	
-	//******************* UniqueConstraint.Owner implementation ******************
-
-	public Iterator<String> candidateUniqueConstraintColumnNames() {
-		org.eclipse.jpt.db.Table dbTable = getDbTable();
-		if (dbTable != null) {
-			return dbTable.columnNames();
-		}
-		return EmptyIterator.instance();
-	}
-	
-	public org.eclipse.jpt.db.Table getDbTable() {
-		Schema schema = this.getDbSchema();
-		return (schema == null) ? null : schema.tableNamed(getName());
-	}
-
-	public Schema getDbSchema() {
-		return getConnectionProfile().getDatabase().schemaNamed(getSchema());
-	}
-
-	public boolean hasResolvedSchema() {
-		return getDbSchema() != null;
-	}
-
-	public boolean isResolved() {
-		return getDbTable() != null;
-	}
-	
-	protected void initialize(XmlBaseTable table) {
-		this.specifiedName = this.specifiedName(table);
-		this.specifiedSchema = this.specifiedSchema(table);
-		this.specifiedCatalog = this.specifiedCatalog(table);
-		this.defaultName = this.defaultName();
-		this.defaultSchema = this.defaultSchema();
-		this.defaultCatalog = this.defaultCatalog();
-		this.initializeUniqueContraints(table);
-	}
-	
-	protected void initializeUniqueContraints(XmlBaseTable table) {
-		if (table == null) {
-			return;
-		}
-		for (XmlUniqueConstraint uniqueConstraint : table.getUniqueConstraints()) {
-			this.uniqueConstraints.add(buildUniqueConstraint(uniqueConstraint));
-		}
-	}
-	
-	protected void update(XmlBaseTable table) {
-		this.setSpecifiedName_(this.specifiedName(table));
-		this.setSpecifiedSchema_(this.specifiedSchema(table));
-		this.setSpecifiedCatalog_(this.specifiedCatalog(table));
-		this.setDefaultName(this.defaultName());
-		this.setDefaultSchema(this.defaultSchema());
-		this.setDefaultCatalog(this.defaultCatalog());
-		this.updateUniqueConstraints(table);
-	}
-
-	protected String specifiedName(XmlBaseTable table) {
-		return table == null ? null : table.getName();
-	}
-	
-	protected String specifiedSchema(XmlBaseTable table) {
-		return table == null ? null : table.getSchema();
-	}
-	
-	protected String specifiedCatalog(XmlBaseTable table) {
-		return table == null ? null : table.getCatalog();
-	}
-	
-	protected abstract String defaultName();
-	
-	protected abstract String defaultSchema();
-	
-	protected abstract String defaultCatalog();
-	
-	protected void updateUniqueConstraints(XmlBaseTable table) {
-		ListIterator<OrmUniqueConstraint> uniqueConstraints = uniqueConstraints();
-		ListIterator<XmlUniqueConstraint> resourceUniqueConstraints;
-		if (table == null) {
-			resourceUniqueConstraints = EmptyListIterator.instance();
-		}
-		else {
-			resourceUniqueConstraints = new CloneListIterator<XmlUniqueConstraint>(table.getUniqueConstraints());//prevent ConcurrentModificiationException
-		}
-		while (uniqueConstraints.hasNext()) {
-			OrmUniqueConstraint uniqueConstraint = uniqueConstraints.next();
-			if (resourceUniqueConstraints.hasNext()) {
-				uniqueConstraint.update(resourceUniqueConstraints.next());
-			}
-			else {
-				removeUniqueConstraint_(uniqueConstraint);
-			}
-		}
-		
-		while (resourceUniqueConstraints.hasNext()) {
-			addUniqueConstraint(uniqueConstraintsSize(), buildUniqueConstraint(resourceUniqueConstraints.next()));
-		}
-	}
-
-	protected OrmUniqueConstraint buildUniqueConstraint(XmlUniqueConstraint xmlUniqueConstraint) {
-		return getJpaFactory().buildOrmUniqueConstraint(this, this, xmlUniqueConstraint);
-	}
-	
-
-	public String qualifiedName() {
-		return NameTools.buildQualifiedDatabaseObjectName(this.getCatalog(), this.getSchema(), this.getName());
-	}
-
-	protected TextRange getNameTextRange() {
-		if (getTableResource() != null) {
-			TextRange textRange = getTableResource().getNameTextRange();
-			if (textRange != null) {
-				return textRange;
-			}
-		}
-		return this.getParent().getValidationTextRange(); 
-	}
-	
-	protected TextRange getCatalogTextRange() {
-		if (getTableResource() != null) {
-			TextRange textRange = getTableResource().getCatalogTextRange();
-			if (textRange != null) {
-				return textRange;
-			}
-		}
-		return this.getParent().getValidationTextRange(); 
-	}
-	
-	protected TextRange getSchemaTextRange() {
-		if (getTableResource() != null) {
-			TextRange textRange = getTableResource().getSchemaTextRange();
-			if (textRange != null) {
-				return textRange;
-			}
-		}
-		return this.getParent().getValidationTextRange(); 
-	}
-	
-	public TextRange getValidationTextRange() {
-		if (getTableResource() != null) {
-			TextRange textRange = this.getTableResource().getValidationTextRange();
-			if (textRange != null) {
-				return textRange;
-			}
-		}
-		return getParent().getValidationTextRange();
-	}
-
-	
-	@Override
-	public void toString(StringBuilder sb) {
-		super.toString(sb);
-		sb.append(qualifiedName());
-	}
-
-	@Override
-	public String displayString() {
-		return qualifiedName();
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTypeMapping.java
deleted file mode 100644
index 60cc1eff0e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTypeMapping.java
+++ /dev/null
@@ -1,367 +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.core.internal.context.orm;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.context.AccessType;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-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.PersistenceUnitMetadata;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public abstract class AbstractOrmTypeMapping<T extends AbstractXmlTypeMapping> extends AbstractOrmJpaContextNode implements OrmTypeMapping
-{
-
-	protected String class_;
-	
-	public AccessType defaultAccess;
-
-	protected AccessType specifiedAccess;
-
-	public boolean defaultMetadataComplete;
-
-	protected Boolean specifiedMetadataComplete;
-
-	protected JavaPersistentType javaPersistentType;
-
-	protected T typeMapping;
-	
-	protected AbstractOrmTypeMapping(OrmPersistentType parent) {
-		super(parent);
-	}
-
-	public boolean isMapped() {
-		return true;
-	}
-
-	public String getTableName() {
-		return null;
-	}
-
-	public String getClass_() {
-		return this.class_;
-	}
-
-	public void setClass(String newClass) {
-		String oldClass = this.class_;
-		this.class_ = newClass;
-		this.getTypeMappingResource().setClassName(newClass);
-		firePropertyChanged(CLASS_PROPERTY, oldClass, newClass);
-		getPersistentType().classChanged(oldClass, newClass);
-	}
-	
-	public AccessType getDefaultAccess() {
-		return this.defaultAccess;
-	}
-
-	protected void setDefaultAccess(AccessType newDefaultAccess) {
-		AccessType oldDefaultAccess = this.defaultAccess;
-		this.defaultAccess = newDefaultAccess;
-		firePropertyChanged(DEFAULT_ACCESS_PROPERTY, oldDefaultAccess, newDefaultAccess);
-	}
-
-	public AccessType getSpecifiedAccess() {
-		return this.specifiedAccess;
-	}
-
-	public void setSpecifiedAccess(AccessType newSpecifiedAccess) {
-		AccessType oldSpecifiedAccess = this.specifiedAccess;
-		this.specifiedAccess = newSpecifiedAccess;
-		this.getTypeMappingResource().setAccess(AccessType.toXmlResourceModel(newSpecifiedAccess));
-		firePropertyChanged(SPECIFIED_ACCESS_PROPERTY, oldSpecifiedAccess, newSpecifiedAccess);
-	}
-
-	public AccessType getAccess() {
-		return (this.getSpecifiedAccess() == null) ? this.getDefaultAccess() : this.getSpecifiedAccess();
-	}
-
-	public boolean isMetadataComplete() {
-		if (isDefaultMetadataComplete()) {
-			//entity-mappings/persistence-unit-metadata/xml-mapping-metadata-complete is specified, then it overrides
-			//anything set here
-			return true;
-		}
-		return (this.getSpecifiedMetadataComplete() == null) ? this.isDefaultMetadataComplete() : this.getSpecifiedMetadataComplete().booleanValue();
-	}
-
-	public boolean isDefaultMetadataComplete() {
-		return this.defaultMetadataComplete;
-	}
-	
-	protected void setDefaultMetadataComplete(boolean newDefaultMetadataComplete) {
-		boolean oldMetadataComplete = this.defaultMetadataComplete;
-		this.defaultMetadataComplete = newDefaultMetadataComplete;
-		firePropertyChanged(DEFAULT_METADATA_COMPLETE_PROPERTY, oldMetadataComplete, newDefaultMetadataComplete);
-	}
-	
-	public Boolean getSpecifiedMetadataComplete() {
-		return this.specifiedMetadataComplete;
-	}
-	
-	public void setSpecifiedMetadataComplete(Boolean newSpecifiedMetadataComplete) {
-		Boolean oldMetadataComplete = this.specifiedMetadataComplete;
-		this.specifiedMetadataComplete = newSpecifiedMetadataComplete;
-		this.getTypeMappingResource().setMetadataComplete(newSpecifiedMetadataComplete);
-		firePropertyChanged(SPECIFIED_METADATA_COMPLETE_PROPERTY, oldMetadataComplete, newSpecifiedMetadataComplete);
-	}
-
-	public OrmPersistentType getPersistentType() {
-		return (OrmPersistentType) getParent();
-	}
-
-	/**
-	 * ITypeMapping is changed and various ITypeMappings may have
-	 * common settings.  In this method initialize the new ITypeMapping (this)
-	 * fromthe old ITypeMapping (oldMapping)
-	 * @param oldMapping
-	 */
-	public void initializeFrom(OrmTypeMapping oldMapping) {
-		this.setClass(oldMapping.getClass_());
-		this.setSpecifiedAccess(oldMapping.getSpecifiedAccess());
-		this.setSpecifiedMetadataComplete(oldMapping.getSpecifiedMetadataComplete());
-		this.setDefaultAccess(oldMapping.getDefaultAccess());
-		this.setDefaultMetadataComplete(oldMapping.isDefaultMetadataComplete());
-	}
-	
-	public Table getPrimaryDbTable() {
-		return null;
-	}
-
-	public Table getDbTable(String tableName) {
-		return null;
-	}
-
-	public Schema getDbSchema() {
-		return null;
-	}
-
-	/**
-	 * @see TypeMapping#attributeMappingKeyAllowed(String)
-	 * 
-	 * Default implementation:  override where needed
-	 */
-	public boolean attributeMappingKeyAllowed(String attributeMappingKey) {
-		return true;
-	}
-
-	public Iterator<OrmPersistentAttribute> overridableAttributes() {
-		return EmptyIterator.instance();
-	}
-
-	public Iterator<String> overridableAttributeNames() {
-		return EmptyIterator.instance();
-	}
-	
-	public Iterator<PersistentAttribute> allOverridableAttributes() {
-		return EmptyIterator.instance();
-	}
-
-	public Iterator<String> allOverridableAttributeNames() {
-		return EmptyIterator.instance();
-	}
-
-	public Iterator<OrmPersistentAttribute> overridableAssociations() {
-		return EmptyIterator.instance();
-	}	
-	
-	public Iterator<String> overridableAssociationNames() {
-		return EmptyIterator.instance();
-	}
-
-	public Iterator<PersistentAttribute> allOverridableAssociations() {
-		return EmptyIterator.instance();
-	}
-
-	public Iterator<String> allOverridableAssociationNames() {
-		return EmptyIterator.instance();
-	}
-
-	public T getTypeMappingResource() {
-		return this.typeMapping;
-	}
-	
-	protected PersistenceUnitMetadata getPersistenceUnitMetadata() {
-		return getEntityMappings().getPersistenceUnitMetadata();
-	}
-
-	protected boolean defaultMetadataComplete() {
-		return getPersistenceUnitMetadata().isXmlMappingMetadataComplete();
-	}
-
-	protected AccessType defaultAccess() {
-		if (!isMetadataComplete()) {
-			if (getJavaPersistentType() != null) {
-				if (getJavaPersistentType().hasAnyAttributeMappingAnnotations()) {
-					return getJavaPersistentType().getAccess();
-				}
-				if (getPersistentType().getParentPersistentType() != null) {
-					return getPersistentType().getParentPersistentType().getAccess();
-				}
-			}
-		}
-		return getEntityMappings().getAccess();
-	}
-	
-	public JavaPersistentType getJavaPersistentType() {
-		return this.javaPersistentType;
-	}
-	
-	protected void setJavaPersistentType(JavaPersistentType newJavaPersistentType) {
-		JavaPersistentType oldJavaPersistentType = this.javaPersistentType;
-		this.javaPersistentType = newJavaPersistentType;
-		firePropertyChanged(JAVA_PERSISTENT_TYPE_PROPERTY, oldJavaPersistentType, newJavaPersistentType);
-	}
-	
-	protected void initializeJavaPersistentType() {
-		JavaResourcePersistentType persistentTypeResource = getJavaResourcePersistentType();
-		if (persistentTypeResource != null) {
-			this.javaPersistentType = buildJavaPersistentType(persistentTypeResource);
-		}	
-	}
-
-	protected JavaResourcePersistentType getJavaResourcePersistentType() {
-		// try to resolve by only the locally specified name
-		JavaResourcePersistentType persistentTypeResource = getJpaProject().getJavaPersistentTypeResource(getClass_());
-		if (persistentTypeResource == null) {
-			// try to resolve by prepending the global package name
-			persistentTypeResource = getJpaProject().getJavaPersistentTypeResource(getEntityMappings().getPackage() + "." + getClass_());
-		}
-		return persistentTypeResource;
-	}
-	
-	protected void updateJavaPersistentType() {
-		JavaResourcePersistentType persistentTypeResource = getJavaResourcePersistentType();
-		if (persistentTypeResource == null) {
-			setJavaPersistentType(null);
-		}
-		else { 
-			if (getJavaPersistentType() != null) {
-				getJavaPersistentType().update(persistentTypeResource);
-			}
-			else {
-				setJavaPersistentType(buildJavaPersistentType(persistentTypeResource));
-			}
-		}		
-	}
-	
-	protected JavaPersistentType buildJavaPersistentType(JavaResourcePersistentType resourcePersistentType) {
-		return getJpaFactory().buildJavaPersistentType(this, resourcePersistentType);
-	}
-
-	public void initialize(T typeMapping) {
-		this.typeMapping = typeMapping;
-		this.class_ = typeMapping.getClassName();
-		this.initializeJavaPersistentType();
-		this.specifiedMetadataComplete = this.metadataComplete(typeMapping);
-		this.defaultMetadataComplete = this.defaultMetadataComplete();
-		this.specifiedAccess = AccessType.fromXmlResourceModel(typeMapping.getAccess());
-		this.defaultAccess = this.defaultAccess();
-	}
-	
-	public void update(T typeMapping) {
-		this.typeMapping = typeMapping;
-		this.setClass(typeMapping.getClassName());
-		this.updateJavaPersistentType();
-		this.setSpecifiedMetadataComplete(this.metadataComplete(typeMapping));
-		this.setDefaultMetadataComplete(this.defaultMetadataComplete());
-		this.setSpecifiedAccess(AccessType.fromXmlResourceModel(typeMapping.getAccess()));
-		this.setDefaultAccess(this.defaultAccess());
-	}
-	
-	protected Boolean metadataComplete(AbstractXmlTypeMapping typeMapping) {
-		return typeMapping.getMetadataComplete();
-	}
-
-
-	
-	// *************************************************************************
-	
-	public JpaStructureNode getStructureNode(int offset) {
-		if (this.typeMapping.containsOffset(offset)) {
-			return getPersistentType();
-		}
-		return null;
-	}
-	
-	public TextRange getSelectionTextRange() {
-		return this.typeMapping.getSelectionTextRange();
-	}
-	
-	public TextRange getClassTextRange() {
-		return this.typeMapping.getClassTextRange();
-	}
-	
-	public TextRange getAttributesTextRange() {
-		return this.typeMapping.getAttributesTextRange();
-	}
-
-	public boolean containsOffset(int textOffset) {
-		if (this.typeMapping == null) {
-			return false;
-		}
-		return this.typeMapping.containsOffset(textOffset);
-	}
-	
-	//************************* validation ************************
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		addClassMessages(messages);
-	}
-	protected void addClassMessages(List<IMessage> messages) {
-		addUnspecifiedClassMessage(messages);
-		addUnresolvedClassMessage(messages);
-	}
-	
-	protected void addUnspecifiedClassMessage(List<IMessage> messages) {
-		if (StringTools.stringIsEmpty(getClass_())) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					JpaValidationMessages.PERSISTENT_TYPE_UNSPECIFIED_CLASS,
-					this, 
-					this.getClassTextRange())
-			);
-		}
-	}
-	
-	protected void addUnresolvedClassMessage(List<IMessage> messages) {
-		if (! StringTools.stringIsEmpty(getClass_())
-				&& getJavaPersistentType() == null) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					JpaValidationMessages.PERSISTENT_TYPE_UNRESOLVED_CLASS,
-					new String[] {getClass_()},
-					this, 
-					this.getClassTextRange())
-			);
-		}
-	}
-
-	public TextRange getValidationTextRange() {
-		return this.typeMapping.getValidationTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericEntityMappings.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericEntityMappings.java
deleted file mode 100644
index 4b7293fb34..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericEntityMappings.java
+++ /dev/null
@@ -1,868 +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.core.internal.context.orm;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.core.JpaFile;
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.AccessType;
-import org.eclipse.jpt.core.context.Generator;
-import org.eclipse.jpt.core.context.NamedNativeQuery;
-import org.eclipse.jpt.core.context.NamedQuery;
-import org.eclipse.jpt.core.context.Query;
-import org.eclipse.jpt.core.context.QueryHolder;
-import org.eclipse.jpt.core.context.orm.EntityMappings;
-import org.eclipse.jpt.core.context.orm.OrmGenerator;
-import org.eclipse.jpt.core.context.orm.OrmNamedNativeQuery;
-import org.eclipse.jpt.core.context.orm.OrmNamedQuery;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.orm.OrmQuery;
-import org.eclipse.jpt.core.context.orm.OrmSequenceGenerator;
-import org.eclipse.jpt.core.context.orm.OrmStructureNodes;
-import org.eclipse.jpt.core.context.orm.OrmTableGenerator;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.context.orm.OrmXml;
-import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults;
-import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlEmbeddable;
-import org.eclipse.jpt.core.resource.orm.XmlEntity;
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass;
-import org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery;
-import org.eclipse.jpt.core.resource.orm.XmlNamedQuery;
-import org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator;
-import org.eclipse.jpt.core.resource.orm.XmlTableGenerator;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.CompositeIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericEntityMappings extends AbstractOrmJpaContextNode implements EntityMappings
-{
-	protected XmlEntityMappings xmlEntityMappings;
-	
-	protected String version;
-	
-	protected String description;
-
-	protected String package_;
-
-	protected String defaultSchema;
-
-	protected String specifiedSchema;
-
-	protected String defaultCatalog;
-
-	protected String specifiedCatalog;
-
-	protected AccessType defaultAccess;
-
-	protected AccessType specifiedAccess;
-		
-	protected final PersistenceUnitMetadata persistenceUnitMetadata;
-
-	protected final List<OrmPersistentType> persistentTypes;
-
-	protected final List<OrmSequenceGenerator> sequenceGenerators;
-	
-	protected final List<OrmTableGenerator> tableGenerators;
-
-	protected final List<OrmNamedQuery> namedQueries;
-
-	protected final List<OrmNamedNativeQuery> namedNativeQueries;
-
-
-	public GenericEntityMappings(OrmXml parent, XmlEntityMappings xmlEntityMappings) {
-		super(parent);
-		this.persistenceUnitMetadata = getJpaFactory().buildPersistenceUnitMetadata(this, xmlEntityMappings);
-		this.persistentTypes = new ArrayList<OrmPersistentType>();
-		this.sequenceGenerators = new ArrayList<OrmSequenceGenerator>();
-		this.tableGenerators = new ArrayList<OrmTableGenerator>();
-		this.namedQueries = new ArrayList<OrmNamedQuery>();
-		this.namedNativeQueries = new ArrayList<OrmNamedNativeQuery>();
-		this.initialize(xmlEntityMappings);
-	}
-	
-	public String getId() {
-		return OrmStructureNodes.ENTITY_MAPPINGS_ID;
-	}
-	
-	@Override
-	public EntityMappings getEntityMappings() {
-		return this;
-	}
-	
-	@Override
-	public OrmXml getParent() {
-		return (OrmXml) super.getParent();
-	}
-	
-	public OrmPersistentType getPersistentType(String fullyQualifiedTypeName) {
-		for (OrmPersistentType ormPersistentType : CollectionTools.iterable(ormPersistentTypes())) {
-			if (ormPersistentType.isFor(fullyQualifiedTypeName)) {
-				return ormPersistentType;
-			}
-		}
-		return null;
-	}
-
-	public PersistenceUnitMetadata getPersistenceUnitMetadata() {
-		return this.persistenceUnitMetadata;
-	}
-
-	public String getPackage() {
-		return this.package_;
-	}
-	
-	public void setPackage(String newPackage) {
-		String oldPackage = this.package_;
-		this.package_ = newPackage;
-		this.xmlEntityMappings.setPackage(newPackage);
-		firePropertyChanged(PACKAGE_PROPERTY, oldPackage, newPackage);
-	}
-
-	public String getVersion() {
-		return this.version;
-	}
-
-	public String getDescription() {
-		return this.description;
-	}
-
-	public void setDescription(String newDescription) {
-		String oldDescription = this.description;
-		this.description = newDescription;
-		this.xmlEntityMappings.setDescription(newDescription);
-		firePropertyChanged(DESCRIPTION_PROPERTY, oldDescription, newDescription);
-	}
-
-	public String getDefaultSchema() {
-		return this.defaultSchema;
-	}
-
-	protected void setDefaultSchema(String newDefaultSchema) {
-		String oldDefaultSchema = this.defaultSchema;
-		this.defaultSchema = newDefaultSchema;
-		firePropertyChanged(DEFAULT_SCHEMA_PROPERTY, oldDefaultSchema, newDefaultSchema);
-	}
-
-	public String getSpecifiedSchema() {
-		return this.specifiedSchema;
-	}
-
-	public void setSpecifiedSchema(String newSpecifiedSchema) {
-		String oldSpecifiedSchema = this.specifiedSchema;
-		this.specifiedSchema = newSpecifiedSchema;
-		this.xmlEntityMappings.setSchema(newSpecifiedSchema);
-		firePropertyChanged(SPECIFIED_SCHEMA_PROPERTY, oldSpecifiedSchema, newSpecifiedSchema);
-	}
-
-	public String getSchema() {
-		return (this.getSpecifiedSchema() == null) ? this.getDefaultSchema() : this.getSpecifiedSchema();
-	}
-
-	public String getDefaultCatalog() {
-		return this.defaultCatalog;
-	}
-
-	protected void setDefaultCatalog(String newDefaultCatalog) {
-		String oldDefaultCatalog = this.defaultCatalog;
-		this.defaultCatalog = newDefaultCatalog;
-		firePropertyChanged(DEFAULT_CATALOG_PROPERTY, oldDefaultCatalog, newDefaultCatalog);
-	}
-
-	public String getSpecifiedCatalog() {
-		return this.specifiedCatalog;
-	}
-
-	public void setSpecifiedCatalog(String newSpecifiedCatalog) {
-		String oldSpecifiedCatalog = this.specifiedCatalog;
-		this.specifiedCatalog = newSpecifiedCatalog;
-		this.xmlEntityMappings.setCatalog(newSpecifiedCatalog);
-		firePropertyChanged(SPECIFIED_CATALOG_PROPERTY, oldSpecifiedCatalog, newSpecifiedCatalog);
-	}
-
-	public String getCatalog() {
-		return (this.getSpecifiedCatalog() == null) ? this.getDefaultCatalog() : this.getSpecifiedCatalog();
-	}
-	
-	public AccessType getAccess() {
-		return (this.getSpecifiedAccess() == null) ? this.getDefaultAccess() : this.getSpecifiedAccess();
-	}
-
-	public AccessType getDefaultAccess() {
-		return this.defaultAccess;
-	}
-
-	protected void setDefaultAccess(AccessType newDefaultAccess) {
-		AccessType oldDefaultAccess = this.defaultAccess;
-		this.defaultAccess = newDefaultAccess;
-		firePropertyChanged(DEFAULT_ACCESS_PROPERTY, oldDefaultAccess, newDefaultAccess);
-	}
-
-	public AccessType getSpecifiedAccess() {
-		return this.specifiedAccess;
-	}
-
-	public void setSpecifiedAccess(AccessType newSpecifiedAccess) {
-		AccessType oldSpecifiedAccess = this.specifiedAccess;
-		this.specifiedAccess = newSpecifiedAccess;
-		this.xmlEntityMappings.setAccess(AccessType.toXmlResourceModel(newSpecifiedAccess));
-		firePropertyChanged(SPECIFIED_ACCESS_PROPERTY, oldSpecifiedAccess, newSpecifiedAccess);
-	}
-
-	public ListIterator<OrmPersistentType> ormPersistentTypes() {
-		return new CloneListIterator<OrmPersistentType>(this.persistentTypes);
-	}
-	
-	public int ormPersistentTypesSize() {
-		return this.persistentTypes.size();
-	}
-	
-	public OrmPersistentType addOrmPersistentType(String mappingKey, String className) {
-		OrmPersistentType persistentType = getJpaFactory().buildOrmPersistentType(this, mappingKey);
-		int index = insertionIndex(persistentType);
-		this.persistentTypes.add(index, persistentType);
-		if (className.startsWith(getPackage() + ".")) {
-			// adds short name if package name is specified
-			className = className.substring(getPackage().length() + 1);
-		}
-		AbstractXmlTypeMapping typeMapping = persistentType.getMapping().addToResourceModel(this.xmlEntityMappings);
-		typeMapping.setClassName(className);
-		fireItemAdded(PERSISTENT_TYPES_LIST, index, persistentType);
-		return persistentType;
-	}
-	
-	protected void addOrmPersistentType(OrmPersistentType ormPersistentType) { 
-		addItemToList(ormPersistentType, this.persistentTypes, PERSISTENT_TYPES_LIST);
-	}
-
-	protected int insertionIndex(OrmPersistentType ormPersistentType) {
-		return CollectionTools.insertionIndexOf(this.persistentTypes, ormPersistentType, buildMappingComparator());
-	}
-
-	private Comparator<OrmPersistentType> buildMappingComparator() {
-		return new Comparator<OrmPersistentType>() {
-			public int compare(OrmPersistentType o1, OrmPersistentType o2) {
-				int o1Sequence = o1.getMapping().getXmlSequence();
-				int o2Sequence = o2.getMapping().getXmlSequence();
-				if (o1Sequence < o2Sequence) {
-					return -1;
-				}
-				if (o1Sequence == o2Sequence) {
-					return 0;
-				}
-				return 1;
-			}
-		};
-	}
-
-	public void removeOrmPersistentType(int index) {
-		OrmPersistentType ormPersistentType = this.persistentTypes.get(index);
-		ormPersistentType.dispose();
-		this.persistentTypes.remove(index);
-		ormPersistentType.getMapping().removeFromResourceModel(this.xmlEntityMappings);
-		fireItemRemoved(PERSISTENT_TYPES_LIST, index, ormPersistentType);		
-	}
-	
-	public void removeOrmPersistentType(OrmPersistentType ormPersistentType) {
-		removeOrmPersistentType(this.persistentTypes.indexOf(ormPersistentType));	
-	}
-	
-	protected void removeOrmPersistentType_(OrmPersistentType ormPersistentType) {
-		ormPersistentType.dispose();
-		removeItemFromList(ormPersistentType, this.persistentTypes, PERSISTENT_TYPES_LIST);
-	}
-
-	public void changeMapping(OrmPersistentType ormPersistentType, OrmTypeMapping oldMapping, OrmTypeMapping newMapping) {
-		ormPersistentType.dispose();
-		int sourceIndex = this.persistentTypes.indexOf(ormPersistentType);
-		this.persistentTypes.remove(sourceIndex);
-		oldMapping.removeFromResourceModel(this.xmlEntityMappings);
-		int targetIndex = insertionIndex(ormPersistentType);
-		this.persistentTypes.add(targetIndex, ormPersistentType);
-		newMapping.addToResourceModel(this.xmlEntityMappings);
-		newMapping.initializeFrom(oldMapping);
-		//TODO are the source and target correct in this case, or is target off by one???
-		fireItemMoved(PERSISTENT_TYPES_LIST, targetIndex, sourceIndex);
-	}
-	
-	public ListIterator<OrmSequenceGenerator> sequenceGenerators() {
-		return new CloneListIterator<OrmSequenceGenerator>(this.sequenceGenerators);
-	}
-	
-	public int sequenceGeneratorsSize() {
-		return this.sequenceGenerators.size();
-	}
-	
-	public OrmSequenceGenerator addSequenceGenerator(int index) {
-		OrmSequenceGenerator ormSequenceGenerator = getJpaFactory().buildOrmSequenceGenerator(this);
-		this.sequenceGenerators.add(index, ormSequenceGenerator);
-		XmlSequenceGenerator sequenceGenerator = OrmFactory.eINSTANCE.createXmlSequenceGeneratorImpl();
-		ormSequenceGenerator.initialize(sequenceGenerator);
-		this.xmlEntityMappings.getSequenceGenerators().add(index, sequenceGenerator);
-		fireItemAdded(SEQUENCE_GENERATORS_LIST, index, ormSequenceGenerator);
-		return ormSequenceGenerator;
-	}
-
-	protected void addSequenceGenerator(int index, OrmSequenceGenerator sequenceGenerator) {
-		addItemToList(index, sequenceGenerator, this.sequenceGenerators, EntityMappings.SEQUENCE_GENERATORS_LIST);
-	}
-
-	public void removeSequenceGenerator(OrmSequenceGenerator sequenceGenerator) {
-		removeSequenceGenerator(this.sequenceGenerators.indexOf(sequenceGenerator));
-	}
-	
-	public void removeSequenceGenerator(int index) {
-		OrmSequenceGenerator removedSequenceGenerator = this.sequenceGenerators.remove(index);
-		fireItemRemoved(SEQUENCE_GENERATORS_LIST, index, removedSequenceGenerator);
-		this.xmlEntityMappings.getSequenceGenerators().remove(index);
-	}
-	
-	protected void removeSequenceGenerator_(OrmSequenceGenerator sequenceGenerator) {
-		removeItemFromList(sequenceGenerator, this.sequenceGenerators, EntityMappings.SEQUENCE_GENERATORS_LIST);
-	}
-
-	public void moveSequenceGenerator(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.sequenceGenerators, targetIndex, sourceIndex);
-		this.xmlEntityMappings.getSequenceGenerators().move(targetIndex, sourceIndex);
-		fireItemMoved(EntityMappings.SEQUENCE_GENERATORS_LIST, targetIndex, sourceIndex);	
-	}
-	
-	public ListIterator<OrmTableGenerator> tableGenerators() {
-		return new CloneListIterator<OrmTableGenerator>(this.tableGenerators);
-	}
-
-	public int tableGeneratorsSize() {
-		return this.tableGenerators.size();
-	}
-	
-	public OrmTableGenerator addTableGenerator(int index) {
-		OrmTableGenerator xmlTableGenerator = getJpaFactory().buildOrmTableGenerator(this);
-		this.tableGenerators.add(index, xmlTableGenerator);
-		XmlTableGenerator tableGenerator = OrmFactory.eINSTANCE.createXmlTableGeneratorImpl();
-		xmlTableGenerator.initialize(tableGenerator);
-		this.xmlEntityMappings.getTableGenerators().add(index, tableGenerator);
-		fireItemAdded(TABLE_GENERATORS_LIST, index, xmlTableGenerator);
-		return xmlTableGenerator;
-	}
-	
-	protected void addTableGenerator(int index, OrmTableGenerator tableGenerator) {
-		addItemToList(index, tableGenerator, this.tableGenerators, EntityMappings.TABLE_GENERATORS_LIST);
-	}
-
-	public void removeTableGenerator(OrmTableGenerator tableGenerator) {
-		removeTableGenerator(this.tableGenerators.indexOf(tableGenerator));
-	}
-
-	public void removeTableGenerator(int index) {
-		OrmTableGenerator removedTableGenerator = this.tableGenerators.remove(index);
-		this.xmlEntityMappings.getTableGenerators().remove(index);
-		fireItemRemoved(TABLE_GENERATORS_LIST, index, removedTableGenerator);
-	}
-	
-	protected void removeTableGenerator_(OrmTableGenerator tableGenerator) {
-		removeItemFromList(tableGenerator, this.tableGenerators, EntityMappings.TABLE_GENERATORS_LIST);
-	}
-
-	public void moveTableGenerator(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.tableGenerators, targetIndex, sourceIndex);
-		this.xmlEntityMappings.getTableGenerators().move(targetIndex, sourceIndex);
-		fireItemMoved(EntityMappings.TABLE_GENERATORS_LIST, targetIndex, sourceIndex);	
-	}
-
-	public ListIterator<OrmNamedQuery> namedQueries() {
-		return new CloneListIterator<OrmNamedQuery>(this.namedQueries);
-	}
-	
-	public int namedQueriesSize() {
-		return this.namedQueries.size();
-	}
-	
-	public OrmNamedQuery addNamedQuery(int index) {
-		OrmNamedQuery namedQuery = getJpaFactory().buildOrmNamedQuery(this);
-		this.namedQueries.add(index, namedQuery);
-		this.xmlEntityMappings.getNamedQueries().add(index, OrmFactory.eINSTANCE.createXmlNamedQuery());
-		this.fireItemAdded(QueryHolder.NAMED_QUERIES_LIST, index, namedQuery);
-		return namedQuery;
-	}
-	
-	protected void addNamedQuery(int index, OrmNamedQuery namedQuery) {
-		addItemToList(index, namedQuery, this.namedQueries, QueryHolder.NAMED_QUERIES_LIST);
-	}
-	
-	public void removeNamedQuery(NamedQuery namedQuery) {
-		this.removeNamedQuery(this.namedQueries.indexOf(namedQuery));
-	}
-
-	public void removeNamedQuery(int index) {
-		OrmNamedQuery namedQuery = this.namedQueries.remove(index);
-		this.xmlEntityMappings.getNamedQueries().remove(index);
-		fireItemRemoved(QueryHolder.NAMED_QUERIES_LIST, index, namedQuery);
-	}
-
-	protected void removeNamedQuery_(OrmNamedQuery namedQuery) {
-		removeItemFromList(namedQuery, this.namedQueries, QueryHolder.NAMED_QUERIES_LIST);
-	}
-	
-	public void moveNamedQuery(int targetIndex, int sourceIndex) {
-		this.xmlEntityMappings.getNamedQueries().move(targetIndex, sourceIndex);
-		moveItemInList(targetIndex, sourceIndex, this.namedQueries, QueryHolder.NAMED_QUERIES_LIST);		
-	}
-	
-	public ListIterator<OrmNamedNativeQuery> namedNativeQueries() {
-		return new CloneListIterator<OrmNamedNativeQuery>(this.namedNativeQueries);
-	}
-	
-	public int namedNativeQueriesSize() {
-		return this.namedNativeQueries.size();
-	}
-	
-	public OrmNamedNativeQuery addNamedNativeQuery(int index) {
-		OrmNamedNativeQuery namedNativeQuery = getJpaFactory().buildOrmNamedNativeQuery(this);
-		this.namedNativeQueries.add(index, namedNativeQuery);
-		this.xmlEntityMappings.getNamedNativeQueries().add(index, OrmFactory.eINSTANCE.createXmlNamedNativeQuery());
-		this.fireItemAdded(QueryHolder.NAMED_NATIVE_QUERIES_LIST, index, namedNativeQuery);
-		return namedNativeQuery;
-	}
-	
-	protected void addNamedNativeQuery(int index, OrmNamedNativeQuery namedNativeQuery) {
-		addItemToList(index, namedNativeQuery, this.namedNativeQueries, QueryHolder.NAMED_NATIVE_QUERIES_LIST);
-	}
-	
-	public void removeNamedNativeQuery(NamedNativeQuery namedNativeQuery) {
-		removeNamedNativeQuery(this.namedNativeQueries.indexOf(namedNativeQuery));
-	}
-
-	public void removeNamedNativeQuery(int index) {
-		OrmNamedNativeQuery namedNativeQuery = this.namedNativeQueries.remove(index);
-		this.xmlEntityMappings.getNamedNativeQueries().remove(index);
-		fireItemRemoved(QueryHolder.NAMED_NATIVE_QUERIES_LIST, index, namedNativeQuery);
-	}
-
-	protected void removeNamedNativeQuery_(OrmNamedNativeQuery namedNativeQuery) {
-		removeItemFromList(namedNativeQuery, this.namedNativeQueries, QueryHolder.NAMED_NATIVE_QUERIES_LIST);
-	}
-	
-	public void moveNamedNativeQuery(int targetIndex, int sourceIndex) {
-		this.xmlEntityMappings.getNamedNativeQueries().move(targetIndex, sourceIndex);
-		moveItemInList(targetIndex, sourceIndex, this.namedNativeQueries, QueryHolder.NAMED_NATIVE_QUERIES_LIST);		
-	}
-
-	//TODO what about qualified name?  package + class
-	//this needs to be handled both for className and persistentType.getName().
-	//moving on for now since I am just trying to get the ui compiled!  just a warning that this isn't good api
-	public boolean containsPersistentType(String className) {
-		for (OrmPersistentType persistentType : CollectionTools.iterable(ormPersistentTypes())) {
-			if (persistentType.getName().equals(className)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public PersistenceUnitDefaults getPersistenceUnitDefaults() {
-		return getPersistenceUnitMetadata().getPersistenceUnitDefaults();
-	}
-	
-	protected void initialize(XmlEntityMappings entityMappings) {
-		this.xmlEntityMappings = entityMappings;
-		this.version = entityMappings.getVersion();
-		this.description = entityMappings.getDescription();
-		this.package_ = entityMappings.getPackage();
-		this.specifiedSchema = entityMappings.getSchema();
-		this.specifiedCatalog = entityMappings.getCatalog();
-		this.specifiedAccess = this.specifiedAccess(entityMappings);
-		this.defaultAccess = getPersistenceUnit().getDefaultAccess();
-		this.defaultCatalog = getPersistenceUnit().getDefaultCatalog();
-		this.defaultSchema = getPersistenceUnit().getDefaultSchema();
-		this.initializePersistentTypes(entityMappings);
-		this.initializeTableGenerators(entityMappings);
-		this.initializeSequenceGenerators(entityMappings);
-		this.initializeNamedQueries(entityMappings);
-		this.initializeNamedNativeQueries(entityMappings);
-		this.updatePersistenceUnitGeneratorsAndQueries();
-	}
-	
-	protected void initializePersistentTypes(XmlEntityMappings entityMappings) {
-		this.initializeMappedSuperclasses(entityMappings);
-		this.initializeEntities(entityMappings);
-		this.initializeEmbeddables(entityMappings);
-	}
-	
-	protected void initializeMappedSuperclasses(XmlEntityMappings entityMappings) {
-		for (XmlMappedSuperclass mappedSuperclass : entityMappings.getMappedSuperclasses()) {
-			OrmPersistentType ormPersistentType = getJpaFactory().buildOrmPersistentType(this, MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY);
-			ormPersistentType.initialize(mappedSuperclass);
-			this.persistentTypes.add(ormPersistentType);
-		}	
-	}
-	
-	protected void initializeEntities(XmlEntityMappings entityMappings) {
-		for (XmlEntity entity : entityMappings.getEntities()) {
-			OrmPersistentType ormPersistentType = getJpaFactory().buildOrmPersistentType(this, MappingKeys.ENTITY_TYPE_MAPPING_KEY);
-			ormPersistentType.initialize(entity);
-			this.persistentTypes.add(ormPersistentType);
-		}				
-	}
-	
-	protected void initializeEmbeddables(XmlEntityMappings entityMappings) {
-		for (XmlEmbeddable embeddable : entityMappings.getEmbeddables()) {
-			OrmPersistentType ormPersistentType = getJpaFactory().buildOrmPersistentType(this, MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY);
-			ormPersistentType.initialize(embeddable);
-			this.persistentTypes.add(ormPersistentType);
-		}
-	}
-	
-	protected void initializeTableGenerators(XmlEntityMappings entityMappings) {
-		for (XmlTableGenerator tableGenerator : entityMappings.getTableGenerators()) {
-			this.tableGenerators.add(buildTableGenerator(tableGenerator));
-		}
-	}
-	
-	protected void initializeSequenceGenerators(XmlEntityMappings entityMappings) {
-		for (XmlSequenceGenerator sequenceGenerator : entityMappings.getSequenceGenerators()) {
-			this.sequenceGenerators.add(buildSequenceGenerator(sequenceGenerator));
-		}
-	}
-	
-	protected void initializeNamedQueries(XmlEntityMappings entityMappings) {
-		for (XmlNamedQuery namedQuery : entityMappings.getNamedQueries()) {
-			this.namedQueries.add(buildNamedQuery(namedQuery));
-		}
-	}
-	
-	protected void initializeNamedNativeQueries(XmlEntityMappings entityMappings) {
-		for (XmlNamedNativeQuery namedNativeQuery : entityMappings.getNamedNativeQueries()) {
-			this.namedNativeQueries.add(buildNamedNativeQuery(namedNativeQuery));
-		}
-	}
-
-	public void update(XmlEntityMappings entityMappings) {
-		this.xmlEntityMappings = entityMappings;
-		getJpaFile(entityMappings.getResource().getResourceModel()).addRootStructureNode(this.getMappingFileName(), this);
-		this.setDescription(entityMappings.getDescription());
-		this.setPackage(entityMappings.getPackage());
-		this.setSpecifiedSchema(entityMappings.getSchema());
-		this.setSpecifiedCatalog(entityMappings.getCatalog());
-		this.setSpecifiedAccess(this.specifiedAccess(entityMappings));
-		this.persistenceUnitMetadata.update(entityMappings);
-		this.setDefaultAccess(getPersistenceUnit().getDefaultAccess());
-		this.setDefaultCatalog(getPersistenceUnit().getDefaultCatalog());
-		this.setDefaultSchema(getPersistenceUnit().getDefaultSchema());
-		this.updatePersistentTypes(entityMappings);
-		this.updateTableGenerators(entityMappings);
-		this.updateSequenceGenerators(entityMappings);
-		this.updateNamedQueries(entityMappings);
-		this.updateNamedNativeQueries(entityMappings);
-		this.updatePersistenceUnitGeneratorsAndQueries();
-	}
-	
-	protected String getMappingFileName() {
-		return getParent().getParent().getFileName();
-	}
-	
-	protected AccessType specifiedAccess(XmlEntityMappings entityMappings) {
-		return AccessType.fromXmlResourceModel(entityMappings.getAccess());
-	}
-	
-	protected void updatePersistentTypes(XmlEntityMappings entityMappings) {
-		ListIterator<OrmPersistentType> ormPersistentTypes = this.ormPersistentTypes();
-		this.updateMappedSuperclasses(entityMappings, ormPersistentTypes);
-		this.updateEntities(entityMappings, ormPersistentTypes);
-		this.updateEmbeddables(entityMappings, ormPersistentTypes);
-		
-		while (ormPersistentTypes.hasNext()) {
-			this.removeOrmPersistentType_(ormPersistentTypes.next());
-		}		
-	}
-	
-	protected void updateMappedSuperclasses(XmlEntityMappings entityMappings, ListIterator<OrmPersistentType> ormPersistentTypes) {
-		ListIterator<XmlMappedSuperclass> mappedSuperclasses = new CloneListIterator<XmlMappedSuperclass>(entityMappings.getMappedSuperclasses());//prevent ConcurrentModificiationException
-		for (XmlMappedSuperclass mappedSuperclass :  CollectionTools.iterable(mappedSuperclasses)) {
-			if (ormPersistentTypes.hasNext()) {
-				ormPersistentTypes.next().update(mappedSuperclass);
-			}
-			else {
-				OrmPersistentType ormPersistentType = getJpaFactory().buildOrmPersistentType(this, MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY);
-				ormPersistentType.initialize(mappedSuperclass);
-				addOrmPersistentType(ormPersistentType);
-			}
-		}
-	}
-	
-	protected void updateEntities(XmlEntityMappings entityMappings, ListIterator<OrmPersistentType> ormPersistentTypes) {
-		ListIterator<XmlEntity> entities = new CloneListIterator<XmlEntity>(entityMappings.getEntities());//prevent ConcurrentModificiationException
-		for (XmlEntity entity : CollectionTools.iterable(entities)) {
-			if (ormPersistentTypes.hasNext()) {
-				ormPersistentTypes.next().update(entity);
-			}
-			else {
-				OrmPersistentType ormPersistentType = getJpaFactory().buildOrmPersistentType(this, MappingKeys.ENTITY_TYPE_MAPPING_KEY);
-				ormPersistentType.initialize(entity);
-				addOrmPersistentType(ormPersistentType);
-			}
-		}
-	}
-	
-	protected void updateEmbeddables(XmlEntityMappings entityMappings, ListIterator<OrmPersistentType> ormPersistentTypes) {
-		ListIterator<XmlEmbeddable> embeddables = new CloneListIterator<XmlEmbeddable>(entityMappings.getEmbeddables());//prevent ConcurrentModificiationException
-		for (XmlEmbeddable embeddable : CollectionTools.iterable(embeddables)) {
-			if (ormPersistentTypes.hasNext()) {
-				ormPersistentTypes.next().update(embeddable);
-			}
-			else {
-				OrmPersistentType ormPersistentType = getJpaFactory().buildOrmPersistentType(this, MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY);
-				ormPersistentType.initialize(embeddable);
-				addOrmPersistentType(ormPersistentType);
-			}
-		}
-	}
-	
-	protected void updateTableGenerators(XmlEntityMappings entityMappings) {
-		ListIterator<OrmTableGenerator> tableGenerators = tableGenerators();
-		ListIterator<XmlTableGenerator> resourceTableGenerators = new CloneListIterator<XmlTableGenerator>(entityMappings.getTableGenerators());//prevent ConcurrentModificiationException
-		while (tableGenerators.hasNext()) {
-			OrmTableGenerator tableGenerator = tableGenerators.next();
-			if (resourceTableGenerators.hasNext()) {
-				tableGenerator.update(resourceTableGenerators.next());
-			}
-			else {
-				removeTableGenerator_(tableGenerator);
-			}
-		}
-		
-		while (resourceTableGenerators.hasNext()) {
-			addTableGenerator(tableGeneratorsSize(), buildTableGenerator(resourceTableGenerators.next()));
-		}
-	}
-
-	protected OrmTableGenerator buildTableGenerator(XmlTableGenerator tableGeneratorResource) {
-		OrmTableGenerator tableGenerator = getJpaFactory().buildOrmTableGenerator(this);
-		tableGenerator.initialize(tableGeneratorResource);
-		return tableGenerator;
-	}
-
-	protected void updateSequenceGenerators(XmlEntityMappings entityMappings) {
-		ListIterator<OrmSequenceGenerator> sequenceGenerators = sequenceGenerators();
-		ListIterator<XmlSequenceGenerator> resourceSequenceGenerators = new CloneListIterator<XmlSequenceGenerator>(entityMappings.getSequenceGenerators());//prevent ConcurrentModificiationException
-		while (sequenceGenerators.hasNext()) {
-			OrmSequenceGenerator sequenceGenerator = sequenceGenerators.next();
-			if (resourceSequenceGenerators.hasNext()) {
-				sequenceGenerator.update(resourceSequenceGenerators.next());
-			}
-			else {
-				removeSequenceGenerator_(sequenceGenerator);
-			}
-		}
-		
-		while (resourceSequenceGenerators.hasNext()) {
-			addSequenceGenerator(sequenceGeneratorsSize(), buildSequenceGenerator(resourceSequenceGenerators.next()));
-		}
-	}
-
-	protected OrmSequenceGenerator buildSequenceGenerator(XmlSequenceGenerator sequenceGeneratorResource) {
-		OrmSequenceGenerator sequenceGenerator = getJpaFactory().buildOrmSequenceGenerator(this);
-		sequenceGenerator.initialize(sequenceGeneratorResource);
-		return sequenceGenerator;
-	}
-	
-	protected void updateNamedQueries(XmlEntityMappings entityMappings) {
-		ListIterator<OrmNamedQuery> namedQueries = namedQueries();
-		ListIterator<XmlNamedQuery> resourceNamedQueries = new CloneListIterator<XmlNamedQuery>(entityMappings.getNamedQueries());//prevent ConcurrentModificiationException
-		
-		while (namedQueries.hasNext()) {
-			OrmNamedQuery namedQuery = namedQueries.next();
-			if (resourceNamedQueries.hasNext()) {
-				namedQuery.update(resourceNamedQueries.next());
-			}
-			else {
-				removeNamedQuery_(namedQuery);
-			}
-		}
-		
-		while (resourceNamedQueries.hasNext()) {
-			addNamedQuery(namedQueriesSize(), buildNamedQuery(resourceNamedQueries.next()));
-		}
-	}
-
-	protected OrmNamedQuery buildNamedQuery(XmlNamedQuery namedQuery) {
-		OrmNamedQuery ormNamedQuery = getJpaFactory().buildOrmNamedQuery(this);
-		ormNamedQuery.initialize(namedQuery);
-		return ormNamedQuery;
-	}
-
-	protected void updateNamedNativeQueries(XmlEntityMappings entityMappings) {
-		ListIterator<OrmNamedNativeQuery> namedNativeQueries = namedNativeQueries();
-		ListIterator<XmlNamedNativeQuery> resourceNamedNativeQueries = new CloneListIterator<XmlNamedNativeQuery>(entityMappings.getNamedNativeQueries());//prevent ConcurrentModificiationException
-		
-		while (namedNativeQueries.hasNext()) {
-			OrmNamedNativeQuery namedQuery = namedNativeQueries.next();
-			if (resourceNamedNativeQueries.hasNext()) {
-				namedQuery.update(resourceNamedNativeQueries.next());
-			}
-			else {
-				removeNamedNativeQuery_(namedQuery);
-			}
-		}
-		
-		while (resourceNamedNativeQueries.hasNext()) {
-			addNamedNativeQuery(namedNativeQueriesSize(), buildNamedNativeQuery(resourceNamedNativeQueries.next()));
-		}
-	}
-
-	protected OrmNamedNativeQuery buildNamedNativeQuery(XmlNamedNativeQuery namedQuery) {
-		OrmNamedNativeQuery ormNamedNativeQuery =getJpaFactory().buildOrmNamedNativeQuery(this);
-		ormNamedNativeQuery.initialize(namedQuery);
-		return ormNamedNativeQuery;
-	}
-	
-	protected void updatePersistenceUnitGeneratorsAndQueries() {
-		for (Generator generator : CollectionTools.iterable(tableGenerators())) {
-			getPersistenceUnit().addGenerator(generator);
-		}
-		
-		for (Generator generator : CollectionTools.iterable(sequenceGenerators())) {
-			getPersistenceUnit().addGenerator(generator);
-		}
-		
-		for (Query query : CollectionTools.iterable(namedQueries())) {
-			getPersistenceUnit().addQuery(query);
-		}
-		
-		for (Query query : CollectionTools.iterable(namedNativeQueries())) {
-			getPersistenceUnit().addQuery(query);
-		}
-	}
-
-	
-	// *************************************************************************
-	
-	public JpaStructureNode getStructureNode(int textOffset) {
-		for (OrmPersistentType persistentType: CollectionTools.iterable(ormPersistentTypes())) {
-			if (persistentType.contains(textOffset)) {
-				return persistentType.getStructureNode(textOffset);
-			}
-		}
-		return this;
-	}
-	
-	public boolean containsOffset(int textOffset) {
-		if (this.xmlEntityMappings == null) {
-			return false;
-		}
-		return this.xmlEntityMappings.containsOffset(textOffset);
-	}
-	
-	public TextRange getSelectionTextRange() {
-		return this.xmlEntityMappings.getSelectionTextRange();
-	}
-	
-	public TextRange getValidationTextRange() {
-		return null;
-	}
-	
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		try {
-			addGeneratorMessages(messages);
-			addQueryMessages(messages);
-		} catch (Throwable exception) {
-			JptCorePlugin.log(exception);
-		}
-		for (OrmPersistentType ormPersistentType : CollectionTools.iterable(this.ormPersistentTypes())) {
-			try {
-				ormPersistentType.addToMessages(messages);
-			} catch (Throwable exception) {
-				JptCorePlugin.log(exception);			
-			}
-		}
-	}
-	
-	@SuppressWarnings("unchecked")
-	protected void addGeneratorMessages(List<IMessage> messages) {
-		List<Generator> masterList = CollectionTools.list(getPersistenceUnit().allGenerators());
-		
-		for (Iterator<OrmGenerator> stream = new CompositeIterator<OrmGenerator>(this.tableGenerators(), this.sequenceGenerators()); stream.hasNext() ; ) {
-			OrmGenerator current = stream.next();
-			masterList.remove(current);
-			
-			for (Generator each : masterList) {
-				if (! each.overrides(current) && each.getName() != null && each.getName().equals(current.getName())) {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.GENERATOR_DUPLICATE_NAME,
-							new String[] {current.getName()},
-							current,
-							current.getNameTextRange())
-					);
-				}
-			}
-			masterList.add(current);
-		}
-	}
-	
-	@SuppressWarnings("unchecked")
-	protected void addQueryMessages(List<IMessage> messages) {
-		List<Query> masterList = CollectionTools.list(getPersistenceUnit().allQueries());
-		
-		for (Iterator<OrmQuery> stream = new CompositeIterator<OrmQuery>(this.namedQueries(), this.namedNativeQueries()); stream.hasNext() ; ) {
-			OrmQuery current = stream.next();
-			masterList.remove(current);
-			
-			for (Query each : masterList) {
-				if (! each.overrides(current) && each.getName() != null && each.getName().equals(current.getName())) {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.QUERY_DUPLICATE_NAME,
-							new String[] {current.getName()},
-							current,
-							current.getNameTextRange())
-					);
-				}
-			}
-			masterList.add(current);
-		}
-	}
-	
-	public void dispose() {
-		if (this.xmlEntityMappings.getResource() != null) {
-			//the resource is null if the orm.xml file was deleted
-			//rootStructureNodes are cleared in the dispose of JpaFile
-			JpaFile jpaFile = getJpaFile(this.xmlEntityMappings.getResource().getResourceModel());
-		
-			if (jpaFile != null) {
-				//yes, this can also be null, seems that sometimes the resource is null and
-				//something it is not yet null, but we will have no jpaFile for it after a delete.
-				jpaFile.removeRootStructureNode(getMappingFileName());
-			}
-		}
-		//still need to dispose these even in the case of a file being deleted.  
-		//JpaFile.dispose() just removes the root structure nodes for this file, not other files (java files)
-		for (OrmPersistentType  ormPersistentType : CollectionTools.iterable(ormPersistentTypes())) {
-			ormPersistentType.dispose();
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAssociationOverride.java
deleted file mode 100644
index 92f2999299..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAssociationOverride.java
+++ /dev/null
@@ -1,257 +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.core.internal.context.orm;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.BaseJoinColumn;
-import org.eclipse.jpt.core.context.AssociationOverride;
-import org.eclipse.jpt.core.context.BaseOverride;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.TypeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAssociationOverride;
-import org.eclipse.jpt.core.context.orm.OrmJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
-import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-public class GenericOrmAssociationOverride extends AbstractOrmJpaContextNode
-	implements OrmAssociationOverride
-{
-
-	protected String name;
-
-	protected final List<OrmJoinColumn> specifiedJoinColumns;
-
-	protected final List<OrmJoinColumn> defaultJoinColumns;
-
-	private final AssociationOverride.Owner owner;
-
-	protected XmlAssociationOverride associationOverride;
-
-
-	public GenericOrmAssociationOverride(OrmJpaContextNode parent, AssociationOverride.Owner owner, XmlAssociationOverride associationOverride) {
-		super(parent);
-		this.owner = owner;
-		this.specifiedJoinColumns = new ArrayList<OrmJoinColumn>();
-		this.defaultJoinColumns = new ArrayList<OrmJoinColumn>();
-		this.initialize(associationOverride);
-	}
-	
-	public OrmAssociationOverride setVirtual(boolean virtual) {
-		return (OrmAssociationOverride) getOwner().setVirtual(virtual, this);
-	}
-	
-	public Owner getOwner() {
-		return this.owner;
-	}
-
-	// ********** IAssociationOverride implementation **********
-
-	public String getName() {
-		return this.name;
-	}
-	
-	public void setName(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		this.associationOverride.setName(newName);
-		firePropertyChanged(BaseOverride.NAME_PROPERTY, oldName, newName);
-	}
-
-
-	public ListIterator<OrmJoinColumn> joinColumns() {
-		return this.specifiedJoinColumns.isEmpty() ? this.defaultJoinColumns() : this.specifiedJoinColumns();
-	}
-	
-	public int joinColumnsSize() {
-		return this.specifiedJoinColumns.isEmpty() ? this.defaultJoinColumnsSize() : this.specifiedJoinColumnsSize();
-	}
-	
-	public ListIterator<OrmJoinColumn> defaultJoinColumns() {
-		return new CloneListIterator<OrmJoinColumn>(this.defaultJoinColumns);
-	}
-	
-	public int defaultJoinColumnsSize() {
-		return this.defaultJoinColumns.size();
-	}
-	
-	public ListIterator<OrmJoinColumn> specifiedJoinColumns() {
-		return new CloneListIterator<OrmJoinColumn>(this.specifiedJoinColumns);
-	}
-	
-	public int specifiedJoinColumnsSize() {
-		return this.specifiedJoinColumns.size();
-	}
-	
-	public OrmJoinColumn addSpecifiedJoinColumn(int index) {
-		OrmJoinColumn joinColumn = getJpaFactory().buildOrmJoinColumn(this, createJoinColumnOwner());
-		this.specifiedJoinColumns.add(index, joinColumn);
-		this.associationOverride.getJoinColumns().add(index, OrmFactory.eINSTANCE.createXmlJoinColumnImpl());
-		this.fireItemAdded(AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn);
-		return joinColumn;
-	}
-	
-	protected OrmJoinColumn.Owner createJoinColumnOwner() {
-		return new JoinColumnOwner();
-	}
-
-	protected void addSpecifiedJoinColumn(int index, OrmJoinColumn joinColumn) {
-		addItemToList(index, joinColumn, this.specifiedJoinColumns, AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST);
-	}
-	
-	public void removeSpecifiedJoinColumn(int index) {
-		OrmJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index);
-		this.associationOverride.getJoinColumns().remove(index);
-		fireItemRemoved(Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedJoinColumn);
-	}
-
-	protected void removeSpecifiedJoinColumn(OrmJoinColumn joinColumn) {
-		removeItemFromList(joinColumn, this.specifiedJoinColumns, AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST);
-	}
-	
-	public void moveSpecifiedJoinColumn(int targetIndex, int sourceIndex) {
-		this.associationOverride.getJoinColumns().move(targetIndex, sourceIndex);
-		moveItemInList(targetIndex, sourceIndex, this.specifiedJoinColumns, AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST);		
-	}
-
-	public boolean containsSpecifiedJoinColumns() {
-		return !this.specifiedJoinColumns.isEmpty();
-	}	
-
-	public boolean isVirtual() {
-		return getOwner().isVirtual(this);
-	}
-	
-	protected void initialize(XmlAssociationOverride associationOverride) {
-		this.associationOverride = associationOverride;
-		this.name = associationOverride.getName();
-		initializeSpecifiedJoinColumns(associationOverride);
-	}
-	
-	protected void initializeSpecifiedJoinColumns(XmlAssociationOverride associationOverride) {
-		for (XmlJoinColumn joinColumn : associationOverride.getJoinColumns()) {
-			this.specifiedJoinColumns.add(createJoinColumn(joinColumn));
-		}
-	}
-
-	public void update(XmlAssociationOverride associationOverride) {
-		this.associationOverride = associationOverride;
-		this.setName(associationOverride.getName());
-		updateSpecifiedJoinColumns(associationOverride);
-	}	
-	
-	protected void updateSpecifiedJoinColumns(XmlAssociationOverride associationOverride) {
-		ListIterator<OrmJoinColumn> joinColumns = specifiedJoinColumns();
-		ListIterator<XmlJoinColumn> resourceJoinColumns = new CloneListIterator<XmlJoinColumn>(associationOverride.getJoinColumns());//prevent ConcurrentModificiationException
-		
-		while (joinColumns.hasNext()) {
-			OrmJoinColumn joinColumn = joinColumns.next();
-			if (resourceJoinColumns.hasNext()) {
-				joinColumn.update(resourceJoinColumns.next());
-			}
-			else {
-				removeSpecifiedJoinColumn(joinColumn);
-			}
-		}
-		
-		while (resourceJoinColumns.hasNext()) {
-			addSpecifiedJoinColumn(specifiedJoinColumnsSize(), createJoinColumn(resourceJoinColumns.next()));
-		}
-	}
-	
-	protected OrmJoinColumn createJoinColumn(XmlJoinColumn joinColumn) {
-		OrmJoinColumn ormJoinColumn = getJpaFactory().buildOrmJoinColumn(this, new JoinColumnOwner());
-		ormJoinColumn.initialize(joinColumn);
-		return ormJoinColumn;
-	}
-
-	public TextRange getValidationTextRange() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	class JoinColumnOwner implements OrmJoinColumn.Owner
-	{
-
-		public JoinColumnOwner() {
-			super();
-		}
-
-		/**
-		 * by default, the join column is in the type mapping's primary table
-		 */
-		public String getDefaultTableName() {
-			return GenericOrmAssociationOverride.this.owner.getTypeMapping().getTableName();
-		}
-		
-		public String getDefaultColumnName() {
-			return null;
-		}
-		
-		public Entity getTargetEntity() {
-			RelationshipMapping relationshipMapping = getRelationshipMapping();
-			return relationshipMapping == null ? null : relationshipMapping.getResolvedTargetEntity();
-		}
-
-		public String getAttributeName() {
-			return GenericOrmAssociationOverride.this.getName();
-		}
-
-		public RelationshipMapping getRelationshipMapping() {
-			return GenericOrmAssociationOverride.this.owner.getRelationshipMapping(GenericOrmAssociationOverride.this.getName());
-		}
-
-		public boolean tableNameIsInvalid(String tableName) {
-			return getTypeMapping().tableNameIsInvalid(tableName);
-		}
-
-		/**
-		 * the join column can be on a secondary table
-		 */
-		public boolean tableIsAllowed() {
-			return true;
-		}
-
-		public TypeMapping getTypeMapping() {
-			return GenericOrmAssociationOverride.this.owner.getTypeMapping();
-		}
-
-		public Table getDbTable(String tableName) {
-			return getTypeMapping().getDbTable(tableName);
-		}
-
-		public Table getDbReferencedColumnTable() {
-			Entity targetEntity = getTargetEntity();
-			return (targetEntity == null) ? null : targetEntity.getPrimaryDbTable();
-		}
-		
-		public boolean isVirtual(BaseJoinColumn joinColumn) {
-			return GenericOrmAssociationOverride.this.defaultJoinColumns.contains(joinColumn);
-		}
-
-		public int joinColumnsSize() {
-			return GenericOrmAssociationOverride.this.joinColumnsSize();
-		}
-		
-		public TextRange getValidationTextRange() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAttributeOverride.java
deleted file mode 100644
index 5344708385..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAttributeOverride.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.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.AttributeOverride;
-import org.eclipse.jpt.core.context.BaseOverride;
-import org.eclipse.jpt.core.context.ColumnMapping;
-import org.eclipse.jpt.core.context.TypeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeOverride;
-import org.eclipse.jpt.core.context.orm.OrmColumn;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
-import org.eclipse.jpt.core.resource.orm.XmlColumn;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericOrmAttributeOverride extends AbstractOrmJpaContextNode
-	implements OrmAttributeOverride, OrmColumn.Owner
-{
-
-	protected String name;
-
-	private final Owner owner;
-
-	protected XmlAttributeOverride attributeOverride;
-	
-
-	protected final OrmColumn column;
-
-	public GenericOrmAttributeOverride(OrmJpaContextNode parent, AttributeOverride.Owner owner, XmlAttributeOverride xmlAttributeOverride) {
-		super(parent);
-		this.owner = owner;
-		this.column = getJpaFactory().buildOrmColumn(this, this);
-		this.initialize(xmlAttributeOverride);
-	}
-	@Override
-	public OrmJpaContextNode getParent() {
-		return (OrmJpaContextNode) super.getParent();
-	}
-
-	public OrmAttributeOverride setVirtual(boolean virtual) {
-		return (OrmAttributeOverride) getOwner().setVirtual(virtual, this);
-	}
-
-	public Owner getOwner() {
-		return this.owner;
-	}
-	
-	public String getName() {
-		return this.name;
-	}
-	
-	public void setName(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		this.attributeOverride.setName(newName);
-		firePropertyChanged(BaseOverride.NAME_PROPERTY, oldName, newName);
-	}
-
-	protected void setName_(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		firePropertyChanged(BaseOverride.NAME_PROPERTY, oldName, newName);
-	}
-
-	public OrmColumn getColumn() {
-		return this.column;
-	}
-
-	public TypeMapping getTypeMapping() {
-		return getOwner().getTypeMapping();
-	}
-
-	public Table getDbTable(String tablename) {
-		return this.getTypeMapping().getDbTable(getColumn().getTable());
-	}
-	
-	public String getDefaultColumnName() {
-		ColumnMapping columnMapping = getColumnMapping();
-		if (columnMapping == null) {
-			return null;
-		}
-		return columnMapping.getColumn().getName();
-	}
-	
-	public String getDefaultTableName() {
-		ColumnMapping columnMapping = getColumnMapping();
-		if (columnMapping == null) {
-			return null;
-		}
-		String tableName = columnMapping.getColumn().getSpecifiedTable();
-		if (tableName != null) {
-			return tableName;
-		}
-		return getOwner().getTypeMapping().getTableName();
-	}
-	
-	protected ColumnMapping getColumnMapping() {
-		return getOwner().getColumnMapping(getName());
-	}
-
-	public boolean isVirtual() {
-		return getOwner().isVirtual(this);
-	}
-
-	public TextRange getValidationTextRange() {
-		TextRange textRange = this.attributeOverride.getValidationTextRange();
-		return textRange == null ? getParent().getValidationTextRange() : textRange;
-	}
-
-
-	//***************** IXmlColumn.Owner implementation ****************
-	
-	public XmlColumn getColumnResource() {
-		return this.attributeOverride.getColumn();
-	}
-	
-	public void addColumnResource() {
-		this.attributeOverride.setColumn(OrmFactory.eINSTANCE.createXmlColumnImpl());
-	}
-	
-	public void removeColumnResource() {
-		this.attributeOverride.setColumn(null);
-	}
-	
-	
-	//***************** updating ****************
-	
-	protected void initialize(XmlAttributeOverride attributeOverride) {
-		this.attributeOverride = attributeOverride;
-		this.name = attributeOverride.getName();
-		this.column.initialize(attributeOverride.getColumn());
-	}
-	
-	public void update(XmlAttributeOverride attributeOverride) {
-		this.attributeOverride = attributeOverride;
-		this.setName_(attributeOverride.getName());
-		this.column.update(attributeOverride.getColumn());
-	}
-	
-	//****************** validation ********************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-	
-		addColumnMessages(messages);
-	}
-	
-	protected void addColumnMessages(List<IMessage> messages) {
-		OrmColumn column = getColumn();
-		String table = column.getTable();
-		boolean doContinue = connectionProfileIsActive();
-		
-		if (doContinue && getTypeMapping().tableNameIsInvalid(table)) {
-			if (isVirtual()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_TABLE,
-						new String[] {getName(), table, column.getName()},
-						column, 
-						column.getTableTextRange())
-				);
-			}
-			else {
-				messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.COLUMN_UNRESOLVED_TABLE,
-							new String[] {table, column.getName()}, 
-							column,
-							column.getTableTextRange())
-					);
-			}
-			doContinue = false;
-		}
-		
-		if (doContinue && !column.isResolved()) {
-			if (isVirtual()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_NAME,
-						new String[] {getName(), column.getName()}, 
-						column,
-						column.getNameTextRange())
-				);
-			}
-			else {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.COLUMN_UNRESOLVED_NAME,
-							new String[] {column.getName()}, 
-							column,
-							column.getNameTextRange())
-					);
-			}
-		}
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmBasicMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmBasicMapping.java
deleted file mode 100644
index c6634e32ea..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmBasicMapping.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.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.BasicMapping;
-import org.eclipse.jpt.core.context.ColumnMapping;
-import org.eclipse.jpt.core.context.EnumType;
-import org.eclipse.jpt.core.context.FetchType;
-import org.eclipse.jpt.core.context.Fetchable;
-import org.eclipse.jpt.core.context.Nullable;
-import org.eclipse.jpt.core.context.TemporalType;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmBasicMapping;
-import org.eclipse.jpt.core.context.orm.OrmColumn;
-import org.eclipse.jpt.core.context.orm.OrmColumnMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlBasic;
-import org.eclipse.jpt.core.resource.orm.XmlColumn;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericOrmBasicMapping extends AbstractOrmAttributeMapping<XmlBasic>
-	implements OrmBasicMapping
-{
-	protected final OrmColumn column;
-	
-	protected FetchType specifiedFetch;
-
-	protected Boolean specifiedOptional;
-	
-	protected EnumType specifiedEnumerated;
-		
-	protected TemporalType temporal;
-	
-	protected boolean lob;
-	
-	public GenericOrmBasicMapping(OrmPersistentAttribute parent) {
-		super(parent);
-		this.column = getJpaFactory().buildOrmColumn(this, this);
-	}
-
-	public FetchType getFetch() {
-		return (this.getSpecifiedFetch() == null) ? this.getDefaultFetch() : this.getSpecifiedFetch();
-	}
-
-	public FetchType getDefaultFetch() {
-		return BasicMapping.DEFAULT_FETCH_TYPE;
-	}
-
-	public FetchType getSpecifiedFetch() {
-		return this.specifiedFetch;
-	}
-	
-	public void setSpecifiedFetch(FetchType newSpecifiedFetch) {
-		FetchType oldFetch = this.specifiedFetch;
-		this.specifiedFetch = newSpecifiedFetch;
-		this.getAttributeMapping().setFetch(FetchType.toOrmResourceModel(newSpecifiedFetch));
-		firePropertyChanged(Fetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch);
-	}
-
-	protected void setSpecifiedFetch_(FetchType newSpecifiedFetch) {
-		FetchType oldFetch = this.specifiedFetch;
-		this.specifiedFetch = newSpecifiedFetch;
-		firePropertyChanged(Fetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch);
-	}
-
-	public Boolean getOptional() {
-		return (this.getSpecifiedOptional() == null) ? this.getDefaultOptional() : this.getSpecifiedOptional();
-	}
-	
-	public Boolean getDefaultOptional() {
-		return Nullable.DEFAULT_OPTIONAL;
-	}
-
-	public Boolean getSpecifiedOptional() {
-		return this.specifiedOptional;
-	}
-	
-	public void setSpecifiedOptional(Boolean newSpecifiedOptional) {
-		Boolean oldOptional = this.specifiedOptional;
-		this.specifiedOptional = newSpecifiedOptional;
-		this.getAttributeMapping().setOptional(newSpecifiedOptional);
-		firePropertyChanged(Nullable.SPECIFIED_OPTIONAL_PROPERTY, oldOptional, newSpecifiedOptional);
-	}
-	
-	protected void setSpecifiedOptional_(Boolean newSpecifiedOptional) {
-		Boolean oldOptional = this.specifiedOptional;
-		this.specifiedOptional = newSpecifiedOptional;
-		firePropertyChanged(Nullable.SPECIFIED_OPTIONAL_PROPERTY, oldOptional, newSpecifiedOptional);
-	}
-
-	public boolean isLob() {
-		return this.lob;
-	}
-
-	public void setLob(boolean newLob) {
-		boolean oldLob = this.lob;
-		this.lob = newLob;
-		this.getAttributeMapping().setLob(newLob);
-		firePropertyChanged(BasicMapping.LOB_PROPERTY, oldLob, newLob);
-	}
-	
-	protected void setLob_(boolean newLob) {
-		boolean oldLob = this.lob;
-		this.lob = newLob;
-		firePropertyChanged(BasicMapping.LOB_PROPERTY, oldLob, newLob);
-	}
-
-	public TemporalType getTemporal() {
-		return this.temporal;
-	}
-
-	public void setTemporal(TemporalType newTemporal) {
-		TemporalType oldTemporal = this.temporal;
-		this.temporal = newTemporal;
-		this.getAttributeMapping().setTemporal(TemporalType.toOrmResourceModel(newTemporal));
-		firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal);
-	}
-
-	protected void setTemporal_(TemporalType newTemporal) {
-		TemporalType oldTemporal = this.temporal;
-		this.temporal = newTemporal;
-		firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal);
-	}
-	
-	public EnumType getEnumerated() {
-		return (this.getSpecifiedEnumerated() == null) ? this.getDefaultEnumerated() : this.getSpecifiedEnumerated();
-	}
-	
-	public EnumType getDefaultEnumerated() {
-		return BasicMapping.DEFAULT_ENUMERATED;
-	}
-	
-	public EnumType getSpecifiedEnumerated() {
-		return this.specifiedEnumerated;
-	}
-	
-	public void setSpecifiedEnumerated(EnumType newSpecifiedEnumerated) {
-		EnumType oldEnumerated = this.specifiedEnumerated;
-		this.specifiedEnumerated = newSpecifiedEnumerated;
-		this.getAttributeMapping().setEnumerated(EnumType.toOrmResourceModel(newSpecifiedEnumerated));
-		firePropertyChanged(BasicMapping.SPECIFIED_ENUMERATED_PROPERTY, oldEnumerated, newSpecifiedEnumerated);
-	}
-	
-	protected void setSpecifiedEnumerated_(EnumType newSpecifiedEnumerated) {
-		EnumType oldEnumerated = this.specifiedEnumerated;
-		this.specifiedEnumerated = newSpecifiedEnumerated;
-		firePropertyChanged(BasicMapping.SPECIFIED_ENUMERATED_PROPERTY, oldEnumerated, newSpecifiedEnumerated);
-	}
-
-	public String getKey() {
-		return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmBasicMapping(this);
-	}
-
-
-	@Override
-	public void initializeFromXmlColumnMapping(OrmColumnMapping oldMapping) {
-		super.initializeFromXmlColumnMapping(oldMapping);
-		setTemporal(oldMapping.getTemporal());
-		getColumn().initializeFrom(oldMapping.getColumn());
-	}
-
-	public int getXmlSequence() {
-		return 2;
-	}
-
-	@Override
-	public boolean isOverridableAttributeMapping() {
-		return true;
-	}
-
-	public OrmColumn getColumn() {
-		return this.column;
-	}
-
-	public String getDefaultColumnName() {		
-		return getAttributeName();
-	}
-
-	public String getDefaultTableName() {
-		return getTypeMapping().getTableName();
-	}
-
-	public Table getDbTable(String tableName) {
-		return getTypeMapping().getDbTable(tableName);
-	}
-	
-	@Override
-	public void initialize(XmlBasic basic) {
-		super.initialize(basic);
-		this.specifiedFetch = this.specifiedFetch(basic);
-		this.specifiedOptional = this.specifiedOptional(basic);
-		this.specifiedEnumerated = this.specifiedEnumerated(basic);
-		this.temporal = this.specifiedTemporal(basic);
-		this.lob = specifiedLob(basic);
-		this.column.initialize(basic.getColumn());
-	}
-	
-	@Override
-	public void update(XmlBasic basic) {
-		super.update(basic);
-		this.setSpecifiedFetch_(this.specifiedFetch(basic));
-		this.setSpecifiedOptional_(this.specifiedOptional(basic));
-		this.setSpecifiedEnumerated_(this.specifiedEnumerated(basic));
-		this.setTemporal_(this.specifiedTemporal(basic));
-		this.setLob_(this.specifiedLob(basic));
-		this.column.update(basic.getColumn());
-	}
-	
-	protected Boolean specifiedOptional(XmlBasic basic) {
-		return basic.getOptional();
-	}
-	
-	protected FetchType specifiedFetch(XmlBasic basic) {
-		return FetchType.fromOrmResourceModel(basic.getFetch());
-	}
-	
-	protected EnumType specifiedEnumerated(XmlBasic basic) {
-		return EnumType.fromOrmResourceModel(basic.getEnumerated());
-	}
-	
-	protected TemporalType specifiedTemporal(XmlBasic basic) {
-		return TemporalType.fromOrmResourceModel(basic.getTemporal());
-	}
-
-	protected boolean specifiedLob(XmlBasic basic) {
-		return basic.isLob();
-	}
-	
-	public XmlBasic addToResourceModel(AbstractXmlTypeMapping typeMapping) {
-		XmlBasic basic = OrmFactory.eINSTANCE.createXmlBasicImpl();
-		getPersistentAttribute().initialize(basic);
-		typeMapping.getAttributes().getBasics().add(basic);
-		return basic;
-	}
-	
-	public void removeFromResourceModel(AbstractXmlTypeMapping typeMapping) {
-		typeMapping.getAttributes().getBasics().remove(this.getAttributeMapping());
-		if (typeMapping.getAttributes().isAllFeaturesUnset()) {
-			typeMapping.setAttributes(null);
-		}
-	}
-	
-	//***************** IXmlColumn.Owner implementation ****************
-	
-	public XmlColumn getColumnResource() {
-		return this.getAttributeMapping().getColumn();
-	}
-	
-	public void addColumnResource() {
-		this.getAttributeMapping().setColumn(OrmFactory.eINSTANCE.createXmlColumnImpl());
-	}
-	
-	public void removeColumnResource() {
-		this.getAttributeMapping().setColumn(null);
-	}
-	
-	// ****************** validation ****************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		if (entityOwned()) {
-			addColumnMessages(messages);
-		}
-	}
-	
-	protected void addColumnMessages(List<IMessage> messages) {
-		OrmColumn column = getColumn();
-		String table = column.getTable();
-		boolean doContinue = connectionProfileIsActive();
-		
-		if (doContinue && getTypeMapping().tableNameIsInvalid(table)) {
-			if (getPersistentAttribute().isVirtual()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_TABLE,
-						new String[] {getName(), table, column.getName()},
-						column, 
-						column.getTableTextRange())
-				);
-			}
-			else {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.COLUMN_UNRESOLVED_TABLE,
-						new String[] {table, column.getName()}, 
-						column, 
-						column.getTableTextRange())
-				);
-			}
-			doContinue = false;
-		}
-		
-		if (doContinue && ! column.isResolved()) {
-			if (getPersistentAttribute().isVirtual()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_NAME,
-						new String[] {getName(), column.getName()}, 
-						column, 
-						column.getNameTextRange())
-				);
-			}
-			else {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.COLUMN_UNRESOLVED_NAME,
-						new String[] {column.getName()}, 
-						column, 
-						column.getNameTextRange())
-				);
-			}
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmColumn.java
deleted file mode 100644
index bc664fff2c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmColumn.java
+++ /dev/null
@@ -1,191 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.Column;
-import org.eclipse.jpt.core.context.orm.OrmColumn;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.resource.orm.XmlColumn;
-
-public class GenericOrmColumn extends AbstractOrmBaseColumn<XmlColumn> implements OrmColumn
-{
-	protected Integer specifiedLength;
-
-	protected Integer specifiedPrecision;
-
-	protected Integer specifiedScale;
-
-	public GenericOrmColumn(OrmJpaContextNode parent, OrmColumn.Owner owner) {
-		super(parent, owner);
-	}
-	
-	@Override
-	public OrmColumn.Owner getOwner() {
-		return (OrmColumn.Owner) super.getOwner();
-	}
-	
-	public void initializeFrom(Column oldColumn) {
-		super.initializeFrom(oldColumn);
-		setSpecifiedLength(oldColumn.getSpecifiedLength());
-		setSpecifiedPrecision(oldColumn.getSpecifiedPrecision());
-		setSpecifiedScale(oldColumn.getSpecifiedScale());
-	}
-
-	public Integer getLength() {
-		return (this.getSpecifiedLength() == null) ? getDefaultLength() : this.getSpecifiedLength();
-	}
-
-	public Integer getDefaultLength() {
-		return Column.DEFAULT_LENGTH;
-	}
-
-	public Integer getSpecifiedLength() {
-		return this.specifiedLength;
-	}
-
-	public void setSpecifiedLength(Integer newSpecifiedLength) {
-		Integer oldSpecifiedLength = this.specifiedLength;
-		this.specifiedLength = newSpecifiedLength;
-		if (oldSpecifiedLength != newSpecifiedLength) {
-			if (this.getColumnResource() != null) {
-				this.getColumnResource().setLength(newSpecifiedLength);
-				if (this.getColumnResource().isAllFeaturesUnset()) {
-					removeColumnResource();
-				}
-			}
-			else if (newSpecifiedLength != null) {
-				addColumnResource();
-				getColumnResource().setLength(newSpecifiedLength);
-			}
-		}
-		firePropertyChanged(SPECIFIED_LENGTH_PROPERTY, oldSpecifiedLength, newSpecifiedLength);
-	}
-	
-	protected void setSpecifiedLength_(Integer newSpecifiedLength) {
-		Integer oldSpecifiedLength = this.specifiedLength;
-		this.specifiedLength = newSpecifiedLength;
-		firePropertyChanged(SPECIFIED_LENGTH_PROPERTY, oldSpecifiedLength, newSpecifiedLength);
-	}
-
-	public Integer getPrecision() {
-		return (this.getSpecifiedPrecision() == null) ? getDefaultPrecision() : this.getSpecifiedPrecision();
-	}
-
-	public Integer getDefaultPrecision() {
-		return Column.DEFAULT_PRECISION;
-	}
-	
-	public Integer getSpecifiedPrecision() {
-		return this.specifiedPrecision;
-	}
-
-	public void setSpecifiedPrecision(Integer newSpecifiedPrecision) {
-		Integer oldSpecifiedPrecision = this.specifiedPrecision;
-		this.specifiedPrecision = newSpecifiedPrecision;
-		if (oldSpecifiedPrecision != newSpecifiedPrecision) {
-			if (this.getColumnResource() != null) {
-				this.getColumnResource().setPrecision(newSpecifiedPrecision);
-				if (this.getColumnResource().isAllFeaturesUnset()) {
-					removeColumnResource();
-				}
-			}
-			else if (newSpecifiedPrecision != null) {
-				addColumnResource();
-				getColumnResource().setPrecision(newSpecifiedPrecision);
-			}
-		}
-		firePropertyChanged(SPECIFIED_PRECISION_PROPERTY, oldSpecifiedPrecision, newSpecifiedPrecision);
-	}
-	
-	protected void setSpecifiedPrecision_(Integer newSpecifiedPrecision) {
-		Integer oldSpecifiedPrecision = this.specifiedPrecision;
-		this.specifiedPrecision = newSpecifiedPrecision;
-		firePropertyChanged(SPECIFIED_PRECISION_PROPERTY, oldSpecifiedPrecision, newSpecifiedPrecision);
-	}
-
-	public Integer getScale() {
-		return (this.getSpecifiedScale() == null) ? getDefaultScale() : this.getSpecifiedScale();
-	}
-
-	public Integer getDefaultScale() {
-		return Column.DEFAULT_SCALE;
-	}
-	
-	public Integer getSpecifiedScale() {
-		return this.specifiedScale;
-	}
-
-	public void setSpecifiedScale(Integer newSpecifiedScale) {
-		Integer oldSpecifiedScale = this.specifiedScale;
-		this.specifiedScale = newSpecifiedScale;
-		if (oldSpecifiedScale != newSpecifiedScale) {
-			if (this.getColumnResource() != null) {
-				this.getColumnResource().setScale(newSpecifiedScale);
-				if (this.getColumnResource().isAllFeaturesUnset()) {
-					removeColumnResource();
-				}
-			}
-			else if (newSpecifiedScale != null) {
-				addColumnResource();
-				getColumnResource().setScale(newSpecifiedScale);
-			}
-		}
-		firePropertyChanged(SPECIFIED_SCALE_PROPERTY, oldSpecifiedScale, newSpecifiedScale);
-	}
-
-	protected void setSpecifiedScale_(Integer newSpecifiedScale) {
-		Integer oldSpecifiedScale = this.specifiedScale;
-		this.specifiedScale = newSpecifiedScale;
-		firePropertyChanged(SPECIFIED_SCALE_PROPERTY, oldSpecifiedScale, newSpecifiedScale);
-	}
-
-	@Override
-	protected XmlColumn getColumnResource() {
-		return getOwner().getColumnResource();
-	}
-	
-	@Override
-	protected void addColumnResource() {
-		getOwner().addColumnResource();
-	}
-	
-	@Override
-	protected void removeColumnResource() {
-		getOwner().removeColumnResource();
-	}
-	
-	@Override
-	public void initialize(XmlColumn column) {
-		super.initialize(column);
-		this.specifiedLength = this.specifiedLength(column);
-		this.specifiedPrecision = this.specifiedPrecision(column);
-		this.specifiedScale = this.specifiedScale(column);
-	}
-	
-	@Override
-	public void update(XmlColumn column) {
-		super.update(column);
-		this.setSpecifiedLength_(this.specifiedLength(column));
-		this.setSpecifiedPrecision_(this.specifiedPrecision(column));
-		this.setSpecifiedScale_(this.specifiedScale(column));
-	}
-
-	protected Integer specifiedLength(XmlColumn column) {
-		return column == null ? null : column.getLength();
-	}
-
-	protected Integer specifiedPrecision(XmlColumn column) {
-		return column == null ? null : column.getPrecision();
-	}
-	
-	protected Integer specifiedScale(XmlColumn column) {
-		return column == null ? null : column.getScale();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmDiscriminatorColumn.java
deleted file mode 100644
index 0cf8666e95..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmDiscriminatorColumn.java
+++ /dev/null
@@ -1,166 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.DiscriminatorColumn;
-import org.eclipse.jpt.core.context.DiscriminatorType;
-import org.eclipse.jpt.core.context.orm.OrmDiscriminatorColumn;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.context.orm.OrmNamedColumn;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn;
-import org.eclipse.jpt.core.resource.orm.XmlEntity;
-
-public class GenericOrmDiscriminatorColumn extends AbstractOrmNamedColumn<XmlDiscriminatorColumn>
-	implements OrmDiscriminatorColumn
-{
-
-	protected DiscriminatorType specifiedDiscriminatorType;
-	
-	protected DiscriminatorType defaultDiscriminatorType;
-
-	protected Integer specifiedLength;
-
-	protected XmlEntity entity;
-	
-	public GenericOrmDiscriminatorColumn(OrmJpaContextNode parent, OrmNamedColumn.Owner owner) {
-		super(parent, owner);
-	}
-
-	public DiscriminatorType getDiscriminatorType() {
-		return (this.getSpecifiedDiscriminatorType() == null) ? this.getDefaultDiscriminatorType() : this.getSpecifiedDiscriminatorType();
-	}
-
-	public DiscriminatorType getDefaultDiscriminatorType() {
-		return DiscriminatorColumn.DEFAULT_DISCRIMINATOR_TYPE;
-	}
-		
-	public DiscriminatorType getSpecifiedDiscriminatorType() {
-		return this.specifiedDiscriminatorType;
-	}
-	
-	public void setSpecifiedDiscriminatorType(DiscriminatorType newSpecifiedDiscriminatorType) {
-		DiscriminatorType oldDiscriminatorType = this.specifiedDiscriminatorType;
-		this.specifiedDiscriminatorType = newSpecifiedDiscriminatorType;
-		if (oldDiscriminatorType != newSpecifiedDiscriminatorType) {
-			if (this.getColumnResource() != null) {
-				this.getColumnResource().setDiscriminatorType(DiscriminatorType.toOrmResourceModel(newSpecifiedDiscriminatorType));
-				if (this.getColumnResource().isAllFeaturesUnset()) {
-					removeColumnResource();
-				}
-			}
-			else if (newSpecifiedDiscriminatorType != null) {
-				addColumnResource();
-				this.getColumnResource().setDiscriminatorType(DiscriminatorType.toOrmResourceModel(newSpecifiedDiscriminatorType));
-			}
-		}
-		firePropertyChanged(DiscriminatorColumn.SPECIFIED_DISCRIMINATOR_TYPE_PROPERTY, oldDiscriminatorType, newSpecifiedDiscriminatorType);
-	}
-	
-	protected void setSpecifiedDiscriminatorType_(DiscriminatorType newSpecifiedDiscriminatorType) {
-		DiscriminatorType oldDiscriminatorType = this.specifiedDiscriminatorType;
-		this.specifiedDiscriminatorType = newSpecifiedDiscriminatorType;
-		firePropertyChanged(DiscriminatorColumn.SPECIFIED_DISCRIMINATOR_TYPE_PROPERTY, oldDiscriminatorType, newSpecifiedDiscriminatorType);
-	}
-		
-	public Integer getLength() {
-		return (this.getSpecifiedLength() == null) ? this.getDefaultLength() : this.getSpecifiedLength();
-	}
-
-	public Integer getDefaultLength() {
-		return DiscriminatorColumn.DEFAULT_LENGTH;
-	}
-
-	public Integer getSpecifiedLength() {
-		return this.specifiedLength;
-	}
-
-	public void setSpecifiedLength(Integer newSpecifiedLength) {
-		Integer oldSpecifiedLength = this.specifiedLength;
-		this.specifiedLength = newSpecifiedLength;
-		if (oldSpecifiedLength != newSpecifiedLength) {
-			if (this.getColumnResource() != null) {
-				this.getColumnResource().setLength(newSpecifiedLength);
-				if (this.getColumnResource().isAllFeaturesUnset()) {
-					removeColumnResource();
-				}
-			}
-			else if (newSpecifiedLength != null) {
-				addColumnResource();
-				getColumnResource().setLength(newSpecifiedLength);
-			}
-		}
-		firePropertyChanged(SPECIFIED_LENGTH_PROPERTY, oldSpecifiedLength, newSpecifiedLength);
-	}
-
-	protected void setSpecifiedLength_(Integer newSpecifiedLength) {
-		Integer oldSpecifiedLength = this.specifiedLength;
-		this.specifiedLength = newSpecifiedLength;
-		firePropertyChanged(SPECIFIED_LENGTH_PROPERTY, oldSpecifiedLength, newSpecifiedLength);
-	}
-
-	@Override
-	protected String tableName() {
-		return this.getOwner().getTypeMapping().getTableName();
-	}
-
-	
-	
-	@Override
-	protected XmlDiscriminatorColumn getColumnResource() {
-		return this.entity.getDiscriminatorColumn();
-	}
-	
-	@Override
-	protected void addColumnResource() {
-		this.entity.setDiscriminatorColumn(OrmFactory.eINSTANCE.createXmlDiscriminatorColumn());		
-	}
-	
-	@Override
-	protected void removeColumnResource() {
-		this.entity.setDiscriminatorColumn(null);
-	}
-	
-	public void initialize(XmlEntity entity) {
-		this.entity = entity;
-		this.initialize(this.getColumnResource());
-	}
-	
-	public void update(XmlEntity entity) {
-		this.entity = entity;
-		this.update(this.getColumnResource());
-	}
-
-	
-	@Override
-	protected void initialize(XmlDiscriminatorColumn column) {
-		super.initialize(column);
-		this.specifiedLength = this.specifiedLength(column);
-		this.specifiedDiscriminatorType = this.specifiedDiscriminatorType(column);
-		//TODO defaultLength, discriminator type java column
-	}
-	
-	@Override
-	protected void update(XmlDiscriminatorColumn column) {
-		super.update(column);
-		this.setSpecifiedLength_(this.specifiedLength(column));
-		this.setSpecifiedDiscriminatorType_(this.specifiedDiscriminatorType(column));
-		//TODO defaultLength, scale, precision from java column
-	}
-	
-	protected Integer specifiedLength(XmlDiscriminatorColumn column) {
-		return column == null ? null : column.getLength();
-	}
-	
-	protected DiscriminatorType specifiedDiscriminatorType(XmlDiscriminatorColumn column) {
-		return column == null ? null : DiscriminatorType.fromOrmResourceModel(column.getDiscriminatorType());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddable.java
deleted file mode 100644
index 437e498d60..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddable.java
+++ /dev/null
@@ -1,71 +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.core.internal.context.orm;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.Table;
-import org.eclipse.jpt.core.context.orm.OrmEmbeddable;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlEmbeddable;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-
-
-public class GenericOrmEmbeddable extends AbstractOrmTypeMapping<XmlEmbeddable> implements OrmEmbeddable
-{
-	public GenericOrmEmbeddable(OrmPersistentType parent) {
-		super(parent);
-	}
-	
-	public String getKey() {
-		return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY;
-	}
-
-	public boolean tableNameIsInvalid(String tableName) {
-		return false;
-	}
-
-	public Iterator<String> associatedTableNamesIncludingInherited() {
-		return EmptyIterator.instance();
-	}
-
-	public Iterator<Table> associatedTables() {
-		return EmptyIterator.instance();
-	}
-
-	public Iterator<Table> associatedTablesIncludingInherited() {
-		return EmptyIterator.instance();
-	}
-
-	public int getXmlSequence() {
-		return 2;
-	}
-
-	@Override
-	public boolean attributeMappingKeyAllowed(String attributeMappingKey) {
-		return attributeMappingKey == MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY || attributeMappingKey == MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	protected Boolean metadataComplete(XmlEmbeddable embeddable) {
-		return embeddable.getMetadataComplete();
-	}
-	
-	public void removeFromResourceModel(XmlEntityMappings entityMappings) {
-		entityMappings.getEmbeddables().remove(this.getTypeMappingResource());
-	}
-
-	public XmlEmbeddable addToResourceModel(XmlEntityMappings entityMappings) {
-		XmlEmbeddable embeddable = OrmFactory.eINSTANCE.createXmlEmbeddable();
-		getPersistentType().initialize(embeddable);
-		entityMappings.getEmbeddables().add(embeddable);
-		return embeddable;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddedIdMapping.java
deleted file mode 100644
index d39b238566..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddedIdMapping.java
+++ /dev/null
@@ -1,70 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmEmbeddedIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlEmbeddedId;
-
-
-public class GenericOrmEmbeddedIdMapping extends AbstractOrmBaseEmbeddedMapping<XmlEmbeddedId> implements OrmEmbeddedIdMapping
-{
-
-	public GenericOrmEmbeddedIdMapping(OrmPersistentAttribute parent) {
-		super(parent);
-	}
-
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmEmbeddedIdMapping(this);
-	}
-	
-	public int getXmlSequence() {
-		return 1;
-	}
-	
-	//*************** AttributeMapping implementation *********************
-	
-	public String getKey() {
-		return MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	@Override
-	public boolean isIdMapping() {
-		return true;
-	}
-
-	public XmlEmbeddedId addToResourceModel(AbstractXmlTypeMapping typeMapping) {
-		XmlEmbeddedId embeddedId = OrmFactory.eINSTANCE.createXmlEmbeddedIdImpl();
-		getPersistentAttribute().initialize(embeddedId);
-		typeMapping.getAttributes().getEmbeddedIds().add(embeddedId);
-		return embeddedId;
-	}
-	
-	public void removeFromResourceModel(AbstractXmlTypeMapping typeMapping) {
-		typeMapping.getAttributes().getEmbeddedIds().remove(this.getAttributeMapping());
-		if (typeMapping.getAttributes().isAllFeaturesUnset()) {
-			typeMapping.setAttributes(null);
-		}
-	}
-	
-	@Override
-	public void initialize(XmlEmbeddedId embedded) {
-		super.initialize(embedded);
-	}
-	
-	@Override
-	public void update(XmlEmbeddedId embedded) {
-		super.update(embedded);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddedMapping.java
deleted file mode 100644
index 62d01d0053..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddedMapping.java
+++ /dev/null
@@ -1,63 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmEmbeddedMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlEmbedded;
-
-
-public class GenericOrmEmbeddedMapping extends AbstractOrmBaseEmbeddedMapping<XmlEmbedded> implements OrmEmbeddedMapping
-{
-	
-	public GenericOrmEmbeddedMapping(OrmPersistentAttribute parent) {
-		super(parent);
-	}
-
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmEmbeddedMapping(this);
-	}
-
-	public int getXmlSequence() {
-		return 8;
-	}
-
-	public String getKey() {
-		return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public XmlEmbedded addToResourceModel(AbstractXmlTypeMapping typeMapping) {
-		XmlEmbedded embedded = OrmFactory.eINSTANCE.createXmlEmbeddedImpl();
-		getPersistentAttribute().initialize(embedded);
-		typeMapping.getAttributes().getEmbeddeds().add(embedded);
-		return embedded;
-	}
-
-	public void removeFromResourceModel(AbstractXmlTypeMapping typeMapping) {
-		typeMapping.getAttributes().getEmbeddeds().remove(this.getAttributeMapping());
-		if (typeMapping.getAttributes().isAllFeaturesUnset()) {
-			typeMapping.setAttributes(null);
-		}
-	}
-	
-	@Override
-	public void initialize(XmlEmbedded embedded) {
-		super.initialize(embedded);
-	}
-	
-	@Override
-	public void update(XmlEmbedded embedded) {
-		super.update(embedded);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEntity.java
deleted file mode 100644
index 3637306b43..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEntity.java
+++ /dev/null
@@ -1,1988 +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.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.MappingKeys;
-import org.eclipse.jpt.core.context.AssociationOverride;
-import org.eclipse.jpt.core.context.AttributeOverride;
-import org.eclipse.jpt.core.context.BaseJoinColumn;
-import org.eclipse.jpt.core.context.BaseOverride;
-import org.eclipse.jpt.core.context.ColumnMapping;
-import org.eclipse.jpt.core.context.DiscriminatorColumn;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.Generator;
-import org.eclipse.jpt.core.context.IdClass;
-import org.eclipse.jpt.core.context.InheritanceType;
-import org.eclipse.jpt.core.context.NamedNativeQuery;
-import org.eclipse.jpt.core.context.NamedQuery;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.context.PersistentType;
-import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.Query;
-import org.eclipse.jpt.core.context.QueryHolder;
-import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.SecondaryTable;
-import org.eclipse.jpt.core.context.Table;
-import org.eclipse.jpt.core.context.TypeMapping;
-import org.eclipse.jpt.core.context.java.JavaAttributeOverride;
-import org.eclipse.jpt.core.context.java.JavaEntity;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.context.java.JavaPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaSecondaryTable;
-import org.eclipse.jpt.core.context.orm.OrmAssociationOverride;
-import org.eclipse.jpt.core.context.orm.OrmAttributeOverride;
-import org.eclipse.jpt.core.context.orm.OrmBaseJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmDiscriminatorColumn;
-import org.eclipse.jpt.core.context.orm.OrmEntity;
-import org.eclipse.jpt.core.context.orm.OrmGenerator;
-import org.eclipse.jpt.core.context.orm.OrmNamedColumn;
-import org.eclipse.jpt.core.context.orm.OrmNamedNativeQuery;
-import org.eclipse.jpt.core.context.orm.OrmNamedQuery;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.orm.OrmPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmQuery;
-import org.eclipse.jpt.core.context.orm.OrmSecondaryTable;
-import org.eclipse.jpt.core.context.orm.OrmSequenceGenerator;
-import org.eclipse.jpt.core.context.orm.OrmTable;
-import org.eclipse.jpt.core.context.orm.OrmTableGenerator;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.resource.orm.Inheritance;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
-import org.eclipse.jpt.core.resource.orm.XmlColumn;
-import org.eclipse.jpt.core.resource.orm.XmlEntity;
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.core.resource.orm.XmlIdClass;
-import org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery;
-import org.eclipse.jpt.core.resource.orm.XmlNamedQuery;
-import org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.resource.orm.XmlSecondaryTable;
-import org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator;
-import org.eclipse.jpt.core.resource.orm.XmlTableGenerator;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.utility.internal.ClassTools;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.CompositeIterator;
-import org.eclipse.jpt.utility.internal.iterators.CompositeListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-import org.eclipse.jpt.utility.internal.iterators.SingleElementIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implements OrmEntity
-{
-	protected String specifiedName;
-
-	protected String defaultName;
-
-	protected String idClass;
-
-	protected final OrmTable table;
-
-	protected final List<OrmSecondaryTable> specifiedSecondaryTables;
-	
-	protected final List<OrmSecondaryTable> virtualSecondaryTables;
-	
-	protected final List<OrmPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns;
-	
-	protected final List<OrmPrimaryKeyJoinColumn> defaultPrimaryKeyJoinColumns;
-
-	protected InheritanceType specifiedInheritanceStrategy;
-	
-	protected InheritanceType defaultInheritanceStrategy;
-
-	protected String defaultDiscriminatorValue;
-
-	protected String specifiedDiscriminatorValue;
-
-	protected boolean discriminatorValueAllowed;
-
-	protected final OrmDiscriminatorColumn discriminatorColumn;
-
-	protected OrmSequenceGenerator sequenceGenerator;
-
-	protected OrmTableGenerator tableGenerator;
-
-	protected final List<OrmAttributeOverride> specifiedAttributeOverrides;
-	
-	protected final List<OrmAttributeOverride> virtualAttributeOverrides;
-
-	protected final List<OrmAssociationOverride> specifiedAssociationOverrides;
-
-	protected final List<OrmAssociationOverride> virtualAssociationOverrides;
-
-	protected final List<OrmNamedQuery> namedQueries;
-
-	protected final List<OrmNamedNativeQuery> namedNativeQueries;
-
-	public GenericOrmEntity(OrmPersistentType parent) {
-		super(parent);
-		this.table = getJpaFactory().buildOrmTable(this);
-		this.specifiedSecondaryTables = new ArrayList<OrmSecondaryTable>();
-		this.virtualSecondaryTables = new ArrayList<OrmSecondaryTable>();
-		this.discriminatorColumn = buildDiscriminatorColumn();
-		this.specifiedPrimaryKeyJoinColumns = new ArrayList<OrmPrimaryKeyJoinColumn>();
-		this.defaultPrimaryKeyJoinColumns = new ArrayList<OrmPrimaryKeyJoinColumn>();
-		this.specifiedAttributeOverrides = new ArrayList<OrmAttributeOverride>();
-		this.virtualAttributeOverrides = new ArrayList<OrmAttributeOverride>();
-		this.specifiedAssociationOverrides = new ArrayList<OrmAssociationOverride>();
-		this.virtualAssociationOverrides = new ArrayList<OrmAssociationOverride>();
-		this.namedQueries = new ArrayList<OrmNamedQuery>();
-		this.namedNativeQueries = new ArrayList<OrmNamedNativeQuery>();
-	}
-	
-	protected OrmDiscriminatorColumn buildDiscriminatorColumn() {
-		return getJpaFactory().buildOrmDiscriminatorColumn(this, buildDiscriminatorColumnOwner());
-	}
-	
-	protected OrmNamedColumn.Owner buildDiscriminatorColumnOwner() {
-		return new OrmNamedColumn.Owner(){
-			public org.eclipse.jpt.db.Table getDbTable(String tableName) {
-				return GenericOrmEntity.this.getDbTable(tableName);
-			}
-
-			public TypeMapping getTypeMapping() {
-				return GenericOrmEntity.this;
-			}
-			
-			public String getDefaultColumnName() {
-				//TODO default column name from java here or in XmlDiscriminatorColumn?
-				return DiscriminatorColumn.DEFAULT_NAME;
-			}
-			
-			public TextRange getValidationTextRange() {
-				// TODO Auto-generated method stub
-				return null;
-			}
-			
-		};
-	}
-
-	// ******************* ITypeMapping implementation ********************
-
-	public String getKey() {
-		return MappingKeys.ENTITY_TYPE_MAPPING_KEY;
-	}	
-
-	@Override
-	public String getTableName() {
-		return getTable().getName();
-	}
-	
-	@Override
-	public org.eclipse.jpt.db.Table getPrimaryDbTable() {
-		return getTable().getDbTable();
-	}
-
-	@Override
-	public org.eclipse.jpt.db.Table getDbTable(String tableName) {
-		for (Iterator<Table> stream = this.associatedTablesIncludingInherited(); stream.hasNext();) {
-			org.eclipse.jpt.db.Table dbTable = stream.next().getDbTable();
-			if (dbTable != null && dbTable.matchesShortJavaClassName(tableName)) {
-				return dbTable;
-			}
-		}
-		return null;
-	}
-	
-	@Override
-	public Schema getDbSchema() {
-		return getTable().getDbSchema();
-	}
-	
-	public JavaEntity getJavaEntity() {
-		JavaPersistentType javaPersistentType = getJavaPersistentType();
-		if (javaPersistentType != null && javaPersistentType.getMappingKey() == MappingKeys.ENTITY_TYPE_MAPPING_KEY) {
-			return (JavaEntity) javaPersistentType.getMapping();
-		}
-		return null;
-	}
-
-	public String getName() {
-		return (this.getSpecifiedName() == null) ? getDefaultName() : this.getSpecifiedName();
-	}
-
-	public String getSpecifiedName() {
-		return this.specifiedName;
-	}
-
-	public void setSpecifiedName(String newSpecifiedName) {
-		String oldSpecifiedName = this.specifiedName;
-		this.specifiedName = newSpecifiedName;
-		this.getTypeMappingResource().setName(newSpecifiedName);
-		firePropertyChanged(SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName);
-	}
-
-	public String getDefaultName() {
-		return this.defaultName;
-	}
-
-	protected void setDefaultName(String newDefaultName) {
-		String oldDefaultName = this.defaultName;
-		this.defaultName = newDefaultName;
-		firePropertyChanged(DEFAULT_NAME_PROPERTY, oldDefaultName, newDefaultName);
-	}
-
-	public OrmTable getTable() {
-		return this.table;
-	}
-
-	public ListIterator<OrmSecondaryTable> secondaryTables() {
-		if (specifiedSecondaryTablesSize() > 0) {
-			return specifiedSecondaryTables();
-		}
-		return virtualSecondaryTables();
-	}
-
-	public int secondaryTablesSize() {
-		if (specifiedSecondaryTablesSize() > 0) {
-			return specifiedSecondaryTablesSize();
-		}
-		return virtualSecondaryTablesSize();
-	}
-	
-	public ListIterator<OrmSecondaryTable> virtualSecondaryTables() {
-		return new CloneListIterator<OrmSecondaryTable>(this.virtualSecondaryTables);
-	}
-
-	public int virtualSecondaryTablesSize() {
-		return this.virtualSecondaryTables.size();
-	}
-	
-	protected void addVirtualSecondaryTable(OrmSecondaryTable secondaryTable) {
-		addItemToList(secondaryTable, this.virtualSecondaryTables, OrmEntity.VIRTUAL_SECONDARY_TABLES_LIST);
-	}
-	
-	protected void removeVirtualSecondaryTable(OrmSecondaryTable secondaryTable) {
-		removeItemFromList(secondaryTable, this.virtualSecondaryTables, OrmEntity.VIRTUAL_SECONDARY_TABLES_LIST);
-	}
-
-	public ListIterator<OrmSecondaryTable> specifiedSecondaryTables() {
-		return new CloneListIterator<OrmSecondaryTable>(this.specifiedSecondaryTables);
-	}
-
-	public int specifiedSecondaryTablesSize() {
-		return this.specifiedSecondaryTables.size();
-	}
-	
-	public OrmSecondaryTable addSpecifiedSecondaryTable(int index) {
-		if (!secondaryTablesDefinedInXml()) {
-			throw new IllegalStateException("Virtual secondary tables exist, must first call setSecondaryTablesDefinedInXml(true)");
-		}
-		XmlSecondaryTable secondaryTableResource = OrmFactory.eINSTANCE.createXmlSecondaryTableImpl();
-		OrmSecondaryTable secondaryTable =  buildSecondaryTable(secondaryTableResource);
-		this.specifiedSecondaryTables.add(index, secondaryTable);
-		getTypeMappingResource().getSecondaryTables().add(index, secondaryTableResource);
-		fireItemAdded(Entity.SPECIFIED_SECONDARY_TABLES_LIST, index, secondaryTable);
-		return secondaryTable;
-	}
-	
-	protected void addSpecifiedSecondaryTable(int index, OrmSecondaryTable secondaryTable) {
-		addItemToList(index, secondaryTable, this.specifiedSecondaryTables, Entity.SPECIFIED_SECONDARY_TABLES_LIST);
-	}
-	
-	public void removeSpecifiedSecondaryTable(SecondaryTable secondaryTable) {
-		this.removeSpecifiedSecondaryTable(this.specifiedSecondaryTables.indexOf(secondaryTable));
-	}
-	
-	public void removeSpecifiedSecondaryTable(int index) {
-		OrmSecondaryTable removedSecondaryTable = this.specifiedSecondaryTables.remove(index);
-		getTypeMappingResource().getSecondaryTables().remove(index);
-		fireItemRemoved(Entity.SPECIFIED_SECONDARY_TABLES_LIST, index, removedSecondaryTable);
-	}
-	
-	protected void removeSpecifiedSecondaryTable_(OrmSecondaryTable secondaryTable) {
-		removeItemFromList(secondaryTable, this.specifiedSecondaryTables, Entity.SPECIFIED_SECONDARY_TABLES_LIST);
-	}
-	
-	public void moveSpecifiedSecondaryTable(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.specifiedSecondaryTables, targetIndex, sourceIndex);
-		this.getTypeMappingResource().getSecondaryTables().move(targetIndex, sourceIndex);
-		fireItemMoved(Entity.SPECIFIED_SECONDARY_TABLES_LIST, targetIndex, sourceIndex);		
-	}
-	
-	public boolean containsSecondaryTable(String name) {
-		return containsSecondaryTable(name, secondaryTables());
-	}
-	
-	public boolean containsSpecifiedSecondaryTable(String name) {
-		return containsSecondaryTable(name, specifiedSecondaryTables());
-	}
-	
-	public boolean containsVirtualSecondaryTable(String name) {
-		return containsSecondaryTable(name, virtualSecondaryTables());
-	}
-	
-	public boolean containsVirtualSecondaryTable(OrmSecondaryTable secondaryTable) {
-		return this.virtualSecondaryTables.contains(secondaryTable);
-	}
-
-	protected boolean containsSecondaryTable(String name, ListIterator<OrmSecondaryTable> secondaryTables) {
-		for (OrmSecondaryTable secondaryTable : CollectionTools.iterable(secondaryTables)) {
-			String secondaryTableName = secondaryTable.getName();
-			if (secondaryTableName != null && secondaryTableName.equals(name)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public boolean secondaryTablesDefinedInXml() {
-		return virtualSecondaryTablesSize() == 0;
-	}
-	
-	public void setSecondaryTablesDefinedInXml(boolean defineInXml) {
-		if (defineInXml == secondaryTablesDefinedInXml()) {
-			return;
-		}
-		if (defineInXml) {
-			specifySecondaryTablesInXml();
-		}
-		else {
-			removeSecondaryTablesFromXml();
-		}
-	}
-	
-	/**
-	 * This is used to take all the java secondary tables and specify them in the xml.  You must
-	 * use setSecondaryTablesDefinedInXml(boolean) before calling addSpecifiedSecondaryTable().
-	 * 
-	 * Yes this code looks odd, but be careful making changes to it
-	 */
-	protected void specifySecondaryTablesInXml() {
-		if (virtualSecondaryTablesSize() != 0) {
-			List<OrmSecondaryTable> virtualSecondaryTables = CollectionTools.list(this.virtualSecondaryTables());
-			List<OrmSecondaryTable> virtualSecondaryTable2 = CollectionTools.list(this.virtualSecondaryTables());
-			//remove all the virtual secondary tables without firing change notification.
-			for (OrmSecondaryTable virtualSecondaryTable : CollectionTools.iterable(virtualSecondaryTables())) {
-				this.virtualSecondaryTables.remove(virtualSecondaryTable);				
-			}
-			//add specified secondary tables for each virtual secondary table. If the virtual secondary tables
-			//are not removed first, they will be removed as a side effect of adding the first specified secondary table.
-			//This screws up the change notification to the UI, since that change notification is in a different thread
-			for (OrmSecondaryTable virtualSecondaryTable : virtualSecondaryTable2) {
-				XmlSecondaryTable secondaryTableResource = OrmFactory.eINSTANCE.createXmlSecondaryTableImpl();
-				OrmSecondaryTable specifiedSecondaryTable =  buildSecondaryTable(secondaryTableResource);
-				this.specifiedSecondaryTables.add(specifiedSecondaryTable);
-				getTypeMappingResource().getSecondaryTables().add(secondaryTableResource);
-				specifiedSecondaryTable.initializeFrom(virtualSecondaryTable);
-			}
-			//fire change notification at the end
-			fireItemsRemoved(OrmEntity.VIRTUAL_SECONDARY_TABLES_LIST, 0, virtualSecondaryTables);
-			fireItemsAdded(Entity.SPECIFIED_SECONDARY_TABLES_LIST, 0, this.specifiedSecondaryTables);		
-		}
-	}
-	
-	protected void removeSecondaryTablesFromXml() {
-		if (specifiedSecondaryTablesSize() != 0) {
-			List<OrmSecondaryTable> specifiedSecondaryTables = CollectionTools.list(this.specifiedSecondaryTables());
-			for (OrmSecondaryTable specifiedSecondaryTable : CollectionTools.iterable(specifiedSecondaryTables())) {
-				int index = this.specifiedSecondaryTables.indexOf(specifiedSecondaryTable);
-				this.specifiedSecondaryTables.remove(specifiedSecondaryTable);
-				if (this.specifiedSecondaryTables.size() == 0) {
-					initializeVirtualSecondaryTables();
-				}
-				getTypeMappingResource().getSecondaryTables().remove(index);
-			}
-			fireItemsRemoved(Entity.SPECIFIED_SECONDARY_TABLES_LIST, 0, specifiedSecondaryTables);
-			if (this.virtualSecondaryTables.size() != 0) {
-				fireItemsAdded(OrmEntity.VIRTUAL_SECONDARY_TABLES_LIST, 0, this.virtualSecondaryTables);
-			}
-		}
-	}
-	
-	protected Iterator<String> tableNames(Iterator<Table> tables) {
-		return new TransformationIterator<Table, String>(tables) {
-			@Override
-			protected String transform(Table t) {
-				return t.getName();
-			}
-		};
-	}
-
-	public Iterator<String> associatedTableNamesIncludingInherited() {
-		return this.nonNullTableNames(this.associatedTablesIncludingInherited());
-	}
-
-	protected Iterator<String> nonNullTableNames(Iterator<Table> tables) {
-		return new FilteringIterator<String, String>(this.tableNames(tables)) {
-			@Override
-			protected boolean accept(String o) {
-				return o != null;
-			}
-		};
-	}
-
-	public Iterator<Table> associatedTables() {
-		return new CompositeIterator<Table>(this.getTable(), this.secondaryTables());
-	}
-
-	public Iterator<Table> associatedTablesIncludingInherited() {
-		return new CompositeIterator<Table>(new TransformationIterator<TypeMapping, Iterator<Table>>(this.inheritanceHierarchy()) {
-			@Override
-			protected Iterator<Table> transform(TypeMapping mapping) {
-				return new FilteringIterator<Table, Table>(mapping.associatedTables()) {
-					@Override
-					protected boolean accept(Table o) {
-						return true;
-						//TODO
-						//filtering these out so as to avoid the duplicate table, root and children share the same table
-						//return !(o instanceof SingleTableInheritanceChildTableImpl);
-					}
-				};
-			}
-		});
-	}
-
-	public boolean tableNameIsInvalid(String tableName) {
-		return !CollectionTools.contains(this.associatedTableNamesIncludingInherited(), tableName);
-	}
-
-	public InheritanceType getInheritanceStrategy() {
-		return (this.getSpecifiedInheritanceStrategy() == null) ? this.getDefaultInheritanceStrategy() : this.getSpecifiedInheritanceStrategy();
-	}
-	
-	public InheritanceType getDefaultInheritanceStrategy() {
-		return this.defaultInheritanceStrategy;
-	}
-	
-	protected void setDefaultInheritanceStrategy(InheritanceType newInheritanceType) {
-		InheritanceType oldInheritanceType = this.defaultInheritanceStrategy;
-		this.defaultInheritanceStrategy = newInheritanceType;
-		firePropertyChanged(DEFAULT_INHERITANCE_STRATEGY_PROPERTY, oldInheritanceType, newInheritanceType);
-	}
-	
-	public InheritanceType getSpecifiedInheritanceStrategy() {
-		return this.specifiedInheritanceStrategy;
-	}
-	
-	public void setSpecifiedInheritanceStrategy(InheritanceType newInheritanceType) {
-		InheritanceType oldInheritanceType = this.specifiedInheritanceStrategy;
-		this.specifiedInheritanceStrategy = newInheritanceType;
-		if (oldInheritanceType != newInheritanceType) {
-			if (this.inheritanceResource() != null) {
-				this.inheritanceResource().setStrategy(InheritanceType.toOrmResourceModel(newInheritanceType));						
-				if (this.inheritanceResource().isAllFeaturesUnset()) {
-					removeInheritanceResource();
-				}
-			}
-			else if (newInheritanceType != null) {
-				addInheritanceResource();
-				inheritanceResource().setStrategy(InheritanceType.toOrmResourceModel(newInheritanceType));
-			}
-		}
-		firePropertyChanged(SPECIFIED_INHERITANCE_STRATEGY_PROPERTY, oldInheritanceType, newInheritanceType);
-	}
-	
-	protected void setSpecifiedInheritanceStrategy_(InheritanceType newInheritanceType) {
-		InheritanceType oldInheritanceType = this.specifiedInheritanceStrategy;
-		this.specifiedInheritanceStrategy = newInheritanceType;
-		firePropertyChanged(SPECIFIED_INHERITANCE_STRATEGY_PROPERTY, oldInheritanceType, newInheritanceType);
-	}
-
-	protected Inheritance inheritanceResource() {
-		return getTypeMappingResource().getInheritance();
-	}
-	
-	protected void addInheritanceResource() {
-		getTypeMappingResource().setInheritance(OrmFactory.eINSTANCE.createInheritance());		
-	}
-	
-	protected void removeInheritanceResource() {
-		getTypeMappingResource().setInheritance(null);
-	}
-
-	public OrmDiscriminatorColumn getDiscriminatorColumn() {
-		return this.discriminatorColumn;
-	}
-
-	public OrmSequenceGenerator addSequenceGenerator() {
-		if (getSequenceGenerator() != null) {
-			throw new IllegalStateException("sequenceGenerator already exists");
-		}
-		this.sequenceGenerator = getJpaFactory().buildOrmSequenceGenerator(this);
-		getTypeMappingResource().setSequenceGenerator(OrmFactory.eINSTANCE.createXmlSequenceGeneratorImpl());
-		firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, null, this.sequenceGenerator);
-		return this.sequenceGenerator;
-	}
-	
-	public void removeSequenceGenerator() {
-		if (getSequenceGenerator() == null) {
-			throw new IllegalStateException("sequenceGenerator does not exist, cannot be removed");
-		}
-		OrmSequenceGenerator oldSequenceGenerator = this.sequenceGenerator;
-		this.sequenceGenerator = null;
-		this.getTypeMappingResource().setSequenceGenerator(null);
-		firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, oldSequenceGenerator, null);
-	}
-	
-	public OrmSequenceGenerator getSequenceGenerator() {
-		return this.sequenceGenerator;
-	}
-
-	protected void setSequenceGenerator(OrmSequenceGenerator newSequenceGenerator) {
-		OrmSequenceGenerator oldSequenceGenerator = this.sequenceGenerator;
-		this.sequenceGenerator = newSequenceGenerator;
-		firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, oldSequenceGenerator, newSequenceGenerator);
-	}
-
-	public OrmTableGenerator addTableGenerator() {
-		if (getTableGenerator() != null) {
-			throw new IllegalStateException("tableGenerator already exists");
-		}
-		this.tableGenerator = getJpaFactory().buildOrmTableGenerator(this);
-		getTypeMappingResource().setTableGenerator(OrmFactory.eINSTANCE.createXmlTableGeneratorImpl());
-		firePropertyChanged(TABLE_GENERATOR_PROPERTY, null, this.tableGenerator);
-		return this.tableGenerator;
-	}
-	
-	public void removeTableGenerator() {
-		if (getTableGenerator() == null) {
-			throw new IllegalStateException("tableGenerator does not exist, cannot be removed");
-		}
-		OrmTableGenerator oldTableGenerator = this.tableGenerator;
-		this.tableGenerator = null;
-		this.getTypeMappingResource().setTableGenerator(null);
-		firePropertyChanged(TABLE_GENERATOR_PROPERTY, oldTableGenerator, null);
-	}
-	
-	public OrmTableGenerator getTableGenerator() {
-		return this.tableGenerator;
-	}
-
-	protected void setTableGenerator(OrmTableGenerator newTableGenerator) {
-		OrmTableGenerator oldTableGenerator = this.tableGenerator;
-		this.tableGenerator = newTableGenerator;
-		firePropertyChanged(TABLE_GENERATOR_PROPERTY, oldTableGenerator, newTableGenerator);
-	}
-	
-	@SuppressWarnings("unchecked")
-	protected Iterator<OrmGenerator> generators() {
-		return new CompositeIterator<OrmGenerator>(
-			(getSequenceGenerator() == null) ? EmptyIterator.instance() : new SingleElementIterator(getSequenceGenerator()),
-			(getTableGenerator() == null) ? EmptyIterator.instance() : new SingleElementIterator(getTableGenerator()));
-	}
-
-	public String getDefaultDiscriminatorValue() {
-		return this.defaultDiscriminatorValue;
-	}
-
-	protected void setDefaultDiscriminatorValue(String newDefaultDiscriminatorValue) {
-		String oldDefaultDiscriminatorValue = this.defaultDiscriminatorValue;
-		this.defaultDiscriminatorValue = newDefaultDiscriminatorValue;
-		firePropertyChanged(DEFAULT_DISCRIMINATOR_VALUE_PROPERTY, oldDefaultDiscriminatorValue, newDefaultDiscriminatorValue);
-	}
-
-	public String getSpecifiedDiscriminatorValue() {
-		return this.specifiedDiscriminatorValue;
-	}
-
-	public void setSpecifiedDiscriminatorValue(String newSpecifiedDiscriminatorValue) {
-		String oldSpecifiedDiscriminatorValue = this.specifiedDiscriminatorValue;
-		this.specifiedDiscriminatorValue = newSpecifiedDiscriminatorValue;
-		getTypeMappingResource().setDiscriminatorValue(newSpecifiedDiscriminatorValue);
-		firePropertyChanged(SPECIFIED_DISCRIMINATOR_VALUE_PROPERTY, oldSpecifiedDiscriminatorValue, newSpecifiedDiscriminatorValue);
-	}
-
-	public String getDiscriminatorValue() {
-		return (this.getSpecifiedDiscriminatorValue() == null) ? getDefaultDiscriminatorValue() : this.getSpecifiedDiscriminatorValue();
-	}
-	
-	public boolean isDiscriminatorValueAllowed() {
-		return this.discriminatorValueAllowed;
-	}
-	
-	protected void setDiscriminatorValueAllowed(boolean newDiscriminatorValueAllowed) {
-		boolean oldDiscriminatorValueAllowed = this.discriminatorValueAllowed;
-		this.discriminatorValueAllowed = newDiscriminatorValueAllowed;
-		firePropertyChanged(Entity.DISCRIMINATOR_VALUE_ALLOWED_PROPERTY, oldDiscriminatorValueAllowed, newDiscriminatorValueAllowed);
-	}
-
-	public ListIterator<OrmPrimaryKeyJoinColumn> defaultPrimaryKeyJoinColumns() {
-		return new CloneListIterator<OrmPrimaryKeyJoinColumn>(this.defaultPrimaryKeyJoinColumns);
-	}
-	
-	public int defaultPrimaryKeyJoinColumnsSize() {
-		return this.defaultPrimaryKeyJoinColumns.size();
-	}
-
-	public OrmPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn() {
-		throw new UnsupportedOperationException("use defaultPrimaryKeyJoinColumns() instead");
-	}
-
-	protected void addDefaultPrimaryKeyJoinColumn(OrmPrimaryKeyJoinColumn defaultPkJoinColumn) {
-		addItemToList(defaultPkJoinColumn, this.defaultPrimaryKeyJoinColumns, OrmEntity.DEFAULT_PRIMARY_KEY_JOIN_COLUMNS_LIST);
-	}
-	
-	protected void removeDefaultPrimaryKeyJoinColumn(PrimaryKeyJoinColumn defaultPkJoinColumn) {
-		removeItemFromList(defaultPkJoinColumn, this.defaultPrimaryKeyJoinColumns, OrmEntity.DEFAULT_PRIMARY_KEY_JOIN_COLUMNS_LIST);
-	}
-	
-	public ListIterator<OrmPrimaryKeyJoinColumn> primaryKeyJoinColumns() {
-		return this.specifiedPrimaryKeyJoinColumns.isEmpty() ? this.defaultPrimaryKeyJoinColumns() : this.specifiedPrimaryKeyJoinColumns();
-	}
-	
-	public int primaryKeyJoinColumnsSize() {
-		return this.specifiedPrimaryKeyJoinColumns.isEmpty() ? this.defaultPrimaryKeyJoinColumnsSize() : this.specifiedPrimaryKeyJoinColumnsSize();
-	}
-	
-	public ListIterator<OrmPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns() {
-		return new CloneListIterator<OrmPrimaryKeyJoinColumn>(this.specifiedPrimaryKeyJoinColumns);
-	}
-
-	public int specifiedPrimaryKeyJoinColumnsSize() {
-		return this.specifiedPrimaryKeyJoinColumns.size();
-	}
-	
-	public boolean containsSpecifiedPrimaryKeyJoinColumns() {
-		return !this.specifiedPrimaryKeyJoinColumns.isEmpty();
-	}	
-
-	public OrmPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index) {
-		if (!this.defaultPrimaryKeyJoinColumns.isEmpty()) {
-			this.defaultPrimaryKeyJoinColumns.clear();
-		}
-		XmlPrimaryKeyJoinColumn xmlPrimaryKeyJoinColumn = OrmFactory.eINSTANCE.createXmlPrimaryKeyJoinColumnImpl();
-		OrmPrimaryKeyJoinColumn primaryKeyJoinColumn = buildPrimaryKeyJoinColumn(xmlPrimaryKeyJoinColumn);
-		this.specifiedPrimaryKeyJoinColumns.add(index, primaryKeyJoinColumn);
-		this.getTypeMappingResource().getPrimaryKeyJoinColumns().add(index, xmlPrimaryKeyJoinColumn);
-
-		this.fireItemAdded(Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, primaryKeyJoinColumn);
-		this.fireListCleared(OrmEntity.DEFAULT_PRIMARY_KEY_JOIN_COLUMNS_LIST);
-		return primaryKeyJoinColumn;
-	}
-	
-	protected OrmBaseJoinColumn.Owner createPrimaryKeyJoinColumnOwner() {
-		return new PrimaryKeyJoinColumnOwner();
-	}
-
-	protected void addSpecifiedPrimaryKeyJoinColumn(int index, OrmPrimaryKeyJoinColumn primaryKeyJoinColumn) {
-		addItemToList(index, primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST);
-	}
-	
-	public void removeSpecifiedPrimaryKeyJoinColumn(PrimaryKeyJoinColumn primaryKeyJoinColumn) {
-		this.removeSpecifiedPrimaryKeyJoinColumn(this.specifiedPrimaryKeyJoinColumns.indexOf(primaryKeyJoinColumn));
-	}
-	
-	public void removeSpecifiedPrimaryKeyJoinColumn(int index) {
-		OrmPrimaryKeyJoinColumn removedPrimaryKeyJoinColumn = this.specifiedPrimaryKeyJoinColumns.remove(index);
-		if (!containsSpecifiedPrimaryKeyJoinColumns()) {
-			//create the defaultJoinColumn now or this will happen during project update 
-			//after removing the join column from the resource model. That causes problems 
-			//in the UI because the change notifications end up in the wrong order.
-			initializeDefaultPrimaryKeyJoinColumns();
-		}
-		this.getTypeMappingResource().getPrimaryKeyJoinColumns().remove(index);
-		fireItemRemoved(Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedPrimaryKeyJoinColumn);
-		if (!this.defaultPrimaryKeyJoinColumns.isEmpty()) {
-			fireListChanged(OrmEntity.DEFAULT_PRIMARY_KEY_JOIN_COLUMNS_LIST);
-		}
-	}
-
-	protected void removeSpecifiedPrimaryKeyJoinColumn_(OrmPrimaryKeyJoinColumn primaryKeyJoinColumn) {
-		removeItemFromList(primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST);
-	}
-	
-	public void moveSpecifiedPrimaryKeyJoinColumn(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.specifiedPrimaryKeyJoinColumns, targetIndex, sourceIndex);
-		this.getTypeMappingResource().getPrimaryKeyJoinColumns().move(targetIndex, sourceIndex);
-		fireItemMoved(Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, targetIndex, sourceIndex);		
-	}
-	
-	@SuppressWarnings("unchecked")
-	public ListIterator<OrmAttributeOverride> attributeOverrides() {
-		return new CompositeListIterator<OrmAttributeOverride>(specifiedAttributeOverrides(), virtualAttributeOverrides());
-	}
-
-	public int attributeOverridesSize() {
-		return this.specifiedAttributeOverridesSize() + this.virtualAttributeOverridesSize();
-	}
-	
-	public ListIterator<OrmAttributeOverride> virtualAttributeOverrides() {
-		return new CloneListIterator<OrmAttributeOverride>(this.virtualAttributeOverrides);
-	}
-	
-	public int virtualAttributeOverridesSize() {
-		return this.virtualAttributeOverrides.size();
-	}
-	
-	protected void addVirtualAttributeOverride(OrmAttributeOverride attributeOverride) {
-		addItemToList(attributeOverride, this.virtualAttributeOverrides, Entity.VIRTUAL_ATTRIBUTE_OVERRIDES_LIST);
-	}
-	
-	protected void removeVirtualAttributeOverride(OrmAttributeOverride attributeOverride) {
-		removeItemFromList(attributeOverride, this.virtualAttributeOverrides, Entity.VIRTUAL_ATTRIBUTE_OVERRIDES_LIST);
-	}
-	
-	protected OrmAttributeOverride setAttributeOverrideVirtual(boolean virtual, OrmAttributeOverride attributeOverride) {
-		if (virtual) {
-			return setAttributeOverrideVirtual(attributeOverride);
-		}
-		return setAttributeOverrideSpecified(attributeOverride);
-	}
-	
-	protected OrmAttributeOverride setAttributeOverrideVirtual(OrmAttributeOverride attributeOverride) {
-		int index = this.specifiedAttributeOverrides.indexOf(attributeOverride);
-		this.specifiedAttributeOverrides.remove(index);
-		String attributeOverrideName = attributeOverride.getName();
-		//add the virtual attribute override so that I can control the order that change notification is sent.
-		//otherwise when we remove the annotation from java we will get an update and add the attribute override
-		//during the udpate.  This causes the UI to be flaky, since change notification might not occur in the correct order
-		OrmAttributeOverride virtualAttributeOverride = null;
-		if (attributeOverrideName != null) {
-			for (PersistentAttribute persistentAttribute : CollectionTools.iterable(allOverridableAttributes())) {
-				if (persistentAttribute.getName().equals(attributeOverrideName)) {
-					JavaAttributeOverride javaAttributeOverride = null;
-					if (getJavaEntity() != null) {
-						javaAttributeOverride = getJavaEntity().getAttributeOverrideNamed(attributeOverrideName);
-					}
-					//store the virtualAttributeOverride so we can fire change notification later
-					virtualAttributeOverride = buildVirtualAttributeOverride(persistentAttribute, javaAttributeOverride);
-					this.virtualAttributeOverrides.add(virtualAttributeOverride);
-				}
-			}
-		}
-
-		getTypeMappingResource().getAttributeOverrides().remove(index);
-		fireItemRemoved(Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride);
-		
-		if (virtualAttributeOverride != null) {
-			fireItemAdded(Entity.VIRTUAL_ATTRIBUTE_OVERRIDES_LIST, virtualAttributeOverridesSize() - 1, virtualAttributeOverride);
-		}
-		return virtualAttributeOverride;
-	}
-	
-	protected OrmAttributeOverride setAttributeOverrideSpecified(OrmAttributeOverride oldAttributeOverride) {
-		int index = specifiedAttributeOverridesSize();
-		XmlAttributeOverride xmlAttributeOverride = OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl();
-		OrmAttributeOverride newAttributeOverride = getJpaFactory().buildOrmAttributeOverride(this, createAttributeOverrideOwner(), xmlAttributeOverride);
-		this.specifiedAttributeOverrides.add(index, newAttributeOverride);
-		
-		getTypeMappingResource().getAttributeOverrides().add(xmlAttributeOverride);
-		
-		int defaultIndex = this.virtualAttributeOverrides.indexOf(oldAttributeOverride);
-		this.virtualAttributeOverrides.remove(defaultIndex);
-
-		newAttributeOverride.setName(oldAttributeOverride.getName());
-		newAttributeOverride.getColumn().setSpecifiedName(oldAttributeOverride.getColumn().getName());
-		
-		this.fireItemRemoved(Entity.VIRTUAL_ATTRIBUTE_OVERRIDES_LIST, defaultIndex, oldAttributeOverride);
-		this.fireItemAdded(Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, newAttributeOverride);		
-
-		return newAttributeOverride;
-	}
-
-	public ListIterator<OrmAttributeOverride> specifiedAttributeOverrides() {
-		return new CloneListIterator<OrmAttributeOverride>(this.specifiedAttributeOverrides);
-	}
-
-	public int specifiedAttributeOverridesSize() {
-		return this.specifiedAttributeOverrides.size();
-	}
-
-	protected void addSpecifiedAttributeOverride(int index, OrmAttributeOverride attributeOverride) {
-		addItemToList(index, attributeOverride, this.specifiedAttributeOverrides, Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST);
-	}
-	
-	protected void removeSpecifiedAttributeOverride_(OrmAttributeOverride attributeOverride) {
-		removeItemFromList(attributeOverride, this.specifiedAttributeOverrides, Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST);
-	}
-	
-	public void moveSpecifiedAttributeOverride(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.specifiedAttributeOverrides, targetIndex, sourceIndex);
-		this.getTypeMappingResource().getAttributeOverrides().move(targetIndex, sourceIndex);
-		fireItemMoved(Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, targetIndex, sourceIndex);		
-	}
-
-	@SuppressWarnings("unchecked")
-	public ListIterator<OrmAssociationOverride> associationOverrides() {
-		return new CompositeListIterator<OrmAssociationOverride>(specifiedAssociationOverrides(), virtualAssociationOverrides());
-	}
-
-	public int associationOverridesSize() {
-		return this.specifiedAssociationOverridesSize() + this.virtualAssociationOverridesSize();
-	}
-
-	public ListIterator<OrmAssociationOverride> virtualAssociationOverrides() {
-		return new CloneListIterator<OrmAssociationOverride>(this.virtualAssociationOverrides);
-	}
-	
-	public int virtualAssociationOverridesSize() {
-		return this.virtualAssociationOverrides.size();
-	}
-	
-	public ListIterator<OrmAssociationOverride> specifiedAssociationOverrides() {
-		return new CloneListIterator<OrmAssociationOverride>(this.specifiedAssociationOverrides);
-	}
-
-	public int specifiedAssociationOverridesSize() {
-		return this.specifiedAssociationOverrides.size();
-	}
-
-	protected void addSpecifiedAssociationOverride(int index, OrmAssociationOverride associationOverride) {
-		addItemToList(index, associationOverride, this.specifiedAssociationOverrides, Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST);
-	}
-	
-	protected void removeSpecifiedAssociationOverride_(OrmAssociationOverride associationOverride) {
-		removeItemFromList(associationOverride, this.specifiedAssociationOverrides, Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST);
-	}
-	
-	public void moveSpecifiedAssociationOverride(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.specifiedAssociationOverrides, targetIndex, sourceIndex);
-		this.getTypeMappingResource().getAssociationOverrides().move(targetIndex, sourceIndex);
-		fireItemMoved(Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST, targetIndex, sourceIndex);		
-	}
-
-	public OrmAttributeOverride getAttributeOverrideNamed(String name) {
-		return (OrmAttributeOverride) getOverrideNamed(name, attributeOverrides());
-	}
-
-	public boolean containsAttributeOverride(String name) {
-		return containsOverride(name, attributeOverrides());
-	}
-
-	public boolean containsDefaultAttributeOverride(String name) {
-		return containsOverride(name, virtualAttributeOverrides());
-	}
-
-	public boolean containsSpecifiedAttributeOverride(String name) {
-		return containsOverride(name, specifiedAttributeOverrides());
-	}
-
-	public OrmAssociationOverride getAssociationOverrideNamed(String name) {
-		return (OrmAssociationOverride) getOverrideNamed(name, associationOverrides());
-	}
-
-	public boolean containsAssociationOverride(String name) {
-		return containsOverride(name, associationOverrides());
-	}
-
-	public boolean containsSpecifiedAssociationOverride(String name) {
-		return containsOverride(name, specifiedAssociationOverrides());
-	}
-
-	public boolean containsDefaultAssociationOverride(String name) {
-		return containsOverride(name, virtualAssociationOverrides());
-	}
-
-	private BaseOverride getOverrideNamed(String name, ListIterator<? extends BaseOverride> overrides) {
-		for (BaseOverride override : CollectionTools.iterable(overrides)) {
-			String overrideName = override.getName();
-			if (overrideName == null && name == null) {
-				return override;
-			}
-			if (overrideName != null && overrideName.equals(name)) {
-				return override;
-			}
-		}
-		return null;
-	}
-
-	private boolean containsOverride(String name, ListIterator<? extends BaseOverride> overrides) {
-		return getOverrideNamed(name, overrides) != null;
-	}
-
-	
-	public ListIterator<OrmNamedQuery> namedQueries() {
-		return new CloneListIterator<OrmNamedQuery>(this.namedQueries);
-	}
-	
-	public int namedQueriesSize() {
-		return this.namedQueries.size();
-	}
-	
-	public OrmNamedQuery addNamedQuery(int index) {
-		OrmNamedQuery namedQuery = getJpaFactory().buildOrmNamedQuery(this);
-		this.namedQueries.add(index, namedQuery);
-		XmlNamedQuery xmlNamedQuery = OrmFactory.eINSTANCE.createXmlNamedQuery();
-		namedQuery.initialize(xmlNamedQuery);
-		this.getTypeMappingResource().getNamedQueries().add(index, xmlNamedQuery);
-		this.fireItemAdded(QueryHolder.NAMED_QUERIES_LIST, index, namedQuery);
-		return namedQuery;
-	}
-	
-	protected void addNamedQuery(int index, OrmNamedQuery namedQuery) {
-		addItemToList(index, namedQuery, this.namedQueries, QueryHolder.NAMED_QUERIES_LIST);
-	}
-		
-	public void removeNamedQuery(NamedQuery namedQuery) {
-		removeNamedQuery(this.namedQueries.indexOf(namedQuery));
-	}
-	
-	public void removeNamedQuery(int index) {
-		OrmNamedQuery namedQuery = this.namedQueries.remove(index);
-		this.getTypeMappingResource().getNamedQueries().remove(index);
-		fireItemRemoved(QueryHolder.NAMED_QUERIES_LIST, index, namedQuery);
-	}
-	
-	protected void removeNamedQuery_(OrmNamedQuery namedQuery) {
-		removeItemFromList(namedQuery, this.namedQueries, QueryHolder.NAMED_QUERIES_LIST);
-	}
-	
-	public void moveNamedQuery(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.namedQueries, targetIndex, sourceIndex);
-		this.getTypeMappingResource().getNamedQueries().move(targetIndex, sourceIndex);
-		fireItemMoved(QueryHolder.NAMED_QUERIES_LIST, targetIndex, sourceIndex);		
-	}
-	
-	public ListIterator<OrmNamedNativeQuery> namedNativeQueries() {
-		return new CloneListIterator<OrmNamedNativeQuery>(this.namedNativeQueries);
-	}
-	
-	public int namedNativeQueriesSize() {
-		return this.namedNativeQueries.size();
-	}
-	
-	public OrmNamedNativeQuery addNamedNativeQuery(int index) {
-		OrmNamedNativeQuery namedNativeQuery = getJpaFactory().buildOrmNamedNativeQuery(this);
-		this.namedNativeQueries.add(index, namedNativeQuery);
-		XmlNamedNativeQuery xmlNamedNativeQuery = OrmFactory.eINSTANCE.createXmlNamedNativeQuery();
-		namedNativeQuery.initialize(xmlNamedNativeQuery);
-		this.getTypeMappingResource().getNamedNativeQueries().add(index, OrmFactory.eINSTANCE.createXmlNamedNativeQuery());
-		this.fireItemAdded(QueryHolder.NAMED_NATIVE_QUERIES_LIST, index, namedNativeQuery);
-		return namedNativeQuery;
-	}
-	
-	protected void addNamedNativeQuery(int index, OrmNamedNativeQuery namedNativeQuery) {
-		addItemToList(index, namedNativeQuery, this.namedNativeQueries, QueryHolder.NAMED_NATIVE_QUERIES_LIST);
-	}
-	
-	public void removeNamedNativeQuery(NamedNativeQuery namedNativeQuery) {
-		this.removeNamedNativeQuery(this.namedNativeQueries.indexOf(namedNativeQuery));
-	}
-	
-	public void removeNamedNativeQuery(int index) {
-		OrmNamedNativeQuery namedNativeQuery = this.namedNativeQueries.remove(index);
-		this.getTypeMappingResource().getNamedNativeQueries().remove(index);
-		fireItemRemoved(QueryHolder.NAMED_NATIVE_QUERIES_LIST, index, namedNativeQuery);
-	}
-
-	protected void removeNamedNativeQuery_(OrmNamedNativeQuery namedNativeQuery) {
-		removeItemFromList(namedNativeQuery, this.namedNativeQueries, QueryHolder.NAMED_NATIVE_QUERIES_LIST);
-	}
-		
-	public void moveNamedNativeQuery(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.namedNativeQueries, targetIndex, sourceIndex);
-		this.getTypeMappingResource().getNamedNativeQueries().move(targetIndex, sourceIndex);
-		fireItemMoved(QueryHolder.NAMED_NATIVE_QUERIES_LIST, targetIndex, sourceIndex);		
-	}
-	
-	@SuppressWarnings("unchecked")
-	protected Iterator<OrmQuery> queries() {
-		return new CompositeIterator<OrmQuery>(this.namedQueries(), this.namedNativeQueries());
-	}
-
-	public String getIdClass() {
-		return this.idClass;
-	}
-	
-	public void setIdClass(String newIdClass) {
-		String oldIdClass = this.idClass;
-		this.idClass = newIdClass;
-		if (oldIdClass != newIdClass) {
-			if (this.idClassResource() != null) {
-				this.idClassResource().setClassName(newIdClass);						
-				if (this.idClassResource().isAllFeaturesUnset()) {
-					removeIdClassResource();
-				}
-			}
-			else if (newIdClass != null) {
-				addIdClassResource();
-				idClassResource().setClassName(newIdClass);
-			}
-		}
-		firePropertyChanged(IdClass.ID_CLASS_PROPERTY, oldIdClass, newIdClass);
-	}
-	
-	protected void setIdClass_(String newIdClass) {
-		String oldIdClass = this.idClass;
-		this.idClass = newIdClass;
-		firePropertyChanged(IdClass.ID_CLASS_PROPERTY, oldIdClass, newIdClass);
-	}
-
-	protected XmlIdClass idClassResource() {
-		return getTypeMappingResource().getIdClass();
-	}
-	
-	protected void addIdClassResource() {
-		getTypeMappingResource().setIdClass(OrmFactory.eINSTANCE.createXmlIdClass());		
-	}
-	
-	protected void removeIdClassResource() {
-		getTypeMappingResource().setIdClass(null);
-	}
-
-	public Entity getParentEntity() {
-		for (Iterator<PersistentType> i = getPersistentType().inheritanceHierarchy(); i.hasNext();) {
-			TypeMapping typeMapping = i.next().getMapping();
-			if (typeMapping != this && typeMapping instanceof Entity) {
-				return (Entity) typeMapping;
-			}
-		}
-		return this;
-	}
-
-	public Entity getRootEntity() {
-		Entity rootEntity = null;
-		for (Iterator<PersistentType> i = getPersistentType().inheritanceHierarchy(); i.hasNext();) {
-			PersistentType persistentType = i.next();
-			if (persistentType.getMapping() instanceof Entity) {
-				rootEntity = (Entity) persistentType.getMapping();
-			}
-		}
-		return rootEntity;
-	}
-
-//	public String primaryKeyColumnName() {
-//		String pkColumnName = null;
-//		for (Iterator<IPersistentAttribute> stream = getPersistentType().allAttributes(); stream.hasNext();) {
-//			IPersistentAttribute attribute = stream.next();
-//			String name = attribute.primaryKeyColumnName();
-//			if (pkColumnName == null) {
-//				pkColumnName = name;
-//			}
-//			else if (name != null) {
-//				// if we encounter a composite primary key, return null
-//				return null;
-//			}
-//		}
-//		// if we encounter only a single primary key column name, return it
-//		return pkColumnName;
-//	}
-//
-//	public String primaryKeyAttributeName() {
-//		String pkColumnName = null;
-//		String pkAttributeName = null;
-//		for (Iterator<IPersistentAttribute> stream = getPersistentType().allAttributes(); stream.hasNext();) {
-//			IPersistentAttribute attribute = stream.next();
-//			String name = attribute.primaryKeyColumnName();
-//			if (pkColumnName == null) {
-//				pkColumnName = name;
-//				pkAttributeName = attribute.getName();
-//			}
-//			else if (name != null) {
-//				// if we encounter a composite primary key, return null
-//				return null;
-//			}
-//		}
-//		// if we encounter only a single primary key column name, return it
-//		return pkAttributeName;
-//	}
-//
-
-
-	public int getXmlSequence() {
-		return 1;
-	}
-
-	/**
-	 * Return an iterator of Entities, each which inherits from the one before,
-	 * and terminates at the root entity (or at the point of cyclicity).
-	 */
-	protected Iterator<TypeMapping> inheritanceHierarchy() {
-		return new TransformationIterator<PersistentType, TypeMapping>(getPersistentType().inheritanceHierarchy()) {
-			@Override
-			protected TypeMapping transform(PersistentType type) {
-				return type.getMapping();
-			}
-		};
-	}
-	
-	@Override
-	public Iterator<PersistentAttribute> allOverridableAttributes() {
-		return new CompositeIterator<PersistentAttribute>(new TransformationIterator<TypeMapping, Iterator<PersistentAttribute>>(this.inheritanceHierarchy()) {
-			@Override
-			protected Iterator<PersistentAttribute> transform(TypeMapping mapping) {
-				return mapping.overridableAttributes();
-			}
-		});
-	}
-
-	@Override
-	public Iterator<String> allOverridableAttributeNames() {
-		return new CompositeIterator<String>(new TransformationIterator<TypeMapping, Iterator<String>>(this.inheritanceHierarchy()) {
-			@Override
-			protected Iterator<String> transform(TypeMapping mapping) {
-				return mapping.overridableAttributeNames();
-			}
-		});
-	}
-
-	@Override
-	public Iterator<String> allOverridableAssociationNames() {
-		return new CompositeIterator<String>(new TransformationIterator<TypeMapping, Iterator<String>>(this.inheritanceHierarchy()) {
-			@Override
-			protected Iterator<String> transform(TypeMapping mapping) {
-				return mapping.overridableAssociationNames();
-			}
-		});
-	}
-
-//
-//	public IAttributeOverride createAttributeOverride(int index) {
-//		return OrmFactory.eINSTANCE.createXmlAttributeOverride(new IEntity.AttributeOverrideOwner(this));
-//	}
-//
-//	public IAssociationOverride createAssociationOverride(int index) {
-//		return OrmFactory.eINSTANCE.createXmlAssociationOverride(new IEntity.AssociationOverrideOwner(this));
-//	}
-//
-//	public IAttributeOverride attributeOverrideNamed(String name) {
-//		return (IAttributeOverride) overrideNamed(name, getAttributeOverrides());
-//	}
-//
-//	public boolean containsAttributeOverride(String name) {
-//		return containsOverride(name, getAttributeOverrides());
-//	}
-//
-//	public boolean containsSpecifiedAttributeOverride(String name) {
-//		return containsOverride(name, getSpecifiedAttributeOverrides());
-//	}
-//
-//	public boolean containsAssociationOverride(String name) {
-//		return containsOverride(name, getAssociationOverrides());
-//	}
-//
-//	public boolean containsSpecifiedAssociationOverride(String name) {
-//		return containsOverride(name, getSpecifiedAssociationOverrides());
-//	}
-//
-//	private IOverride overrideNamed(String name, List<? extends IOverride> overrides) {
-//		for (IOverride override : overrides) {
-//			String overrideName = override.getName();
-//			if (overrideName == null && name == null) {
-//				return override;
-//			}
-//			if (overrideName != null && overrideName.equals(name)) {
-//				return override;
-//			}
-//		}
-//		return null;
-//	}
-//
-//	private boolean containsOverride(String name, List<? extends IOverride> overrides) {
-//		return overrideNamed(name, overrides) != null;
-//	}
-//
-//	public boolean containsSpecifiedPrimaryKeyJoinColumns() {
-//		return !this.getSpecifiedPrimaryKeyJoinColumns().isEmpty();
-//	}
-	
-	
-	@Override
-	public void initialize(XmlEntity entity) {
-		super.initialize(entity);
-		this.specifiedName = entity.getName();
-		this.defaultName = this.defaultName();
-		this.initializeInheritance(this.inheritanceResource());
-		this.discriminatorColumn.initialize(entity);
-		this.specifiedDiscriminatorValue = entity.getDiscriminatorValue();
-		this.defaultDiscriminatorValue = this.defaultDiscriminatorValue();
-		this.discriminatorValueAllowed = this.discriminatorValueIsAllowed();
-		this.table.initialize(entity);
-		this.initializeSpecifiedSecondaryTables(entity);
-		this.initializeVirtualSecondaryTables();
-		this.initializeSequenceGenerator(entity);
-		this.initializeTableGenerator(entity);
-		this.initializeSpecifiedPrimaryKeyJoinColumns(entity);
-		this.initializeDefaultPrimaryKeyJoinColumns();
-		this.initializeSpecifiedAttributeOverrides(entity);
-		this.initializeVirtualAttributeOverrides();
-		this.initializeSpecifiedAssociationOverrides(entity);
-		this.initializeNamedQueries(entity);
-		this.initializeNamedNativeQueries(entity);
-		this.initializeIdClass(this.idClassResource());
-		this.updatePersistenceUnitGeneratorsAndQueries();
-	}
-	
-	protected void initializeInheritance(Inheritance inheritanceResource) {
-		this.specifiedInheritanceStrategy = this.specifiedInheritanceStrategy(inheritanceResource);
-		this.defaultInheritanceStrategy = this.defaultInheritanceStrategy();
-	}
-
-	protected void initializeSpecifiedSecondaryTables(XmlEntity entity) {
-		for (XmlSecondaryTable secondaryTable : entity.getSecondaryTables()) {
-			this.specifiedSecondaryTables.add(buildSecondaryTable(secondaryTable));
-		}
-	}
-	
-	protected void initializeVirtualSecondaryTables() {
-		if (isMetadataComplete()) {
-			return;
-		}
-		if (getJavaEntity() == null) {
-			return;
-		}
-		if (specifiedSecondaryTablesSize() > 0) {
-			return;
-		}
-		ListIterator<JavaSecondaryTable> javaSecondaryTables = getJavaEntity().secondaryTables();
-		while(javaSecondaryTables.hasNext()) {
-			JavaSecondaryTable javaSecondaryTable = javaSecondaryTables.next();
-			if (javaSecondaryTable.getName() != null) {
-				this.virtualSecondaryTables.add(buildVirtualSecondaryTable(javaSecondaryTable));
-			}
-		}
-	}	
-	
-	protected void initializeDefaultPrimaryKeyJoinColumns() {
-		if (isMetadataComplete()) {
-			return;
-		}
-		if (getJavaEntity() == null) {
-			this.defaultPrimaryKeyJoinColumns.add(buildPrimaryKeyJoinColumn(null));
-			return;
-		}
-		if (specifiedPrimaryKeyJoinColumnsSize() > 0) {
-			return;
-		}
-		ListIterator<JavaPrimaryKeyJoinColumn> javaPkJoinColumns = getJavaEntity().primaryKeyJoinColumns();
-		while(javaPkJoinColumns.hasNext()) {
-			JavaPrimaryKeyJoinColumn javaPkJoinColumn = javaPkJoinColumns.next();
-			if (javaPkJoinColumn.getName() != null) {
-				this.defaultPrimaryKeyJoinColumns.add(buildVirtualPrimaryKeyJoinColumn(javaPkJoinColumn));
-			}
-		}
-	}
-
-	protected void initializeTableGenerator(XmlEntity entity) {
-		if (entity.getTableGenerator() != null) {
-			this.tableGenerator = buildTableGenerator(entity.getTableGenerator());
-		}
-	}
-	
-	protected OrmTableGenerator buildTableGenerator(XmlTableGenerator tableGeneratorResource) {
-		OrmTableGenerator tableGenerator = getJpaFactory().buildOrmTableGenerator(this);
-		tableGenerator.initialize(tableGeneratorResource);
-		return tableGenerator;
-	}
-
-	protected void initializeSequenceGenerator(XmlEntity entity) {
-		if (entity.getSequenceGenerator() != null) {
-			this.sequenceGenerator = buildSequenceGenerator(entity.getSequenceGenerator());
-		}
-	}
-	
-	protected OrmSequenceGenerator buildSequenceGenerator(XmlSequenceGenerator xmlSequenceGenerator) {
-		OrmSequenceGenerator sequenceGenerator = getJpaFactory().buildOrmSequenceGenerator(this);
-		sequenceGenerator.initialize(xmlSequenceGenerator);
-		return sequenceGenerator;
-	}
-
-	protected void initializeSpecifiedPrimaryKeyJoinColumns(XmlEntity entity) {
-		for (XmlPrimaryKeyJoinColumn primaryKeyJoinColumn : entity.getPrimaryKeyJoinColumns()) {
-			this.specifiedPrimaryKeyJoinColumns.add(buildPrimaryKeyJoinColumn(primaryKeyJoinColumn));
-		}
-	}
-	
-	protected void initializeSpecifiedAttributeOverrides(XmlEntity entity) {
-		for (XmlAttributeOverride attributeOverride : entity.getAttributeOverrides()) {
-			this.specifiedAttributeOverrides.add(buildAttributeOverride(attributeOverride));
-		}
-	}
-	
-	protected void initializeVirtualAttributeOverrides() {
-		for (PersistentAttribute persistentAttribute : CollectionTools.iterable(allOverridableAttributes())) {
-			OrmAttributeOverride attributeOverride = getAttributeOverrideNamed(persistentAttribute.getName());
-			if (attributeOverride == null) {
-				JavaAttributeOverride javaAttributeOverride = null;
-				if (getJavaEntity() != null) {
-					javaAttributeOverride = getJavaEntity().getAttributeOverrideNamed(persistentAttribute.getName());
-				}
-				this.virtualAttributeOverrides.add(buildVirtualAttributeOverride(persistentAttribute, javaAttributeOverride));
-			}
-		}
-	}
-
-	protected OrmAttributeOverride buildVirtualAttributeOverride(PersistentAttribute persistentAttribute, JavaAttributeOverride javaAttributeOverride) {
-		return buildAttributeOverride(buildVirtualXmlAttributeOverride(persistentAttribute, javaAttributeOverride));
-	}
-	
-	protected XmlAttributeOverride buildVirtualXmlAttributeOverride(PersistentAttribute persistentAttribute, JavaAttributeOverride javaAttributeOverride) {
-		XmlColumn xmlColumn;
-		if (javaAttributeOverride == null) {
-			ColumnMapping columnMapping = (ColumnMapping) persistentAttribute.getMapping();
-			xmlColumn = new VirtualXmlColumn(this, columnMapping.getColumn(), false);		
-		}
-		else {
-			xmlColumn = new VirtualXmlColumn(this, javaAttributeOverride.getColumn(), isMetadataComplete());
-		}
-		return new VirtualXmlAttributeOverride(persistentAttribute.getName(), xmlColumn);
-	}
-	
-	protected void initializeSpecifiedAssociationOverrides(XmlEntity entity) {
-		for (XmlAssociationOverride associationOverride : entity.getAssociationOverrides()) {
-			this.specifiedAssociationOverrides.add(buildAssociationOverride(associationOverride));
-		}
-	}
-	
-	protected void initializeNamedQueries(XmlEntity entity) {
-		for (XmlNamedQuery namedQuery : entity.getNamedQueries()) {
-			this.namedQueries.add(buildNamedQuery(namedQuery));
-		}
-	}
-	
-	protected void initializeNamedNativeQueries(XmlEntity entity) {
-		for (XmlNamedNativeQuery namedNativeQuery : entity.getNamedNativeQueries()) {
-			this.namedNativeQueries.add(buildNamedNativeQuery(namedNativeQuery));
-		}
-	}
-	
-	protected void initializeIdClass(XmlIdClass idClassResource) {
-		this.idClass = this.idClass(idClassResource);	
-	}
-
-	protected String idClass(XmlIdClass idClassResource) {
-		return idClassResource == null ? null : idClassResource.getClassName();
-	}
-
-	@Override
-	public void update(XmlEntity entity) {
-		super.update(entity);
-		this.setSpecifiedName(entity.getName());
-		this.setDefaultName(this.defaultName());
-		this.updateInheritance(this.inheritanceResource());
-		this.discriminatorColumn.update(entity);
-		this.setSpecifiedDiscriminatorValue(entity.getDiscriminatorValue());
-		this.setDefaultDiscriminatorValue(defaultDiscriminatorValue());
-		this.setDiscriminatorValueAllowed(this.discriminatorValueIsAllowed());
-		this.table.update(entity);
-		this.updateSpecifiedSecondaryTables(entity);
-		this.updateVirtualSecondaryTables();
-		this.updateSequenceGenerator(entity);
-		this.updateTableGenerator(entity);
-		this.updateSpecifiedPrimaryKeyJoinColumns(entity);
-		this.updateDefaultPrimaryKeyJoinColumns();
-		this.updateSpecifiedAttributeOverrides(entity);
-		this.updateVirtualAttributeOverrides();
-		this.updateSpecifiedAssociationOverrides(entity);
-		this.updateNamedQueries(entity);
-		this.updateNamedNativeQueries(entity);
-		this.updateIdClass(this.idClassResource());
-		this.updatePersistenceUnitGeneratorsAndQueries();
-	}
-
-	protected String defaultName() {
-		if (!isMetadataComplete()) {
-			JavaEntity javaEntity = getJavaEntity();
-			if (javaEntity != null) {
-				return javaEntity.getName();
-			}
-		}
-		String className = getClass_();
-		if (className != null) {
-			return ClassTools.shortNameForClassNamed(className);
-		}
-		return null;
-	}
-	
-	protected String defaultDiscriminatorValue() {
-		//TODO default discriminator value
-		return null;
-	}
-	
-	protected boolean discriminatorValueIsAllowed() {
-		JavaResourcePersistentType javaResourcePersistentType = getJavaResourcePersistentType();
-		return javaResourcePersistentType == null ? false : !javaResourcePersistentType.isAbstract();
-	}
-
-	protected void updateInheritance(Inheritance inheritanceResource) {
-		this.setSpecifiedInheritanceStrategy_(this.specifiedInheritanceStrategy(inheritanceResource));
-		this.setDefaultInheritanceStrategy(this.defaultInheritanceStrategy());
-	}
-	
-	protected void updateSpecifiedSecondaryTables(XmlEntity entity) {
-		ListIterator<OrmSecondaryTable> secondaryTables = specifiedSecondaryTables();
-		ListIterator<XmlSecondaryTable> resourceSecondaryTables = new CloneListIterator<XmlSecondaryTable>(entity.getSecondaryTables());//prevent ConcurrentModificiationException
-		
-		while (secondaryTables.hasNext()) {
-			OrmSecondaryTable secondaryTable = secondaryTables.next();
-			if (resourceSecondaryTables.hasNext()) {
-				secondaryTable.update(resourceSecondaryTables.next());
-			}
-			else {
-				removeSpecifiedSecondaryTable_(secondaryTable);
-			}
-		}
-		
-		while (resourceSecondaryTables.hasNext()) {
-			addSpecifiedSecondaryTable(specifiedSecondaryTablesSize(), buildSecondaryTable(resourceSecondaryTables.next()));
-		}
-	}
-	
-	//if any secondary-tables are specified in the xml file, then all of the java secondaryTables are overriden
-	protected void updateVirtualSecondaryTables() {
-		ListIterator<OrmSecondaryTable> secondaryTables = virtualSecondaryTables();
-		ListIterator<JavaSecondaryTable> javaSecondaryTables = EmptyListIterator.instance();
-		
-		if (getJavaEntity() != null && !isMetadataComplete() && specifiedSecondaryTablesSize() == 0) {
-			javaSecondaryTables = getJavaEntity().secondaryTables();
-		}
-		while (secondaryTables.hasNext()) {
-			OrmSecondaryTable virtualSecondaryTable = secondaryTables.next();
-			if (javaSecondaryTables.hasNext()) {
-				JavaSecondaryTable javaSecondaryTable = javaSecondaryTables.next();
-				virtualSecondaryTable.update(new VirtualXmlSecondaryTable(javaSecondaryTable));
-			}
-			else {
-				removeVirtualSecondaryTable(virtualSecondaryTable);
-			}
-		}
-		
-		while (javaSecondaryTables.hasNext()) {
-			JavaSecondaryTable javaSecondaryTable = javaSecondaryTables.next();
-			addVirtualSecondaryTable(buildVirtualSecondaryTable(javaSecondaryTable));
-		}
-	}
-
-	protected OrmSecondaryTable buildSecondaryTable(XmlSecondaryTable xmlSecondaryTable) {
-		return getJpaFactory().buildOrmSecondaryTable(this, xmlSecondaryTable);
-	}
-	
-	protected OrmSecondaryTable buildVirtualSecondaryTable(JavaSecondaryTable javaSecondaryTable) {
-		return buildSecondaryTable(new VirtualXmlSecondaryTable(javaSecondaryTable));
-	}
-	
-	protected void updateTableGenerator(XmlEntity entity) {
-		if (entity.getTableGenerator() == null) {
-			if (getTableGenerator() != null) {
-				setTableGenerator(null);
-			}
-		}
-		else {
-			if (getTableGenerator() == null) {
-				setTableGenerator(buildTableGenerator(entity.getTableGenerator()));
-			}
-			else {
-				getTableGenerator().update(entity.getTableGenerator());
-			}
-		}
-	}
-	
-	protected void updateSequenceGenerator(XmlEntity entity) {
-		if (entity.getSequenceGenerator() == null) {
-			if (getSequenceGenerator() != null) {
-				setSequenceGenerator(null);
-			}
-		}
-		else {
-			if (getSequenceGenerator() == null) {
-				setSequenceGenerator(buildSequenceGenerator(entity.getSequenceGenerator()));
-			}
-			else {
-				getSequenceGenerator().update(entity.getSequenceGenerator());
-			}
-		}
-	}
-
-	protected InheritanceType specifiedInheritanceStrategy(Inheritance inheritanceResource) {
-		if (inheritanceResource == null) {
-			return null;
-		}
-		return InheritanceType.fromOrmResourceModel(inheritanceResource.getStrategy());
-	}
-	
-	protected InheritanceType defaultInheritanceStrategy() {
-		if (inheritanceResource() == null && !isMetadataComplete()) {
-			if (getJavaEntity() != null) {
-				return getJavaEntity().getInheritanceStrategy();
-			}
-		}
-		if (getRootEntity() == this) {
-			return InheritanceType.SINGLE_TABLE;
-		}
-		return getRootEntity().getInheritanceStrategy();
-	}
-	
-	protected void updateSpecifiedPrimaryKeyJoinColumns(XmlEntity entity) {
-		ListIterator<OrmPrimaryKeyJoinColumn> primaryKeyJoinColumns = specifiedPrimaryKeyJoinColumns();
-		ListIterator<XmlPrimaryKeyJoinColumn> resourcePrimaryKeyJoinColumns = new CloneListIterator<XmlPrimaryKeyJoinColumn>(entity.getPrimaryKeyJoinColumns());//prevent ConcurrentModificiationException
-		
-		while (primaryKeyJoinColumns.hasNext()) {
-			OrmPrimaryKeyJoinColumn primaryKeyJoinColumn = primaryKeyJoinColumns.next();
-			if (resourcePrimaryKeyJoinColumns.hasNext()) {
-				primaryKeyJoinColumn.update(resourcePrimaryKeyJoinColumns.next());
-			}
-			else {
-				removeSpecifiedPrimaryKeyJoinColumn_(primaryKeyJoinColumn);
-			}
-		}
-		
-		while (resourcePrimaryKeyJoinColumns.hasNext()) {
-			addSpecifiedPrimaryKeyJoinColumn(specifiedPrimaryKeyJoinColumnsSize(), buildPrimaryKeyJoinColumn(resourcePrimaryKeyJoinColumns.next()));
-		}
-	}
-	
-	//if there are any specified pkJoinColumns, then no default pkJoinColumns
-	//if the java has specified pkJoinColumns, then those are the default pkJoinColumns
-	//otherwise, just 1 pkJoinColumn, defaults being null if multiple primaryKey columns
-	protected void updateDefaultPrimaryKeyJoinColumns() {
-		ListIterator<OrmPrimaryKeyJoinColumn> defaultPkJoinColumns = defaultPrimaryKeyJoinColumns();
-		ListIterator<JavaPrimaryKeyJoinColumn> javaPkJoinColumns = EmptyListIterator.instance();
-		
-		if (getJavaEntity() != null && !isMetadataComplete() && specifiedPrimaryKeyJoinColumnsSize() == 0) {
-			javaPkJoinColumns = getJavaEntity().primaryKeyJoinColumns();
-		}
-		while (defaultPkJoinColumns.hasNext()) {
-			OrmPrimaryKeyJoinColumn defaultPkJoinColumn = defaultPkJoinColumns.next();
-			if (javaPkJoinColumns.hasNext()) {
-				JavaPrimaryKeyJoinColumn javaPkJoinColumn = javaPkJoinColumns.next();
-				defaultPkJoinColumn.update(new VirtualXmlPrimaryKeyJoinColumn(javaPkJoinColumn));
-			}
-			else {
-				if (defaultPrimaryKeyJoinColumnsSize() == 1) {
-					defaultPkJoinColumn.update(null);
-				}
-				else {
-					removeDefaultPrimaryKeyJoinColumn(defaultPkJoinColumn);
-				}
-			}
-		}
-		
-		while (javaPkJoinColumns.hasNext()) {
-			JavaPrimaryKeyJoinColumn javaPkJoinColumn = javaPkJoinColumns.next();
-			addDefaultPrimaryKeyJoinColumn(buildVirtualPrimaryKeyJoinColumn(javaPkJoinColumn));
-		}
-		
-		if (defaultPrimaryKeyJoinColumnsSize() == 0 && specifiedPrimaryKeyJoinColumnsSize() == 0) {
-			addDefaultPrimaryKeyJoinColumn(buildPrimaryKeyJoinColumn(null));
-		}
-	}
-	
-	protected OrmPrimaryKeyJoinColumn buildVirtualPrimaryKeyJoinColumn(JavaPrimaryKeyJoinColumn javaSecondaryTable) {
-		return buildPrimaryKeyJoinColumn(new VirtualXmlPrimaryKeyJoinColumn(javaSecondaryTable));
-	}
-	
-	protected OrmPrimaryKeyJoinColumn buildPrimaryKeyJoinColumn(XmlPrimaryKeyJoinColumn primaryKeyJoinColumn) {
-		OrmPrimaryKeyJoinColumn ormPrimaryKeyJoinColumn = getJpaFactory().buildOrmPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner());
-		ormPrimaryKeyJoinColumn.initialize(primaryKeyJoinColumn);
-		return ormPrimaryKeyJoinColumn;
-	}
-
-	protected void updateSpecifiedAttributeOverrides(XmlEntity entity) {
-		ListIterator<OrmAttributeOverride> attributeOverrides = specifiedAttributeOverrides();
-		ListIterator<XmlAttributeOverride> resourceAttributeOverrides = new CloneListIterator<XmlAttributeOverride>(entity.getAttributeOverrides());//prevent ConcurrentModificiationException
-		
-		while (attributeOverrides.hasNext()) {
-			OrmAttributeOverride attributeOverride = attributeOverrides.next();
-			if (resourceAttributeOverrides.hasNext()) {
-				attributeOverride.update(resourceAttributeOverrides.next());
-			}
-			else {
-				removeSpecifiedAttributeOverride_(attributeOverride);
-			}
-		}
-		
-		while (resourceAttributeOverrides.hasNext()) {
-			addSpecifiedAttributeOverride(specifiedAttributeOverridesSize(), buildAttributeOverride(resourceAttributeOverrides.next()));
-		}
-	}
-	
-	protected void updateVirtualAttributeOverrides() {
-		Iterator<PersistentAttribute> overridableAttributes = allOverridableAttributes();
-		ListIterator<OrmAttributeOverride> virtualAttributeOverrides = virtualAttributeOverrides();
-		
-		for (PersistentAttribute persistentAttribute : CollectionTools.iterable(overridableAttributes)) {
-			OrmAttributeOverride ormAttributeOverride = getAttributeOverrideNamed(persistentAttribute.getName());
-			if (ormAttributeOverride != null && !ormAttributeOverride.isVirtual()) {
-				continue;
-			}
-			JavaAttributeOverride javaAttributeOverride = null;
-			if (getJavaEntity() != null) {
-				javaAttributeOverride = getJavaEntity().getAttributeOverrideNamed(persistentAttribute.getName());
-			}
-			if (ormAttributeOverride != null) {
-				if (virtualAttributeOverrides.hasNext()) {
-					OrmAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next();
-					virtualAttributeOverride.update(buildVirtualXmlAttributeOverride(persistentAttribute, javaAttributeOverride));
-				}
-				else {
-					addVirtualAttributeOverride(buildVirtualAttributeOverride(persistentAttribute, javaAttributeOverride));
-				}
-			}
-			else {
-				addVirtualAttributeOverride(buildVirtualAttributeOverride(persistentAttribute, javaAttributeOverride));
-			}
-		}
-		for (OrmAttributeOverride virtualAttributeOverride : CollectionTools.iterable(virtualAttributeOverrides)) {
-			removeVirtualAttributeOverride(virtualAttributeOverride);
-		}
-	}
-	
-	protected OrmAttributeOverride buildAttributeOverride(XmlAttributeOverride attributeOverride) {
-		return getJpaFactory().buildOrmAttributeOverride(this, createAttributeOverrideOwner(), attributeOverride);
-	}
-
-	protected AttributeOverride.Owner createAttributeOverrideOwner() {
-		return new AttributeOverrideOwner();
-	}
-
-	protected void updateSpecifiedAssociationOverrides(XmlEntity entity) {
-		ListIterator<OrmAssociationOverride> associationOverrides = specifiedAssociationOverrides();
-		ListIterator<XmlAssociationOverride> resourceAssociationOverrides = new CloneListIterator<XmlAssociationOverride>(entity.getAssociationOverrides());//prevent ConcurrentModificiationException
-		
-		while (associationOverrides.hasNext()) {
-			OrmAssociationOverride associationOverride = associationOverrides.next();
-			if (resourceAssociationOverrides.hasNext()) {
-				associationOverride.update(resourceAssociationOverrides.next());
-			}
-			else {
-				removeSpecifiedAssociationOverride_(associationOverride);
-			}
-		}
-		
-		while (resourceAssociationOverrides.hasNext()) {
-			addSpecifiedAssociationOverride(specifiedAssociationOverridesSize(), buildAssociationOverride(resourceAssociationOverrides.next()));
-		}
-	}
-	
-	protected OrmAssociationOverride buildAssociationOverride(XmlAssociationOverride associationOverride) {
-		return getJpaFactory().buildOrmAssociationOverride(this, createAssociationOverrideOwner(), associationOverride);
-	}
-
-	protected AssociationOverride.Owner createAssociationOverrideOwner() {
-		return new AssociationOverrideOwner();
-	}
-	
-	protected void updateNamedQueries(XmlEntity entity) {
-		ListIterator<OrmNamedQuery> namedQueries = namedQueries();
-		ListIterator<XmlNamedQuery> resourceNamedQueries = new CloneListIterator<XmlNamedQuery>(entity.getNamedQueries());//prevent ConcurrentModificiationException
-		
-		while (namedQueries.hasNext()) {
-			OrmNamedQuery namedQuery = namedQueries.next();
-			if (resourceNamedQueries.hasNext()) {
-				namedQuery.update(resourceNamedQueries.next());
-			}
-			else {
-				removeNamedQuery_(namedQuery);
-			}
-		}
-		
-		while (resourceNamedQueries.hasNext()) {
-			addNamedQuery(namedQueriesSize(), buildNamedQuery(resourceNamedQueries.next()));
-		}
-	}
-
-	protected OrmNamedQuery buildNamedQuery(XmlNamedQuery namedQuery) {
-		OrmNamedQuery ormNamedQuery = getJpaFactory().buildOrmNamedQuery(this);
-		ormNamedQuery.initialize(namedQuery);
-		return ormNamedQuery;
-	}
-
-	protected void updateNamedNativeQueries(XmlEntity entity) {
-		ListIterator<OrmNamedNativeQuery> namedNativeQueries = namedNativeQueries();
-		ListIterator<XmlNamedNativeQuery> resourceNamedNativeQueries = new CloneListIterator<XmlNamedNativeQuery>(entity.getNamedNativeQueries());//prevent ConcurrentModificiationException
-		
-		while (namedNativeQueries.hasNext()) {
-			OrmNamedNativeQuery namedQuery = namedNativeQueries.next();
-			if (resourceNamedNativeQueries.hasNext()) {
-				namedQuery.update(resourceNamedNativeQueries.next());
-			}
-			else {
-				removeNamedNativeQuery_(namedQuery);
-			}
-		}
-		
-		while (resourceNamedNativeQueries.hasNext()) {
-			addNamedNativeQuery(namedNativeQueriesSize(), buildNamedNativeQuery(resourceNamedNativeQueries.next()));
-		}
-	}
-
-	protected OrmNamedNativeQuery buildNamedNativeQuery(XmlNamedNativeQuery namedQuery) {
-		OrmNamedNativeQuery ormNamedNativeQuery = getJpaFactory().buildOrmNamedNativeQuery(this);
-		ormNamedNativeQuery.initialize(namedQuery);
-		return ormNamedNativeQuery;
-	}
-	
-	protected void updateIdClass(XmlIdClass idClassResource) {
-		this.setIdClass_(this.idClass(idClassResource));
-	}
-	
-	protected void updatePersistenceUnitGeneratorsAndQueries() {
-		if (getTableGenerator() != null) {
-			getPersistenceUnit().addGenerator(getTableGenerator());
-		}
-		
-		if (getSequenceGenerator() != null) {
-			getPersistenceUnit().addGenerator(getSequenceGenerator());
-		}
-		
-		for (Query query : CollectionTools.iterable(namedQueries())) {
-			getPersistenceUnit().addQuery(query);
-		}
-		
-		for (Query query : CollectionTools.iterable(namedNativeQueries())) {
-			getPersistenceUnit().addQuery(query);
-		}
-	}
-	
-	
-	// *************************************************************************
-	
-	public String getPrimaryKeyColumnName() {
-		return getPrimaryKeyColumnName(getPersistentType().allAttributes());
-	}
-	
-	//copied in GenericJavaEntity to avoid an API change for fixing bug 229423 in RC1
-	public String getPrimaryKeyColumnName(Iterator<PersistentAttribute> attributes) {
-		String pkColumnName = null;
-		for (Iterator<PersistentAttribute> stream = attributes; stream.hasNext();) {
-			PersistentAttribute attribute = stream.next();
-			String name = attribute.getPrimaryKeyColumnName();
-			if (name != null) {
-				//if the attribute is a primary key then we need to check if there is an attribute override
-				//and use its column name instead (bug 229423)
-				AttributeOverride attributeOverride = getAttributeOverrideNamed(attribute.getName());
-				if (attributeOverride != null) {
-					name = attributeOverride.getColumn().getName();
-				}
-			}
-			if (pkColumnName == null) {
-				pkColumnName = name;
-			}
-			else if (name != null) {
-				// if we encounter a composite primary key, return null
-				return null;
-			}
-		}
-		// if we encounter only a single primary key column name, return it
-		return pkColumnName;
-	}
-
-	//**********  Validation **************************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		getTable().addToMessages(messages);	
-		addIdMessages(messages);
-		addGeneratorMessages(messages);
-		addQueryMessages(messages);
-		for (OrmSecondaryTable secondaryTable : CollectionTools.iterable(secondaryTables())) {
-			secondaryTable.addToMessages(messages);
-		}
-
-		for (OrmAttributeOverride attributeOverride : CollectionTools.iterable(attributeOverrides())) {
-			attributeOverride.addToMessages(messages);
-		}
-
-		for (OrmAssociationOverride associationOverride : CollectionTools.iterable(associationOverrides())) {
-			associationOverride.addToMessages(messages);
-		}
-	}
-	
-	protected void addIdMessages(List<IMessage> messages) {
-		addNoIdMessage(messages);
-	}
-	
-	protected void addNoIdMessage(List<IMessage> messages) {
-		if (entityHasNoId()) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					JpaValidationMessages.ENTITY_NO_ID,
-					new String[] {this.getName()},
-					this, 
-					this.getValidationTextRange())
-			);
-		}
-	}
-	
-	private boolean entityHasNoId() {
-		return ! this.entityHasId();
-	}
-	
-	protected void addGeneratorMessages(List<IMessage> messages) {
-		List<Generator> masterList = CollectionTools.list(getPersistenceUnit().allGenerators());
-		
-		for (Iterator<OrmGenerator> stream = this.generators(); stream.hasNext() ; ) {
-			OrmGenerator current = stream.next();
-			masterList.remove(current);
-			
-			for (Generator each : masterList) {
-				if (! each.overrides(current) && each.getName() != null && each.getName().equals(current.getName())) {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.GENERATOR_DUPLICATE_NAME,
-							new String[] {current.getName()},
-							current,
-							current.getNameTextRange())
-					);
-				}
-			}
-		
-			masterList.add(current);
-		}
-	}
-	
-	protected void addQueryMessages(List<IMessage> messages) {
-		List<Query> masterList = CollectionTools.list(getPersistenceUnit().allQueries());
-		
-		for (Iterator<OrmQuery> stream = this.queries(); stream.hasNext() ; ) {
-			OrmQuery current = stream.next();
-			masterList.remove(current);
-			
-			for (Query each : masterList) {
-				if (! each.overrides(current) && each.getName() != null && each.getName().equals(current.getName())) {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.QUERY_DUPLICATE_NAME,
-							new String[] {current.getName()},
-							current,
-							current.getNameTextRange())
-					);
-				}
-			}
-			
-			masterList.add(current);
-		}
-	}
-
-	private boolean entityHasId() {
-		for (Iterator<PersistentAttribute> stream = this.getPersistentType().allAttributes(); stream.hasNext(); ) {
-			if (stream.next().isIdAttribute()) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	public TypeMapping typeMapping() {
-		return this;
-	}
-	
-	public void removeFromResourceModel(XmlEntityMappings entityMappings) {
-		entityMappings.getEntities().remove(this.getTypeMappingResource());
-	}
-	
-	public XmlEntity addToResourceModel(XmlEntityMappings entityMappings) {
-		XmlEntity entity = OrmFactory.eINSTANCE.createXmlEntity();
-		getPersistentType().initialize(entity);
-		entityMappings.getEntities().add(entity);
-		return entity;
-	}
-	
-	@Override
-	public void toString(StringBuilder sb) {
-		super.toString(sb);
-		sb.append(getName());
-	}
-	
-	class PrimaryKeyJoinColumnOwner implements OrmBaseJoinColumn.Owner
-	{
-		public TypeMapping getTypeMapping() {
-			return GenericOrmEntity.this;
-		}
-
-		public org.eclipse.jpt.db.Table getDbTable(String tableName) {
-			return GenericOrmEntity.this.getDbTable(tableName);
-		}
-
-		public org.eclipse.jpt.db.Table getDbReferencedColumnTable() {
-			Entity parentEntity = GenericOrmEntity.this.getParentEntity();
-			return (parentEntity == null) ? null : parentEntity.getPrimaryDbTable();
-		}
-
-		public int joinColumnsSize() {
-			return GenericOrmEntity.this.primaryKeyJoinColumnsSize();
-		}
-		
-		public boolean isVirtual(BaseJoinColumn joinColumn) {
-			return GenericOrmEntity.this.defaultPrimaryKeyJoinColumns.contains(joinColumn);
-		}
-		
-		public String getDefaultColumnName() {
-			if (joinColumnsSize() != 1) {
-				return null;
-			}
-			return GenericOrmEntity.this.getParentEntity().getPrimaryKeyColumnName();
-		}
-		
-		public TextRange getValidationTextRange() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-	}
-	
-	class AttributeOverrideOwner implements AttributeOverride.Owner {
-
-		public ColumnMapping getColumnMapping(String attributeName) {
-			if (attributeName == null) {
-				return null;
-			}
-			for (Iterator<PersistentAttribute> stream = getPersistentType().allAttributes(); stream.hasNext();) {
-				PersistentAttribute persAttribute = stream.next();
-				if (attributeName.equals(persAttribute.getName())) {
-					if (persAttribute.getMapping() instanceof ColumnMapping) {
-						return (ColumnMapping) persAttribute.getMapping();
-					}
-				}
-			}
-			return null;
-		}
-
-		public boolean isVirtual(BaseOverride override) {
-			return GenericOrmEntity.this.virtualAttributeOverrides.contains(override);
-		}
-
-		public BaseOverride setVirtual(boolean virtual, BaseOverride override) {
-			return GenericOrmEntity.this.setAttributeOverrideVirtual(virtual, (OrmAttributeOverride) override);
-		}
-
-		public TypeMapping getTypeMapping() {
-			return GenericOrmEntity.this;
-		}
-		
-	}
-
-	class AssociationOverrideOwner implements AssociationOverride.Owner {
-
-		public RelationshipMapping getRelationshipMapping(String attributeName) {
-			if (attributeName == null) {
-				return null;
-			}
-			for (Iterator<PersistentAttribute> stream = getPersistentType().allAttributes(); stream.hasNext();) {
-				PersistentAttribute persAttribute = stream.next();
-				if (attributeName.equals(persAttribute.getName())) {
-					if (persAttribute.getMapping() instanceof RelationshipMapping) {
-						return (RelationshipMapping) persAttribute.getMapping();
-					}
-				}
-			}
-			return null;
-		}
-
-		public boolean isVirtual(BaseOverride override) {
-			return GenericOrmEntity.this.virtualAssociationOverrides.contains(override);
-		}
-
-		public BaseOverride setVirtual(boolean virtual, BaseOverride override) {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public TypeMapping getTypeMapping() {
-			return GenericOrmEntity.this;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmGeneratedValue.java
deleted file mode 100644
index 2fe5dac4af..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmGeneratedValue.java
+++ /dev/null
@@ -1,130 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.GeneratedValue;
-import org.eclipse.jpt.core.context.GenerationType;
-import org.eclipse.jpt.core.context.orm.OrmGeneratedValue;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.resource.orm.XmlGeneratedValue;
-import org.eclipse.jpt.core.utility.TextRange;
-
-public class GenericOrmGeneratedValue extends AbstractOrmJpaContextNode implements OrmGeneratedValue
-{
-
-	protected GenerationType specifiedStrategy;
-
-	protected String specifiedGenerator;
-	protected String defaultGenerator;
-
-	protected XmlGeneratedValue generatedValue;
-	
-	public GenericOrmGeneratedValue(OrmJpaContextNode parent) {
-		super(parent);
-	}
-	
-	@Override
-	public OrmJpaContextNode getParent() {
-		return (OrmJpaContextNode) super.getParent();
-	}
-	
-	public GenerationType getStrategy() {
-		return (this.getSpecifiedStrategy() == null) ? this.getDefaultStrategy() : this.getSpecifiedStrategy();
-	}
-
-	public GenerationType getDefaultStrategy() {
-		return GeneratedValue.DEFAULT_STRATEGY;
-	}
-	
-	public GenerationType getSpecifiedStrategy() {
-		return this.specifiedStrategy;
-	}
-
-	public void setSpecifiedStrategy(GenerationType newSpecifiedStrategy) {
-		GenerationType oldStrategy = this.specifiedStrategy;
-		this.specifiedStrategy = newSpecifiedStrategy;
-		this.generatedValue.setStrategy(GenerationType.toOrmResourceModel(newSpecifiedStrategy));
-		firePropertyChanged(SPECIFIED_STRATEGY_PROPERTY, oldStrategy, newSpecifiedStrategy);
-	}
-	
-	protected void setSpecifiedStrategy_(GenerationType newSpecifiedStrategy) {
-		GenerationType oldStrategy = this.specifiedStrategy;
-		this.specifiedStrategy = newSpecifiedStrategy;
-		firePropertyChanged(SPECIFIED_STRATEGY_PROPERTY, oldStrategy, newSpecifiedStrategy);
-	}
-
-	public String getGenerator() {
-		return (this.getSpecifiedGenerator() == null) ? this.getDefaultGenerator() : this.getSpecifiedGenerator();
-	}
-
-	public String getDefaultGenerator() {
-		return this.defaultGenerator;
-	}
-	
-	protected void setDefaultGenerator(String newDefaultGenerator) {
-		String oldGenerator = this.defaultGenerator;
-		this.defaultGenerator = newDefaultGenerator;
-		firePropertyChanged(DEFAULT_GENERATOR_PROPERTY, oldGenerator, newDefaultGenerator);
-	}
-
-	public String getSpecifiedGenerator() {
-		return this.specifiedGenerator;
-	}
-
-	public void setSpecifiedGenerator(String newSpecifiedGenerator) {
-		String oldGenerator = this.specifiedGenerator;
-		this.specifiedGenerator = newSpecifiedGenerator;
-		this.generatedValue.setGenerator(newSpecifiedGenerator);
-		firePropertyChanged(SPECIFIED_GENERATOR_PROPERTY, oldGenerator, newSpecifiedGenerator);
-	}
-
-	protected void setSpecifiedGenerator_(String newSpecifiedGenerator) {
-		String oldGenerator = this.specifiedGenerator;
-		this.specifiedGenerator = newSpecifiedGenerator;
-		firePropertyChanged(SPECIFIED_GENERATOR_PROPERTY, oldGenerator, newSpecifiedGenerator);
-	}
-
-	public TextRange getGeneratorTextRange() {
-		TextRange textRange =  this.generatedValue.getGeneratorTextRange();
-		return textRange != null ? textRange : getValidationTextRange();
-	}
-
-	
-	// ********** resource model -> java context model **********
-
-	public void initialize(XmlGeneratedValue generatedValue) {
-		this.generatedValue = generatedValue;
-		this.specifiedStrategy = this.strategy(generatedValue);
-		this.specifiedGenerator = this.generator(generatedValue);
-		//TODO
-		this.defaultGenerator = null;
-	}
-
-	public void update(XmlGeneratedValue generatedValue) {
-		this.generatedValue = generatedValue;
-		this.setSpecifiedStrategy_(this.strategy(generatedValue));
-		this.setSpecifiedGenerator_(this.generator(generatedValue));
-		//TODO
-		this.setDefaultGenerator(null);
-	}
-
-	protected GenerationType strategy(XmlGeneratedValue generatedValue) {
-		return GenerationType.fromOrmResourceModel(generatedValue.getStrategy());
-	}
-	
-	protected String generator(XmlGeneratedValue generatedValue) {
-		return generatedValue.getGenerator();
-	}
-	
-	public TextRange getValidationTextRange() {
-		TextRange validationTextRange = this.generatedValue.getValidationTextRange();
-		return validationTextRange != null ? validationTextRange : getParent().getValidationTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmIdMapping.java
deleted file mode 100644
index 04b3f75f3b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmIdMapping.java
+++ /dev/null
@@ -1,494 +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.core.internal.context.orm;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.ColumnMapping;
-import org.eclipse.jpt.core.context.Generator;
-import org.eclipse.jpt.core.context.TemporalType;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmColumn;
-import org.eclipse.jpt.core.context.orm.OrmColumnMapping;
-import org.eclipse.jpt.core.context.orm.OrmGeneratedValue;
-import org.eclipse.jpt.core.context.orm.OrmGenerator;
-import org.eclipse.jpt.core.context.orm.OrmIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmSequenceGenerator;
-import org.eclipse.jpt.core.context.orm.OrmTableGenerator;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlColumn;
-import org.eclipse.jpt.core.resource.orm.XmlGeneratedValue;
-import org.eclipse.jpt.core.resource.orm.XmlId;
-import org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator;
-import org.eclipse.jpt.core.resource.orm.XmlTableGenerator;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CompositeIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.SingleElementIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId>
-	implements OrmIdMapping
-{
-	protected final OrmColumn column;
-
-	protected OrmGeneratedValue generatedValue;
-	
-	protected TemporalType temporal;
-	
-	protected OrmTableGenerator tableGenerator;
-	protected OrmSequenceGenerator sequenceGenerator;
-
-	
-	public GenericOrmIdMapping(OrmPersistentAttribute parent) {
-		super(parent);
-		this.column = getJpaFactory().buildOrmColumn(this, this);
-	}
-
-
-	public String getKey() {
-		return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public int getXmlSequence() {
-		return 0;
-	}
-
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmIdMapping(this);
-	}
-
-	@Override
-	public void initializeFromXmlColumnMapping(OrmColumnMapping oldMapping) {
-		super.initializeFromXmlColumnMapping(oldMapping);
-		setTemporal(oldMapping.getTemporal());
-		getColumn().initializeFrom(oldMapping.getColumn());
-	}
-
-	
-	public OrmColumn getColumn() {
-		return this.column;
-	}
-
-	public TemporalType getTemporal() {
-		return this.temporal;
-	}
-
-	public void setTemporal(TemporalType newTemporal) {
-		TemporalType oldTemporal = this.temporal;
-		this.temporal = newTemporal;
-		this.getAttributeMapping().setTemporal(TemporalType.toOrmResourceModel(newTemporal));
-		firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal);
-	}
-	
-	protected void setTemporal_(TemporalType newTemporal) {
-		TemporalType oldTemporal = this.temporal;
-		this.temporal = newTemporal;
-		firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal);
-	}
-
-	public OrmGeneratedValue addGeneratedValue() {
-		if (getGeneratedValue() != null) {
-			throw new IllegalStateException("gemeratedValue already exists");
-		}
-		this.generatedValue = getJpaFactory().buildOrmGeneratedValue(this);
-		this.getAttributeMapping().setGeneratedValue(OrmFactory.eINSTANCE.createXmlGeneratedValueImpl());
-		firePropertyChanged(GENERATED_VALUE_PROPERTY, null, this.generatedValue);
-		return this.generatedValue;
-	}
-	
-	public void removeGeneratedValue() {
-		if (getGeneratedValue() == null) {
-			throw new IllegalStateException("gemeratedValue does not exist, cannot be removed");
-		}
-		OrmGeneratedValue oldGeneratedValue = this.generatedValue;
-		this.generatedValue = null;
-		this.getAttributeMapping().setGeneratedValue(null);
-		firePropertyChanged(GENERATED_VALUE_PROPERTY, oldGeneratedValue, null);
-	}
-	
-	public OrmGeneratedValue getGeneratedValue() {
-		return this.generatedValue;
-	}
-	
-	protected void setGeneratedValue(OrmGeneratedValue newGeneratedValue) {
-		OrmGeneratedValue oldGeneratedValue = this.generatedValue;
-		this.generatedValue = newGeneratedValue;
-		firePropertyChanged(GENERATED_VALUE_PROPERTY, oldGeneratedValue, newGeneratedValue);
-	}
-
-	public OrmSequenceGenerator addSequenceGenerator() {
-		if (getSequenceGenerator() != null) {
-			throw new IllegalStateException("sequenceGenerator already exists");
-		}
-		this.sequenceGenerator = getJpaFactory().buildOrmSequenceGenerator(this);
-		this.getAttributeMapping().setSequenceGenerator(OrmFactory.eINSTANCE.createXmlSequenceGeneratorImpl());
-		firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, null, this.sequenceGenerator);
-		return this.sequenceGenerator;
-	}
-	
-	public void removeSequenceGenerator() {
-		if (getSequenceGenerator() == null) {
-			throw new IllegalStateException("sequenceGenerator does not exist, cannot be removed");
-		}
-		OrmSequenceGenerator oldSequenceGenerator = this.sequenceGenerator;
-		this.sequenceGenerator = null;
-		this.getAttributeMapping().setSequenceGenerator(null);
-		firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, oldSequenceGenerator, null);
-	}
-	
-	public OrmSequenceGenerator getSequenceGenerator() {
-		return this.sequenceGenerator;
-	}
-
-	protected void setSequenceGenerator(OrmSequenceGenerator newSequenceGenerator) {
-		OrmSequenceGenerator oldSequenceGenerator = this.sequenceGenerator;
-		this.sequenceGenerator = newSequenceGenerator;
-		firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, oldSequenceGenerator, newSequenceGenerator);
-	}
-
-	public OrmTableGenerator addTableGenerator() {
-		if (getTableGenerator() != null) {
-			throw new IllegalStateException("tableGenerator already exists");
-		}
-		this.tableGenerator = getJpaFactory().buildOrmTableGenerator(this);
-		this.getAttributeMapping().setTableGenerator(OrmFactory.eINSTANCE.createXmlTableGeneratorImpl());
-		firePropertyChanged(TABLE_GENERATOR_PROPERTY, null, this.tableGenerator);
-		return this.tableGenerator;
-	}
-	
-	public void removeTableGenerator() {
-		if (getTableGenerator() == null) {
-			throw new IllegalStateException("tableGenerator does not exist, cannot be removed");
-		}
-		OrmTableGenerator oldTableGenerator = this.tableGenerator;
-		this.tableGenerator = null;
-		this.getAttributeMapping().setTableGenerator(null);
-		firePropertyChanged(TABLE_GENERATOR_PROPERTY, oldTableGenerator, null);	
-	}
-	
-	public OrmTableGenerator getTableGenerator() {
-		return this.tableGenerator;
-	}
-
-	protected void setTableGenerator(OrmTableGenerator newTableGenerator) {
-		OrmTableGenerator oldTableGenerator = this.tableGenerator;
-		this.tableGenerator = newTableGenerator;
-		firePropertyChanged(TABLE_GENERATOR_PROPERTY, oldTableGenerator, newTableGenerator);
-	}
-	
-	@SuppressWarnings("unchecked")
-	protected Iterator<OrmGenerator> generators() {
-		return new CompositeIterator<OrmGenerator>(
-			(getSequenceGenerator() == null) ? EmptyIterator.instance() : new SingleElementIterator(getSequenceGenerator()),
-			(getTableGenerator() == null) ? EmptyIterator.instance() : new SingleElementIterator(getTableGenerator()));
-	}
-
-	@Override
-	public String getPrimaryKeyColumnName() {
-		return this.getColumn().getName();
-	}
-
-	@Override
-	public boolean isOverridableAttributeMapping() {
-		return true;
-	}
-
-	@Override
-	public boolean isIdMapping() {
-		return true;
-	}
-	
-	public XmlId addToResourceModel(AbstractXmlTypeMapping typeMapping) {
-		XmlId id = OrmFactory.eINSTANCE.createXmlIdImpl();
-		getPersistentAttribute().initialize(id);
-		typeMapping.getAttributes().getIds().add(id);
-		return id;
-	}
-	
-	public void removeFromResourceModel(AbstractXmlTypeMapping typeMapping) {
-		typeMapping.getAttributes().getIds().remove(this.getAttributeMapping());
-		if (typeMapping.getAttributes().isAllFeaturesUnset()) {
-			typeMapping.setAttributes(null);
-		}
-	}
-
-	public Table getDbTable(String tableName) {
-		return getTypeMapping().getDbTable(tableName);
-	}
-
-	public String getDefaultColumnName() {		
-		return getAttributeName();
-	}
-
-	public String getDefaultTableName() {
-		return getTypeMapping().getTableName();
-	}
-	
-	@Override
-	public void initialize(XmlId id) {
-		super.initialize(id);
-		this.temporal = this.specifiedTemporal(id);
-		this.column.initialize(id.getColumn());
-		this.initializeSequenceGenerator(id);
-		this.initializeTableGenerator(id);
-		this.initializeGeneratedValue(id);
-		this.updatePersistenceUnitGenerators();
-	}
-	
-	protected TemporalType specifiedTemporal(XmlId id) {
-		return TemporalType.fromOrmResourceModel(id.getTemporal());
-	}
-	
-	protected void initializeSequenceGenerator(XmlId id) {
-		if (id.getSequenceGenerator() != null) {
-			this.sequenceGenerator = buildSequenceGenerator(id.getSequenceGenerator());
-		}
-	}
-	
-	protected OrmSequenceGenerator buildSequenceGenerator(XmlSequenceGenerator xmlSequenceGenerator) {
-		OrmSequenceGenerator sequenceGenerator = getJpaFactory().buildOrmSequenceGenerator(this);
-		sequenceGenerator.initialize(xmlSequenceGenerator);
-		return sequenceGenerator;
-	}
-
-	protected void initializeTableGenerator(XmlId id) {
-		if (id.getTableGenerator() != null) {
-			this.tableGenerator = buildTableGenerator(id.getTableGenerator());
-		}
-	}
-	
-	protected OrmTableGenerator buildTableGenerator(XmlTableGenerator tableGeneratorResource) {
-		OrmTableGenerator tableGenerator = getJpaFactory().buildOrmTableGenerator(this);
-		tableGenerator.initialize(tableGeneratorResource);
-		return tableGenerator;
-	}
-
-	protected void initializeGeneratedValue(XmlId id) {
-		if (id.getGeneratedValue() != null) {
-			this.generatedValue = buildGeneratedValue(id.getGeneratedValue());
-		}
-	}
-	
-	protected OrmGeneratedValue buildGeneratedValue(XmlGeneratedValue xmlGeneratedValue) {
-		OrmGeneratedValue ormGeneratedValue = getJpaFactory().buildOrmGeneratedValue(this);
-		ormGeneratedValue.initialize(xmlGeneratedValue);
-		return ormGeneratedValue;
-	}
-	@Override
-	public void update(XmlId id) {
-		super.update(id);
-		this.setTemporal_(this.specifiedTemporal(id));
-		this.column.update(id.getColumn());
-		this.updateSequenceGenerator(id);
-		this.updateTableGenerator(id);
-		this.updateGeneratedValue(id);
-		this.updatePersistenceUnitGenerators();
-	}
-	
-	protected void updateSequenceGenerator(XmlId id) {
-		if (id.getSequenceGenerator() == null) {
-			if (getSequenceGenerator() != null) {
-				setSequenceGenerator(null);
-			}
-		}
-		else {
-			if (getSequenceGenerator() == null) {
-				setSequenceGenerator(buildSequenceGenerator(id.getSequenceGenerator()));
-			}
-			else {
-				getSequenceGenerator().update(id.getSequenceGenerator());
-			}
-		}
-	}
-	
-	protected void updateTableGenerator(XmlId id) {
-		if (id.getTableGenerator() == null) {
-			if (getTableGenerator() != null) {
-				setTableGenerator(null);
-			}
-		}
-		else {
-			if (getTableGenerator() == null) {
-				setTableGenerator(buildTableGenerator(id.getTableGenerator()));
-			}
-			else {
-				getTableGenerator().update(id.getTableGenerator());
-			}
-		}
-	}
-	
-	protected void updateGeneratedValue(XmlId id) {
-		if (id.getGeneratedValue() == null) {
-			if (getGeneratedValue() != null) {
-				setGeneratedValue(null);
-			}
-		}
-		else {
-			if (getGeneratedValue() == null) {
-				setGeneratedValue(buildGeneratedValue(id.getGeneratedValue()));
-				getGeneratedValue().initialize(id.getGeneratedValue());
-			}
-			else {
-				getGeneratedValue().update(id.getGeneratedValue());
-			}
-		}
-	}
-	
-	protected void updatePersistenceUnitGenerators() {
-		if (getTableGenerator() != null) {
-			getPersistenceUnit().addGenerator(getTableGenerator());
-		}
-		
-		if (getSequenceGenerator() != null) {
-			getPersistenceUnit().addGenerator(getSequenceGenerator());
-		}
-	}
-
-	//***************** IXmlColumn.Owner implementation ****************
-	
-	public XmlColumn getColumnResource() {
-		return this.getAttributeMapping().getColumn();
-	}
-	
-	public void addColumnResource() {
-		this.getAttributeMapping().setColumn(OrmFactory.eINSTANCE.createXmlColumnImpl());
-	}
-	
-	public void removeColumnResource() {
-		this.getAttributeMapping().setColumn(null);
-	}
-	
-	// ****************** validation ****************
-
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		
-		if (entityOwned()) {
-			addColumnMessages(messages);
-		}
-		addGeneratedValueMessages(messages);
-		addGeneratorMessages(messages);
-	}
-	
-	protected void addColumnMessages(List<IMessage> messages) {
-		OrmColumn column = getColumn();
-		String table = column.getTable();
-		boolean doContinue = this.connectionProfileIsActive();
-		
-		if (doContinue && getTypeMapping().tableNameIsInvalid(table)) {
-			if (getPersistentAttribute().isVirtual()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_TABLE,
-						new String[] {getPersistentAttribute().getName(), table, column.getName()},
-						column, 
-						column.getTableTextRange())
-				);
-			}
-			else {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.COLUMN_UNRESOLVED_TABLE,
-						new String[] {table, column.getName()}, 
-						column, 
-						column.getTableTextRange())
-				);
-			}
-			doContinue = false;
-		}
-		
-		if (doContinue && ! column.isResolved()) {
-			if (getPersistentAttribute().isVirtual()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_NAME,
-						new String[] {getPersistentAttribute().getName(), column.getName()}, 
-						column, 
-						column.getNameTextRange())
-				);
-			}
-			else {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.COLUMN_UNRESOLVED_NAME,
-						new String[] {column.getName()}, 
-						column, 
-						column.getNameTextRange())
-				);
-			}
-		}
-	}
-	
-	protected void addGeneratedValueMessages(List<IMessage> messages) {
-		OrmGeneratedValue generatedValue = getGeneratedValue();
-		if (generatedValue == null) {
-			return;
-		}
-		String generatorName = generatedValue.getGenerator();
-		if (generatorName == null) {
-			return;
-		}
-		
-		for (Generator nextMasterGenerator : CollectionTools.iterable(getPersistenceUnit().allGenerators())) {
-			if (generatorName.equals(nextMasterGenerator.getName())) {
-				return;
-			}
-		}
-		
-		messages.add(
-			DefaultJpaValidationMessages.buildMessage(
-				IMessage.HIGH_SEVERITY,
-				JpaValidationMessages.ID_MAPPING_UNRESOLVED_GENERATOR_NAME,
-				new String[] {generatorName},
-				this,
-				generatedValue.getGeneratorTextRange())
-			);
-	}
-	
-	protected void addGeneratorMessages(List<IMessage> messages) {
-		List<Generator> masterList = CollectionTools.list(getPersistenceUnit().allGenerators());
-		
-		for (Iterator<OrmGenerator> stream = this.generators(); stream.hasNext() ; ) {
-			OrmGenerator current = stream.next();
-			if (current.isVirtual()) {
-				return;
-			}
-			masterList.remove(current);
-			
-			for (Generator each : masterList) {
-				if (! each.overrides(current) && each.getName() != null && each.getName().equals(current.getName())) {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.GENERATOR_DUPLICATE_NAME,
-							new String[] {current.getName()},
-							current,
-							current.getNameTextRange())
-					);
-				}
-			}
-			
-			masterList.add(current);
-		}
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmJoinColumn.java
deleted file mode 100644
index 6a8c21895d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmJoinColumn.java
+++ /dev/null
@@ -1,240 +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.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.JoinColumn;
-import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.orm.OrmJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.context.orm.OrmRelationshipMapping;
-import org.eclipse.jpt.core.internal.context.MappingTools;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class GenericOrmJoinColumn extends AbstractOrmBaseColumn<XmlJoinColumn> implements OrmJoinColumn
-{
-
-	protected String specifiedReferencedColumnName;
-
-	protected String defaultReferencedColumnName;
-
-	protected XmlJoinColumn joinColumn;
-
-	public GenericOrmJoinColumn(OrmJpaContextNode parent, OrmJoinColumn.Owner owner) {
-		super(parent, owner);
-	}
-
-	public void initializeFrom(JoinColumn oldColumn) {
-		super.initializeFrom(oldColumn);
-		setSpecifiedReferencedColumnName(oldColumn.getSpecifiedReferencedColumnName());
-	}
-	
-	public String getReferencedColumnName() {
-		return (this.getSpecifiedReferencedColumnName() == null) ? getDefaultReferencedColumnName() : this.getSpecifiedReferencedColumnName();
-	}
-
-	public String getSpecifiedReferencedColumnName() {
-		return this.specifiedReferencedColumnName;
-	}
-
-	public void setSpecifiedReferencedColumnName(String newSpecifiedReferencedColumnName) {
-		String oldSpecifiedReferencedColumnName = this.specifiedReferencedColumnName;
-		this.specifiedReferencedColumnName = newSpecifiedReferencedColumnName;
-		getColumnResource().setReferencedColumnName(newSpecifiedReferencedColumnName);
-		firePropertyChanged(SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, oldSpecifiedReferencedColumnName, newSpecifiedReferencedColumnName);
-	}
-	
-	public void setSpecifiedReferencedColumnName_(String newSpecifiedReferencedColumnName) {
-		String oldSpecifiedReferencedColumnName = this.specifiedReferencedColumnName;
-		this.specifiedReferencedColumnName = newSpecifiedReferencedColumnName;
-		firePropertyChanged(SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, oldSpecifiedReferencedColumnName, newSpecifiedReferencedColumnName);
-	}
-
-	public String getDefaultReferencedColumnName() {
-		return this.defaultReferencedColumnName;
-	}
-
-	protected void setDefaultReferencedColumnName(String newDefaultReferencedColumnName) {
-		String oldDefaultReferencedColumnName = this.defaultReferencedColumnName;
-		this.defaultReferencedColumnName = newDefaultReferencedColumnName;
-		firePropertyChanged(DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY, oldDefaultReferencedColumnName, newDefaultReferencedColumnName);
-	}
-
-	public boolean isVirtual() {
-		return getOwner().isVirtual(this);
-	}
-	
-	@Override
-	public OrmJoinColumn.Owner getOwner() {
-		return (OrmJoinColumn.Owner) this.owner;
-	}
-
-	public Table dbReferencedColumnTable() {
-		return getOwner().getDbReferencedColumnTable();
-	}
-
-	public Column getDbReferencedColumn() {
-		Table table = dbReferencedColumnTable();
-		return (table == null) ? null : table.columnNamed(getReferencedColumnName());
-	}
-
-	public boolean isReferencedColumnResolved() {
-		return getDbReferencedColumn() != null;
-	}
-
-	public TextRange getReferencedColumnNameTextRange() {
-		if (getColumnResource() != null) {
-			TextRange textRange = getColumnResource().getReferencedColumnNameTextRange();
-			if (textRange != null) {
-				return textRange;
-			}
-		}
-		return getOwner().getValidationTextRange();
-	}
-
-
-	@Override
-	protected XmlJoinColumn getColumnResource() {
-		return this.joinColumn;
-	}
-
-	@Override
-	protected void addColumnResource() {
-		//joinColumns are part of a collection, the join-column element will be removed/added
-		//when the XmlJoinColumn is removed/added to the XmlEntity collection
-	}
-	
-	@Override
-	protected void removeColumnResource() {
-		//joinColumns are part of a collection, the pk-join-column element will be removed/added
-		//when the XmlJoinColumn is removed/added to the XmlEntity collection
-	}
-	
-	
-	@Override
-	public void initialize(XmlJoinColumn column) {
-		this.joinColumn = column;
-		super.initialize(column);
-		this.specifiedReferencedColumnName = specifiedReferencedColumnName(column);
-		this.defaultReferencedColumnName = defaultReferencedColumnName();
-	}
-	
-	@Override
-	public void update(XmlJoinColumn column) {
-		this.joinColumn = column;
-		super.update(column);
-		this.setSpecifiedReferencedColumnName_(specifiedReferencedColumnName(column));
-		this.setDefaultReferencedColumnName(defaultReferencedColumnName());
-	}
-
-	protected String specifiedReferencedColumnName(XmlJoinColumn column) {
-		return column == null ? null : column.getReferencedColumnName();
-	}
-
-	@Override
-	protected String defaultName() {
-		RelationshipMapping relationshipMapping = getOwner().getRelationshipMapping();
-		if (relationshipMapping == null) {
-			return null;
-		}
-		if (!getOwner().getRelationshipMapping().isRelationshipOwner()) {
-			return null;
-		}
-		return MappingTools.buildJoinColumnDefaultName(this);
-	}
-	
-	protected String defaultReferencedColumnName() {
-		RelationshipMapping relationshipMapping = getOwner().getRelationshipMapping();
-		if (relationshipMapping == null) {
-			return null;
-		}
-		if (!relationshipMapping.isRelationshipOwner()) {
-			return null;
-		}
-		return MappingTools.buildJoinColumnDefaultReferencedColumnName(this);
-	}
-	
-	@Override
-	protected String defaultTable() {
-		RelationshipMapping relationshipMapping = getOwner().getRelationshipMapping();
-		if (relationshipMapping == null) {
-			return null;
-		}
-		if (!relationshipMapping.isRelationshipOwner()) {
-			return null;
-		}
-		return super.defaultTable();
-	}
-	
-	
-	//******************* validation ***********************
-	
-	/** used internally as a mechanism to short circuit continued message adding */
-	private boolean doContinue;
-	
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		this.doContinue = this.connectionProfileIsActive();
-	
-		OrmRelationshipMapping mapping = (OrmRelationshipMapping) getOwner().getRelationshipMapping();
-		//TODO why is this commented out?  i copied it like this from the maintenance stream
-//		if (doContinue && typeMapping.tableNameIsInvalid(table)) {
-//			if (mapping.isVirtual()) {
-//				messages.add(
-//					JpaValidationMessages.buildMessage(
-//						IMessage.HIGH_SEVERITY,
-//						IJpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_TABLE,
-//						new String[] {mapping.getPersistentAttribute().getName(), table, column.getName()},
-//						column, column.getTableTextRange())
-//				);
-//			}
-//			else {
-//				messages.add(
-//					JpaValidationMessages.buildMessage(
-//						IMessage.HIGH_SEVERITY,
-//						IJpaValidationMessages.COLUMN_UNRESOLVED_TABLE,
-//						new String[] {table, column.getName()}, 
-//						column, column.getTableTextRange())
-//				);
-//			}
-//			doContinue = false;
-//		}
-//		
-		if (this.doContinue && ! isResolved()) {
-			if (mapping.getPersistentAttribute().isVirtual()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_NAME,
-						new String[] {mapping.getName(), getName()}, 
-						this, 
-						getNameTextRange())
-				);
-			}
-			else {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.COLUMN_UNRESOLVED_NAME,
-						new String[] {getName()}, 
-						this, 
-						getNameTextRange())
-				);
-			}
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmJoinTable.java
deleted file mode 100644
index 03e0a0a091..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmJoinTable.java
+++ /dev/null
@@ -1,698 +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.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.AttributeMapping;
-import org.eclipse.jpt.core.context.BaseJoinColumn;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.JoinColumn;
-import org.eclipse.jpt.core.context.JoinTable;
-import org.eclipse.jpt.core.context.NonOwningMapping;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.TypeMapping;
-import org.eclipse.jpt.core.context.orm.OrmJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmJoinTable;
-import org.eclipse.jpt.core.context.orm.OrmRelationshipMapping;
-import org.eclipse.jpt.core.internal.context.MappingTools;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
-import org.eclipse.jpt.core.resource.orm.XmlJoinTable;
-import org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericOrmJoinTable extends AbstractOrmTable implements OrmJoinTable
-{
-
-	protected final List<OrmJoinColumn> specifiedJoinColumns;
-
-	protected OrmJoinColumn defaultJoinColumn;
-
-	protected final List<OrmJoinColumn> specifiedInverseJoinColumns;
-
-	protected OrmJoinColumn defaultInverseJoinColumn;
-	
-	protected XmlRelationshipMapping relationshipMappingResource;
-	
-	public GenericOrmJoinTable(OrmRelationshipMapping parent) {
-		super(parent);
-		this.specifiedJoinColumns = new ArrayList<OrmJoinColumn>();
-		this.specifiedInverseJoinColumns = new ArrayList<OrmJoinColumn>();
-	}
-	
-	@Override
-	public OrmRelationshipMapping getParent() {
-		return (OrmRelationshipMapping) super.getParent();
-	}
-	
-	public OrmRelationshipMapping getRelationshipMapping() {
-		return getParent();
-	}
-
-	public void initializeFrom(JoinTable oldJoinTable) {
-		super.initializeFrom(oldJoinTable);
-		int index = 0;
-		for (JoinColumn joinColumn : CollectionTools.iterable(oldJoinTable.specifiedJoinColumns())) {
-			OrmJoinColumn newJoinColumn = addSpecifiedJoinColumn(index++);
-			newJoinColumn.initializeFrom(joinColumn);
-		}
-		index = 0;
-		for (JoinColumn joinColumn : CollectionTools.iterable(oldJoinTable.specifiedInverseJoinColumns())) {
-			OrmJoinColumn newJoinColumn = addSpecifiedInverseJoinColumn(index++);
-			newJoinColumn.initializeFrom(joinColumn);
-		}
-	}
-	
-	//******************* AbstractOrmTable implementation *****************
-	
-	@Override
-	protected String defaultCatalog() {
-		if (!getRelationshipMapping().isRelationshipOwner()) {
-			return null;
-		}
-		return getEntityMappings().getCatalog();
-	}
-	
-	@Override
-	protected String defaultName() {
-		return MappingTools.buildJoinTableDefaultName(getRelationshipMapping());
-	}
-	
-	@Override
-	protected String defaultSchema() {
-		if (!getRelationshipMapping().isRelationshipOwner()) {
-			return null;
-		}
-		return getEntityMappings().getSchema();
-	}
-
-	@Override
-	protected void removeTableResource() {
-		this.relationshipMappingResource.setJoinTable(null);
-	}
-	
-	@Override
-	protected void addTableResource() {
-		this.relationshipMappingResource.setJoinTable(OrmFactory.eINSTANCE.createXmlJoinTableImpl());
-		
-	}
-
-	@Override
-	protected XmlJoinTable getTableResource() {
-		return this.relationshipMappingResource.getJoinTable();
-	}
-
-	
-	//******************* JoinTable implementation *****************
-
-	//****************** join columns **********************
-	public ListIterator<OrmJoinColumn> joinColumns() {
-		return this.containsSpecifiedJoinColumns() ? this.specifiedJoinColumns() : this.defaultJoinColumns();
-	}
-	
-	public int joinColumnsSize() {
-		return this.containsSpecifiedJoinColumns() ? this.specifiedJoinColumnsSize() : this.defaultJoinColumnsSize();
-	}
-
-	public ListIterator<OrmJoinColumn> specifiedJoinColumns() {
-		return new CloneListIterator<OrmJoinColumn>(this.specifiedJoinColumns);
-	}
-
-	public int specifiedJoinColumnsSize() {
-		return this.specifiedJoinColumns.size();
-	}
-	
-	protected ListIterator<OrmJoinColumn> defaultJoinColumns() {
-		if (this.defaultJoinColumn != null) {
-			return new SingleElementListIterator<OrmJoinColumn>(this.defaultJoinColumn);
-		}
-		return EmptyListIterator.instance();
-	}
-	
-	protected int defaultJoinColumnsSize() {
-		return (this.defaultJoinColumn == null) ? 0 : 1;
-	}
-	
-	public OrmJoinColumn getDefaultJoinColumn() {
-		return this.defaultJoinColumn;
-	}
-	
-	protected void setDefaultJoinColumn(OrmJoinColumn newJoinColumn) {
-		OrmJoinColumn oldJoinColumn = this.defaultJoinColumn;
-		this.defaultJoinColumn = newJoinColumn;
-		firePropertyChanged(JoinTable.DEFAULT_JOIN_COLUMN, oldJoinColumn, newJoinColumn);
-	}
-
-	public boolean containsSpecifiedJoinColumns() {
-		return !this.specifiedJoinColumns.isEmpty();
-	}
-
-	public OrmJoinColumn addSpecifiedJoinColumn(int index) {
-		if (getTableResource() == null) {
-			addTableResource();
-		}
-		OrmJoinColumn joinColumn = getJpaFactory().buildOrmJoinColumn(this, new JoinColumnOwner());
-		this.specifiedJoinColumns.add(index, joinColumn);
-		XmlJoinColumn xmlJoinColumn = OrmFactory.eINSTANCE.createXmlJoinColumnImpl();
-		joinColumn.initialize(xmlJoinColumn);
-		this.getTableResource().getJoinColumns().add(index, xmlJoinColumn);
-		this.fireItemAdded(JoinTable.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn);
-		return joinColumn;
-	}
-
-	protected void addSpecifiedJoinColumn(int index, OrmJoinColumn joinColumn) {
-		addItemToList(index, joinColumn, this.specifiedJoinColumns, JoinTable.SPECIFIED_JOIN_COLUMNS_LIST);
-	}
-
-	public void removeSpecifiedJoinColumn(JoinColumn joinColumn) {
-		this.removeSpecifiedJoinColumn(this.specifiedJoinColumns.indexOf(joinColumn));
-	}
-	
-	public void removeSpecifiedJoinColumn(int index) {
-		OrmJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index);
-		if (!containsSpecifiedJoinColumns()) {
-			//create the defaultJoinColumn now or this will happen during project update 
-			//after removing the join column from the resource model. That causes problems 
-			//in the UI because the change notifications end up in the wrong order.
-			this.defaultJoinColumn = buildJoinColumn(null);
-		}
-		this.getTableResource().getJoinColumns().remove(index);
-		fireItemRemoved(JoinTable.SPECIFIED_JOIN_COLUMNS_LIST, index, removedJoinColumn);
-		if (this.defaultJoinColumn != null) {
-			//fire change notification if a defaultJoinColumn was created above
-			this.firePropertyChanged(JoinTable.DEFAULT_JOIN_COLUMN, null, this.defaultJoinColumn);
-		}
-	}
-
-	protected void removeSpecifiedJoinColumn_(OrmJoinColumn joinColumn) {
-		removeItemFromList(joinColumn, this.specifiedJoinColumns, JoinTable.SPECIFIED_JOIN_COLUMNS_LIST);
-	}
-	
-	public void moveSpecifiedJoinColumn(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.specifiedJoinColumns, targetIndex, sourceIndex);
-		this.getTableResource().getJoinColumns().move(targetIndex, sourceIndex);
-		fireItemMoved(JoinTable.SPECIFIED_JOIN_COLUMNS_LIST, targetIndex, sourceIndex);		
-	}
-	
-	
-	//****************** inverse join columns **********************
-
-	public ListIterator<OrmJoinColumn> inverseJoinColumns() {
-		return this.containsSpecifiedInverseJoinColumns() ? this.specifiedInverseJoinColumns() : this.defaultInverseJoinColumns();
-	}
-	
-	public int inverseJoinColumnsSize() {
-		return this.containsSpecifiedInverseJoinColumns() ? this.specifiedInverseJoinColumnsSize() : this.defaultInverseJoinColumnsSize();
-	}
-
-	public ListIterator<OrmJoinColumn> specifiedInverseJoinColumns() {
-		return new CloneListIterator<OrmJoinColumn>(this.specifiedInverseJoinColumns);
-	}
-
-	public int specifiedInverseJoinColumnsSize() {
-		return this.specifiedInverseJoinColumns.size();
-	}
-	
-	protected ListIterator<OrmJoinColumn> defaultInverseJoinColumns() {
-		if (this.defaultInverseJoinColumn != null) {
-			return new SingleElementListIterator<OrmJoinColumn>(this.defaultInverseJoinColumn);
-		}
-		return EmptyListIterator.instance();
-	}
-	
-	protected int defaultInverseJoinColumnsSize() {
-		return (this.defaultInverseJoinColumn == null) ? 0 : 1;
-	}
-
-	public OrmJoinColumn getDefaultInverseJoinColumn() {
-		return this.defaultInverseJoinColumn;
-	}
-	
-	protected void setDefaultInverseJoinColumn(OrmJoinColumn newJoinColumn) {
-		OrmJoinColumn oldJoinColumn = this.defaultInverseJoinColumn;
-		this.defaultInverseJoinColumn = newJoinColumn;
-		firePropertyChanged(JoinTable.DEFAULT_INVERSE_JOIN_COLUMN, oldJoinColumn, newJoinColumn);
-	}
-	
-	public boolean containsSpecifiedInverseJoinColumns() {
-		return !this.specifiedInverseJoinColumns.isEmpty();
-	}
-
-	public OrmJoinColumn addSpecifiedInverseJoinColumn(int index) {
-		if (getTableResource() == null) {
-			addTableResource();
-		}
-		OrmJoinColumn joinColumn = getJpaFactory().buildOrmJoinColumn(this, new InverseJoinColumnOwner());
-		this.specifiedInverseJoinColumns.add(index, joinColumn);
-		XmlJoinColumn xmlJoinColumn = OrmFactory.eINSTANCE.createXmlJoinColumnImpl();
-		joinColumn.initialize(xmlJoinColumn);
-		this.getTableResource().getInverseJoinColumns().add(index, xmlJoinColumn);
-		this.fireItemAdded(JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST, index, joinColumn);
-		return joinColumn;
-	}
-	
-	protected void addSpecifiedInverseJoinColumn(int index, OrmJoinColumn joinColumn) {
-		addItemToList(index, joinColumn, this.specifiedInverseJoinColumns, JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST);
-	}
-
-	public void removeSpecifiedInverseJoinColumn(JoinColumn joinColumn) {
-		this.removeSpecifiedInverseJoinColumn(this.specifiedInverseJoinColumns.indexOf(joinColumn));
-	}
-	
-	public void removeSpecifiedInverseJoinColumn(int index) {
-		OrmJoinColumn removedJoinColumn = this.specifiedInverseJoinColumns.remove(index);
-		if (!containsSpecifiedInverseJoinColumns()) {
-			//create the defaultInverseJoinColumn now or this will happen during project update 
-			//after removing the join column from the resource model. That causes problems 
-			//in the UI because the change notifications end up in the wrong order.
-			this.defaultInverseJoinColumn = buildInverseJoinColumn(null);
-		}
-		this.getTableResource().getInverseJoinColumns().remove(index);
-		fireItemRemoved(JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST, index, removedJoinColumn);
-		if (this.defaultInverseJoinColumn != null) {
-			//fire change notification if a defaultJoinColumn was created above
-			this.firePropertyChanged(JoinTable.DEFAULT_INVERSE_JOIN_COLUMN, null, this.defaultInverseJoinColumn);
-		}
-	}
-
-	protected void removeSpecifiedInverseJoinColumn_(OrmJoinColumn joinColumn) {
-		removeItemFromList(joinColumn, this.specifiedInverseJoinColumns, JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST);
-	}
-	
-	public void moveSpecifiedInverseJoinColumn(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.specifiedInverseJoinColumns, targetIndex, sourceIndex);
-		this.getTableResource().getInverseJoinColumns().move(targetIndex, sourceIndex);
-		fireItemMoved(JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST, targetIndex, sourceIndex);		
-	}
-	
-	
-	// ****************** OrmJoinTable implementation *****************
-	public boolean isSpecified() {
-		return this.getTableResource() != null && getTableResource().isSpecified();
-	}	
-	
-	public void initialize(XmlRelationshipMapping relationshipMapping) {
-		this.relationshipMappingResource = relationshipMapping;
-		this.initialize(this.getTableResource());
-	}
-	
-	public void update(XmlRelationshipMapping relationshipMapping) {
-		this.relationshipMappingResource = relationshipMapping;
-		this.update(this.getTableResource());
-	}
-
-	protected void initialize(XmlJoinTable joinTable) {
-		super.initialize(joinTable);
-		this.initializeSpecifiedJoinColumns(joinTable);
-		this.initializeDefaultJoinColumn();
-		this.initializeSpecifiedInverseJoinColumns(joinTable);
-		this.initializeDefaultInverseJoinColumn();
-	}
-	
-	protected void initializeSpecifiedJoinColumns(XmlJoinTable joinTable) {
-		if (joinTable == null) {
-			return;
-		}
-		for (XmlJoinColumn joinColumn : joinTable.getJoinColumns()) {
-			this.specifiedJoinColumns.add(buildJoinColumn(joinColumn));
-		}
-	}
-	
-	protected void initializeDefaultJoinColumn() {
-		if (!shouldBuildDefaultJoinColumn()) {
-			return;
-		}
-		this.defaultJoinColumn = buildJoinColumn(null);
-	}	
-
-	protected void initializeSpecifiedInverseJoinColumns(XmlJoinTable joinTable) {
-		if (joinTable == null) {
-			return;
-		}
-		for (XmlJoinColumn joinColumn : joinTable.getInverseJoinColumns()) {
-			this.specifiedInverseJoinColumns.add(buildInverseJoinColumn(joinColumn));
-		}
-	}
-	
-	protected void initializeDefaultInverseJoinColumn() {
-		if (!shouldBuildDefaultInverseJoinColumn()) {
-			return;
-		}
-		this.defaultInverseJoinColumn = buildInverseJoinColumn(null);
-	}	
-	
-	protected void update(XmlJoinTable joinTable) {
-		super.update(joinTable);
-		this.updateSpecifiedJoinColumns(joinTable);
-		this.updateDefaultJoinColumn();
-		this.updateSpecifiedInverseJoinColumns(joinTable);
-		this.updateDefaultInverseJoinColumn();
-	}
-		
-	protected void updateSpecifiedJoinColumns(XmlJoinTable joinTable) {
-		ListIterator<OrmJoinColumn> joinColumns = specifiedJoinColumns();
-		ListIterator<XmlJoinColumn> resourceJoinColumns = EmptyListIterator.instance();
-		if (joinTable != null) {
-			resourceJoinColumns = new CloneListIterator<XmlJoinColumn>(joinTable.getJoinColumns());//prevent ConcurrentModificiationException
-		}
-		
-		while (joinColumns.hasNext()) {
-			OrmJoinColumn joinColumn = joinColumns.next();
-			if (resourceJoinColumns.hasNext()) {
-				joinColumn.update(resourceJoinColumns.next());
-			}
-			else {
-				removeSpecifiedJoinColumn_(joinColumn);
-			}
-		}
-		
-		while (resourceJoinColumns.hasNext()) {
-			addSpecifiedJoinColumn(specifiedJoinColumnsSize(), buildJoinColumn(resourceJoinColumns.next()));
-		}
-	}
-	
-	protected boolean shouldBuildDefaultJoinColumn() {
-		return !containsSpecifiedJoinColumns();
-	}
-
-	protected void updateDefaultJoinColumn() {
-		if (!shouldBuildDefaultJoinColumn()) {
-			setDefaultJoinColumn(null);
-			return;
-		}
-		if (getDefaultJoinColumn() == null) {
-			this.setDefaultJoinColumn(buildJoinColumn(null));
-		}
-		else {
-			this.defaultJoinColumn.update(null);
-		}
-	}	
-
-	protected void updateSpecifiedInverseJoinColumns(XmlJoinTable joinTable) {
-		ListIterator<OrmJoinColumn> inverseJoinColumns = specifiedInverseJoinColumns();
-		ListIterator<XmlJoinColumn> resourceInverseJoinColumns = EmptyListIterator.instance();
-		if (joinTable != null) {
-			resourceInverseJoinColumns = new CloneListIterator<XmlJoinColumn>(joinTable.getInverseJoinColumns());//prevent ConcurrentModificiationException
-		}
-		
-		while (inverseJoinColumns.hasNext()) {
-			OrmJoinColumn joinColumn = inverseJoinColumns.next();
-			if (resourceInverseJoinColumns.hasNext()) {
-				joinColumn.update(resourceInverseJoinColumns.next());
-			}
-			else {
-				removeSpecifiedInverseJoinColumn_(joinColumn);
-			}
-		}
-		
-		while (resourceInverseJoinColumns.hasNext()) {
-			addSpecifiedInverseJoinColumn(specifiedInverseJoinColumnsSize(), buildInverseJoinColumn(resourceInverseJoinColumns.next()));
-		}
-	}
-	
-	protected boolean shouldBuildDefaultInverseJoinColumn() {
-		return !containsSpecifiedInverseJoinColumns();
-	}
-
-	protected void updateDefaultInverseJoinColumn() {
-		if (!shouldBuildDefaultInverseJoinColumn()) {
-			setDefaultInverseJoinColumn(null);
-			return;
-		}
-		if (getDefaultInverseJoinColumn() == null) {
-			this.setDefaultInverseJoinColumn(buildInverseJoinColumn(null));
-		}
-		else {
-			this.defaultInverseJoinColumn.update(null);
-		}
-	}	
-	
-	protected OrmJoinColumn buildJoinColumn(XmlJoinColumn joinColumn) {
-		OrmJoinColumn ormJoinColumn = getJpaFactory().buildOrmJoinColumn(this, new JoinColumnOwner());
-		ormJoinColumn.initialize(joinColumn);
-		return ormJoinColumn;
-	}
-	
-	protected OrmJoinColumn buildInverseJoinColumn(XmlJoinColumn joinColumn) {
-		OrmJoinColumn ormJoinColumn = getJpaFactory().buildOrmJoinColumn(this, new InverseJoinColumnOwner());
-		ormJoinColumn.initialize(joinColumn);
-		return ormJoinColumn;
-	}
-	
-	
-	// ************************** validation ***********************
-	
-	/** used internally as a mechanism to short circuit continued message adding */
-	private boolean doContinue;
-
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		this.addTableMessages(messages);
-		
-		if (this.doContinue) {
-			for (OrmJoinColumn joinColumn : CollectionTools.iterable(joinColumns())) {
-				joinColumn.addToMessages(messages);
-			}
-			
-			for (OrmJoinColumn joinColumn : CollectionTools.iterable(inverseJoinColumns())) {
-				joinColumn.addToMessages(messages);
-			}
-		}
-	}
-	
-	protected void addTableMessages(List<IMessage> messages) {
-		this.doContinue = connectionProfileIsActive();
-		String schema = getSchema();
-		OrmRelationshipMapping mapping = getRelationshipMapping();
-	
-		if (this.doContinue && ! hasResolvedSchema()) {
-			if (mapping.getPersistentAttribute().isVirtual()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_SCHEMA,
-						new String[] {mapping.getName(), schema, getName()}, 
-						this, 
-						getSchemaTextRange())
-				);
-				
-			}
-			else {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.JOIN_TABLE_UNRESOLVED_SCHEMA,
-						new String[] {schema, getName()}, 
-						this, 
-						getSchemaTextRange())
-				);
-			}
-			this.doContinue = false;
-		}
-		
-		if (this.doContinue && ! isResolved()) {
-			if (mapping.getPersistentAttribute().isVirtual()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_NAME,
-						new String[] {mapping.getName(), getName()}, 
-						this, 
-						getNameTextRange())
-				);
-			}
-			else {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.JOIN_TABLE_UNRESOLVED_NAME,
-						new String[] {getName()}, 
-						this, 
-						getNameTextRange())
-				);
-			}
-		}
-	}
-	/**
-	 * just a little common behavior
-	 */
-	abstract class AbstractJoinColumnOwner implements OrmJoinColumn.Owner
-	{
-		AbstractJoinColumnOwner() {
-			super();
-		}
-
-		public TypeMapping getTypeMapping() {
-			return getRelationshipMapping().getTypeMapping();
-		}
-		
-		public RelationshipMapping getRelationshipMapping() {
-			return GenericOrmJoinTable.this.getRelationshipMapping();
-		}
-
-		/**
-		 * the default table name is always valid and a specified table name
-		 * is prohibited (which will be handled elsewhere)
-		 */
-		public boolean tableNameIsInvalid(String tableName) {
-			return false;
-		}
-
-		/**
-		 * the join column can only be on the join table itself
-		 */
-		public boolean tableIsAllowed() {
-			return false;
-		}
-
-		public org.eclipse.jpt.db.Table getDbTable(String tableName) {
-			if (GenericOrmJoinTable.this.getName() == null) {
-				return null;
-			}
-			return (GenericOrmJoinTable.this.getName().equals(tableName)) ? GenericOrmJoinTable.this.getDbTable() : null;
-		}
-		
-		/**
-		 * by default, the join column is, obviously, in the join table;
-		 * not sure whether it can be anywhere else...
-		 */
-		public String getDefaultTableName() {
-			return GenericOrmJoinTable.this.getName();
-		}
-
-		public TextRange getValidationTextRange() {
-			return GenericOrmJoinTable.this.getValidationTextRange();
-		}
-	}
-
-
-	/**
-	 * owner for "forward-pointer" JoinColumns;
-	 * these point at the target/inverse entity
-	 */
-	class InverseJoinColumnOwner extends AbstractJoinColumnOwner
-	{
-		public InverseJoinColumnOwner() {
-			super();
-		}
-
-		public Entity getTargetEntity() {
-			return GenericOrmJoinTable.this.getRelationshipMapping().getResolvedTargetEntity();
-		}
-
-		public String getAttributeName() {
-			return GenericOrmJoinTable.this.getRelationshipMapping().getName();
-		}
-
-		@Override
-		public org.eclipse.jpt.db.Table getDbTable(String tableName) {
-			org.eclipse.jpt.db.Table dbTable = super.getDbTable(tableName);
-			if (dbTable != null) {
-				return dbTable;
-			}
-			Entity targetEntity = getTargetEntity();
-			return (targetEntity == null) ? null : targetEntity.getDbTable(tableName);
-		}
-
-		public org.eclipse.jpt.db.Table getDbReferencedColumnTable() {
-			Entity targetEntity = getTargetEntity();
-			return (targetEntity == null) ? null : targetEntity.getPrimaryDbTable();
-		}
-		
-		public boolean isVirtual(BaseJoinColumn joinColumn) {
-			return GenericOrmJoinTable.this.defaultInverseJoinColumn == joinColumn;
-		}
-		
-		public String getDefaultColumnName() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-		
-		public int joinColumnsSize() {
-			return GenericOrmJoinTable.this.inverseJoinColumnsSize();
-		}
-		
-	}
-
-
-	/**
-	 * owner for "back-pointer" JoinColumns;
-	 * these point at the source/owning entity
-	 */
-	class JoinColumnOwner extends AbstractJoinColumnOwner
-	{
-		public JoinColumnOwner() {
-			super();
-		}
-
-		public Entity getTargetEntity() {
-			return GenericOrmJoinTable.this.getRelationshipMapping().getEntity();
-		}
-
-		public String getAttributeName() {
-			Entity targetEntity = GenericOrmJoinTable.this.getRelationshipMapping().getResolvedTargetEntity();
-			if (targetEntity == null) {
-				return null;
-			}
-			String attributeName = GenericOrmJoinTable.this.getRelationshipMapping().getName();
-			for (Iterator<PersistentAttribute> stream = targetEntity.getPersistentType().allAttributes(); stream.hasNext();) {
-				PersistentAttribute attribute = stream.next();
-				AttributeMapping mapping = attribute.getMapping();
-				if (mapping instanceof NonOwningMapping) {
-					String mappedBy = ((NonOwningMapping) mapping).getMappedBy();
-					if ((mappedBy != null) && mappedBy.equals(attributeName)) {
-						return attribute.getName();
-					}
-				}
-			}
-			return null;
-		}
-
-		@Override
-		public org.eclipse.jpt.db.Table getDbTable(String tableName) {
-			org.eclipse.jpt.db.Table dbTable = super.getDbTable(tableName);
-			if (dbTable != null) {
-				return dbTable;
-			}
-			return getTypeMapping().getDbTable(tableName);
-		}
-
-		public org.eclipse.jpt.db.Table getDbReferencedColumnTable() {
-			return getTypeMapping().getPrimaryDbTable();
-		}
-		
-		public boolean isVirtual(BaseJoinColumn joinColumn) {
-			return GenericOrmJoinTable.this.defaultJoinColumn == joinColumn;
-		}
-		
-		public String getDefaultColumnName() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-		
-		public int joinColumnsSize() {
-			return GenericOrmJoinTable.this.joinColumnsSize();
-		}
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToManyMapping.java
deleted file mode 100644
index c7341a8f49..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToManyMapping.java
+++ /dev/null
@@ -1,67 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.AttributeMapping;
-import org.eclipse.jpt.core.context.NonOwningMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmManyToManyMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlManyToMany;
-
-public class GenericOrmManyToManyMapping extends AbstractOrmMultiRelationshipMapping<XmlManyToMany>
-	implements OrmManyToManyMapping
-{
-
-	public GenericOrmManyToManyMapping(OrmPersistentAttribute parent) {
-		super(parent);
-	}
-
-	public String getKey() {
-		return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmManyToManyMapping(this);
-	}
-
-	@Override
-	public void initializeFromXmlNonOwningMapping(NonOwningMapping oldMapping) {
-		super.initializeFromXmlNonOwningMapping(oldMapping);
-		setMappedBy(oldMapping.getMappedBy());
-	}
-
-	public int getXmlSequence() {
-		return 7;
-	}
-
-	// ********** NonOwningMapping implementation **********
-	public boolean mappedByIsValid(AttributeMapping mappedByMapping) {
-		String mappedByKey = mappedByMapping.getKey();
-		return (mappedByKey == MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY);
-	}
-	
-	public XmlManyToMany addToResourceModel(AbstractXmlTypeMapping typeMapping) {
-		XmlManyToMany manyToMany = OrmFactory.eINSTANCE.createXmlManyToManyImpl();
-		getPersistentAttribute().initialize(manyToMany);
-		typeMapping.getAttributes().getManyToManys().add(manyToMany);
-		return manyToMany;
-	}
-	
-	public void removeFromResourceModel(AbstractXmlTypeMapping typeMapping) {
-		typeMapping.getAttributes().getManyToManys().remove(this.getAttributeMapping());
-		if (typeMapping.getAttributes().isAllFeaturesUnset()) {
-			typeMapping.setAttributes(null);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToOneMapping.java
deleted file mode 100644
index 7bf9876ee8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToOneMapping.java
+++ /dev/null
@@ -1,64 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmManyToOneMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlManyToOne;
-
-
-public class GenericOrmManyToOneMapping extends AbstractOrmSingleRelationshipMapping<XmlManyToOne>
-	implements OrmManyToOneMapping
-{
-
-	public GenericOrmManyToOneMapping(OrmPersistentAttribute parent) {
-		super(parent);
-	}
-
-	public int getXmlSequence() {
-		return 4;
-	}
-
-	public String getKey() {
-		return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	//ManyToOne mapping is always the owning side
-	public boolean isRelationshipOwner() {
-		return true;
-	}
-	
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmManyToOneMapping(this);
-	}
-
-	@Override
-	public boolean isOverridableAssociationMapping() {
-		return true;
-	}
-		
-	public XmlManyToOne addToResourceModel(AbstractXmlTypeMapping typeMapping) {
-		XmlManyToOne manyToOne = OrmFactory.eINSTANCE.createXmlManyToOneImpl();
-		getPersistentAttribute().initialize(manyToOne);
-		typeMapping.getAttributes().getManyToOnes().add(manyToOne);
-		return manyToOne;
-	}
-	
-	public void removeFromResourceModel(AbstractXmlTypeMapping typeMapping) {
-		typeMapping.getAttributes().getManyToOnes().remove(this.getAttributeMapping());
-		if (typeMapping.getAttributes().isAllFeaturesUnset()) {
-			typeMapping.setAttributes(null);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappedSuperclass.java
deleted file mode 100644
index c7d81fdf0f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappedSuperclass.java
+++ /dev/null
@@ -1,181 +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.core.internal.context.orm;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.IdClass;
-import org.eclipse.jpt.core.context.Table;
-import org.eclipse.jpt.core.context.orm.OrmMappedSuperclass;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.core.resource.orm.XmlIdClass;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-
-
-public class GenericOrmMappedSuperclass extends AbstractOrmTypeMapping<XmlMappedSuperclass>
-	implements OrmMappedSuperclass
-{
-	protected String idClass;
-	
-	public GenericOrmMappedSuperclass(OrmPersistentType parent) {
-		super(parent);
-	}
-
-	public String getIdClass() {
-		return this.idClass;
-	}
-	
-	public void setIdClass(String newIdClass) {
-		String oldIdClass = this.idClass;
-		this.idClass = newIdClass;
-		if (oldIdClass != newIdClass) {
-			if (this.idClassResource() != null) {
-				this.idClassResource().setClassName(newIdClass);						
-				if (this.idClassResource().isAllFeaturesUnset()) {
-					removeIdClassResource();
-				}
-			}
-			else if (newIdClass != null) {
-				addIdClassResource();
-				idClassResource().setClassName(newIdClass);
-			}
-		}
-		firePropertyChanged(IdClass.ID_CLASS_PROPERTY, oldIdClass, newIdClass);
-	}
-	
-	protected void setIdClass_(String newIdClass) {
-		String oldIdClass = this.idClass;
-		this.idClass = newIdClass;
-		firePropertyChanged(IdClass.ID_CLASS_PROPERTY, oldIdClass, newIdClass);
-	}
-
-	protected XmlIdClass idClassResource() {
-		return getTypeMappingResource().getIdClass();
-	}
-	
-	protected void addIdClassResource() {
-		getTypeMappingResource().setIdClass(OrmFactory.eINSTANCE.createXmlIdClass());		
-	}
-	
-	protected void removeIdClassResource() {
-		getTypeMappingResource().setIdClass(null);
-	}
-
-	public String getKey() {
-		return MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY;
-	}
-
-	public boolean tableNameIsInvalid(String tableName) {
-		return false;
-	}
-
-	public Iterator<String> associatedTableNamesIncludingInherited() {
-		return EmptyIterator.instance();
-	}
-
-	public Iterator<Table> associatedTables() {
-		return EmptyIterator.instance();
-	}
-
-	public Iterator<Table> associatedTablesIncludingInherited() {
-		return EmptyIterator.instance();
-	}
-
-	@Override
-	public Iterator<String> overridableAttributeNames() {
-		return this.namesOf(this.overridableAttributes());
-	}
-
-	@Override
-	public Iterator<OrmPersistentAttribute> overridableAttributes() {
-		return new FilteringIterator<OrmPersistentAttribute, OrmPersistentAttribute>(this.getPersistentType().attributes()) {
-			@Override
-			protected boolean accept(OrmPersistentAttribute o) {
-				return o.isOverridableAttribute();
-			}
-		};
-	}
-
-	@Override
-	public Iterator<String> overridableAssociationNames() {
-		return this.namesOf(this.overridableAssociations());
-	}
-
-	@Override
-	public Iterator<OrmPersistentAttribute> overridableAssociations() {
-		return new FilteringIterator<OrmPersistentAttribute, OrmPersistentAttribute>(this.getPersistentType().attributes()) {
-			@Override
-			protected boolean accept(OrmPersistentAttribute o) {
-				return o.isOverridableAssociation();
-			}
-		};
-	}
-
-	private Iterator<String> namesOf(Iterator<OrmPersistentAttribute> attributes) {
-		return new TransformationIterator<OrmPersistentAttribute, String>(attributes) {
-			@Override
-			protected String transform(OrmPersistentAttribute attribute) {
-				return attribute.getName();
-			}
-		};
-	}
-
-	public int getXmlSequence() {
-		return 0;
-	}
-
-	protected Boolean metadataComplete(XmlMappedSuperclass mappedSuperclass) {
-		return mappedSuperclass.getMetadataComplete();
-	}
-	
-	public void removeFromResourceModel(XmlEntityMappings entityMappings) {
-		entityMappings.getMappedSuperclasses().remove(this.getTypeMappingResource());
-	}
-	
-	public XmlMappedSuperclass addToResourceModel(XmlEntityMappings entityMappings) {
-		XmlMappedSuperclass mappedSuperclass = OrmFactory.eINSTANCE.createXmlMappedSuperclass();
-		getPersistentType().initialize(mappedSuperclass);
-		entityMappings.getMappedSuperclasses().add(mappedSuperclass);
-		return mappedSuperclass;
-	}
-
-	
-	
-	@Override
-	public void initialize(XmlMappedSuperclass mappedSuperclass) {
-		super.initialize(mappedSuperclass);
-		this.initializeIdClass(this.idClassResource());
-	}
-	
-	protected void initializeIdClass(XmlIdClass idClassResource) {
-		this.idClass = this.idClass(idClassResource);	
-	}
-	
-	@Override
-	public void update(XmlMappedSuperclass mappedSuperclass) {
-		super.update(mappedSuperclass);
-		this.updateIdClass(this.idClassResource());
-	}
-	
-	protected void updateIdClass(XmlIdClass idClassResource) {
-		this.setIdClass_(this.idClass(idClassResource));
-	}
-
-	protected String idClass(XmlIdClass idClassResource) {
-		return idClassResource == null ? null : idClassResource.getClassName();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNamedNativeQuery.java
deleted file mode 100644
index 11151b5175..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNamedNativeQuery.java
+++ /dev/null
@@ -1,68 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.NamedNativeQuery;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.context.orm.OrmNamedNativeQuery;
-import org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery;
-
-
-public class GenericOrmNamedNativeQuery extends AbstractOrmQuery<XmlNamedNativeQuery>
-	implements OrmNamedNativeQuery
-{
-
-	protected String resultClass;
-
-	protected String resultSetMapping;
-
-
-	public GenericOrmNamedNativeQuery(OrmJpaContextNode parent) {
-		super(parent);
-	}
-	
-	public String getResultClass() {
-		return this.resultClass;
-	}
-
-	public void setResultClass(String newResultClass) {
-		String oldResultClass = this.resultClass;
-		this.resultClass = newResultClass;
-		getQueryResource().setResultClass(newResultClass);
-		firePropertyChanged(NamedNativeQuery.RESULT_CLASS_PROPERTY, oldResultClass, newResultClass);
-	}
-
-	public String getResultSetMapping() {
-		return this.resultSetMapping;
-	}
-
-	public void setResultSetMapping(String newResultSetMapping) {
-		String oldResultSetMapping = this.resultSetMapping;
-		this.resultSetMapping = newResultSetMapping;
-		getQueryResource().setResultSetMapping(newResultSetMapping);
-		firePropertyChanged(NamedNativeQuery.RESULT_SET_MAPPING_PROPERTY, oldResultSetMapping, newResultSetMapping);
-	}
-
-
-	@Override
-	public void initialize(XmlNamedNativeQuery queryResource) {
-		super.initialize(queryResource);
-		this.resultClass = queryResource.getResultClass();
-		this.resultSetMapping = queryResource.getResultSetMapping();
-	}
-	
-	@Override
-	public void update(XmlNamedNativeQuery queryResource) {
-		super.update(queryResource);
-		this.setResultClass(queryResource.getResultClass());
-		this.setResultSetMapping(queryResource.getResultSetMapping());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNamedQuery.java
deleted file mode 100644
index 5bd004150f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNamedQuery.java
+++ /dev/null
@@ -1,24 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.context.orm.OrmNamedQuery;
-import org.eclipse.jpt.core.resource.orm.XmlNamedQuery;
-
-
-public class GenericOrmNamedQuery extends AbstractOrmQuery<XmlNamedQuery> implements OrmNamedQuery
-{
-
-	public GenericOrmNamedQuery(OrmJpaContextNode parent) {
-		super(parent);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNullAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNullAttributeMapping.java
deleted file mode 100644
index 5ab796605c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNullAttributeMapping.java
+++ /dev/null
@@ -1,45 +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.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.resource.orm.AbstractXmlTypeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping;
-
-
-public class GenericOrmNullAttributeMapping extends AbstractOrmAttributeMapping<XmlNullAttributeMapping>
-{
-
-	public GenericOrmNullAttributeMapping(OrmPersistentAttribute parent) {
-		super(parent);
-	}
-
-	public int getXmlSequence() {
-		return -1;
-	}
-
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmAttributeMapping(this);
-	}
-
-	public String getKey() {
-		return null;
-	}
-	
-	public XmlAttributeMapping addToResourceModel(AbstractXmlTypeMapping typeMapping) {
-		throw new UnsupportedOperationException();
-	}
-
-	public void removeFromResourceModel(AbstractXmlTypeMapping typeMapping) {
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToManyMapping.java
deleted file mode 100644
index 430dd74a1a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToManyMapping.java
+++ /dev/null
@@ -1,68 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.AttributeMapping;
-import org.eclipse.jpt.core.context.NonOwningMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmOneToManyMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlOneToMany;
-
-
-public class GenericOrmOneToManyMapping extends AbstractOrmMultiRelationshipMapping<XmlOneToMany>
-	implements OrmOneToManyMapping
-{
-
-	public GenericOrmOneToManyMapping(OrmPersistentAttribute parent) {
-		super(parent);
-	}
-
-	public String getKey() {
-		return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmOneToManyMapping(this);
-	}
-
-	@Override
-	public void initializeFromXmlNonOwningMapping(NonOwningMapping oldMapping) {
-		super.initializeFromXmlNonOwningMapping(oldMapping);
-		setMappedBy(oldMapping.getMappedBy());
-	}
-
-	public int getXmlSequence() {
-		return 5;
-	}
-
-	// ********** NonOwningMapping implementation **********
-	public boolean mappedByIsValid(AttributeMapping mappedByMapping) {
-		String mappedByKey = mappedByMapping.getKey();
-		return (mappedByKey == MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY);
-	}
-	
-	public XmlOneToMany addToResourceModel(AbstractXmlTypeMapping typeMapping) {
-		XmlOneToMany oneToMany = OrmFactory.eINSTANCE.createXmlOneToManyImpl();
-		getPersistentAttribute().initialize(oneToMany);
-		typeMapping.getAttributes().getOneToManys().add(oneToMany);
-		return oneToMany;
-	}
-	
-	public void removeFromResourceModel(AbstractXmlTypeMapping typeMapping) {
-		typeMapping.getAttributes().getOneToManys().remove(this.getAttributeMapping());
-		if (typeMapping.getAttributes().isAllFeaturesUnset()) {
-			typeMapping.setAttributes(null);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToOneMapping.java
deleted file mode 100644
index b9cf47f2f2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToOneMapping.java
+++ /dev/null
@@ -1,294 +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.core.internal.context.orm;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.AttributeMapping;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.NonOwningMapping;
-import org.eclipse.jpt.core.context.OneToOneMapping;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmOneToOneMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlOneToOne;
-import org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericOrmOneToOneMapping extends AbstractOrmSingleRelationshipMapping<XmlOneToOne>
-	implements OrmOneToOneMapping
-{
-	
-	protected String mappedBy;
-	
-	protected final List<OrmPrimaryKeyJoinColumn> primaryKeyJoinColumns;
-
-
-	public GenericOrmOneToOneMapping(OrmPersistentAttribute parent) {
-		super(parent);
-		this.primaryKeyJoinColumns = new ArrayList<OrmPrimaryKeyJoinColumn>();
-	}
-
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmOneToOneMapping(this);
-	}
-
-	@Override
-	public void initializeFromXmlNonOwningMapping(NonOwningMapping oldMapping) {
-		super.initializeFromXmlNonOwningMapping(oldMapping);
-		setMappedBy(oldMapping.getMappedBy());
-	}
-	
-	public boolean isRelationshipOwner() {
-		return getMappedBy() == null;
-	}
-
-	
-	
-	public ListIterator<OrmPrimaryKeyJoinColumn> primaryKeyJoinColumns() {
-		return new CloneListIterator<OrmPrimaryKeyJoinColumn>(this.primaryKeyJoinColumns);
-	}
-	
-	public int primaryKeyJoinColumnsSize() {
-		return this.primaryKeyJoinColumns.size();
-	}
-	
-	public OrmPrimaryKeyJoinColumn addPrimaryKeyJoinColumn(int index) {
-		OrmPrimaryKeyJoinColumn pkJoinColumn = getJpaFactory().buildOrmPrimaryKeyJoinColumn(this, new JoinColumnOwner());
-		XmlPrimaryKeyJoinColumn xmlPkJoinColumn = OrmFactory.eINSTANCE.createXmlPrimaryKeyJoinColumnImpl();
-		this.primaryKeyJoinColumns.add(index, pkJoinColumn);
-		this.getAttributeMapping().getPrimaryKeyJoinColumns().add(index, xmlPkJoinColumn);
-		pkJoinColumn.initialize(xmlPkJoinColumn);
-		this.fireItemAdded(OneToOneMapping.PRIMAY_KEY_JOIN_COLUMNS_LIST, index, pkJoinColumn);
-		return pkJoinColumn;
-	}
-
-	protected void addPrimaryKeyJoinColumn(int index, OrmPrimaryKeyJoinColumn joinColumn) {
-		addItemToList(index, joinColumn, this.primaryKeyJoinColumns, OneToOneMapping.PRIMAY_KEY_JOIN_COLUMNS_LIST);
-	}
-
-	public void removePrimaryKeyJoinColumn(PrimaryKeyJoinColumn pkJoinColumn) {
-		this.removePrimaryKeyJoinColumn(this.primaryKeyJoinColumns.indexOf(pkJoinColumn));
-	}
-	
-	public void removePrimaryKeyJoinColumn(int index) {
-		OrmPrimaryKeyJoinColumn removedPkJoinColumn = this.primaryKeyJoinColumns.remove(index);
-		this.getAttributeMapping().getPrimaryKeyJoinColumns().remove(index);
-		fireItemRemoved(OneToOneMapping.PRIMAY_KEY_JOIN_COLUMNS_LIST, index, removedPkJoinColumn);
-	}
-
-	protected void removePrimaryKeyJoinColumn_(OrmPrimaryKeyJoinColumn joinColumn) {
-		removeItemFromList(joinColumn, this.primaryKeyJoinColumns, OneToOneMapping.PRIMAY_KEY_JOIN_COLUMNS_LIST);
-	}
-	
-	public void movePrimaryKeyJoinColumn(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.primaryKeyJoinColumns, targetIndex, sourceIndex);
-		this.getAttributeMapping().getPrimaryKeyJoinColumns().move(targetIndex, sourceIndex);
-		fireItemMoved(OneToOneMapping.PRIMAY_KEY_JOIN_COLUMNS_LIST, targetIndex, sourceIndex);		
-	}
-	
-	public boolean containsPrimaryKeyJoinColumns() {
-		return !this.primaryKeyJoinColumns.isEmpty();
-	}
-
-	public String getMappedBy() {
-		return this.mappedBy;
-	}
-
-	public void setMappedBy(String newMappedBy) {
-		String oldMappedBy = this.mappedBy;
-		this.mappedBy = newMappedBy;
-		getAttributeMapping().setMappedBy(newMappedBy);
-		firePropertyChanged(MAPPED_BY_PROPERTY, oldMappedBy, newMappedBy);
-	}
-	
-	protected void setMappedBy_(String newMappedBy) {
-		String oldMappedBy = this.mappedBy;
-		this.mappedBy = newMappedBy;
-		firePropertyChanged(MAPPED_BY_PROPERTY, oldMappedBy, newMappedBy);
-	}	
-	
-	public boolean mappedByIsValid(AttributeMapping mappedByMapping) {
-		String mappedByKey = mappedByMapping.getKey();
-		return (mappedByKey == MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY);
-	}
-
-	public TextRange getMappedByTextRange() {
-		TextRange mappedByTextRange = getAttributeMapping().getMappedByTextRange();
-		return mappedByTextRange != null ? mappedByTextRange : getValidationTextRange();
-	}
-
-
-	public int getXmlSequence() {
-		return 6;
-	}
-
-	public String getKey() {
-		return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	@Override
-	public boolean isOverridableAssociationMapping() {
-		return true;
-	}
-	
-	public XmlOneToOne addToResourceModel(AbstractXmlTypeMapping typeMapping) {
-		XmlOneToOne oneToOne = OrmFactory.eINSTANCE.createXmlOneToOneImpl();
-		getPersistentAttribute().initialize(oneToOne);
-		typeMapping.getAttributes().getOneToOnes().add(oneToOne);
-		return oneToOne;
-	}
-	
-	public void removeFromResourceModel(AbstractXmlTypeMapping typeMapping) {
-		typeMapping.getAttributes().getOneToOnes().remove(this.getAttributeMapping());
-		if (typeMapping.getAttributes().isAllFeaturesUnset()) {
-			typeMapping.setAttributes(null);
-		}
-	}	
-
-	
-	//***************** Validation ***********************************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		
-		if (this.getMappedBy() != null) {
-			addMappedByMessages(messages);
-		}
-	}
-	
-	@Override
-	protected boolean addJoinColumnMessages() {
-		if (containsPrimaryKeyJoinColumns() && !containsSpecifiedJoinColumns()) {
-			return false;
-		}
-		return super.addJoinColumnMessages();
-	}
-	
-	protected void addMappedByMessages(List<IMessage> messages) {
-		String mappedBy = this.getMappedBy();
-		Entity targetEntity = this.getResolvedTargetEntity();
-		
-		if (targetEntity == null) {
-			// already have validation messages for that
-			return;
-		}
-		
-		PersistentAttribute attribute = targetEntity.getPersistentType().resolveAttribute(mappedBy);
-		
-		if (attribute == null) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.MAPPING_UNRESOLVED_MAPPED_BY,
-						new String[] {mappedBy}, 
-						this, this.getMappedByTextRange())
-				);
-			return;
-		}
-		
-		if (! this.mappedByIsValid(attribute.getMapping())) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.MAPPING_INVALID_MAPPED_BY,
-						new String[] {mappedBy}, 
-						this, this.getMappedByTextRange())
-				);
-			return;
-		}
-		
-		NonOwningMapping mappedByMapping;
-		try {
-			mappedByMapping = (NonOwningMapping) attribute.getMapping();
-		} catch (ClassCastException cce) {
-			// there is no error then
-			return;
-		}
-		
-		if (mappedByMapping.getMappedBy() != null) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.MAPPING_MAPPED_BY_ON_BOTH_SIDES,
-						this, this.getMappedByTextRange())
-				);
-		}
-	}
-
-	@Override
-	public void initialize(XmlOneToOne oneToOne) {
-		super.initialize(oneToOne);
-		this.mappedBy = oneToOne.getMappedBy();
-		this.initializePrimaryKeyJoinColumns(oneToOne);
-	}
-	
-	protected void initializePrimaryKeyJoinColumns(XmlOneToOne oneToOne) {
-		if (oneToOne == null) {
-			return;
-		}
-		for (XmlPrimaryKeyJoinColumn pkJoinColumn : oneToOne.getPrimaryKeyJoinColumns()) {
-			this.primaryKeyJoinColumns.add(buildPrimaryKeyJoinColumn(pkJoinColumn));
-		}
-	}
-	
-	protected OrmPrimaryKeyJoinColumn buildPrimaryKeyJoinColumn(XmlPrimaryKeyJoinColumn xmlPkJoinColumn) {
-		OrmPrimaryKeyJoinColumn ormPkJoinColumn = getJpaFactory().buildOrmPrimaryKeyJoinColumn(this, new JoinColumnOwner());
-		ormPkJoinColumn.initialize(xmlPkJoinColumn);
-		return ormPkJoinColumn;
-	}	
-
-	
-	@Override
-	public void update(XmlOneToOne oneToOne) {
-		super.update(oneToOne);
-		this.setMappedBy_(oneToOne.getMappedBy());
-		this.updatePrimaryKeyJoinColumns(oneToOne);
-	}
-	
-	
-	protected void updatePrimaryKeyJoinColumns(XmlOneToOne oneToOne) {
-		ListIterator<OrmPrimaryKeyJoinColumn> pkJoinColumns = primaryKeyJoinColumns();
-		ListIterator<XmlPrimaryKeyJoinColumn> resourcePkJoinColumns = EmptyListIterator.instance();
-		if (oneToOne != null) {
-			resourcePkJoinColumns = new CloneListIterator<XmlPrimaryKeyJoinColumn>(oneToOne.getPrimaryKeyJoinColumns());//prevent ConcurrentModificiationException
-		}
-		
-		while (pkJoinColumns.hasNext()) {
-			OrmPrimaryKeyJoinColumn pkJoinColumn = pkJoinColumns.next();
-			if (resourcePkJoinColumns.hasNext()) {
-				pkJoinColumn.update(resourcePkJoinColumns.next());
-			}
-			else {
-				removePrimaryKeyJoinColumn_(pkJoinColumn);
-			}
-		}
-		
-		while (resourcePkJoinColumns.hasNext()) {
-			addPrimaryKeyJoinColumn(primaryKeyJoinColumnsSize(), buildPrimaryKeyJoinColumn(resourcePkJoinColumns.next()));
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentAttribute.java
deleted file mode 100644
index 98d1a5c909..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentAttribute.java
+++ /dev/null
@@ -1,357 +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.core.internal.context.orm;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-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.OrmStructureNodes;
-import org.eclipse.jpt.core.context.orm.OrmTransientMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.context.orm.OrmVersionMapping;
-import org.eclipse.jpt.core.resource.orm.XmlBasic;
-import org.eclipse.jpt.core.resource.orm.XmlEmbedded;
-import org.eclipse.jpt.core.resource.orm.XmlEmbeddedId;
-import org.eclipse.jpt.core.resource.orm.XmlId;
-import org.eclipse.jpt.core.resource.orm.XmlManyToMany;
-import org.eclipse.jpt.core.resource.orm.XmlManyToOne;
-import org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping;
-import org.eclipse.jpt.core.resource.orm.XmlOneToMany;
-import org.eclipse.jpt.core.resource.orm.XmlOneToOne;
-import org.eclipse.jpt.core.resource.orm.XmlTransient;
-import org.eclipse.jpt.core.resource.orm.XmlVersion;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericOrmPersistentAttribute extends AbstractOrmJpaContextNode
-	implements OrmPersistentAttribute
-{
-
-	protected List<OrmAttributeMappingProvider> attributeMappingProviders;
-
-	protected OrmAttributeMapping attributeMapping;
-	
-	public GenericOrmPersistentAttribute(OrmPersistentType parent, String mappingKey) {
-		super(parent);
-		this.attributeMappingProviders = buildAttributeMappingProviders();
-		this.attributeMapping = buildAttributeMapping(mappingKey);
-	}
-
-	protected List<OrmAttributeMappingProvider> buildAttributeMappingProviders() {
-		List<OrmAttributeMappingProvider> list = new ArrayList<OrmAttributeMappingProvider>();
-		list.add(OrmEmbeddedMappingProvider.instance()); //bug 190344 need to test default embedded before basic
-		list.add(OrmBasicMappingProvider.instance());
-		list.add(OrmTransientMappingProvider.instance());
-		list.add(OrmIdMappingProvider.instance());
-		list.add(OrmManyToManyMappingProvider.instance());
-		list.add(OrmOneToManyMappingProvider.instance());
-		list.add(OrmManyToOneMappingProvider.instance());
-		list.add(OrmOneToOneMappingProvider.instance());
-		list.add(OrmVersionMappingProvider.instance());
-		list.add(OrmEmbeddedIdMappingProvider.instance());
-		return list;
-	}
-	
-	protected OrmAttributeMappingProvider attributeMappingProvider(String key) {
-		for (OrmAttributeMappingProvider provider : this.attributeMappingProviders) {
-			if (provider.getKey().equals(key)) {
-				return provider;
-			}
-		}
-		return OrmNullAttributeMappingProvider.instance();
-	}
-
-	protected OrmAttributeMapping buildAttributeMapping(String key) {
-		return this.attributeMappingProvider(key).buildAttributeMapping(getJpaFactory(), this);
-	}
-	
-	public String getId() {
-		return OrmStructureNodes.PERSISTENT_ATTRIBUTE_ID;
-	}
-
-	public String getName() {
-		return getMapping().getName();
-	}
-
-	public void nameChanged(String oldName, String newName) {
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
-	}
-
-	public OrmAttributeMapping getSpecifiedMapping() {
-		return this.attributeMapping;
-	}
-	
-	public OrmAttributeMapping getMapping() {
-		return this.attributeMapping;
-	}
-
-	public String getMappingKey() {
-		return this.getMapping().getKey();
-	}
-
-	public String getDefaultMappingKey() {
-		return null;
-	}
-
-	public void setSpecifiedMappingKey(String newMappingKey) {
-		if (this.getMappingKey() == newMappingKey) {
-			return;
-		}
-		OrmAttributeMapping oldMapping = getMapping();
-		this.attributeMapping = buildAttributeMapping(newMappingKey);
-		getPersistentType().changeMapping(this, oldMapping, this.attributeMapping);
-		firePropertyChanged(SPECIFIED_MAPPING_PROPERTY, oldMapping, this.attributeMapping);
-	}
-	
-	protected void setSpecifiedMappingKey_(String newMappingKey) {
-		if (this.getMappingKey() == newMappingKey) {
-			return;
-		}
-		OrmAttributeMapping oldMapping = getMapping();
-		this.attributeMapping = buildAttributeMapping(newMappingKey);
-		firePropertyChanged(SPECIFIED_MAPPING_PROPERTY, oldMapping, this.attributeMapping);
-	}
-
-	public Collection<OrmAttributeMappingProvider> attributeMappingProviders() {
-		return this.attributeMappingProviders;
-	}
-
-	public OrmPersistentType getPersistentType() {
-		return (OrmPersistentType) getParent();
-	}
-
-	public OrmTypeMapping getTypeMapping() {
-		return getPersistentType().getMapping();
-	}
-
-	public boolean isVirtual() {
-		return getPersistentType().containsVirtualPersistentAttribute(this);
-	}
-
-	public void makeVirtual() {
-		if (isVirtual()) {
-			throw new IllegalStateException("Attribute is already virtual");
-		}
-		getOrmPersistentType().makePersistentAttributeVirtual(this);
-	}
-	
-	public void makeSpecified() {
-		if (!isVirtual()) {
-			throw new IllegalStateException("Attribute is already specified");
-		}
-		if (getMappingKey() == MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY) {
-			throw new IllegalStateException("Use makeSpecified(String) instead and specify a mapping type");
-		}
-		getOrmPersistentType().makePersistentAttributeSpecified(this);
-	}
-	
-	public void makeSpecified(String mappingKey) {
-		if (!isVirtual()) {
-			throw new IllegalStateException("Attribute is already specified");
-		}
-		getOrmPersistentType().makePersistentAttributeSpecified(this, mappingKey);
-	}
-	
-	public String getPrimaryKeyColumnName() {
-		return getMapping().getPrimaryKeyColumnName();
-	}
-
-	public boolean isOverridableAttribute() {
-		return this.getMapping().isOverridableAttributeMapping();
-	}
-
-	public boolean isOverridableAssociation() {
-		return this.getMapping().isOverridableAssociationMapping();
-	}
-
-	public boolean isIdAttribute() {
-		return this.getMapping().isIdMapping();
-	}
-	
-	//TODO is there a way to avoid a method for every mapping type?
-	//I am trying to take adavantage of generics here, but it sure is
-	//leading to a lot of duplicated code. - KFM
-	public void initialize(XmlBasic basic) {
-		((OrmBasicMapping) getMapping()).initialize(basic);
-	}
-	
-	public void initialize(XmlEmbedded embedded) {
-		((OrmEmbeddedMapping) getMapping()).initialize(embedded);
-	}
-	
-	public void initialize(XmlVersion version) {
-		((OrmVersionMapping) getMapping()).initialize(version);
-	}
-	
-	public void initialize(XmlManyToOne manyToOne) {
-		((OrmManyToOneMapping) getMapping()).initialize(manyToOne);
-	}
-	
-	public void initialize(XmlOneToMany oneToMany) {
-		((OrmOneToManyMapping) getMapping()).initialize(oneToMany);
-	}
-	
-	public void initialize(XmlOneToOne oneToOne) {
-		((OrmOneToOneMapping) getMapping()).initialize(oneToOne);
-	}
-	
-	public void initialize(XmlManyToMany manyToMany) {
-		((OrmManyToManyMapping) getMapping()).initialize(manyToMany);
-	}
-	
-	public void initialize(XmlId id) {
-		((OrmIdMapping) getMapping()).initialize(id);
-	}
-	
-	public void initialize(XmlEmbeddedId embeddedId) {
-		((OrmEmbeddedIdMapping) getMapping()).initialize(embeddedId);
-	}
-	
-	public void initialize(XmlTransient transientResource) {
-		((OrmTransientMapping) getMapping()).initialize(transientResource);
-	}
-	
-	public void initialize(XmlNullAttributeMapping xmlNullAttributeMapping) {
-		((GenericOrmNullAttributeMapping) getMapping()).initialize(xmlNullAttributeMapping);
-	}
-	
-	public void update(XmlId id) {
-		if (getMappingKey() != MappingKeys.ID_ATTRIBUTE_MAPPING_KEY) {
-			setSpecifiedMappingKey_(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY);
-		}
-		((OrmIdMapping) getMapping()).update(id);
-	}
-	
-	public void update(XmlEmbeddedId embeddedId) {
-		if (getMappingKey() != MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY) {
-			setSpecifiedMappingKey_(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY);
-		}
-		((OrmEmbeddedIdMapping) getMapping()).update(embeddedId);
-	}
-
-	public void update(XmlBasic basic) {
-		if (getMappingKey() != MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY) {
-			setSpecifiedMappingKey_(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY);
-		}
-		((OrmBasicMapping) getMapping()).update(basic);
-	}
-	
-	public void update(XmlVersion version) {
-		if (getMappingKey() != MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY) {
-			setSpecifiedMappingKey_(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY);
-		}
-		((OrmVersionMapping) getMapping()).update(version);
-	}
-	
-	public void update(XmlManyToOne manyToOne) {
-		if (getMappingKey() != MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY) {
-			setSpecifiedMappingKey_(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY);
-		}
-		((OrmManyToOneMapping) getMapping()).update(manyToOne);
-	}
-	
-	public void update(XmlOneToMany oneToMany) {
-		if (getMappingKey() != MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY) {
-			setSpecifiedMappingKey_(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY);
-		}
-		((OrmOneToManyMapping) getMapping()).update(oneToMany);
-	}
-	
-	public void update(XmlOneToOne oneToOne) {
-		if (getMappingKey() != MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY) {
-			setSpecifiedMappingKey_(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY);
-		}
-		((OrmOneToOneMapping) getMapping()).update(oneToOne);
-	}
-	
-	public void update(XmlManyToMany manyToMany) {
-		if (getMappingKey() != MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY) {
-			setSpecifiedMappingKey_(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY);
-		}
-		((OrmManyToManyMapping) getMapping()).update(manyToMany);
-	}
-
-	public void update(XmlEmbedded embedded) {
-		if (getMappingKey() != MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY) {
-			setSpecifiedMappingKey_(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY);
-		}
-		((OrmEmbeddedMapping) getMapping()).update(embedded);
-	}
-	
-	public void update(XmlTransient transientResource) {
-		if (getMappingKey() != MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY) {
-			setSpecifiedMappingKey_(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY);
-		}
-		((OrmTransientMapping) getMapping()).update(transientResource);
-	}
-
-	public void update(XmlNullAttributeMapping xmlNullAttributeMapping) {
-		if (getMappingKey() != MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY) {
-			setSpecifiedMappingKey_(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY);
-		}
-		((GenericOrmNullAttributeMapping) getMapping()).update(xmlNullAttributeMapping);
-	}
-	
-	public JpaStructureNode getStructureNode(int offset) {
-		return this;
-	}
-
-	public boolean contains(int textOffset) {
-		if (isVirtual()) {
-			return false;
-		}
-		return this.attributeMapping.contains(textOffset);
-	}
-	
-	public TextRange getSelectionTextRange() {
-		if (isVirtual()) {
-			return null;
-		}
-		return this.attributeMapping.getSelectionTextRange();
-	}
-	
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		getMapping().addToMessages(messages);
-	}
-	
-	public TextRange getValidationTextRange() {
-		if (isVirtual()) {
-			return getPersistentType().getMapping().getAttributesTextRange();
-		}
-		return this.attributeMapping.getValidationTextRange();
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		super.toString(sb);
-		sb.append(getName());
-	}
-	
-	public void dispose() {
-		//nothing to dispose
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentType.java
deleted file mode 100644
index dc7054e620..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentType.java
+++ /dev/null
@@ -1,896 +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.core.internal.context.orm;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.AccessType;
-import org.eclipse.jpt.core.context.PersistentAttribute;
-import org.eclipse.jpt.core.context.PersistentType;
-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.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.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.OrmEmbeddable;
-import org.eclipse.jpt.core.context.orm.OrmEntity;
-import org.eclipse.jpt.core.context.orm.OrmMappedSuperclass;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.orm.OrmStructureNodes;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMappingProvider;
-import org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping;
-import org.eclipse.jpt.core.resource.orm.Attributes;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlBasic;
-import org.eclipse.jpt.core.resource.orm.XmlEmbeddable;
-import org.eclipse.jpt.core.resource.orm.XmlEmbedded;
-import org.eclipse.jpt.core.resource.orm.XmlEmbeddedId;
-import org.eclipse.jpt.core.resource.orm.XmlEntity;
-import org.eclipse.jpt.core.resource.orm.XmlId;
-import org.eclipse.jpt.core.resource.orm.XmlManyToMany;
-import org.eclipse.jpt.core.resource.orm.XmlManyToOne;
-import org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass;
-import org.eclipse.jpt.core.resource.orm.XmlOneToMany;
-import org.eclipse.jpt.core.resource.orm.XmlOneToOne;
-import org.eclipse.jpt.core.resource.orm.XmlTransient;
-import org.eclipse.jpt.core.resource.orm.XmlVersion;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.ChainIterator;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.CompositeIterator;
-import org.eclipse.jpt.utility.internal.iterators.CompositeListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implements OrmPersistentType
-{
-	protected final List<OrmPersistentAttribute> specifiedPersistentAttributes;
-
-	protected final List<OrmPersistentAttribute> virtualPersistentAttributes;
-
-	protected final Collection<OrmTypeMappingProvider> typeMappingProviders;
-
-	protected OrmTypeMapping ormTypeMapping;
-	
-	protected PersistentType parentPersistentType;
-	
-	public GenericOrmPersistentType(EntityMappings parent, String mappingKey) {
-		super(parent);
-		this.typeMappingProviders = buildTypeMappingProviders();
-		this.ormTypeMapping = buildOrmTypeMapping(mappingKey);
-		this.specifiedPersistentAttributes = new ArrayList<OrmPersistentAttribute>();
-		this.virtualPersistentAttributes = new ArrayList<OrmPersistentAttribute>();
-	}
-	
-	public String getId() {
-		return OrmStructureNodes.PERSISTENT_TYPE_ID;
-	}
-
-	public boolean isFor(String fullyQualifiedTypeName) {
-		String className = getMapping().getClass_();
-		if (className == null) {
-			return false;
-		}
-		if (className.equals(fullyQualifiedTypeName)) {
-			return true;
-		}
-		if ((getEntityMappings().getPackage() + "." +  className).equals(fullyQualifiedTypeName)) {
-			return true;
-		}
-		return false;
-	}
-	
-	protected OrmTypeMapping buildOrmTypeMapping(String key) {
-		return getTypeMappingProvider(key).buildTypeMapping(getJpaFactory(), this);
-	}
-
-	protected Collection<OrmTypeMappingProvider> buildTypeMappingProviders() {
-		Collection<OrmTypeMappingProvider> collection = new ArrayList<OrmTypeMappingProvider>();
-		collection.add(new OrmEntityProvider());
-		collection.add(new OrmMappedSuperclassProvider());
-		collection.add(new OrmEmbeddableProvider());
-		return collection;
-	}
-
-	protected OrmTypeMappingProvider getTypeMappingProvider(String key) {
-		for (OrmTypeMappingProvider provider : this.typeMappingProviders) {
-			if (provider.getKey().equals(key)) {
-				return provider;
-			}
-		}
-		throw new IllegalArgumentException();
-	}
-
-	public OrmTypeMapping getMapping() {
-		return this.ormTypeMapping;
-	}
-
-	public void setMappingKey(String newMappingKey) {
-		if (this.getMappingKey() == newMappingKey) {
-			return;
-		}
-		OrmTypeMapping oldMapping = getMapping();
-		this.ormTypeMapping = buildOrmTypeMapping(newMappingKey);
-		getEntityMappings().changeMapping(this, oldMapping, this.ormTypeMapping);
-		firePropertyChanged(MAPPING_PROPERTY, oldMapping, this.ormTypeMapping);
-	}
-	
-	protected void setMappingKey_(String newMappingKey) {
-		if (this.getMappingKey() == newMappingKey) {
-			return;
-		}
-		OrmTypeMapping oldMapping = getMapping();
-		this.ormTypeMapping = buildOrmTypeMapping(newMappingKey);
-		firePropertyChanged(MAPPING_PROPERTY, oldMapping, this.ormTypeMapping);
-	}
-
-	public Iterator<PersistentType> inheritanceHierarchy() {
-		// using a chain iterator to traverse up the inheritance tree
-		return new ChainIterator<PersistentType>(this) {
-			@Override
-			protected PersistentType nextLink(PersistentType pt) {
-				return pt.getParentPersistentType();
-			}
-		};
-	}
-
-	public PersistentType getParentPersistentType() {
-		return this.parentPersistentType;
-	}
-	
-	public void setParentPersistentType(PersistentType newParentPersistentType) {
-		if (attributeValueHasNotChanged(this.parentPersistentType, newParentPersistentType)) {
-			return;
-		}
-		PersistentType oldParentPersistentType = this.parentPersistentType;
-		this.parentPersistentType = newParentPersistentType;
-		firePropertyChanged(PersistentType.PARENT_PERSISTENT_TYPE_PROPERTY, oldParentPersistentType, newParentPersistentType);
-	}
-
-	public AccessType getAccess() {
-		return getMapping().getAccess();
-	}
-	
-	public void changeMapping(OrmPersistentAttribute ormPersistentAttribute, OrmAttributeMapping oldMapping, OrmAttributeMapping newMapping) {
-		int sourceIndex = this.specifiedPersistentAttributes.indexOf(ormPersistentAttribute);
-		if (sourceIndex != -1) {
-			this.specifiedPersistentAttributes.remove(sourceIndex);
-			oldMapping.removeFromResourceModel(getMapping().getTypeMappingResource());
-		}
-		if (getMapping().getTypeMappingResource().getAttributes() == null) {
-			getMapping().getTypeMappingResource().setAttributes(OrmFactory.eINSTANCE.createAttributes());
-		}
-		int targetIndex = insertionIndex(ormPersistentAttribute);
-		this.specifiedPersistentAttributes.add(targetIndex, ormPersistentAttribute);
-		newMapping.addToResourceModel(getMapping().getTypeMappingResource());
-		oldMapping.initializeOn(newMapping);
-		if (sourceIndex != -1) {
-			//TODO are the source and target correct in this case, or is target off by one???
-			fireItemMoved(SPECIFIED_ATTRIBUTES_LIST, targetIndex, sourceIndex);
-		}
-	}
-
-	public void makePersistentAttributeVirtual(OrmPersistentAttribute ormPersistentAttribute) {
-		if (ormPersistentAttribute.isVirtual()) {
-			throw new IllegalStateException("Attribute is already virtual");
-		}
-		JavaPersistentAttribute javaPersistentAttribute = ormPersistentAttribute.getMapping().getJavaPersistentAttribute();
-		OrmPersistentAttribute virtualPersistentAttribute = null;
-		if (javaPersistentAttribute != null) {
-			virtualPersistentAttribute = createVirtualPersistentAttribute(javaPersistentAttribute);
-			this.virtualPersistentAttributes.add(virtualPersistentAttribute);
-		}
-		this.removeSpecifiedPersistentAttribute(ormPersistentAttribute);
-		if (virtualPersistentAttribute != null) {
-			fireItemAdded(VIRTUAL_ATTRIBUTES_LIST, virtualAttributesSize() - 1, virtualPersistentAttribute);
-		}
-	}
-	
-	public void makePersistentAttributeSpecified(OrmPersistentAttribute ormPersistentAttribute) {
-		makePersistentAttributeSpecified(ormPersistentAttribute, ormPersistentAttribute.getMappingKey());		
-	}
-
-	public void makePersistentAttributeSpecified(OrmPersistentAttribute ormPersistentAttribute, String mappingKey) {
-		if (!ormPersistentAttribute.isVirtual()) {
-			throw new IllegalStateException("Attribute is already specified");
-		}
-		if (mappingKey == MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY) {
-			throw new IllegalStateException("Use makePersistentAttributeSpecified(OrmPersistentAttribute, String) instead and specify a mapping type");
-		}
-			
-		OrmPersistentAttribute newPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, mappingKey);
-		if (getMapping().getTypeMappingResource().getAttributes() == null) {
-			getMapping().getTypeMappingResource().setAttributes(OrmFactory.eINSTANCE.createAttributes());
-		}
-		int insertionIndex = insertionIndex(newPersistentAttribute);
-		this.specifiedPersistentAttributes.add(insertionIndex, newPersistentAttribute);
-		newPersistentAttribute.getMapping().addToResourceModel(getMapping().getTypeMappingResource());
-		
-		int removalIndex = this.virtualPersistentAttributes.indexOf(ormPersistentAttribute);
-		this.virtualPersistentAttributes.remove(ormPersistentAttribute);
-		newPersistentAttribute.getSpecifiedMapping().setName(ormPersistentAttribute.getName());
-		
-		fireItemAdded(PersistentType.SPECIFIED_ATTRIBUTES_LIST, insertionIndex, newPersistentAttribute);
-		fireItemRemoved(VIRTUAL_ATTRIBUTES_LIST, removalIndex, ormPersistentAttribute);
-	}
-
-	public Iterator<String> allAttributeNames() {
-		return this.attributeNames(this.allAttributes());
-	}
-
-	public Iterator<PersistentAttribute> allAttributes() {
-		return new CompositeIterator<PersistentAttribute>(new TransformationIterator<PersistentType, Iterator<PersistentAttribute>>(this.inheritanceHierarchy()) {
-			@Override
-			protected Iterator<PersistentAttribute> transform(PersistentType pt) {
-				return pt.attributes();
-			}
-		});
-	}
-
-	protected Iterator<OrmPersistentAttribute> attributesNamed(final String attributeName) {
-		return new FilteringIterator<OrmPersistentAttribute, OrmPersistentAttribute>(attributes()) {
-			@Override
-			protected boolean accept(OrmPersistentAttribute o) {
-				if (attributeName == null && o.getName() == null) {
-					return true;
-				}
-				if (attributeName != null && attributeName.equals(o.getName())) {
-					return true;
-				}
-				return false;
-			}
-		};
-	}
-
-	public OrmPersistentAttribute getAttributeNamed(String attributeName) {
-		Iterator<OrmPersistentAttribute> stream = attributesNamed(attributeName);
-		return (stream.hasNext()) ? stream.next() : null;
-	}
-
-	public Iterator<String> attributeNames() {
-		return this.attributeNames(this.attributes());
-	}
-	
-	protected Iterator<String> attributeNames(Iterator<? extends PersistentAttribute> attrs) {
-		return new TransformationIterator<PersistentAttribute, String>(attrs) {
-			@Override
-			protected String transform(PersistentAttribute attribute) {
-				return attribute.getName();
-			}
-		};
-	}
-
-	protected OrmPersistentAttribute specifiedAttributeNamed(String attributeName) {
-		Iterator<OrmPersistentAttribute> stream = specifiedAttributesNamed(attributeName);
-		return (stream.hasNext()) ? stream.next() : null;
-		
-	}
-	
-	protected Iterator<OrmPersistentAttribute> specifiedAttributesNamed(final String attributeName) {
-		return new FilteringIterator<OrmPersistentAttribute, OrmPersistentAttribute>(specifiedAttributes()) {
-			@Override
-			protected boolean accept(OrmPersistentAttribute ormPersistentAttribute) {
-				return attributeName.equals(ormPersistentAttribute.getName());
-			}
-		};
-	}
-
-	@SuppressWarnings("unchecked")
-	public ListIterator<OrmPersistentAttribute> attributes() {
-		return new CompositeListIterator<OrmPersistentAttribute>(specifiedAttributes(), virtualAttributes());
-	}
-
-	public int attributesSize() {
-		return specifiedAttributesSize() + virtualAttributesSize();
-	}
-	
-	public ListIterator<OrmPersistentAttribute> specifiedAttributes() {
-		return new CloneListIterator<OrmPersistentAttribute>(this.specifiedPersistentAttributes);
-	}
-	
-	public int specifiedAttributesSize() {
-		return this.specifiedPersistentAttributes.size();
-	}
-	
-	public ListIterator<OrmPersistentAttribute> virtualAttributes() {
-		return new CloneListIterator<OrmPersistentAttribute>(this.virtualPersistentAttributes);		
-	}
-	
-	public int virtualAttributesSize() {
-		return this.virtualPersistentAttributes.size();
-	}
-	
-	protected void addVirtualPersistentAttribute(OrmPersistentAttribute ormPersistentAttribute) {
-		addItemToList(ormPersistentAttribute, this.virtualPersistentAttributes, OrmPersistentType.VIRTUAL_ATTRIBUTES_LIST);
-	}
-
-	protected void removeVirtualPersistentAttribute(OrmPersistentAttribute ormPersistentAttribute) {
-		removeItemFromList(ormPersistentAttribute, this.virtualPersistentAttributes, OrmPersistentType.VIRTUAL_ATTRIBUTES_LIST);
-	}
-	
-	public boolean containsVirtualPersistentAttribute(OrmPersistentAttribute ormPersistentAttribute) {
-		return this.virtualPersistentAttributes.contains(ormPersistentAttribute);
-	}
-	
-	public OrmPersistentAttribute addSpecifiedPersistentAttribute(String mappingKey, String attributeName) {
-		OrmPersistentAttribute persistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, mappingKey);
-		int index = insertionIndex(persistentAttribute);
-		if (getMapping().getTypeMappingResource().getAttributes() == null) {
-			getMapping().getTypeMappingResource().setAttributes(OrmFactory.eINSTANCE.createAttributes());
-		}
-		this.specifiedPersistentAttributes.add(index, persistentAttribute);
-		persistentAttribute.getMapping().addToResourceModel(getMapping().getTypeMappingResource());
-		
-		persistentAttribute.getSpecifiedMapping().setName(attributeName);
-		fireItemAdded(PersistentType.SPECIFIED_ATTRIBUTES_LIST, index, persistentAttribute);
-		return persistentAttribute;
-	}
-
-	protected int insertionIndex(OrmPersistentAttribute persistentAttribute) {
-		return CollectionTools.insertionIndexOf(this.specifiedPersistentAttributes, persistentAttribute, buildMappingComparator());
-	}
-
-	protected Comparator<OrmPersistentAttribute> buildMappingComparator() {
-		return new Comparator<OrmPersistentAttribute>() {
-			public int compare(OrmPersistentAttribute o1, OrmPersistentAttribute o2) {
-				int o1Sequence = o1.getMapping().getXmlSequence();
-				int o2Sequence = o2.getMapping().getXmlSequence();
-				if (o1Sequence < o2Sequence) {
-					return -1;
-				}
-				if (o1Sequence == o2Sequence) {
-					return 0;
-				}
-				return 1;
-			}
-		};
-	}
-
-	
-	protected void addSpecifiedPersistentAttribute_(OrmPersistentAttribute ormPersistentAttribute) {
-		addItemToList(ormPersistentAttribute, this.specifiedPersistentAttributes, PersistentType.SPECIFIED_ATTRIBUTES_LIST);
-	}
-
-	protected void removeSpecifiedPersistentAttribute_(OrmPersistentAttribute ormPersistentAttribute) {
-		removeItemFromList(ormPersistentAttribute, this.specifiedPersistentAttributes, PersistentType.SPECIFIED_ATTRIBUTES_LIST);
-	}
-
-	public void removeSpecifiedPersistentAttribute(OrmPersistentAttribute ormPersistentAttribute) {
-		int index = this.specifiedPersistentAttributes.indexOf(ormPersistentAttribute);
-		this.specifiedPersistentAttributes.remove(ormPersistentAttribute);
-		ormPersistentAttribute.getMapping().removeFromResourceModel(this.ormTypeMapping.getTypeMappingResource());
-		fireItemRemoved(PersistentType.SPECIFIED_ATTRIBUTES_LIST, index, ormPersistentAttribute);		
-	}
-
-	public String getName() {
-		return getMapping().getClass_();
-	}
-
-	public void classChanged(String oldClass, String newClass) {
-		firePropertyChanged(NAME_PROPERTY, oldClass, newClass);
-	}
-
-	public boolean isMapped() {
-		return true;
-	}
-
-	public String getMappingKey() {
-		return getMapping().getKey();
-	}
-	
-	public JavaPersistentType getJavaPersistentType() {
-		return getMapping().getJavaPersistentType();
-	}
-	
-	
-	//TODO is there a way to avoid a method for every mapping type?
-	//I am trying to take adavantage of generics here, but it sure is
-	//leading to a lot of duplicated code. - KFM
-	public void initialize(XmlEntity entity) {
-		((OrmEntity) getMapping()).initialize(entity);
-		this.initializeParentPersistentType();	
-		this.initializePersistentAttributes(entity);
-	}
-	
-	public void initialize(XmlMappedSuperclass mappedSuperclass) {
-		((OrmMappedSuperclass) getMapping()).initialize(mappedSuperclass);
-		this.initializeParentPersistentType();
-		this.initializePersistentAttributes(mappedSuperclass);
-	}
-		
-	public void initialize(XmlEmbeddable embeddable) {
-		((OrmEmbeddable) getMapping()).initialize(embeddable);
-		this.initializeParentPersistentType();		
-		this.initializePersistentAttributes(embeddable);
-	}
-	
-	protected void initializePersistentAttributes(AbstractXmlTypeMapping typeMapping) {
-		Attributes attributes = typeMapping.getAttributes();
-		if (attributes != null) {
-			this.initializeSpecifiedPersistentAttributes(attributes);
-		}
-		this.initializeVirtualPersistentAttributes();
-	}
-	
-	protected void initializeSpecifiedPersistentAttributes(Attributes attributes) {
-		for (XmlId id : attributes.getIds()) {
-			OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.ID_ATTRIBUTE_MAPPING_KEY);
-			ormPersistentAttribute.initialize(id);
-			this.specifiedPersistentAttributes.add(ormPersistentAttribute);
-		}
-		for (XmlEmbeddedId embeddedId : attributes.getEmbeddedIds()) {
-			OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY);
-			ormPersistentAttribute.initialize(embeddedId);
-			this.specifiedPersistentAttributes.add(ormPersistentAttribute);
-		}
-		for (XmlBasic basic : attributes.getBasics()) {
-			OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY);
-			ormPersistentAttribute.initialize(basic);
-			this.specifiedPersistentAttributes.add(ormPersistentAttribute);
-		}
-		for (XmlVersion version : attributes.getVersions()) {
-			OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY);
-			ormPersistentAttribute.initialize(version);
-			this.specifiedPersistentAttributes.add(ormPersistentAttribute);
-		}
-		for (XmlManyToOne manyToOne : attributes.getManyToOnes()) {
-			OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY);
-			ormPersistentAttribute.initialize(manyToOne);
-			this.specifiedPersistentAttributes.add(ormPersistentAttribute);
-		}
-		for (XmlOneToMany oneToMany : attributes.getOneToManys()) {
-			OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY);
-			ormPersistentAttribute.initialize(oneToMany);
-			this.specifiedPersistentAttributes.add(ormPersistentAttribute);
-		}
-		for (XmlOneToOne oneToOne : attributes.getOneToOnes()) {
-			OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY);
-			ormPersistentAttribute.initialize(oneToOne);
-			this.specifiedPersistentAttributes.add(ormPersistentAttribute);
-		}
-		for (XmlManyToMany manyToMany : attributes.getManyToManys()) {
-			OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY);
-			ormPersistentAttribute.initialize(manyToMany);
-			this.specifiedPersistentAttributes.add(ormPersistentAttribute);
-		}
-		for (XmlEmbedded embedded : attributes.getEmbeddeds()) {
-			OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY);
-			ormPersistentAttribute.initialize(embedded);
-			this.specifiedPersistentAttributes.add(ormPersistentAttribute);
-		}
-		for (XmlTransient transientResource : attributes.getTransients()) {
-			OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY);
-			ormPersistentAttribute.initialize(transientResource);
-			this.specifiedPersistentAttributes.add(ormPersistentAttribute);
-		}
-	}
-	
-	protected void initializeVirtualPersistentAttributes() {
-		ListIterator<JavaPersistentAttribute> javaAttributes = javaPersistentAttributes();
-		
-		while (javaAttributes.hasNext()) {
-			JavaPersistentAttribute javaPersistentAttribute = javaAttributes.next();
-			if (specifiedAttributeNamed(javaPersistentAttribute.getName()) == null) {
-				OrmPersistentAttribute ormPersistentAttribute = createVirtualPersistentAttribute(javaPersistentAttribute);
-				this.virtualPersistentAttributes.add(ormPersistentAttribute);
-			}
-		}
-	}
-	
-	protected ListIterator<JavaPersistentAttribute> javaPersistentAttributes() {
-		JavaPersistentType javaPersistentType = getJavaPersistentType();
-		if (javaPersistentType != null) {
-			return javaPersistentType.attributes();
-		}
-		return EmptyListIterator.instance();
-	}
-
-	protected void initializeParentPersistentType() {
-		JavaPersistentType javaPersistentType = getJavaPersistentType();
-		if (javaPersistentType != null) {
-			this.parentPersistentType = javaPersistentType.getParentPersistentType();
-		}
-	}
-
-	public void update(XmlEntity entity) {
-		if (getMappingKey() != MappingKeys.ENTITY_TYPE_MAPPING_KEY) {
-			setMappingKey_(MappingKeys.ENTITY_TYPE_MAPPING_KEY);
-		}
-		((OrmEntity) getMapping()).update(entity);
-		this.updateParentPersistentType();
-		this.updatePersistentAttributes(entity);
-	}
-	
-	public void update(XmlMappedSuperclass mappedSuperclass) {
-		if (getMappingKey() != MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY) {
-			setMappingKey_(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY);
-		}
-		((OrmMappedSuperclass) getMapping()).update(mappedSuperclass);
-		this.updateParentPersistentType();
-		this.updatePersistentAttributes(mappedSuperclass);
-	}
-	
-	public void update(XmlEmbeddable embeddable) {
-		if (getMappingKey() != MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY) {
-			setMappingKey_(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY);
-		}
-		((OrmEmbeddable) getMapping()).update(embeddable);
-		this.updateParentPersistentType();
-		this.updatePersistentAttributes(embeddable);
-	}
-	
-	protected void updateParentPersistentType() {
-		JavaPersistentType javaPersistentType = getJavaPersistentType();
-		setParentPersistentType(javaPersistentType == null ? null : javaPersistentType.getParentPersistentType());
-	}
-
-	protected void updatePersistentAttributes(AbstractXmlTypeMapping typeMapping) {
-		ListIterator<OrmPersistentAttribute> ormPersistentAttributes = this.specifiedAttributes();
-		if (typeMapping.getAttributes() != null) {
-			this.updateIds(typeMapping.getAttributes(), ormPersistentAttributes);
-			this.updateEmbeddedIds(typeMapping.getAttributes(), ormPersistentAttributes);
-			this.updateBasics(typeMapping.getAttributes(), ormPersistentAttributes);
-			this.updateVersions(typeMapping.getAttributes(), ormPersistentAttributes);
-			this.updateManyToOnes(typeMapping.getAttributes(), ormPersistentAttributes);
-			this.updateOneToManys(typeMapping.getAttributes(), ormPersistentAttributes);
-			this.updateOneToOnes(typeMapping.getAttributes(), ormPersistentAttributes);
-			this.updateManyToManys(typeMapping.getAttributes(), ormPersistentAttributes);
-			this.updateEmbeddeds(typeMapping.getAttributes(), ormPersistentAttributes);		
-			this.updateTransients(typeMapping.getAttributes(), ormPersistentAttributes);		
-		}
-		while (ormPersistentAttributes.hasNext()) {
-			this.removeSpecifiedPersistentAttribute_(ormPersistentAttributes.next());
-		}	
-		this.updateVirtualPersistentAttributes();
-	}
-	
-	protected void updateVirtualAttribute(OrmPersistentAttribute ormPersistentAttribute, JavaPersistentAttribute javaAttribute) {
-		String javaMappingKey = javaAttribute.getMappingKey();
-		JavaAttributeMapping javaAttributeMapping = javaAttribute.getMapping();
-		if (getMapping().isMetadataComplete()) {
-			javaMappingKey = javaAttribute.getDefaultMappingKey();
-			javaAttributeMapping = javaAttribute.getDefaultMapping();
-		}
-		
-		if (javaMappingKey == MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.update(new VirtualXmlBasic(getMapping(), (JavaBasicMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.update(new VirtualXmlEmbedded(getMapping(), (JavaEmbeddedMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.update(new VirtualXmlEmbeddedId(getMapping(), (JavaEmbeddedIdMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.ID_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.update(new VirtualXmlId(getMapping(), (JavaIdMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.update(new VirtualXmlManyToMany(ormPersistentAttribute, (JavaManyToManyMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.update(new VirtualXmlManyToOne((JavaManyToOneMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.update(new VirtualXmlOneToMany(ormPersistentAttribute, (JavaOneToManyMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.update(new VirtualXmlOneToOne((JavaOneToOneMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.update(new VirtualXmlTransient((JavaTransientMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.update(new VirtualXmlVersion(getMapping(), (JavaVersionMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.update(new VirtualXmlNullAttributeMapping(getMapping(), javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-	}
-	
-	protected void updateVirtualPersistentAttributes() {
-		ListIterator<JavaPersistentAttribute> javaAttributes = this.javaPersistentAttributes();
-		ListIterator<OrmPersistentAttribute> xmlVirtualAttributes = this.virtualAttributes();
-		for (JavaPersistentAttribute javaAttribute : CollectionTools.iterable(javaAttributes)) {
-			if (specifiedAttributeNamed(javaAttribute.getName()) == null) {
-				if (xmlVirtualAttributes.hasNext()) {
-					updateVirtualAttribute(xmlVirtualAttributes.next(), javaAttribute);
-				}
-				else {
-					OrmPersistentAttribute ormPersistentAttribute = createVirtualPersistentAttribute(javaAttribute);
-					addVirtualPersistentAttribute(ormPersistentAttribute);
-				}
-			}
-		}
-		
-		while (xmlVirtualAttributes.hasNext()) {
-			this.removeVirtualPersistentAttribute(xmlVirtualAttributes.next());
-		}	
-
-	}
-
-	protected void addVirtualPersistentAttribute(JavaPersistentAttribute javaAttribute) {
-		addVirtualPersistentAttribute(createVirtualPersistentAttribute(javaAttribute));
-	}
-	
-	protected OrmPersistentAttribute createVirtualPersistentAttribute(JavaPersistentAttribute javaAttribute) {
-		String javaMappingKey = javaAttribute.getMappingKey();
-		JavaAttributeMapping javaAttributeMapping = javaAttribute.getMapping();
-		if (getMapping().isMetadataComplete()) {
-			javaMappingKey = javaAttribute.getDefaultMappingKey();
-			javaAttributeMapping = javaAttribute.getDefaultMapping();
-		}
-		OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, javaMappingKey);
-		
-		if (javaMappingKey == MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.initialize(new VirtualXmlBasic(getMapping(), (JavaBasicMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.initialize(new VirtualXmlEmbeddedId(getMapping(), (JavaEmbeddedIdMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.initialize(new VirtualXmlEmbedded(getMapping(), (JavaEmbeddedMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.ID_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.initialize(new VirtualXmlId(getMapping(), (JavaIdMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.initialize(new VirtualXmlManyToMany(ormPersistentAttribute, (JavaManyToManyMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.initialize(new VirtualXmlManyToOne((JavaManyToOneMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.initialize(new VirtualXmlOneToMany(ormPersistentAttribute, (JavaOneToManyMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.initialize(new VirtualXmlOneToOne((JavaOneToOneMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.initialize(new VirtualXmlTransient((JavaTransientMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.initialize(new VirtualXmlVersion(getMapping(), (JavaVersionMapping) javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		else if (javaMappingKey == MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY) {
-			ormPersistentAttribute.initialize(new VirtualXmlNullAttributeMapping(getMapping(), javaAttributeMapping, getMapping().isMetadataComplete()));
-		}
-		return ormPersistentAttribute;
-	}
-
-	protected void updateIds(Attributes attributes, ListIterator<OrmPersistentAttribute> ormPersistentAttributes) {
-		ListIterator<XmlId> ids = new CloneListIterator<XmlId>(attributes.getIds());//prevent ConcurrentModificiationException
-		for (XmlId id : CollectionTools.iterable(ids)) {
-			if (ormPersistentAttributes.hasNext()) {
-				ormPersistentAttributes.next().update(id);
-			}
-			else {
-				OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.ID_ATTRIBUTE_MAPPING_KEY);
-				ormPersistentAttribute.initialize(id);
-				addSpecifiedPersistentAttribute_(ormPersistentAttribute);
-			}
-		}
-	}
-	
-	protected void updateEmbeddedIds(Attributes attributes, ListIterator<OrmPersistentAttribute> ormPersistentAttributes) {
-		ListIterator<XmlEmbeddedId> embeddedIds = new CloneListIterator<XmlEmbeddedId>(attributes.getEmbeddedIds());//prevent ConcurrentModificiationException
-		for (XmlEmbeddedId embeddedId : CollectionTools.iterable(embeddedIds)) {
-			if (ormPersistentAttributes.hasNext()) {
-				ormPersistentAttributes.next().update(embeddedId);
-			}
-			else {
-				OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY);
-				ormPersistentAttribute.initialize(embeddedId);
-				addSpecifiedPersistentAttribute_(ormPersistentAttribute);
-			}
-		}
-	}
-	
-	protected void updateBasics(Attributes attributes, ListIterator<OrmPersistentAttribute> ormPersistentAttributes) {
-		ListIterator<XmlBasic> basics = new CloneListIterator<XmlBasic>(attributes.getBasics());//prevent ConcurrentModificiationException
-		for (XmlBasic basic : CollectionTools.iterable(basics)) {
-			if (ormPersistentAttributes.hasNext()) {
-				ormPersistentAttributes.next().update(basic);
-			}
-			else {
-				OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY);
-				ormPersistentAttribute.initialize(basic);
-				addSpecifiedPersistentAttribute_(ormPersistentAttribute);
-			}
-		}
-	}
-	
-	protected void updateVersions(Attributes attributes, ListIterator<OrmPersistentAttribute> ormPersistentAttributes) {
-		ListIterator<XmlVersion> versions = new CloneListIterator<XmlVersion>(attributes.getVersions());//prevent ConcurrentModificiationException
-		for (XmlVersion version : CollectionTools.iterable(versions)) {
-			if (ormPersistentAttributes.hasNext()) {
-				ormPersistentAttributes.next().update(version);
-			}
-			else {
-				OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY);
-				ormPersistentAttribute.initialize(version);
-				addSpecifiedPersistentAttribute_(ormPersistentAttribute);
-			}
-		}
-	}
-	
-	protected void updateManyToOnes(Attributes attributes, ListIterator<OrmPersistentAttribute> ormPersistentAttributes) {
-		ListIterator<XmlManyToOne> manyToOnes = new CloneListIterator<XmlManyToOne>(attributes.getManyToOnes());//prevent ConcurrentModificiationException
-		for (XmlManyToOne manyToOne : CollectionTools.iterable(manyToOnes)) {
-			if (ormPersistentAttributes.hasNext()) {
-				ormPersistentAttributes.next().update(manyToOne);
-			}
-			else {
-				OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY);
-				ormPersistentAttribute.initialize(manyToOne);
-				addSpecifiedPersistentAttribute_(ormPersistentAttribute);
-			}
-		}
-	}
-	
-	protected void updateOneToManys(Attributes attributes, ListIterator<OrmPersistentAttribute> ormPersistentAttributes) {
-		ListIterator<XmlOneToMany> oneToManys = new CloneListIterator<XmlOneToMany>(attributes.getOneToManys());//prevent ConcurrentModificiationException
-		for (XmlOneToMany oneToMany : CollectionTools.iterable(oneToManys)) {
-			if (ormPersistentAttributes.hasNext()) {
-				ormPersistentAttributes.next().update(oneToMany);
-			}
-			else {
-				OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY);
-				ormPersistentAttribute.initialize(oneToMany);
-				addSpecifiedPersistentAttribute_(ormPersistentAttribute);
-			}
-		}
-	}
-	
-	protected void updateOneToOnes(Attributes attributes, ListIterator<OrmPersistentAttribute> ormPersistentAttributes) {
-		ListIterator<XmlOneToOne> oneToOnes = new CloneListIterator<XmlOneToOne>(attributes.getOneToOnes());//prevent ConcurrentModificiationException
-		for (XmlOneToOne oneToOne : CollectionTools.iterable(oneToOnes)) {
-			if (ormPersistentAttributes.hasNext()) {
-				ormPersistentAttributes.next().update(oneToOne);
-			}
-			else {
-				OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY);
-				ormPersistentAttribute.initialize(oneToOne);
-				addSpecifiedPersistentAttribute_(ormPersistentAttribute);
-			}
-		}
-	}
-	
-	protected void updateManyToManys(Attributes attributes, ListIterator<OrmPersistentAttribute> ormPersistentAttributes) {
-		ListIterator<XmlManyToMany> manyToManys = new CloneListIterator<XmlManyToMany>(attributes.getManyToManys());//prevent ConcurrentModificiationException
-		for (XmlManyToMany manyToMany : CollectionTools.iterable(manyToManys)) {
-			if (ormPersistentAttributes.hasNext()) {
-				ormPersistentAttributes.next().update(manyToMany);
-			}
-			else {
-				OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY);
-				ormPersistentAttribute.initialize(manyToMany);
-				addSpecifiedPersistentAttribute_(ormPersistentAttribute);
-			}
-		}
-	}
-
-	protected void updateEmbeddeds(Attributes attributes, ListIterator<OrmPersistentAttribute> ormPersistentAttributes) {
-		ListIterator<XmlEmbedded> embeddeds = new CloneListIterator<XmlEmbedded>(attributes.getEmbeddeds());//prevent ConcurrentModificiationException
-		for (XmlEmbedded embedded : CollectionTools.iterable(embeddeds)) {
-			if (ormPersistentAttributes.hasNext()) {
-				ormPersistentAttributes.next().update(embedded);
-			}
-			else {
-				OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY);
-				ormPersistentAttribute.initialize(embedded);
-				addSpecifiedPersistentAttribute_(ormPersistentAttribute);
-			}
-		}
-	}
-	
-	protected void updateTransients(Attributes attributes, ListIterator<OrmPersistentAttribute> ormPersistentAttributes) {
-		ListIterator<XmlTransient> transients = new CloneListIterator<XmlTransient>(attributes.getTransients());//prevent ConcurrentModificiationException
-		for (XmlTransient transientResource : CollectionTools.iterable(transients)) {
-			if (ormPersistentAttributes.hasNext()) {
-				ormPersistentAttributes.next().update(transientResource);
-			}
-			else {
-				OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY);
-				ormPersistentAttribute.initialize(transientResource);
-				addSpecifiedPersistentAttribute_(ormPersistentAttribute);
-			}
-		}
-	}
-	
-	public PersistentAttribute resolveAttribute(String attributeName) {
-		Iterator<OrmPersistentAttribute> attributes = attributesNamed(attributeName);
-		if (attributes.hasNext()) {
-			OrmPersistentAttribute attribute = attributes.next();
-			return attributes.hasNext() ? null /* more than one */: attribute;
-		}
-		else if (getParentPersistentType() != null) {
-			return getParentPersistentType().resolveAttribute(attributeName);
-		}
-		else {
-			return null;
-		}
-	}
-	
-	@Override
-	public OrmPersistentType getOrmPersistentType() {
-		return this;
-	}
-	
-	public JpaStructureNode getStructureNode(int textOffset) {
-		for (OrmPersistentAttribute attribute : CollectionTools.iterable(specifiedAttributes())) {
-			if (attribute.contains(textOffset)) {
-				return attribute;
-			}
-		}
-		return this;
-	}
-	
-	public boolean contains(int textOffset) {
-		return this.ormTypeMapping.containsOffset(textOffset);
-	}
-	
-	public TextRange getSelectionTextRange() {
-		return this.ormTypeMapping.getSelectionTextRange();
-	}
-	
-	//******************** validation **********************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-
-		try {
-			getMapping().addToMessages(messages);
-		} catch(Throwable t) {
-			JptCorePlugin.log(t);
-		}
-		
-		for (OrmPersistentAttribute persistentAttribute : CollectionTools.iterable(this.attributes())) {
-			try {
-				persistentAttribute.addToMessages(messages);
-			} catch(Throwable t) {
-				JptCorePlugin.log(t);
-			}
-		}
-	}
-	
-	public TextRange getValidationTextRange() {
-		return this.ormTypeMapping.getValidationTextRange();
-	}
-	
-	public void dispose() {
-		if (getJavaPersistentType() != null) {
-			getJavaPersistentType().dispose();
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumn.java
deleted file mode 100644
index 4710e4b714..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumn.java
+++ /dev/null
@@ -1,149 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmBaseJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.context.orm.OrmPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Column;
-import org.eclipse.jpt.db.Table;
-
-public class GenericOrmPrimaryKeyJoinColumn extends AbstractOrmNamedColumn<XmlPrimaryKeyJoinColumn>
-	implements OrmPrimaryKeyJoinColumn
-{
-	protected String specifiedReferencedColumnName;
-
-	protected String defaultReferencedColumnName;
-
-	protected XmlPrimaryKeyJoinColumn primaryKeyJoinColumn;
-	
-	public GenericOrmPrimaryKeyJoinColumn(OrmJpaContextNode parent, OrmBaseJoinColumn.Owner owner) {
-		super(parent, owner);
-	}
-
-	public void initializeFrom(PrimaryKeyJoinColumn oldPkJoinColumn) {
-		super.initializeFrom(oldPkJoinColumn);
-		setSpecifiedReferencedColumnName(oldPkJoinColumn.getSpecifiedReferencedColumnName());
-	}
-	
-	@Override
-	protected XmlPrimaryKeyJoinColumn getColumnResource() {
-		return this.primaryKeyJoinColumn;
-	}
-	
-	@Override
-	protected void addColumnResource() {
-		//primaryKeyJoinColumns are part of a collection, the pk-join-column element will be removed/added
-		//when the XmlPrimaryKeyJoinColumn is removed/added to the XmlEntity collection
-	}
-	
-	@Override
-	protected void removeColumnResource() {
-		//primaryKeyJoinColumns are part of a collection, the pk-join-column element will be removed/added
-		//when the XmlPrimaryKeyJoinColumn is removed/added to the XmlEntity collection
-	}
-	
-	public String getReferencedColumnName() {
-		return (this.getSpecifiedReferencedColumnName() == null) ? getDefaultReferencedColumnName() : this.getSpecifiedReferencedColumnName();
-	}
-
-	public String getSpecifiedReferencedColumnName() {
-		return this.specifiedReferencedColumnName;
-	}
-
-	public void setSpecifiedReferencedColumnName(String newSpecifiedReferencedColumnName) {
-		String oldSpecifiedReferencedColumnName = this.specifiedReferencedColumnName;
-		this.specifiedReferencedColumnName = newSpecifiedReferencedColumnName;
-		getColumnResource().setReferencedColumnName(newSpecifiedReferencedColumnName);
-		firePropertyChanged(SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, oldSpecifiedReferencedColumnName, newSpecifiedReferencedColumnName);
-	}
-	
-	protected void setSpecifiedReferencedColumnName_(String newSpecifiedReferencedColumnName) {
-		String oldSpecifiedReferencedColumnName = this.specifiedReferencedColumnName;
-		this.specifiedReferencedColumnName = newSpecifiedReferencedColumnName;
-		firePropertyChanged(SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, oldSpecifiedReferencedColumnName, newSpecifiedReferencedColumnName);
-	}
-
-	public String getDefaultReferencedColumnName() {
-		return this.defaultReferencedColumnName;
-	}
-
-	protected void setDefaultReferencedColumnName(String newDefaultReferencedColumnName) {
-		String oldDefaultReferencedColumnName = this.defaultReferencedColumnName;
-		this.defaultReferencedColumnName = newDefaultReferencedColumnName;
-		firePropertyChanged(DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY, oldDefaultReferencedColumnName, newDefaultReferencedColumnName);
-	}
-
-	@Override
-	public OrmBaseJoinColumn.Owner getOwner() {
-		return (OrmBaseJoinColumn.Owner) this.owner;
-	}
-
-	public Column getDbReferencedColumn() {
-		Table table = this.dbReferencedColumnTable();
-		return (table == null) ? null : table.columnNamed(this.getReferencedColumnName());
-	}
-
-	public Table dbReferencedColumnTable() {
-		return getOwner().getDbReferencedColumnTable();
-	}
-
-	@Override
-	protected String tableName() {
-		return this.getOwner().getTypeMapping().getTableName();
-	}
-
-	public boolean isReferencedColumnResolved() {
-		return getDbReferencedColumn() != null;
-	}
-
-	public TextRange getReferencedColumnNameTextRange() {
-		if (getColumnResource() != null) {
-			TextRange textRange = getColumnResource().getReferencedColumnNameTextRange();
-			if (textRange != null) {
-				return textRange;
-			}
-		}
-		return getOwner().getValidationTextRange();
-	}
-
-		
-	public boolean isVirtual() {
-		return getOwner().isVirtual(this);
-	}
-	
-	@Override
-	public void initialize(XmlPrimaryKeyJoinColumn column) {
-		this.primaryKeyJoinColumn = column;
-		super.initialize(column);
-		this.specifiedReferencedColumnName = specifiedReferencedColumnName(column);
-		this.defaultReferencedColumnName = defaultReferencedColumnName();
-	}
-	
-	@Override
-	public void update(XmlPrimaryKeyJoinColumn column) {
-		this.primaryKeyJoinColumn = column;
-		super.update(column);
-		this.setSpecifiedReferencedColumnName_(specifiedReferencedColumnName(column));
-		this.setDefaultReferencedColumnName(defaultReferencedColumnName());
-	}
-	
-	protected String specifiedReferencedColumnName(XmlPrimaryKeyJoinColumn column) {
-		return column == null ? null : column.getReferencedColumnName();
-	}
-	
-	//TODO not correct when we start supporting primaryKeyJoinColumns in 1-1 mappings
-	protected String defaultReferencedColumnName() {
-		return defaultName();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmQueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmQueryHint.java
deleted file mode 100644
index 0110bd7884..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmQueryHint.java
+++ /dev/null
@@ -1,69 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.QueryHint;
-import org.eclipse.jpt.core.context.orm.OrmQuery;
-import org.eclipse.jpt.core.context.orm.OrmQueryHint;
-import org.eclipse.jpt.core.resource.orm.XmlQueryHint;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-public class GenericOrmQueryHint extends AbstractOrmJpaContextNode implements OrmQueryHint
-{
-
-	protected String name;
-
-	protected String value;
-
-	protected XmlQueryHint queryHint;
-	
-	public GenericOrmQueryHint(OrmQuery parent) {
-		super(parent);
-	}
-
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		this.queryHint.setName(newName);
-		firePropertyChanged(QueryHint.NAME_PROPERTY, oldName, newName);
-	}
-
-	public String getValue() {
-		return this.value;
-	}
-
-	public void setValue(String newValue) {
-		String oldValue = this.value;
-		this.value = newValue;
-		this.queryHint.setValue(newValue);
-		firePropertyChanged(QueryHint.VALUE_PROPERTY, oldValue, newValue);
-	}
-
-	public void initialize(XmlQueryHint queryHint) {
-		this.queryHint = queryHint;
-		this.name = queryHint.getName();
-		this.value = queryHint.getValue();
-	}
-	
-	public void update(XmlQueryHint queryHint) {
-		this.queryHint = queryHint;
-		this.setName(queryHint.getName());
-		this.setValue(queryHint.getValue());
-	}
-	
-	public TextRange getValidationTextRange() {
-		return this.queryHint.getValidationTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmSecondaryTable.java
deleted file mode 100644
index 8ccd9ff4e3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmSecondaryTable.java
+++ /dev/null
@@ -1,351 +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.core.internal.context.orm;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.BaseJoinColumn;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.SecondaryTable;
-import org.eclipse.jpt.core.context.TypeMapping;
-import org.eclipse.jpt.core.context.orm.OrmBaseJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmEntity;
-import org.eclipse.jpt.core.context.orm.OrmPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmSecondaryTable;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.resource.orm.XmlSecondaryTable;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericOrmSecondaryTable extends AbstractOrmTable
-	implements OrmSecondaryTable
-{
-	protected XmlSecondaryTable secondaryTable;
-	
-	protected final List<OrmPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns;
-	
-	protected OrmPrimaryKeyJoinColumn defaultPrimaryKeyJoinColumn;
-
-	public GenericOrmSecondaryTable(OrmEntity parent, XmlSecondaryTable xmlSecondaryTable) {
-		super(parent);
-		this.specifiedPrimaryKeyJoinColumns = new ArrayList<OrmPrimaryKeyJoinColumn>();
-		initialize(xmlSecondaryTable);
-	}
-	
-	public void initializeFrom(SecondaryTable oldSecondaryTable) {
-		super.initializeFrom(oldSecondaryTable);
-		for (PrimaryKeyJoinColumn oldPkJoinColumn : CollectionTools.iterable(oldSecondaryTable.specifiedPrimaryKeyJoinColumns())) {
-			OrmPrimaryKeyJoinColumn newPkJoinColumn = addSpecifiedPrimaryKeyJoinColumn(specifiedPrimaryKeyJoinColumnsSize());
-			newPkJoinColumn.initializeFrom(oldPkJoinColumn);
-		}
-	}
-	
-	@Override
-	public OrmEntity getParent() {
-		return (OrmEntity) super.getParent();
-	}
-	
-	public OrmEntity getOrmEntity() {
-		return getParent();
-	}
-	
-	public OrmPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn() {
-		return this.defaultPrimaryKeyJoinColumn;
-	}
-	
-	protected void setDefaultPrimaryKeyJoinColumn(OrmPrimaryKeyJoinColumn newPkJoinColumn) {
-		OrmPrimaryKeyJoinColumn oldPkJoinColumn = this.defaultPrimaryKeyJoinColumn;
-		this.defaultPrimaryKeyJoinColumn = newPkJoinColumn;
-		firePropertyChanged(SecondaryTable.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, oldPkJoinColumn, newPkJoinColumn);
-	}
-	
-	public ListIterator<OrmPrimaryKeyJoinColumn> primaryKeyJoinColumns() {
-		return this.containsSpecifiedPrimaryKeyJoinColumns() ? this.specifiedPrimaryKeyJoinColumns() : this.defaultPrimaryKeyJoinColumns();
-	}
-	
-	public int primaryKeyJoinColumnsSize() {
-		return this.containsSpecifiedPrimaryKeyJoinColumns() ? this.specifiedPrimaryKeyJoinColumnsSize() : this.defaultPrimaryKeyJoinColumnsSize();
-	}
-
-	public ListIterator<OrmPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns() {
-		return new CloneListIterator<OrmPrimaryKeyJoinColumn>(this.specifiedPrimaryKeyJoinColumns);
-	}
-
-	public int specifiedPrimaryKeyJoinColumnsSize() {
-		return this.specifiedPrimaryKeyJoinColumns.size();
-	}
-	
-	protected ListIterator<OrmPrimaryKeyJoinColumn> defaultPrimaryKeyJoinColumns() {
-		if (this.defaultPrimaryKeyJoinColumn != null) {
-			return new SingleElementListIterator<OrmPrimaryKeyJoinColumn>(this.defaultPrimaryKeyJoinColumn);
-		}
-		return EmptyListIterator.instance();
-	}
-	
-	protected int defaultPrimaryKeyJoinColumnsSize() {
-		return (this.defaultPrimaryKeyJoinColumn == null) ? 0 : 1;
-	}
-	
-	public boolean containsSpecifiedPrimaryKeyJoinColumns() {
-		return !this.specifiedPrimaryKeyJoinColumns.isEmpty();
-	}	
-
-	public OrmPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index) {
-		OrmPrimaryKeyJoinColumn oldDefaultPkJoinColumn = this.getDefaultPrimaryKeyJoinColumn();
-		if (oldDefaultPkJoinColumn != null) {
-			//null the default join column now if one already exists.
-			//if one does not exist, there is already a specified join column.
-			//Remove it now so that it doesn't get removed during an update and
-			//cause change notifications to be sent to the UI in the wrong order
-			this.defaultPrimaryKeyJoinColumn = null;
-		}
-		XmlPrimaryKeyJoinColumn xmlPrimaryKeyJoinColumn = OrmFactory.eINSTANCE.createXmlPrimaryKeyJoinColumnImpl();
-		OrmPrimaryKeyJoinColumn primaryKeyJoinColumn = createPrimaryKeyJoinColumn(xmlPrimaryKeyJoinColumn);
-		this.specifiedPrimaryKeyJoinColumns.add(index, primaryKeyJoinColumn);
-		this.secondaryTable.getPrimaryKeyJoinColumns().add(index, xmlPrimaryKeyJoinColumn);
-		
-		this.fireItemAdded(SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, primaryKeyJoinColumn);
-		if (oldDefaultPkJoinColumn != null) {
-			this.firePropertyChanged(SecondaryTable.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, oldDefaultPkJoinColumn, null);
-		}
-		return primaryKeyJoinColumn;
-	}
-	
-	protected OrmBaseJoinColumn.Owner createPrimaryKeyJoinColumnOwner() {
-		return new PrimaryKeyJoinColumnOwner();
-	}
-
-	protected void addSpecifiedPrimaryKeyJoinColumn(int index, OrmPrimaryKeyJoinColumn primaryKeyJoinColumn) {
-		addItemToList(index, primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST);
-	}
-	
-	public void removeSpecifiedPrimaryKeyJoinColumn(PrimaryKeyJoinColumn pkJoinColumn) {
-		this.removeSpecifiedPrimaryKeyJoinColumn(this.specifiedPrimaryKeyJoinColumns.indexOf(pkJoinColumn));
-	}
-	
-	public void removeSpecifiedPrimaryKeyJoinColumn(int index) {
-		OrmPrimaryKeyJoinColumn removedPrimaryKeyJoinColumn = this.specifiedPrimaryKeyJoinColumns.remove(index);
-		if (!containsSpecifiedPrimaryKeyJoinColumns()) {
-			//create the defaultJoinColumn now or this will happen during project update 
-			//after removing the join column from the resource model. That causes problems 
-			//in the UI because the change notifications end up in the wrong order.
-			this.defaultPrimaryKeyJoinColumn = createPrimaryKeyJoinColumn(null);
-		}
-		this.secondaryTable.getPrimaryKeyJoinColumns().remove(index);
-		fireItemRemoved(SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedPrimaryKeyJoinColumn);
-		if (this.defaultPrimaryKeyJoinColumn != null) {
-			//fire change notification if a defaultJoinColumn was created above
-			this.firePropertyChanged(Entity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, null, this.defaultPrimaryKeyJoinColumn);
-		}
-	}
-
-	protected void removeSpecifiedPrimaryKeyJoinColumn_(OrmPrimaryKeyJoinColumn primaryKeyJoinColumn) {
-		removeItemFromList(primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST);
-	}
-	
-	public void moveSpecifiedPrimaryKeyJoinColumn(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.specifiedPrimaryKeyJoinColumns, targetIndex, sourceIndex);
-		this.secondaryTable.getPrimaryKeyJoinColumns().move(targetIndex, sourceIndex);
-		fireItemMoved(SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, targetIndex, sourceIndex);		
-	}
-
-	
-	public boolean isVirtual() {
-		return getOrmEntity().containsVirtualSecondaryTable(this);
-	}
-	
-	@Override
-	protected void addTableResource() {
-		//secondaryTables are part of a collection, the secondary-table element will be removed/added
-		//when the XmlSecondaryTable is removed/added to the XmlEntity collection
-	}
-	
-	@Override
-	protected void removeTableResource() {
-		//secondaryTables are part of a collection, the secondary-table element will be removed/added
-		//when the XmlSecondaryTable is removed/added to the XmlEntity collection
-	}
-
-	@Override
-	protected XmlSecondaryTable getTableResource() {
-		return this.secondaryTable;
-	}
-
-	protected void initialize(XmlSecondaryTable secondaryTable) {
-		this.secondaryTable = secondaryTable;
-		super.initialize(secondaryTable);
-		this.initializeSpecifiedPrimaryKeyJoinColumns(secondaryTable);
-		this.initializeDefaultPrimaryKeyJoinColumn();
-	}
-	
-	protected void initializeSpecifiedPrimaryKeyJoinColumns(XmlSecondaryTable secondaryTable) {
-		for (XmlPrimaryKeyJoinColumn primaryKeyJoinColumn : secondaryTable.getPrimaryKeyJoinColumns()) {
-			this.specifiedPrimaryKeyJoinColumns.add(createPrimaryKeyJoinColumn(primaryKeyJoinColumn));
-		}
-	}
-	
-	protected boolean shouldBuildDefaultPrimaryKeyJoinColumn() {
-		return !containsSpecifiedPrimaryKeyJoinColumns();
-	}
-
-	protected void initializeDefaultPrimaryKeyJoinColumn() {
-		if (!shouldBuildDefaultPrimaryKeyJoinColumn()) {
-			return;
-		}
-		this.defaultPrimaryKeyJoinColumn = createPrimaryKeyJoinColumn(null);
-	}	
-
-	public void update(XmlSecondaryTable secondaryTable) {
-		this.secondaryTable = secondaryTable;
-		super.update(secondaryTable);
-		this.updateSpecifiedPrimaryKeyJoinColumns(secondaryTable);
-		this.updateDefaultPrimaryKeyJoinColumn();
-	}
-		
-	protected void updateSpecifiedPrimaryKeyJoinColumns(XmlSecondaryTable secondaryTable) {
-		ListIterator<OrmPrimaryKeyJoinColumn> primaryKeyJoinColumns = specifiedPrimaryKeyJoinColumns();
-		ListIterator<XmlPrimaryKeyJoinColumn> resourcePrimaryKeyJoinColumns = new CloneListIterator<XmlPrimaryKeyJoinColumn>(secondaryTable.getPrimaryKeyJoinColumns());//prevent ConcurrentModificiationException
-		
-		while (primaryKeyJoinColumns.hasNext()) {
-			OrmPrimaryKeyJoinColumn primaryKeyJoinColumn = primaryKeyJoinColumns.next();
-			if (resourcePrimaryKeyJoinColumns.hasNext()) {
-				primaryKeyJoinColumn.update(resourcePrimaryKeyJoinColumns.next());
-			}
-			else {
-				removeSpecifiedPrimaryKeyJoinColumn_(primaryKeyJoinColumn);
-			}
-		}
-		
-		while (resourcePrimaryKeyJoinColumns.hasNext()) {
-			addSpecifiedPrimaryKeyJoinColumn(specifiedPrimaryKeyJoinColumnsSize(), createPrimaryKeyJoinColumn(resourcePrimaryKeyJoinColumns.next()));
-		}
-	}
-	
-	protected void updateDefaultPrimaryKeyJoinColumn() {
-		if (!shouldBuildDefaultPrimaryKeyJoinColumn()) {
-			setDefaultPrimaryKeyJoinColumn(null);
-			return;
-		}
-		if (getDefaultPrimaryKeyJoinColumn() == null) {
-			this.setDefaultPrimaryKeyJoinColumn(createPrimaryKeyJoinColumn(null));
-		}
-		else {
-			this.defaultPrimaryKeyJoinColumn.update(null);
-		}
-	}	
-
-	protected OrmPrimaryKeyJoinColumn createPrimaryKeyJoinColumn(XmlPrimaryKeyJoinColumn xmlPrimaryKeyJoinColumn) {
-		OrmPrimaryKeyJoinColumn ormPrimaryKeyJoinColumn = getJpaFactory().buildOrmPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner());
-		ormPrimaryKeyJoinColumn.initialize(xmlPrimaryKeyJoinColumn);
-		return ormPrimaryKeyJoinColumn;
-	}
-
-	@Override
-	//no default name for secondaryTables
-	protected String defaultName() {
-		return null;
-	}
-
-	@Override
-	protected String defaultCatalog() {
-		return getEntityMappings().getCatalog();
-	}
-
-	@Override
-	protected String defaultSchema() {
-		return getEntityMappings().getSchema();
-	}
-	
-	
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		addTableMessages(messages);
-		
-		for (OrmPrimaryKeyJoinColumn pkJoinColumn : CollectionTools.iterable(this.primaryKeyJoinColumns())) {
-			pkJoinColumn.addToMessages(messages);
-		}
-	}
-	
-	protected void addTableMessages(List<IMessage> messages) {
-		boolean doContinue = connectionProfileIsActive();
-		String schema = getSchema();
-		
-		if (doContinue && ! hasResolvedSchema()) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.SECONDARY_TABLE_UNRESOLVED_SCHEMA,
-						new String[] {schema, getName()}, 
-						this,
-						getSchemaTextRange())
-				);
-			doContinue = false;
-		}
-		
-		if (doContinue && ! isResolved()) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.SECONDARY_TABLE_UNRESOLVED_NAME,
-						new String[] {getName()}, 
-						this, 
-						getNameTextRange())
-				);
-		}
-	}
-	
-	class PrimaryKeyJoinColumnOwner implements OrmBaseJoinColumn.Owner
-	{
-
-		public TypeMapping getTypeMapping() {
-			return GenericOrmSecondaryTable.this.getOrmEntity();
-		}
-
-		public Table getDbTable(String tableName) {
-			return GenericOrmSecondaryTable.this.getDbTable();
-		}
-
-		public Table getDbReferencedColumnTable() {
-			return getTypeMapping().getPrimaryDbTable();
-		}
-
-		public int joinColumnsSize() {
-			return GenericOrmSecondaryTable.this.primaryKeyJoinColumnsSize();
-		}
-		
-		public boolean isVirtual(BaseJoinColumn joinColumn) {
-			return GenericOrmSecondaryTable.this.defaultPrimaryKeyJoinColumn == joinColumn;
-		}
-		
-		public String getDefaultColumnName() {
-			if (joinColumnsSize() != 1) {
-				return null;
-			}
-			return getOrmEntity().getParentEntity().getPrimaryKeyColumnName();
-		}
-		
-		public TextRange getValidationTextRange() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmSequenceGenerator.java
deleted file mode 100644
index b42cac0d45..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmSequenceGenerator.java
+++ /dev/null
@@ -1,78 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.context.orm.OrmSequenceGenerator;
-import org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator;
-
-
-public class GenericOrmSequenceGenerator extends AbstractOrmGenerator<XmlSequenceGenerator>
-	implements OrmSequenceGenerator
-{
-
-	protected String specifiedSequenceName;
-
-	protected String defaultSequenceName;
-
-	public GenericOrmSequenceGenerator(OrmJpaContextNode parent) {
-		super(parent);
-	}
-
-	public String getSequenceName() {
-		return (this.getSpecifiedSequenceName() == null) ? getDefaultSequenceName() : this.getSpecifiedSequenceName();
-	}
-
-	public String getSpecifiedSequenceName() {
-		return this.specifiedSequenceName;
-	}
-
-	public void setSpecifiedSequenceName(String newSpecifiedSequenceName) {
-		String oldSpecifiedSequenceName = this.specifiedSequenceName;
-		this.specifiedSequenceName = newSpecifiedSequenceName;
-		getGeneratorResource().setSequenceName(newSpecifiedSequenceName);
-		firePropertyChanged(SPECIFIED_SEQUENCE_NAME_PROPERTY, oldSpecifiedSequenceName, newSpecifiedSequenceName);
-	}
-	
-	protected void setSpecifiedSequenceName_(String newSpecifiedSequenceName) {
-		String oldSpecifiedSequenceName = this.specifiedSequenceName;
-		this.specifiedSequenceName = newSpecifiedSequenceName;
-		firePropertyChanged(SPECIFIED_SEQUENCE_NAME_PROPERTY, oldSpecifiedSequenceName, newSpecifiedSequenceName);
-	}
-
-	public String getDefaultSequenceName() {
-		return this.defaultSequenceName;
-	}
-	
-	protected void setDefaultSequenceName(String newDefaultSequenceName) {
-		String oldSpecifiedSequenceName = this.defaultSequenceName;
-		this.defaultSequenceName = newDefaultSequenceName;
-		firePropertyChanged(DEFAULT_SEQUENCE_NAME_PROPERTY, oldSpecifiedSequenceName, newDefaultSequenceName);
-	}
-
-	@Override
-	public void initialize(XmlSequenceGenerator sequenceGenerator) {
-		super.initialize(sequenceGenerator);
-		this.specifiedSequenceName = this.specifiedSequenceName(sequenceGenerator);
-		//TODO default sequence name
-	}
-	
-	@Override
-	public void update(XmlSequenceGenerator sequenceGenerator) {
-		super.update(sequenceGenerator);
-		this.setSpecifiedSequenceName_(this.specifiedSequenceName(sequenceGenerator));
-		//TODO default sequence name
-	}
-	
-	protected String specifiedSequenceName(XmlSequenceGenerator generatorResource) {
-		return generatorResource.getSequenceName();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTable.java
deleted file mode 100644
index d0c3730735..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTable.java
+++ /dev/null
@@ -1,157 +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.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.InheritanceType;
-import org.eclipse.jpt.core.context.java.JavaEntity;
-import org.eclipse.jpt.core.context.java.JavaTable;
-import org.eclipse.jpt.core.context.orm.OrmEntity;
-import org.eclipse.jpt.core.context.orm.OrmTable;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlEntity;
-import org.eclipse.jpt.core.resource.orm.XmlTable;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class GenericOrmTable extends AbstractOrmTable implements OrmTable
-{
-
-	protected XmlEntity entity;
-	
-	public GenericOrmTable(OrmEntity parent) {
-		super(parent);
-	}
-
-	public OrmEntity getOrmEntity() {
-		return (OrmEntity) super.getParent();
-	}
-	
-	@Override
-	protected XmlTable getTableResource() {
-		return this.entity.getTable();
-	}
-	
-	@Override
-	protected void removeTableResource() {
-		this.entity.setTable(null);
-	}
-	
-	@Override
-	protected void addTableResource() {
-		this.entity.setTable(OrmFactory.eINSTANCE.createXmlTable());
-		
-	}
-	
-	protected JavaTable getJavaTable() {
-		JavaEntity javaEntity = getOrmEntity().getJavaEntity();
-		if (javaEntity != null) {
-			return javaEntity.getTable();
-		}
-		return null;
-	}
-	
-	public void initialize(XmlEntity entity) {
-		this.entity = entity;
-		this.initialize(this.getTableResource());
-	}
-	
-	public void update(XmlEntity entity) {
-		this.entity = entity;
-		this.update(this.getTableResource());
-	}
-
-	@Override
-	protected String defaultName() {
-		JavaTable javaTable = getJavaTable();
-		if (javaTable != null) {
-			if (!getOrmEntity().isMetadataComplete() && getTableResource() == null && javaTable.getSpecifiedName() != null) {
-				return javaTable.getSpecifiedName();
-			}
-		}
-		Entity rootEntity = getOrmEntity().getRootEntity();
-		if (rootEntity != getOrmEntity()) {
-			if (rootEntity.getInheritanceStrategy() == InheritanceType.SINGLE_TABLE) {
-				return rootEntity.getTable().getName();
-			}
-		}
-		return getOrmEntity().getName();
-	}
-	
-	@Override
-	protected String defaultSchema() {
-		JavaTable javaTable = getJavaTable();
-		if (javaTable != null ) {
-			if (getOrmEntity().isMetadataComplete() || (getTableResource() != null)) {
-				return javaTable.getDefaultSchema();
-			}
-			return javaTable.getSchema();
-		}
-		Entity rootEntity = getOrmEntity().getRootEntity();
-		if (rootEntity != getOrmEntity()) {
-			if (rootEntity.getInheritanceStrategy() == InheritanceType.SINGLE_TABLE) {
-				return rootEntity.getTable().getSchema();
-			}
-		}
-		return getEntityMappings().getSchema();
-	}
-	
-	@Override
-	protected String defaultCatalog() {
-		JavaTable javaTable = getJavaTable();
-		if (javaTable != null) {
-			if (getOrmEntity().isMetadataComplete() || (getTableResource() != null)) {
-				return javaTable.getDefaultCatalog();
-			}
-			return javaTable.getCatalog();
-		}
-		Entity rootEntity = getOrmEntity().getRootEntity();
-		if (rootEntity != getOrmEntity()) {
-			if (rootEntity.getInheritanceStrategy() == InheritanceType.SINGLE_TABLE) {
-				return rootEntity.getTable().getCatalog();
-			}
-		}
-		return getEntityMappings().getCatalog();
-	}
-	
-	//*********** Validation *******************************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		boolean doContinue = connectionProfileIsActive();
-		String schema = this.getSchema();
-		
-		if (doContinue && ! this.hasResolvedSchema()) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.TABLE_UNRESOLVED_SCHEMA,
-						new String[] {schema, this.getName()}, 
-						this,
-						this.getSchemaTextRange())
-				);
-			doContinue = false;
-		}
-		
-		if (doContinue && ! this.isResolved()) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.TABLE_UNRESOLVED_NAME,
-						new String[] {this.getName()}, 
-						this, 
-						this.getNameTextRange())
-				);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTableGenerator.java
deleted file mode 100644
index 57e8df7551..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTableGenerator.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.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.TableGenerator;
-import org.eclipse.jpt.core.context.UniqueConstraint;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.context.orm.OrmTableGenerator;
-import org.eclipse.jpt.core.context.orm.OrmUniqueConstraint;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlTableGenerator;
-import org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-
-public class GenericOrmTableGenerator extends AbstractOrmGenerator<XmlTableGenerator> implements OrmTableGenerator, UniqueConstraint.Owner
-{
-	protected String specifiedTable;
-	protected String defaultTable;
-
-	protected String specifiedCatalog;
-	protected String defaultCatalog;
-
-	protected String specifiedSchema;
-	protected String defaultSchema;
-
-	protected String specifiedPkColumnName;
-	protected String defaultPkColumnName;
-
-	protected String specifiedValueColumnName;
-	protected String defaultValueColumnName;
-
-	protected String specifiedPkColumnValue;
-	protected String defaultPkColumnValue;
-
-	protected final List<OrmUniqueConstraint> uniqueConstraints;
-
-	
-	public GenericOrmTableGenerator(OrmJpaContextNode parent) {
-		super(parent);
-		this.uniqueConstraints = new ArrayList<OrmUniqueConstraint>();
-	}
-
-	public String getTable() {
-		return (this.getSpecifiedTable() == null) ? getDefaultTable() : this.getSpecifiedTable();
-	}
-
-	public String getSpecifiedTable() {
-		return this.specifiedTable;
-	}
-
-	public void setSpecifiedTable(String newSpecifiedTable) {
-		String oldSpecifiedTable = this.specifiedTable;
-		this.specifiedTable = newSpecifiedTable;
-		getGeneratorResource().setTable(newSpecifiedTable);
-		firePropertyChanged(SPECIFIED_TABLE_PROPERTY, oldSpecifiedTable, newSpecifiedTable);
-	}
-	
-	protected void setSpecifiedTable_(String newSpecifiedTable) {
-		String oldSpecifiedTable = this.specifiedTable;
-		this.specifiedTable = newSpecifiedTable;
-		firePropertyChanged(SPECIFIED_TABLE_PROPERTY, oldSpecifiedTable, newSpecifiedTable);
-	}
-
-	public String getDefaultTable() {
-		return this.defaultTable;
-	}
-	
-	protected void setDefaultTable(String newDefaultTable) {
-		String oldDefaultTable = this.defaultTable;
-		this.defaultTable = newDefaultTable;
-		firePropertyChanged(DEFAULT_TABLE_PROPERTY, oldDefaultTable, newDefaultTable);
-	}
-
-	public String getCatalog() {
-		return (this.getSpecifiedCatalog() == null) ? getDefaultCatalog() : this.getSpecifiedCatalog();
-	}
-
-	public String getSpecifiedCatalog() {
-		return this.specifiedCatalog;
-	}
-
-	public void setSpecifiedCatalog(String newSpecifiedCatalog) {
-		String oldSpecifiedCatalog = this.specifiedCatalog;
-		this.specifiedCatalog = newSpecifiedCatalog;
-		getGeneratorResource().setCatalog(newSpecifiedCatalog);
-		firePropertyChanged(SPECIFIED_CATALOG_PROPERTY, oldSpecifiedCatalog, newSpecifiedCatalog);
-	}
-	
-	protected void setSpecifiedCatalog_(String newSpecifiedCatalog) {
-		String oldSpecifiedCatalog = this.specifiedCatalog;
-		this.specifiedCatalog = newSpecifiedCatalog;
-		firePropertyChanged(SPECIFIED_CATALOG_PROPERTY, oldSpecifiedCatalog, newSpecifiedCatalog);
-	}
-
-	public String getDefaultCatalog() {
-		return this.defaultCatalog;
-	}
-	
-	protected void setDefaultCatalog(String newDefaultCatalog) {
-		String oldDefaultCatalog = this.defaultCatalog;
-		this.defaultCatalog = newDefaultCatalog;
-		firePropertyChanged(TableGenerator.DEFAULT_CATALOG_PROPERTY, oldDefaultCatalog, newDefaultCatalog);
-	}
-
-	public String getSchema() {
-		return (this.getSpecifiedSchema() == null) ? getDefaultSchema() : this.getSpecifiedSchema();
-	}
-
-	public String getSpecifiedSchema() {
-		return this.specifiedSchema;
-	}
-
-	public void setSpecifiedSchema(String newSpecifiedSchema) {
-		String oldSpecifiedSchema = this.specifiedSchema;
-		this.specifiedSchema = newSpecifiedSchema;
-		getGeneratorResource().setSchema(newSpecifiedSchema);
-		firePropertyChanged(SPECIFIED_SCHEMA_PROPERTY, oldSpecifiedSchema, newSpecifiedSchema);
-	}
-
-	protected void setSpecifiedSchema_(String newSpecifiedSchema) {
-		String oldSpecifiedSchema = this.specifiedSchema;
-		this.specifiedSchema = newSpecifiedSchema;
-		firePropertyChanged(SPECIFIED_SCHEMA_PROPERTY, oldSpecifiedSchema, newSpecifiedSchema);
-	}
-
-	public String getDefaultSchema() {
-		return this.defaultSchema;
-	}
-	
-	protected void setDefaultSchema(String newDefaultSchema) {
-		String oldDefaultSchema = this.defaultSchema;
-		this.defaultSchema = newDefaultSchema;
-		firePropertyChanged(TableGenerator.DEFAULT_SCHEMA_PROPERTY, oldDefaultSchema, newDefaultSchema);
-	}
-
-	public String getPkColumnName() {
-		return (this.getSpecifiedPkColumnName() == null) ? getDefaultPkColumnName() : this.getSpecifiedPkColumnName();
-	}
-
-	public String getSpecifiedPkColumnName() {
-		return this.specifiedPkColumnName;
-	}
-	
-	public void setSpecifiedPkColumnName(String newSpecifiedPkColumnName) {
-		String oldSpecifiedPkColumnName = this.specifiedPkColumnName;
-		this.specifiedPkColumnName = newSpecifiedPkColumnName;
-		getGeneratorResource().setPkColumnName(newSpecifiedPkColumnName);
-		firePropertyChanged(SPECIFIED_PK_COLUMN_NAME_PROPERTY, oldSpecifiedPkColumnName, newSpecifiedPkColumnName);
-	}
-	
-	protected void setSpecifiedPkColumnName_(String newSpecifiedPkColumnName) {
-		String oldSpecifiedPkColumnName = this.specifiedPkColumnName;
-		this.specifiedPkColumnName = newSpecifiedPkColumnName;
-		firePropertyChanged(SPECIFIED_PK_COLUMN_NAME_PROPERTY, oldSpecifiedPkColumnName, newSpecifiedPkColumnName);
-	}
-
-	public String getDefaultPkColumnName() {
-		return this.defaultPkColumnName;
-	}
-	
-	protected void setDefaultPkColumnName(String newDefaultPkColumnName) {
-		String oldDefaultPkColumnName = this.defaultPkColumnName;
-		this.defaultPkColumnName = newDefaultPkColumnName;
-		firePropertyChanged(DEFAULT_PK_COLUMN_NAME_PROPERTY, oldDefaultPkColumnName, newDefaultPkColumnName);
-	}
-
-	public String getValueColumnName() {
-		return (this.getSpecifiedValueColumnName() == null) ? getDefaultValueColumnName() : this.getSpecifiedValueColumnName();
-	}
-
-	public String getSpecifiedValueColumnName() {
-		return this.specifiedValueColumnName;
-	}
-
-	public void setSpecifiedValueColumnName(String newSpecifiedValueColumnName) {
-		String oldSpecifiedValueColumnName = this.specifiedValueColumnName;
-		this.specifiedValueColumnName = newSpecifiedValueColumnName;
-		getGeneratorResource().setValueColumnName(newSpecifiedValueColumnName);
-		firePropertyChanged(SPECIFIED_VALUE_COLUMN_NAME_PROPERTY, oldSpecifiedValueColumnName, newSpecifiedValueColumnName);
-	}
-
-	protected void setSpecifiedValueColumnName_(String newSpecifiedValueColumnName) {
-		String oldSpecifiedValueColumnName = this.specifiedValueColumnName;
-		this.specifiedValueColumnName = newSpecifiedValueColumnName;
-		firePropertyChanged(SPECIFIED_VALUE_COLUMN_NAME_PROPERTY, oldSpecifiedValueColumnName, newSpecifiedValueColumnName);
-	}
-
-	public String getDefaultValueColumnName() {
-		return this.defaultValueColumnName;
-	}
-	
-	protected void setDefaultValueColumnName(String newDefaultValueColumnName) {
-		String oldDefaultValueColumnName = this.defaultValueColumnName;
-		this.defaultValueColumnName = newDefaultValueColumnName;
-		firePropertyChanged(DEFAULT_VALUE_COLUMN_NAME_PROPERTY, oldDefaultValueColumnName, newDefaultValueColumnName);
-	}
-
-	public String getPkColumnValue() {
-		return (this.getSpecifiedPkColumnValue() == null) ? getDefaultPkColumnValue() : this.getSpecifiedPkColumnValue();
-	}
-
-	public String getSpecifiedPkColumnValue() {
-		return this.specifiedPkColumnValue;
-	}
-
-	public void setSpecifiedPkColumnValue(String newSpecifiedPkColumnValue) {
-		String oldSpecifiedPkColumnValue = this.specifiedPkColumnValue;
-		this.specifiedPkColumnValue = newSpecifiedPkColumnValue;
-		getGeneratorResource().setPkColumnValue(newSpecifiedPkColumnValue);
-		firePropertyChanged(SPECIFIED_PK_COLUMN_VALUE_PROPERTY, oldSpecifiedPkColumnValue, newSpecifiedPkColumnValue);
-	}
-
-	protected void setSpecifiedPkColumnValue_(String newSpecifiedPkColumnValue) {
-		String oldSpecifiedPkColumnValue = this.specifiedPkColumnValue;
-		this.specifiedPkColumnValue = newSpecifiedPkColumnValue;
-		firePropertyChanged(SPECIFIED_PK_COLUMN_VALUE_PROPERTY, oldSpecifiedPkColumnValue, newSpecifiedPkColumnValue);
-	}
-
-	public String getDefaultPkColumnValue() {
-		return this.defaultPkColumnValue;
-	}
-	
-	public void setDefaultPkColumnValue(String newDefaultPkColumnValue) {
-		String oldDefaultPkColumnValue = this.defaultPkColumnValue;
-		this.defaultPkColumnValue = newDefaultPkColumnValue;
-		firePropertyChanged(DEFAULT_PK_COLUMN_VALUE_PROPERTY, oldDefaultPkColumnValue, newDefaultPkColumnValue);
-	}
-	
-	
-	// ********** unique constraints **********
-	
-	public ListIterator<OrmUniqueConstraint> uniqueConstraints() {
-		return new CloneListIterator<OrmUniqueConstraint>(this.uniqueConstraints);
-	}
-	
-	public int uniqueConstraintsSize() {
-		return this.uniqueConstraints.size();
-	}
-	
-	public OrmUniqueConstraint addUniqueConstraint(int index) {
-		XmlUniqueConstraint uniqueConstraintResource = OrmFactory.eINSTANCE.createXmlUniqueConstraintImpl();
-		OrmUniqueConstraint uniqueConstraint =  buildUniqueConstraint(uniqueConstraintResource);
-		this.uniqueConstraints.add(index, uniqueConstraint);
-		getGeneratorResource().getUniqueConstraints().add(index, uniqueConstraintResource);
-		fireItemAdded(TableGenerator.UNIQUE_CONSTRAINTS_LIST, index, uniqueConstraint);
-		return uniqueConstraint;
-	}
-	
-	protected void addUniqueConstraint(int index, OrmUniqueConstraint uniqueConstraint) {
-		addItemToList(index, uniqueConstraint, this.uniqueConstraints, TableGenerator.UNIQUE_CONSTRAINTS_LIST);
-	}
-	
-	
-	public void removeUniqueConstraint(UniqueConstraint uniqueConstraint) {
-		this.removeUniqueConstraint(this.uniqueConstraints.indexOf(uniqueConstraint));
-	}
-	
-	public void removeUniqueConstraint(int index) {
-		OrmUniqueConstraint removedUniqueConstraint = this.uniqueConstraints.remove(index);
-		getGeneratorResource().getUniqueConstraints().remove(index);
-		fireItemRemoved(TableGenerator.UNIQUE_CONSTRAINTS_LIST, index, removedUniqueConstraint);
-	}
-	
-	protected void removeUniqueConstraint_(OrmUniqueConstraint uniqueConstraint) {
-		removeItemFromList(uniqueConstraint, this.uniqueConstraints, TableGenerator.UNIQUE_CONSTRAINTS_LIST);
-	}
-	
-	public void moveUniqueConstraint(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.uniqueConstraints, targetIndex, sourceIndex);
-		this.getGeneratorResource().getUniqueConstraints().move(targetIndex, sourceIndex);
-		fireItemMoved(TableGenerator.UNIQUE_CONSTRAINTS_LIST, targetIndex, sourceIndex);		
-	}
-	
-	//******************* UniqueConstraint.Owner implementation ******************
-
-	public Iterator<String> candidateUniqueConstraintColumnNames() {
-		org.eclipse.jpt.db.Table dbTable = getDbTable();
-		if (dbTable != null) {
-			return dbTable.columnNames();
-		}
-		return EmptyIterator.instance();
-	}
-
-	public Table getDbTable() {
-		Schema schema = this.getDbSchema();
-		return (schema == null) ? null : schema.tableNamed(this.getTable());
-	}
-
-	public Schema getDbSchema() {
-		return this.getDatabase().schemaNamed(this.getSchema());
-	}
-	
-	// ********** orm resource model -> context model **********
-
-	@Override
-	public void initialize(XmlTableGenerator tableGenerator) {
-		super.initialize(tableGenerator);
-		this.specifiedTable = this.specifiedTable(tableGenerator);
-		this.specifiedCatalog = this.specifiedCatalog(tableGenerator);
-		this.defaultCatalog = this.defaultCatalog();
-		this.specifiedSchema = this.specifiedSchema(tableGenerator);
-		this.defaultSchema = this.defaultSchema();
-		this.specifiedPkColumnName = this.specifiedPkColumnName(tableGenerator);
-		this.specifiedValueColumnName = this.specifiedValueColumnName(tableGenerator);
-		this.specifiedPkColumnValue = this.specifiedPkColumnValue(tableGenerator);
-		this.initializeUniqueContraints(tableGenerator);
-	}
-	
-	protected void initializeUniqueContraints(XmlTableGenerator tableGenerator) {
-		if (tableGenerator == null) {
-			return;
-		}
-		for (XmlUniqueConstraint uniqueConstraint : tableGenerator.getUniqueConstraints()) {
-			this.uniqueConstraints.add(buildUniqueConstraint(uniqueConstraint));
-		}
-	}
-	
-	@Override
-	public void update(XmlTableGenerator tableGenerator) {
-		super.update(tableGenerator);
-		this.setSpecifiedTable_(this.specifiedTable(tableGenerator));
-		this.setSpecifiedCatalog_(this.specifiedCatalog(tableGenerator));
-		this.setDefaultCatalog(this.defaultCatalog());
-		this.setSpecifiedSchema_(this.specifiedSchema(tableGenerator));
-		this.setDefaultSchema(this.defaultSchema());
-		this.setSpecifiedPkColumnName_(this.specifiedPkColumnName(tableGenerator));
-		this.setSpecifiedValueColumnName_(this.specifiedValueColumnName(tableGenerator));
-		this.setSpecifiedPkColumnValue_(this.specifiedPkColumnValue(tableGenerator));
-		//TODO defaults
-		this.updateUniqueConstraints(tableGenerator);
-	}
-	
-	protected String specifiedTable(XmlTableGenerator tableGenerator) {
-		return tableGenerator.getTable();
-	}
-	
-	protected String specifiedCatalog(XmlTableGenerator tableGenerator) {
-		return tableGenerator.getCatalog();
-	}
-	
-	protected String specifiedSchema(XmlTableGenerator tableGenerator) {
-		return tableGenerator.getSchema();
-	}
-	
-	protected String specifiedPkColumnName(XmlTableGenerator tableGenerator) {
-		return tableGenerator.getPkColumnName();
-	}
-	
-	protected String specifiedValueColumnName(XmlTableGenerator tableGenerator) {
-		return tableGenerator.getValueColumnName();
-	}
-	
-	protected String specifiedPkColumnValue(XmlTableGenerator tableGenerator) {
-		return tableGenerator.getPkColumnValue();
-	}
-	
-	protected String defaultSchema() {
-		return getEntityMappings().getSchema();
-	}
-	
-	protected String defaultCatalog() {
-		return getEntityMappings().getCatalog();
-	}
-
-	protected void updateUniqueConstraints(XmlTableGenerator tableGenerator) {
-		ListIterator<OrmUniqueConstraint> uniqueConstraints = uniqueConstraints();
-		ListIterator<XmlUniqueConstraint> resourceUniqueConstraints;
-		if (tableGenerator == null) {
-			resourceUniqueConstraints = EmptyListIterator.instance();
-		}
-		else {
-			resourceUniqueConstraints = new CloneListIterator<XmlUniqueConstraint>(tableGenerator.getUniqueConstraints());//prevent ConcurrentModificiationException
-		}
-		
-		while (uniqueConstraints.hasNext()) {
-			OrmUniqueConstraint uniqueConstraint = uniqueConstraints.next();
-			if (resourceUniqueConstraints.hasNext()) {
-				uniqueConstraint.update(resourceUniqueConstraints.next());
-			}
-			else {
-				removeUniqueConstraint_(uniqueConstraint);
-			}
-		}
-		
-		while (resourceUniqueConstraints.hasNext()) {
-			addUniqueConstraint(uniqueConstraintsSize(), buildUniqueConstraint(resourceUniqueConstraints.next()));
-		}
-	}
-
-	protected OrmUniqueConstraint buildUniqueConstraint(XmlUniqueConstraint xmlUniqueConstraint) {
-		return getJpaFactory().buildOrmUniqueConstraint(this, this, xmlUniqueConstraint);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTransientMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTransientMapping.java
deleted file mode 100644
index 15aa020230..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTransientMapping.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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTransientMapping;
-import org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlTransient;
-
-
-public class GenericOrmTransientMapping extends AbstractOrmAttributeMapping<XmlTransient> implements OrmTransientMapping
-{
-	
-	public GenericOrmTransientMapping(OrmPersistentAttribute parent) {
-		super(parent);
-	}
-
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmTransientMapping(this);
-	}
-
-	public int getXmlSequence() {
-		return 9;
-	}
-
-	public String getKey() {
-		return MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public XmlTransient addToResourceModel(AbstractXmlTypeMapping typeMapping) {
-		XmlTransient transientResource = OrmFactory.eINSTANCE.createXmlTransientImpl();
-		getPersistentAttribute().initialize(transientResource);
-		typeMapping.getAttributes().getTransients().add(transientResource);
-		return transientResource;
-	}
-	
-	public void removeFromResourceModel(AbstractXmlTypeMapping typeMapping) {
-		typeMapping.getAttributes().getTransients().remove(this.getAttributeMapping());
-		if (typeMapping.getAttributes().isAllFeaturesUnset()) {
-			typeMapping.setAttributes(null);
-		}
-	}
-	
-	@Override
-	public void initialize(XmlTransient transientResource) {
-		super.initialize(transientResource);
-	}
-	
-	@Override
-	public void update(XmlTransient transientResource) {
-		super.update(transientResource);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmUniqueConstraint.java
deleted file mode 100644
index beeda806a7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmUniqueConstraint.java
+++ /dev/null
@@ -1,122 +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.core.internal.context.orm;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.core.context.UniqueConstraint;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.context.orm.OrmUniqueConstraint;
-import org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-public class GenericOrmUniqueConstraint extends AbstractOrmJpaContextNode
-	implements OrmUniqueConstraint
-{
-	
-	protected final List<String> columnNames;
-	
-	protected XmlUniqueConstraint uniqueConstraint;
-	
-	protected UniqueConstraint.Owner owner;
-	
-	public GenericOrmUniqueConstraint(OrmJpaContextNode parent, UniqueConstraint.Owner owner, XmlUniqueConstraint uniqueConstraint) {
-		super(parent);
-		this.owner = owner;
-		this.columnNames = new ArrayList<String>();
-		this.initialize(uniqueConstraint);
-	}
-	
-	public ListIterator<String> columnNames() {
-		return new CloneListIterator<String>(this.columnNames);
-	}
-
-	public int columnNamesSize() {
-		return this.columnNames.size();
-	}
-
-	public void addColumnName(int index, String columnName) {
-		this.columnNames.add(index, columnName);
-		this.uniqueConstraint.getColumnNames().add(index, columnName);
-		fireItemAdded(UniqueConstraint.COLUMN_NAMES_LIST, index, columnName);		
-	}	
-	
-	protected void addColumnName_(int index, String columnName) {
-		this.columnNames.add(index, columnName);
-		fireItemAdded(UniqueConstraint.COLUMN_NAMES_LIST, index, columnName);		
-	}	
-
-	public void removeColumnName(String columnName) {
-		this.removeColumnName(this.columnNames.indexOf(columnName));
-	}
-
-	public void removeColumnName(int index) {
-		String removedColumnName = this.columnNames.remove(index);
-		this.uniqueConstraint.getColumnNames().remove(index);
-		fireItemRemoved(UniqueConstraint.COLUMN_NAMES_LIST, index, removedColumnName);
-	}
-	
-	protected void removeColumnName_(int index) {
-		String removedColumnName = this.columnNames.remove(index);
-		fireItemRemoved(UniqueConstraint.COLUMN_NAMES_LIST, index, removedColumnName);
-	}
-
-	public void moveColumnName(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.columnNames, targetIndex, sourceIndex);
-		this.uniqueConstraint.getColumnNames().move(targetIndex, sourceIndex);
-		fireItemMoved(UniqueConstraint.COLUMN_NAMES_LIST, targetIndex, sourceIndex);		
-	}
-
-	public TextRange getValidationTextRange() {
-		return this.uniqueConstraint.getValidationTextRange();
-	}
-	
-	protected void initialize(XmlUniqueConstraint uniqueConstraint) {
-		this.uniqueConstraint = uniqueConstraint;
-		this.initializeColumnNames(uniqueConstraint);
-	}
-	
-	protected void initializeColumnNames(XmlUniqueConstraint uniqueConstraint) {
-		ListIterator<String> xmlColumnNames = new CloneListIterator<String>(uniqueConstraint.getColumnNames());
-		
-		for (String annotationColumnName : CollectionTools.iterable(xmlColumnNames)) {
-			this.columnNames.add(annotationColumnName);
-		}
-	}
-	
-	public void update(XmlUniqueConstraint uniqueConstraint) {
-		this.uniqueConstraint = uniqueConstraint;
-		this.updateColumnNames(uniqueConstraint);
-	}
-	
-	protected void updateColumnNames(XmlUniqueConstraint uniqueConstraint) {
-		ListIterator<String> xmlColumnNames = new CloneListIterator<String>(uniqueConstraint.getColumnNames());
-		
-		int index = 0;
-		for (String xmlColumnName : CollectionTools.iterable(xmlColumnNames)) {
-			if (columnNamesSize() > index) {
-				if (this.columnNames.get(index) != xmlColumnName) {
-					addColumnName_(index, xmlColumnName);
-				}
-			}
-			else {
-				addColumnName_(index, xmlColumnName);			
-			}
-			index++;
-		}
-		
-		for ( ; index < columnNamesSize(); ) {
-			removeColumnName_(index);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmVersionMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmVersionMapping.java
deleted file mode 100644
index 488342b8f7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmVersionMapping.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.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.ColumnMapping;
-import org.eclipse.jpt.core.context.TemporalType;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmColumn;
-import org.eclipse.jpt.core.context.orm.OrmColumnMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmVersionMapping;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlColumn;
-import org.eclipse.jpt.core.resource.orm.XmlVersion;
-import org.eclipse.jpt.db.Table;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-
-public class GenericOrmVersionMapping extends AbstractOrmAttributeMapping<XmlVersion>
-	implements OrmVersionMapping
-{
-	protected final OrmColumn column;
-
-	protected TemporalType temporal;
-	
-	public GenericOrmVersionMapping(OrmPersistentAttribute parent) {
-		super(parent);
-		this.column = getJpaFactory().buildOrmColumn(this, this);
-	}
-
-	public int getXmlSequence() {
-		return 3;
-	}
-
-	public String getKey() {
-		return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmVersionMapping(this);
-	}
-
-	@Override
-	public void initializeFromXmlColumnMapping(OrmColumnMapping oldMapping) {
-		super.initializeFromXmlColumnMapping(oldMapping);
-		setTemporal(oldMapping.getTemporal());
-		getColumn().initializeFrom(oldMapping.getColumn());
-	}
-
-	public OrmColumn getColumn() {
-		return this.column;
-	}
-
-	public TemporalType getTemporal() {
-		return this.temporal;
-	}
-
-	public void setTemporal(TemporalType newTemporal) {
-		TemporalType oldTemporal = this.temporal;
-		this.temporal = newTemporal;
-		this.getAttributeMapping().setTemporal(TemporalType.toOrmResourceModel(newTemporal));
-		firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal);
-	}
-	
-	protected void setTemporal_(TemporalType newTemporal) {
-		TemporalType oldTemporal = this.temporal;
-		this.temporal = newTemporal;
-		firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal);
-	}
-
-	public XmlVersion addToResourceModel(AbstractXmlTypeMapping typeMapping) {
-		XmlVersion version = OrmFactory.eINSTANCE.createXmlVersionImpl();
-		getPersistentAttribute().initialize(version);
-		typeMapping.getAttributes().getVersions().add(version);
-		return version;
-	}
-	
-	public void removeFromResourceModel(AbstractXmlTypeMapping typeMapping) {
-		typeMapping.getAttributes().getVersions().remove(this.getAttributeMapping());
-		if (typeMapping.getAttributes().isAllFeaturesUnset()) {
-			typeMapping.setAttributes(null);
-		}
-	}
-
-	public String getDefaultColumnName() {		
-		return getAttributeName();
-	}
-
-	public String getDefaultTableName() {
-		return getTypeMapping().getTableName();
-	}
-
-	public Table getDbTable(String tableName) {
-		return getTypeMapping().getDbTable(tableName);
-	}
-	
-	@Override
-	public void initialize(XmlVersion version) {
-		super.initialize(version);
-		this.temporal = this.specifiedTemporal(version);
-		this.column.initialize(version.getColumn());
-	}
-	
-	@Override
-	public void update(XmlVersion version) {
-		super.update(version);
-		this.setTemporal_(this.specifiedTemporal(version));
-		this.column.update(version.getColumn());
-	}
-	
-	protected TemporalType specifiedTemporal(XmlVersion version) {
-		return TemporalType.fromOrmResourceModel(version.getTemporal());
-	}
-
-	//***************** IXmlColumn.Owner implementation ****************
-	
-	public XmlColumn getColumnResource() {
-		return this.getAttributeMapping().getColumn();
-	}
-	
-	public void addColumnResource() {
-		this.getAttributeMapping().setColumn(OrmFactory.eINSTANCE.createXmlColumnImpl());
-	}
-	
-	public void removeColumnResource() {
-		this.getAttributeMapping().setColumn(null);
-	}
-	
-	// ****************** validation ****************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		
-		if (entityOwned()) {
-			addColumnMessages(messages);
-		}
-	}
-	
-	protected void addColumnMessages(List<IMessage> messages) {
-		OrmColumn column = getColumn();
-		String table = column.getTable();
-		boolean doContinue = entityOwned() &&  this.connectionProfileIsActive();
-		
-		if (doContinue && getTypeMapping().tableNameIsInvalid(table)) {
-			if (getPersistentAttribute().isVirtual()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_TABLE,
-						new String[] {getPersistentAttribute().getName(), table, column.getName()},
-						column,
-						column.getTableTextRange())
-				);
-			}
-			else {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.COLUMN_UNRESOLVED_TABLE,
-						new String[] {table, column.getName()}, 
-						column,
-						column.getTableTextRange())
-				);
-			}
-			doContinue = false;
-		}
-		
-		if (doContinue && ! column.isResolved()) {
-			if (getPersistentAttribute().isVirtual()) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_NAME,
-						new String[] {getPersistentAttribute().getName(), column.getName()}, 
-						column,
-						column.getNameTextRange())
-				);
-			}
-			else {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.COLUMN_UNRESOLVED_NAME,
-						new String[] {column.getName()}, 
-						column,
-						column.getNameTextRange())
-				);
-			}
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericPersistenceUnitDefaults.java
deleted file mode 100644
index 847e081d33..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericPersistenceUnitDefaults.java
+++ /dev/null
@@ -1,267 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.AccessType;
-import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults;
-import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults;
-import org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Catalog;
-import org.eclipse.jpt.db.Schema;
-
-public class GenericPersistenceUnitDefaults extends AbstractOrmJpaContextNode
-	implements PersistenceUnitDefaults
-{
-	protected String specifiedSchema;
-	
-	protected String defaultSchema;
-
-	protected String specifiedCatalog;
-
-	protected String defaultCatalog;
-
-	protected AccessType access;
-
-	protected boolean cascadePersist;
-
-	protected XmlEntityMappings entityMappings;
-	
-	public GenericPersistenceUnitDefaults(PersistenceUnitMetadata parent, XmlEntityMappings xmlEntityMappings) {
-		super(parent);
-		this.initialize(xmlEntityMappings);
-	}
-
-	public AccessType getAccess() {
-		return this.access;
-	}
-
-	public void setAccess(AccessType newAccess) {
-		AccessType oldAccess = this.access;
-		this.access = newAccess;
-		if (oldAccess != newAccess) {
-			if (this.persistenceUnitDefaults() != null) {
-				this.persistenceUnitDefaults().setAccess(AccessType.toXmlResourceModel(newAccess));
-				if (this.persistenceUnitDefaults().isAllFeaturesUnset()) {
-					this.persistenceUnitMetadata().setPersistenceUnitDefaults(null);
-					if (this.persistenceUnitMetadata().isAllFeaturesUnset()) {
-						this.entityMappings.setPersistenceUnitMetadata(null);
-					}
-				}
-			}
-			else {
-				if (persistenceUnitMetadata() == null) {
-					this.entityMappings.setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-				}
-				persistenceUnitMetadata().setPersistenceUnitDefaults(OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults());
-				persistenceUnitDefaults().setAccess(AccessType.toXmlResourceModel(newAccess));
-			}
-		}
-		firePropertyChanged(PersistenceUnitDefaults.ACCESS_PROPERTY, oldAccess, newAccess);
-	}
-	
-	protected void setAccess_(AccessType newAccess) {
-		AccessType oldAccess = this.access;
-		this.access = newAccess;
-		firePropertyChanged(PersistenceUnitDefaults.ACCESS_PROPERTY, oldAccess, newAccess);
-	}
-	
-	public String getCatalog() {
-		return (this.getSpecifiedCatalog() == null) ? this.getDefaultCatalog() : this.getSpecifiedCatalog();
-	}
-
-	public String getDefaultCatalog() {
-		return this.defaultCatalog;
-	}
-	
-
-	protected void setDefaultCatalog(String newDefaultCatalog) {
-		String oldDefaultCatalog = this.defaultCatalog;
-		this.defaultCatalog = newDefaultCatalog;
-		firePropertyChanged(DEFAULT_CATALOG_PROPERTY, oldDefaultCatalog, newDefaultCatalog);
-	}
-
-	public String getSpecifiedCatalog() {
-		return this.specifiedCatalog;
-	}
-
-	public void setSpecifiedCatalog(String newCatalog) {
-		String oldCatalog = this.specifiedCatalog;
-		this.specifiedCatalog = newCatalog;
-		if (oldCatalog != newCatalog) {
-			if (this.persistenceUnitDefaults() != null) {
-				this.persistenceUnitDefaults().setCatalog(newCatalog);
-				if (this.persistenceUnitDefaults().isAllFeaturesUnset()) {
-					this.persistenceUnitMetadata().setPersistenceUnitDefaults(null);
-					if (this.persistenceUnitMetadata().isAllFeaturesUnset()) {
-						this.entityMappings.setPersistenceUnitMetadata(null);
-					}
-				}
-			}
-			else {
-				if (persistenceUnitMetadata() == null) {
-					this.entityMappings.setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-				}
-				persistenceUnitMetadata().setPersistenceUnitDefaults(OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults());
-				persistenceUnitDefaults().setCatalog(newCatalog);
-			}
-		}
-		firePropertyChanged(PersistenceUnitDefaults.SPECIFIED_CATALOG_PROPERTY, oldCatalog, newCatalog);
-	}
-	
-	protected void setSpecifiedCatalog_(String newCatalog) {
-		String oldCatalog = this.specifiedCatalog;
-		this.specifiedCatalog = newCatalog;
-		firePropertyChanged(PersistenceUnitDefaults.SPECIFIED_CATALOG_PROPERTY, oldCatalog, newCatalog);
-	}
-
-
-	public String getSchema() {
-		return (this.getSpecifiedSchema() == null) ? this.getDefaultSchema() : this.getSpecifiedSchema();
-	}
-
-	public String getDefaultSchema() {
-		return this.defaultSchema;
-	}
-
-	protected void setDefaultSchema(String newDefaultSchema) {
-		String oldDefaultSchema = this.defaultSchema;
-		this.defaultSchema = newDefaultSchema;
-		firePropertyChanged(DEFAULT_SCHEMA_PROPERTY, oldDefaultSchema, newDefaultSchema);
-	}
-
-	public String getSpecifiedSchema() {
-		return this.specifiedSchema;
-	}
-
-	public void setSpecifiedSchema(String newSchema) {
-		String oldSchema = this.specifiedSchema;
-		this.specifiedSchema = newSchema;
-		if (oldSchema != newSchema) {
-			if (this.persistenceUnitDefaults() != null) {
-				this.persistenceUnitDefaults().setSchema(newSchema);
-				if (this.persistenceUnitDefaults().isAllFeaturesUnset()) {
-					this.persistenceUnitMetadata().setPersistenceUnitDefaults(null);
-					if (this.persistenceUnitMetadata().isAllFeaturesUnset()) {
-						this.entityMappings.setPersistenceUnitMetadata(null);
-					}
-				}
-			}
-			else {
-				if (persistenceUnitMetadata() == null) {
-					this.entityMappings.setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-				}
-				persistenceUnitMetadata().setPersistenceUnitDefaults(OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults());
-				persistenceUnitDefaults().setSchema(newSchema);
-			}
-		}
-		firePropertyChanged(PersistenceUnitDefaults.SPECIFIED_SCHEMA_PROPERTY, oldSchema, newSchema);
-	}
-	
-	protected void setSpecifiedSchema_(String newSchema) {
-		String oldSchema = this.specifiedSchema;
-		this.specifiedSchema = newSchema;
-		firePropertyChanged(PersistenceUnitDefaults.SPECIFIED_SCHEMA_PROPERTY, oldSchema, newSchema);
-	}
-	
-	public boolean isCascadePersist() {
-		return this.cascadePersist;
-	}
-
-	public void setCascadePersist(boolean newCascadePersist) {
-		boolean oldCascadePersist = this.cascadePersist;
-		this.cascadePersist = newCascadePersist;
-		if (oldCascadePersist != newCascadePersist) {
-			if (this.persistenceUnitDefaults() != null) {
-				this.persistenceUnitDefaults().setCascadePersist(newCascadePersist);
-				if (this.persistenceUnitDefaults().isAllFeaturesUnset()) {
-					this.persistenceUnitMetadata().setPersistenceUnitDefaults(null);
-					if (this.persistenceUnitMetadata().isAllFeaturesUnset()) {
-						this.entityMappings.setPersistenceUnitMetadata(null);
-					}
-				}
-			}
-			else if (newCascadePersist) {
-				if (persistenceUnitMetadata() == null) {
-					this.entityMappings.setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-				}
-				persistenceUnitMetadata().setPersistenceUnitDefaults(OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults());
-				persistenceUnitDefaults().setCascadePersist(newCascadePersist);
-			}
-		}
-		firePropertyChanged(PersistenceUnitDefaults.CASCADE_PERSIST_PROPERTY, oldCascadePersist, newCascadePersist);
-	}
-
-	protected void setCascadePersist_(boolean newCascadePersist) {
-		boolean oldCascadePersist = this.cascadePersist;
-		this.cascadePersist = newCascadePersist;
-		firePropertyChanged(PersistenceUnitDefaults.CASCADE_PERSIST_PROPERTY, oldCascadePersist, newCascadePersist);
-	}
-	
-	protected void initialize(XmlEntityMappings entityMappings) {
-		this.entityMappings = entityMappings;
-		if (this.persistenceUnitDefaults() != null) {
-			this.access = AccessType.fromXmlResourceModel(this.persistenceUnitDefaults().getAccess());
-			this.cascadePersist = this.persistenceUnitDefaults().isCascadePersist();
-			this.specifiedCatalog = this.persistenceUnitDefaults().getCatalog();
-			this.specifiedSchema = this.persistenceUnitDefaults().getSchema();
-		}
-	}
-	
-	
-	public void update(XmlEntityMappings entityMappings) {
-		this.entityMappings = entityMappings;
-		if (this.persistenceUnitDefaults() != null) {
-			this.setAccess_(AccessType.fromXmlResourceModel(this.persistenceUnitDefaults().getAccess()));
-			this.setCascadePersist_(this.persistenceUnitDefaults().isCascadePersist());
-			this.setSpecifiedCatalog_(this.persistenceUnitDefaults().getCatalog());
-			this.setSpecifiedSchema_(this.persistenceUnitDefaults().getSchema());
-		}
-		else {
-			this.setAccess_(null);
-			this.setCascadePersist_(false);
-			this.setSpecifiedCatalog_(null);
-			this.setSpecifiedSchema_(null);
-		}
-		this.setDefaultSchema(this.projectDefaultSchemaName());
-		this.setDefaultCatalog(this.projectDefaultCatalogName());
-	}
-	
-	protected String projectDefaultSchemaName() {
-		Schema projectDefaultSchema = getJpaProject().getDefaultSchema();
-		return projectDefaultSchema == null ? null : projectDefaultSchema.getName();
-	}
-
-	protected String projectDefaultCatalogName() {
-		Catalog catalog = getJpaProject().getConnectionProfile().getDefaultCatalog();
-		return (catalog == null) ? null : catalog.getName();
-	}
-
-	protected XmlPersistenceUnitDefaults persistenceUnitDefaults() {
-		if (persistenceUnitMetadata() != null) {
-			return persistenceUnitMetadata().getPersistenceUnitDefaults();
-		}
-		return null;
-	}
-
-	protected XmlPersistenceUnitMetadata persistenceUnitMetadata() {
-		return this.entityMappings.getPersistenceUnitMetadata();
-	}
-
-	public TextRange getValidationTextRange() {
-		if (persistenceUnitDefaults() != null) {
-			return persistenceUnitDefaults().getValidationTextRange();
-		}
-		return this.entityMappings.getValidationTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericPersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericPersistenceUnitMetadata.java
deleted file mode 100644
index c970efe73a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericPersistenceUnitMetadata.java
+++ /dev/null
@@ -1,95 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.orm.EntityMappings;
-import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults;
-import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata;
-import org.eclipse.jpt.core.utility.TextRange;
-
-public class GenericPersistenceUnitMetadata extends AbstractOrmJpaContextNode
-	implements PersistenceUnitMetadata
-{
-	protected boolean xmlMappingMetadataComplete;
-
-	protected final PersistenceUnitDefaults persistenceUnitDefaults;
-
-	protected XmlEntityMappings entityMappings;
-
-	public GenericPersistenceUnitMetadata(EntityMappings parent, XmlEntityMappings xmlEntityMappings) {
-		super(parent);
-		this.persistenceUnitDefaults = getJpaFactory().buildPersistenceUnitDefaults(this, xmlEntityMappings);
-		this.initialize(xmlEntityMappings);
-	}
-
-	public boolean isXmlMappingMetadataComplete() {
-		return this.xmlMappingMetadataComplete;
-	}
-
-	public void setXmlMappingMetadataComplete(boolean newXmlMappingMetadataComplete) {
-		boolean oldXmlMappingMetadataComplete = this.xmlMappingMetadataComplete;
-		this.xmlMappingMetadataComplete = newXmlMappingMetadataComplete;
-		if (oldXmlMappingMetadataComplete != newXmlMappingMetadataComplete) {
-			if (this.persistenceUnitMetadata() != null) {
-				this.persistenceUnitMetadata().setXmlMappingMetadataComplete(newXmlMappingMetadataComplete);						
-				if (this.persistenceUnitMetadata().isAllFeaturesUnset()) {
-					this.entityMappings.setPersistenceUnitMetadata(null);
-				}
-			}
-			else if (newXmlMappingMetadataComplete) {
-				this.entityMappings.setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-				this.persistenceUnitMetadata().setXmlMappingMetadataComplete(newXmlMappingMetadataComplete);		
-			}
-		}
-		firePropertyChanged(PersistenceUnitMetadata.XML_MAPPING_METADATA_COMPLETE_PROPERTY, oldXmlMappingMetadataComplete, newXmlMappingMetadataComplete);
-	}
-	
-	protected void setXmlMappingMetadataComplete_(boolean newXmlMappingMetadataComplete) {
-		boolean oldXmlMappingMetadataComplete = this.xmlMappingMetadataComplete;
-		this.xmlMappingMetadataComplete = newXmlMappingMetadataComplete;
-		firePropertyChanged(PersistenceUnitMetadata.XML_MAPPING_METADATA_COMPLETE_PROPERTY, oldXmlMappingMetadataComplete, newXmlMappingMetadataComplete);
-	}
-
-	public PersistenceUnitDefaults getPersistenceUnitDefaults() {
-		return this.persistenceUnitDefaults;
-	}
-	
-	protected void initialize(XmlEntityMappings entityMappings) {
-		this.entityMappings = entityMappings;
-		if (this.persistenceUnitMetadata() != null) {
-			this.xmlMappingMetadataComplete = this.persistenceUnitMetadata().isXmlMappingMetadataComplete();
-		}
-	}
-	
-	public void update(XmlEntityMappings entityMappings) {
-		this.entityMappings = entityMappings;
-		if (this.persistenceUnitMetadata() != null) {
-			setXmlMappingMetadataComplete_(this.persistenceUnitMetadata().isXmlMappingMetadataComplete());
-		}
-		else {
-			setXmlMappingMetadataComplete_(false);
-		}
-		this.persistenceUnitDefaults.update(entityMappings);
-	}
-	
-	protected XmlPersistenceUnitMetadata persistenceUnitMetadata() {
-		return this.entityMappings.getPersistenceUnitMetadata();
-	}
-	
-	public TextRange getValidationTextRange() {
-		if (persistenceUnitMetadata() != null) {
-			return persistenceUnitMetadata().getValidationTextRange();
-		}
-		return this.entityMappings.getValidationTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmBasicMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmBasicMappingProvider.java
deleted file mode 100644
index e5dd187a11..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmBasicMappingProvider.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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmBasicMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-
-public class OrmBasicMappingProvider implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmBasicMappingProvider INSTANCE = new OrmBasicMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private OrmBasicMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public OrmBasicMapping buildAttributeMapping(JpaFactory factory, OrmPersistentAttribute parent) {
-		return factory.buildOrmBasicMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmCascade.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmCascade.java
deleted file mode 100644
index 22a3f1e316..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmCascade.java
+++ /dev/null
@@ -1,246 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.Cascade;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-import org.eclipse.jpt.core.context.orm.OrmRelationshipMapping;
-import org.eclipse.jpt.core.resource.orm.CascadeType;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-public class OrmCascade extends AbstractOrmJpaContextNode implements Cascade, OrmJpaContextNode
-{
-
-	protected boolean all;
-
-	protected boolean persist;
-
-	protected boolean merge;
-
-	protected boolean remove;
-
-	protected boolean refresh;
-
-	
-	protected XmlRelationshipMapping relationshipMapping;
-	
-	protected OrmCascade(OrmRelationshipMapping parent) {
-		super(parent);
-	}
-	
-	public void initializeFrom(Cascade oldCascade) {
-		setAll(oldCascade.isAll());
-		setPersist(oldCascade.isPersist());
-		setMerge(oldCascade.isMerge());
-		setRemove(oldCascade.isRemove());
-		setRefresh(oldCascade.isRefresh());
-	}
-
-	public boolean isAll() {
-		return this.all;
-	}
-
-	public void setAll(boolean newAll) {
-		boolean oldAll = this.all;
-		this.all = newAll;
-		if (oldAll != newAll) {
-			if (this.getCascadeResource() != null) {
-				this.getCascadeResource().setCascadeAll(newAll);						
-				if (this.getCascadeResource().isAllFeaturesUnset()) {
-					removeCascadeResource();
-				}
-			}
-			else if (newAll != false) {
-				addCascadeResource();
-				getCascadeResource().setCascadeAll(newAll);
-			}
-		}
-		firePropertyChanged(ALL_PROPERTY, oldAll, newAll);
-	}
-	
-	protected void setAll_(boolean newAll) {
-		boolean oldAll = this.all;
-		this.all = newAll;
-		firePropertyChanged(ALL_PROPERTY, oldAll, newAll);
-	}
-	
-	public boolean isPersist() {
-		return this.persist;
-	}
-
-	public void setPersist(boolean newPersist) {
-		boolean oldPersist = this.persist;
-		this.persist = newPersist;
-		if (oldPersist != newPersist) {
-			if (this.getCascadeResource() != null) {
-				this.getCascadeResource().setCascadePersist(newPersist);						
-				if (this.getCascadeResource().isAllFeaturesUnset()) {
-					removeCascadeResource();
-				}
-			}
-			else if (newPersist != false) {
-				addCascadeResource();
-				getCascadeResource().setCascadePersist(newPersist);
-			}
-		}		
-		firePropertyChanged(PERSIST_PROPERTY, oldPersist, newPersist);
-	}
-	
-	protected void setPersist_(boolean newPersist) {
-		boolean oldPersist = this.persist;
-		this.persist = newPersist;		
-		firePropertyChanged(PERSIST_PROPERTY, oldPersist, newPersist);
-	}
-
-
-	public boolean isMerge() {
-		return this.merge;
-	}
-
-	public void setMerge(boolean newMerge) {
-		boolean oldMerge = this.merge;
-		this.merge = newMerge;
-		if (oldMerge != newMerge) {
-			if (this.getCascadeResource() != null) {
-				this.getCascadeResource().setCascadeMerge(newMerge);						
-				if (this.getCascadeResource().isAllFeaturesUnset()) {
-					removeCascadeResource();
-				}
-			}
-			else if (newMerge != false) {
-				addCascadeResource();
-				getCascadeResource().setCascadeMerge(newMerge);
-			}
-		}		
-		firePropertyChanged(MERGE_PROPERTY, oldMerge, newMerge);
-	}
-	
-	protected void setMerge_(boolean newMerge) {
-		boolean oldMerge = this.merge;
-		this.merge = newMerge;
-		firePropertyChanged(MERGE_PROPERTY, oldMerge, newMerge);
-	}
-
-	public boolean isRemove() {
-		return this.remove;
-	}
-
-	public void setRemove(boolean newRemove) {
-		boolean oldRemove = this.remove;
-		this.remove = newRemove;
-		if (oldRemove != newRemove) {
-			if (this.getCascadeResource() != null) {
-				this.getCascadeResource().setCascadeRemove(newRemove);						
-				if (this.getCascadeResource().isAllFeaturesUnset()) {
-					removeCascadeResource();
-				}
-			}
-			else if (newRemove != false) {
-				addCascadeResource();
-				getCascadeResource().setCascadeRemove(newRemove);
-			}
-		}		
-		firePropertyChanged(REMOVE_PROPERTY, oldRemove, newRemove);
-	}
-	
-	protected void setRemove_(boolean newRemove) {
-		boolean oldRemove = this.remove;
-		this.remove = newRemove;		
-		firePropertyChanged(REMOVE_PROPERTY, oldRemove, newRemove);
-	}
-
-	public boolean isRefresh() {
-		return this.refresh;
-	}
-
-	public void setRefresh(boolean newRefresh) {
-		boolean oldRefresh = this.refresh;
-		this.refresh = newRefresh;	
-		if (oldRefresh != newRefresh) {
-			if (this.getCascadeResource() != null) {
-				this.getCascadeResource().setCascadeRefresh(newRefresh);						
-				if (this.getCascadeResource().isAllFeaturesUnset()) {
-					removeCascadeResource();
-				}
-			}
-			else if (newRefresh != false) {
-				addCascadeResource();
-				getCascadeResource().setCascadeRefresh(newRefresh);
-			}
-		}
-		firePropertyChanged(REFRESH_PROPERTY, oldRefresh, newRefresh);
-	}
-	
-	protected void setRefresh_(boolean newRefresh) {
-		boolean oldRefresh = this.refresh;
-		this.refresh = newRefresh;
-		firePropertyChanged(REFRESH_PROPERTY, oldRefresh, newRefresh);
-	}
-	
-
-	protected CascadeType getCascadeResource() {
-		return this.relationshipMapping.getCascade();
-	}
-	
-	protected void removeCascadeResource() {
-		this.relationshipMapping.setCascade(null);		
-	}
-	
-	protected void addCascadeResource() {
-		this.relationshipMapping.setCascade(OrmFactory.eINSTANCE.createCascadeTypeImpl());			
-	}
-
-	public void initialize(XmlRelationshipMapping relationshipMapping) {
-		this.relationshipMapping = relationshipMapping;
-		CascadeType cascade = getCascadeResource();
-		this.all = this.all(cascade);
-		this.persist = this.persist(cascade);
-		this.merge = this.merge(cascade);
-		this.remove = this.remove(cascade);
-		this.refresh = this.refresh(cascade);
-	}
-	
-	public void update(XmlRelationshipMapping relationshipMapping) {
-		this.relationshipMapping = relationshipMapping;
-		CascadeType cascade = getCascadeResource();
-		this.setAll_(this.all(cascade));
-		this.setPersist_(this.persist(cascade));
-		this.setMerge_(this.merge(cascade));
-		this.setRemove_(this.remove(cascade));
-		this.setRefresh_(this.refresh(cascade));		
-	}
-
-	protected boolean all(CascadeType cascade) {
-		return cascade == null ? false : cascade.isCascadeAll();
-	}
-
-	protected boolean persist(CascadeType cascade) {
-		return cascade == null ? false : cascade.isCascadePersist();
-	}
-
-	protected boolean merge(CascadeType cascade) {
-		return cascade == null ? false : cascade.isCascadeMerge();
-	}
-
-	protected boolean remove(CascadeType cascade) {
-		return cascade == null ? false : cascade.isCascadeRemove();
-	}
-
-	protected boolean refresh(CascadeType cascade) {
-		return cascade == null ? false : cascade.isCascadeRefresh();
-	}
-
-	public TextRange getValidationTextRange() {
-		return this.getCascadeResource().getValidationTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddableProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddableProvider.java
deleted file mode 100644
index 9dc3cae9cb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddableProvider.java
+++ /dev/null
@@ -1,29 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmEmbeddable;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.orm.OrmTypeMappingProvider;
-
-
-public class OrmEmbeddableProvider implements OrmTypeMappingProvider
-{
-
-	public OrmEmbeddable buildTypeMapping(JpaFactory factory, OrmPersistentType parent) {
-		return factory.buildOrmEmbeddable(parent);
-	}
-
-	public String getKey() {
-		return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddedIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddedIdMappingProvider.java
deleted file mode 100644
index 2a3162affd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddedIdMappingProvider.java
+++ /dev/null
@@ -1,44 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmEmbeddedIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-
-public class OrmEmbeddedIdMappingProvider implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmEmbeddedIdMappingProvider INSTANCE = new OrmEmbeddedIdMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private OrmEmbeddedIdMappingProvider() {
-		super();
-	}
-
-	public OrmEmbeddedIdMapping buildAttributeMapping(JpaFactory factory, OrmPersistentAttribute parent) {
-		return factory.buildOrmEmbeddedIdMapping(parent);
-	}
-
-	public String getKey() {
-		return MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddedMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddedMappingProvider.java
deleted file mode 100644
index dcf069189a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddedMappingProvider.java
+++ /dev/null
@@ -1,44 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmEmbeddedMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-
-public class OrmEmbeddedMappingProvider implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmEmbeddedMappingProvider INSTANCE = new OrmEmbeddedMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private OrmEmbeddedMappingProvider() {
-		super();
-	}
-
-	public OrmEmbeddedMapping buildAttributeMapping(JpaFactory factory, OrmPersistentAttribute parent) {
-		return factory.buildOrmEmbeddedMapping(parent);
-	}
-
-	public String getKey() {
-		return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEntityProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEntityProvider.java
deleted file mode 100644
index 10c69c5333..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEntityProvider.java
+++ /dev/null
@@ -1,28 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmEntity;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.orm.OrmTypeMappingProvider;
-
-
-public class OrmEntityProvider implements OrmTypeMappingProvider
-{	
-	public OrmEntity buildTypeMapping(JpaFactory factory, OrmPersistentType parent) {
-		return factory.buildOrmEntity(parent);
-	}
-
-	public String getKey() {
-		return MappingKeys.ENTITY_TYPE_MAPPING_KEY;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmIdMappingProvider.java
deleted file mode 100644
index 302c800245..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmIdMappingProvider.java
+++ /dev/null
@@ -1,43 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-
-public class OrmIdMappingProvider implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmIdMappingProvider INSTANCE = new OrmIdMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private OrmIdMappingProvider() {
-		super();
-	}
-	public String getKey() {
-		return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public OrmIdMapping buildAttributeMapping(JpaFactory factory, OrmPersistentAttribute parent) {
-		return factory.buildOrmIdMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmManyToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmManyToManyMappingProvider.java
deleted file mode 100644
index 5dbfd0c6bc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmManyToManyMappingProvider.java
+++ /dev/null
@@ -1,44 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmManyToManyMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-
-public class OrmManyToManyMappingProvider implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmManyToManyMappingProvider INSTANCE = new OrmManyToManyMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private OrmManyToManyMappingProvider() {
-		super();
-	}
-	
-	public String getKey() {
-		return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public OrmManyToManyMapping buildAttributeMapping(JpaFactory factory, OrmPersistentAttribute parent) {
-		return factory.buildOrmManyToManyMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmManyToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmManyToOneMappingProvider.java
deleted file mode 100644
index bf5acb53c0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmManyToOneMappingProvider.java
+++ /dev/null
@@ -1,44 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmManyToOneMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-
-public class OrmManyToOneMappingProvider implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmManyToOneMappingProvider INSTANCE = new OrmManyToOneMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private OrmManyToOneMappingProvider() {
-		super();
-	}
-	
-	public String getKey() {
-		return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public OrmManyToOneMapping buildAttributeMapping(JpaFactory factory, OrmPersistentAttribute parent) {
-		return factory.buildOrmManyToOneMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmMappedSuperclassProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmMappedSuperclassProvider.java
deleted file mode 100644
index 18e970fd24..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmMappedSuperclassProvider.java
+++ /dev/null
@@ -1,28 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmMappedSuperclass;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.orm.OrmTypeMappingProvider;
-
-
-public class OrmMappedSuperclassProvider implements OrmTypeMappingProvider
-{	
-	public OrmMappedSuperclass buildTypeMapping(JpaFactory factory, OrmPersistentType parent) {
-		return factory.buildOrmMappedSuperclass(parent);
-	}
-
-	public String getKey() {
-		return MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmNullAttributeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmNullAttributeMappingProvider.java
deleted file mode 100644
index 1ea615a7ee..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmNullAttributeMappingProvider.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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-
-public class OrmNullAttributeMappingProvider implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmNullAttributeMappingProvider INSTANCE = new OrmNullAttributeMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private OrmNullAttributeMappingProvider() {
-		super();
-	}
-
-	public String getKey() {
-		return MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public OrmAttributeMapping buildAttributeMapping(JpaFactory factory, OrmPersistentAttribute parent) {
-		return factory.buildOrmNullAttributeMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmOneToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmOneToManyMappingProvider.java
deleted file mode 100644
index 0ec7805f0b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmOneToManyMappingProvider.java
+++ /dev/null
@@ -1,44 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmOneToManyMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-
-public class OrmOneToManyMappingProvider implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmOneToManyMappingProvider INSTANCE = new OrmOneToManyMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private OrmOneToManyMappingProvider() {
-		super();
-	}
-	
-	public String getKey() {
-		return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public OrmOneToManyMapping buildAttributeMapping(JpaFactory factory, OrmPersistentAttribute parent) {
-		return factory.buildOrmOneToManyMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmOneToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmOneToOneMappingProvider.java
deleted file mode 100644
index 6b600fa27e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmOneToOneMappingProvider.java
+++ /dev/null
@@ -1,44 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmOneToOneMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-
-public class OrmOneToOneMappingProvider implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmOneToOneMappingProvider INSTANCE = new OrmOneToOneMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private OrmOneToOneMappingProvider() {
-		super();
-	}
-	
-	public String getKey() {
-		return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public OrmOneToOneMapping buildAttributeMapping(JpaFactory factory, OrmPersistentAttribute parent) {
-		return factory.buildOrmOneToOneMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmTransientMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmTransientMappingProvider.java
deleted file mode 100644
index c3197b3dcd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmTransientMappingProvider.java
+++ /dev/null
@@ -1,44 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmTransientMapping;
-
-public class OrmTransientMappingProvider implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmTransientMappingProvider INSTANCE = new OrmTransientMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private OrmTransientMappingProvider() {
-		super();
-	}
-	
-	public String getKey() {
-		return MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public OrmTransientMapping buildAttributeMapping(JpaFactory factory, OrmPersistentAttribute parent) {
-		return factory.buildOrmTransientMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmVersionMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmVersionMappingProvider.java
deleted file mode 100644
index 50ac6eaa2b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmVersionMappingProvider.java
+++ /dev/null
@@ -1,44 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmVersionMapping;
-
-public class OrmVersionMappingProvider implements OrmAttributeMappingProvider
-{
-	// singleton
-	private static final OrmVersionMappingProvider INSTANCE = new OrmVersionMappingProvider();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private OrmVersionMappingProvider() {
-		super();
-	}
-	
-	public String getKey() {
-		return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public OrmVersionMapping buildAttributeMapping(JpaFactory factory, OrmPersistentAttribute parent) {
-		return factory.buildOrmVersionMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmXmlImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmXmlImpl.java
deleted file mode 100644
index 3153f0fcfc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmXmlImpl.java
+++ /dev/null
@@ -1,170 +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.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.context.orm.EntityMappings;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.orm.OrmXml;
-import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults;
-import org.eclipse.jpt.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.OrmResource;
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class OrmXmlImpl extends AbstractOrmJpaContextNode
-	implements OrmXml
-{
-	protected OrmResource ormResource;
-	
-	protected EntityMappings entityMappings;
-	
-	
-	public OrmXmlImpl(MappingFileRef parent, OrmResource ormResource) {
-		super(parent);
-		this.initialize(ormResource);
-	}
-	
-	@Override
-	public MappingFileRef getParent() {
-		return (MappingFileRef) super.getParent();
-	}
-	
-	public String getId() {
-		// isn't actually displayed, so needs no details page
-		return null;
-	}
-	
-	public OrmPersistentType getPersistentType(String fullyQualifiedTypeName) {
-		if (getEntityMappings() != null) {
-			return getEntityMappings().getPersistentType(fullyQualifiedTypeName);
-		}
-		return null;
-	}
-	
-	@Override
-	public IResource getResource() {
-		return ormResource.getFile();
-	}
-	
-	// **************** persistence ********************************************
-	
-	@Override
-	public EntityMappings getEntityMappings() {
-		return this.entityMappings;
-	}
-	
-	protected void setEntityMappings(EntityMappings newEntityMappings) {
-		EntityMappings oldEntityMappings = this.entityMappings;
-		this.entityMappings = newEntityMappings;
-		firePropertyChanged(ENTITY_MAPPINGS_PROPERTY, oldEntityMappings, newEntityMappings);
-	}
-
-	public EntityMappings addEntityMappings() {
-		if (this.entityMappings != null) {
-			throw new IllegalStateException();
-		}
-		
-		XmlEntityMappings xmlEntityMappings = OrmFactory.eINSTANCE.createXmlEntityMappings();
-		this.entityMappings = buildEntityMappings(xmlEntityMappings);
-		this.ormResource.getContents().add(xmlEntityMappings);
-		firePropertyChanged(ENTITY_MAPPINGS_PROPERTY, null, this.entityMappings);
-		return this.entityMappings;
-	}
-	
-	public void removeEntityMappings() {
-		if (this.entityMappings == null) {
-			throw new IllegalStateException();
-		}
-		this.entityMappings.dispose();
-		EntityMappings oldEntityMappings = this.entityMappings;
-		
-		this.entityMappings = null;
-		XmlEntityMappings xmlEntityMappings = this.ormResource.getEntityMappings(); //TODO helper removeEntityMappings method on ormResource??
-		this.ormResource.getContents().remove(xmlEntityMappings);
-		firePropertyChanged(ENTITY_MAPPINGS_PROPERTY, oldEntityMappings, null);
-	}
-	
-	public PersistenceUnitDefaults getPersistenceUnitDefaults() {
-		if (getEntityMappings() != null) {
-			return getEntityMappings().getPersistenceUnitDefaults();
-		}
-		return null;
-	}
-	// **************** updating ***********************************************
-	
-	protected void initialize(OrmResource ormResource) {
-		this.ormResource = ormResource;
-		if (ormResource.getEntityMappings() != null) {
-			this.entityMappings = buildEntityMappings(ormResource.getEntityMappings());
-		}
-	}
-
-	public void update(OrmResource ormResource) {
-		this.ormResource = ormResource;
-		if (ormResource.getEntityMappings() != null) {
-			if (this.entityMappings != null) {
-				this.entityMappings.update(ormResource.getEntityMappings());
-			}
-			else {
-				setEntityMappings(buildEntityMappings(ormResource.getEntityMappings()));
-			}
-		}
-		else {
-			if (getEntityMappings() != null) {
-				getEntityMappings().dispose();
-			}
-			setEntityMappings(null);
-		}
-	}
-	
-	protected EntityMappings buildEntityMappings(XmlEntityMappings xmlEntityMappings) {
-		return getJpaFactory().buildEntityMappings(this, xmlEntityMappings);
-	}
-	
-	
-	// *************************************************************************
-	
-	public JpaStructureNode getStructureNode(int textOffset) {
-		if (entityMappings.containsOffset(textOffset)) {
-			return entityMappings.getStructureNode(textOffset);
-		}
-		return this;
-	}
-	
-	// never actually selected
-	public TextRange getSelectionTextRange() {
-		return TextRange.Empty.instance();
-	}
-	
-	public TextRange getValidationTextRange() {
-		return TextRange.Empty.instance();
-	}
-	
-	
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		if (getEntityMappings() != null) {
-			getEntityMappings().addToMessages(messages);
-		}
-	}
-	
-	public void dispose() {
-		if (getEntityMappings() != null) {
-			getEntityMappings().dispose();
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualCascadeType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualCascadeType.java
deleted file mode 100644
index b5f5c117d7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualCascadeType.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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.Cascade;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.CascadeType;
-
-public class VirtualCascadeType extends AbstractJpaEObject implements CascadeType
-{
-	Cascade javaCascade;
-
-	protected boolean metadataComplete;
-	
-	public VirtualCascadeType(Cascade javaCascade, boolean metadataComplete) {
-		super();
-		this.javaCascade = javaCascade;
-		this.metadataComplete = metadataComplete;
-	}
-
-	public void update(Cascade javaCascade) {
-		this.javaCascade = javaCascade;
-	}
-
-	public boolean isCascadeAll() {
-		if (this.metadataComplete) {
-			return false;
-		}
-		return this.javaCascade.isAll();
-	}
-
-	public void setCascadeAll(boolean value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public boolean isCascadeMerge() {
-		if (this.metadataComplete) {
-			return false;
-		}
-		return this.javaCascade.isMerge();
-	}
-
-	public void setCascadeMerge(boolean value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public boolean isCascadePersist() {
-		if (this.metadataComplete) {
-			return false;
-		}
-		return this.javaCascade.isPersist();
-	}
-
-	public void setCascadePersist(boolean value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public boolean isCascadeRefresh() {
-		if (this.metadataComplete) {
-			return false;
-		}
-		return this.javaCascade.isRefresh();
-	}
-
-	public void setCascadeRefresh(boolean value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public boolean isCascadeRemove() {
-		if (this.metadataComplete) {
-			return false;
-		}
-		return this.javaCascade.isRemove();
-	}
-
-	public void setCascadeRemove(boolean value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualMapKey.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualMapKey.java
deleted file mode 100644
index f354af95fe..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualMapKey.java
+++ /dev/null
@@ -1,42 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.java.JavaMultiRelationshipMapping;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.MapKey;
-
-public class VirtualMapKey extends AbstractJpaEObject implements MapKey
-{
-	JavaMultiRelationshipMapping javaMultiRelationshipMapping;
-
-	protected boolean metadataComplete;
-	
-	public VirtualMapKey(JavaMultiRelationshipMapping javaMultiRelationshipMapping, boolean metadataComplete) {
-		super();
-		this.javaMultiRelationshipMapping = javaMultiRelationshipMapping;
-		this.metadataComplete = metadataComplete;
-	}
-
-	public String getName() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaMultiRelationshipMapping.getMapKey();
-	}
-
-	public void setName(String newName) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public void update(JavaMultiRelationshipMapping javaMultiRelationshipMapping) {
-		this.javaMultiRelationshipMapping = javaMultiRelationshipMapping;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlAttributeOverride.java
deleted file mode 100644
index 7618d713d0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlAttributeOverride.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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
-import org.eclipse.jpt.core.resource.orm.XmlColumn;
-
-public class VirtualXmlAttributeOverride extends AbstractJpaEObject implements XmlAttributeOverride
-{
-
-	protected String name;
-	
-	protected final XmlColumn column;
-
-	protected VirtualXmlAttributeOverride(String name, XmlColumn xmlColumn) {
-		super();
-		this.name = name;
-		this.column = xmlColumn;
-	}
-	
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-
-	public XmlColumn getColumn() {
-		return this.column;
-	}
-
-	public void setColumn(XmlColumn value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlBasic.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlBasic.java
deleted file mode 100644
index 9ac0ae3828..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlBasic.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.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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.EnumType;
-import org.eclipse.jpt.core.resource.orm.FetchType;
-import org.eclipse.jpt.core.resource.orm.TemporalType;
-import org.eclipse.jpt.core.resource.orm.XmlBasic;
-import org.eclipse.jpt.core.resource.orm.XmlColumn;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * VirtualBasic is an implementation of Basic used when there is 
- * no tag in the orm.xml and an underlying javaBasicMapping exists.
- */
-public class VirtualXmlBasic extends AbstractJpaEObject implements XmlBasic
-{
-	JavaBasicMapping javaBasicMapping;
-
-	protected final VirtualXmlColumn column;
-
-	protected boolean metadataComplete;
-		
-	public VirtualXmlBasic(OrmTypeMapping ormTypeMapping, JavaBasicMapping javaBasicMapping, boolean metadataComplete) {
-		super();
-		this.javaBasicMapping = javaBasicMapping;
-		this.metadataComplete = metadataComplete;
-		this.column = new VirtualXmlColumn(ormTypeMapping, javaBasicMapping.getColumn(), metadataComplete);
-	}
-
-	public String getName() {
-		return this.javaBasicMapping.getPersistentAttribute().getName();
-	}
-
-	public void setName(String newName) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public XmlColumn getColumn() {
-		return this.column;
-	}
-
-	public void setColumn(XmlColumn value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public FetchType getFetch() {
-		if (this.metadataComplete) {
-			return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaBasicMapping.getDefaultFetch());
-		}
-		return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaBasicMapping.getFetch());
-	}
-
-	public void setFetch(FetchType newFetch) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public Boolean getOptional() {
-		if (this.metadataComplete) {
-			return this.javaBasicMapping.getDefaultOptional();
-		}
-		return this.javaBasicMapping.getOptional();
-	}
-
-	public void setOptional(Boolean newOptional) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public boolean isLob() {
-		if (this.metadataComplete) {
-			return false;
-		}
-		return this.javaBasicMapping.isLob();
-	}
-
-	public void setLob(boolean newLob) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public TemporalType getTemporal() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return org.eclipse.jpt.core.context.TemporalType.toOrmResourceModel(this.javaBasicMapping.getTemporal());
-	}
-
-	public void setTemporal(TemporalType newTemporal){
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public EnumType getEnumerated() {
-		if (this.metadataComplete) {
-			return org.eclipse.jpt.core.context.EnumType.toOrmResourceModel(this.javaBasicMapping.getDefaultEnumerated());
-		}
-		return org.eclipse.jpt.core.context.EnumType.toOrmResourceModel(this.javaBasicMapping.getEnumerated());
-	}
-
-	public void setEnumerated(EnumType newEnumerated) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-
-	public void update(JavaBasicMapping javaBasicMapping) {
-		this.javaBasicMapping = javaBasicMapping;
-		this.column.update(javaBasicMapping.getColumn());
-	}
-	
-	public TextRange getNameTextRange() {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlColumn.java
deleted file mode 100644
index 7c8dbce6ef..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlColumn.java
+++ /dev/null
@@ -1,168 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.Column;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.XmlColumn;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * A virtual column is used to represent the XmlColumn resource object
- * within a virtual mapping.  A virtual mapping is one which is not specified
- * in the orm.xml file, but is implied from the underlying java.  Virtual column
- * is not used when the mapping is specified in the orm.xml, but the column tag does not exist.
- * 
- * A virtual column delegates to the underlying java column for its state.  The metadataComplete
- * flag determines whether it will get specified or default information from the java column
- *
- */
-public class VirtualXmlColumn extends AbstractJpaEObject implements XmlColumn
-{
-	
-	protected Column column;
-
-	protected boolean metadataComplete;
-
-	protected OrmTypeMapping ormTypeMapping;
-	
-	
-	protected VirtualXmlColumn(OrmTypeMapping ormTypeMapping, Column column, boolean metadataComplete) {
-		super();
-		this.ormTypeMapping = ormTypeMapping;
-		this.column = column;
-		this.metadataComplete = metadataComplete;
-	}
-	
-	public String getColumnDefinition() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.column.getColumnDefinition();
-	}
-
-	public void setColumnDefinition(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public Boolean getInsertable() {
-		if (this.metadataComplete) {
-			return this.column.getDefaultInsertable();
-		}
-		return this.column.getInsertable();
-	}
-
-	public void setInsertable(Boolean value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public Integer getLength() {
-		if (this.metadataComplete) {
-			return this.column.getDefaultLength();
-		}
-		return this.column.getLength();
-	}
-
-	public void setLength(Integer value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public String getName() {
-		if (this.metadataComplete) {
-			return this.column.getDefaultName();
-		}
-		return this.column.getName();
-	}
-
-	public void setName(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public Boolean getNullable() {
-		if (this.metadataComplete) {
-			return this.column.getDefaultNullable();
-		}
-		return this.column.getNullable();
-	}
-
-	public void setNullable(Boolean value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public Integer getPrecision() {
-		if (this.metadataComplete) {
-			return this.column.getDefaultPrecision();
-		}
-		return this.column.getPrecision();
-	}
-
-	public void setPrecision(Integer value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public Integer getScale() {
-		if (this.metadataComplete) {
-			return this.column.getDefaultScale();
-		}
-		return this.column.getScale();
-	}
-
-	public void setScale(Integer value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public String getTable() {
-		if (!this.metadataComplete) {
-			if (this.column.getSpecifiedTable() != null) {
-				return this.column.getSpecifiedTable();
-			}	
-		}
-		return this.ormTypeMapping.getTableName();
-	}
-
-	public void setTable(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public Boolean getUnique() {
-		if (this.metadataComplete) {
-			return this.column.getDefaultUnique();
-		}
-		return this.column.getUnique();
-	}
-
-	public void setUnique(Boolean value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public Boolean getUpdatable() {
-		if (this.metadataComplete) {
-			return this.column.getDefaultUpdatable();
-		}
-		return this.column.getUpdatable();
-	}
-
-	public void setUpdatable(Boolean value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public void update(Column column) {
-		this.column = column;
-	}
-	
-	public TextRange getNameTextRange() {
-		return null;
-	}
-	
-	public TextRange getTableTextRange() {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlEmbedded.java
deleted file mode 100644
index 2e144ba5b1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlEmbedded.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.core.internal.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.jpt.core.context.java.JavaAttributeOverride;
-import org.eclipse.jpt.core.context.java.JavaEmbeddedMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
-import org.eclipse.jpt.core.resource.orm.XmlColumn;
-import org.eclipse.jpt.core.resource.orm.XmlEmbedded;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-
-/**
- * VirtualEmbedded is an implementation of Embedded used when there is 
- * no tag in the orm.xml and an underlying javaEmbeddedMapping exists.
- */
-public class VirtualXmlEmbedded extends AbstractJpaEObject implements XmlEmbedded
-{
-	JavaEmbeddedMapping javaEmbeddedMapping;
-
-	protected boolean metadataComplete;
-	
-	protected OrmTypeMapping ormTypeMapping;
-	
-	public VirtualXmlEmbedded(OrmTypeMapping ormTypeMapping, JavaEmbeddedMapping javaEmbeddedMapping, boolean metadataComplete) {
-		super();
-		this.ormTypeMapping = ormTypeMapping;
-		this.javaEmbeddedMapping = javaEmbeddedMapping;
-		this.metadataComplete = metadataComplete;
-	}
-		
-	public String getName() {
-		return this.javaEmbeddedMapping.getPersistentAttribute().getName();
-	}
-
-	public void setName(String newName) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public EList<XmlAttributeOverride> getAttributeOverrides() {
-		EList<XmlAttributeOverride> attributeOverrides = new EObjectContainmentEList<XmlAttributeOverride>(XmlAttributeOverride.class, this, OrmPackage.XML_EMBEDDED__ATTRIBUTE_OVERRIDES);
-		ListIterator<JavaAttributeOverride> javaAttributeOverrides;
-		if (!this.metadataComplete) {
-			javaAttributeOverrides = this.javaEmbeddedMapping.attributeOverrides();
-		}
-		else {
-			javaAttributeOverrides = this.javaEmbeddedMapping.virtualAttributeOverrides();
-		}
-		for (JavaAttributeOverride javaAttributeOverride : CollectionTools.iterable(javaAttributeOverrides)) {
-			XmlColumn xmlColumn = new VirtualXmlColumn(this.ormTypeMapping, javaAttributeOverride.getColumn(), this.metadataComplete);
-			XmlAttributeOverride xmlAttributeOverride = new VirtualXmlAttributeOverride(javaAttributeOverride.getName(), xmlColumn);
-			attributeOverrides.add(xmlAttributeOverride);
-		}
-		return attributeOverrides;
-	}
-
-	public void update(JavaEmbeddedMapping javaEmbeddedMapping) {
-		this.javaEmbeddedMapping = javaEmbeddedMapping;
-	}
-
-	public TextRange getNameTextRange() {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlEmbeddedId.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlEmbeddedId.java
deleted file mode 100644
index 8b1a6f6dc7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlEmbeddedId.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.core.internal.context.orm;
-
-import java.util.ListIterator;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.jpt.core.context.java.JavaAttributeOverride;
-import org.eclipse.jpt.core.context.java.JavaEmbeddedIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
-import org.eclipse.jpt.core.resource.orm.XmlColumn;
-import org.eclipse.jpt.core.resource.orm.XmlEmbeddedId;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-
-/**
- * VirtualEmbeddedId is an implementation of EmbeddedId used when there is 
- * no tag in the orm.xml and an underlying javaEmbeddedIdMapping exists.
- */
-public class VirtualXmlEmbeddedId extends AbstractJpaEObject implements XmlEmbeddedId
-{
-	JavaEmbeddedIdMapping javaEmbeddedIdMapping;
-
-	protected boolean metadataComplete;
-	
-	protected OrmTypeMapping ormTypeMapping;
-	
-	public VirtualXmlEmbeddedId(OrmTypeMapping ormTypeMapping, JavaEmbeddedIdMapping javaEmbeddedIdMapping, boolean metadataComplete) {
-		super();
-		this.ormTypeMapping = ormTypeMapping;
-		this.javaEmbeddedIdMapping = javaEmbeddedIdMapping;
-		this.metadataComplete = metadataComplete;
-	}
-	
-	public String getName() {
-		return this.javaEmbeddedIdMapping.getPersistentAttribute().getName();
-	}
-
-	public void setName(String newName) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public EList<XmlAttributeOverride> getAttributeOverrides() {
-		EList<XmlAttributeOverride> attributeOverrides = new EObjectContainmentEList<XmlAttributeOverride>(XmlAttributeOverride.class, this, OrmPackage.XML_EMBEDDED_ID__ATTRIBUTE_OVERRIDES);
-		ListIterator<JavaAttributeOverride> javaAttributeOverrides;
-		if (!this.metadataComplete) {
-			javaAttributeOverrides = this.javaEmbeddedIdMapping.attributeOverrides();
-		}
-		else {
-			javaAttributeOverrides = this.javaEmbeddedIdMapping.virtualAttributeOverrides();
-		}
-		for (JavaAttributeOverride javaAttributeOverride : CollectionTools.iterable(javaAttributeOverrides)) {
-			XmlColumn xmlColumn = new VirtualXmlColumn(this.ormTypeMapping, javaAttributeOverride.getColumn(), this.metadataComplete);
-			XmlAttributeOverride xmlAttributeOverride = new VirtualXmlAttributeOverride(javaAttributeOverride.getName(), xmlColumn);
-			attributeOverrides.add(xmlAttributeOverride);
-		}
-		return attributeOverrides;
-	}
-
-	public void update(JavaEmbeddedIdMapping javaEmbeddedIdMapping) {
-		this.javaEmbeddedIdMapping = javaEmbeddedIdMapping;
-	}
-
-	public TextRange getNameTextRange() {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlGeneratedValue.java
deleted file mode 100644
index ba814d42c6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlGeneratedValue.java
+++ /dev/null
@@ -1,61 +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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.java.JavaGeneratedValue;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.GenerationType;
-import org.eclipse.jpt.core.resource.orm.XmlGeneratedValue;
-import org.eclipse.jpt.core.utility.TextRange;
-
-public class VirtualXmlGeneratedValue extends AbstractJpaEObject implements XmlGeneratedValue
-{
-	JavaGeneratedValue javaGeneratedValue;
-
-	protected boolean metadataComplete;
-	
-		
-	public VirtualXmlGeneratedValue(JavaGeneratedValue javaGeneratedValue, boolean metadataComplete) {
-		super();
-		this.javaGeneratedValue = javaGeneratedValue;
-		this.metadataComplete = metadataComplete;
-	}
-
-
-	public String getGenerator() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaGeneratedValue.getGenerator();
-	}
-
-	public GenerationType getStrategy() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return org.eclipse.jpt.core.context.GenerationType.toOrmResourceModel(this.javaGeneratedValue.getStrategy());
-	}
-
-	public void setGenerator(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public void setStrategy(GenerationType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public TextRange getGeneratorTextRange() {
-		return null;
-	}
-
-	public void update(JavaGeneratedValue javaGeneratedValue) {
-		this.javaGeneratedValue = javaGeneratedValue;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlId.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlId.java
deleted file mode 100644
index 308ce8b5e7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlId.java
+++ /dev/null
@@ -1,136 +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.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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.TemporalType;
-import org.eclipse.jpt.core.resource.orm.XmlColumn;
-import org.eclipse.jpt.core.resource.orm.XmlGeneratedValue;
-import org.eclipse.jpt.core.resource.orm.XmlId;
-import org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator;
-import org.eclipse.jpt.core.resource.orm.XmlTableGenerator;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * VirtualId is an implementation of Id used when there is 
- * no tag in the orm.xml and an underlying javaIdMapping exists.
- */
-public class VirtualXmlId extends AbstractJpaEObject implements XmlId
-{
-	JavaIdMapping javaIdMapping;
-
-	protected boolean metadataComplete;
-
-	protected final VirtualXmlColumn column;
-
-	protected final VirtualXmlGeneratedValue virtualGeneratedValue;
-	
-	protected final VirtualXmlTableGenerator virtualTableGenerator;
-	
-	protected final VirtualXmlSequenceGenerator virtualSequenceGenerator;
-	
-
-		
-	public VirtualXmlId(OrmTypeMapping ormTypeMapping, JavaIdMapping javaIdMapping, boolean metadataComplete) {
-		super();
-		this.javaIdMapping = javaIdMapping;
-		this.metadataComplete = metadataComplete;
-		this.column = new VirtualXmlColumn(ormTypeMapping, javaIdMapping.getColumn(), metadataComplete);
-		this.virtualGeneratedValue = new VirtualXmlGeneratedValue(javaIdMapping.getGeneratedValue(), metadataComplete);
-		this.virtualTableGenerator = new VirtualXmlTableGenerator(javaIdMapping.getTableGenerator(), metadataComplete);
-		this.virtualSequenceGenerator = new VirtualXmlSequenceGenerator(javaIdMapping.getSequenceGenerator(), metadataComplete);
-	}
-
-	public String getName() {
-		return this.javaIdMapping.getPersistentAttribute().getName();
-	}
-
-	public void setName(String newName) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public XmlColumn getColumn() {
-		return this.column;
-	}
-
-	public void setColumn(XmlColumn value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public TemporalType getTemporal() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return org.eclipse.jpt.core.context.TemporalType.toOrmResourceModel(this.javaIdMapping.getTemporal());
-	}
-
-	public void setTemporal(TemporalType newTemporal){
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-
-	public XmlGeneratedValue getGeneratedValue() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		if (this.javaIdMapping.getGeneratedValue() != null) {
-			return this.virtualGeneratedValue;
-		}
-		return null;
-	}
-	
-	public void setGeneratedValue(XmlGeneratedValue value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");		
-	}
-
-	public XmlSequenceGenerator getSequenceGenerator() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		if (this.javaIdMapping.getSequenceGenerator() != null) {
-			return this.virtualSequenceGenerator;
-		}
-		return null;
-	}
-
-	public void setSequenceGenerator(XmlSequenceGenerator value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");		
-	}
-
-	public XmlTableGenerator getTableGenerator() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		if (this.javaIdMapping.getTableGenerator() != null) {
-			return this.virtualTableGenerator;
-		}
-		return null;
-	}
-
-	public void setTableGenerator(XmlTableGenerator value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");		
-	}
-	
-
-	public void update(JavaIdMapping javaIdMapping) {
-		this.javaIdMapping = javaIdMapping;
-		this.column.update(javaIdMapping.getColumn());
-		this.virtualGeneratedValue.update(javaIdMapping.getGeneratedValue());
-		this.virtualTableGenerator.update(javaIdMapping.getTableGenerator());
-		this.virtualSequenceGenerator.update(javaIdMapping.getSequenceGenerator());
-	}
-	
-	public TextRange getNameTextRange() {
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlJoinColumn.java
deleted file mode 100644
index 60505b096e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlJoinColumn.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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.java.JavaJoinColumn;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
-import org.eclipse.jpt.core.utility.TextRange;
-
-public class VirtualXmlJoinColumn extends AbstractJpaEObject implements XmlJoinColumn
-{	
-	protected JavaJoinColumn javaJoinColumn;
-
-	protected boolean metadataComplete;
-
-	protected VirtualXmlJoinColumn(JavaJoinColumn javaJoinColumn, boolean metadataComplete) {
-		super();
-		this.javaJoinColumn = javaJoinColumn;
-		this.metadataComplete = metadataComplete;
-	}
-	
-	public String getColumnDefinition() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaJoinColumn.getColumnDefinition();
-	}
-
-	public void setColumnDefinition(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public Boolean getInsertable() {
-		if (this.metadataComplete) {
-			return this.javaJoinColumn.getDefaultInsertable();
-		}
-		return this.javaJoinColumn.getInsertable();
-	}
-
-	public void setInsertable(Boolean value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public String getName() {
-		if (this.metadataComplete) {
-			return this.javaJoinColumn.getDefaultName();
-		}
-		return this.javaJoinColumn.getName();
-	}
-
-	public void setName(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public String getReferencedColumnName() {
-		if (this.metadataComplete) {
-			return this.javaJoinColumn.getDefaultReferencedColumnName();
-		}
-		return this.javaJoinColumn.getReferencedColumnName();
-	}
-
-	public void setReferencedColumnName(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public Boolean getNullable() {
-		if (this.metadataComplete) {
-			return this.javaJoinColumn.getDefaultNullable();
-		}
-		return this.javaJoinColumn.getNullable();
-	}
-
-	public void setNullable(Boolean value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public String getTable() {
-		if (this.metadataComplete) {
-			return this.javaJoinColumn.getDefaultTable();
-		}
-		return this.javaJoinColumn.getTable();
-	}
-
-	public void setTable(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public Boolean getUnique() {
-		if (this.metadataComplete) {
-			return this.javaJoinColumn.getDefaultUnique();
-		}
-		return this.javaJoinColumn.getUnique();
-	}
-
-	public void setUnique(Boolean value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public Boolean getUpdatable() {
-		if (this.metadataComplete) {
-			return this.javaJoinColumn.getDefaultUpdatable();
-		}
-		return this.javaJoinColumn.getUpdatable();
-	}
-
-	public void setUpdatable(Boolean value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public void update(JavaJoinColumn javaJoinColumn) {
-		this.javaJoinColumn = javaJoinColumn;
-	}
-
-	public TextRange getNameTextRange() {
-		return null;
-	}
-	
-	public TextRange getTableTextRange() {
-		return null;
-	}
-	
-	public TextRange getReferencedColumnNameTextRange() {
-		return null;
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlJoinTable.java
deleted file mode 100644
index 9275d0a514..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlJoinTable.java
+++ /dev/null
@@ -1,135 +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.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.java.JavaJoinTable;
-import org.eclipse.jpt.core.context.java.JavaUniqueConstraint;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.context.orm.OrmRelationshipMapping;
-import org.eclipse.jpt.core.internal.context.MappingTools;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
-import org.eclipse.jpt.core.resource.orm.XmlJoinTable;
-import org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-
-public class VirtualXmlJoinTable extends AbstractJpaEObject implements XmlJoinTable
-{
-	
-	protected JavaJoinTable javaJoinTable;
-
-	protected boolean metadataComplete;
-
-	protected OrmPersistentAttribute ormPersistentAttribute;
-	
-
-	protected VirtualXmlJoinTable(OrmPersistentAttribute ormPersistentAttribute, JavaJoinTable javaJoinTable, boolean metadataComplete) {
-		super();
-		this.ormPersistentAttribute = ormPersistentAttribute;
-		this.javaJoinTable = javaJoinTable;
-		this.metadataComplete = metadataComplete;
-	}
-
-	protected OrmRelationshipMapping ormRelationshipMapping() {
-		return (OrmRelationshipMapping) this.ormPersistentAttribute.getMapping();
-	}
-	
-	public String getName() {
-		if (!this.metadataComplete) {
-			if (this.javaJoinTable.getSpecifiedName() != null) {
-				return this.javaJoinTable.getSpecifiedName();
-			}	
-		}
-		return MappingTools.buildJoinTableDefaultName(ormRelationshipMapping());
-	}
-
-	public void setName(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public String getCatalog() {
-		if (this.metadataComplete) {
-			return this.javaJoinTable.getDefaultCatalog();
-		}
-		return this.javaJoinTable.getCatalog();
-	}
-
-	public void setCatalog(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public String getSchema() {
-		if (this.metadataComplete) {
-			return this.javaJoinTable.getDefaultSchema();
-		}
-		return this.javaJoinTable.getSchema();
-	}
-
-	public void setSchema(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	//VirtualXmlJoinTable is rebuilt every time, so just rebuilding the joinColumns list as well
-	public EList<XmlJoinColumn> getJoinColumns() {
-		EList<XmlJoinColumn> joinColumns = new EObjectContainmentEList<XmlJoinColumn>(XmlJoinColumn.class, this, OrmPackage.XML_JOIN_TABLE__JOIN_COLUMNS);
-		for (JavaJoinColumn joinColumn : CollectionTools.iterable(this.javaJoinTable.specifiedJoinColumns())) {
-			XmlJoinColumn xmlJoinColumn = new VirtualXmlJoinColumn(joinColumn, this.metadataComplete);
-			joinColumns.add(xmlJoinColumn);
-		}
-		return joinColumns;
-	}
-	
-	//VirtualXmlJoinTable is rebuilt every time, so just rebuilding the joinColumns list as well
-	public EList<XmlJoinColumn> getInverseJoinColumns() {
-		EList<XmlJoinColumn> inverseJoinColumns = new EObjectContainmentEList<XmlJoinColumn>(XmlJoinColumn.class, this, OrmPackage.XML_JOIN_TABLE__INVERSE_JOIN_COLUMNS);
-		for (JavaJoinColumn joinColumn : CollectionTools.iterable(this.javaJoinTable.specifiedInverseJoinColumns())) {
-			XmlJoinColumn xmlJoinColumn = new VirtualXmlJoinColumn(joinColumn, this.metadataComplete);
-			inverseJoinColumns.add(xmlJoinColumn);
-		}
-
-		return inverseJoinColumns;
-	}
-
-	public EList<XmlUniqueConstraint> getUniqueConstraints() {
-		EList<XmlUniqueConstraint> xmlUniqueConstraints = new EObjectContainmentEList<XmlUniqueConstraint>(XmlUniqueConstraint.class, this, OrmPackage.XML_JOIN_TABLE__UNIQUE_CONSTRAINTS);
-
-		for (JavaUniqueConstraint uniqueConstraint : CollectionTools.iterable(this.javaJoinTable.uniqueConstraints())) {
-			XmlUniqueConstraint xmlUniqueConstraint = new VirtualXmlUniqueConstraint(uniqueConstraint, this.metadataComplete);
-			xmlUniqueConstraints.add(xmlUniqueConstraint);
-		}
-
-		return xmlUniqueConstraints;
-	}
-	
-	public void update(JavaJoinTable javaJoinTable) {
-		this.javaJoinTable = javaJoinTable;
-	}
-	
-	public TextRange getNameTextRange() {
-		return null;
-	}
-	
-	public TextRange getCatalogTextRange() {
-		return null;
-	}
-	
-	public TextRange getSchemaTextRange() {
-		return null;
-	}
-
-	public boolean isSpecified() {
-		return this.javaJoinTable.isSpecified();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlManyToMany.java
deleted file mode 100644
index 3983e29227..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlManyToMany.java
+++ /dev/null
@@ -1,189 +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.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.OrmPersistentAttribute;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.CascadeType;
-import org.eclipse.jpt.core.resource.orm.FetchType;
-import org.eclipse.jpt.core.resource.orm.MapKey;
-import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
-import org.eclipse.jpt.core.resource.orm.XmlJoinTable;
-import org.eclipse.jpt.core.resource.orm.XmlManyToMany;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * VirtualManyToMany is an implementation of ManyToMany used when there is 
- * no tag in the orm.xml and an underlying javaManyToManyMapping exists.
- */
-public class VirtualXmlManyToMany extends AbstractJpaEObject implements XmlManyToMany
-{
-	JavaManyToManyMapping javaManyToManyMapping;
-
-	protected boolean metadataComplete;
-	
-	protected final VirtualXmlJoinTable virtualJoinTable;
-	
-	protected final VirtualCascadeType virtualCascadeType;
-	
-	protected final MapKey mapKey;
-	
-	//TODO joinColumns not yet supported in the context model
-//	protected EList<JoinColumn> virtualJoinColumns;
-
-	public VirtualXmlManyToMany(OrmPersistentAttribute ormPersistentAttribute, JavaManyToManyMapping javaManyToManyMapping, boolean metadataComplete) {
-		super();
-		this.javaManyToManyMapping = javaManyToManyMapping;
-		this.metadataComplete = metadataComplete;
-//		this.initializeJoinColumns(javaOneToManyMapping);
-		this.virtualCascadeType = new VirtualCascadeType(javaManyToManyMapping.getCascade(), this.metadataComplete);
-		this.virtualJoinTable = new VirtualXmlJoinTable(ormPersistentAttribute, javaManyToManyMapping.getJoinTable(), metadataComplete);
-		this.mapKey = new VirtualMapKey(javaManyToManyMapping, metadataComplete);
-	}
-	
-//	protected void initializeJoinColumns(IJavaOneToManyMapping javaOneToManyMapping) {
-//		this.virtualJoinColumns = new BasicEList<JoinColumn>();
-//		ListIterator<IJavaJoinColumn> javaJoinColumns;
-//		if (this.metadataComplete) {
-//			javaJoinColumns = this.javaOneToManyMapping.defaultJoinColumns();
-//		}
-//		else {
-//			javaJoinColumns = this.javaOneToManyMapping.joinColumns();			
-//		}
-//		
-//		while (javaJoinColumns.hasNext()) {
-//			this.virtualJoinColumns.add(new VirtualJoinColumn(javaJoinColumns.next(), this.metadataComplete));
-//		}
-//	}
-	
-	public String getName() {
-		return this.javaManyToManyMapping.getPersistentAttribute().getName();
-	}
-
-	public void setName(String newName) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public FetchType getFetch() {
-		if (this.metadataComplete) {
-			return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaManyToManyMapping.getDefaultFetch());
-		}
-		return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaManyToManyMapping.getFetch());
-	}
-
-	public void setFetch(FetchType newFetch) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public EList<XmlJoinColumn> getJoinColumns() {
-		return null;
-	}
-
-	public CascadeType getCascade() {
-		return this.virtualCascadeType;
-	}
-	
-	public void setCascade(CascadeType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public XmlJoinTable getJoinTable() {
-		return this.virtualJoinTable;
-	}
-
-	public void setJoinTable(XmlJoinTable value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public String getTargetEntity() {
-		if (this.metadataComplete) {
-			return this.javaManyToManyMapping.getDefaultTargetEntity();
-		}
-		return this.javaManyToManyMapping.getTargetEntity();
-	}
-
-	public void setTargetEntity(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public String getMappedBy() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaManyToManyMapping.getMappedBy();
-	}
-	
-	public void setMappedBy(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	
-	public MapKey getMapKey() {
-		return this.mapKey;
-	}
-	
-	public void setMapKey(MapKey value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public String getOrderBy() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaManyToManyMapping.getOrderBy();
-	}
-	
-	public void setOrderBy(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public void update(JavaManyToManyMapping javaManyToManyMapping) {
-		this.javaManyToManyMapping = javaManyToManyMapping;
-		this.virtualCascadeType.update(javaManyToManyMapping.getCascade());
-		this.virtualJoinTable.update(javaManyToManyMapping.getJoinTable());
-//		this.updateJoinColumns(javaOneToManyMapping);
-	}
-	
-//	protected void updateJoinColumns(IJavaOneToManyMapping javaOneToManyMapping) {
-//		ListIterator<IJavaJoinColumn> javaJoinColumns;
-//		ListIterator<JoinColumn> virtualJoinColumns = this.virtualJoinColumns.listIterator();
-//		if (this.metadataComplete) {
-//			javaJoinColumns = this.javaOneToManyMapping.defaultJoinColumns();
-//		}
-//		else {
-//			javaJoinColumns = this.javaOneToManyMapping.joinColumns();			
-//		}
-//		
-//		while (javaJoinColumns.hasNext()) {
-//			IJavaJoinColumn javaJoinColumn = javaJoinColumns.next();
-//			if (virtualJoinColumns.hasNext()) {
-//				VirtualJoinColumn virtualJoinColumn = (VirtualJoinColumn) virtualJoinColumns.next();
-//				virtualJoinColumn.update(javaJoinColumn);
-//			}
-//			else {
-//				this.virtualJoinColumns.add(new VirtualJoinColumn(javaJoinColumn, this.metadataComplete));
-//			}
-//		}
-//		
-//		while(virtualJoinColumns.hasNext()) {
-//			this.virtualJoinColumns.remove(virtualJoinColumns.next());
-//		}
-//	}
-	
-	public TextRange getNameTextRange() {
-		return null;
-	}
-
-	public TextRange getMappedByTextRange() {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlManyToOne.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlManyToOne.java
deleted file mode 100644
index 349ec76333..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlManyToOne.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.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.java.JavaManyToOneMapping;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.CascadeType;
-import org.eclipse.jpt.core.resource.orm.FetchType;
-import org.eclipse.jpt.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
-import org.eclipse.jpt.core.resource.orm.XmlJoinTable;
-import org.eclipse.jpt.core.resource.orm.XmlManyToOne;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-
-/**
- * VirtualManyToOne is an implementation of ManyToOne used when there is 
- * no tag in the orm.xml and an underlying javaManyToOneMapping exists.
- */
-public class VirtualXmlManyToOne extends AbstractJpaEObject implements XmlManyToOne
-{
-	JavaManyToOneMapping javaManyToOneMapping;
-
-	protected boolean metadataComplete;
-	
-//	protected VirtualJoinTable virtualJoinTable;
-	
-	protected final VirtualCascadeType virtualCascadeType;
-
-	public VirtualXmlManyToOne(JavaManyToOneMapping javaManyToOneMapping, boolean metadataComplete) {
-		super();
-		this.javaManyToOneMapping = javaManyToOneMapping;
-		this.metadataComplete = metadataComplete;
-		this.virtualCascadeType = new VirtualCascadeType(javaManyToOneMapping.getCascade(), this.metadataComplete);
-	}
-	
-	public String getName() {
-		return this.javaManyToOneMapping.getPersistentAttribute().getName();
-	}
-
-	public void setName(String newName) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public FetchType getFetch() {
-		if (this.metadataComplete) {
-			return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaManyToOneMapping.getDefaultFetch());
-		}
-		return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaManyToOneMapping.getFetch());
-	}
-
-	public void setFetch(FetchType newFetch) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public Boolean getOptional() {
-		if (this.metadataComplete) {
-			return this.javaManyToOneMapping.getDefaultOptional();
-		}
-		return this.javaManyToOneMapping.getOptional();
-	}
-
-	public void setOptional(Boolean newOptional) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public EList<XmlJoinColumn> getJoinColumns() {
-		EList<XmlJoinColumn> joinColumns = new EObjectContainmentEList<XmlJoinColumn>(XmlJoinColumn.class, this, OrmPackage.XML_JOIN_TABLE__JOIN_COLUMNS);
-		//TODO here i'm using joinColumns() while VirtualXmlJoinTable uses specifiedJoinColumns()???
-		for (JavaJoinColumn joinColumn : CollectionTools.iterable(this.javaManyToOneMapping.joinColumns())) {
-			XmlJoinColumn xmlJoinColumn = new VirtualXmlJoinColumn(joinColumn, this.metadataComplete);
-			joinColumns.add(xmlJoinColumn);
-		}
-		return joinColumns;
-	}
-
-	public CascadeType getCascade() {
-		return this.virtualCascadeType;
-	}
-	
-	public void setCascade(CascadeType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public XmlJoinTable getJoinTable() {
-		//TODO we don't yet support JoinTable in the context model for many-to-one mappings
-		return null;//this.virtualJoinTable;
-	}
-
-	public void setJoinTable(XmlJoinTable value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public String getTargetEntity() {
-		if (this.metadataComplete) {
-			return this.javaManyToOneMapping.getDefaultTargetEntity();
-		}
-		return this.javaManyToOneMapping.getTargetEntity();
-	}
-
-	public void setTargetEntity(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public void update(JavaManyToOneMapping javaManyToOneMapping) {
-		this.javaManyToOneMapping = javaManyToOneMapping;
-		this.virtualCascadeType.update(javaManyToOneMapping.getCascade());
-	}
-	
-	public TextRange getNameTextRange() {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlNullAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlNullAttributeMapping.java
deleted file mode 100644
index 7f63835d9a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlNullAttributeMapping.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.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.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * VirtualVersion is an implementation of Version used when there is 
- * no tag in the orm.xml and an underlying javaVersionMapping exists.
- */
-public class VirtualXmlNullAttributeMapping extends AbstractJpaEObject implements XmlNullAttributeMapping
-{
-	JavaAttributeMapping javaAttributeMapping;
-
-	protected boolean metadataComplete;
-	
-	public VirtualXmlNullAttributeMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, boolean metadataComplete) {
-		super();
-		this.javaAttributeMapping = javaAttributeMapping;
-		this.metadataComplete = metadataComplete;
-	}
-
-	public String getName() {
-		return this.javaAttributeMapping.getPersistentAttribute().getName();
-	}
-
-	public void setName(String newName) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public void update(JavaAttributeMapping javaAttributeMapping) {
-		this.javaAttributeMapping = javaAttributeMapping;
-	}
-	
-	public TextRange getNameTextRange() {
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlOneToMany.java
deleted file mode 100644
index 53469b4aba..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlOneToMany.java
+++ /dev/null
@@ -1,189 +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.core.internal.context.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.context.java.JavaOneToManyMapping;
-import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.CascadeType;
-import org.eclipse.jpt.core.resource.orm.FetchType;
-import org.eclipse.jpt.core.resource.orm.MapKey;
-import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
-import org.eclipse.jpt.core.resource.orm.XmlJoinTable;
-import org.eclipse.jpt.core.resource.orm.XmlOneToMany;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * VirtualOneToMany is an implementation of OneToMany used when there is 
- * no tag in the orm.xml and an underlying javaOneToManyMapping exists.
- */
-public class VirtualXmlOneToMany extends AbstractJpaEObject implements XmlOneToMany
-{
-	JavaOneToManyMapping javaOneToManyMapping;
-
-	protected boolean metadataComplete;
-	
-	protected final VirtualXmlJoinTable virtualJoinTable;
-	
-	protected final VirtualCascadeType virtualCascadeType;
-	
-	protected final MapKey mapKey;
-	
-	//TODO joinColumns not yet supported in the context model
-//	protected EList<JoinColumn> virtualJoinColumns;
-
-	public VirtualXmlOneToMany(OrmPersistentAttribute ormPersistentAttribute, JavaOneToManyMapping javaOneToManyMapping, boolean metadataComplete) {
-		super();
-		this.javaOneToManyMapping = javaOneToManyMapping;
-		this.metadataComplete = metadataComplete;
-//		this.initializeJoinColumns(javaOneToManyMapping);
-		this.virtualCascadeType = new VirtualCascadeType(javaOneToManyMapping.getCascade(), this.metadataComplete);
-		this.virtualJoinTable = new VirtualXmlJoinTable(ormPersistentAttribute, javaOneToManyMapping.getJoinTable(), metadataComplete);
-		this.mapKey = new VirtualMapKey(javaOneToManyMapping, metadataComplete);
-	}
-	
-//	protected void initializeJoinColumns(IJavaOneToManyMapping javaOneToManyMapping) {
-//		this.virtualJoinColumns = new BasicEList<JoinColumn>();
-//		ListIterator<IJavaJoinColumn> javaJoinColumns;
-//		if (this.metadataComplete) {
-//			javaJoinColumns = this.javaOneToManyMapping.defaultJoinColumns();
-//		}
-//		else {
-//			javaJoinColumns = this.javaOneToManyMapping.joinColumns();			
-//		}
-//		
-//		while (javaJoinColumns.hasNext()) {
-//			this.virtualJoinColumns.add(new VirtualJoinColumn(javaJoinColumns.next(), this.metadataComplete));
-//		}
-//	}
-	
-	public String getName() {
-		return this.javaOneToManyMapping.getPersistentAttribute().getName();
-	}
-
-	public void setName(String newName) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public FetchType getFetch() {
-		if (this.metadataComplete) {
-			return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaOneToManyMapping.getDefaultFetch());
-		}
-		return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaOneToManyMapping.getFetch());
-	}
-
-	public void setFetch(FetchType newFetch) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public EList<XmlJoinColumn> getJoinColumns() {
-		return null;
-	}
-
-	public CascadeType getCascade() {
-		return this.virtualCascadeType;
-	}
-	
-	public void setCascade(CascadeType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public XmlJoinTable getJoinTable() {
-		return this.virtualJoinTable;
-	}
-
-	public void setJoinTable(XmlJoinTable value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public String getTargetEntity() {
-		if (this.metadataComplete) {
-			return this.javaOneToManyMapping.getDefaultTargetEntity();
-		}
-		return this.javaOneToManyMapping.getTargetEntity();
-	}
-
-	public void setTargetEntity(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public String getMappedBy() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaOneToManyMapping.getMappedBy();
-	}
-	
-	public void setMappedBy(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	
-	public MapKey getMapKey() {
-		return this.mapKey;
-	}
-	
-	public void setMapKey(MapKey value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public String getOrderBy() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaOneToManyMapping.getOrderBy();
-	}
-	
-	public void setOrderBy(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public void update(JavaOneToManyMapping javaOneToManyMapping) {
-		this.javaOneToManyMapping = javaOneToManyMapping;
-		this.virtualCascadeType.update(javaOneToManyMapping.getCascade());
-		this.virtualJoinTable.update(javaOneToManyMapping.getJoinTable());
-//		this.updateJoinColumns(javaOneToManyMapping);
-	}
-	
-//	protected void updateJoinColumns(IJavaOneToManyMapping javaOneToManyMapping) {
-//		ListIterator<IJavaJoinColumn> javaJoinColumns;
-//		ListIterator<JoinColumn> virtualJoinColumns = this.virtualJoinColumns.listIterator();
-//		if (this.metadataComplete) {
-//			javaJoinColumns = this.javaOneToManyMapping.defaultJoinColumns();
-//		}
-//		else {
-//			javaJoinColumns = this.javaOneToManyMapping.joinColumns();			
-//		}
-//		
-//		while (javaJoinColumns.hasNext()) {
-//			IJavaJoinColumn javaJoinColumn = javaJoinColumns.next();
-//			if (virtualJoinColumns.hasNext()) {
-//				VirtualJoinColumn virtualJoinColumn = (VirtualJoinColumn) virtualJoinColumns.next();
-//				virtualJoinColumn.update(javaJoinColumn);
-//			}
-//			else {
-//				this.virtualJoinColumns.add(new VirtualJoinColumn(javaJoinColumn, this.metadataComplete));
-//			}
-//		}
-//		
-//		while(virtualJoinColumns.hasNext()) {
-//			this.virtualJoinColumns.remove(virtualJoinColumns.next());
-//		}
-//	}
-	
-	public TextRange getNameTextRange() {
-		return null;
-	}
-	
-	public TextRange getMappedByTextRange() {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlOneToOne.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlOneToOne.java
deleted file mode 100644
index b771b2b2c6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlOneToOne.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.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.java.JavaOneToOneMapping;
-import org.eclipse.jpt.core.context.java.JavaPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.CascadeType;
-import org.eclipse.jpt.core.resource.orm.FetchType;
-import org.eclipse.jpt.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
-import org.eclipse.jpt.core.resource.orm.XmlJoinTable;
-import org.eclipse.jpt.core.resource.orm.XmlOneToOne;
-import org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-
-/**
- * VirtualOneToOne is an implementation of OneToOne used when there is 
- * no tag in the orm.xml and an underlying javaOneToOneMapping exists.
- */
-public class VirtualXmlOneToOne extends AbstractJpaEObject implements XmlOneToOne
-{
-	JavaOneToOneMapping javaOneToOneMapping;
-
-	protected boolean metadataComplete;
-	
-//	protected VirtualJoinTable virtualJoinTable;
-		
-	protected final VirtualCascadeType virtualCascadeType;
-
-	public VirtualXmlOneToOne(JavaOneToOneMapping javaOneToOneMapping, boolean metadataComplete) {
-		super();
-		this.javaOneToOneMapping = javaOneToOneMapping;
-		this.metadataComplete = metadataComplete;
-		this.virtualCascadeType = new VirtualCascadeType(javaOneToOneMapping.getCascade(), this.metadataComplete);
-	}
-
-	public String getName() {
-		return this.javaOneToOneMapping.getPersistentAttribute().getName();
-	}
-
-	public void setName(String newName) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public FetchType getFetch() {
-		if (this.metadataComplete) {
-			return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaOneToOneMapping.getDefaultFetch());
-		}
-		return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaOneToOneMapping.getFetch());
-	}
-
-	public void setFetch(FetchType newFetch) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public Boolean getOptional() {
-		if (this.metadataComplete) {
-			return this.javaOneToOneMapping.getDefaultOptional();
-		}
-		return this.javaOneToOneMapping.getOptional();
-	}
-
-	public void setOptional(Boolean newOptional) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	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.javaOneToOneMapping.joinColumns())) {
-			XmlJoinColumn xmlJoinColumn = new VirtualXmlJoinColumn(joinColumn, this.metadataComplete);
-			joinColumns.add(xmlJoinColumn);
-		}
-		return joinColumns;
-	}
-
-	public CascadeType getCascade() {
-		return this.virtualCascadeType;
-	}
-	
-	public void setCascade(CascadeType value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public XmlJoinTable getJoinTable() {
-		//TODO we don't yet support JoinTable in the context model for many-to-one mappings
-		return null;//this.virtualJoinTable;
-	}
-
-	public void setJoinTable(XmlJoinTable value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public String getTargetEntity() {
-		if (this.metadataComplete) {
-			return this.javaOneToOneMapping.getDefaultTargetEntity();
-		}
-		return this.javaOneToOneMapping.getTargetEntity();
-	}
-
-	public void setTargetEntity(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public String getMappedBy() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaOneToOneMapping.getMappedBy();
-	}
-
-	public void setMappedBy(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public EList<XmlPrimaryKeyJoinColumn> getPrimaryKeyJoinColumns() {
-		EList<XmlPrimaryKeyJoinColumn> joinColumns = new EObjectContainmentEList<XmlPrimaryKeyJoinColumn>(XmlPrimaryKeyJoinColumn.class, this, OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_JOIN_COLUMNS);
-		if (!this.metadataComplete) {
-			for (JavaPrimaryKeyJoinColumn joinColumn : CollectionTools.iterable(this.javaOneToOneMapping.primaryKeyJoinColumns())) {
-				XmlPrimaryKeyJoinColumn xmlJoinColumn = new VirtualXmlPrimaryKeyJoinColumn(joinColumn/*, this.metadataComplete*/);
-				joinColumns.add(xmlJoinColumn);
-			}
-		}
-		return joinColumns;
-	}
-	
-	public void update(JavaOneToOneMapping javaOneToOneMapping) {
-		this.javaOneToOneMapping = javaOneToOneMapping;
-		this.virtualCascadeType.update(javaOneToOneMapping.getCascade());
-	}
-	
-	public TextRange getNameTextRange() {
-		return null;
-	}
-	
-	public TextRange getMappedByTextRange() {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlPrimaryKeyJoinColumn.java
deleted file mode 100644
index 9465b2ec3c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlPrimaryKeyJoinColumn.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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.java.JavaPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * A virtual primary key join column is used to represent the XmlPrimaryKeyJoinColumn resource object
- * within a virtual secondary table.  A virtual secondary table is one which is not specified
- * in the orm.xml file, but is implied from the underlying java.  Virtual pk join column
- * is not used when the secondary table is specified in the orm.xml.
- * 
- * A virtual pk join column delegates to the underlying java pk join column for its state.
- */
-public class VirtualXmlPrimaryKeyJoinColumn extends AbstractJpaEObject implements XmlPrimaryKeyJoinColumn
-{
-	
-	protected JavaPrimaryKeyJoinColumn javaPrimaryKeyJoinColumn;
-
-	
-	protected VirtualXmlPrimaryKeyJoinColumn(JavaPrimaryKeyJoinColumn javaPrimaryKeyJoinColumn) {
-		super();
-		this.javaPrimaryKeyJoinColumn = javaPrimaryKeyJoinColumn;
-	}
-
-	public String getName() {
-		return this.javaPrimaryKeyJoinColumn.getName();
-	}
-
-	public void setName(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public String getColumnDefinition() {
-		return this.javaPrimaryKeyJoinColumn.getColumnDefinition();
-	}
-	
-	public void setColumnDefinition(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public String getReferencedColumnName() {
-		return this.javaPrimaryKeyJoinColumn.getReferencedColumnName();
-	}
-	
-	public void setReferencedColumnName(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public TextRange getNameTextRange() {
-		return null;
-	}
-	
-	public TextRange getReferencedColumnNameTextRange() {
-		return null;
-	}
-		
-	public void update(JavaPrimaryKeyJoinColumn javaPrimaryKeyJoinColumn) {
-		this.javaPrimaryKeyJoinColumn = javaPrimaryKeyJoinColumn;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlSecondaryTable.java
deleted file mode 100644
index 5d5a009a51..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlSecondaryTable.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.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.JavaPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaSecondaryTable;
-import org.eclipse.jpt.core.context.java.JavaUniqueConstraint;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint;
-import org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.resource.orm.XmlSecondaryTable;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-
-/**
- * A virtual secondary table is used to represent the XmlSecondaryTable resource object.
- * A virtual secondary table is one which is not specified in the orm.xml file, 
- * but is implied from the underlying java.  Virtual secondary table
- * is not used when the secondary table is specified in the orm.xml.
- * 
- * A virtual secondary table delegates to the underlying java secondary table for its state. 
- */
-public class VirtualXmlSecondaryTable extends AbstractJpaEObject implements XmlSecondaryTable
-{
-	
-	protected JavaSecondaryTable javaSecondaryTable;
-	
-	protected VirtualXmlSecondaryTable(JavaSecondaryTable javaSecondaryTable) {
-		super();
-		this.javaSecondaryTable = javaSecondaryTable;
-	}
-
-	public String getName() {
-		return this.javaSecondaryTable.getSpecifiedName();
-	}
-
-	public void setName(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public String getCatalog() {
-		return this.javaSecondaryTable.getSpecifiedCatalog();
-	}
-	
-	public void setCatalog(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public String getSchema() {
-		return this.javaSecondaryTable.getSpecifiedSchema();
-	}
-	
-	public void setSchema(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	//VirtualXmlSecondaryTable is rebuilt everytime, so rebuilding the joinColumns list as well
-	public EList<XmlPrimaryKeyJoinColumn> getPrimaryKeyJoinColumns() {
-		EList<XmlPrimaryKeyJoinColumn> primaryKeyJoinColumns = new EObjectContainmentEList<XmlPrimaryKeyJoinColumn>(XmlPrimaryKeyJoinColumn.class, this, OrmPackage.XML_SECONDARY_TABLE_IMPL__PRIMARY_KEY_JOIN_COLUMNS);
-		
-		for (JavaPrimaryKeyJoinColumn pkJoinColumn : CollectionTools.iterable(this.javaSecondaryTable.specifiedPrimaryKeyJoinColumns())) {
-			XmlPrimaryKeyJoinColumn xmlPkJoinColumn = new VirtualXmlPrimaryKeyJoinColumn(pkJoinColumn);
-			primaryKeyJoinColumns.add(xmlPkJoinColumn);
-		}
-		
-		return primaryKeyJoinColumns;
-	}
-	
-	public EList<XmlUniqueConstraint> getUniqueConstraints() {
-		EList<XmlUniqueConstraint> xmlUniqueConstraints = new EObjectContainmentEList<XmlUniqueConstraint>(XmlUniqueConstraint.class, this, OrmPackage.XML_SECONDARY_TABLE__UNIQUE_CONSTRAINTS);
-
-		for (JavaUniqueConstraint uniqueConstraint : CollectionTools.iterable(this.javaSecondaryTable.uniqueConstraints())) {
-			XmlUniqueConstraint xmlUniqueConstraint = new VirtualXmlUniqueConstraint(uniqueConstraint, true);
-			xmlUniqueConstraints.add(xmlUniqueConstraint);
-		}
-
-		return xmlUniqueConstraints;
-	}
-	
-	public TextRange getNameTextRange() {
-		return null;
-	}
-	
-	public TextRange getCatalogTextRange() {
-		return null;
-	}
-	
-	public TextRange getSchemaTextRange() {
-		return null;
-	}
-		
-	public void update(JavaSecondaryTable javaSecondaryTable) {
-		this.javaSecondaryTable = javaSecondaryTable;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlSequenceGenerator.java
deleted file mode 100644
index c6ab23dc26..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlSequenceGenerator.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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.java.JavaSequenceGenerator;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator;
-import org.eclipse.jpt.core.utility.TextRange;
-
-public class VirtualXmlSequenceGenerator extends AbstractJpaEObject implements XmlSequenceGenerator
-{
-	JavaSequenceGenerator javaSequenceGenerator;
-
-	protected boolean metadataComplete;
-	
-		
-	public VirtualXmlSequenceGenerator(JavaSequenceGenerator javaSequenceGenerator, boolean metadataComplete) {
-		super();
-		this.javaSequenceGenerator = javaSequenceGenerator;
-		this.metadataComplete = metadataComplete;
-	}
-
-	public String getSequenceName() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaSequenceGenerator.getSequenceName();
-	}
-
-	public void setSequenceName(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-	
-	public Integer getAllocationSize() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaSequenceGenerator.getAllocationSize();
-	}
-
-	public void setAllocationSize(Integer value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public Integer getInitialValue() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaSequenceGenerator.getInitialValue();
-	}
-
-	public void setInitialValue(Integer value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public String getName() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaSequenceGenerator.getName();
-	}
-
-	public void setName(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public void update(JavaSequenceGenerator javaSequenceGenerator) {
-		this.javaSequenceGenerator = javaSequenceGenerator;
-	}
-	
-	public TextRange getNameTextRange() {
-		return getValidationTextRange();
-	}
-	
-	public boolean isVirtual() {
-		return true;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlTableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlTableGenerator.java
deleted file mode 100644
index 332f6cae25..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlTableGenerator.java
+++ /dev/null
@@ -1,159 +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.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.JavaTableGenerator;
-import org.eclipse.jpt.core.context.java.JavaUniqueConstraint;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint;
-import org.eclipse.jpt.core.resource.orm.XmlTableGenerator;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-
-public class VirtualXmlTableGenerator extends AbstractJpaEObject implements XmlTableGenerator
-{
-	JavaTableGenerator javaTableGenerator;
-
-	protected boolean metadataComplete;
-	
-		
-	public VirtualXmlTableGenerator(JavaTableGenerator javaTableGenerator, boolean metadataComplete) {
-		super();
-		this.javaTableGenerator = javaTableGenerator;
-		this.metadataComplete = metadataComplete;
-	}
-
-	public String getCatalog() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaTableGenerator.getCatalog();
-	}
-
-	public void setCatalog(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public String getPkColumnName() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaTableGenerator.getPkColumnName();
-	}
-
-	public void setPkColumnName(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public String getPkColumnValue() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaTableGenerator.getPkColumnValue();
-	}
-
-	public void setPkColumnValue(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public String getSchema() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaTableGenerator.getSchema();
-	}
-
-	public void setSchema(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public String getTable() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaTableGenerator.getTable();
-	}
-
-	public void setTable(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public String getValueColumnName() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaTableGenerator.getValueColumnName();
-	}
-
-	public void setValueColumnName(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public Integer getAllocationSize() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaTableGenerator.getAllocationSize();
-	}
-
-	public void setAllocationSize(Integer value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public Integer getInitialValue() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaTableGenerator.getInitialValue();
-	}
-
-	public void setInitialValue(Integer value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public String getName() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return this.javaTableGenerator.getName();
-	}
-
-	public void setName(String value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-
-
-	public EList<XmlUniqueConstraint> getUniqueConstraints() {
-		EList<XmlUniqueConstraint> xmlUniqueConstraints = new EObjectContainmentEList<XmlUniqueConstraint>(XmlUniqueConstraint.class, this, OrmPackage.XML_TABLE_GENERATOR__UNIQUE_CONSTRAINTS);
-
-		for (JavaUniqueConstraint uniqueConstraint : CollectionTools.iterable(this.javaTableGenerator.uniqueConstraints())) {
-			XmlUniqueConstraint xmlUniqueConstraint = new VirtualXmlUniqueConstraint(uniqueConstraint, this.metadataComplete);
-			xmlUniqueConstraints.add(xmlUniqueConstraint);
-		}
-
-		return xmlUniqueConstraints;
-	}
-
-	public void update(JavaTableGenerator javaTableGenerator) {
-		this.javaTableGenerator = javaTableGenerator;
-	}
-	
-	public TextRange getNameTextRange() {
-		return getValidationTextRange();
-	}
-	
-	public boolean isVirtual() {
-		return true;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlTransient.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlTransient.java
deleted file mode 100644
index 8e80ccc9e3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlTransient.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.core.internal.context.orm;
-
-import org.eclipse.jpt.core.context.java.JavaTransientMapping;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.XmlTransient;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * VirtualTransient is an implementation of Transient used when there is 
- * no tag in the orm.xml and an underlying javaTransientMapping exists.
- */
-public class VirtualXmlTransient extends AbstractJpaEObject implements XmlTransient
-{
-	JavaTransientMapping javaTransientMapping;
-
-	protected boolean metadataComplete;
-	
-	public VirtualXmlTransient(JavaTransientMapping javaTransientMapping, boolean metadataComplete) {
-		super();
-		this.javaTransientMapping = javaTransientMapping;
-		this.metadataComplete = metadataComplete;
-	}
-
-	public String getName() {
-		return this.javaTransientMapping.getPersistentAttribute().getName();
-	}
-
-	public void setName(String newName) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public void update(JavaTransientMapping javaTransientMapping) {
-		this.javaTransientMapping = javaTransientMapping;
-	}
-	
-	
-	public TextRange getNameTextRange() {
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlUniqueConstraint.java
deleted file mode 100644
index 4f106eace8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlUniqueConstraint.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.core.internal.context.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.EDataTypeEList;
-import org.eclipse.jpt.core.context.java.JavaUniqueConstraint;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-
-public class VirtualXmlUniqueConstraint extends AbstractJpaEObject implements XmlUniqueConstraint
-{	
-	protected JavaUniqueConstraint javaUniqueConstraint;
-
-	protected boolean metadataComplete;
-
-	protected VirtualXmlUniqueConstraint(JavaUniqueConstraint javaUniqueConstraint, boolean metadataComplete) {
-		super();
-		this.javaUniqueConstraint = javaUniqueConstraint;
-		this.metadataComplete = metadataComplete;
-	}
-
-	public EList<String> getColumnNames() {
-		EList<String> columnNames = new EDataTypeEList<String>(String.class, this, OrmPackage.XML_UNIQUE_CONSTRAINT_IMPL__COLUMN_NAMES);
-
-		for (String columnName : CollectionTools.iterable(this.javaUniqueConstraint.columnNames())) {
-			columnNames.add(columnName);
-		}
-		return columnNames;
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlVersion.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlVersion.java
deleted file mode 100644
index c402e38e7e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlVersion.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.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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.orm.TemporalType;
-import org.eclipse.jpt.core.resource.orm.XmlColumn;
-import org.eclipse.jpt.core.resource.orm.XmlVersion;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * VirtualVersion is an implementation of Version used when there is 
- * no tag in the orm.xml and an underlying javaVersionMapping exists.
- */
-public class VirtualXmlVersion extends AbstractJpaEObject implements XmlVersion
-{
-	JavaVersionMapping javaVersionMapping;
-
-	protected final VirtualXmlColumn column;
-
-	protected boolean metadataComplete;
-	
-	public VirtualXmlVersion(OrmTypeMapping ormTypeMapping, JavaVersionMapping javaVersionMapping, boolean metadataComplete) {
-		super();
-		this.javaVersionMapping = javaVersionMapping;
-		this.metadataComplete = metadataComplete;
-		this.column = new VirtualXmlColumn(ormTypeMapping, javaVersionMapping.getColumn(), metadataComplete);
-	}
-
-	public String getName() {
-		return this.javaVersionMapping.getPersistentAttribute().getName();
-	}
-
-	public void setName(String newName) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public XmlColumn getColumn() {
-		return this.column;
-	}
-
-	public void setColumn(XmlColumn value) {
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public TemporalType getTemporal() {
-		if (this.metadataComplete) {
-			return null;
-		}
-		return org.eclipse.jpt.core.context.TemporalType.toOrmResourceModel(this.javaVersionMapping.getTemporal());
-	}
-
-	public void setTemporal(TemporalType newTemporal){
-		throw new UnsupportedOperationException("cannot set values on a virtual mapping");
-	}
-
-	public void update(JavaVersionMapping javaVersionMapping) {
-		this.javaVersionMapping = javaVersionMapping;
-		this.column.update(javaVersionMapping.getColumn());
-	}
-	
-	
-	public TextRange getNameTextRange() {
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/AbstractPersistenceJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/AbstractPersistenceJpaContextNode.java
deleted file mode 100644
index 0896417bdd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/AbstractPersistenceJpaContextNode.java
+++ /dev/null
@@ -1,36 +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.core.internal.context.persistence;
-
-import java.util.List;
-import org.eclipse.jpt.core.context.JpaContextNode;
-import org.eclipse.jpt.core.context.persistence.PersistenceJpaContextNode;
-import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public abstract class AbstractPersistenceJpaContextNode extends AbstractJpaContextNode implements PersistenceJpaContextNode
-{
-	// ********** constructor **********
-
-	protected AbstractPersistenceJpaContextNode(JpaContextNode parent) {
-		super(parent);
-	}
-	
-	// ********** validation **********
-	
-	/**
-	 * All subclass implementations {@link #addToMessages(List<IMessage>)} 
-	 * should be preceded by a "super" call to this method
-	 */
-	public void addToMessages(List<IMessage> messages) {
-		
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericClassRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericClassRef.java
deleted file mode 100644
index 2cf6519bf9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericClassRef.java
+++ /dev/null
@@ -1,267 +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.core.internal.context.persistence;
-
-import java.util.List;
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.context.persistence.ClassRef;
-import org.eclipse.jpt.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.core.context.persistence.PersistenceStructureNodes;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * This is the context model object which corresponds to the 
- * persistence resource model object XmlJavaClassRef.
- * XmlJavaClassRef corresponds to the class tag in the persistence.xml
- */
-public class GenericClassRef extends AbstractPersistenceJpaContextNode 
-	implements ClassRef
-{
-	//this is null for the implied classRef case
-	protected XmlJavaClassRef xmlJavaClassRef;
-	
-	protected String className;
-	
-	protected JavaPersistentType javaPersistentType;
-	
-	
-	public GenericClassRef(PersistenceUnit parent, XmlJavaClassRef classRef) {
-		super(parent);
-		initialize(classRef);
-	}
-	
-	public GenericClassRef(PersistenceUnit parent, String className) {
-		super(parent);
-		initialize(className);
-	}
-	
-	public String getId() {
-		return PersistenceStructureNodes.CLASS_REF_ID;
-	}
-	
-	public boolean isFor(String fullyQualifiedTypeName) {
-		if (getClassName() == null) {
-			return false;
-		}
-		return getClassName().equals(fullyQualifiedTypeName);
-	}
-	
-	public boolean isVirtual() {
-		return this.xmlJavaClassRef == null;
-	}
-	
-	
-	// **************** class name *********************************************
-	
-	public String getClassName() {
-		return this.className;
-	}
-	
-	public void setClassName(String newClassName) {
-		String oldClassName = this.className;
-		this.className = newClassName;
-		this.xmlJavaClassRef.setJavaClass(newClassName);
-		firePropertyChanged(CLASS_NAME_PROPERTY, oldClassName, newClassName);
-	}
-	
-	protected void setClassName_(String newClassName) {
-		String oldClassName = this.className;
-		this.className = newClassName;
-		firePropertyChanged(CLASS_NAME_PROPERTY, oldClassName, newClassName);
-	}
-	
-	
-	// **************** java persistent type ***********************************
-	
-	public JavaPersistentType getJavaPersistentType() {
-		return this.javaPersistentType;
-	}
-	
-	protected void setJavaPersistentType(JavaPersistentType newJavaPersistentType) {
-		JavaPersistentType oldJavaPersistentType = this.javaPersistentType;
-		this.javaPersistentType = newJavaPersistentType;
-		firePropertyChanged(ClassRef.JAVA_PERSISTENT_TYPE_PROPERTY, oldJavaPersistentType, newJavaPersistentType);
-	}
-	
-	
-	// **************** updating ***********************************************
-	
-	protected void initialize(XmlJavaClassRef classRef) {
-		this.xmlJavaClassRef = classRef;
-		this.className = classRef.getJavaClass();
-		initializeJavaPersistentType();
-	}
-	
-	protected void initialize(String className) {
-		this.className = className;
-		initializeJavaPersistentType();
-	}
-	
-	protected void initializeJavaPersistentType() {
-		JavaResourcePersistentType persistentTypeResource = getJpaProject().getJavaPersistentTypeResource(getClassName());
-		if (persistentTypeResource != null) {
-			this.javaPersistentType = buildJavaPersistentType(persistentTypeResource);
-		}				
-	}
-
-	public void update(XmlJavaClassRef classRef) {
-		this.xmlJavaClassRef = classRef;
-		setClassName_(classRef.getJavaClass());
-		updateJavaPersistentType();
-	}
-	
-	public void update(String className) {
-		this.xmlJavaClassRef = null;
-		setClassName_(className);
-		updateJavaPersistentType();
-	}
-	
-	protected void updateJavaPersistentType() {
-		JavaResourcePersistentType persistentTypeResource = getJpaProject().getJavaPersistentTypeResource(getClassName());
-		if (persistentTypeResource == null) {
-			if (getJavaPersistentType() != null) {
-				getJavaPersistentType().dispose();
-			}
-			setJavaPersistentType(null);
-		}
-		else { 
-			if (getJavaPersistentType() != null) {
-				getJavaPersistentType().update(persistentTypeResource);
-			}
-			else {
-				setJavaPersistentType(buildJavaPersistentType(persistentTypeResource));
-			}
-		}		
-	}
-	
-	protected JavaPersistentType buildJavaPersistentType(JavaResourcePersistentType resourcePersistentType) {
-		return getJpaFactory().buildJavaPersistentType(this, resourcePersistentType);
-	}
-	
-	
-	// *************************************************************************
-
-	// ************************* validation *********************************
-
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		addUnspecifiedClassMessage(messages);
-		addUnresolvedClassMessage(messages);
-		addJavaPersistentTypeMessages(messages);
-	}
-	
-	protected void addUnspecifiedClassMessage(List<IMessage> messages) {
-		if (StringTools.stringIsEmpty(getClassName())) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					JpaValidationMessages.PERSISTENCE_UNIT_UNSPECIFIED_CLASS,
-					this, getValidationTextRange())
-			);
-		}
-	}
-	
-	protected void addUnresolvedClassMessage(List<IMessage> messages) {
-		if (! StringTools.stringIsEmpty(getClassName()) && getJavaPersistentType() == null) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					JpaValidationMessages.PERSISTENCE_UNIT_NONEXISTENT_CLASS,
-					new String[] {getClassName()}, 
-					this, 
-					this.getValidationTextRange())
-			);
-		}
-	}
-	
-	protected void addJavaPersistentTypeMessages(List<IMessage> messages) {
-		if (getJavaPersistentType() != null) { //class might not resolve to a java type
-			MappingFileRef mappingFileRef = getMappingFileContaining(getClassName());
-			if (mappingFileRef != null) {
-				messages.add(DefaultJpaValidationMessages.buildMessage(
-					IMessage.LOW_SEVERITY,
-					JpaValidationMessages.PERSISTENCE_UNIT_REDUNDANT_CLASS,
-					new String[] { this.getClassName(), mappingFileRef.getFileName()},
-					this,
-					this.getValidationTextRange()));
-			}
-			else {
-				try {
-					//bug 190062 - only add java validation messages if this class is not listed in a mapping file
-					getJavaPersistentType().addToMessages(messages);
-				} catch (Throwable t) {
-					JptCorePlugin.log(t);
-				}
-			}
-		}
-	}
-	
-	//possibly move this and make it API on PersistenceUnit
-	/**
-	 * Return the mapping file that contains a persistent type for the given 
-	 * type name.  Return null if no mapping file contains the persistent type.
-	 */
-	protected MappingFileRef getMappingFileContaining(String fullyQualifiedTypeName) {
-		for (MappingFileRef mappingFileRef : CollectionTools.iterable(getPersistenceUnit().mappingFileRefs())) {
-			if (mappingFileRef.getPersistentType(fullyQualifiedTypeName) != null) {
-				return mappingFileRef;
-			}
-		}
-		return null;
-	}
-
-	public JpaStructureNode getStructureNode(int textOffset) {
-		return this;
-	}
-	
-	public boolean containsOffset(int textOffset) {
-		if (isVirtual()) {
-			return false;
-		}
-		return this.xmlJavaClassRef.containsOffset(textOffset);
-	}
-	
-	public TextRange getSelectionTextRange() {
-		if (isVirtual()) {
-			return null;
-		}
-		return this.xmlJavaClassRef.getSelectionTextRange();
-	}
-	
-	public TextRange getValidationTextRange() {
-		if (isVirtual()) {
-			return null;
-		}
-		return this.xmlJavaClassRef.getValidationTextRange();
-	}
-	
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(getClassName());
-	}
-	
-	public void dispose() {
-		if (getJavaPersistentType() != null) {
-			getJavaPersistentType().dispose();
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericMappingFileRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericMappingFileRef.java
deleted file mode 100644
index c53de37e86..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericMappingFileRef.java
+++ /dev/null
@@ -1,268 +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.core.internal.context.persistence;
-
-import java.util.List;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.orm.OrmXml;
-import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults;
-import org.eclipse.jpt.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.core.context.persistence.PersistenceStructureNodes;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.orm.OrmArtifactEdit;
-import org.eclipse.jpt.core.resource.orm.OrmResource;
-import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class GenericMappingFileRef extends AbstractPersistenceJpaContextNode 
-	implements MappingFileRef
-{
-	//this is null for the implied mappingFileRef case
-	protected XmlMappingFileRef xmlMappingFileRef;
-	
-	protected String fileName;
-	
-	protected OrmXml ormXml;
-	
-	public GenericMappingFileRef(PersistenceUnit parent, XmlMappingFileRef mappingFileRef) {
-		super(parent);
-		this.initialize(mappingFileRef);
-	}
-	
-	public String getId() {
-		return PersistenceStructureNodes.MAPPING_FILE_REF_ID;
-	}
-
-	
-	public boolean isVirtual() {
-		return xmlMappingFileRef == null;
-	}
-	
-	
-	// **************** file name **********************************************
-	
-	public String getFileName() {
-		return this.fileName;
-	}
-	
-	public void setFileName(String newFileName) {
-		this.xmlMappingFileRef.setFileName(newFileName);
-		setFileName_(newFileName);
-	}
-	
-	protected void setFileName_(String newFileName) {
-		String oldFileName = this.fileName;
-		this.fileName = newFileName;
-		firePropertyChanged(FILE_NAME_PROPERTY, oldFileName, newFileName);
-	}
-	
-	public OrmXml getOrmXml() {
-		return this.ormXml;
-	}
-	
-	protected void setOrmXml(OrmXml newOrmXml) {
-		OrmXml oldOrmXml = this.ormXml;
-		this.ormXml = newOrmXml;
-		firePropertyChanged(ORM_XML_PROPERTY, oldOrmXml, newOrmXml);
-	}
-	
-	
-	// **************** updating ***********************************************
-	
-	protected void initialize(XmlMappingFileRef mappingFileRef) {
-		this.xmlMappingFileRef = mappingFileRef;
-		initializeFileName();
-		initializeOrmXml();
-	}
-	
-	protected void initializeFileName() {
-		if (isVirtual()) {
-			fileName = JptCorePlugin.DEFAULT_ORM_XML_FILE_PATH;
-		}
-		else {
-			fileName = xmlMappingFileRef.getFileName();
-		}
-	}
-	
-	protected void initializeOrmXml() {
-		if (fileName != null) {
-			OrmArtifactEdit oae = OrmArtifactEdit.getArtifactEditForRead(getJpaProject().getProject());
-			OrmResource ormResource = oae.getResource(fileName);
-			
-			if (ormResource != null && ormResource.exists()) {
-				ormXml = buildOrmXml(ormResource);
-			}
-			oae.dispose();
-		}
-	}
-
-	public void update(XmlMappingFileRef mappingFileRef) {
-		xmlMappingFileRef = mappingFileRef;
-		updateFileName();
-		updateOrmXml();
-	}
-	
-	protected void updateFileName() {
-		if (isVirtual()) {
-			setFileName_(JptCorePlugin.DEFAULT_ORM_XML_FILE_PATH);
-		}
-		else {
-			setFileName_(xmlMappingFileRef.getFileName());
-		}
-	}
-	
-	protected void updateOrmXml() {
-		if (fileName != null) {
-			IProject project = getJpaProject().getProject();
-			OrmArtifactEdit oae = OrmArtifactEdit.getArtifactEditForRead(project);
-			OrmResource ormResource = oae.getResource(JptCorePlugin.getOrmXmlDeploymentURI(project, fileName));
-			if (ormResource != null && ormResource.exists()) {
-				if (ormXml != null) {
-					ormXml.update(ormResource);
-				}
-				else {
-					setOrmXml(buildOrmXml(ormResource));
-				}
-			}
-			else {
-				if (getOrmXml() != null) {
-					getOrmXml().dispose();
-				}
-				setOrmXml(null);
-			}
-			oae.dispose();
-		}
-		else {
-			if (getOrmXml() != null) {
-				getOrmXml().dispose();
-			}
-			setOrmXml(null);
-		}
-	}
-	
-	protected OrmXml buildOrmXml(OrmResource ormResource) {
-		return getJpaFactory().buildOrmXml(this, ormResource);
-	}
-	
-	
-	// *************************************************************************
-	
-	public PersistenceUnitDefaults getPersistenceUnitDefaults() {
-		if (getOrmXml() != null) {
-			return getOrmXml().getPersistenceUnitDefaults();
-		}
-		return null;
-	}
-	
-	public OrmPersistentType getPersistentType(String fullyQualifiedTypeName) {
-		if (getOrmXml() != null) {
-			return getOrmXml().getPersistentType(fullyQualifiedTypeName);
-		}
-		return null;
-	}
-	
-	public JpaStructureNode getStructureNode(int textOffset) {
-		return this;
-	}
-	
-	public boolean containsOffset(int textOffset) {
-		if (this.xmlMappingFileRef == null) {
-			return false;
-		}
-		return this.xmlMappingFileRef.containsOffset(textOffset);
-	}
-	
-	public TextRange getSelectionTextRange() {
-		if (isVirtual()) {
-			return null;
-		}
-		return this.xmlMappingFileRef.getSelectionTextRange();
-	}
-	
-	public TextRange getValidationTextRange() {
-		if (isVirtual()) {
-			return getPersistenceUnit().getValidationTextRange();
-		}
-		return this.xmlMappingFileRef.getValidationTextRange();
-	}
-	
-	//**************** Validation *************************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		this.addUnspecifiedMappingFileMessage(messages);
-		this.addUnresolvedMappingFileMessage(messages);
-		this.addInvalidMappingFileContentMessage(messages);
-		if (getOrmXml() != null) {
-			getOrmXml().addToMessages(messages);
-		}
-	}
-	
-	
-	protected void addUnspecifiedMappingFileMessage(List<IMessage> messages) {
-		if (StringTools.stringIsEmpty(getFileName())) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					JpaValidationMessages.PERSISTENCE_UNIT_UNSPECIFIED_MAPPING_FILE,
-					this, 
-					getValidationTextRange())
-			);
-		}
-	}
-	
-	protected void addUnresolvedMappingFileMessage(List<IMessage> messages) {
-		if (!StringTools.stringIsEmpty(getFileName()) && getOrmXml() == null) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					JpaValidationMessages.PERSISTENCE_UNIT_NONEXISTENT_MAPPING_FILE,
-					new String[] {getFileName()}, 
-					this, 
-					getValidationTextRange()) 
-			);
-		}
-	}
-	
-	protected void addInvalidMappingFileContentMessage(List<IMessage> messages) {
-		if (getOrmXml() != null 
-				&& getOrmXml().getEntityMappings() == null) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					JpaValidationMessages.PERSISTENCE_UNIT_INVALID_MAPPING_FILE,
-					new String[] {getFileName()}, 
-					this,
-					getValidationTextRange())
-			);
-		}
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		super.toString(sb);
-		sb.append(getFileName());
-	}
-	
-	public void dispose() {
-		if (getOrmXml() != null) {
-			getOrmXml().dispose();
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistence.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistence.java
deleted file mode 100644
index 9aa1a83e05..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistence.java
+++ /dev/null
@@ -1,228 +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.core.internal.context.persistence;
-
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.context.persistence.Persistence;
-import org.eclipse.jpt.core.context.persistence.PersistenceStructureNodes;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.core.context.persistence.PersistenceXml;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
-import org.eclipse.jpt.core.resource.persistence.XmlPersistence;
-import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class GenericPersistence extends AbstractPersistenceJpaContextNode
-	implements Persistence
-{	
-	protected XmlPersistence xmlPersistence;
-	
-	// the implementation here is a single persistence unit, although the API
-	// is for a list.  we will want to support multiple persistence units soon.
-	protected PersistenceUnit persistenceUnit;
-
-	public GenericPersistence(PersistenceXml parent, XmlPersistence xmlPersistence) {
-		super(parent);
-		this.initialize(xmlPersistence);
-	}
-	
-	public String getId() {
-		return PersistenceStructureNodes.PERSISTENCE_ID;
-	}
-
-	
-	// **************** persistence units **************************************
-	
-	public ListIterator<PersistenceUnit> persistenceUnits() {
-		if (persistenceUnit == null) {
-			return EmptyListIterator.instance();
-		}
-		else {
-			return new SingleElementListIterator<PersistenceUnit>(persistenceUnit);
-		}
-	}
-	
-	public int persistenceUnitsSize() {
-		return (persistenceUnit == null) ? 0 : 1;
-	}
-	
-	public PersistenceUnit addPersistenceUnit() {
-		return addPersistenceUnit(persistenceUnitsSize());
-	}
-	
-	public PersistenceUnit addPersistenceUnit(int index) {
-		if (index > 0 || persistenceUnit != null) {
-			throw new IllegalStateException("This implementation does not support multiple persistence units.");
-		}
-		XmlPersistenceUnit xmlPersistenceUnit = PersistenceFactory.eINSTANCE.createXmlPersistenceUnit();
-		persistenceUnit = createPersistenceUnit(xmlPersistenceUnit);
-		xmlPersistence.getPersistenceUnits().add(xmlPersistenceUnit);
-		fireItemAdded(PERSISTENCE_UNITS_LIST, index, persistenceUnit);
-		return persistenceUnit;
-	}
-	
-	public void removePersistenceUnit(PersistenceUnit persistenceUnit) {
-		removePersistenceUnit(0);
-	}
-	
-	public void removePersistenceUnit(int index) {
-		if (index > 0 ) {
-			throw new IllegalArgumentException(new Integer(index).toString());
-		}
-		PersistenceUnit oldPersistenceUnit = persistenceUnit;
-		persistenceUnit.dispose();
-		persistenceUnit = null;
-		xmlPersistence.getPersistenceUnits().remove(index);
-		fireItemRemoved(PERSISTENCE_UNITS_LIST, index, oldPersistenceUnit);
-	}
-	
-	protected void addPersistenceUnit_(PersistenceUnit newPersistenceUnit) {
-		persistenceUnit = newPersistenceUnit;
-		fireItemAdded(PERSISTENCE_UNITS_LIST, 0, persistenceUnit);
-	}
-	
-	protected void removePersistenceUnit_(PersistenceUnit oldPersistenceUnit) {
-		persistenceUnit.dispose();
-		persistenceUnit = null;
-		fireItemRemoved(PERSISTENCE_UNITS_LIST, 0, oldPersistenceUnit);
-	}
-	
-	
-	// **************** updating ***********************************************
-	
-	protected void initialize(XmlPersistence xmlPersistence) {
-		this.xmlPersistence = xmlPersistence;
-		initializePersistenceUnits(xmlPersistence);
-	}
-	
-	protected void initializePersistenceUnits(XmlPersistence persistence) {
-		// only adding one here, until we support multiple persistence units
-		if (xmlPersistence.getPersistenceUnits().size() > 0) {
-			persistenceUnit = createPersistenceUnit(persistence.getPersistenceUnits().get(0));
-		}
-	}
-	
-	public void update(XmlPersistence persistence) {
-		this.xmlPersistence = persistence;
-		getJpaFile(this.xmlPersistence.getResource().getResourceModel()).addRootStructureNode(this, this);
-		XmlPersistenceUnit xmlPersistenceUnit = null;
-		if (persistence.getPersistenceUnits().size() > 0) {
-			xmlPersistenceUnit = persistence.getPersistenceUnits().get(0);
-		}
-				
-		if (persistenceUnit != null) {
-			if (xmlPersistenceUnit != null) {
-				persistenceUnit.update(xmlPersistenceUnit);
-			}
-			else {
-				removePersistenceUnit_(persistenceUnit);
-			}
-		}
-		else {
-			if (xmlPersistenceUnit != null) {
-				addPersistenceUnit_(createPersistenceUnit(xmlPersistenceUnit));
-			}
-		}
-	}
-	
-	protected PersistenceUnit createPersistenceUnit(XmlPersistenceUnit xmlPersistenceUnit) {
-		return getJpaFactory().buildPersistenceUnit(this, xmlPersistenceUnit);
-	}
-	
-	
-	// *************************************************************************
-	
-	@Override
-	public PersistenceUnit getPersistenceUnit() {
-		throw new UnsupportedOperationException("No PersistenceUnit in this context");
-	}
-	
-	public JpaStructureNode getStructureNode(int textOffset) {
-		for (PersistenceUnit persistenceUnit : CollectionTools.iterable(persistenceUnits())) {
-			if (persistenceUnit.containsOffset(textOffset)) {
-				return persistenceUnit.getStructureNode(textOffset);
-			}
-		}
-		return this;
-	}
-	
-	public boolean containsOffset(int textOffset) {
-		if (xmlPersistence == null) {
-			return false;
-		}
-		return xmlPersistence.containsOffset(textOffset);
-	}
-	
-	public TextRange getSelectionTextRange() {
-		return xmlPersistence.getSelectionTextRange();
-	}
-	
-	public TextRange getValidationTextRange() {
-		return xmlPersistence.getValidationTextRange();
-	}
-
-
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		//persistence root validation
-		addNoPersistenceUnitMessage(messages);
-		
-		// note to neil (or whomever): extraneous persistence units can be
-		// accessed through the XmlPersistence resource object
-		addMultiplePersistenceUnitMessage(messages);
-		
-		
-		//persistence unit validation
-		if (persistenceUnit != null) {
-			persistenceUnit.addToMessages(messages);
-		}
-	}
-	
-	protected void addNoPersistenceUnitMessage(List<IMessage> messages) {
-		if (persistenceUnit == null) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.PERSISTENCE_NO_PERSISTENCE_UNIT,
-						this, 
-						this.getValidationTextRange())
-				);
-		}
-	}
-	
-	protected void addMultiplePersistenceUnitMessage(List<IMessage> messages) {
-		if (xmlPersistence.getPersistenceUnits().size() > 1) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-						IMessage.NORMAL_SEVERITY,
-						JpaValidationMessages.PERSISTENCE_MULTIPLE_PERSISTENCE_UNITS,
-						this, 
-						this.getValidationTextRange())
-				);
-		}
-	}
-	
-	public void dispose() {
-		getJpaFile(this.xmlPersistence.getResource().getResourceModel()).removeRootStructureNode(this);
-		for (PersistenceUnit persistenceUnit : CollectionTools.iterable(persistenceUnits())) {
-			persistenceUnit.dispose();
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceUnit.java
deleted file mode 100644
index 8dc2406c7c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceUnit.java
+++ /dev/null
@@ -1,1254 +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.core.internal.context.persistence;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.context.AccessType;
-import org.eclipse.jpt.core.context.Generator;
-import org.eclipse.jpt.core.context.PersistentType;
-import org.eclipse.jpt.core.context.Query;
-import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults;
-import org.eclipse.jpt.core.context.persistence.ClassRef;
-import org.eclipse.jpt.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.core.context.persistence.Persistence;
-import org.eclipse.jpt.core.context.persistence.PersistenceStructureNodes;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnitTransactionType;
-import org.eclipse.jpt.core.context.persistence.Property;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.orm.OrmArtifactEdit;
-import org.eclipse.jpt.core.resource.orm.OrmResource;
-import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
-import org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef;
-import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
-import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
-import org.eclipse.jpt.core.resource.persistence.XmlProperties;
-import org.eclipse.jpt.core.resource.persistence.XmlProperty;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Catalog;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.HashBag;
-import org.eclipse.jpt.utility.internal.iterators.CloneIterator;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.ReadOnlyCompositeListIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class GenericPersistenceUnit extends AbstractPersistenceJpaContextNode
-	implements PersistenceUnit
-{
-	protected XmlPersistenceUnit xmlPersistenceUnit;
-	
-	protected String name;
-	
-	protected PersistenceUnitTransactionType specifiedTransactionType;
-	
-	protected PersistenceUnitTransactionType defaultTransactionType;
-	
-	protected String description;
-	
-	protected String provider;
-	
-	protected String jtaDataSource;
-	
-	protected String nonJtaDataSource;
-	
-	protected final List<MappingFileRef> specifiedMappingFileRefs;
-	
-	protected MappingFileRef impliedMappingFileRef;
-	
-	protected final List<ClassRef> specifiedClassRefs;
-	
-	protected final List<ClassRef> impliedClassRefs;
-	
-	protected Boolean specifiedExcludeUnlistedClasses;
-	
-	protected boolean defaultExcludeUnlistedClasses = false;
-	
-	protected final List<Property> properties;
-	
-	/* global generator definitions, defined elsewhere in model */
-	protected final List<Generator> generators;
-	
-	/* global query definitions, defined elsewhere in model */
-	protected final List<Query> queries;
-	
-	
-	protected String defaultSchema;
-	protected String defaultCatalog;
-	protected AccessType defaultAccess;
-	protected boolean defaultCascadePersist;
-	
-	public GenericPersistenceUnit(Persistence parent, XmlPersistenceUnit persistenceUnit) {
-		super(parent);
-		this.specifiedMappingFileRefs = new ArrayList<MappingFileRef>();
-		this.specifiedClassRefs = new ArrayList<ClassRef>();
-		this.impliedClassRefs = new ArrayList<ClassRef>();
-		this.properties = new ArrayList<Property>();
-		this.generators = new ArrayList<Generator>();
-		this.queries = new ArrayList<Query>();
-		this.initialize(persistenceUnit);
-	}
-	
-	@Override
-	protected void addNonUpdateAspectNamesTo(Set<String> nonUpdateAspectNames) {
-		super.addNonUpdateAspectNamesTo(nonUpdateAspectNames);
-		nonUpdateAspectNames.add(GENERATORS_LIST);
-		nonUpdateAspectNames.add(QUERIES_LIST);
-	}
-	
-	public String getId() {
-		return PersistenceStructureNodes.PERSISTENCE_UNIT_ID;
-	}
-
-	@Override
-	public PersistenceUnit getPersistenceUnit() {
-		return this;
-	}
-	
-	
-	// **************** parent *************************************************
-	
-	@Override
-	public Persistence getParent() {
-		return (Persistence) super.getParent();
-	}
-	
-	
-	// **************** name ***************************************************
-	
-	public String getName() {
-		return this.name;
-	}
-	
-	public void setName(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		this.xmlPersistenceUnit.setName(newName);
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
-	}
-	
-	
-	// **************** transaction type ***************************************
-	
-	public PersistenceUnitTransactionType getTransactionType() {
-		return (isTransactionTypeDefault()) ?
-			getDefaultTransactionType() : getSpecifiedTransactionType();
-	}
-	
-	public PersistenceUnitTransactionType getSpecifiedTransactionType() {
-		return this.specifiedTransactionType;
-	}
-	
-	public void setSpecifiedTransactionType(PersistenceUnitTransactionType newTransactionType) {
-		PersistenceUnitTransactionType oldTransactionType = this.specifiedTransactionType;
-		this.specifiedTransactionType = newTransactionType;		
-		this.xmlPersistenceUnit.setTransactionType(PersistenceUnitTransactionType.toXmlResourceModel(newTransactionType));		
-		firePropertyChanged(SPECIFIED_TRANSACTION_TYPE_PROPERTY, oldTransactionType, newTransactionType);
-	}
-	
-	public boolean isTransactionTypeDefault() {
-		return this.specifiedTransactionType == null;
-	}
-	
-	public PersistenceUnitTransactionType getDefaultTransactionType() {
-		return this.defaultTransactionType;
-	}
-	
-	protected void setDefaultTransactionType(PersistenceUnitTransactionType newTransactionType) {
-		PersistenceUnitTransactionType oldTransactionType = this.defaultTransactionType;
-		this.defaultTransactionType = newTransactionType;		
-		firePropertyChanged(DEFAULT_TRANSACTION_TYPE_PROPERTY, oldTransactionType, newTransactionType);
-	}
-	
-	// **************** description ********************************************
-	
-	public String getDescription() {
-		return this.description;
-	}
-	
-	public void setDescription(String newDescription) {
-		String oldDescription = this.description;
-		this.description = newDescription;
-		this.xmlPersistenceUnit.setDescription(newDescription);
-		firePropertyChanged(DESCRIPTION_PROPERTY, oldDescription, newDescription);
-	}
-	
-	
-	// **************** provider ***********************************************
-	
-	public String getProvider() {
-		return this.provider;
-	}
-	
-	public void setProvider(String newProvider) {
-		String oldProvider = this.provider;
-		this.provider = newProvider;
-		this.xmlPersistenceUnit.setProvider(newProvider);
-		firePropertyChanged(PROVIDER_PROPERTY, oldProvider, newProvider);
-	}
-	
-	
-	// **************** jta data source ****************************************
-	
-	public String getJtaDataSource() {
-		return this.jtaDataSource;
-	}
-	
-	public void setJtaDataSource(String newJtaDataSource) {
-		String oldJtaDataSource = this.jtaDataSource;
-		this.jtaDataSource = newJtaDataSource;
-		this.xmlPersistenceUnit.setJtaDataSource(newJtaDataSource);
-		firePropertyChanged(JTA_DATA_SOURCE_PROPERTY, oldJtaDataSource, newJtaDataSource);
-	}
-	
-	
-	// **************** non-jta data source ************************************
-	
-	public String getNonJtaDataSource() {
-		return this.nonJtaDataSource;
-	}
-	
-	public void setNonJtaDataSource(String newNonJtaDataSource) {
-		String oldNonJtaDataSource = this.nonJtaDataSource;
-		this.nonJtaDataSource = newNonJtaDataSource;
-		this.xmlPersistenceUnit.setNonJtaDataSource(newNonJtaDataSource);
-		firePropertyChanged(NON_JTA_DATA_SOURCE_PROPERTY, oldNonJtaDataSource, newNonJtaDataSource);
-	}
-	
-	
-	// **************** mapping file refs **************************************
-	
-	public ListIterator<MappingFileRef> mappingFileRefs() {
-		if (impliedMappingFileRef == null) {
-			return specifiedMappingFileRefs();
-		}
-		else {
-			return new ReadOnlyCompositeListIterator<MappingFileRef>(
-				specifiedMappingFileRefs(), impliedMappingFileRef);
-		}
-	}
-	
-	public int mappingFileRefsSize() {
-		if (impliedMappingFileRef == null) {
-			return specifiedMappingFileRefsSize();
-		}
-		return 1 + specifiedMappingFileRefsSize();
-	}
-
-	// **************** specified mapping file refs ****************************
-	
-	public ListIterator<MappingFileRef> specifiedMappingFileRefs() {
-		return new CloneListIterator<MappingFileRef>(specifiedMappingFileRefs);
-	}
-	
-	public int specifiedMappingFileRefsSize() {
-		return specifiedMappingFileRefs.size();
-	}
-	
-	public MappingFileRef addSpecifiedMappingFileRef() {
-		return addSpecifiedMappingFileRef(specifiedMappingFileRefs.size());
-	}
-	
-	public MappingFileRef addSpecifiedMappingFileRef(int index) {
-		XmlMappingFileRef xmlMappingFileRef = PersistenceFactory.eINSTANCE.createXmlMappingFileRef();
-		MappingFileRef mappingFileRef = buildMappingFileRef(xmlMappingFileRef);
-		specifiedMappingFileRefs.add(index, mappingFileRef);
-		this.xmlPersistenceUnit.getMappingFiles().add(index, xmlMappingFileRef);
-		fireItemAdded(SPECIFIED_MAPPING_FILE_REF_LIST, index, mappingFileRef);
-		return mappingFileRef;
-	}
-	
-	public void removeSpecifiedMappingFileRef(MappingFileRef mappingFileRef) {
-		removeSpecifiedMappingFileRef(specifiedMappingFileRefs.indexOf(mappingFileRef));
-	}
-	
-	public void removeSpecifiedMappingFileRef(int index) {
-		MappingFileRef mappingFileRefRemoved = specifiedMappingFileRefs.remove(index);
-		mappingFileRefRemoved.dispose();
-		this.xmlPersistenceUnit.getMappingFiles().remove(index);
-		fireItemRemoved(SPECIFIED_MAPPING_FILE_REF_LIST, index, mappingFileRefRemoved);
-	}
-	
-	protected void addSpecifiedMappingFileRef_(MappingFileRef mappingFileRef) {
-		addSpecifiedMappingFileRef_(specifiedMappingFileRefs.size(), mappingFileRef);
-	}
-	
-	protected void addSpecifiedMappingFileRef_(int index, MappingFileRef mappingFileRef) {
-		addItemToList(index, mappingFileRef, specifiedMappingFileRefs, SPECIFIED_MAPPING_FILE_REF_LIST);
-	}
-	
-	protected void removeSpecifiedMappingFileRef_(MappingFileRef mappingFileRef) {
-		removeSpecifiedMappingFileRef_(specifiedMappingFileRefs.indexOf(mappingFileRef));
-	}
-	
-	protected void removeSpecifiedMappingFileRef_(int index) {
-		specifiedMappingFileRefs.get(index).dispose();
-		removeItemFromList(index, specifiedMappingFileRefs, SPECIFIED_MAPPING_FILE_REF_LIST);
-	}
-	
-	
-	// **************** implied mapping file ref *******************************
-	
-	public MappingFileRef getImpliedMappingFileRef() {
-		return impliedMappingFileRef;
-	}
-	
-	protected MappingFileRef setImpliedMappingFileRef() {
-		if (impliedMappingFileRef != null) {
-			throw new IllegalStateException("The implied mapping file ref is already set.");
-		}
-		MappingFileRef mappingFileRef = buildMappingFileRef(null);
-		impliedMappingFileRef = mappingFileRef;
-		firePropertyChanged(IMPLIED_MAPPING_FILE_REF_PROPERTY, null, mappingFileRef);
-		return mappingFileRef;
-	}
-	
-	protected void unsetImpliedMappingFileRef() {
-		if (impliedMappingFileRef == null) {
-			throw new IllegalStateException("The implied mapping file ref is already unset.");
-		}
-		MappingFileRef mappingFileRef = impliedMappingFileRef;
-		impliedMappingFileRef.dispose();
-		impliedMappingFileRef = null;
-		firePropertyChanged(IMPLIED_MAPPING_FILE_REF_PROPERTY, mappingFileRef, null);
-	}
-	
-	
-	// **************** class refs *********************************************
-	
-	@SuppressWarnings("unchecked")
-	public ListIterator<ClassRef> classRefs() {
-		return new ReadOnlyCompositeListIterator<ClassRef>(
-			specifiedClassRefs(), impliedClassRefs());
-	}
-	
-	public int classRefsSize() {
-		return specifiedClassRefsSize() + impliedClassRefsSize();
-	}
-	
-	// **************** specified class refs ***********************************
-	
-	public ListIterator<ClassRef> specifiedClassRefs() {
-		return new CloneListIterator<ClassRef>(this.specifiedClassRefs);
-	}
-	
-	public int specifiedClassRefsSize() {
-		return specifiedClassRefs.size();
-	}
-	
-	public ClassRef addSpecifiedClassRef() {
-		return addSpecifiedClassRef(this.specifiedClassRefsSize());
-	}
-	
-	public ClassRef addSpecifiedClassRef(int index) {
-		XmlJavaClassRef xmlClassRef = PersistenceFactory.eINSTANCE.createXmlJavaClassRef();
-		ClassRef classRef = buildClassRef(xmlClassRef);
-		this.specifiedClassRefs.add(index, classRef);
-		this.xmlPersistenceUnit.getClasses().add(index, xmlClassRef);
-		fireItemAdded(SPECIFIED_CLASS_REF_LIST, index, classRef);
-		return classRef;
-	}
-
-	public void removeSpecifiedClassRef(ClassRef classRef) {
-		removeSpecifiedClassRef(this.specifiedClassRefs.indexOf(classRef));
-	}
-	
-	public void removeSpecifiedClassRef(int index) {
-		ClassRef classRefRemoved = this.specifiedClassRefs.remove(index);
-		classRefRemoved.dispose();
-		this.xmlPersistenceUnit.getClasses().remove(index);
-		fireItemRemoved(SPECIFIED_CLASS_REF_LIST, index, classRefRemoved);
-	}
-	
-	protected void addSpecifiedClassRef_(ClassRef classRef) {
-		addSpecifiedClassRef_(this.specifiedClassRefs.size(), classRef);
-	}
-	
-	protected void addSpecifiedClassRef_(int index, ClassRef classRef) {
-		addItemToList(index, classRef, this.specifiedClassRefs, SPECIFIED_CLASS_REF_LIST);
-	}
-	
-	protected void removeSpecifiedClassRef_(ClassRef classRef) {
-		classRef.dispose();
-		removeSpecifiedClassRef_(this.specifiedClassRefs.indexOf(classRef));
-	}
-	
-	protected void removeSpecifiedClassRef_(int index) {
-		removeItemFromList(index, this.specifiedClassRefs, SPECIFIED_CLASS_REF_LIST);
-	}
-	
-	
-	// **************** implied class refs *************************************
-	
-	public ListIterator<ClassRef> impliedClassRefs() {
-		return new CloneListIterator<ClassRef>(impliedClassRefs);
-	}
-	
-	public int impliedClassRefsSize() {
-		return impliedClassRefs.size();
-	}
-	
-	protected ClassRef addImpliedClassRef(String className) {
-		return addImpliedClassRef(impliedClassRefs.size(), className);
-	}
-	
-	protected ClassRef addImpliedClassRef(int index, String className) {
-		ClassRef classRef = buildClassRef(className);
-		addItemToList(index, classRef, impliedClassRefs, IMPLIED_CLASS_REF_LIST);
-		return classRef;
-	}
-	
-	protected void removeImpliedClassRef(ClassRef classRef) {
-		classRef.dispose();
-		removeImpliedClassRef(impliedClassRefs.indexOf(classRef));
-	}
-	
-	protected void removeImpliedClassRef(int index) {
-		removeItemFromList(index, impliedClassRefs, IMPLIED_CLASS_REF_LIST);
-	}
-	
-	
-	// **************** exclude unlisted classes *******************************
-	
-	public boolean isExcludeUnlistedClasses() {
-		return getSpecifiedExcludeUnlistedClasses() == null ? getDefaultExcludeUnlistedClasses() : getSpecifiedExcludeUnlistedClasses().booleanValue();
-	}
-	
-	public Boolean getSpecifiedExcludeUnlistedClasses() {
-		return this.specifiedExcludeUnlistedClasses;
-	}
-	
-	public void setSpecifiedExcludeUnlistedClasses(Boolean newExcludeUnlistedClasses) {
-		Boolean oldExcludeUnlistedClasses = this.specifiedExcludeUnlistedClasses;
-		this.specifiedExcludeUnlistedClasses = newExcludeUnlistedClasses;
-		
-		this.xmlPersistenceUnit.setExcludeUnlistedClasses(this.specifiedExcludeUnlistedClasses);
-		
-		firePropertyChanged(SPECIFIED_EXCLUDE_UNLISTED_CLASSED_PROPERTY, oldExcludeUnlistedClasses, newExcludeUnlistedClasses);
-	}
-
-	public boolean getDefaultExcludeUnlistedClasses() {
-		// TODO - calculate default
-		//  This is determined from the project
-		return this.defaultExcludeUnlistedClasses;
-	}
-
-
-	// **************** properties *********************************************
-	
-	public ListIterator<Property> properties() {
-		return new CloneListIterator<Property>(this.properties);
-	}
-
-	public int propertiesSize() {
-		return this.properties.size();
-	}
-
-	public Property getProperty(String key) {
-		if (key == null) {
-			throw new IllegalStateException("Cannot getProperty: key is null.");
-		}
-		for(Property property : this.properties) {
-			if(key.equals(property.getName())) {
-				return property;
-			}
-		}
-		return null;
-	}
-
-	public ListIterator<Property> propertiesWithPrefix(String keyPrefix) {
-		if (keyPrefix == null) {
-			throw new IllegalStateException("Cannot find propertiesWithPrefix: keyPrefix is null.");
-		}
-		List<Property> properties = new ArrayList<Property>();
-		
-		for(Property property : this.properties) {
-			if(property.getName() != null && property.getName().startsWith(keyPrefix)) {
-				properties.add( property);
-			}
-		}
-		return properties.listIterator();
-	}
-	
-	public Property getProperty(String key, String value) {
-		if (key == null || value == null) {
-			throw new IllegalStateException("Cannot getProperty: key or value is null.");
-		}
-		for(Property property : this.properties) {
-			if(key.equals(property.getName())) {
-				if(value.equals(property.getValue())) {
-						return property;
-				}
-			}
-		}
-		return null;
-	}
-	
-	protected Property getProperty(int index) {
-		return this.properties.get(index);
-	}
-
-	protected XmlProperty getXmlProperty(String name, String value) {
-		if (this.xmlPersistenceUnit.getProperties() == null) {
-			XmlProperties xmlProperties = PersistenceFactory.eINSTANCE.createXmlProperties();
-			this.xmlPersistenceUnit.setProperties(xmlProperties);
-		}
-		for(XmlProperty xmlProperty : this.xmlPersistenceUnit.getProperties().getProperties()) {
-			if(name.equals(xmlProperty.getName()) && value.equals(xmlProperty.getValue())) {
-				return xmlProperty;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Adds or Changes Property with the given key and value.
-	 */
-	public void putProperty(String key, String value, boolean allowDuplicates) {
-		if( ! allowDuplicates && this.containsProperty(key)) {
-			this.putXmlProperty(key, value, this.getProperty(key).getValue());
-			return;
-		}
-		if( value != null) {
-			XmlProperty xmlProperty = PersistenceFactory.eINSTANCE.createXmlProperty();
-			xmlProperty.setName(key);
-			xmlProperty.setValue(value);
-			
-			this.addXmlProperty(xmlProperty, propertiesSize());
-			return;
-		}
-	}
-	
-	public void replacePropertyValue(String key, String oldValue, String newValue) {
-		
-		this.putXmlProperty(key, newValue, oldValue);
-	}
-	
-	protected void putXmlProperty(String key, String value, String oldValue) {
-		if( value == null) {
-			this.removeProperty(key);
-			return;
-		}
-
-		XmlProperty xmlProperty = this.getXmlProperty(key, oldValue);
-		if(xmlProperty == null) {
-			throw new NoSuchElementException("Missing Property name: " + key + ", value: " + oldValue);
-		}
-		xmlProperty.setValue(value);
-	}	
-	
-	public boolean containsProperty(String key) {
-		return (this.getProperty(key) != null);
-	}
-
-	public Property addProperty() {
-		return addProperty(propertiesSize());
-	}
-	
-	public Property addProperty(int index) {
-		return this.addXmlProperty(PersistenceFactory.eINSTANCE.createXmlProperty(), index);
-	}
-	
-	protected Property addXmlProperty(XmlProperty xmlProperty, int index) {
-
-		Property property = buildProperty(xmlProperty);
-		
-		if (this.xmlPersistenceUnit.getProperties() == null) {
-			XmlProperties xmlProperties = PersistenceFactory.eINSTANCE.createXmlProperties();
-			this.xmlPersistenceUnit.setProperties(xmlProperties);
-		}
-		
-		this.properties.add(index, property);
-		this.xmlPersistenceUnit.getProperties().getProperties().add(index, xmlProperty);
-		this.fireItemAdded(PROPERTIES_LIST, index, property);
-		return property;
-	}
-	
-	public void removeProperty(String key) {
-		this.removeProperty(this.getProperty(key));
-	}
-	
-	public void removeProperty(String key, String value) {
-		this.removeProperty(this.getProperty(key, value));
-	}
-	
-	public void removeProperty(Property property) {
-		if (property != null) {
-			this.removeProperty(this.properties.indexOf(property));
-		}
-	}
-	
-	protected void removeProperty(int index) {
-		Property propertyRemoved = this.properties.remove(index);
-		this.xmlPersistenceUnit.getProperties().getProperties().remove(index);
-		
-		if (this.xmlPersistenceUnit.getProperties().getProperties().isEmpty()) {
-			this.xmlPersistenceUnit.setProperties(null);
-		}
-		
-		fireItemRemoved(PROPERTIES_LIST, index, propertyRemoved);
-	}
-	
-	protected void addProperty_(Property property) {
-		addProperty_(this.properties.size(), property);
-	}
-	
-	protected void addProperty_(int index, Property property) {
-		addItemToList(index, property, this.properties, PROPERTIES_LIST);
-	}
-	
-	protected void removeProperty_(Property property) {
-		removeProperty_(this.properties.indexOf(property));
-	}
-	
-	protected void removeProperty_(int index) {
-		removeItemFromList(index, this.properties, PROPERTIES_LIST);
-	}
-	
-	
-	// **************** Persistence Unit Defaults *********************************************
-	
-	//TODO validation for multiple persistenceUnitDefaults.
-	
-	//Take the first PersistenceUnitDefaults found in an orm.xml file and use
-	//this for the defaults of the PersistenceUnit.
-	protected PersistenceUnitDefaults persistenceUnitDefaults() {
-		for (MappingFileRef mappingFileRef : CollectionTools.iterable(mappingFileRefs())) {
-			PersistenceUnitDefaults persistenceUnitDefaults = mappingFileRef.getPersistenceUnitDefaults();
-			if (persistenceUnitDefaults != null) {
-				return persistenceUnitDefaults;
-			}
-		}
-		return null;
-	}
-
-	public String getDefaultSchema() {
-		return this.defaultSchema;
-	}
-	
-	protected void setDefaultSchema(String newDefaultSchema) {
-		String oldDefaultSchema = this.defaultSchema;
-		this.defaultSchema = newDefaultSchema;
-		firePropertyChanged(DEFAULT_SCHEMA_PROPERTY, oldDefaultSchema, newDefaultSchema);
-	}
-	
-	public String getDefaultCatalog() {
-		return this.defaultCatalog;
-	}
-	
-	protected void setDefaultCatalog(String newDefaultCatalog) {
-		String oldDefaultCatalog = this.defaultCatalog;
-		this.defaultCatalog = newDefaultCatalog;
-		firePropertyChanged(DEFAULT_CATALOG_PROPERTY, oldDefaultCatalog, newDefaultCatalog);
-	}
-	
-	public AccessType getDefaultAccess() {
-		return this.defaultAccess;
-	}
-	
-	protected void setDefaultAccess(AccessType newDefaultAccess) {
-		AccessType oldDefaultAccess = this.defaultAccess;
-		this.defaultAccess = newDefaultAccess;
-		firePropertyChanged(DEFAULT_ACCESS_PROPERTY, oldDefaultAccess, newDefaultAccess);
-	}	
-	
-	public boolean getDefaultCascadePersist() {
-		return this.defaultCascadePersist;
-	}
-	
-	protected void setDefaultCascadePersist(boolean newDefaultCascadePersist) {
-		boolean oldDefaultCascadePersist = this.defaultCascadePersist;
-		this.defaultCascadePersist = newDefaultCascadePersist;
-		firePropertyChanged(DEFAULT_CASCADE_PERSIST_PROPERTY, oldDefaultCascadePersist, newDefaultCascadePersist);
-	}
-	
-	
-	// **************** global generator and query support *********************
-	
-	public void addGenerator(Generator generator) {
-		this.generators.add(generator);
-	}
-	
-	public ListIterator<Generator> allGenerators() {
-		return new CloneListIterator<Generator>(this.generators);
-	}
-	
-	public void addQuery(Query query) {
-		this.queries.add(query);
-	}
-	
-	public ListIterator<Query> allQueries() {
-		return new CloneListIterator<Query>(this.queries);
-	}
-	
-
-	// **************** updating ***********************************************
-	
-	protected void initialize(XmlPersistenceUnit xmlPersistenceUnit) {
-		this.xmlPersistenceUnit = xmlPersistenceUnit;
-		this.name = xmlPersistenceUnit.getName();
-		
-		//initialize specified classRefs before mappingFileRefs because of 
-		//JpaFile rootStructureNode, we want the mapping file to "win",
-		//as it would in a Jpa runtime implementation
-		initializeSpecifiedClassRefs(xmlPersistenceUnit);
-		initializeMappingFileRefs(xmlPersistenceUnit);
-		//initialize implied classRefs last since they depend on both
-		//specified classRefs and mappingFileRefs
-		initializeImpliedClassRefs(xmlPersistenceUnit);
-		initializeProperties(xmlPersistenceUnit);
-		initializePersistenceUnitDefaults();
-		this.specifiedExcludeUnlistedClasses = xmlPersistenceUnit.getExcludeUnlistedClasses();
-		this.specifiedTransactionType = specifiedTransactionType(xmlPersistenceUnit);
-		this.defaultTransactionType = defaultTransacationType();
-		this.description = xmlPersistenceUnit.getDescription();
-		this.provider = xmlPersistenceUnit.getProvider();
-		this.jtaDataSource = xmlPersistenceUnit.getJtaDataSource();
-		this.nonJtaDataSource = xmlPersistenceUnit.getNonJtaDataSource();
-		this.specifiedExcludeUnlistedClasses = xmlPersistenceUnit.getExcludeUnlistedClasses();
-	}
-	
-	protected void initializeMappingFileRefs(XmlPersistenceUnit xmlPersistenceUnit) {
-		for (XmlMappingFileRef xmlMappingFileRef : xmlPersistenceUnit.getMappingFiles()) {
-			specifiedMappingFileRefs.add(buildMappingFileRef(xmlMappingFileRef));
-		}
-		if (! impliedMappingFileIsSpecified() && impliedMappingFileExists()) {
-			impliedMappingFileRef = buildMappingFileRef(null);
-		}
-	}
-	
-	protected void initializeSpecifiedClassRefs(XmlPersistenceUnit xmlPersistenceUnit) {
-		for (XmlJavaClassRef xmlJavaClassRef : xmlPersistenceUnit.getClasses()) {
-			specifiedClassRefs.add(buildClassRef(xmlJavaClassRef));
-		}
-	}
-	
-	protected void initializeImpliedClassRefs(XmlPersistenceUnit xmlPersistenceUnit) {
-		if (getJpaProject().discoversAnnotatedClasses() && ! isExcludeUnlistedClasses()) {
-			for (String typeName : CollectionTools.iterable(this.getJpaProject().annotatedClassNames())) {
-				if ( ! classIsSpecified(typeName)) {
-					impliedClassRefs.add(buildClassRef(typeName));
-				}
-			}
-		}
-	}
-	
-	protected void initializeProperties(XmlPersistenceUnit xmlPersistenceUnit) {
-		XmlProperties xmlProperties = xmlPersistenceUnit.getProperties();
-		if (xmlProperties == null) {
-			return;
-		}
-		for (XmlProperty xmlProperty : xmlProperties.getProperties()) {
-			this.properties.add(buildProperty(xmlProperty));
-		}
-	}
-	
-	protected void initializePersistenceUnitDefaults() {
-		PersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
-		if (persistenceUnitDefaults != null) {
-			this.defaultSchema = this.schema(persistenceUnitDefaults);
-			this.defaultCatalog = this.catalog(persistenceUnitDefaults);
-			this.defaultAccess = this.access(persistenceUnitDefaults);
-			this.defaultCascadePersist = this.cascadePersist(persistenceUnitDefaults);
-		}
-		else {
-			this.defaultSchema = null;
-			this.defaultCatalog = null;
-			this.defaultAccess = null;
-			this.defaultCascadePersist = false;		
-		}
-	}
-
-	public void update(XmlPersistenceUnit persistenceUnit) {
-		this.xmlPersistenceUnit = persistenceUnit;
-		this.generators.clear();
-		this.queries.clear();
-		updateName(persistenceUnit);
-		updateSpecifiedTransactionType(persistenceUnit);
-		updateDefaultTransactionType();
-		updateDescription(persistenceUnit);
-		updateProvider(persistenceUnit);
-		updateJtaDataSource(persistenceUnit);
-		updateNonJtaDataSource(persistenceUnit);
-		//update specified classRefs before mappingFileRefs because of 
-		//JpaFile rootStructureNode, we want the mapping file to "win",
-		//as it would in a Jpa runtime implementation
-		updateSpecifiedClassRefs(persistenceUnit);
-		updateMappingFileRefs(persistenceUnit);
-		//update implied classRefs last since they depend on both
-		//specified classRefs and mappingFileRefs
-		updateImpliedClassRefs();
-		updateExcludeUnlistedClasses(persistenceUnit);
-		updateProperties(persistenceUnit);
-		updatePersistenceUnitDefaults();
-		generatorRepositoryUpdated();
-		queryRepositoryUpdated();
-	}
-	
-	protected void updateName(XmlPersistenceUnit persistenceUnit) {
-		setName(persistenceUnit.getName());
-	}
-	
-	protected void updateSpecifiedTransactionType(XmlPersistenceUnit persistenceUnit) {
-		setSpecifiedTransactionType(specifiedTransactionType(persistenceUnit));
-	}
-	
-	protected PersistenceUnitTransactionType specifiedTransactionType(XmlPersistenceUnit persistenceUnit) {
-		return PersistenceUnitTransactionType.fromXmlResourceModel(persistenceUnit.getTransactionType());
-	}
-	
-	protected void updateDefaultTransactionType() {
-		setDefaultTransactionType(defaultTransacationType());
-	}
-	
-	protected PersistenceUnitTransactionType defaultTransacationType() {
-		// TODO - calculate default
-		//  From the JPA spec: "In a Java EE environment, if this element is not 
-		//  specified, the default is JTA. In a Java SE environment, if this element 
-		// is not specified, a default of RESOURCE_LOCAL may be assumed."
-		return null;
-	}
-	
-	protected void updateDescription(XmlPersistenceUnit persistenceUnit) {
-		setDescription(persistenceUnit.getDescription());
-	}
-	
-	protected void updateProvider(XmlPersistenceUnit persistenceUnit) {
-		setProvider(persistenceUnit.getProvider());
-	}
-	
-	protected void updateJtaDataSource(XmlPersistenceUnit persistenceUnit) {
-		setJtaDataSource(persistenceUnit.getJtaDataSource());
-	}
-	
-	protected void updateNonJtaDataSource(XmlPersistenceUnit persistenceUnit) {
-		setNonJtaDataSource(persistenceUnit.getNonJtaDataSource());
-	}
-	
-	protected void updateMappingFileRefs(XmlPersistenceUnit persistenceUnit) {
-		Iterator<MappingFileRef> stream = specifiedMappingFileRefs();
-		Iterator<XmlMappingFileRef> stream2 = new CloneIterator<XmlMappingFileRef>(persistenceUnit.getMappingFiles());//prevent ConcurrentModificiationException
-		
-		while (stream.hasNext()) {
-			MappingFileRef mappingFileRef = stream.next();
-			if (stream2.hasNext()) {
-				mappingFileRef.update(stream2.next());
-			}
-			else {
-				removeSpecifiedMappingFileRef_(mappingFileRef);
-			}
-		}
-		
-		while (stream2.hasNext()) {
-			addSpecifiedMappingFileRef_(buildMappingFileRef(stream2.next()));
-		}
-		
-		if (impliedMappingFileIsSpecified()) {
-			if (impliedMappingFileRef != null) {
-				unsetImpliedMappingFileRef();
-			}
-		}
-		else {
-			if (impliedMappingFileExists()) {
-				if (impliedMappingFileRef == null) {
-					setImpliedMappingFileRef();
-				}
-				getImpliedMappingFileRef().update(null);
-			}
-			else {
-				if (impliedMappingFileRef != null) {
-					unsetImpliedMappingFileRef();
-				}
-			}
-		}
-	}
-	
-	protected boolean impliedMappingFileIsSpecified() {
-		String impliedMappingFile = JptCorePlugin.DEFAULT_ORM_XML_FILE_PATH;
-		for (MappingFileRef each : specifiedMappingFileRefs) {
-			if (impliedMappingFile.equals(each.getFileName())) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	protected boolean impliedMappingFileExists() {
-		OrmArtifactEdit oae = OrmArtifactEdit.getArtifactEditForRead(getJpaProject().getProject());
-		OrmResource or = oae.getResource(JptCorePlugin.getDefaultOrmXmlDeploymentURI(getJpaProject().getProject()));
-		boolean exists =  or != null && or.exists();
-		oae.dispose();
-		return exists;
-	}
-	
-	protected MappingFileRef buildMappingFileRef(XmlMappingFileRef xmlMappingFileRef) {
-		return getJpaFactory().buildMappingFileRef(this, xmlMappingFileRef);
-	}
-	
-	//this is not being changed to match updateImpliedClassRefs.  In the xml,
-	//changing the class name does not imply that a new object needs to be created.
-	//If anything we should be matching ClassRefs with the corresponding XmlJavaClassRef
-	//and if there is not one the ClassRef would be removed.  We would not want to 
-	//do a name match as is done for the implied class refs.
-	protected void updateSpecifiedClassRefs(XmlPersistenceUnit persistenceUnit) {
-		Iterator<ClassRef> contextClassRefs = specifiedClassRefs();
-		Iterator<XmlJavaClassRef> resourceClassRefs = new CloneIterator<XmlJavaClassRef>(persistenceUnit.getClasses());//prevent ConcurrentModificiationException
-		
-		while (contextClassRefs.hasNext()) {
-			ClassRef contextClassRef = contextClassRefs.next();
-			if (resourceClassRefs.hasNext()) {
-				contextClassRef.update(resourceClassRefs.next());
-			}
-			else {
-				removeSpecifiedClassRef_(contextClassRef);
-			}
-		}
-		
-		while (resourceClassRefs.hasNext()) {
-			addSpecifiedClassRef_(buildClassRef(resourceClassRefs.next()));
-		}
-	}
-	
-	protected void updateImpliedClassRefs() {
-		if (isExcludeUnlistedClasses()) {
-			for (ClassRef classRef : CollectionTools.iterable(impliedClassRefs())) {
-				removeImpliedClassRef(classRef);
-			}
-			return;
-		}
-		
-		Iterator<String> annotatedClassNames = getJpaProject().annotatedClassNames();
-		Collection<ClassRef> impliedRefsToRemove = CollectionTools.collection(impliedClassRefs());
-		Collection<ClassRef> impliedRefsToUpdate = new ArrayList<ClassRef>();
-		
-		while (annotatedClassNames.hasNext()) {
-			String annotatedClassName = annotatedClassNames.next();
-			boolean impliedRefFound = false;
-			if (!classIsSpecified(annotatedClassName)) {
-				for (ClassRef classRef : impliedRefsToRemove) {
-					if (annotatedClassName.equals(classRef.getClassName())) {
-						impliedRefsToRemove.remove(classRef);
-						impliedRefsToUpdate.add(classRef);
-						impliedRefFound = true;
-						break;
-					}
-				}
-				if (!impliedRefFound) {
-					addImpliedClassRef(annotatedClassName);
-				}
-			}
-		}
-		for (ClassRef classRef : impliedRefsToRemove) {
-			removeImpliedClassRef(classRef);
-		}
-		//first handle adding/removing of the implied class refs, then update the others last, 
-		//this causes less churn in the update process
-		for (ClassRef classRef : impliedRefsToUpdate) {
-			classRef.update(classRef.getClassName());
-		}
-	}
-	
-	protected ClassRef buildClassRef(XmlJavaClassRef xmlClassRef) {
-		return getJpaFactory().buildClassRef(this, xmlClassRef);
-	}
-	
-	protected ClassRef buildClassRef(String className) {
-		return getJpaFactory().buildClassRef(this, className);
-	}
-	
-	/**
-	 * Return true if the class is specified either as a class
-	 * or listed in a mapping file
-	 */
-	protected boolean classIsSpecified(String className) {
-		for (ClassRef specifiedClassRef : CollectionTools.iterable(specifiedClassRefs())) {
-			if (className.equals(specifiedClassRef.getClassName())) {
-				return true;
-			}
-		}
-		for (MappingFileRef mappingFileRef : CollectionTools.iterable(mappingFileRefs())) {
-			if (mappingFileRef.getPersistentType(className) != null) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	protected void updateExcludeUnlistedClasses(XmlPersistenceUnit persistenceUnit) {
-		setSpecifiedExcludeUnlistedClasses(persistenceUnit.getExcludeUnlistedClasses());
-	}
-	
-	protected void updateProperties(XmlPersistenceUnit persistenceUnit) {
-		XmlProperties xmlProperties = persistenceUnit.getProperties();
-		
-		Iterator<Property> stream = properties();
-		Iterator<XmlProperty> stream2;
-		
-		if (xmlProperties == null) {
-			stream2 = EmptyIterator.instance();
-		}
-		else {
-			stream2 = new CloneIterator<XmlProperty>(xmlProperties.getProperties());//avoid ConcurrentModificationException
-		}
-		
-		while (stream.hasNext()) {
-			Property property = stream.next();
-			if (stream2.hasNext()) {
-				property.update(stream2.next());
-			}
-			else {
-				removeProperty_(property);
-			}
-		}
-		
-		while (stream2.hasNext()) {
-			addProperty_(buildProperty(stream2.next()));
-		}
-	}
-	
-	protected Property buildProperty(XmlProperty xmlProperty) {
-		return getJpaFactory().buildProperty(this, xmlProperty);
-	}
-		
-	protected void updatePersistenceUnitDefaults() {
-		PersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
-		this.setDefaultSchema(this.schema(persistenceUnitDefaults));
-		this.setDefaultCatalog(this.catalog(persistenceUnitDefaults));
-		this.setDefaultAccess(this.access(persistenceUnitDefaults));
-		this.setDefaultCascadePersist(this.cascadePersist(persistenceUnitDefaults));
-	}
-
-	protected String schema(PersistenceUnitDefaults persistenceUnitDefaults) {
-		if (persistenceUnitDefaults != null) {
-			if (persistenceUnitDefaults.getSchema() != null) {
-				return persistenceUnitDefaults.getSchema();
-			}
-		}
-		Schema projectDefaultSchema = projectDefaultSchema();
-		return projectDefaultSchema == null ? null : projectDefaultSchema.getName();
-	}
-	
-	protected Schema projectDefaultSchema() {
-		return getJpaProject().getDefaultSchema();
-	}
-
-	protected String catalog(PersistenceUnitDefaults persistenceUnitDefaults) {
-		if (persistenceUnitDefaults != null) {
-			if (persistenceUnitDefaults.getCatalog() != null) {
-				return persistenceUnitDefaults.getCatalog();
-			}
-		}
-		return projectDefaultCatalogName();
-	}
-
-	protected String projectDefaultCatalogName() {
-		Catalog catalog = getJpaProject().getConnectionProfile().getDefaultCatalog();
-		return (catalog == null) ? null : catalog.getName();
-	}
-	
-	protected AccessType access(PersistenceUnitDefaults persistenceUnitDefaults) {
-		return persistenceUnitDefaults == null ? null : persistenceUnitDefaults.getAccess();
-	}
-	
-	protected boolean cascadePersist(PersistenceUnitDefaults persistenceUnitDefaults) {
-		return persistenceUnitDefaults == null ? false : persistenceUnitDefaults.isCascadePersist();
-	}
-	
-	// This is called after the persistence unit has been updated to ensure
-	// we catch all added generators
-	protected void generatorRepositoryUpdated() {
-		fireListChanged(GENERATORS_LIST);
-	}
-	
-	// This is called after the persistence unit has been updated to ensure
-	// we catch all added queries
-	protected void queryRepositoryUpdated() {
-		fireListChanged(QUERIES_LIST);
-	}
-	
-	
-	// ********** Validation ***********************************************
-	
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		addMappingFileMessages(messages);	
-		addClassMessages(messages);
-	}
-	
-	protected void addMappingFileMessages(List<IMessage> messages) {
-		addMultipleMetadataMessages(messages);
-		addDuplicateMappingFileMessages(messages);
-		
-		for (Iterator<MappingFileRef> stream =  mappingFileRefs(); stream.hasNext();) {
-			stream.next().addToMessages(messages);
-		}
-	}
-	
-	protected void addMultipleMetadataMessages(List<IMessage> messages) {
-		Collection<PersistenceUnitDefaults> puDefaultsCollection = persistenceUnitDefaultsForValidation();
-		if (puDefaultsCollection.size() > 1) {
-			for (PersistenceUnitDefaults puDefaults : puDefaultsCollection) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.ENTITY_MAPPINGS_MULTIPLE_METADATA,
-						new String[] {this.getName()},
-						puDefaults)
-				);
-			}
-		}
-	}
-	
-	protected void addDuplicateMappingFileMessages(List<IMessage> messages) {
-		HashBag<String> fileBag = new HashBag<String>(
-				CollectionTools.collection(
-						new TransformationIterator<MappingFileRef, String>(this.mappingFileRefs()) {
-							@Override
-							protected String transform(MappingFileRef mappingFileRef) {
-								return mappingFileRef.getFileName();
-							}
-						}
-				)
-		);
-		for (MappingFileRef mappingFileRef : CollectionTools.iterable(this.mappingFileRefs())) {
-			if (fileBag.count(mappingFileRef.getFileName()) > 1) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.PERSISTENCE_UNIT_DUPLICATE_MAPPING_FILE,
-						new String[] {mappingFileRef.getFileName()}, 
-						mappingFileRef, 
-						mappingFileRef.getValidationTextRange())
-				);
-			}
-		}
-	}
-		
-	protected void addClassMessages(List<IMessage> messages) {
-		addDuplicateClassMessages(messages);
-		
-		for (ClassRef classRef : CollectionTools.iterable(classRefs())) {
-			classRef.addToMessages(messages);
-		}
-	}
-	
-	protected void addDuplicateClassMessages(List<IMessage> messages) {
-		HashBag<String> classNameBag = new HashBag<String>(
-				CollectionTools.collection(
-						new TransformationIterator<ClassRef, String>(this.classRefs()) {
-							@Override
-							protected String transform(ClassRef classRef) {
-								return classRef.getClassName();
-							}
-						}
-				)
-		);
-		for (ClassRef javaClassRef : CollectionTools.iterable(this.classRefs())) {
-			if (javaClassRef.getClassName() != null
-					&& classNameBag.count(javaClassRef.getClassName()) > 1) {
-				messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.PERSISTENCE_UNIT_DUPLICATE_CLASS,
-						new String[] {javaClassRef.getClassName()}, 
-						javaClassRef, 
-						javaClassRef.getValidationTextRange())
-				);
-			}
-		}
-	}
-	
-	private Collection<PersistenceUnitDefaults> persistenceUnitDefaultsForValidation() {
-		ArrayList<PersistenceUnitDefaults> puDefaults = new ArrayList<PersistenceUnitDefaults>();
-		for (MappingFileRef mappingFileRef : CollectionTools.iterable(mappingFileRefs())) {
-			PersistenceUnitDefaults persistenceUnitDefaults = mappingFileRef.getPersistenceUnitDefaults();
-			if (persistenceUnitDefaults != null) {
-				puDefaults.add(persistenceUnitDefaults);
-			}
-		}
-		return puDefaults;
-	}
-	
-	//*************************************
-	
-	public PersistentType getPersistentType(String fullyQualifiedTypeName) {
-		for (MappingFileRef mappingFileRef : CollectionTools.iterable(mappingFileRefs())) {
-			OrmPersistentType ormPersistentType = mappingFileRef.getPersistentType(fullyQualifiedTypeName);
-			if (ormPersistentType != null) {
-				return ormPersistentType;
-			}
-		}
-		for (ClassRef classRef : CollectionTools.iterable(classRefs())) {
-			if (classRef.isFor(fullyQualifiedTypeName)) {
-				return classRef.getJavaPersistentType();
-			}
-		}
-		return null;
-	}
-	
-	public JpaStructureNode getStructureNode(int textOffset) {
-		for (MappingFileRef mappingFileRef : CollectionTools.iterable(mappingFileRefs())) {
-			if (mappingFileRef.containsOffset(textOffset)) {
-				return mappingFileRef;
-			}
-		}
-		for (ClassRef classRef : CollectionTools.iterable(classRefs())) {
-			if (classRef.containsOffset(textOffset)) {
-				return classRef;
-			}
-		}
-		return this;
-	}
-	
-	public boolean containsOffset(int textOffset) {
-		if (xmlPersistenceUnit == null) {
-			return false;
-		}
-		return xmlPersistenceUnit.containsOffset(textOffset);
-	}
-	
-	public TextRange getSelectionTextRange() {
-		return xmlPersistenceUnit.getSelectionTextRange();
-	}
-	
-	public TextRange getValidationTextRange() {
-		return xmlPersistenceUnit.getValidationTextRange();
-	}
-	
-	@Override
-	public void toString(StringBuilder sb) {
-		super.toString(sb);
-		sb.append(getName());
-	}
-	
-	public void dispose() {
-		for (ClassRef classRef : CollectionTools.iterable(classRefs())) {
-			classRef.dispose();
-		}
-		for (MappingFileRef mappingFileRef : CollectionTools.iterable(mappingFileRefs())) {
-			mappingFileRef.dispose();
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXml.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXml.java
deleted file mode 100644
index f0d76469bc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXml.java
+++ /dev/null
@@ -1,179 +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.core.internal.context.persistence;
-
-import java.util.List;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.context.JpaRootContextNode;
-import org.eclipse.jpt.core.context.persistence.Persistence;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.core.context.persistence.PersistenceXml;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
-import org.eclipse.jpt.core.resource.persistence.PersistenceResource;
-import org.eclipse.jpt.core.resource.persistence.XmlPersistence;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class GenericPersistenceXml extends AbstractPersistenceJpaContextNode
-	implements PersistenceXml
-{
-	protected PersistenceResource persistenceResource;
-	
-	protected Persistence persistence;
-	
-	
-	public GenericPersistenceXml(JpaRootContextNode parent, PersistenceResource persistenceResource) {
-		super(parent);
-		this.initialize(persistenceResource);
-	}
-	
-	public String getId() {
-		// isn't actually displayed, so needs no details page
-		return null;
-	}
-	
-	@Override
-	public JpaRootContextNode getParent() {
-		return (JpaRootContextNode) super.getParent();
-	}
-	
-	@Override
-	public IResource getResource() {
-		return persistenceResource.getFile();
-	}
-	
-	// **************** persistence ********************************************
-	
-	public Persistence getPersistence() {
-		return persistence;
-	}
-	
-	public Persistence addPersistence() {
-		if (persistence != null) {
-			throw new IllegalStateException();
-		}
-		
-		XmlPersistence xmlPersistence = PersistenceFactory.eINSTANCE.createXmlPersistence();
-		persistence = buildPersistence(xmlPersistence);
-		persistenceResource.getContents().add(xmlPersistence);
-		firePropertyChanged(PERSISTENCE_PROPERTY, null, persistence);
-		return persistence;
-	}
-	
-	public void removePersistence() {
-		if (persistence == null) {
-			throw new IllegalStateException();
-		}
-		this.persistence.dispose();
-		Persistence oldPersistence = persistence;
-		persistence = null;
-		XmlPersistence xmlPersistence = persistenceResource.getPersistence();
-		persistenceResource.getContents().remove(xmlPersistence);
-		firePropertyChanged(PERSISTENCE_PROPERTY, oldPersistence, null);
-	}
-	
-	protected void setPersistence_(Persistence newPersistence) {
-		Persistence oldPersistence = persistence;
-		persistence = newPersistence;
-		firePropertyChanged(PERSISTENCE_PROPERTY, oldPersistence, newPersistence);
-	}
-	
-	
-	// **************** updating ***********************************************
-	
-	protected void initialize(PersistenceResource persistenceResource) {
-		this.persistenceResource = persistenceResource;
-		if (persistenceResource.getPersistence() != null) {
-			this.persistence = buildPersistence(persistenceResource.getPersistence());
-		}
-	}
-
-	public void update(PersistenceResource persistenceResource) {
-		this.persistenceResource = persistenceResource;
-		if (persistenceResource.getPersistence() != null) {
-			if (this.persistence != null) {
-				this.persistence.update(persistenceResource.getPersistence());
-			}
-			else {
-				setPersistence_(buildPersistence(persistenceResource.getPersistence()));
-			}
-		}
-		else {
-			if (getPersistence() != null) {
-				getPersistence().dispose();
-			}
-			setPersistence_(null);
-		}
-	}
-	
-	protected Persistence buildPersistence(XmlPersistence xmlPersistence) {
-		return getJpaFactory().buildPersistence(this, xmlPersistence);
-	}
-	
-	
-	// *************************************************************************
-	
-	@Override
-	public PersistenceUnit getPersistenceUnit() {
-		throw new UnsupportedOperationException("No PersistenceUnit in this context");
-	}
-	
-	
-	public JpaStructureNode getStructureNode(int textOffset) {
-		if (persistence.containsOffset(textOffset)) {
-			return persistence.getStructureNode(textOffset);
-		}
-		return this;
-	}
-	
-	// never actually selected
-	public TextRange getSelectionTextRange() {
-		return TextRange.Empty.instance();
-	}
-	
-	public TextRange getValidationTextRange() {
-		return TextRange.Empty.instance();
-	}
-	
-	
-	// **************** validation *********************************************
-	
-	private boolean okToContinueValidation = true;
-
-	@Override
-	public void addToMessages(List<IMessage> messages) {
-		super.addToMessages(messages);
-		addInvalidPersistenceXmlContentMessage(messages);
-		
-		if (okToContinueValidation){
-			getPersistence().addToMessages(messages);
-		}
-	}
-	
-	protected void addInvalidPersistenceXmlContentMessage(List<IMessage> messages) {
-		if (this.persistence == null) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.PERSISTENCE_XML_INVALID_CONTENT,
-						this)
-				);
-			okToContinueValidation = false;
-		}
-	}
-
-	public void dispose() {
-		this.persistence.dispose();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericProperty.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericProperty.java
deleted file mode 100644
index f3d17d64ec..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericProperty.java
+++ /dev/null
@@ -1,91 +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.core.internal.context.persistence;
-
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.core.context.persistence.Property;
-import org.eclipse.jpt.core.resource.persistence.XmlProperty;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-public class GenericProperty extends AbstractPersistenceJpaContextNode
-	implements Property
-{
-	protected String name;
-	
-	protected String value;
-	
-	protected XmlProperty property;
-	
-	public GenericProperty(PersistenceUnit parent, XmlProperty property) {
-		super(parent);
-		this.initialize(property);
-	}
-	
-	// **************** name ***************************************************
-	
-	public String getName() {
-		return this.name;
-	}
-	
-	public void setName(String newName) {
-		String oldName = this.name;
-		this.name = newName;
-		this.property.setName(newName);
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
-	}
-	
-	
-	// **************** value **************************************************
-	
-	public String getValue() {
-		return this.value;
-	}
-	
-	public void setValue(String newValue) {
-		String oldValue = this.value;
-		this.value = newValue;
-		this.property.setValue(newValue);
-		firePropertyChanged(VALUE_PROPERTY, oldValue, newValue);
-	}
-	
-	
-	// **************** updating ***********************************************
-	
-	protected void initialize(XmlProperty property) {
-		this.property = property;
-		this.name = property.getName();
-		this.value = property.getValue();
-	}
-	
-	public void update(XmlProperty property) {
-		this.property = property;
-		setName(property.getName());
-		setValue(property.getValue());
-	}
-	
-	// **************** validation ***********************************************
-	
-	public TextRange getValidationTextRange() {
-		return this.property.getValidationTextRange();
-	}
-	
-	// **************** toString
-	@Override
-	public void toString(StringBuilder sb)
-	{
-		sb.append(" (name: ");
-		sb.append(name);
-		sb.append(", value: ");
-		sb.append(value);
-		sb.append(')');
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetDataModelProperties.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetDataModelProperties.java
deleted file mode 100644
index c1d28a0177..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetDataModelProperties.java
+++ /dev/null
@@ -1,94 +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.core.internal.facet;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties;
-
-public interface JpaFacetDataModelProperties extends IDataModelProperties
-{
-	/**
-	 * Required, type String, identifies Jpa Platform
-	 */
-	public static final String PLATFORM_ID = "JpaFacetDataModelProperties.PLATFORM_ID";
-	
-	/**
-	 * Not required, type String, identifies database connection
-	 */
-	public static final String CONNECTION = "JpaFacetDataModelProperties.CONNECTION";
-	
-	/**
-	 * Required, type Boolean, identifies whether database connection is active
-	 */
-	public static final String CONNECTION_ACTIVE = "JpaFacetDataModelProperties.CONNECTION_ACTIVE";
-	
-	/**
-	 * Required, type Boolean, identifies if the user wishes to override default schema name
-	 */
-	public static final String USER_WANTS_TO_OVERRIDE_DEFAULT_SCHEMA = 
-		"JpaFacetDataModelProperties.USER_WANTS_TO_OVERRIDE_DEFAULT_SCHEMA";
-	
-	/**
-	 * Not required, type String, identifies the user overridden default schema name
-	 */
-	public static final String USER_OVERRIDE_DEFAULT_SCHEMA = 
-			"JpaFacetDataModelProperties.USER_OVERRIDE_DEFAULT_SCHEMA";
-	
-	/**
-	 * Internal, type IRuntime, identifies runtime associated with project
-	 * Used only in conjunction with validation of other properties, because this information
-	 * is otherwise inaccessible to this data model
-	 */
-	public static final String RUNTIME = "JpaFacetDataModelProperties.RUNTIME";
-	
-	/**
-	 * Required, type boolean, opposite of USE_USER_JPA_LIBRARY, identifies whether 
-	 * server runtime provides JPA implementation
-	 * If this is true, then the property JPA_LIBRARY is not used
-	 */
-	public static final String USE_SERVER_JPA_IMPLEMENTATION = "JpaFacetDataModelProperties.USE_SERVER_JPA_IMPLEMENTATION";
-	
-	/**
-	 * Required, type boolean, opposite of USE_SERVER_JPA_IMPLEMENTATION, identifies
-	 * whether the user is providing his own JPA library 
-	 * (This additional setting is necessary in order to use synchHelper within
-	 * the wizard - there must be a unique property for each radio button. Stupid
-	 * but true)
-	 * If this is true, then the property JPA_LIBRARY is used
-	 */
-	public static final String USE_USER_JPA_LIBRARY = "JpaFacetDataModelProperties.USE_USER_JPA_LIBRARY";
-	
-	/**
-	 * Not required, type String, identifies JPA implementation library.
-	 * Only used if the property USE_SERVER_JPA_IMPLEMENTATION is false.
-	 */
-	public static final String JPA_LIBRARY = "JpaFacetDataModelProperties.JPA_LIBRARY";
-	
-	/**
-	 * Required, type boolean, opposite of LIST_ANNOTATED_CLASSES, identifies 
-	 * whether all annotated classes are to be automatically included as part of 
-	 * all persistence units
-	 */
-	public static final String DISCOVER_ANNOTATED_CLASSES = "JpaFacetDataModelProperties.DISCOVER_ANNOTATED_CLASSES";
-	
-	/**
-	 * Required, type boolean, opposite of DISCOVER_ANNOTATED_CLASSES, identifies
-	 * if annotated classes should be listed in the persistence.xml in order to
-	 * be considered part of a persistence unit
-	 * (This additional setting is necessary in order to use synchHelper within
-	 * the wizard - there must be a unique property for each radio button. Stupid
-	 * but true)
-	 */
-	public static final String LIST_ANNOTATED_CLASSES = "JpaFacetDataModelProperties.LIST_ANNOTATED_CLASSES";
-	
-	/**
-	 * Required, type boolean, details whether orm.xml should be created
-	 */
-	public static final String CREATE_ORM_XML = "JpaFacetDataModelProperties.CREATE_ORM_XML";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetDataModelProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetDataModelProvider.java
deleted file mode 100644
index 579e40ba9f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetDataModelProvider.java
+++ /dev/null
@@ -1,416 +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.core.internal.facet;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.internal.JptCoreMessages;
-import org.eclipse.jpt.core.internal.platform.JpaPlatformRegistry;
-import org.eclipse.jpt.db.ConnectionProfile;
-import org.eclipse.jpt.db.JptDbPlugin;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.CompositeIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public class JpaFacetDataModelProvider extends FacetInstallDataModelProvider
-	implements JpaFacetDataModelProperties
-{
-	private static final String EJB_FACET_ID = IModuleConstants.JST_EJB_MODULE;
-
-	private static final String RUNTIME_NONE = 
-			WTPCommonPlugin.getResourceString(WTPCommonMessages.RUNTIME_NONE, null);
-	
-	private static final IStatus PLATFORM_NOT_SPECIFIED_STATUS = 
-			buildErrorStatus(JptCoreMessages.VALIDATE_PLATFORM_NOT_SPECIFIED);
-	
-	private static final IStatus CONNECTION_NOT_CONNECTED_STATUS = 
-			buildInfoStatus(JptCoreMessages.VALIDATE_CONNECTION_NOT_CONNECTED);
-	
-	private static final IStatus USER_OVERRIDE_DEFAULT_SCHEMA_NOT_SPECIFIED_STATUS = 
-			buildErrorStatus(JptCoreMessages.VALIDATE_DEFAULT_SCHEMA_NOT_SPECIFIED);
-	
-	private static final IStatus RUNTIME_NOT_SPECIFIED_STATUS = 
-			buildWarningStatus(JptCoreMessages.VALIDATE_RUNTIME_NOT_SPECIFIED);
-	
-	private static final IStatus RUNTIME_DOES_NOT_SUPPORT_EJB_30_STATUS = 
-			buildWarningStatus(JptCoreMessages.VALIDATE_RUNTIME_DOES_NOT_SUPPORT_EJB_30);
-	
-	private static final IStatus LIBRARY_NOT_SPECIFIED_STATUS = 
-			buildWarningStatus(JptCoreMessages.VALIDATE_LIBRARY_NOT_SPECIFIED);
-
-	/**
-	 * required default constructor
-	 */
-	public JpaFacetDataModelProvider() {
-		super();
-	}
-
-
-	@Override
-	public Set<String> getPropertyNames() {
-		Set<String> propertyNames = super.getPropertyNames();
-		propertyNames.add(PLATFORM_ID);
-		propertyNames.add(CONNECTION);
-		propertyNames.add(CONNECTION_ACTIVE);
-		propertyNames.add(USER_WANTS_TO_OVERRIDE_DEFAULT_SCHEMA);
-		propertyNames.add(USER_OVERRIDE_DEFAULT_SCHEMA);
-		propertyNames.add(RUNTIME);
-		propertyNames.add(USE_SERVER_JPA_IMPLEMENTATION);
-		propertyNames.add(USE_USER_JPA_LIBRARY);
-		propertyNames.add(JPA_LIBRARY);
-		propertyNames.add(DISCOVER_ANNOTATED_CLASSES);
-		propertyNames.add(LIST_ANNOTATED_CLASSES);
-		propertyNames.add(CREATE_ORM_XML);
-		return propertyNames;
-	}
-	
-	@Override
-	public boolean isPropertyEnabled(String propertyName) {
-		if (propertyName.equals(USER_OVERRIDE_DEFAULT_SCHEMA)) {
-			return getBooleanProperty(USER_WANTS_TO_OVERRIDE_DEFAULT_SCHEMA);
-		}
-		if (propertyName.equals(JPA_LIBRARY)) {
-			return getBooleanProperty(USE_USER_JPA_LIBRARY);
-		}
-		return super.isPropertyEnabled(propertyName);
-	}
-	
-	@Override
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(FACET_ID)) {
-			return JptCorePlugin.FACET_ID;
-		}
-		if (propertyName.equals(PLATFORM_ID)) {
-			return JptCorePlugin.getDefaultJpaPlatformId();
-		}
-		if (propertyName.equals(CONNECTION)) {
-			return null;
-		}
-		if (propertyName.equals(CONNECTION_ACTIVE)) {
-			return connectionIsActive();
-		}
-		if (propertyName.equals(USER_WANTS_TO_OVERRIDE_DEFAULT_SCHEMA)) {
-			return Boolean.FALSE;
-		}
-		if (propertyName.equals(USER_OVERRIDE_DEFAULT_SCHEMA)) {
-			return getDefaultSchemaName();
-		}
-		if (propertyName.equals(RUNTIME)) {
-			return null;
-		}
-		if (propertyName.equals(USE_SERVER_JPA_IMPLEMENTATION)) {
-			return Boolean.valueOf(this.runtimeSupportsEjb30(this.runtime()));
-		}
-		if (propertyName.equals(USE_USER_JPA_LIBRARY)) {
-			return ! getBooleanProperty(USE_SERVER_JPA_IMPLEMENTATION);
-		}
-		if (propertyName.equals(JPA_LIBRARY)) {
-			return JptCorePlugin.getDefaultJpaLibrary();
-		}
-		if (propertyName.equals(DISCOVER_ANNOTATED_CLASSES)) {
-			return Boolean.valueOf(this.runtimeSupportsEjb30(this.runtime()));
-		}
-		if (propertyName.equals(LIST_ANNOTATED_CLASSES)) {
-			return ! getBooleanProperty(DISCOVER_ANNOTATED_CLASSES);
-		}
-		if (propertyName.equals(CREATE_ORM_XML)) {
-			return Boolean.TRUE;
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-	
-	
-	
-	@Override
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		boolean ok = super.propertySet(propertyName, propertyValue);
-		if (propertyName.equals(RUNTIME)) {
-			this.model.notifyPropertyChange(USE_SERVER_JPA_IMPLEMENTATION, IDataModel.DEFAULT_CHG);
-			this.model.notifyPropertyChange(USE_USER_JPA_LIBRARY, IDataModel.DEFAULT_CHG);
-			// need to fire that the default change for using user library may have
-			// actually changed enablement for library
-			this.model.notifyPropertyChange(JPA_LIBRARY, IDataModel.ENABLE_CHG);
-			this.model.notifyPropertyChange(DISCOVER_ANNOTATED_CLASSES, IDataModel.DEFAULT_CHG);
-			this.model.notifyPropertyChange(LIST_ANNOTATED_CLASSES, IDataModel.DEFAULT_CHG);
-		}
-		if (propertyName.equals(CONNECTION)) {
-			this.model.notifyPropertyChange(CONNECTION, IDataModel.VALID_VALUES_CHG);
-			this.model.setBooleanProperty(CONNECTION_ACTIVE, connectionIsActive());
-			this.model.notifyPropertyChange(USER_OVERRIDE_DEFAULT_SCHEMA, IDataModel.DEFAULT_CHG);
-			this.model.notifyPropertyChange(USER_OVERRIDE_DEFAULT_SCHEMA, IDataModel.VALID_VALUES_CHG);
-		}
-		if (propertyName.equals(CONNECTION_ACTIVE)) {
-			this.model.notifyPropertyChange(USER_OVERRIDE_DEFAULT_SCHEMA, IDataModel.DEFAULT_CHG);
-			this.model.notifyPropertyChange(USER_OVERRIDE_DEFAULT_SCHEMA, IDataModel.VALID_VALUES_CHG);
-		}
-		if (propertyName.equals(USER_WANTS_TO_OVERRIDE_DEFAULT_SCHEMA)) {
-			this.model.notifyPropertyChange(USER_OVERRIDE_DEFAULT_SCHEMA, IDataModel.ENABLE_CHG);
-			if (! (Boolean) propertyValue) {
-				this.model.setProperty(USER_OVERRIDE_DEFAULT_SCHEMA, null);
-			}
-		}
-		if (propertyName.equals(USE_SERVER_JPA_IMPLEMENTATION)) {
-			this.model.setBooleanProperty(USE_USER_JPA_LIBRARY, ! (Boolean) propertyValue);
-		}
-		if (propertyName.equals(USE_USER_JPA_LIBRARY)) {
-			this.model.setBooleanProperty(USE_SERVER_JPA_IMPLEMENTATION, ! (Boolean) propertyValue);
-			this.model.notifyPropertyChange(JPA_LIBRARY, IDataModel.ENABLE_CHG);
-		}
-		if (propertyName.equals(DISCOVER_ANNOTATED_CLASSES)) {
-			this.model.setBooleanProperty(LIST_ANNOTATED_CLASSES, ! (Boolean) propertyValue);
-		}
-		if (propertyName.equals(LIST_ANNOTATED_CLASSES)) {
-			this.model.setBooleanProperty(DISCOVER_ANNOTATED_CLASSES, ! (Boolean) propertyValue);
-		}
-		return ok;
-	}
-
-	@Override
-	public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
-		if (propertyName.equals(PLATFORM_ID)) {
-			return CollectionTools.array(
-				new TransformationIterator<String, DataModelPropertyDescriptor>(
-						JpaPlatformRegistry.instance().jpaPlatformIds()) {
-					@Override
-					protected DataModelPropertyDescriptor transform(String platformId) {
-						return platformIdPropertyDescriptor(platformId);
-					}
-				},
-				new DataModelPropertyDescriptor[0]);
-		}
-		if (propertyName.equals(CONNECTION)) {
-			return CollectionTools.array(
-				new TransformationIterator<String, DataModelPropertyDescriptor>(
-						new CompositeIterator<String>(null, connectionNames())) {
-					@Override
-					protected DataModelPropertyDescriptor transform(String next) {
-						return connectionPropertyDescriptor(next);
-					}
-				},
-				new DataModelPropertyDescriptor[0]);
-		}
-		if (propertyName.equals(USER_OVERRIDE_DEFAULT_SCHEMA)) {
-			return CollectionTools.array(
-				new TransformationIterator<String, DataModelPropertyDescriptor>(schemas()) {
-					@Override
-					protected DataModelPropertyDescriptor transform(String next) {
-						return new DataModelPropertyDescriptor(next);
-					}
-				},
-				new DataModelPropertyDescriptor[0]);
-		}
-		if (propertyName.equals(JPA_LIBRARY)) {
-			String[] libraries = CollectionTools.sort(JavaCore.getUserLibraryNames());
-			DataModelPropertyDescriptor[] descriptors = new DataModelPropertyDescriptor[libraries.length + 1];
-			descriptors[0] = new DataModelPropertyDescriptor("", RUNTIME_NONE);
-
-			int i = 1;
-			for (String library : libraries) {
-				descriptors[i++] = new DataModelPropertyDescriptor(library, library);
-			}
-			return descriptors;
-		}
-
-		return super.getValidPropertyDescriptors(propertyName);
-	}
-	
-	@Override
-	public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName) {
-		if (propertyName.equals(PLATFORM_ID)) {
-			return platformIdPropertyDescriptor(getStringProperty(PLATFORM_ID));
-		}
-		if (propertyName.equals(CONNECTION)) {
-			return connectionPropertyDescriptor(getStringProperty(CONNECTION));
-		}
-		return super.getPropertyDescriptor(propertyName);
-	}
-	
-	private DataModelPropertyDescriptor platformIdPropertyDescriptor(String platformId) {
-		return new DataModelPropertyDescriptor(
-			platformId, JpaPlatformRegistry.instance().getJpaPlatformLabel(platformId));
-	}
-	
-	private DataModelPropertyDescriptor connectionPropertyDescriptor(String connection) {
-		if (StringTools.stringIsEmpty(connection)) {
-			return new DataModelPropertyDescriptor(null, JptCoreMessages.NONE);
-		}
-		else {
-			return new DataModelPropertyDescriptor(connection);
-		}
-	}
-
-	@Override
-	public IStatus validate(String name) {
-		if (name.equals(PLATFORM_ID)) {
-			return this.validatePlatformId(this.getStringProperty(name));
-		}
-		if (name.equals(CONNECTION)) {
-			return this.validateConnectionName(this.getStringProperty(name));
-		}
-		if (name.equals(USER_WANTS_TO_OVERRIDE_DEFAULT_SCHEMA)
-				|| name.equals(USER_OVERRIDE_DEFAULT_SCHEMA)) {
-			return this.validateUserOverrideDefaultSchema();
-		}
-		if (name.equals(USE_SERVER_JPA_IMPLEMENTATION)) {
-			return this.validateJpaLibrary(this.getBooleanProperty(name));
-		}
-		if (name.equals(DISCOVER_ANNOTATED_CLASSES)) {
-			return this.validatePersistentClassManagement(this.getBooleanProperty(name));
-		}
-		return super.validate(name);
-	}
-
-	private IRuntime runtime() {
-		return (IRuntime) this.getProperty(RUNTIME);
-	}
-
-	private boolean runtimeSupportsEjb30(IRuntime runtime) {
-		IProjectFacetVersion ejb30 = ProjectFacetsManager.getProjectFacet(EJB_FACET_ID).getVersion("3.0");
-		return (runtime == null) ? false : runtime.supports(ejb30);
-	}
-	
-	private ConnectionProfile getConnection() {
-		String connectionName = getStringProperty(CONNECTION);
-		return JptDbPlugin.instance().getConnectionProfileRepository().connectionProfileNamed(connectionName);
-	}
-	
-	private boolean connectionIsActive() {
-		return getConnection().isActive();
-	}
-	
-	private Iterator<String> connectionNames() {
-		String setValue = getStringProperty(CONNECTION);
-		
-		List<String> connectionNames = CollectionTools.sort(CollectionTools.list(
-			JptDbPlugin.instance().getConnectionProfileRepository().connectionProfileNames()));
-		
-		if (! StringTools.stringIsEmpty(setValue) && ! connectionNames.contains(setValue)) {
-			return new CompositeIterator<String>(setValue, connectionNames.iterator());
-		}
-		else {
-			return connectionNames.iterator();
-		}
-	}
-	
-	private String getDefaultSchemaName() {
-		Schema defaultSchema = getConnection().getDefaultSchema();
-		return (defaultSchema == null) ? null : defaultSchema.getName();
-	}
-	
-	private Iterator<String> schemas() {
-		String setValue = getStringProperty(USER_OVERRIDE_DEFAULT_SCHEMA);
-		
-		List<String> schemas = CollectionTools.sort(CollectionTools.list(
-			new TransformationIterator<Schema, String>(getConnection().getDatabase().schemata()) {
-				@Override
-				protected String transform(Schema next) {
-					return next.getName();
-				}
-			}));
-		
-		if (! StringTools.stringIsEmpty(setValue) && ! schemas.contains(setValue)) {
-			return new CompositeIterator<String>(setValue, schemas.iterator());
-		}
-		else {
-			return schemas.iterator();
-		}
-	}
-
-
-	// ********** validation **********
-
-	private IStatus validatePlatformId(String platformId) {
-		return StringTools.stringIsEmpty(platformId) ?
-				PLATFORM_NOT_SPECIFIED_STATUS
-			:
-				OK_STATUS;
-	}
-
-	private IStatus validateConnectionName(String connectionName) {
-		if (StringTools.stringIsEmpty(connectionName)) {
-			return OK_STATUS;
-		}
-		ConnectionProfile connectionProfile = JptDbPlugin.instance().getConnectionProfileRepository().connectionProfileNamed(connectionName);
-		if (connectionProfile.isNull()) {
-			return buildErrorStatus(JptCoreMessages.bind(JptCoreMessages.VALIDATE_CONNECTION_INVALID, connectionName));
-	
-		}
-		if (! connectionProfile.isActive()) {
-			return CONNECTION_NOT_CONNECTED_STATUS;
-		}
-		return OK_STATUS;
-	}
-	
-	private IStatus validateUserOverrideDefaultSchema() {
-		if (getBooleanProperty(USER_WANTS_TO_OVERRIDE_DEFAULT_SCHEMA)) {
-			if (StringTools.stringIsEmpty(getStringProperty(USER_OVERRIDE_DEFAULT_SCHEMA))) {
-				return USER_OVERRIDE_DEFAULT_SCHEMA_NOT_SPECIFIED_STATUS;
-			}
-		}
-		return OK_STATUS;
-	}
-
-	private IStatus validateJpaLibrary(boolean useServerJpaImplementation) {
-		if (useServerJpaImplementation) {
-			IRuntime runtime = this.runtime();
-			if (runtime == null) {
-				return RUNTIME_NOT_SPECIFIED_STATUS;
-			}
-			if ( ! this.runtimeSupportsEjb30(runtime)) {
-				return RUNTIME_DOES_NOT_SUPPORT_EJB_30_STATUS;
-			}
-		} else {
-			if (StringTools.stringIsEmpty(this.getStringProperty(JPA_LIBRARY))) {
-				return LIBRARY_NOT_SPECIFIED_STATUS;
-			}
-		}
-		return OK_STATUS;
-	}
-
-	private IStatus validatePersistentClassManagement(boolean discoverAnnotatedClasses) {
-		// TODO warning if "discovery" is used, but no runtime specified ??
-		return OK_STATUS;
-	}
-
-
-	// ********** static methods **********
-
-	private static IStatus buildInfoStatus(String message) {
-		return buildStatus(IStatus.INFO, message);
-	}
-
-	private static IStatus buildWarningStatus(String message) {
-		return buildStatus(IStatus.WARNING, message);
-	}
-
-	private static IStatus buildErrorStatus(String message) {
-		return buildStatus(IStatus.ERROR, message);
-	}
-
-	private static IStatus buildStatus(int severity, String message) {
-		return new Status(severity, JptCorePlugin.PLUGIN_ID, message);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetInstallDelegate.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetInstallDelegate.java
deleted file mode 100644
index f9c295e591..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetInstallDelegate.java
+++ /dev/null
@@ -1,133 +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.core.internal.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil;
-import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * We don't really "install" the JPA facet here. We simply store all the various
- * data model properties in the appropriate preferences. These settings will
- * used in the POST_INSTALL event listener to build the JPA project.
- */
-public class JpaFacetInstallDelegate 
-	implements IDelegate, JpaFacetDataModelProperties
-{
-
-	public void execute(IProject project, IProjectFacetVersion fv, 
-				Object config, IProgressMonitor monitor) throws CoreException {
-		monitor = this.nonNullMonitor(monitor);
-		try {
-			this.execute_(project, fv, config, monitor);
-		} finally {
-			monitor.done();
-		}
-	}
-
-	private void execute_(IProject project, IProjectFacetVersion fv, 
-				Object config, IProgressMonitor monitor) throws CoreException {
-		
-		monitor.beginTask("", 1); //$NON-NLS-1$
-
-		// NB: WTP Natures (including the JavaEMFNature)
-		// should already be added, as this facet should 
-		// always coexist with a module facet.
-
-		IJavaProject javaProject = JavaCore.create(project);
-		IDataModel dataModel = (IDataModel) config;
-		this.configureClasspath(javaProject, dataModel, monitor);
-		
-		// project settings
-		JptCorePlugin.setJpaPlatformId(project, dataModel.getStringProperty(PLATFORM_ID));
-		JptCorePlugin.setConnectionProfileName(project, dataModel.getStringProperty(CONNECTION));
-		if (dataModel.getBooleanProperty(USER_WANTS_TO_OVERRIDE_DEFAULT_SCHEMA)) {
-			JptCorePlugin.setUserOverrideDefaultSchemaName(project, dataModel.getStringProperty(USER_OVERRIDE_DEFAULT_SCHEMA));
-		}
-		JptCorePlugin.setDiscoverAnnotatedClasses(project, dataModel.getBooleanProperty(DISCOVER_ANNOTATED_CLASSES));
-		
-		// defaults settings
-		JptCorePlugin.setDefaultJpaPlatformId(dataModel.getStringProperty(PLATFORM_ID));
-		
-		monitor.worked(1);
-	}
-
-	private void configureClasspath(IJavaProject javaProject, IDataModel dataModel, IProgressMonitor monitor) throws CoreException {
-		boolean useServerLibrary = dataModel.getBooleanProperty(USE_SERVER_JPA_IMPLEMENTATION);
-		if (useServerLibrary) {
-			return;
-		}
-
-		String jpaLibrary = dataModel.getStringProperty(JPA_LIBRARY);
-		if (StringTools.stringIsEmpty(jpaLibrary)) {
-			return;
-		}
-
-		// build the JPA library to be added to the classpath
-		IClasspathAttribute[] attributes = this.buildClasspathAttributes(javaProject.getProject());
-		IClasspathEntry jpaLibraryEntry = 
-			JavaCore.newContainerEntry(
-				new Path(JavaCore.USER_LIBRARY_CONTAINER_ID + "/" + jpaLibrary),
-				null, attributes, true
-			);
-
-		// if the JPA library is already there, do nothing
-		IClasspathEntry[] classpath = javaProject.getRawClasspath();
-		if (CollectionTools.contains(classpath, jpaLibraryEntry)) {
-			return;
-		}
-
-		// add the JPA library to the classpath
-		int len = classpath.length;
-		IClasspathEntry[] newClasspath = new IClasspathEntry[len + 1];
-		System.arraycopy(classpath, 0, newClasspath, 0, len);
-		newClasspath[len] = jpaLibraryEntry;
-		javaProject.setRawClasspath(newClasspath, monitor);
-	}
-
-	private static final IClasspathAttribute[] EMPTY_CLASSPATH_ATTRIBUTES = new IClasspathAttribute[0];
-
-	private IClasspathAttribute[] buildClasspathAttributes(IProject project) {
-		boolean webApp = JptCorePlugin.projectHasWebFacet(project);
-		if ( ! webApp && this.projectIsStandalone(project)) {
-			return EMPTY_CLASSPATH_ATTRIBUTES;
-		}
-		return new IClasspathAttribute[] {
-				JavaCore.newClasspathAttribute(
-					IClasspathDependencyConstants.CLASSPATH_COMPONENT_DEPENDENCY,
-					ClasspathDependencyUtil.getDefaultRuntimePath(webApp).toString()
-				)
-		};
-	}
-
-	private boolean projectIsStandalone(IProject project) {
-		return EarUtilities.isStandaloneProject(project);
-	}
-
-	private IProgressMonitor nonNullMonitor(IProgressMonitor monitor) {
-		return (monitor != null) ? monitor : new NullProgressMonitor();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetUninstallDelegate.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetUninstallDelegate.java
deleted file mode 100644
index acdfa2dff5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetUninstallDelegate.java
+++ /dev/null
@@ -1,31 +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.core.internal.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class JpaFacetUninstallDelegate 
-	implements IDelegate 
-{
-	public void execute(IProject project, IProjectFacetVersion fv,
-			Object config, IProgressMonitor monitor) throws CoreException {
-		
-		// There is nothing to do here.  Everything is taken care of by the 
-		// JpaModelManager *whenever* the facet is removed (even via meta-file
-		// editing and CVS updating), but this delegate needs to be here because
-		// it is required by the facet extension point action element, and that 
-		// is required by the facet UI to allow uninstallation of this facet.
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/operations/OrmFileCreationDataModelProperties.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/operations/OrmFileCreationDataModelProperties.java
deleted file mode 100644
index 908a3bb0d7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/operations/OrmFileCreationDataModelProperties.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.core.internal.operations;
-
-public interface OrmFileCreationDataModelProperties
-{
-	/**
-	 * Required, type String, identifies the name of the project in which to create the file
-	 */
-	public static final String PROJECT_NAME = "OrmFileCreationDataModelProperties.PROJECT_NAME";
-	
-	/**
-	 * Required, type String, identifies the fully pathed source folder in which to create the file
-	 */
-	public static final String SOURCE_FOLDER = "OrmFileCreationDataModelProperties.SOURCE_FOLDER";
-	
-	/**
-	 * Required, type String, identifies the file path relative to the source folder
-	 */
-	public static final String FILE_PATH = "OrmFileCreationDataModelProperties.FILE_PATH";
-	
-	/**
-	 * Optional, type AccessType, specifies the default access type (or null)
-	 */
-	public static final String DEFAULT_ACCESS = "OrmFileCreationDataModelProperties.DEFAULT_ACCESS";
-	
-	/**
-	 * Required, type Boolean, specifies whether to add a reference to the file
-	 * in the persistence unit
-	 */
-	public static final String ADD_TO_PERSISTENCE_UNIT = "OrmFileCreationDataModelProperties.ADD_TO_PERSISTENCE_UNIT";
-	
-	/**
-	 * Optional (unless ADD_TO_PERSISTENCE_UNIT property is true), type String, 
-	 * identifies the persistence unit to which to add a reference to the file
-	 */
-	public static final String PERSISTENCE_UNIT = "OrmFileCreationDataModelProperties.PERSISTENCE_UNIT";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/operations/OrmFileCreationDataModelProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/operations/OrmFileCreationDataModelProvider.java
deleted file mode 100644
index 57f2854a82..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/operations/OrmFileCreationDataModelProvider.java
+++ /dev/null
@@ -1,479 +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.core.internal.operations;
-
-import java.util.Iterator;
-import java.util.Set;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.context.persistence.Persistence;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.core.context.persistence.PersistenceXml;
-import org.eclipse.jpt.core.internal.JptCoreMessages;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-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;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-
-public class OrmFileCreationDataModelProvider extends AbstractDataModelProvider
-	implements OrmFileCreationDataModelProperties
-{
-	/**
-	 * required default constructor
-	 */
-	public OrmFileCreationDataModelProvider() {
-		super();
-	}
-	
-	
-	@Override
-	public IDataModelOperation getDefaultOperation() {
-		return new OrmFileCreationOperation(getDataModel());
-	}
-	
-	@Override
-	public Set<String> getPropertyNames() {
-		@SuppressWarnings("unchecked")
-		Set<String> propertyNames = super.getPropertyNames();
-		propertyNames.add(PROJECT_NAME);
-		propertyNames.add(SOURCE_FOLDER);
-		propertyNames.add(FILE_PATH);
-		propertyNames.add(DEFAULT_ACCESS);
-		propertyNames.add(ADD_TO_PERSISTENCE_UNIT);
-		propertyNames.add(PERSISTENCE_UNIT);
-		return propertyNames;
-	}
-	
-	@Override
-	public boolean isPropertyEnabled(String propertyName) {
-		if (propertyName.equals(PERSISTENCE_UNIT)) {
-			return getBooleanProperty(ADD_TO_PERSISTENCE_UNIT);
-		}
-		return super.isPropertyEnabled(propertyName);
-	}
-	
-	@Override
-	public Object getDefaultProperty(String propertyName) {
-		if (propertyName.equals(SOURCE_FOLDER)) {
-			IFolder sourceFolder = getDefaultSourceFolder();
-			if (sourceFolder != null && sourceFolder.exists()) {
-				return sourceFolder.getFullPath().toPortableString();
-			}
-		}
-		else if (propertyName.equals(FILE_PATH)) {
-			return new Path(JptCorePlugin.DEFAULT_ORM_XML_FILE_PATH).toPortableString();
-		}
-		else if (propertyName.equals(DEFAULT_ACCESS)) {
-			return null;
-		}
-		else if (propertyName.equals(ADD_TO_PERSISTENCE_UNIT)) {
-			return Boolean.FALSE;
-		}
-		else if (propertyName.equals(PERSISTENCE_UNIT)) {
-			PersistenceUnit pUnit = getDefaultPersistenceUnit();
-			if (pUnit != null) {
-				return pUnit.getName();
-			}
-		}
-		return super.getDefaultProperty(propertyName);
-	}
-	
-	@Override
-	public boolean propertySet(String propertyName, Object propertyValue) {
-		boolean ok = super.propertySet(propertyName, propertyValue);
-		if (propertyName.equals(PROJECT_NAME)) {
-			this.model.notifyPropertyChange(SOURCE_FOLDER, IDataModel.DEFAULT_CHG);
-			this.model.notifyPropertyChange(PERSISTENCE_UNIT, IDataModel.DEFAULT_CHG);
-			this.model.notifyPropertyChange(PERSISTENCE_UNIT, IDataModel.VALID_VALUES_CHG);
-		}
-		else if (propertyName.equals(ADD_TO_PERSISTENCE_UNIT)) {
-			this.model.notifyPropertyChange(PERSISTENCE_UNIT, IDataModel.ENABLE_CHG);
-		}
-		return ok;
-	}
-	
-	@Override
-	public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
-		if (propertyName.equals(PROJECT_NAME)) {
-			return CollectionTools.array(
-				new TransformationIterator<IProject, DataModelPropertyDescriptor>(jpaIProjects()) {
-					@Override
-					protected DataModelPropertyDescriptor transform(IProject next) {
-						return new DataModelPropertyDescriptor(next.getName());
-					}
-				},
-				new DataModelPropertyDescriptor[0]);
-		}
-		else if (propertyName.equals(DEFAULT_ACCESS)) {
-			DataModelPropertyDescriptor[] accessTypes = new DataModelPropertyDescriptor[3];
-			accessTypes[0] = accessPropertyDescriptor(null);
-			accessTypes[1] = accessPropertyDescriptor(AccessType.FIELD);
-			accessTypes[2] = accessPropertyDescriptor(AccessType.PROPERTY);
-			return accessTypes;
-		}
-		else if (propertyName.equals(PERSISTENCE_UNIT)) {
-			return CollectionTools.array(
-				new TransformationIterator<String, DataModelPropertyDescriptor>(new CompositeIterator<String>(null, persistenceUnitNames())) {
-					@Override
-					protected DataModelPropertyDescriptor transform(String next) {
-						return persistenceUnitPropertyDescriptor(next);
-					}
-				},
-				new DataModelPropertyDescriptor[0]);
-				
-		}
-		return super.getValidPropertyDescriptors(propertyName);
-	}
-	
-	@Override
-	public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName) {
-		if (propertyName.equals(PROJECT_NAME)) {
-			return new DataModelPropertyDescriptor(getStringProperty(PROJECT_NAME));
-		}
-		else if (propertyName.equals(DEFAULT_ACCESS)) {
-			return accessPropertyDescriptor((AccessType) getProperty(DEFAULT_ACCESS)); 
-		}
-		else if (propertyName.equals(PERSISTENCE_UNIT)) {
-			return persistenceUnitPropertyDescriptor(getStringProperty(PERSISTENCE_UNIT));
-		}
-		return super.getPropertyDescriptor(propertyName);
-	}
-	
-	private DataModelPropertyDescriptor accessPropertyDescriptor(AccessType accessType) {
-		if (accessType == null) {
-			return new DataModelPropertyDescriptor(null, JptCoreMessages.NONE);
-		}
-		else {
-			return new DataModelPropertyDescriptor(accessType, accessType.getName());
-		}
-	}
-	
-	private DataModelPropertyDescriptor persistenceUnitPropertyDescriptor(String persistenceUnitName) {
-		if (StringTools.stringIsEmpty(persistenceUnitName)) {
-			return new DataModelPropertyDescriptor(null, JptCoreMessages.NONE);
-		}
-		else {
-			return new DataModelPropertyDescriptor(persistenceUnitName);
-		}
-	}
-	
-	
-	// **************** validation *********************************************
-	
-	@Override
-	public IStatus validate(String propertyName) {
-		if (propertyName.equals(PROJECT_NAME)
-				|| propertyName.equals(SOURCE_FOLDER)
-				|| propertyName.equals(FILE_PATH)) {
-			return validateProjectSourceFolderAndFilePath();
-		}
-		else if (propertyName.equals(ADD_TO_PERSISTENCE_UNIT)
-				|| propertyName.equals(PERSISTENCE_UNIT)) {
-			return validatePersistenceUnit();
-		}
-		return super.validate(propertyName);
-	}
-	
-	private IStatus validateProjectSourceFolderAndFilePath() {
-		String projectName = (String) getProperty(PROJECT_NAME);
-		if (StringTools.stringIsEmpty(projectName)) {
-			return new Status(
-				IStatus.ERROR, JptCorePlugin.PLUGIN_ID, 
-				JptCoreMessages.VALIDATE_PROJECT_NOT_SPECIFIED);
-		}
-		String sourceFolderPath = getStringProperty(SOURCE_FOLDER);
-		if (StringTools.stringIsEmpty(sourceFolderPath)) {
-			return new Status(
-				IStatus.ERROR, JptCorePlugin.PLUGIN_ID,
-				JptCoreMessages.VALIDATE_SOURCE_FOLDER_NOT_SPECIFIED);
-		}
-		if (sourceFolderIsIllegal(sourceFolderPath)) {
-			return new Status(
-				IStatus.ERROR, JptCorePlugin.PLUGIN_ID,
-				JptCoreMessages.VALIDATE_SOURCE_FOLDER_ILLEGAL);
-		}
-		if (sourceFolderNotInProject(sourceFolderPath)) {
-			return new Status(
-				IStatus.ERROR, JptCorePlugin.PLUGIN_ID,
-				JptCoreMessages.bind(
-					JptCoreMessages.VALIDATE_SOURCE_FOLDER_NOT_IN_PROJECT, 
-					sourceFolderPath, projectName));
-		}
-		if (getVerifiedSourceFolder() == null) {
-			return new Status(
-				IStatus.ERROR, JptCorePlugin.PLUGIN_ID,
-				JptCoreMessages.bind(JptCoreMessages.VALIDATE_SOURCE_FOLDER_DOES_NOT_EXIST, sourceFolderPath));
-		}
-		if (getVerifiedJavaSourceFolder() == null) {
-			return new Status(
-				IStatus.ERROR, JptCorePlugin.PLUGIN_ID,
-				JptCoreMessages.bind(JptCoreMessages.VALIDATE_SOURCE_FOLDER_NOT_SOURCE_FOLDER, sourceFolderPath));
-		}
-		if (getExistingOrmFile() != null) {
-			return new Status(
-				IStatus.ERROR, JptCorePlugin.PLUGIN_ID,
-				JptCoreMessages.VALIDATE_ORM_FILE_ALREADY_EXISTS);
-		}
-		return Status.OK_STATUS;
-	}
-	
-	private IStatus validatePersistenceUnit() {
-		boolean addToPUnit = getBooleanProperty(ADD_TO_PERSISTENCE_UNIT);
-		String projectName = getStringProperty(PROJECT_NAME);
-		String pUnitName = getStringProperty(PERSISTENCE_UNIT);
-		if (addToPUnit) {
-			if (StringTools.stringIsEmpty(pUnitName)) {
-				return new Status(
-					IStatus.ERROR, JptCorePlugin.PLUGIN_ID,
-					JptCoreMessages.bind(JptCoreMessages.VALIDATE_PERSISTENCE_UNIT_DOES_NOT_SPECIFIED, pUnitName));
-			}
-			if (getPersistenceUnit() == null) {
-				return new Status(
-					IStatus.ERROR, JptCorePlugin.PLUGIN_ID,
-					JptCoreMessages.bind(JptCoreMessages.VALIDATE_PERSISTENCE_UNIT_NOT_IN_PROJECT, pUnitName, projectName));
-			}
-		}
-		return Status.OK_STATUS;
-	}
-	
-	
-	// **************** helper methods *****************************************
-	
-	// Copied from ArtifactEditOperationDataModelProvider
-	private IProject getProject() {
-		String projectName = (String) model.getProperty(PROJECT_NAME);
-		if (StringTools.stringIsEmpty(projectName)) {
-			return null;
-		}
-		return ProjectUtilities.getProject(projectName);
-	}
-	
-	private JpaProject getJpaProject() {
-		IProject project = getProject();
-		if (project == null) {
-			return null;
-		}
-		return JptCorePlugin.getJpaProject(project);
-	}
-	
-	/**
-	 * Return a best guess java source folder for the specified project
-	 */
-	// Copied from NewJavaClassDataModelProvider
-	private IFolder getDefaultSourceFolder() {
-		IProject project = getProject();
-		if (project == null) {
-			return null;
-		}
-		IPackageFragmentRoot[] sources = J2EEProjectUtilities.getSourceContainers(project);
-		// Try and return the first source folder
-		if (sources.length > 0) {
-			try {
-				return (IFolder) sources[0].getCorrespondingResource();
-			} catch (Exception e) {
-				return null;
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Return whether the path provided can not be a valid IFolder path
-	 */
-	private boolean sourceFolderIsIllegal(String folderPath) {
-		IProject project = getProject();
-		if (project == null) {
-			return false;
-		}
-		try {
-			project.getWorkspace().getRoot().getFolder(new Path(folderPath));
-		}
-		catch (IllegalArgumentException e) {
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Return whether the path provided is in the current project
-	 */
-	private boolean sourceFolderNotInProject(String folderPath) {
-		IProject project = getProject();
-		if (project == null) {
-			return false;
-		}
-		IFolder folder;
-		try {
-			folder = project.getWorkspace().getRoot().getFolder(new Path(folderPath));
-		}
-		catch (IllegalArgumentException e) {
-			return false;
-		}
-		return ! project.equals(folder.getProject());
-	}
-	
-	/**
-	 * Return an IFolder represented by the SOURCE_FOLDER property, verified
-	 * to exist
-	 */
-	private IFolder getVerifiedSourceFolder() {
-		String folderPath = getStringProperty(SOURCE_FOLDER);
-		IProject project = getProject();
-		if (project == null) {
-			return null;
-		}
-		IFolder folder;
-		try {
-			folder = project.getWorkspace().getRoot().getFolder(new Path(folderPath));
-		}
-		catch (IllegalArgumentException e) {
-			return null;
-		}
-		if (folder == null || ! folder.exists()) {
-			return null;
-		}
-		return folder;
-	}
-	
-	/**
-	 * Return the source folder, provided it is verified to be an actual java
-	 * source folder
-	 */
-	private IFolder getVerifiedJavaSourceFolder() {
-		IFolder folder = getVerifiedSourceFolder();
-		if (folder == null) {
-			return null;
-		}
-		IJavaProject jProject = JavaCore.create(getProject());
-		if (jProject == null) {
-			return null;
-		}
-		IPackageFragmentRoot packageFragmentRoot = jProject.getPackageFragmentRoot(folder);
-		if (packageFragmentRoot == null || ! packageFragmentRoot.exists()) {
-			return null;
-		}
-		return folder;
-	}
-	
-	private IFile getExistingOrmFile() {
-		IFolder folder = getVerifiedSourceFolder();
-		if (folder == null) {
-			return null;
-		}
-		String filePath = getStringProperty(FILE_PATH);
-		IFile existingFile = folder.getFile(new Path(filePath));
-		if (! existingFile.exists()) {
-			return null;
-		}
-		return existingFile;
-	}
-	
-	private PersistenceUnit getDefaultPersistenceUnit() {
-		JpaProject jpaProject = getJpaProject();
-		if (jpaProject == null) {
-			return null;
-		}
-		PersistenceXml persistenceXml = jpaProject.getRootContext().getPersistenceXml();
-		if (persistenceXml == null) {
-			return null;
-		}
-		Persistence persistence = persistenceXml.getPersistence();
-		if (persistence == null) {
-			return null;
-		}
-		if (persistence.persistenceUnitsSize() == 0) {
-			return null;
-		}
-		return persistence.persistenceUnits().next();
-	}
-	
-	private PersistenceUnit getPersistenceUnit() {
-		String pUnitName = getStringProperty(PERSISTENCE_UNIT);
-		JpaProject jpaProject = 
-			(StringTools.stringIsEmpty(pUnitName)) ? null : getJpaProject();
-		PersistenceXml persistenceXml = 
-			(jpaProject == null) ? null : jpaProject.getRootContext().getPersistenceXml();
-		Persistence persistence = 
-			(persistenceXml == null) ? null : persistenceXml.getPersistence();
-		if (persistence != null) {
-			for (Iterator<PersistenceUnit> stream = persistence.persistenceUnits(); stream.hasNext(); ) {
-				PersistenceUnit next = stream.next();
-				if (pUnitName.equals(next.getName())) {
-					return next;
-				}
-			}
-		}
-		return null;
-	}
-	
-	private Iterator<IProject> jpaIProjects() {
-		return new FilteringIterator<IProject, IProject>(CollectionTools.iterator(ProjectUtilities.getAllProjects())) {
-			@Override
-			protected boolean accept(IProject project) {
-				try {
-					return FacetedProjectFramework.hasProjectFacet(project, JptCorePlugin.FACET_ID);
-				}
-				catch (CoreException ce) {
-					return false;
-				}
-			}
-		};
-	}
-	
-	private Iterator<PersistenceUnit> persistenceUnits() {
-		return new CompositeIterator<PersistenceUnit>(
-			new TransformationIterator<IProject, Iterator<PersistenceUnit>>(jpaIProjects()) {
-				@Override
-				protected Iterator<PersistenceUnit> transform(IProject jpaIProject) {
-					JpaProject jpaProject = JptCorePlugin.getJpaProject(jpaIProject);
-					PersistenceXml persistenceXml = 
-						(jpaProject == null) ? null : jpaProject.getRootContext().getPersistenceXml();
-					Persistence persistence = 
-						(persistenceXml == null) ? null : persistenceXml.getPersistence();
-					if (persistence == null) {
-						return EmptyIterator.instance();
-					}
-					else {
-						return persistence.persistenceUnits();
-					}
-				}
-			});
-	}
-	
-	private Iterator<String> persistenceUnitNames() {
-		return new TransformationIterator<PersistenceUnit, String>(persistenceUnits()) {
-			@Override
-			protected String transform(PersistenceUnit next) {
-				return next.getName();
-			}
-		};
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/operations/OrmFileCreationOperation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/operations/OrmFileCreationOperation.java
deleted file mode 100644
index bbacaab32d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/operations/OrmFileCreationOperation.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.core.internal.operations;
-
-import java.util.Iterator;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.JptCorePlugin;
-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.context.persistence.PersistenceXml;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.core.resource.orm.OrmArtifactEdit;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.OrmResource;
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults;
-import org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata;
-import org.eclipse.jpt.core.resource.persistence.PersistenceArtifactEdit;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class OrmFileCreationOperation extends AbstractDataModelOperation
-	implements OrmFileCreationDataModelProperties
-{
-	public OrmFileCreationOperation(IDataModel dataModel) {
-		super(dataModel);
-	}
-	
-	
-	@Override
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// Create source folder if it does not exist
-		IFolder folder = createSourceFolder();
-		// Create orm file
-		createOrmXml(folder);
-		// Add orm file to persistence unit if specified
-		addOrmXmlToPersistenceXml();
-		return OK_STATUS;
-	}
-	
-	private IProject getProject() throws ExecutionException {
-		String projectName = (String) getDataModel().getProperty(PROJECT_NAME);
-		IProject project = ProjectUtilities.getProject(projectName);
-		if (project == null) {
-			throw new ExecutionException("No project name specified");
-		}
-		return project;
-	}
-	
-	private JpaProject getJpaProject() throws ExecutionException {
-		IProject project = getProject();
-		JpaProject jpaProject = JptCorePlugin.getJpaProject(project);
-		if (jpaProject == null) {
-			throw new ExecutionException("Project does not have JPA content");
-		}
-		return jpaProject;
-	}
-	
-	private PersistenceUnit getPersistenceUnit() throws ExecutionException {
-		String pUnitName = getDataModel().getStringProperty(PERSISTENCE_UNIT);
-		JpaProject jpaProject = getJpaProject();
-		PersistenceXml persistenceXml = jpaProject.getRootContext().getPersistenceXml();
-		if (persistenceXml == null) {
-			throw new ExecutionException("Project does not have a persistence.xml file");
-		}
-		Persistence persistence = persistenceXml.getPersistence();
-		if (persistence == null) {
-			throw new ExecutionException("persistence.xml does not have a persistence node.");
-		}
-		for (Iterator<PersistenceUnit> stream = persistence.persistenceUnits(); stream.hasNext(); ) {
-			PersistenceUnit pUnit = stream.next();
-			if (pUnitName.equals(pUnit.getName())) {
-				return pUnit;
-			}
-		}
-		throw new ExecutionException("persistence.xml does not have persistence unit named \'" + pUnitName + "\'");
-	}
-	
-	/**
-	 * This method will return the source folder as specified in the data model. 
-	 * It will create the source folder if it does not exist. It will not add
-	 * it as a source folder to the project build path if it is not already.
-	 * This method may return null.
-	 */
-	// copied from NewJavaClassOperation
-	private IFolder createSourceFolder() throws ExecutionException {
-		// Get the source folder name from the data model
-		String folderPath = model.getStringProperty(SOURCE_FOLDER);
-		IProject project = getProject();
-		IFolder folder = project.getWorkspace().getRoot().getFolder(new Path(folderPath));
-		// If folder does not exist, create the folder with the specified path
-		if (! folder.exists()) {
-			try {
-				folder.create(true, true, null);
-			} catch (CoreException e) {
-				throw new ExecutionException("Could not create folder", e);
-			}
-		}
-		// Return the source folder
-		return folder;
-	}
-	
-	@SuppressWarnings("unchecked")
-	private void createOrmXml(IFolder folder) throws ExecutionException {
-		String filePath = getDataModel().getStringProperty(FILE_PATH);
-		IFile file = folder.getFile(new Path(filePath));
-		OrmArtifactEdit oae = OrmArtifactEdit.getArtifactEditForWrite(getProject());
-		OrmResource ormResource = oae.getResource(file);
-		XmlEntityMappings entityMappings = OrmFactory.eINSTANCE.createXmlEntityMappings();
-		entityMappings.setVersion("1.0");
-		ormResource.getContents().add(entityMappings);
-		
-		AccessType defaultAccess = (AccessType) getDataModel().getProperty(DEFAULT_ACCESS); 
-		if (defaultAccess != null) {
-			XmlPersistenceUnitMetadata puMetadata = OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata();
-			entityMappings.setPersistenceUnitMetadata(puMetadata);
-			XmlPersistenceUnitDefaults puDefaults = OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults();
-			puMetadata.setPersistenceUnitDefaults(puDefaults);
-			puDefaults.setAccess(defaultAccess);
-		}
-		
-		oae.save(null);
-		oae.dispose();
-	}
-	
-	private void addOrmXmlToPersistenceXml() throws ExecutionException {
-		if (! getDataModel().getBooleanProperty(ADD_TO_PERSISTENCE_UNIT)) {
-			return;
-		}
-		
-		String filePath = getDataModel().getStringProperty(FILE_PATH);
-		PersistenceUnit pUnit = getPersistenceUnit();
-		for (Iterator<MappingFileRef> stream = pUnit.specifiedMappingFileRefs(); stream.hasNext(); ) {
-			if (filePath.equals(stream.next().getFileName())) {
-				return;
-			}
-		}
-		MappingFileRef mfRef = pUnit.addSpecifiedMappingFileRef();
-		mfRef.setFileName(new Path(filePath).toPortableString());
-		
-		PersistenceArtifactEdit pae = PersistenceArtifactEdit.getArtifactEditForWrite(getProject());
-		pae.getResource((IFile) pUnit.getResource());
-		
-		pae.save(null);
-		pae.dispose();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaAnnotationProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaAnnotationProvider.java
deleted file mode 100644
index dd94860a5b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaAnnotationProvider.java
+++ /dev/null
@@ -1,325 +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.core.internal.platform;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jpt.core.JpaAnnotationProvider;
-import org.eclipse.jpt.core.internal.resource.java.AssociationOverrideImpl.AssociationOverrideAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.AssociationOverridesImpl.AssociationOverridesAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.AttributeOverrideImpl.AttributeOverrideAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.AttributeOverridesImpl.AttributeOverridesAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.BasicImpl.BasicAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.ColumnImpl.ColumnAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.DiscriminatorColumnImpl.DiscriminatorColumnAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.DiscriminatorValueImpl.DiscriminatorValueAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.EmbeddableImpl.EmbeddableAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.EmbeddedIdImpl.EmbeddedIdAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.EmbeddedImpl.EmbeddedAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.EntityImpl.EntityAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.EnumeratedImpl.EnumeratedAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.GeneratedValueImpl.GeneratedValueAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.IdClassImpl.IdClassAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.IdImpl.IdAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.InheritanceImpl.InheritanceAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.JoinColumnImpl.JoinColumnAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.JoinColumnsImpl.JoinColumnsAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.JoinTableImpl.JoinTableAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.LobImpl.LobAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.ManyToManyImpl.ManyToManyAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.ManyToOneImpl.ManyToOneAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.MapKeyImpl.MapKeyAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.MappedSuperclassImpl.MappedSuperclassAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.NamedNativeQueriesImpl.NamedNativeQueriesAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.NamedNativeQueryImpl.NamedNativeQueryAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.NamedQueriesImpl.NamedQueriesAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.NamedQueryImpl.NamedQueryAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.OneToManyImpl.OneToManyAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.OneToOneImpl.OneToOneAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.OrderByImpl.OrderByAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.PrimaryKeyJoinColumnImpl.PrimaryKeyJoinColumnAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.PrimaryKeyJoinColumnsImpl.PrimaryKeyJoinColumnsAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.SecondaryTableImpl.SecondaryTableAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.SecondaryTablesImpl.SecondaryTablesAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.SequenceGeneratorImpl.SequenceGeneratorAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.TableGeneratorImpl.TableGeneratorAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.TableImpl.TableAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.TemporalImpl.TemporalAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.TransientImpl.TransientAnnotationDefinition;
-import org.eclipse.jpt.core.internal.resource.java.VersionImpl.VersionAnnotationDefinition;
-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.JavaResourcePersistentType;
-import org.eclipse.jpt.core.utility.jdt.Attribute;
-import org.eclipse.jpt.core.utility.jdt.Type;
-import org.eclipse.jpt.utility.internal.iterators.CloneIterator;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationListIterator;
-
-public class GenericJpaAnnotationProvider implements JpaAnnotationProvider
-{
-	/**
-	 * Ordered list of possible type mapping annotations.  Ordered because this
-	 * is used to determine the mapping in the case where 2 mapping annotations exist
-	 */
-	private List<AnnotationDefinition> typeMappingAnnotationDefinitions;
-	
-	private Collection<AnnotationDefinition> typeAnnotationDefinitions;
-	
-	/**
-	 * Ordered list of possible attribute mapping annotations.  Ordered because this
-	 * is used to determine the mapping in the case where 2 mapping annotations exist
-	 */
-	private List<AnnotationDefinition> attributeMappingAnnotationDefinitions;
-	
-	private Collection<AnnotationDefinition> attributeAnnotationDefinitions;
-	
-	
-	protected GenericJpaAnnotationProvider() {
-		super();
-	}
-	
-	
-	protected ListIterator<AnnotationDefinition> typeMappingAnnotationDefinitions() {
-		if (this.typeMappingAnnotationDefinitions == null) {
-			this.typeMappingAnnotationDefinitions = new ArrayList<AnnotationDefinition>();
-			this.addTypeMappingAnnotationDefinitionsTo(this.typeMappingAnnotationDefinitions);
-		}
-		return new CloneListIterator<AnnotationDefinition>(this.typeMappingAnnotationDefinitions);
-	}
-	
-	/**
-	 * Override this to specify more or different type mapping definitions.
-	 * The default includes the JPA spec-defined type mappings of 
-	 * Embeddable, Entity, MappedSuperclass
-	 */
-	protected void addTypeMappingAnnotationDefinitionsTo(List<AnnotationDefinition> definitions) {
-		definitions.add(EmbeddableAnnotationDefinition.instance());
-		definitions.add(EntityAnnotationDefinition.instance());
-		definitions.add(MappedSuperclassAnnotationDefinition.instance());
-	}
-	
-	protected Iterator<AnnotationDefinition> typeAnnotationDefinitions() {
-		if (this.typeAnnotationDefinitions == null) {
-			this.typeAnnotationDefinitions = new ArrayList<AnnotationDefinition>();
-			this.addTypeAnnotationDefinitionsTo(this.typeAnnotationDefinitions);
-		}
-		return new CloneIterator<AnnotationDefinition>(this.typeAnnotationDefinitions);
-	}
-	
-	/**
-	 * Override this to specify more or different type annotation definitions.
-	 * The default includes the JPA spec-defined annotations.
-	 */
-	protected void addTypeAnnotationDefinitionsTo(Collection<AnnotationDefinition> definitions) {
-		definitions.add(AssociationOverrideAnnotationDefinition.instance());
-		definitions.add(AssociationOverridesAnnotationDefinition.instance());
-		definitions.add(AttributeOverrideAnnotationDefinition.instance());
-		definitions.add(AttributeOverrideAnnotationDefinition.instance());
-		definitions.add(AttributeOverridesAnnotationDefinition.instance());
-		definitions.add(DiscriminatorColumnAnnotationDefinition.instance());
-		definitions.add(DiscriminatorValueAnnotationDefinition.instance());
-		definitions.add(IdClassAnnotationDefinition.instance());
-		definitions.add(InheritanceAnnotationDefinition.instance());
-		definitions.add(NamedQueryAnnotationDefinition.instance());
-		definitions.add(NamedQueriesAnnotationDefinition.instance());
-		definitions.add(NamedNativeQueryAnnotationDefinition.instance());
-		definitions.add(NamedNativeQueriesAnnotationDefinition.instance());
-		definitions.add(PrimaryKeyJoinColumnAnnotationDefinition.instance());
-		definitions.add(PrimaryKeyJoinColumnsAnnotationDefinition.instance());
-		definitions.add(SecondaryTableAnnotationDefinition.instance());
-		definitions.add(SecondaryTablesAnnotationDefinition.instance());
-		definitions.add(SequenceGeneratorAnnotationDefinition.instance());
-		definitions.add(TableAnnotationDefinition.instance());
-		definitions.add(TableGeneratorAnnotationDefinition.instance());
-	}
-	
-	protected ListIterator<AnnotationDefinition> attributeMappingAnnotationDefinitions() {
-		if (this.attributeMappingAnnotationDefinitions == null) {
-			this.attributeMappingAnnotationDefinitions = new ArrayList<AnnotationDefinition>();
-			this.addAttributeMappingAnnotationDefinitionsTo(this.attributeMappingAnnotationDefinitions);
-		}
-		return new CloneListIterator<AnnotationDefinition>(this.attributeMappingAnnotationDefinitions);
-	}
-	
-	/**
-	 * Override this to specify more or different attribute mapping definitions.
-	 * The default includes the JPA spec-defined attribute mappings of 
-	 * Basic, Id, Transient OneToOne, OneToMany, ManyToOne, ManyToMany, Embedded, EmbeddedId, Version.
-	 */
-	protected void addAttributeMappingAnnotationDefinitionsTo(List<AnnotationDefinition> definitions) {
-		definitions.add(BasicAnnotationDefinition.instance());
-		definitions.add(EmbeddedAnnotationDefinition.instance());
-		definitions.add(EmbeddedIdAnnotationDefinition.instance());
-		definitions.add(IdAnnotationDefinition.instance());
-		definitions.add(ManyToManyAnnotationDefinition.instance());
-		definitions.add(ManyToOneAnnotationDefinition.instance());
-		definitions.add(OneToManyAnnotationDefinition.instance());
-		definitions.add(OneToOneAnnotationDefinition.instance());
-		definitions.add(TransientAnnotationDefinition.instance());
-		definitions.add(VersionAnnotationDefinition.instance());
-	}
-	
-	protected Iterator<AnnotationDefinition> attributeAnnotationDefinitions() {
-		if (this.attributeAnnotationDefinitions == null) {
-			this.attributeAnnotationDefinitions = new ArrayList<AnnotationDefinition>();
-			this.addAttributeAnnotationDefinitionsTo(this.attributeAnnotationDefinitions);
-		}
-		return new CloneIterator<AnnotationDefinition>(this.attributeAnnotationDefinitions);
-	}
-	
-	/**
-	 * Override this to specify more or different attribute annotation definitions.
-	 * The default includes the JPA spec-defined annotations.
-	 */
-	protected void addAttributeAnnotationDefinitionsTo(Collection<AnnotationDefinition> definitions) {
-		definitions.add(AssociationOverrideAnnotationDefinition.instance());
-		definitions.add(AssociationOverridesAnnotationDefinition.instance());
-		definitions.add(AttributeOverrideAnnotationDefinition.instance());
-		definitions.add(AttributeOverridesAnnotationDefinition.instance());
-		definitions.add(ColumnAnnotationDefinition.instance());
-		definitions.add(EnumeratedAnnotationDefinition.instance());
-		definitions.add(GeneratedValueAnnotationDefinition.instance());
-		definitions.add(JoinColumnAnnotationDefinition.instance());
-		definitions.add(JoinColumnsAnnotationDefinition.instance());
-		definitions.add(JoinTableAnnotationDefinition.instance());
-		definitions.add(LobAnnotationDefinition.instance());
-		definitions.add(MapKeyAnnotationDefinition.instance());
-		definitions.add(OrderByAnnotationDefinition.instance());
-		definitions.add(PrimaryKeyJoinColumnAnnotationDefinition.instance());
-		definitions.add(PrimaryKeyJoinColumnsAnnotationDefinition.instance());
-		definitions.add(SequenceGeneratorAnnotationDefinition.instance());
-		definitions.add(TableGeneratorAnnotationDefinition.instance());
-		definitions.add(TemporalAnnotationDefinition.instance());
-	}
-	
-	//********************* IJpaPlatform implementation *************************
-
-	public Annotation buildTypeMappingAnnotation(JavaResourcePersistentType parent, Type type, String mappingAnnotationName) {
-		AnnotationDefinition annotationDefinition = typeMappingAnnotationDefinition(mappingAnnotationName);
-		return annotationDefinition.buildAnnotation(parent, type);
-	}
-	
-	public Annotation buildNullTypeMappingAnnotation(JavaResourcePersistentType parent, Type type, String mappingAnnotationName) {
-		AnnotationDefinition annotationDefinition = typeMappingAnnotationDefinition(mappingAnnotationName);
-		return annotationDefinition.buildNullAnnotation(parent, type);
-	}
-
-	public Annotation buildTypeAnnotation(JavaResourcePersistentType parent, Type type, String annotationName) {
-		AnnotationDefinition annotationDefinition = typeAnnotationDefinition(annotationName);
-		return annotationDefinition.buildAnnotation(parent, type);
-	}
-
-	public Annotation buildNullTypeAnnotation(JavaResourcePersistentType parent, Type type, String annotationName) {
-		AnnotationDefinition annotationDefinition = typeAnnotationDefinition(annotationName);
-		return annotationDefinition.buildNullAnnotation(parent, type);
-	}
-	
-	public ListIterator<String> typeMappingAnnotationNames() {
-		return new TransformationListIterator<AnnotationDefinition, String>(typeMappingAnnotationDefinitions()) {
-			@Override
-			protected String transform(AnnotationDefinition next) {
-				return next.getAnnotationName();
-			}
-		};
-	}
-	
-	public Iterator<String> typeAnnotationNames() {
-		return new TransformationIterator<AnnotationDefinition, String>(typeAnnotationDefinitions()) {
-			@Override
-			protected String transform(AnnotationDefinition next) {
-				return next.getAnnotationName();
-			}
-		};
-	}
-	
-	public Annotation buildAttributeMappingAnnotation(JavaResourcePersistentAttribute parent, Attribute attribute, String mappingAnnotationName) {
-		AnnotationDefinition annotationDefinition = attributeMappingAnnotationDefinition(mappingAnnotationName);
-		return annotationDefinition.buildAnnotation(parent, attribute);
-	}
-	
-	public Annotation buildNullAttributeMappingAnnotation(JavaResourcePersistentAttribute parent, Attribute attribute, String annotationName) {
-		AnnotationDefinition annotationDefinition = attributeMappingAnnotationDefinition(annotationName);
-		return annotationDefinition.buildNullAnnotation(parent, attribute);
-	}
-	
-	public Annotation buildAttributeAnnotation(JavaResourcePersistentAttribute parent, Attribute attribute, String annotationName) {
-		AnnotationDefinition annotationDefinition = attributeAnnotationDefinition(annotationName);
-		return annotationDefinition.buildAnnotation(parent, attribute);
-	}
-	
-	public Annotation buildNullAttributeAnnotation(JavaResourcePersistentAttribute parent, Attribute attribute, String annotationName) {
-		AnnotationDefinition annotationDefinition = attributeAnnotationDefinition(annotationName);
-		return annotationDefinition.buildNullAnnotation(parent, attribute);
-	}
-	
-	public ListIterator<String> attributeMappingAnnotationNames() {
-		return new TransformationListIterator<AnnotationDefinition, String>(attributeMappingAnnotationDefinitions()) {
-			@Override
-			protected String transform(AnnotationDefinition next) {
-				return next.getAnnotationName();
-			}
-		};
-	}
-	
-	public Iterator<String> attributeAnnotationNames() {
-		return new TransformationIterator<AnnotationDefinition, String>(attributeAnnotationDefinitions()) {
-			@Override
-			protected String transform(AnnotationDefinition next) {
-				return next.getAnnotationName();
-			}
-		};
-	}
-	
-	private AnnotationDefinition typeMappingAnnotationDefinition(String mappingAnnotationName) {
-		for (ListIterator<AnnotationDefinition> i = typeMappingAnnotationDefinitions(); i.hasNext(); ) {
-			AnnotationDefinition definition = i.next();
-			if (definition.getAnnotationName().equals(mappingAnnotationName)) {
-				return definition;
-			}
-		}
-		throw new IllegalArgumentException(mappingAnnotationName + " is an unsupported type mapping annotation");
-	}
-	
-	private AnnotationDefinition typeAnnotationDefinition(String annotationName) {
-		for (Iterator<AnnotationDefinition> i = typeAnnotationDefinitions(); i.hasNext(); ) {
-			AnnotationDefinition definition = i.next();
-			if (definition.getAnnotationName().equals(annotationName)) {
-				return definition;
-			}
-		}
-		throw new IllegalArgumentException(annotationName + " is an unsupported type annotation");
-	}
-
-	private AnnotationDefinition attributeMappingAnnotationDefinition(String mappingAnnotationName) {
-		for (ListIterator<AnnotationDefinition> i = attributeMappingAnnotationDefinitions(); i.hasNext(); ) {
-			AnnotationDefinition definition = i.next();
-			if (definition.getAnnotationName().equals(mappingAnnotationName)) {
-				return definition;
-			}
-		}
-		throw new IllegalArgumentException(mappingAnnotationName + " is an unsupported attribute mapping annotation");	
-	}
-	
-	private AnnotationDefinition attributeAnnotationDefinition(String annotationName) {
-		for (Iterator<AnnotationDefinition> i = attributeAnnotationDefinitions(); i.hasNext(); ) {
-			AnnotationDefinition definition = i.next();
-			if (definition.getAnnotationName().equals(annotationName)) {
-				return definition;
-			}
-		}
-		throw new IllegalArgumentException(annotationName + " is an unsupported attribute annotation");
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaFactory.java
deleted file mode 100644
index 1057f07559..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaFactory.java
+++ /dev/null
@@ -1,632 +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.core.internal.platform;
-
-import java.io.IOException;
-import java.io.InputStream;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jpt.core.JpaDataSource;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.JpaFile;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.ResourceModel;
-import org.eclipse.jpt.core.context.AssociationOverride;
-import org.eclipse.jpt.core.context.AttributeOverride;
-import org.eclipse.jpt.core.context.JpaContextNode;
-import org.eclipse.jpt.core.context.JpaRootContextNode;
-import org.eclipse.jpt.core.context.UniqueConstraint;
-import org.eclipse.jpt.core.context.java.JavaAssociationOverride;
-import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.core.context.java.JavaAttributeOverride;
-import org.eclipse.jpt.core.context.java.JavaBaseJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaBasicMapping;
-import org.eclipse.jpt.core.context.java.JavaColumn;
-import org.eclipse.jpt.core.context.java.JavaDiscriminatorColumn;
-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.JavaEntity;
-import org.eclipse.jpt.core.context.java.JavaGeneratedValue;
-import org.eclipse.jpt.core.context.java.JavaIdMapping;
-import org.eclipse.jpt.core.context.java.JavaJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaJoinTable;
-import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.core.context.java.JavaManyToManyMapping;
-import org.eclipse.jpt.core.context.java.JavaManyToOneMapping;
-import org.eclipse.jpt.core.context.java.JavaMappedSuperclass;
-import org.eclipse.jpt.core.context.java.JavaNamedColumn;
-import org.eclipse.jpt.core.context.java.JavaNamedNativeQuery;
-import org.eclipse.jpt.core.context.java.JavaNamedQuery;
-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.JavaPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaQuery;
-import org.eclipse.jpt.core.context.java.JavaQueryHint;
-import org.eclipse.jpt.core.context.java.JavaRelationshipMapping;
-import org.eclipse.jpt.core.context.java.JavaSecondaryTable;
-import org.eclipse.jpt.core.context.java.JavaSequenceGenerator;
-import org.eclipse.jpt.core.context.java.JavaTable;
-import org.eclipse.jpt.core.context.java.JavaTableGenerator;
-import org.eclipse.jpt.core.context.java.JavaTransientMapping;
-import org.eclipse.jpt.core.context.java.JavaTypeMapping;
-import org.eclipse.jpt.core.context.java.JavaUniqueConstraint;
-import org.eclipse.jpt.core.context.java.JavaVersionMapping;
-import org.eclipse.jpt.core.context.orm.EntityMappings;
-import org.eclipse.jpt.core.context.orm.OrmAssociationOverride;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmAttributeOverride;
-import org.eclipse.jpt.core.context.orm.OrmBaseJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmBasicMapping;
-import org.eclipse.jpt.core.context.orm.OrmColumn;
-import org.eclipse.jpt.core.context.orm.OrmDiscriminatorColumn;
-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.OrmGeneratedValue;
-import org.eclipse.jpt.core.context.orm.OrmIdMapping;
-import org.eclipse.jpt.core.context.orm.OrmJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmJoinTable;
-import org.eclipse.jpt.core.context.orm.OrmJpaContextNode;
-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.OrmNamedColumn;
-import org.eclipse.jpt.core.context.orm.OrmNamedNativeQuery;
-import org.eclipse.jpt.core.context.orm.OrmNamedQuery;
-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.OrmPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmQuery;
-import org.eclipse.jpt.core.context.orm.OrmQueryHint;
-import org.eclipse.jpt.core.context.orm.OrmRelationshipMapping;
-import org.eclipse.jpt.core.context.orm.OrmSecondaryTable;
-import org.eclipse.jpt.core.context.orm.OrmSequenceGenerator;
-import org.eclipse.jpt.core.context.orm.OrmTable;
-import org.eclipse.jpt.core.context.orm.OrmTableGenerator;
-import org.eclipse.jpt.core.context.orm.OrmTransientMapping;
-import org.eclipse.jpt.core.context.orm.OrmUniqueConstraint;
-import org.eclipse.jpt.core.context.orm.OrmVersionMapping;
-import org.eclipse.jpt.core.context.orm.OrmXml;
-import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults;
-import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata;
-import org.eclipse.jpt.core.context.persistence.ClassRef;
-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.context.persistence.PersistenceXml;
-import org.eclipse.jpt.core.context.persistence.Property;
-import org.eclipse.jpt.core.internal.GenericJpaDataSource;
-import org.eclipse.jpt.core.internal.GenericJpaFile;
-import org.eclipse.jpt.core.internal.GenericJpaProject;
-import org.eclipse.jpt.core.internal.context.GenericRootContextNode;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaAssociationOverride;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaAttributeOverride;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaBasicMapping;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaColumn;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaDiscriminatorColumn;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaEmbeddable;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaEmbeddedIdMapping;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaEmbeddedMapping;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaEntity;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaGeneratedValue;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaIdMapping;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaJoinColumn;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaJoinTable;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaManyToManyMapping;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaManyToOneMapping;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaMappedSuperclass;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaNamedNativeQuery;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaNamedQuery;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaNullAttributeMapping;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaOneToManyMapping;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaOneToOneMapping;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaPersistentType;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaQueryHint;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaSecondaryTable;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaSequenceGenerator;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaTable;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaTableGenerator;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaTransientMapping;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaUniqueConstraint;
-import org.eclipse.jpt.core.internal.context.java.GenericJavaVersionMapping;
-import org.eclipse.jpt.core.internal.context.java.JavaNullTypeMapping;
-import org.eclipse.jpt.core.internal.context.orm.GenericEntityMappings;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmAssociationOverride;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmAttributeOverride;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmBasicMapping;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmColumn;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmDiscriminatorColumn;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmEmbeddable;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmEmbeddedIdMapping;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmEmbeddedMapping;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmEntity;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmGeneratedValue;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmIdMapping;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmJoinColumn;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmJoinTable;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmManyToManyMapping;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmManyToOneMapping;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmMappedSuperclass;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmNamedNativeQuery;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmNamedQuery;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmNullAttributeMapping;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmOneToManyMapping;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmOneToOneMapping;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmPersistentType;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmQueryHint;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmSecondaryTable;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmSequenceGenerator;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmTable;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmTableGenerator;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmTransientMapping;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmUniqueConstraint;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmVersionMapping;
-import org.eclipse.jpt.core.internal.context.orm.GenericPersistenceUnitDefaults;
-import org.eclipse.jpt.core.internal.context.orm.GenericPersistenceUnitMetadata;
-import org.eclipse.jpt.core.internal.context.orm.OrmXmlImpl;
-import org.eclipse.jpt.core.internal.context.persistence.GenericClassRef;
-import org.eclipse.jpt.core.internal.context.persistence.GenericMappingFileRef;
-import org.eclipse.jpt.core.internal.context.persistence.GenericPersistence;
-import org.eclipse.jpt.core.internal.context.persistence.GenericPersistenceUnit;
-import org.eclipse.jpt.core.internal.context.persistence.GenericPersistenceXml;
-import org.eclipse.jpt.core.internal.context.persistence.GenericProperty;
-import org.eclipse.jpt.core.internal.resource.java.JavaResourceModelImpl;
-import org.eclipse.jpt.core.internal.utility.jdt.DefaultAnnotationEditFormatter;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.resource.orm.OrmResource;
-import org.eclipse.jpt.core.resource.orm.OrmResourceModel;
-import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
-import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.core.resource.orm.XmlSecondaryTable;
-import org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint;
-import org.eclipse.jpt.core.resource.persistence.PersistenceResource;
-import org.eclipse.jpt.core.resource.persistence.PersistenceResourceModel;
-import org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef;
-import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
-import org.eclipse.jpt.core.resource.persistence.XmlPersistence;
-import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
-import org.eclipse.jpt.core.resource.persistence.XmlProperty;
-
-public class GenericJpaFactory implements JpaFactory
-{
-	protected GenericJpaFactory() {
-		super();
-	}
-	
-	
-	// **************** Core objects ******************************************
-	
-	public JpaProject buildJpaProject(JpaProject.Config config) throws CoreException {
-		return new GenericJpaProject(config);
-	}
-	
-	public JpaDataSource buildJpaDataSource(JpaProject jpaProject, String connectionProfileName) {
-		return new GenericJpaDataSource(jpaProject, connectionProfileName);
-	}
-	
-	public JpaFile buildJpaFile(JpaProject jpaProject, IFile file, ResourceModel resourceModel) {
-		return new GenericJpaFile(jpaProject, file, resourceModel);
-	}
-	
-	
-	// **************** Resource objects **************************************
-	
-	public boolean hasRelevantContent(IFile file) {
-		if (! JavaCore.create(file.getProject()).isOnClasspath(file)) {
-			return false;
-		}
-		IContentType contentType = this.contentType(file);
-		if (contentType == null) {
-			return false;
-		}
-		String contentTypeId = contentType.getId();
-		return supportsContentType(contentTypeId);
-	}
-	
-	protected boolean supportsContentType(String contentTypeId) {
-		return contentTypeId.equals(JavaCore.JAVA_SOURCE_CONTENT_TYPE)
-				|| contentTypeId.equals(JptCorePlugin.PERSISTENCE_XML_CONTENT_TYPE)
-				|| contentTypeId.equals(JptCorePlugin.ORM_XML_CONTENT_TYPE);
-	}
-	
-	public ResourceModel buildResourceModel(JpaProject jpaProject, IFile file) {
-		if (! JavaCore.create(jpaProject.getProject()).isOnClasspath(file)) {
-			throw new IllegalArgumentException("The file" + file + " is not on the project classpath");
-		}
-		IContentType contentType = this.contentType(file);
-		if (contentType == null) {
-			throw new IllegalArgumentException("The file" + file + " does not have a supported content type");
-		}
-		String contentTypeId = contentType.getId();
-		return buildResourceModel(jpaProject, file, contentTypeId);
-	}
-	
-	protected ResourceModel buildResourceModel(JpaProject jpaProject, IFile file, String contentTypeId) {
-		if (JavaCore.JAVA_SOURCE_CONTENT_TYPE.equals(contentTypeId)) {
-			return buildJavaResourceModel(jpaProject, file);
-		}
-		else if (JptCorePlugin.PERSISTENCE_XML_CONTENT_TYPE.equals(contentTypeId)) {
-			return buildPersistenceResourceModel(file);
-		}
-		else if (JptCorePlugin.ORM_XML_CONTENT_TYPE.equals(contentTypeId)) {
-			return buildOrmResourceModel(file);
-		}
-		
-		return null;
-	}
-	
-	protected ResourceModel buildJavaResourceModel(JpaProject jpaProject, IFile file) {
-		return new JavaResourceModelImpl(
-				file, jpaProject.getJpaPlatform().getAnnotationProvider(), 
-				jpaProject.getModifySharedDocumentCommandExecutorProvider(),
-				DefaultAnnotationEditFormatter.instance());
-	}
-	
-	protected ResourceModel buildPersistenceResourceModel(IFile file) {
-		return new PersistenceResourceModel(file);
-	}
-	
-	protected ResourceModel buildOrmResourceModel(IFile file) {
-		return new OrmResourceModel(file);
-	}
-	
-	// attempting to get the contentType based on the file contents.
-	// have to check the file contents instead of just the file name
-	// because for xml we base it on the rootElement name
-	private IContentType contentType(IFile file) {
-		InputStream inputStream = null;
-		try {
-			inputStream = file.getContents();
-			return Platform.getContentTypeManager().findContentTypeFor(inputStream, file.getName());
-		}
-		catch (IOException ex) {
-			JptCorePlugin.log(ex);
-		}
-		catch (CoreException ex) {
-			JptCorePlugin.log(ex);
-		}
-		finally {
-			try {
-				if (inputStream != null) {
-					inputStream.close();
-				}
-			} catch (IOException ex) {
-				JptCorePlugin.log(ex);
-			}
-		}
-		return null;
-	}
-	
-	
-	// **************** Context objects ***************************************
-	
-	public JpaRootContextNode buildRootContext(JpaProject parent) {
-		return new GenericRootContextNode(parent);
-	}
-	
-	public PersistenceXml buildPersistenceXml(JpaRootContextNode parent, PersistenceResource persistenceResource) {
-		return new GenericPersistenceXml(parent, persistenceResource);
-	}
-	
-	public OrmXml buildOrmXml(MappingFileRef parent, OrmResource ormResource) {
-		return new OrmXmlImpl(parent, ormResource);
-	}
-	
-	public EntityMappings buildEntityMappings(OrmXml parent, XmlEntityMappings xmlEntityMappings) {
-		return new GenericEntityMappings(parent, xmlEntityMappings);
-	}
-	
-	public PersistenceUnitMetadata buildPersistenceUnitMetadata(EntityMappings parent, XmlEntityMappings xmlEntityMappings) {
-		return new GenericPersistenceUnitMetadata(parent, xmlEntityMappings);
-	}
-	
-	public PersistenceUnitDefaults buildPersistenceUnitDefaults(PersistenceUnitMetadata parent, XmlEntityMappings xmlEntityMappings) {
-		return new GenericPersistenceUnitDefaults(parent, xmlEntityMappings);
-	}
-	
-	public Persistence buildPersistence(PersistenceXml parent, XmlPersistence xmlPersistence) {
-		return new GenericPersistence(parent, xmlPersistence);
-	}
-	
-	public PersistenceUnit buildPersistenceUnit(Persistence parent, XmlPersistenceUnit persistenceUnit) {
-		return new GenericPersistenceUnit(parent, persistenceUnit);
-	}
-	
-	public MappingFileRef buildMappingFileRef(PersistenceUnit parent, XmlMappingFileRef xmlMappingFileRef) {
-		return new GenericMappingFileRef(parent, xmlMappingFileRef);
-	}
-	
-	public ClassRef buildClassRef(PersistenceUnit parent, XmlJavaClassRef classRef) {
-		return new GenericClassRef(parent, classRef);
-	}
-	
-	public ClassRef buildClassRef(PersistenceUnit parent, String className) {
-		return new GenericClassRef(parent, className);
-	}
-	
-	public Property buildProperty(PersistenceUnit parent, XmlProperty xmlProperty) {
-		return new GenericProperty(parent, xmlProperty);
-	}
-	
-	public JavaPersistentType buildJavaPersistentType(JpaContextNode parent, JavaResourcePersistentType resourcePersistentType) {
-		return new GenericJavaPersistentType(parent, resourcePersistentType);
-	}
-	
-	public JavaPersistentAttribute buildJavaPersistentAttribute(JavaPersistentType parent) {
-		return new GenericJavaPersistentAttribute(parent);
-	}
-	
-	public JavaTypeMapping buildJavaNullTypeMapping(JavaPersistentType parent) {
-		return new JavaNullTypeMapping(parent);
-	}
-	
-	public JavaEntity buildJavaEntity(JavaPersistentType parent) {
-		return new GenericJavaEntity(parent);
-	}
-
-	public JavaMappedSuperclass buildJavaMappedSuperclass(JavaPersistentType parent) {
-		return new GenericJavaMappedSuperclass(parent);
-	}
-
-	public JavaEmbeddable buildJavaEmbeddable(JavaPersistentType parent) {
-		return new GenericJavaEmbeddable(parent);
-	}
-	
-	public JavaTable buildJavaTable(JavaEntity parent) {
-		return new GenericJavaTable(parent);
-	}
-	
-	public JavaColumn buildJavaColumn(JavaJpaContextNode parent, JavaColumn.Owner owner) {
-		return new GenericJavaColumn(parent, owner);
-	}
-	
-	public JavaDiscriminatorColumn buildJavaDiscriminatorColumn(JavaEntity parent, JavaNamedColumn.Owner owner) {
-		return new GenericJavaDiscriminatorColumn(parent, owner);
-	}
-	
-	public JavaJoinColumn buildJavaJoinColumn(JavaJpaContextNode parent, JavaJoinColumn.Owner owner) {
-		return new GenericJavaJoinColumn(parent, owner);
-	}
-	
-	public JavaJoinTable buildJavaJoinTable(JavaRelationshipMapping parent) {
-		return new GenericJavaJoinTable(parent);
-	}
-	
-	public JavaSecondaryTable buildJavaSecondaryTable(JavaEntity parent) {
-		return new GenericJavaSecondaryTable(parent);
-	}
-	
-	public JavaBasicMapping buildJavaBasicMapping(JavaPersistentAttribute parent) {
-		return new GenericJavaBasicMapping(parent);
-	}
-	
-	public JavaEmbeddedIdMapping buildJavaEmbeddedIdMapping(JavaPersistentAttribute parent) {
-		return new GenericJavaEmbeddedIdMapping(parent);
-	}
-	
-	public JavaEmbeddedMapping buildJavaEmbeddedMapping(JavaPersistentAttribute parent) {
-		return new GenericJavaEmbeddedMapping(parent);
-	}
-	
-	public JavaIdMapping buildJavaIdMapping(JavaPersistentAttribute parent) {
-		return new GenericJavaIdMapping(parent);
-	}
-	
-	public JavaManyToManyMapping buildJavaManyToManyMapping(JavaPersistentAttribute parent) {
-		return new GenericJavaManyToManyMapping(parent);
-	}
-	
-	public JavaManyToOneMapping buildJavaManyToOneMapping(JavaPersistentAttribute parent) {
-		return new GenericJavaManyToOneMapping(parent);
-	}
-	
-	public JavaOneToManyMapping buildJavaOneToManyMapping(JavaPersistentAttribute parent) {
-		return new GenericJavaOneToManyMapping(parent);
-	}
-	
-	public JavaOneToOneMapping buildJavaOneToOneMapping(JavaPersistentAttribute parent) {
-		return new GenericJavaOneToOneMapping(parent);
-	}
-	
-	public JavaTransientMapping buildJavaTransientMapping(JavaPersistentAttribute parent) {
-		return new GenericJavaTransientMapping(parent);
-	}
-	
-	public JavaVersionMapping buildJavaVersionMapping(JavaPersistentAttribute parent) {
-		return new GenericJavaVersionMapping(parent);
-	}
-	
-	public JavaAttributeMapping buildJavaNullAttributeMapping(JavaPersistentAttribute parent) {
-		return new GenericJavaNullAttributeMapping(parent);
-	}
-	
-	public JavaSequenceGenerator buildJavaSequenceGenerator(JavaJpaContextNode parent) {
-		return new GenericJavaSequenceGenerator(parent);
-	}
-	
-	public JavaTableGenerator buildJavaTableGenerator(JavaJpaContextNode parent) {
-		return new GenericJavaTableGenerator(parent);
-	}
-	
-	public JavaGeneratedValue buildJavaGeneratedValue(JavaAttributeMapping parent) {
-		return new GenericJavaGeneratedValue(parent);
-	}
-	
-	public JavaPrimaryKeyJoinColumn buildJavaPrimaryKeyJoinColumn(JavaJpaContextNode parent, JavaBaseJoinColumn.Owner owner) {
-		return new GenericJavaPrimaryKeyJoinColumn(parent, owner);
-	}
-	
-	public JavaAttributeOverride buildJavaAttributeOverride(JavaJpaContextNode parent, AttributeOverride.Owner owner) {
-		return new GenericJavaAttributeOverride(parent, owner);
-	}
-	
-	public JavaAssociationOverride buildJavaAssociationOverride(JavaJpaContextNode parent, AssociationOverride.Owner owner) {
-		return new GenericJavaAssociationOverride(parent, owner);
-	}
-	
-	public JavaNamedQuery buildJavaNamedQuery(JavaJpaContextNode parent) {
-		return new GenericJavaNamedQuery(parent);
-	}
-	
-	public JavaNamedNativeQuery buildJavaNamedNativeQuery(JavaJpaContextNode parent) {
-		return new GenericJavaNamedNativeQuery(parent);
-	}
-	
-	public JavaQueryHint buildJavaQueryHint(JavaQuery parent) {
-		return new GenericJavaQueryHint(parent);
-	}
-	
-	public JavaUniqueConstraint buildJavaUniqueConstraint(JavaJpaContextNode parent, UniqueConstraint.Owner owner) {
-		return new GenericJavaUniqueConstraint(parent, owner);
-	}
-	
-	public OrmPersistentType buildOrmPersistentType(EntityMappings parent, String mappingKey) {
-		return new GenericOrmPersistentType(parent, mappingKey);
-	}
-	
-	public OrmEntity buildOrmEntity(OrmPersistentType parent) {
-		return new GenericOrmEntity(parent);
-	}
-	
-	public OrmMappedSuperclass buildOrmMappedSuperclass(OrmPersistentType parent) {
-		return new GenericOrmMappedSuperclass(parent);
-	}
-	
-	public OrmEmbeddable buildOrmEmbeddable(OrmPersistentType parent) {
-		return new GenericOrmEmbeddable(parent);
-	}
-	
-	public OrmPersistentAttribute buildOrmPersistentAttribute(OrmPersistentType parent, String mappingKey) {
-		return new GenericOrmPersistentAttribute(parent, mappingKey);
-	}
-	
-	public OrmTable buildOrmTable(OrmEntity parent) {
-		return new GenericOrmTable(parent);
-	}
-	
-	public OrmSecondaryTable buildOrmSecondaryTable(OrmEntity parent, XmlSecondaryTable xmlSecondaryTable) {
-		return new GenericOrmSecondaryTable(parent, xmlSecondaryTable);
-	}
-	
-	public OrmPrimaryKeyJoinColumn buildOrmPrimaryKeyJoinColumn(OrmJpaContextNode parent, OrmBaseJoinColumn.Owner owner) {
-		return new GenericOrmPrimaryKeyJoinColumn(parent, owner);
-	}
-	
-	public OrmJoinTable buildOrmJoinTable(OrmRelationshipMapping parent) {
-		return new GenericOrmJoinTable(parent);
-	}
-	
-	public OrmJoinColumn buildOrmJoinColumn(OrmJpaContextNode parent, OrmJoinColumn.Owner owner) {
-		return new GenericOrmJoinColumn(parent, owner);
-	}
-	
-	public OrmAttributeOverride buildOrmAttributeOverride(OrmJpaContextNode parent, AttributeOverride.Owner owner, XmlAttributeOverride xmlAttributeOverride) {
-		return new GenericOrmAttributeOverride(parent, owner, xmlAttributeOverride);
-	}
-	
-	public OrmAssociationOverride buildOrmAssociationOverride(OrmJpaContextNode parent, AssociationOverride.Owner owner, XmlAssociationOverride xmlAssociationOverride) {
-		return new GenericOrmAssociationOverride(parent, owner, xmlAssociationOverride);
-	}
-	
-	public OrmDiscriminatorColumn buildOrmDiscriminatorColumn(OrmEntity parent, OrmNamedColumn.Owner owner) {
-		return new GenericOrmDiscriminatorColumn(parent, owner);
-	}
-	
-	public OrmColumn buildOrmColumn(OrmJpaContextNode parent, OrmColumn.Owner owner) {
-		return new GenericOrmColumn(parent, owner);
-	}
-	
-	public OrmGeneratedValue buildOrmGeneratedValue(OrmJpaContextNode parent) {
-		return new GenericOrmGeneratedValue(parent);
-	}
-	
-	public OrmSequenceGenerator buildOrmSequenceGenerator(OrmJpaContextNode parent) {
-		return new GenericOrmSequenceGenerator(parent);
-	}
-	
-	public OrmTableGenerator buildOrmTableGenerator(OrmJpaContextNode parent) {
-		return new GenericOrmTableGenerator(parent);
-	}
-	
-	public OrmNamedNativeQuery buildOrmNamedNativeQuery(OrmJpaContextNode parent) {
-		return new GenericOrmNamedNativeQuery(parent);
-	}
-	
-	public OrmNamedQuery buildOrmNamedQuery(OrmJpaContextNode parent) {
-		return new GenericOrmNamedQuery(parent);
-	}
-	
-	public OrmQueryHint buildOrmQueryHint(OrmQuery parent) {
-		return new GenericOrmQueryHint(parent);
-	}
-	
-	public OrmBasicMapping buildOrmBasicMapping(OrmPersistentAttribute parent) {
-		return new GenericOrmBasicMapping(parent);
-	}
-	
-	public OrmEmbeddedMapping buildOrmEmbeddedMapping(OrmPersistentAttribute parent) {
-		return new GenericOrmEmbeddedMapping(parent);
-	}
-	
-	public OrmEmbeddedIdMapping buildOrmEmbeddedIdMapping(OrmPersistentAttribute parent) {
-		return new GenericOrmEmbeddedIdMapping(parent);
-	}
-	
-	public OrmIdMapping buildOrmIdMapping(OrmPersistentAttribute parent) {
-		return new GenericOrmIdMapping(parent);
-	}
-	
-	public OrmManyToManyMapping buildOrmManyToManyMapping(OrmPersistentAttribute parent) {
-		return new GenericOrmManyToManyMapping(parent);
-	}
-	
-	public OrmManyToOneMapping buildOrmManyToOneMapping(OrmPersistentAttribute parent) {
-		return new GenericOrmManyToOneMapping(parent);
-	}
-	
-	public OrmOneToManyMapping buildOrmOneToManyMapping(OrmPersistentAttribute parent) {
-		return new GenericOrmOneToManyMapping(parent);
-	}
-	
-	public OrmOneToOneMapping buildOrmOneToOneMapping(OrmPersistentAttribute parent) {
-		return new GenericOrmOneToOneMapping(parent);
-	}
-	
-	public OrmTransientMapping buildOrmTransientMapping(OrmPersistentAttribute parent) {
-		return new GenericOrmTransientMapping(parent);
-	}
-	
-	public OrmVersionMapping buildOrmVersionMapping(OrmPersistentAttribute parent) {
-		return new GenericOrmVersionMapping(parent);
-	}
-	
-	public OrmAttributeMapping buildOrmNullAttributeMapping(OrmPersistentAttribute parent) {
-		return new GenericOrmNullAttributeMapping(parent);
-	}
-	
-	public OrmUniqueConstraint buildOrmUniqueConstraint(OrmJpaContextNode parent, UniqueConstraint.Owner owner, XmlUniqueConstraint xmlUniqueConstraint) {
-		return new GenericOrmUniqueConstraint(parent, owner, xmlUniqueConstraint);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaPlatform.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaPlatform.java
deleted file mode 100644
index 260f64832b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaPlatform.java
+++ /dev/null
@@ -1,278 +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.core.internal.platform;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jpt.core.JpaAnnotationProvider;
-import org.eclipse.jpt.core.JpaFactory;
-import org.eclipse.jpt.core.JpaFile;
-import org.eclipse.jpt.core.JpaPlatform;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.ResourceModel;
-import org.eclipse.jpt.core.context.java.DefaultJavaAttributeMappingProvider;
-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.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.core.context.java.JavaTypeMapping;
-import org.eclipse.jpt.core.context.java.JavaTypeMappingProvider;
-import org.eclipse.jpt.core.internal.context.java.JavaBasicMappingProvider;
-import org.eclipse.jpt.core.internal.context.java.JavaEmbeddableProvider;
-import org.eclipse.jpt.core.internal.context.java.JavaEmbeddedIdMappingProvider;
-import org.eclipse.jpt.core.internal.context.java.JavaEmbeddedMappingProvider;
-import org.eclipse.jpt.core.internal.context.java.JavaEntityProvider;
-import org.eclipse.jpt.core.internal.context.java.JavaIdMappingProvider;
-import org.eclipse.jpt.core.internal.context.java.JavaManyToManyMappingProvider;
-import org.eclipse.jpt.core.internal.context.java.JavaManyToOneMappingProvider;
-import org.eclipse.jpt.core.internal.context.java.JavaMappedSuperclassProvider;
-import org.eclipse.jpt.core.internal.context.java.JavaNullAttributeMappingProvider;
-import org.eclipse.jpt.core.internal.context.java.JavaNullTypeMappingProvider;
-import org.eclipse.jpt.core.internal.context.java.JavaOneToManyMappingProvider;
-import org.eclipse.jpt.core.internal.context.java.JavaOneToOneMappingProvider;
-import org.eclipse.jpt.core.internal.context.java.JavaTransientMappingProvider;
-import org.eclipse.jpt.core.internal.context.java.JavaVersionMappingProvider;
-import org.eclipse.jpt.utility.internal.iterators.CloneIterator;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class GenericJpaPlatform implements JpaPlatform
-{
-	public static String ID = "generic";
-	
-	private String id;
-	
-	protected JpaFactory jpaFactory;
-	
-	protected JpaAnnotationProvider annotationProvider;
-	
-	protected Collection<JavaTypeMappingProvider> javaTypeMappingProviders;
-	
-	protected Collection<JavaAttributeMappingProvider> javaAttributeMappingProviders;
-	
-	protected List<DefaultJavaAttributeMappingProvider> defaultJavaAttributeMappingProviders;
-	
-	public GenericJpaPlatform() {
-		super();
-	}
-	
-	
-	public String getId() {
-		return this.id;
-	}
-	
-	/**
-	 * *************
-	 * * IMPORTANT *   For INTERNAL use only !!
-	 * *************
-	 * 
-	 * @see JpaPlatform#setId(String)
-	 */
-	public void setId(String theId) {
-		this.id = theId;
-	}
-	
-	
-	// **************** Model construction / updating **************************
-	
-	public JpaFactory getJpaFactory() {
-		if (this.jpaFactory == null) {
-			this.jpaFactory = buildJpaFactory();
-		}
-		return this.jpaFactory;
-	}
-	
-	protected JpaFactory buildJpaFactory() {
-		return new GenericJpaFactory();
-	}
-	
-	public JpaFile buildJpaFile(JpaProject jpaProject, IFile file) {
-		if (getJpaFactory().hasRelevantContent(file)) {
-			ResourceModel resourceModel = getJpaFactory().buildResourceModel(jpaProject, file);
-			return getJpaFactory().buildJpaFile(jpaProject, file, resourceModel);
-		}
-		
-		return null;
-	}
-	
-	
-	// **************** java annotation support ********************************
-	
-	public JpaAnnotationProvider getAnnotationProvider() {
-		if (this.annotationProvider == null) {
-			this.annotationProvider = buildAnnotationProvider();
-		}
-		return this.annotationProvider;
-	}
-	
-	protected JpaAnnotationProvider buildAnnotationProvider() {
-		return new GenericJpaAnnotationProvider();
-	}
-	
-	
-	// **************** type mapping support ********************************
-	
-	public JavaTypeMapping buildJavaTypeMappingFromMappingKey(String typeMappingKey, JavaPersistentType parent) {
-		return javaTypeMappingProviderFromMappingKey(typeMappingKey).buildMapping(parent, getJpaFactory());
-	}
-	
-	public JavaTypeMapping buildJavaTypeMappingFromAnnotation(String mappingAnnotationName, JavaPersistentType parent) {
-		return javaTypeMappingProviderFromAnnotation(mappingAnnotationName).buildMapping(parent, getJpaFactory());
-	}
-	
-	public JavaAttributeMapping buildJavaAttributeMappingFromMappingKey(String attributeMappingKey, JavaPersistentAttribute parent) {
-		return javaAttributeMappingProviderFromMappingKey(attributeMappingKey).buildMapping(parent, getJpaFactory());
-	}
-	
-	public JavaAttributeMapping buildJavaAttributeMappingFromAnnotation(String mappingAnnotationName, JavaPersistentAttribute parent) {
-		return javaAttributeMappingProviderFromAnnotation(mappingAnnotationName).buildMapping(parent, getJpaFactory());
-	}
-
-	public JavaAttributeMapping buildDefaultJavaAttributeMapping(JavaPersistentAttribute parent) {
-		return defaultJavaAttributeMappingProvider(parent).buildMapping(parent, getJpaFactory());
-	}
-	
-	protected Iterator<JavaTypeMappingProvider> javaTypeMappingProviders() {
-		if (this.javaTypeMappingProviders == null) {
-			this.javaTypeMappingProviders = new ArrayList<JavaTypeMappingProvider>();
-			this.addJavaTypeMappingProvidersTo(this.javaTypeMappingProviders);
-		}
-		return new CloneIterator<JavaTypeMappingProvider>(this.javaTypeMappingProviders);
-	}
-
-	/**
-	 * Override this to specify more or different type mapping providers.
-	 * The default includes the JPA spec-defined type mappings of 
-	 * Entity, MappedSuperclass, and Embeddable
-	 */
-	protected void addJavaTypeMappingProvidersTo(Collection<JavaTypeMappingProvider> providers) {
-		providers.add(JavaEntityProvider.instance());
-		providers.add(JavaMappedSuperclassProvider.instance());
-		providers.add(JavaEmbeddableProvider.instance());
-		providers.add(JavaNullTypeMappingProvider.instance());
-	}
-
-	protected JavaTypeMappingProvider javaTypeMappingProviderFromMappingKey(String typeMappingKey) {
-		for (Iterator<JavaTypeMappingProvider> i = this.javaTypeMappingProviders(); i.hasNext(); ) {
-			JavaTypeMappingProvider provider = i.next();
-			if (provider.getKey() == typeMappingKey) {
-				return provider;
-			}
-		}
-		throw new IllegalArgumentException("Illegal type mapping key: " + typeMappingKey);
-	}
-	
-	protected JavaTypeMappingProvider javaTypeMappingProviderFromAnnotation(String annotationName) {
-		for (Iterator<JavaTypeMappingProvider> i = this.javaTypeMappingProviders(); i.hasNext(); ) {
-			JavaTypeMappingProvider provider = i.next();
-			if (provider.getAnnotationName() == annotationName) {
-				return provider;
-			}
-		}
-		throw new IllegalArgumentException("Illegal annotation name: " + annotationName);
-	}
-	
-	protected Iterator<JavaAttributeMappingProvider> javaAttributeMappingProviders() {
-		if (this.javaAttributeMappingProviders == null) {
-			this.javaAttributeMappingProviders = new ArrayList<JavaAttributeMappingProvider>();
-			this.addJavaAttributeMappingProvidersTo(this.javaAttributeMappingProviders);
-		}
-		return new CloneIterator<JavaAttributeMappingProvider>(this.javaAttributeMappingProviders);
-	}
-
-	/**
-	 * Override this to specify more or different attribute mapping providers.
-	 * The default includes the JPA spec-defined attribute mappings of 
-	 * Basic, Id, Transient OneToOne, OneToMany, ManyToOne, ManyToMany, Embeddable, EmbeddedId, Version.
-	 */
-	protected void addJavaAttributeMappingProvidersTo(Collection<JavaAttributeMappingProvider> providers) {
-		providers.add(JavaBasicMappingProvider.instance());
-		providers.add(JavaEmbeddedMappingProvider.instance());
-		providers.add(JavaEmbeddedIdMappingProvider.instance());
-		providers.add(JavaIdMappingProvider.instance());
-		providers.add(JavaManyToManyMappingProvider.instance());
-		providers.add(JavaManyToOneMappingProvider.instance());
-		providers.add(JavaOneToManyMappingProvider.instance());
-		providers.add(JavaOneToOneMappingProvider.instance());
-		providers.add(JavaTransientMappingProvider.instance());
-		providers.add(JavaVersionMappingProvider.instance());
-	}
-
-	protected JavaAttributeMappingProvider javaAttributeMappingProviderFromMappingKey(String attributeMappingKey) {
-		for (Iterator<JavaAttributeMappingProvider> i = this.javaAttributeMappingProviders(); i.hasNext(); ) {
-			JavaAttributeMappingProvider provider = i.next();
-			if (provider.getKey() == attributeMappingKey) {
-				return provider;
-			}
-		}
-		throw new IllegalArgumentException("Illegal attribute mapping key: " + attributeMappingKey);
-	}
-	
-	protected JavaAttributeMappingProvider javaAttributeMappingProviderFromAnnotation(String annotationName) {
-		for (Iterator<JavaAttributeMappingProvider> i = this.javaAttributeMappingProviders(); i.hasNext(); ) {
-			JavaAttributeMappingProvider provider = i.next();
-			if (provider.getAnnotationName() == annotationName) {
-				return provider;
-			}
-		}
-		throw new IllegalArgumentException("Illegal annotation name: " + annotationName);
-	}
-	
-	protected ListIterator<DefaultJavaAttributeMappingProvider> defaultJavaAttributeMappingProviders() {
-		if (this.defaultJavaAttributeMappingProviders == null) {
-			this.defaultJavaAttributeMappingProviders = new ArrayList<DefaultJavaAttributeMappingProvider>();
-			this.addDefaultJavaAttributeMappingProvidersTo(this.defaultJavaAttributeMappingProviders);
-		}
-		return new CloneListIterator<DefaultJavaAttributeMappingProvider>(this.defaultJavaAttributeMappingProviders);
-	}
-	
-	/**
-	 * Override this to specify more or different default attribute mapping providers.
-	 * The default includes the JPA spec-defined attribute mappings of 
-	 * Embedded and Basic.
-	 */
-	protected void addDefaultJavaAttributeMappingProvidersTo(List<DefaultJavaAttributeMappingProvider> providers) {
-		providers.add(JavaEmbeddedMappingProvider.instance()); //bug 190344 need to test default embedded before basic
-		providers.add(JavaBasicMappingProvider.instance());
-	}
-
-	protected JavaAttributeMappingProvider defaultJavaAttributeMappingProvider(JavaPersistentAttribute persistentAttribute) {
-		for (Iterator<DefaultJavaAttributeMappingProvider> i = this.defaultJavaAttributeMappingProviders(); i.hasNext(); ) {
-			DefaultJavaAttributeMappingProvider provider = i.next();
-			if (provider.defaultApplies(persistentAttribute)) {
-				return provider;
-			}
-		}
-		
-		return nullAttributeMappingProvider();
-	}
-
-	public String defaultJavaAttributeMappingKey(JavaPersistentAttribute persistentAttribute) {
-		return defaultJavaAttributeMappingProvider(persistentAttribute).getKey();
-	}
-	
-	/**
-	 * the "null" attribute mapping is used when the attribute is neither
-	 * modified with a mapping annotation nor mapped by a "default" mapping
-	 */
-	protected JavaAttributeMappingProvider nullAttributeMappingProvider() {
-		return JavaNullAttributeMappingProvider.instance();
-	}
-
-	// **************** Validation *********************************************
-	
-	public void addToMessages(JpaProject project, List<IMessage> messages) {
-		project.addToMessages(messages);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JpaPlatformRegistry.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JpaPlatformRegistry.java
deleted file mode 100644
index 38213f9792..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JpaPlatformRegistry.java
+++ /dev/null
@@ -1,237 +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.core.internal.platform;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jpt.core.JpaPlatform;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CompositeIterator;
-import org.eclipse.jpt.utility.internal.iterators.ReadOnlyIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-
-/**
- * Singleton registry for storing all the registered JPA platform configuration
- * elements and instantiating JPA platforms from them.
- */
-public class JpaPlatformRegistry {
-
-	private final HashMap<String, IConfigurationElement> jpaPlatformConfigurationElements;
-
-
-	// singleton
-	private static final JpaPlatformRegistry INSTANCE = new JpaPlatformRegistry();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JpaPlatformRegistry instance() {
-		return INSTANCE;
-	}
-
-	private static final String EXTENSION_ID = "jpaPlatform"; //$NON-NLS-1$
-	private static final String EL_PLATFORM = "jpaPlatform"; //$NON-NLS-1$	
-	private static final String AT_ID = "id"; //$NON-NLS-1$	
-	private static final String AT_LABEL = "label"; //$NON-NLS-1$	
-	private static final String AT_CLASS = "class"; //$NON-NLS-1$
-	private static final String AT_DEFAULT = "default"; //$NON-NLS-1$
-
-
-	// ********** constructor/initialization **********
-
-	/**
-	 * ensure single instance
-	 */
-	private JpaPlatformRegistry() {
-		super();
-		this.jpaPlatformConfigurationElements = this.buildJpaPlatformConfigurationElements();
-	}
-	
-	
-	private HashMap<String, IConfigurationElement> buildJpaPlatformConfigurationElements() {
-		HashMap<String, IConfigurationElement> configElements = new HashMap<String, IConfigurationElement>();
-		for (Iterator<IConfigurationElement> stream = this.configElements(); stream.hasNext(); ) {
-			this.addConfigElementTo(stream.next(), configElements);
-		}
-		return configElements;
-	}
-
-	/**
-	 * Return the configuration elements from the Eclipse platform extension
-	 * registry.
-	 */
-	private Iterator<IConfigurationElement> configElements() {
-		return new CompositeIterator<IConfigurationElement>(
-				new TransformationIterator<IExtension, Iterator<IConfigurationElement>>(this.extensions()) {
-					@Override
-					protected Iterator<IConfigurationElement> transform(IExtension extension) {
-						return CollectionTools.iterator(extension.getConfigurationElements());
-					}
-				}
-		);
-	}
-
-	private Iterator<IExtension> extensions() {
-		return CollectionTools.iterator(this.extensionPoint().getExtensions());
-	}
-
-	private IExtensionPoint extensionPoint() {
-		return Platform.getExtensionRegistry().getExtensionPoint(JptCorePlugin.PLUGIN_ID, EXTENSION_ID);
-	}
-
-	private void addConfigElementTo(IConfigurationElement configElement, HashMap<String, IConfigurationElement> configElements) {
-		if ( ! configElement.getName().equals(EL_PLATFORM)) {
-			return;
-		}
-		if ( ! this.configElementIsValid(configElement)) {
-			return;
-		}
-
-		String id = configElement.getAttribute(AT_ID);
-		IConfigurationElement prev = configElements.get(id);
-		if (prev == null) {
-			configElements.put(id, configElement);
-		} else {
-			this.logDuplicatePlatform(prev, configElement);
-		}
-	}
-
-	/**
-	 * check *all* attributes before returning
-	 */
-	private boolean configElementIsValid(IConfigurationElement configElement) {
-		boolean valid = true;
-		if (configElement.getAttribute(AT_ID) == null) {
-			this.logMissingAttribute(configElement, AT_ID);
-			valid = false;
-		}
-		if (configElement.getAttribute(AT_LABEL) == null) {
-			logMissingAttribute(configElement, AT_LABEL);
-			valid = false;
-		}
-		if (configElement.getAttribute(AT_CLASS) == null) {
-			logMissingAttribute(configElement, AT_CLASS);
-			valid = false;
-		}
-		return valid;
-	}
-
-
-	// ********** public methods **********
-
-	/**
-	 * Return the IDs for the registered JPA platforms.
-	 * This does not activate any of the JPA platforms' plug-ins.
-	 */
-	public Iterator<String> jpaPlatformIds() {
-		return new ReadOnlyIterator<String>(this.jpaPlatformConfigurationElements.keySet());
-	}
-	
-	/**
-	 * Return whether the platform id is registered
-	 */
-	public boolean containsPlatform(String platformId) {
-		return this.jpaPlatformConfigurationElements.containsKey(platformId);
-	}
-	
-	/**
-	 * Return the label for the JPA platform with the specified ID.
-	 * This does not activate the JPA platform's plug-in.
-	 */
-	public String getJpaPlatformLabel(String id) {
-		return this.jpaPlatformConfigurationElements.get(id).getAttribute(AT_LABEL);
-	}
-	
-	/**
-	 * Return the ID for a JPA platform registered as a default platform.
-	 * Returns null if there are no such registered platforms.
-	 * Returns the first platform ID if there are multiple such registered platforms.
-	 */
-	public String getDefaultJpaPlatformId() {
-		for (String platformId : jpaPlatformConfigurationElements.keySet()) {
-			if ("true".equals(jpaPlatformConfigurationElements.get(platformId).getAttribute(AT_DEFAULT))) {
-				return platformId;
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Return a new JPA platform for the specified ID.
-	 * NB: This should only be called when instantiating a JPA platform
-	 * when building a new JPA project.
-	 * Unlike other registry methods, invoking this method may activate 
-	 * the plug-in.
-	 */
-	public JpaPlatform getJpaPlatform(String id) {
-		IConfigurationElement configElement = this.jpaPlatformConfigurationElements.get(id);
-		if (configElement == null) {
-			throw new IllegalArgumentException(id);
-		}
-		JpaPlatform platform;
-		try {
-			platform = (JpaPlatform) configElement.createExecutableExtension(AT_CLASS);
-		} catch (CoreException ex) {
-			this.logFailedInstantiation(configElement, ex);
-			throw new IllegalArgumentException(id);
-		}
-		platform.setId(id);
-		return platform;
-	}
-
-
-	// ********** errors **********
-
-	// TODO externalize strings
-	private void logMissingAttribute(IConfigurationElement configElement, String attributeName) {
-		String message = 
-			"An extension element \""
-			+ configElement.getName()
-			+ "\" in plugin \""
-			+ configElement.getContributor().getName()
-			+ "\" is missing a required attribute \""
-			+ attributeName
-			+ "\".";
-		JptCorePlugin.log(message);
-	}
-
-	// TODO externalize strings
-	private void logDuplicatePlatform(IConfigurationElement prevConfigElement, IConfigurationElement newConfigElement) {
-		String message =
-			"The plugins \""
-			+ prevConfigElement.getContributor().getName()
-			+ "\" and \""
-			+ newConfigElement.getContributor().getName()
-			+ "\" have registered a duplicate attribute \"id\" "
-			+ "for the extension element \"jpaPlatform\".";
-		JptCorePlugin.log(message);
-	}
-
-	// TODO externalize strings
-	private void logFailedInstantiation(IConfigurationElement configElement, CoreException ex) {
-		String message =
-			"Could not instantiate the class \""
-			+ configElement.getAttribute(AT_CLASS)
-			+ "\" for the extension element \""
-			+ configElement.getName()
-			+ "\" in the plugin \""
-			+ configElement.getContributor().getName()
-			+ "\".";
-		JptCorePlugin.log(message);
-		JptCorePlugin.log(ex);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/prefs/JpaPreferenceConstants.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/prefs/JpaPreferenceConstants.java
deleted file mode 100644
index 190fdf53c8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/prefs/JpaPreferenceConstants.java
+++ /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
- ******************************************************************************/
-package org.eclipse.jpt.core.internal.prefs;
-
-/**
- * Constant definitions for plug-in preferences
- */
-public class JpaPreferenceConstants 
-{
-	public static final String PREF_DEFAULT_JPA_LIB = "defaultJpaLib";
-	
-	public static final String PREF_DEFAULT_JPA_PLATFORM = "defaultJpaPlatform";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/prefs/JpaPreferenceInitializer.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/prefs/JpaPreferenceInitializer.java
deleted file mode 100644
index dde4b89381..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/prefs/JpaPreferenceInitializer.java
+++ /dev/null
@@ -1,36 +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.core.internal.prefs;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.internal.platform.GenericJpaPlatform;
-import org.eclipse.jpt.core.internal.platform.JpaPlatformRegistry;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * Class used to initialize default preference values.
- */
-public class JpaPreferenceInitializer extends AbstractPreferenceInitializer 
-{
-	@Override
-	public void initializeDefaultPreferences() {
-		IEclipsePreferences node = new DefaultScope().getNode(JptCorePlugin.instance().getBundle().getSymbolicName());
-		
-		// default JPA platform
-		String defaultPlatformId = JpaPlatformRegistry.instance().getDefaultJpaPlatformId();
-		if (StringTools.stringIsEmpty(defaultPlatformId)) {
-			defaultPlatformId = GenericJpaPlatform.ID;
-		}
-		node.put(JpaPreferenceConstants.PREF_DEFAULT_JPA_PLATFORM, defaultPlatformId);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/common/translators/BooleanTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/common/translators/BooleanTranslator.java
deleted file mode 100644
index 8dcc16aaf0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/common/translators/BooleanTranslator.java
+++ /dev/null
@@ -1,37 +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.core.internal.resource.common.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class BooleanTranslator extends Translator
-{
-	public BooleanTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, BOOLEAN_FEATURE | BOOLEAN_LOWERCASE);
-	}
-	
-	public BooleanTranslator(String domNameAndPath, EStructuralFeature aFeature, int style) {
-		super(domNameAndPath, aFeature, BOOLEAN_FEATURE | BOOLEAN_LOWERCASE | style);
-	}
-	
-	@Override
-	public Object convertStringToValue(String strValue, EObject owner) {
-		return Boolean.valueOf(strValue);
-	}
-	
-	@Override
-	public String convertValueToString(Object value, EObject owner) {
-		return ((Boolean) value).toString();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractJavaResourceNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractJavaResourceNode.java
deleted file mode 100644
index f0fb9e4117..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractJavaResourceNode.java
+++ /dev/null
@@ -1,102 +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.core.internal.resource.java;
-
-import org.eclipse.jpt.core.JpaAnnotationProvider;
-import org.eclipse.jpt.core.resource.java.JavaResourceModel;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JpaCompilationUnit;
-import org.eclipse.jpt.core.utility.jdt.AnnotationEditFormatter;
-import org.eclipse.jpt.utility.CommandExecutorProvider;
-import org.eclipse.jpt.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.utility.internal.model.CallbackChangeSupport;
-import org.eclipse.jpt.utility.internal.model.ChangeSupport;
-
-/**
- * resource containment hierarchy
- */
-public abstract class AbstractJavaResourceNode
-	extends AbstractModel
-	implements JavaResourceNode, CallbackChangeSupport.Source
-{
-	private final JavaResourceNode parent;
-
-
-	// ********** construction **********
-	
-	protected AbstractJavaResourceNode(JavaResourceNode parent) {
-		super();
-		this.checkParent(parent);
-		this.parent = parent;
-	}
-
-	protected void checkParent(JavaResourceNode p) {
-		if (p == null) {
-			if (this.requiresParent()) {
-				throw new IllegalArgumentException("'parent' cannot be null");
-			}
-		} else {
-			if (this.forbidsParent()) {
-				throw new IllegalArgumentException("'parent' must be null");
-			}
-		}
-	}
-
-	protected boolean requiresParent() {
-		return true;
-	}
-
-	protected boolean forbidsParent() {
-		return ! this.requiresParent();  // assume 'parent' is not optional
-	}
-
-	@Override
-	protected ChangeSupport buildChangeSupport() {
-		return new CallbackChangeSupport(this);
-	}
-
-
-	// ********** JavaResourceNode implementation **********
-	
-	public JpaCompilationUnit getJpaCompilationUnit() {
-		return this.parent.getJpaCompilationUnit();
-	}
-	
-	public JavaResourceModel getResourceModel() {
-		return this.getJpaCompilationUnit().getResourceModel();
-	}
-
-
-	// ********** CallbackChangeSupport.Source implementation **********
-	
-	public void aspectChanged(String aspectName) {
-		this.getJpaCompilationUnit().resourceChanged();
-	}
-
-
-	// ********** convenience methods **********
-	
-	protected JavaResourceNode getParent() {
-		return this.parent;
-	}
-
-	public JpaAnnotationProvider getAnnotationProvider() {
-		return this.getJpaCompilationUnit().getAnnotationProvider();
-	}
-	
-	public CommandExecutorProvider getModifySharedDocumentCommandExecutorProvider() {
-		return this.getJpaCompilationUnit().getModifySharedDocumentCommandExecutorProvider();
-	}
-	
-	public AnnotationEditFormatter getAnnotationEditFormatter()  {
-		return this.getJpaCompilationUnit().getAnnotationEditFormatter();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractJavaResourcePersistentMember.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractJavaResourcePersistentMember.java
deleted file mode 100644
index 34fe50aa5e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractJavaResourcePersistentMember.java
+++ /dev/null
@@ -1,563 +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.core.internal.resource.java;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.ASTNodeTextRange;
-import org.eclipse.jpt.core.internal.utility.jdt.JDTTools;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.ContainerAnnotation;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.utility.MethodSignature;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneIterator;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator;
-
-public abstract class AbstractJavaResourcePersistentMember<E extends Member>
-	extends AbstractJavaResourceNode
-	implements JavaResourcePersistentMember
-{	
-	private final E member;
-
-	/**
-	 * stores all annotations(non-mapping) except duplicates, java compiler has an error for duplicates
-	 */
-	private final Collection<Annotation> annotations;
-	
-	/**
-	 * stores all mapping annotations except duplicates, java compiler has an error for duplicates
-	 */
-	private final Collection<Annotation> mappingAnnotations;
-	
-	private boolean persistable;
-
-	AbstractJavaResourcePersistentMember(JavaResourceNode parent, E member){
-		super(parent);
-		this.member = member;
-		this.annotations = new ArrayList<Annotation>();
-		this.mappingAnnotations = new ArrayList<Annotation>();
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		getMember().getBodyDeclaration(astRoot).accept(this.buildInitialAnnotationVisitor(astRoot));
-		this.persistable = buildPersistable(astRoot);		
-	}
-
-	protected ASTVisitor buildInitialAnnotationVisitor(CompilationUnit astRoot) {
-		return new LocalASTVisitor(astRoot, this.getMember().getBodyDeclaration(astRoot)) {
-			@Override
-			protected void visitChildAnnotation(org.eclipse.jdt.core.dom.Annotation node) {
-				AbstractJavaResourcePersistentMember.this.addInitialAnnotation(node, this.astRoot);
-			}
-		};
-	}
-	
-	protected void addInitialAnnotation(org.eclipse.jdt.core.dom.Annotation node, CompilationUnit astRoot) {
-		String qualifiedAnnotationName = JDTTools.resolveAnnotation(node);
-		if (qualifiedAnnotationName == null) {
-			return;
-		}
-		if (isPossibleAnnotation(qualifiedAnnotationName)) {
-			if (getAnnotation(qualifiedAnnotationName) == null) { //don't want duplicates
-				Annotation annotation = buildAnnotation(qualifiedAnnotationName);
-				annotation.initialize(astRoot);
-				this.annotations.add(annotation);
-			}
-		}
-		else if (isPossibleMappingAnnotation(qualifiedAnnotationName)) {
-			if (getMappingAnnotation(qualifiedAnnotationName) == null) { //don't want duplicates
-				Annotation annotation = buildMappingAnnotation(qualifiedAnnotationName);
-				annotation.initialize(astRoot);
-				this.mappingAnnotations.add(annotation);
-			}
-		}
-	}
-
-	public E getMember() {
-		return this.member;
-	}
-	
-	protected abstract Annotation buildAnnotation(String annotationName);
-	
-	protected abstract Annotation buildNullAnnotation(String annotationName);
-
-	protected abstract Annotation buildMappingAnnotation(String mappingAnnotationName);
-	
-	protected abstract Annotation buildNullMappingAnnotation(String annotationName);
-
-	protected abstract ListIterator<String> possibleMappingAnnotationNames();
-
-	protected abstract boolean isPossibleAnnotation(String annotationName);
-	
-	protected abstract boolean isPossibleMappingAnnotation(String annotationName);
-	
-	protected boolean buildPersistable(CompilationUnit astRoot) {
-		return this.getMember().isPersistable(astRoot);
-	}
-
-
-	public Annotation getAnnotation(String annotationName) {
-		for (Iterator<Annotation> i = annotations(); i.hasNext(); ) {
-			Annotation annotation = i.next();
-			if (annotation.getAnnotationName().equals(annotationName)) {
-				return annotation;
-			}
-		}
-		return null;
-	}
-	
-	public JavaResourceNode getNonNullAnnotation(String annotationName) {
-		Annotation annotation = getAnnotation(annotationName);
-		if (annotation == null) {
-			return buildNullAnnotation(annotationName);	
-		}
-		return annotation;
-	}
-	
-	public Annotation getMappingAnnotation(String annotationName) {
-		for (Iterator<Annotation> i = mappingAnnotations(); i.hasNext(); ) {
-			Annotation mappingAnnotation = i.next();
-			if (mappingAnnotation.getAnnotationName().equals(annotationName)) {
-				return mappingAnnotation;
-			}
-		}
-		return null;
-	}
-
-	public JavaResourceNode getNullMappingAnnotation(String annotationName) {
-		return buildNullMappingAnnotation(annotationName);	
-	}
-	
-	@SuppressWarnings("unchecked")
-	public Iterator<Annotation> annotations() {
-		return new CloneIterator<Annotation>(this.annotations);
-	}
-	
-	public int annotationsSize() {
-		return this.annotations.size();
-	}
-	
-	public Annotation addAnnotation(String annotationName) {
-		Annotation annotation = buildAnnotation(annotationName);
-		this.annotations.add(annotation);
-		annotation.newAnnotation();
-		this.fireItemAdded(ANNOTATIONS_COLLECTION, annotation);
-		return annotation;
-	}
-
-	@SuppressWarnings("unchecked")
-	protected ContainerAnnotation<NestableAnnotation> addContainerAnnotation(String containerAnnotationName) {
-		return (ContainerAnnotation<NestableAnnotation>) addAnnotation(containerAnnotationName);
-	}
-	
-	protected ContainerAnnotation<NestableAnnotation> addContainerAnnotationTwoNestableAnnotations(String containerAnnotationName) {
-		ContainerAnnotation<NestableAnnotation> containerAnnotation = buildContainerAnnotation(containerAnnotationName);
-		this.annotations.add(containerAnnotation);
-		containerAnnotation.newAnnotation();
-		containerAnnotation.addInternal(0).newAnnotation();
-		containerAnnotation.addInternal(1).newAnnotation();
-		return containerAnnotation;
-	}
-		
-	@SuppressWarnings("unchecked")
-	protected ContainerAnnotation<NestableAnnotation>  buildContainerAnnotation(String containerAnnotationName) {
-		return (ContainerAnnotation<NestableAnnotation>) buildAnnotation(containerAnnotationName);
-	}
-	
-	@SuppressWarnings("unchecked")
-	protected ContainerAnnotation<NestableAnnotation> getContainerAnnotation(String containerAnnotationName) {
-		return (ContainerAnnotation<NestableAnnotation>) getAnnotation(containerAnnotationName);
-	}
-	
-	protected NestableAnnotation getNestableAnnotation(String nestableAnnotationName) {
-		return (NestableAnnotation) getAnnotation(nestableAnnotationName);
-	}
-	
-	protected NestableAnnotation addNestableAnnotation(String nestableAnnotationName) {
-		return (NestableAnnotation) addAnnotation(nestableAnnotationName);
-	}
-	
-	//TODO it seems we should be firing one change notification here, that a new nestable annotation was added.
-	public NestableAnnotation addAnnotation(int index, String nestableAnnotationName, String containerAnnotationName) {
-		NestableAnnotation nestedAnnotation = (NestableAnnotation) getAnnotation(nestableAnnotationName);
-		
-		ContainerAnnotation<NestableAnnotation> containerAnnotation = getContainerAnnotation(containerAnnotationName);
-		
-		if (containerAnnotation != null) {
-			//ignore any nestableAnnotation and just add to the plural one
-			NestableAnnotation newNestedAnnotation = ContainerAnnotationTools.addNestedAnnotation(index, containerAnnotation);
-			//TODO any event notification being fired for the add???
-			return newNestedAnnotation;
-		}
-		if (nestedAnnotation == null) {
-			//add the nestable since neither nestable or container exists
-			return addNestableAnnotation(nestableAnnotationName);
-		}
-		//move the nestable to a new container annotation and add to it
-		ContainerAnnotation<NestableAnnotation> newContainerAnnotation = addContainerAnnotationTwoNestableAnnotations(containerAnnotationName);
-		if (index == 0) {
-			newContainerAnnotation.nestedAnnotationAt(1).initializeFrom(nestedAnnotation);
-		}
-		else {
-			newContainerAnnotation.nestedAnnotationAt(0).initializeFrom(nestedAnnotation);		
-		}
-		removeAnnotation(nestedAnnotation);
-		return newContainerAnnotation.nestedAnnotationAt(index);
-	}
-	
-	public void move(int targetIndex, int sourceIndex, String containerAnnotationName) {
-		move(targetIndex, sourceIndex, getContainerAnnotation(containerAnnotationName));
-	}
-	
-	protected void move(int targetIndex, int sourceIndex, ContainerAnnotation<NestableAnnotation> containerAnnotation) {
-		containerAnnotation.move(targetIndex, sourceIndex);
-		ContainerAnnotationTools.synchAnnotationsAfterMove(targetIndex, sourceIndex, containerAnnotation);
-	}
-	
-	protected void addAnnotation(Annotation annotation) {
-		addItemToCollection(annotation, this.annotations, ANNOTATIONS_COLLECTION);
-	}
-	
-	protected void removeAnnotation(Annotation annotation) {
-		removeAnnotation_(annotation);
-		//TODO looks odd that we remove the annotation here, but in addAnnotation(Annotation) we don't do the same
-		annotation.removeAnnotation();
-	}
-	
-	protected void removeAnnotation_(Annotation annotation) {
-		removeItemFromCollection(annotation, this.annotations, ANNOTATIONS_COLLECTION);
-	}
-	
-	protected void addMappingAnnotation(String mappingAnnotationName) {
-		if (getMappingAnnotation(mappingAnnotationName) != null) {
-			return;
-		}
-		Annotation mappingAnnotation = buildMappingAnnotation(mappingAnnotationName);
-		addMappingAnnotation(mappingAnnotation);
-		//TODO should this be done here or should creating the Annotation do this??
-		mappingAnnotation.newAnnotation();
-	}	
-
-	protected void addMappingAnnotation(Annotation annotation) {
-		addItemToCollection(annotation, this.mappingAnnotations, MAPPING_ANNOTATIONS_COLLECTION);
-	}
-	
-	protected void removeMappingAnnotation(Annotation annotation) {
-		removeMappingAnnotation_(annotation);
-		annotation.removeAnnotation();
-	}
-	
-	protected void removeMappingAnnotation_(Annotation annotation) {
-		removeItemFromCollection(annotation, this.mappingAnnotations, MAPPING_ANNOTATIONS_COLLECTION);
-	}
-	
-	@SuppressWarnings("unchecked")
-	public Iterator<Annotation> mappingAnnotations() {
-		return new CloneIterator<Annotation>(this.mappingAnnotations);
-	}
-
-	public int mappingAnnotationsSize() {
-		return this.mappingAnnotations.size();
-	}
-	
-	public void removeAnnotation(String annotationName) {
-		Annotation annotation = getAnnotation(annotationName);
-		if (annotation != null) {
-			removeAnnotation(annotation);
-		}
-	}
-	
-	public void removeAnnotation(int index, String nestableAnnotationName, String containerAnnotationName) {
-		ContainerAnnotation<NestableAnnotation> containerAnnotation = getContainerAnnotation(containerAnnotationName);
-		if (containerAnnotation == null) {
-			Annotation annotation = getAnnotation(nestableAnnotationName);
-			removeAnnotation(annotation);
-		}
-		else {
-			removeAnnotation(index, containerAnnotation);
-		}
-	}
-	
-	protected void removeAnnotation(int index, ContainerAnnotation<NestableAnnotation> containerAnnotation) {
-		NestableAnnotation nestableAnnotation = containerAnnotation.nestedAnnotationAt(index);
-		containerAnnotation.remove(index);
-		//TODO move these 2 lines to the ContainerAnnotation implementation, i think
-		nestableAnnotation.removeAnnotation();
-		ContainerAnnotationTools.synchAnnotationsAfterRemove(index, containerAnnotation);
-		
-		if (containerAnnotation.nestedAnnotationsSize() == 0) {
-			removeAnnotation(containerAnnotation);
-		}
-		else if (containerAnnotation.nestedAnnotationsSize() == 1) {
-			NestableAnnotation nestedAnnotation = containerAnnotation.nestedAnnotationAt(0);
-			
-			this.annotations.remove(containerAnnotation);
-			containerAnnotation.removeAnnotation();
-
-
-			NestableAnnotation newAnnotation = (NestableAnnotation) buildAnnotation(containerAnnotation.getNestableAnnotationName());
-			this.annotations.add(newAnnotation);
-			newAnnotation.newAnnotation();
-
-			newAnnotation.initializeFrom(nestedAnnotation);
-			
-			this.fireItemAdded(ANNOTATIONS_COLLECTION, newAnnotation);
-			fireItemRemoved(ANNOTATIONS_COLLECTION, containerAnnotation);
-		}
-	}
-	// removes all other *mapping* annotations that exist, not just the one returned by mappingAnnotation()
-	// mappingAnnotation() returns the first mapping annotation found in the source.  if there are multiple
-	// mapping annotations (which is a validation error condition) then calling this api would not work
-	// because the new mapping annotatio would be added to the end of the list of annotations.
-	public void setMappingAnnotation(String annotationName) {
-		if (getMappingAnnotation(annotationName) != null) {
-			throw new IllegalStateException("The mapping annotation named " + annotationName + " already exists.");
-		}
-		Annotation oldMapping = getMappingAnnotation();
-		Annotation newMapping = null;
-		if (oldMapping != null) {
-			removeUnnecessaryAnnotations(annotationName);
-		}
-		if (annotationName != null) {
-			if (getMappingAnnotation(annotationName) != null) {
-				return;
-			}
-			newMapping = buildMappingAnnotation(annotationName);
-			this.mappingAnnotations.add(newMapping);
-			newMapping.newAnnotation();
-		}
-		//have to hold property change notification until the end so a project update does not occur
-		//before we are finished removing the old mapping and adding the new mapping
-		//just firing collectio changed since one or more removes and one add was completed.
-		//if we ever listen for specific events instead of just doing a mass update, we might need to make this more specific
-		fireCollectionChanged(MAPPING_ANNOTATIONS_COLLECTION);
-	}
-	/**
-	 * Remove all mapping annotations that already exist.
-	 * No change notification fired.
-	 */
-	protected void removeUnnecessaryAnnotations(String newMappingAnnotationName) {	
-		for (ListIterator<String> i = possibleMappingAnnotationNames(); i.hasNext(); ) {
-			String mappingAnnotationName = i.next();
-			if (mappingAnnotationName != newMappingAnnotationName) {
-				Annotation mappingAnnotation = getMappingAnnotation(mappingAnnotationName);
-				if (mappingAnnotation != null) {
-					this.mappingAnnotations.remove(mappingAnnotation);
-					mappingAnnotation.removeAnnotation();
-				}
-			}
-		}
-	}
-	
-	//TODO need property change notification on this mappingAnnotation changing
-	//from the context model we don't really care if their are multiple mapping annotations,
-	//just which one we need to use
-	public Annotation getMappingAnnotation() {
-		for (ListIterator<String> i = possibleMappingAnnotationNames(); i.hasNext(); ) {
-			String mappingAnnotationName = i.next();
-			for (Iterator<Annotation> j = mappingAnnotations(); j.hasNext(); ) {
-				Annotation mappingAnnotation = j.next();
-				if (mappingAnnotationName == mappingAnnotation.getAnnotationName()) {
-					return mappingAnnotation;
-				}
-			}
-		}
-		return null;
-	}
-	
-	@SuppressWarnings("unchecked")
-	public ListIterator<NestableAnnotation> annotations(String nestableAnnotationName, String containerAnnotationName) {
-		ContainerAnnotation<NestableAnnotation> containerAnnotation = getContainerAnnotation(containerAnnotationName);
-		if (containerAnnotation != null) {
-			return containerAnnotation.nestedAnnotations();
-		}
-		NestableAnnotation nestableAnnotation = getNestableAnnotation(nestableAnnotationName);
-		if (nestableAnnotation != null) {
-			return new SingleElementListIterator<NestableAnnotation>(nestableAnnotation);
-		}
-		return EmptyListIterator.instance();
-	}
-	
-	public void updateFromJava(CompilationUnit astRoot) {
-		this.updateAnnotations(astRoot);
-		this.setPersistable(this.buildPersistable(astRoot));		
-	}
-	
-	public void resolveTypes(CompilationUnit astRoot) {
-		this.setPersistable(this.buildPersistable(astRoot));		
-	}
-	
-	protected void updateAnnotations(CompilationUnit astRoot) {
-		getMember().getBodyDeclaration(astRoot).accept(this.buildUpdateAnnotationVisitor(astRoot));
-		removeMappingAnnotationsNotInSource(astRoot);
-		removeAnnotationsNotInSource(astRoot);
-	}
-	
-	protected void removeAnnotationsNotInSource(CompilationUnit astRoot) {
-		for (Annotation annotation : CollectionTools.iterable(annotations())) {
-			if (annotation.getJdtAnnotation(astRoot) == null) {
-				removeAnnotation_(annotation);
-			}
-		}		
-	}
-	
-	protected void removeMappingAnnotationsNotInSource(CompilationUnit astRoot) {
-		for (Annotation mappingAnnotation : CollectionTools.iterable(mappingAnnotations())) {
-			if (mappingAnnotation.getJdtAnnotation(astRoot) == null) {
-				removeMappingAnnotation_(mappingAnnotation);
-			}
-		}	
-	}
-	
-	protected ASTVisitor buildUpdateAnnotationVisitor(CompilationUnit astRoot) {
-		return new LocalASTVisitor(astRoot, this.getMember().getBodyDeclaration(astRoot)) {
-			@Override
-			protected void visitChildAnnotation(org.eclipse.jdt.core.dom.Annotation node) {
-				AbstractJavaResourcePersistentMember.this.addOrUpdateAnnotation(node, this.astRoot);
-			}
-		};
-	}
-	
-	protected void addOrUpdateAnnotation(org.eclipse.jdt.core.dom.Annotation node, CompilationUnit astRoot) {
-		String qualifiedAnnotationName = JDTTools.resolveAnnotation(node);
-		if (qualifiedAnnotationName == null) {
-			return;
-		}
-		if (isPossibleAnnotation(qualifiedAnnotationName)) {
-			Annotation annotation = getAnnotation(qualifiedAnnotationName);
-			if (annotation != null) {
-				annotation.updateFromJava(astRoot);
-			}
-			else {
-				annotation = buildAnnotation(qualifiedAnnotationName);
-				annotation.initialize(astRoot);
-				addAnnotation(annotation);				
-			}
-		}
-		else if (isPossibleMappingAnnotation(qualifiedAnnotationName)) {
-			Annotation annotation = getMappingAnnotation(qualifiedAnnotationName);
-			if (annotation != null) {
-				annotation.updateFromJava(astRoot);
-			}
-			else {
-				annotation = buildMappingAnnotation(qualifiedAnnotationName);
-				annotation.initialize(astRoot);
-				addMappingAnnotation(annotation);				
-			}
-		}
-	}
-
-	public boolean isFor(String memberName, int occurrence) {
-		return this.member.matches(memberName, occurrence);
-	}
-
-	public boolean isFor(MethodSignature methodSignature, int occurrence) {
-		return false;
-	}
-
-	public boolean isPersistable() {
-		return this.persistable;
-	}
-	
-	protected void setPersistable(boolean newPersistable) {
-		boolean oldPersistable = this.persistable;
-		this.persistable = newPersistable;
-		firePropertyChanged(PERSISTABLE_PROPERTY, oldPersistable, newPersistable);
-		//TODO change notification to parent so that the context model gets notification 
-		//that the list of persistable fields has been updated
-		//
-	}
-	
-	public boolean isPersisted() {
-		return getMappingAnnotation() != null;
-	}
-
-	public TextRange fullTextRange(CompilationUnit astRoot) {
-		return this.getTextRange(this.getMember().getBodyDeclaration(astRoot));
-	}
-
-	public TextRange getTextRange(CompilationUnit astRoot) {
-		return this.fullTextRange(astRoot);
-	}
-
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return this.getMember().getNameTextRange(astRoot);
-	}
-	
-	protected TextRange getTextRange(ASTNode astNode) {
-		return (astNode == null) ? null : new ASTNodeTextRange(astNode);
-	}
-
-	protected static <T extends JavaResourcePersistentMember> Iterator<T> persistableMembers(Iterator<T> attributes) {
-		return new FilteringIterator<T, T>(attributes) {
-			@Override
-			protected boolean accept(T attribute) {
-				return attribute.isPersistable();
-			}
-		};
-	}
-
-
-	// ********** AST visitor **********
-
-	protected abstract class LocalASTVisitor extends ASTVisitor {
-		protected final CompilationUnit astRoot;
-		protected final BodyDeclaration bodyDeclaration;
-
-		protected LocalASTVisitor(CompilationUnit astRoot, BodyDeclaration bodyDeclaration) {
-			super();
-			this.astRoot = astRoot;
-			this.bodyDeclaration = bodyDeclaration;
-		}
-
-		@Override
-		public boolean visit(SingleMemberAnnotation node) {
-			return visit_(node);
-		}
-	
-		@Override
-		public boolean visit(NormalAnnotation node) {
-			return visit_(node);
-		}
-	
-		@Override
-		public boolean visit(MarkerAnnotation node) {
-			return visit_(node);
-		}
-		
-		protected boolean visit_(org.eclipse.jdt.core.dom.Annotation node) {
-			// ignore annotations for child members, only this member
-			if (node.getParent() == this.bodyDeclaration) {
-				this.visitChildAnnotation(node);
-			}
-			return false;
-		}
-
-		protected abstract void visitChildAnnotation(org.eclipse.jdt.core.dom.Annotation node);
-
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractNamedColumn.java
deleted file mode 100644
index ddf131e8af..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractNamedColumn.java
+++ /dev/null
@@ -1,146 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.NumberIntegerExpressionConverter;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.NamedColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationAdapter;
-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;
-
-public abstract class AbstractNamedColumn extends AbstractResourceAnnotation<Member> implements NamedColumnAnnotation
-{
-	// hold this so we can get the 'name' text range
-	private final DeclarationAnnotationElementAdapter<String> nameDeclarationAdapter;
-
-	// hold this so we can get the 'columnDefinition' text range
-	private final DeclarationAnnotationElementAdapter<String> columnDefinitionDeclarationAdapter;
-
-	private final AnnotationElementAdapter<String> nameAdapter;
-
-	private final AnnotationElementAdapter<String> columnDefinitionAdapter;
-
-	private String name;
-	private String columnDefinition;
-	
-	public AbstractNamedColumn(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) {
-		super(parent, member, daa, annotationAdapter);
-		this.nameDeclarationAdapter = this.buildStringElementAdapter(this.nameElementName());
-		this.nameAdapter = this.buildShortCircuitElementAdapter(this.nameDeclarationAdapter);
-		this.columnDefinitionDeclarationAdapter = this.buildStringElementAdapter(this.columnDefinitionElementName());		
-		this.columnDefinitionAdapter = this.buildShortCircuitElementAdapter(this.columnDefinitionDeclarationAdapter);
-	}
-
-	protected DeclarationAnnotationElementAdapter<String> buildStringElementAdapter(String elementName) {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(getDeclarationAnnotationAdapter(), elementName);
-	}
-
-	protected DeclarationAnnotationElementAdapter<Boolean> buildBooleanElementAdapter(String elementName) {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(getDeclarationAnnotationAdapter(), elementName, BooleanExpressionConverter.instance());
-	}
-
-	protected DeclarationAnnotationElementAdapter<Integer> buildIntegerElementAdapter(String elementName) {
-		return new ConversionDeclarationAnnotationElementAdapter<Integer>(getDeclarationAnnotationAdapter(), elementName, NumberIntegerExpressionConverter.instance());
-	}
-
-	protected AnnotationElementAdapter<String> buildShortCircuitElementAdapter(DeclarationAnnotationElementAdapter<String> daea) {
-		return new ShortCircuitAnnotationElementAdapter<String>(getMember(), daea);
-	}
-	
-	protected AnnotationElementAdapter<Boolean> buildShortCircuitBooleanElementAdapter(DeclarationAnnotationElementAdapter<Boolean> daea) {
-		return new ShortCircuitAnnotationElementAdapter<Boolean>(getMember(), daea);
-	}
-	
-	protected AnnotationElementAdapter<Integer> buildShortCircuitIntegerElementAdapter(DeclarationAnnotationElementAdapter<Integer> daea) {
-		return new ShortCircuitAnnotationElementAdapter<Integer>(getMember(), daea);
-	}
-
-	protected AnnotationElementAdapter<String> buildShortCircuitStringElementAdapter(String elementName) {
-		return this.buildShortCircuitElementAdapter(this.buildStringElementAdapter(elementName));
-	}
-	protected abstract String nameElementName();
-
-	protected abstract String columnDefinitionElementName();
-
-	public void initialize(CompilationUnit astRoot) {
-		this.name = this.name(astRoot);
-		this.columnDefinition = this.columnDefinition(astRoot);
-	}
-	
-	public void initializeFrom(NestableAnnotation oldAnnotation) {
-		NamedColumnAnnotation oldColumn = (NamedColumnAnnotation) oldAnnotation;
-		setName(oldColumn.getName());
-		setColumnDefinition(oldColumn.getColumnDefinition());
-	}
-
-	//************* NamedColumn 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 getColumnDefinition() {
-		return this.columnDefinition;
-	}
-	
-	public void setColumnDefinition(String newColumnDefinition) {
-		if (attributeValueHasNotChanged(this.columnDefinition, newColumnDefinition)) {
-			return;
-		}
-		String oldColumnDefinition = this.columnDefinition;
-		this.columnDefinition = newColumnDefinition;
-		this.columnDefinitionAdapter.setValue(newColumnDefinition);
-		firePropertyChanged(COLUMN_DEFINITION_PROPERTY, oldColumnDefinition, newColumnDefinition);
-	}	
-
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.nameDeclarationAdapter, astRoot);
-	}
-
-	public TextRange getColumnDefinitionTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.columnDefinitionDeclarationAdapter, astRoot);
-	}
-	
-	public boolean nameTouches(int pos, CompilationUnit astRoot) {
-		return this.elementTouches(this.nameDeclarationAdapter, pos, astRoot);
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		this.setName(this.name(astRoot));
-		this.setColumnDefinition(this.columnDefinition(astRoot));
-	}
-	
-	protected String name(CompilationUnit astRoot) {
-		return this.nameAdapter.getValue(astRoot);
-	}
-	
-	protected String columnDefinition(CompilationUnit astRoot) {
-		return this.columnDefinitionAdapter.getValue(astRoot);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractNamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractNamedQuery.java
deleted file mode 100644
index f06e4dbdad..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractNamedQuery.java
+++ /dev/null
@@ -1,309 +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.core.internal.resource.java;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.resource.java.ContainerAnnotation;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.core.resource.java.NestableQueryHint;
-import org.eclipse.jpt.core.resource.java.QueryAnnotation;
-import org.eclipse.jpt.core.resource.java.QueryHintAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationAdapter;
-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.Type;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-public abstract class AbstractNamedQuery extends AbstractResourceAnnotation<Type> 
-	implements QueryAnnotation
-{
-	// hold this so we can get the 'name' text range
-	private final DeclarationAnnotationElementAdapter<String> nameDeclarationAdapter;
-
-	// hold this so we can get the 'query' text range
-	private final DeclarationAnnotationElementAdapter<String> queryDeclarationAdapter;
-
-	private final AnnotationElementAdapter<String> nameAdapter;
-
-	private final AnnotationElementAdapter<String> queryAdapter;
-
-	private String name;
-	
-	private String query;
-	
-	private final List<NestableQueryHint> hints;
-	private final HintsContainerAnnotation hintsContainerAnnotation;
-	
-	protected AbstractNamedQuery(JavaResourceNode parent, Type type,DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) {
-		super(parent, type, daa, annotationAdapter);
-		this.nameDeclarationAdapter = nameAdapter(daa);
-		this.queryDeclarationAdapter = queryAdapter(daa);
-		this.nameAdapter = this.buildAdapter(this.nameDeclarationAdapter);
-		this.queryAdapter = this.buildAdapter(this.queryDeclarationAdapter);
-		this.hints = new ArrayList<NestableQueryHint>();
-		this.hintsContainerAnnotation = new HintsContainerAnnotation();
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.name = this.name(astRoot);
-		this.query = this.query(astRoot);
-		ContainerAnnotationTools.initializeNestedAnnotations(astRoot, this.hintsContainerAnnotation);
-	}
-	
-	
-	// ********** initialization **********
-	protected AnnotationElementAdapter<String> buildAdapter(DeclarationAnnotationElementAdapter<String> daea) {
-		return new ShortCircuitAnnotationElementAdapter<String>(getMember(), daea);
-	}
-
-	protected DeclarationAnnotationElementAdapter<String> nameAdapter(DeclarationAnnotationAdapter daa) {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(daa, nameElementName());
-	}
-
-	protected DeclarationAnnotationElementAdapter<String> queryAdapter(DeclarationAnnotationAdapter daa) {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(daa, queryElementName());
-	}
-
-	protected abstract String nameElementName();
-
-	protected abstract String queryElementName();
-
-	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 getQuery() {
-		return this.query;
-	}
-
-	public void setQuery(String newQuery) {
-		if (attributeValueHasNotChanged(this.query, newQuery)) {
-			return;
-		}
-		String oldQuery = this.query;
-		this.query = newQuery;
-		this.queryAdapter.setValue(newQuery);
-		firePropertyChanged(QUERY_PROPERTY, oldQuery, newQuery);
-	}
-
-	public ListIterator<QueryHintAnnotation> hints() {
-		return new CloneListIterator<QueryHintAnnotation>(this.hints);
-	}
-	
-	public int hintsSize() {
-		return this.hints.size();
-	}
-	
-	public NestableQueryHint hintAt(int index) {
-		return this.hints.get(index);
-	}
-	
-	public int indexOfHint(QueryHintAnnotation queryHint) {
-		return this.hints.indexOf(queryHint);
-	}
-	
-	public NestableQueryHint addHint(int index) {
-		NestableQueryHint queryHint = (NestableQueryHint) ContainerAnnotationTools.addNestedAnnotation(index, this.hintsContainerAnnotation);
-		fireItemAdded(QueryAnnotation.HINTS_LIST, index, queryHint);
-		return queryHint;
-	}
-	
-	private void addHint(int index, NestableQueryHint queryHint) {
-		addItemToList(index, queryHint, this.hints, HINTS_LIST);
-	}
-	
-	public void removeHint(int index) {
-		NestableQueryHint queryHint = hintAt(index);
-		removeHint(queryHint);
-		queryHint.removeAnnotation();
-		ContainerAnnotationTools.synchAnnotationsAfterRemove(index, this.hintsContainerAnnotation);
-	}
-	
-	private void removeHint(NestableQueryHint queryHint) {
-		removeItemFromList(queryHint, this.hints, HINTS_LIST);
-	}
-
-	public void moveHint(int targetIndex, int sourceIndex) {
-		moveHintInternal(targetIndex, sourceIndex);
-		ContainerAnnotationTools.synchAnnotationsAfterMove(targetIndex, sourceIndex, this.hintsContainerAnnotation);
-		fireItemMoved(QueryAnnotation.HINTS_LIST, targetIndex, sourceIndex);
-	}
-	
-	protected void moveHintInternal(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.hints, targetIndex, sourceIndex);
-	}
-	
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.nameDeclarationAdapter, astRoot);
-	}
-
-	public TextRange getQueryTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.queryDeclarationAdapter, astRoot);
-	}
-	
-	public void updateFromJava(CompilationUnit astRoot) {
-		this.setName(this.name(astRoot));
-		this.setQuery(this.query(astRoot));
-		this.updateQueryHintsFromJava(astRoot);
-	}
-
-	protected String name(CompilationUnit astRoot) {
-		return this.nameAdapter.getValue(astRoot);
-	}
-	
-	protected String query(CompilationUnit astRoot) {
-		return this.queryAdapter.getValue(astRoot);
-	}
-	
-	private void updateQueryHintsFromJava(CompilationUnit astRoot) {
-		ContainerAnnotationTools.updateNestedAnnotationsFromJava(astRoot, this.hintsContainerAnnotation);
-	}
-	
-	protected abstract NestableQueryHint createQueryHint(int index);
-	
-	// ********** persistence model -> java annotations **********
-	public IndexedAnnotationAdapter getIndexedAnnotationAdapter() {
-		return (IndexedAnnotationAdapter) super.getAnnotationAdapter();
-	}
-
-	public void moveAnnotation(int newIndex) {
-		getIndexedAnnotationAdapter().moveAnnotation(newIndex);
-	}
-
-	public void initializeFrom(NestableAnnotation oldAnnotation) {
-		AbstractNamedQuery oldNamedQuery = (AbstractNamedQuery) oldAnnotation;
-		setName(oldNamedQuery.getName());
-		setQuery(oldNamedQuery.getQuery());
-		for (QueryHintAnnotation queryHint : CollectionTools.iterable(oldNamedQuery.hints())) {
-			NestableQueryHint newQueryHint = addHint(oldNamedQuery.indexOfHint(queryHint));
-			newQueryHint.initializeFrom((NestableQueryHint) queryHint);
-		}
-	}
-
-	
-	private class HintsContainerAnnotation extends AbstractJavaResourceNode implements ContainerAnnotation<NestableQueryHint> {
-
-		public HintsContainerAnnotation() {
-			super(AbstractNamedQuery.this);
-		}
-		
-		public void initialize(CompilationUnit astRoot) {
-			// nothing to initialize
-		}
-		
-		public NestableQueryHint add(int index) {
-			NestableQueryHint queryHint = AbstractNamedQuery.this.createQueryHint(index);
-			AbstractNamedQuery.this.addHint(index, queryHint);
-			return queryHint;
-		}
-		
-		public NestableQueryHint addInternal(int index) {
-			NestableQueryHint queryHint = AbstractNamedQuery.this.createQueryHint(index);
-			AbstractNamedQuery.this.hints.add(index, queryHint);
-			return queryHint;
-		}
-		
-		public String getAnnotationName() {
-			return AbstractNamedQuery.this.getAnnotationName();
-		}
-
-		public String getNestableAnnotationName() {
-			return JPA.QUERY_HINT;
-		}
-
-		public int indexOf(NestableQueryHint hint) {
-			return AbstractNamedQuery.this.indexOfHint(hint);
-		}
-
-		public void move(int targetIndex, int sourceIndex) {
-			AbstractNamedQuery.this.moveHint(targetIndex, sourceIndex);
-		}
-		
-		public void moveInternal(int targetIndex, int sourceIndex) {
-			AbstractNamedQuery.this.moveHintInternal(targetIndex, sourceIndex);
-		}
-
-		public NestableQueryHint nestedAnnotationAt(int index) {
-			return AbstractNamedQuery.this.hintAt(index);
-		}
-
-		public NestableQueryHint nestedAnnotationFor(Annotation jdtAnnotation) {
-			for (NestableQueryHint uniqueConstraint : CollectionTools.iterable(nestedAnnotations())) {
-				if (jdtAnnotation == uniqueConstraint.getJdtAnnotation((CompilationUnit) jdtAnnotation.getRoot())) {
-					return uniqueConstraint;
-				}
-			}
-			return null;
-		}
-
-		public ListIterator<NestableQueryHint> nestedAnnotations() {
-			return new CloneListIterator<NestableQueryHint>(AbstractNamedQuery.this.hints);
-		}
-
-		public int nestedAnnotationsSize() {
-			return AbstractNamedQuery.this.hintsSize();
-		}
-
-		public void remove(NestableQueryHint queryHint) {
-			AbstractNamedQuery.this.removeHint(queryHint);
-		}
-
-		public void remove(int index) {
-			AbstractNamedQuery.this.removeHint(nestedAnnotationAt(index));	
-		}
-
-		public Annotation getJdtAnnotation(CompilationUnit astRoot) {
-			return AbstractNamedQuery.this.getJdtAnnotation(astRoot);
-		}
-
-		public void newAnnotation() {
-			AbstractNamedQuery.this.newAnnotation();
-		}
-
-		public void removeAnnotation() {
-			AbstractNamedQuery.this.removeAnnotation();
-		}
-
-		public void updateFromJava(CompilationUnit astRoot) {
-			AbstractNamedQuery.this.updateFromJava(astRoot);
-		}
-		
-		public TextRange getTextRange(CompilationUnit astRoot) {
-			return AbstractNamedQuery.this.getTextRange(astRoot);
-		}
-		
-		public String getElementName() {
-			return "hints";
-		}
-
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractRelationshipMappingAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractRelationshipMappingAnnotation.java
deleted file mode 100644
index 768c01ae60..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractRelationshipMappingAnnotation.java
+++ /dev/null
@@ -1,314 +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.core.internal.resource.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.EnumArrayDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.EnumDeclarationAnnotationElementAdapter;
-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.ShortCircuitArrayAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleTypeStringExpressionConverter;
-import org.eclipse.jpt.core.resource.java.CascadeType;
-import org.eclipse.jpt.core.resource.java.FetchType;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.RelationshipMappingAnnotation;
-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.ExpressionConverter;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-
-
-public abstract class AbstractRelationshipMappingAnnotation extends AbstractResourceAnnotation<Attribute> implements RelationshipMappingAnnotation
-{
-	// hold this so we can get the 'targetEntity' text range
-	private final DeclarationAnnotationElementAdapter<String> targetEntityDeclarationAdapter;
-	
-	// hold this so we can get the 'fetch' text range
-	private final DeclarationAnnotationElementAdapter<String> fetchDeclarationAdapter;
-	
-	// hold this so we can get the 'cascade' text range
-	private final DeclarationAnnotationElementAdapter<String[]> cascadeDeclarationAdapter;
-	
-	private final AnnotationElementAdapter<String> targetEntityAdapter;
-
-	private final AnnotationElementAdapter<String> fetchAdapter;
-
-	private final AnnotationElementAdapter<String[]> cascadeAdapter;
-
-	private String targetEntity;
-
-	private String fullyQualifiedTargetEntity;
-
-	private FetchType fetch;
-	
-	protected boolean cascadeAll;
-
-	protected boolean cascadePersist;
-
-	protected boolean cascadeMerge;
-
-	protected boolean cascadeRemove;
-
-	protected boolean cascadeRefresh;
-
-	
-	public AbstractRelationshipMappingAnnotation(JavaResourcePersistentAttribute parent, Attribute attribute, DeclarationAnnotationAdapter daa) {
-		super(parent, attribute, daa);
-		this.targetEntityDeclarationAdapter = targetEntityAdapter();
-		this.targetEntityAdapter = buildAnnotationElementAdapter(this.targetEntityDeclarationAdapter);
-		this.fetchDeclarationAdapter = fetchAdapter();
-		this.fetchAdapter = buildAnnotationElementAdapter(this.fetchDeclarationAdapter);
-		this.cascadeDeclarationAdapter = cascadeAdapter();
-		this.cascadeAdapter = new ShortCircuitArrayAnnotationElementAdapter<String>(attribute, this.cascadeDeclarationAdapter);
-	}
-	
-	protected AnnotationElementAdapter<String> buildAnnotationElementAdapter(DeclarationAnnotationElementAdapter<String> daea) {
-		return new ShortCircuitAnnotationElementAdapter<String>(this.getMember(), daea);
-	}
-	
-	protected AnnotationElementAdapter<Boolean> buildBooleanAnnotationElementAdapter(DeclarationAnnotationElementAdapter<Boolean> daea) {
-		return new ShortCircuitAnnotationElementAdapter<Boolean>(this.getMember(), daea);
-	}
-
-	/**
-	 * return the Java adapter's 'targetEntity' element adapter config
-	 */
-	protected abstract DeclarationAnnotationElementAdapter<String> targetEntityAdapter();
-
-	/**
-	 * return the Java adapter's 'cascade' element adapter config
-	 */
-	protected abstract DeclarationAnnotationElementAdapter<String[]> cascadeAdapter();
-
-	/**
-	 * return the Java adapter's 'fetch' element adapter config
-	 */
-	protected abstract DeclarationAnnotationElementAdapter<String> fetchAdapter();
-
-	public void initialize(CompilationUnit astRoot) {
-		this.targetEntity = this.targetEntity(astRoot);
-		this.fullyQualifiedTargetEntity = this.fullyQualifiedTargetEntity(astRoot);
-		this.fetch = this.fetch(astRoot);
-		this.initializeCascadeTypes(astRoot);
-	}
-	
-	protected void initializeCascadeTypes(CompilationUnit astRoot) {
-		String[] javaValue = this.cascadeAdapter.getValue(astRoot);
-		CascadeType[] cascadeTypes = CascadeType.fromJavaAnnotationValue(javaValue);
-		
-		this.cascadeAll = CollectionTools.contains(cascadeTypes, CascadeType.ALL);
-		this.cascadeMerge = CollectionTools.contains(cascadeTypes, CascadeType.MERGE);
-		this.cascadePersist = CollectionTools.contains(cascadeTypes, CascadeType.PERSIST);
-		this.cascadeRefresh = CollectionTools.contains(cascadeTypes, CascadeType.REFRESH);
-		this.cascadeRemove = CollectionTools.contains(cascadeTypes, CascadeType.REMOVE);
-	}
-	
-	public String getTargetEntity() {
-		return this.targetEntity;
-	}
-	
-	public void setTargetEntity(String newTargetEntity) {
-		if (attributeValueHasNotChanged(this.targetEntity, newTargetEntity)) {
-			return;
-		}
-		String oldTargetEntity = this.targetEntity;
-		this.targetEntity = newTargetEntity;
-		this.targetEntityAdapter.setValue(newTargetEntity);
-		firePropertyChanged(TARGET_ENTITY_PROPERTY, oldTargetEntity, newTargetEntity);
-	}
-	
-	public String getFullyQualifiedTargetEntity() {
-		return this.fullyQualifiedTargetEntity;
-	}
-	
-	protected void setFullyQualifiedTargetEntity(String newTargetEntity) {
-		String oldTargetEntity = this.fullyQualifiedTargetEntity;
-		this.fullyQualifiedTargetEntity = newTargetEntity;
-		firePropertyChanged(FULLY_QUALFIEID_TARGET_ENTITY_PROPERTY, oldTargetEntity, newTargetEntity);
-	}
-	
-	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 boolean isCascadeAll() {
-		return this.cascadeAll;
-	}
-	
-	public void setCascadeAll(boolean newCascadeAll) {
-		if (this.cascadeAll == newCascadeAll) {
-			return;
-		}
-		boolean oldCascadeAll = this.cascadeAll;
-		this.cascadeAll = newCascadeAll;
-		setCascade(newCascadeAll, CascadeType.ALL);
-		firePropertyChanged(CASCADE_ALL_PROPERTY, oldCascadeAll, newCascadeAll);
-	}
-	
-	public boolean isCascadePersist() {
-		return this.cascadePersist;
-	}
-	
-	public void setCascadePersist(boolean newCascadePersist) {
-		if (this.cascadePersist == newCascadePersist) {
-			return;
-		}
-		boolean oldCascadePersist = this.cascadePersist;
-		this.cascadePersist = newCascadePersist;
-		setCascade(newCascadePersist, CascadeType.PERSIST);
-		firePropertyChanged(CASCADE_PERSIST_PROPERTY, oldCascadePersist, newCascadePersist);
-	}
-	
-	public boolean isCascadeMerge() {
-		return this.cascadeMerge;
-	}
-	
-	public void setCascadeMerge(boolean newCascadeMerge) {
-		if (this.cascadeMerge == newCascadeMerge) {
-			return;
-		}
-		boolean oldCascadeMerge = this.cascadeMerge;
-		this.cascadeMerge = newCascadeMerge;
-		setCascade(newCascadeMerge, CascadeType.MERGE);
-		firePropertyChanged(CASCADE_MERGE_PROPERTY, oldCascadeMerge, newCascadeMerge);
-	}
-	
-	public boolean isCascadeRemove() {
-		return this.cascadeRemove;
-	}
-	
-	public void setCascadeRemove(boolean newCascadeRemove) {
-		if (this.cascadeRemove == newCascadeRemove) {
-			return;
-		}
-		boolean oldCascadeRemove = this.cascadeRemove;
-		this.cascadeRemove = newCascadeRemove;
-		setCascade(newCascadeRemove, CascadeType.REMOVE);
-		firePropertyChanged(CASCADE_REMOVE_PROPERTY, oldCascadeRemove, newCascadeRemove);
-	}
-	
-	public boolean isCascadeRefresh() {
-		return this.cascadeRefresh;
-	}
-	
-	public void setCascadeRefresh(boolean newCascadeRefresh) {
-		if (this.cascadeRefresh == newCascadeRefresh) {
-			return;
-		}
-		boolean oldCascadeRefresh = this.cascadeRefresh;
-		this.cascadeRefresh = newCascadeRefresh;
-		setCascade(newCascadeRefresh, CascadeType.REFRESH);
-		firePropertyChanged(CASCADE_REFRESH_PROPERTY, oldCascadeRefresh, newCascadeRefresh);
-	}
-	
-	private void setCascadeTypes(CascadeType[] cascadeTypes) {
-		String[] newJavaValue = CascadeType.toJavaAnnotationValue(cascadeTypes);
-		this.cascadeAdapter.setValue(newJavaValue);
-	}
-	
-	private void setCascade(boolean isSet, CascadeType cascadeType) {
-		String[] javaValue = this.cascadeAdapter.getValue();
-		CascadeType[] cascadeTypes = CascadeType.fromJavaAnnotationValue(javaValue);	
-		List<CascadeType> cascadeCollection = CollectionTools.list(cascadeTypes);
-
-		if (cascadeCollection.contains(cascadeType)) {
-			if (!isSet) {
-				cascadeCollection.remove(cascadeType);
-				setCascadeTypes(cascadeCollection.toArray(new CascadeType[cascadeCollection.size()]));
-			}
-		}
-		else {
-			if (isSet) {
-				cascadeCollection.add(cascadeType);
-				setCascadeTypes(cascadeCollection.toArray(new CascadeType[cascadeCollection.size()]));
-			}
-		}
-	}
-	
-	public TextRange getTargetEntityTextRange(CompilationUnit astRoot) {
-		return getElementTextRange(this.targetEntityDeclarationAdapter, astRoot);
-	}
-	
-	public TextRange getFetchTextRange(CompilationUnit astRoot) {
-		return getElementTextRange(this.fetchDeclarationAdapter, astRoot);
-	}
-	
-	public TextRange getCascadeTextRange(CompilationUnit astRoot) {
-		return getElementTextRange(this.cascadeDeclarationAdapter, astRoot);
-	}
-	
-	public void updateFromJava(CompilationUnit astRoot) {
-		this.setFetch(this.fetch(astRoot));
-		this.setTargetEntity(this.targetEntity(astRoot));
-		this.setFullyQualifiedTargetEntity(this.fullyQualifiedTargetEntity(astRoot));
-		this.updateCascadeFromJava(astRoot);
-	}
-	
-	protected FetchType fetch(CompilationUnit astRoot) {
-		return FetchType.fromJavaAnnotationValue(this.fetchAdapter.getValue(astRoot));
-	}
-	
-	protected String targetEntity(CompilationUnit astRoot) {
-		return this.targetEntityAdapter.getValue(astRoot);
-	}
-	
-	private void updateCascadeFromJava(CompilationUnit astRoot) {
-		String[] javaValue = this.cascadeAdapter.getValue(astRoot);
-		CascadeType[] cascadeTypes = CascadeType.fromJavaAnnotationValue(javaValue);
-		setCascadeAll(CollectionTools.contains(cascadeTypes, CascadeType.ALL));
-		setCascadeMerge(CollectionTools.contains(cascadeTypes, CascadeType.MERGE));
-		setCascadePersist(CollectionTools.contains(cascadeTypes, CascadeType.PERSIST));
-		setCascadeRefresh(CollectionTools.contains(cascadeTypes, CascadeType.REFRESH));
-		setCascadeRemove(CollectionTools.contains(cascadeTypes, CascadeType.REMOVE));
-	}
-	
-	private String fullyQualifiedTargetEntity(CompilationUnit astRoot) {
-		if (getTargetEntity() == null) {
-			return null;
-		}
-		return JDTTools.resolveFullyQualifiedName(this.targetEntityAdapter.getExpression(astRoot));
-	}
-
-	// ********** static methods **********
-	
-	protected static DeclarationAnnotationElementAdapter<String> buildTargetEntityAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName) {
-		// TODO what about QualifiedType?
-		return buildAnnotationElementAdapter(annotationAdapter, elementName, SimpleTypeStringExpressionConverter.instance());
-	}
-	
-	protected static DeclarationAnnotationElementAdapter<String> buildAnnotationElementAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName, ExpressionConverter<String> converter) {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(annotationAdapter, elementName, false, converter);
-	}
-	
-	protected static DeclarationAnnotationElementAdapter<String> buildFetchAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName) {
-		return new EnumDeclarationAnnotationElementAdapter(annotationAdapter, elementName, false);
-	}
-	
-	protected static DeclarationAnnotationElementAdapter<String[]> buildEnumArrayAnnotationElementAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName) {
-		return new EnumArrayDeclarationAnnotationElementAdapter(annotationAdapter, elementName, false);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResourceAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResourceAnnotation.java
deleted file mode 100644
index 1036203dc1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResourceAnnotation.java
+++ /dev/null
@@ -1,133 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jpt.core.internal.utility.jdt.ASTNodeTextRange;
-import org.eclipse.jpt.core.internal.utility.jdt.MemberAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-
-public abstract class AbstractResourceAnnotation<E extends Member>
-	extends AbstractJavaResourceNode
-	implements Annotation
-{
-	private final E member;
-
-	private final DeclarationAnnotationAdapter daa;
-
-	private final AnnotationAdapter annotationAdapter;
-		
-	protected AbstractResourceAnnotation(JavaResourceNode parent, E member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) {
-		super(parent);
-		this.member = member;
-		this.daa = daa;
-		this.annotationAdapter = annotationAdapter;
-	}
-	
-	public E getMember() {
-		return this.member;
-	}
-	
-	protected AbstractResourceAnnotation(JavaResourceNode parent, E member, DeclarationAnnotationAdapter daa) {
-		this(parent, member, daa, new MemberAnnotationAdapter(member, daa));
-	}
-
-	
-	public AnnotationAdapter getAnnotationAdapter() {
-		return this.annotationAdapter;
-	}
-	
-	public org.eclipse.jdt.core.dom.Annotation getJdtAnnotation(CompilationUnit astRoot) {
-		return getAnnotationAdapter().getAnnotation(astRoot);
-	}
-	
-	public DeclarationAnnotationAdapter getDeclarationAnnotationAdapter() {
-		return this.daa;
-	}
-
-	public void removeAnnotation() {
-		getAnnotationAdapter().removeAnnotation();
-	}
-	
-	public void newAnnotation() {
-		getAnnotationAdapter().newMarkerAnnotation();
-	}
-	
-	public TextRange getTextRange(CompilationUnit astRoot) {
-		return getAnnotationTextRange(astRoot);
-	}
-	
-	protected TextRange getTextRange(ASTNode astNode) {
-		return (astNode == null) ? null : new ASTNodeTextRange(astNode);
-	}
-
-	/**
-	 * Return the text range corresponding to the specified annotation.
-	 * If the annotation is missing, return null.
-	 */
-	protected TextRange getAnnotationTextRange(CompilationUnit astRoot) {
-		return this.getTextRange(getAnnotation(astRoot));
-	}
-	
-	protected org.eclipse.jdt.core.dom.Annotation getAnnotation(CompilationUnit astRoot) {
-		return this.daa.getAnnotation(getMember().getModifiedDeclaration(astRoot));
-		
-	}
-
-	protected Expression getAnnotationElementExpression(DeclarationAnnotationElementAdapter<?> adapter, CompilationUnit astRoot) {
-		return adapter.getExpression(getMember().getModifiedDeclaration(astRoot));
-	}
-
-	protected TextRange getAnnotationElementTextRange(DeclarationAnnotationElementAdapter<?> adapter, CompilationUnit astRoot) {
-		return this.getTextRange(getAnnotationElementExpression(adapter, astRoot));
-
-	}
-
-	/**
-	 * Convenience method. If the specified element is missing
-	 * return the member's text range instead.
-	 */
-	protected TextRange getElementTextRange(DeclarationAnnotationElementAdapter<?> elementAdapter, CompilationUnit astRoot) {
-		return this.getElementTextRange(getAnnotationElementTextRange(elementAdapter, astRoot), astRoot);
-	}
-	
-	/**
-	 * Convenience method. If the specified element text range is null
-	 * return the member's text range instead.
-	 */
-	protected TextRange getElementTextRange(TextRange elementTextRange, CompilationUnit astRoot) {
-		return (elementTextRange != null) ? elementTextRange : this.getTextRange(astRoot);
-	}
-	
-	/**
-	 * Convenience method. Return whether the specified position touches the element.
-	 * Returns false if the element does not exist
-	 */
-	protected boolean elementTouches(DeclarationAnnotationElementAdapter<?> elementAdapter, int pos, CompilationUnit astRoot) {
-		return this.elementTouches(getAnnotationElementTextRange(elementAdapter, astRoot), pos);
-	}
-	
-	/**
-	 * Convenience method. Return whether element's text range is not
-	 * null (meaning the element exists) and the specified position touches it.
-	 */
-	protected boolean elementTouches(TextRange elementTextRange, int pos) {
-		return (elementTextRange != null) && elementTextRange.touches(pos);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResourceTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResourceTable.java
deleted file mode 100644
index ab4b056265..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResourceTable.java
+++ /dev/null
@@ -1,339 +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.core.internal.resource.java;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.resource.java.ContainerAnnotation;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.NestableUniqueConstraint;
-import org.eclipse.jpt.core.resource.java.TableAnnotation;
-import org.eclipse.jpt.core.resource.java.UniqueConstraintAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationAdapter;
-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.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-public abstract class AbstractResourceTable extends AbstractResourceAnnotation<Member> implements TableAnnotation
-{
-	// hold this so we can get the 'name' text range
-	private final DeclarationAnnotationElementAdapter<String> nameDeclarationAdapter;
-
-	// hold this so we can get the 'schema' text range
-	private final DeclarationAnnotationElementAdapter<String> schemaDeclarationAdapter;
-
-	// hold this so we can get the 'catalog' text range
-	private final DeclarationAnnotationElementAdapter<String> catalogDeclarationAdapter;
-
-	private final AnnotationElementAdapter<String> nameAdapter;
-
-	private final AnnotationElementAdapter<String> schemaAdapter;
-
-	private final AnnotationElementAdapter<String> catalogAdapter;
-
-	private String name;
-	
-	private String catalog;
-	
-	private String schema;
-	
-	private final List<NestableUniqueConstraint> uniqueConstraints;
-	
-	private final UniqueConstraintsContainerAnnotation uniqueConstraintsContainerAnnotation;
-	
-	protected AbstractResourceTable(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) {
-		super(parent, member, daa, annotationAdapter);
-		this.nameDeclarationAdapter = this.nameAdapter(daa);
-		this.schemaDeclarationAdapter = this.schemaAdapter(daa);
-		this.catalogDeclarationAdapter = this.catalogAdapter(daa);
-		this.nameAdapter = buildAnnotationElementAdapter(this.nameDeclarationAdapter);
-		this.schemaAdapter = buildAnnotationElementAdapter(this.schemaDeclarationAdapter);
-		this.catalogAdapter = buildAnnotationElementAdapter(this.catalogDeclarationAdapter);
-		this.uniqueConstraints = new ArrayList<NestableUniqueConstraint>();
-		this.uniqueConstraintsContainerAnnotation = new UniqueConstraintsContainerAnnotation();
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.name = this.name(astRoot);
-		this.catalog = this.catalog(astRoot);
-		this.schema = this.schema(astRoot);
-		ContainerAnnotationTools.initializeNestedAnnotations(astRoot, this.uniqueConstraintsContainerAnnotation);
-	}
-	
-	protected AnnotationElementAdapter<String> buildAnnotationElementAdapter(DeclarationAnnotationElementAdapter<String> daea) {
-		return new ShortCircuitAnnotationElementAdapter<String>(this.getMember(), daea);
-	}
-
-	/**
-	 * Build and return a declaration element adapter for the table's 'name' element
-	 */
-	protected abstract DeclarationAnnotationElementAdapter<String> nameAdapter(DeclarationAnnotationAdapter declarationAnnotationAdapter);
-
-	/**
-	 * Build and return a declaration element adapter for the table's 'schema' element
-	 */
-	protected abstract DeclarationAnnotationElementAdapter<String> schemaAdapter(DeclarationAnnotationAdapter declarationAnnotationAdapter);
-
-	/**
-	 * Build and return a declaration element adapter for the table's 'catalog' element
-	 */
-	protected abstract DeclarationAnnotationElementAdapter<String> catalogAdapter(DeclarationAnnotationAdapter declarationAnnotationAdapter);
-
-	
-	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 getCatalog() {
-		return this.catalog;
-	}
-
-	public void setCatalog(String newCatalog) {
-		if (attributeValueHasNotChanged(this.catalog, newCatalog)) {
-			return;
-		}
-		String oldCatalog = this.catalog;
-		this.catalog = newCatalog;
-		this.catalogAdapter.setValue(newCatalog);
-		firePropertyChanged(CATALOG_PROPERTY, oldCatalog, newCatalog);
-	}
-
-	public String getSchema() {
-		return this.schema;
-	}
-
-	public void setSchema(String newSchema) {
-		if (attributeValueHasNotChanged(this.schema, newSchema)) {
-			return;
-		}
-		String oldSchema = this.schema;
-		this.schema = newSchema;
-		this.schemaAdapter.setValue(newSchema);
-		firePropertyChanged(SCHEMA_PROPERTY, oldSchema, newSchema);
-	}
-	
-	public ListIterator<UniqueConstraintAnnotation> uniqueConstraints() {
-		return new CloneListIterator<UniqueConstraintAnnotation>(this.uniqueConstraints);
-	}
-	
-	public int uniqueConstraintsSize() {
-		return this.uniqueConstraints.size();
-	}
-	
-	public NestableUniqueConstraint uniqueConstraintAt(int index) {
-		return this.uniqueConstraints.get(index);
-	}
-	
-	public int indexOfUniqueConstraint(UniqueConstraintAnnotation uniqueConstraint) {
-		return this.uniqueConstraints.indexOf(uniqueConstraint);
-	}
-	
-	public NestableUniqueConstraint addUniqueConstraint(int index) {
-		NestableUniqueConstraint uniqueConstraint = (NestableUniqueConstraint) ContainerAnnotationTools.addNestedAnnotation(index, this.uniqueConstraintsContainerAnnotation);
-		fireItemAdded(TableAnnotation.UNIQUE_CONSTRAINTS_LIST, index, uniqueConstraint);
-		return uniqueConstraint;
-	}
-	
-	private void addUniqueConstraint(int index, NestableUniqueConstraint uniqueConstraint) {
-		addItemToList(index, uniqueConstraint, this.uniqueConstraints, UNIQUE_CONSTRAINTS_LIST);
-	}
-	
-	public void removeUniqueConstraint(int index) {
-		NestableUniqueConstraint uniqueConstraint = this.uniqueConstraintAt(index);
-		removeUniqueConstraint(uniqueConstraint);
-		uniqueConstraint.removeAnnotation();
-		ContainerAnnotationTools.synchAnnotationsAfterRemove(index, this.uniqueConstraintsContainerAnnotation);
-	}
-
-	private void removeUniqueConstraint(NestableUniqueConstraint uniqueConstraint) {
-		removeItemFromList(uniqueConstraint, this.uniqueConstraints, UNIQUE_CONSTRAINTS_LIST);
-	}
-	
-	public void moveUniqueConstraint(int targetIndex, int sourceIndex) {
-		moveUniqueConstraintInternal(targetIndex, sourceIndex);
-		ContainerAnnotationTools.synchAnnotationsAfterMove(targetIndex, sourceIndex, this.uniqueConstraintsContainerAnnotation);
-		fireItemMoved(TableAnnotation.UNIQUE_CONSTRAINTS_LIST, targetIndex, sourceIndex);
-	}
-	
-	protected void moveUniqueConstraintInternal(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.uniqueConstraints, targetIndex, sourceIndex);
-	}
-	
-	protected abstract NestableUniqueConstraint createUniqueConstraint(int index);
-
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return getElementTextRange(this.nameDeclarationAdapter, astRoot);
-	}
-	
-	public TextRange getSchemaTextRange(CompilationUnit astRoot) {
-		return getElementTextRange(this.schemaDeclarationAdapter, astRoot);
-	}
-	
-	public TextRange getCatalogTextRange(CompilationUnit astRoot) {
-		return getElementTextRange(this.catalogDeclarationAdapter, astRoot);
-	}
-	
-	public boolean nameTouches(int pos, CompilationUnit astRoot) {
-		return this.elementTouches(this.nameDeclarationAdapter, pos, astRoot);
-	}
-
-	public boolean catalogTouches(int pos, CompilationUnit astRoot) {
-		return this.elementTouches(this.catalogDeclarationAdapter, pos, astRoot);
-	}
-	
-	public boolean schemaTouches(int pos, CompilationUnit astRoot) {
-		return this.elementTouches(this.schemaDeclarationAdapter, pos, astRoot);
-	}
-	
-	public void updateFromJava(CompilationUnit astRoot) {
-		this.setName(this.name(astRoot));
-		this.setSchema(this.schema(astRoot));
-		this.setCatalog(this.catalog(astRoot));
-		this.updateUniqueConstraintsFromJava(astRoot);
-	}
-	
-	protected String name(CompilationUnit astRoot) {
-		return this.nameAdapter.getValue(astRoot);
-	}
-	
-	protected String schema(CompilationUnit astRoot) {
-		return this.schemaAdapter.getValue(astRoot);
-	}
-	
-	protected String catalog(CompilationUnit astRoot) {
-		return this.catalogAdapter.getValue(astRoot);
-	}
-	
-	/**
-	 * here we just worry about getting the unique constraints lists the same size;
-	 * then we delegate to the unique constraints to synch themselves up
-	 */
-	private void updateUniqueConstraintsFromJava(CompilationUnit astRoot) {
-		ContainerAnnotationTools.updateNestedAnnotationsFromJava(astRoot, this.uniqueConstraintsContainerAnnotation);
-	}
-
-	
-	private class UniqueConstraintsContainerAnnotation extends AbstractJavaResourceNode 
-		implements ContainerAnnotation<NestableUniqueConstraint> 
-	{
-		public UniqueConstraintsContainerAnnotation() {
-			super(AbstractResourceTable.this);
-		}
-		
-		public void initialize(CompilationUnit astRoot) {
-			//nothing to initialize
-		}
-
-		public NestableUniqueConstraint addInternal(int index) {
-			NestableUniqueConstraint uniqueConstraint = AbstractResourceTable.this.createUniqueConstraint(index);
-			AbstractResourceTable.this.uniqueConstraints.add(index, uniqueConstraint);			
-			return uniqueConstraint;
-		}
-		
-		public NestableUniqueConstraint add(int index) {
-			NestableUniqueConstraint uniqueConstraint = AbstractResourceTable.this.createUniqueConstraint(index);
-			AbstractResourceTable.this.addUniqueConstraint(index, uniqueConstraint);
-			return uniqueConstraint;
-		}
-		
-		public String getAnnotationName() {
-			return AbstractResourceTable.this.getAnnotationName();
-		}
-
-		public String getNestableAnnotationName() {
-			return JPA.UNIQUE_CONSTRAINT;
-		}
-
-		public int indexOf(NestableUniqueConstraint uniqueConstraint) {
-			return AbstractResourceTable.this.indexOfUniqueConstraint(uniqueConstraint);
-		}
-
-		public void move(int targetIndex, int sourceIndex) {
-			AbstractResourceTable.this.moveUniqueConstraint(targetIndex, sourceIndex);
-		}
-		
-		public void moveInternal(int targetIndex, int sourceIndex) {
-			AbstractResourceTable.this.moveUniqueConstraintInternal(targetIndex, sourceIndex);
-		}
-
-		public NestableUniqueConstraint nestedAnnotationAt(int index) {
-			return AbstractResourceTable.this.uniqueConstraintAt(index);
-		}
-
-		public NestableUniqueConstraint nestedAnnotationFor(Annotation jdtAnnotation) {
-			for (NestableUniqueConstraint uniqueConstraint : CollectionTools.iterable(nestedAnnotations())) {
-				if (jdtAnnotation == uniqueConstraint.getJdtAnnotation((CompilationUnit) jdtAnnotation.getRoot())) {
-					return uniqueConstraint;
-				}
-			}
-			return null;
-		}
-
-		public ListIterator<NestableUniqueConstraint> nestedAnnotations() {
-			return new CloneListIterator<NestableUniqueConstraint>(AbstractResourceTable.this.uniqueConstraints);
-		}
-
-		public int nestedAnnotationsSize() {
-			return AbstractResourceTable.this.uniqueConstraintsSize();
-		}
-
-		public void remove(NestableUniqueConstraint uniqueConstraint) {
-			AbstractResourceTable.this.removeUniqueConstraint(uniqueConstraint);	
-		}
-
-		public void remove(int index) {
-			this.remove(nestedAnnotationAt(index));
-		}
-
-		public Annotation getJdtAnnotation(CompilationUnit astRoot) {
-			return AbstractResourceTable.this.getJdtAnnotation(astRoot);
-		}
-
-		public void newAnnotation() {
-			AbstractResourceTable.this.newAnnotation();
-		}
-
-		public void removeAnnotation() {
-			AbstractResourceTable.this.removeAnnotation();
-		}
-
-		public void updateFromJava(CompilationUnit astRoot) {
-			AbstractResourceTable.this.updateFromJava(astRoot);
-		}
-		
-		public TextRange getTextRange(CompilationUnit astRoot) {
-			return AbstractResourceTable.this.getTextRange(astRoot);
-		}
-		
-		public String getElementName() {
-			return "uniqueConstraints";
-		}
-
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverrideImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverrideImpl.java
deleted file mode 100644
index 5e7663ddf5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverrideImpl.java
+++ /dev/null
@@ -1,285 +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.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.utility.jdt.MemberAnnotationAdapter;
-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.SimpleDeclarationAnnotationAdapter;
-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.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.core.resource.java.NestableAssociationOverride;
-import org.eclipse.jpt.core.resource.java.NestableJoinColumn;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-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.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-public class AssociationOverrideImpl 
-	extends OverrideImpl  
-	implements NestableAssociationOverride
-{		
-	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-		
-	private final List<NestableJoinColumn> joinColumns;
-	
-	private final JoinColumnsContainerAnnotation joinColumnsContainerAnnotation;
-	
-	protected AssociationOverrideImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) {
-		super(parent, member, daa, annotationAdapter);
-		this.joinColumns = new ArrayList<NestableJoinColumn>();
-		this.joinColumnsContainerAnnotation = new JoinColumnsContainerAnnotation();
-	}
-
-	@Override
-	public void initialize(CompilationUnit astRoot) {		
-		super.initialize(astRoot);
-		ContainerAnnotationTools.initializeNestedAnnotations(astRoot, this.joinColumnsContainerAnnotation);
-	}
-	
-	public String getAnnotationName() {
-		return AssociationOverrideAnnotation.ANNOTATION_NAME;
-	}
-	
-	@Override
-	public void initializeFrom(NestableAnnotation oldAnnotation) {
-		super.initializeFrom(oldAnnotation);
-		AssociationOverrideAnnotation oldAssociationOverride = (AssociationOverrideAnnotation) oldAnnotation;
-		for (JoinColumnAnnotation joinColumn : CollectionTools.iterable(oldAssociationOverride.joinColumns())) {
-			NestableJoinColumn newJoinColumn = addJoinColumn(oldAssociationOverride.indexOfJoinColumn(joinColumn));
-			newJoinColumn.initializeFrom((NestableAnnotation) joinColumn);
-		}
-	}
-	
-
-	// ************* Association implementation *******************
-	
-	public ListIterator<JoinColumnAnnotation> joinColumns() {
-		return new CloneListIterator<JoinColumnAnnotation>(this.joinColumns);
-	}
-	
-	public int joinColumnsSize() {
-		return this.joinColumns.size();
-	}
-	
-	public NestableJoinColumn joinColumnAt(int index) {
-		return this.joinColumns.get(index);
-	}
-	
-	public int indexOfJoinColumn(JoinColumnAnnotation joinColumn) {
-		return this.joinColumns.indexOf(joinColumn);
-	}
-	
-	public NestableJoinColumn addJoinColumn(int index) {
-		NestableJoinColumn joinColumn = (NestableJoinColumn) ContainerAnnotationTools.addNestedAnnotation(index, this.joinColumnsContainerAnnotation);
-		fireItemAdded(AssociationOverrideAnnotation.JOIN_COLUMNS_LIST, index, joinColumn);
-		return joinColumn;
-	}
-	
-	private void addJoinColumn(int index, NestableJoinColumn joinColumn) {
-		addItemToList(index, joinColumn, this.joinColumns, AssociationOverrideAnnotation.JOIN_COLUMNS_LIST);
-	}
-	
-	public void removeJoinColumn(int index) {
-		NestableJoinColumn joinColumn = this.joinColumns.get(index);
-		removeJoinColumn(joinColumn);
-		joinColumn.removeAnnotation();
-		ContainerAnnotationTools.synchAnnotationsAfterRemove(index, this.joinColumnsContainerAnnotation);
-	}
-
-	private void removeJoinColumn(NestableJoinColumn joinColumn) {
-		removeItemFromList(joinColumn, this.joinColumns, AssociationOverrideAnnotation.JOIN_COLUMNS_LIST);
-	}
-
-	public void moveJoinColumn(int targetIndex, int sourceIndex) {
-		moveJoinColumnInternal(targetIndex, sourceIndex);
-		ContainerAnnotationTools.synchAnnotationsAfterMove(targetIndex, sourceIndex, this.joinColumnsContainerAnnotation);
-		fireItemMoved(AssociationOverrideAnnotation.JOIN_COLUMNS_LIST, targetIndex, sourceIndex);
-	}
-	
-	protected void moveJoinColumnInternal(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.joinColumns, targetIndex, sourceIndex);
-	}
-
-	protected NestableJoinColumn createJoinColumn(int index) {
-		return JoinColumnImpl.createAssociationOverrideJoinColumn(getDeclarationAnnotationAdapter(), this, getMember(), index);
-	}
-
-	@Override
-	public void updateFromJava(CompilationUnit astRoot) {
-		super.updateFromJava(astRoot);
-		this.updateJoinColumnsFromJava(astRoot);
-	}
-	
-	private void updateJoinColumnsFromJava(CompilationUnit astRoot) {
-		ContainerAnnotationTools.updateNestedAnnotationsFromJava(astRoot, this.joinColumnsContainerAnnotation);
-	}
-
-
-	// ********** static methods **********
-	static AssociationOverrideImpl createAssociationOverride(JavaResourceNode parent, Member member) {
-		return new AssociationOverrideImpl(parent, member, DECLARATION_ANNOTATION_ADAPTER, new MemberAnnotationAdapter(member, DECLARATION_ANNOTATION_ADAPTER));
-	}
-
-	static AssociationOverrideImpl createNestedAssociationOverride(JavaResourceNode parent, Member member, int index, DeclarationAnnotationAdapter attributeOverridesAdapter) {
-		IndexedDeclarationAnnotationAdapter idaa = buildNestedDeclarationAnnotationAdapter(index, attributeOverridesAdapter);
-		IndexedAnnotationAdapter annotationAdapter = new MemberIndexedAnnotationAdapter(member, idaa);
-		return new AssociationOverrideImpl(parent, member, idaa, annotationAdapter);
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildNestedDeclarationAnnotationAdapter(int index, DeclarationAnnotationAdapter attributeOverridesAdapter) {
-		return new NestedIndexedDeclarationAnnotationAdapter(attributeOverridesAdapter, index, JPA.ASSOCIATION_OVERRIDE);
-	}
-	
-	private class JoinColumnsContainerAnnotation extends AbstractJavaResourceNode 
-		implements ContainerAnnotation<NestableJoinColumn> 
-	{
-		public JoinColumnsContainerAnnotation() {
-			super(AssociationOverrideImpl.this);
-		}
-
-		public void initialize(CompilationUnit astRoot) {
-			//nothing to initialize
-		}
-		
-		public NestableJoinColumn addInternal(int index) {
-			NestableJoinColumn joinColumn = AssociationOverrideImpl.this.createJoinColumn(index);
-			AssociationOverrideImpl.this.joinColumns.add(index, joinColumn);
-			return joinColumn;
-		}
-		
-		public NestableJoinColumn add(int index) {
-			NestableJoinColumn joinColumn = AssociationOverrideImpl.this.createJoinColumn(index);
-			AssociationOverrideImpl.this.addJoinColumn(index, joinColumn);
-			return joinColumn;
-		}
-		
-		public int indexOf(NestableJoinColumn pkJoinColumn) {
-			return AssociationOverrideImpl.this.indexOfJoinColumn(pkJoinColumn);
-		}
-
-		public void move(int targetIndex, int sourceIndex) {
-			AssociationOverrideImpl.this.moveJoinColumn(targetIndex, sourceIndex);
-		}
-
-		public void moveInternal(int targetIndex, int sourceIndex) {
-			AssociationOverrideImpl.this.moveJoinColumnInternal(targetIndex, sourceIndex);			
-		}
-		
-		public NestableJoinColumn nestedAnnotationAt(int index) {
-			return AssociationOverrideImpl.this.joinColumnAt(index);
-		}
-
-		public ListIterator<NestableJoinColumn> nestedAnnotations() {
-			return new CloneListIterator<NestableJoinColumn>(AssociationOverrideImpl.this.joinColumns);
-		}
-
-		public int nestedAnnotationsSize() {
-			return joinColumnsSize();
-		}
-
-		public void remove(int index) {
-			this.remove(nestedAnnotationAt(index));
-		}		
-
-		public void remove(NestableJoinColumn joinColumn) {
-			AssociationOverrideImpl.this.removeJoinColumn(joinColumn);
-		}
-
-		public String getAnnotationName() {
-			return AssociationOverrideImpl.this.getAnnotationName();
-		}
-
-		public String getNestableAnnotationName() {
-			return JPA.JOIN_COLUMN;
-		}
-
-		public NestableJoinColumn nestedAnnotationFor(org.eclipse.jdt.core.dom.Annotation jdtAnnotation) {
-			for (NestableJoinColumn pkJoinColumn : CollectionTools.iterable(nestedAnnotations())) {
-				if (jdtAnnotation == pkJoinColumn.getJdtAnnotation((CompilationUnit) jdtAnnotation.getRoot())) {
-					return pkJoinColumn;
-				}
-			}
-			return null;
-		}
-
-		public org.eclipse.jdt.core.dom.Annotation getJdtAnnotation(CompilationUnit astRoot) {
-			return AssociationOverrideImpl.this.getJdtAnnotation(astRoot);
-		}
-
-		public void newAnnotation() {
-			AssociationOverrideImpl.this.newAnnotation();
-		}
-
-		public void removeAnnotation() {
-			AssociationOverrideImpl.this.removeAnnotation();
-		}
-
-		public void updateFromJava(CompilationUnit astRoot) {
-			AssociationOverrideImpl.this.updateFromJava(astRoot);
-		}
-		
-		public TextRange getTextRange(CompilationUnit astRoot) {
-			return AssociationOverrideImpl.this.getTextRange(astRoot);
-		}
-		
-		public String getElementName() {
-			return "joinColumns";
-		}
-
-	}
-
-	public static class AssociationOverrideAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final AssociationOverrideAnnotationDefinition INSTANCE = new AssociationOverrideAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private AssociationOverrideAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return AssociationOverrideImpl.createAssociationOverride(parent, member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return AssociationOverrideAnnotation.ANNOTATION_NAME;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverridesImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverridesImpl.java
deleted file mode 100644
index 28be72a16f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverridesImpl.java
+++ /dev/null
@@ -1,152 +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.core.internal.resource.java;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation;
-import org.eclipse.jpt.core.resource.java.AssociationOverridesAnnotation;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.NestableAssociationOverride;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-public class AssociationOverridesImpl extends AbstractResourceAnnotation<Member> implements AssociationOverridesAnnotation
-{	
-	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	protected final List<NestableAssociationOverride> associationOverrides;
-	
-	protected AssociationOverridesImpl(JavaResourceNode parent, Member member) {
-		super(parent, member, DECLARATION_ANNOTATION_ADAPTER);
-		this.associationOverrides = new ArrayList<NestableAssociationOverride>();
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		ContainerAnnotationTools.initializeNestedAnnotations(astRoot, this);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public String getNestableAnnotationName() {
-		return AssociationOverrideAnnotation.ANNOTATION_NAME;
-	}
-		
-	public ListIterator<NestableAssociationOverride> nestedAnnotations() {
-		return new CloneListIterator<NestableAssociationOverride>(this.associationOverrides);
-	}
-	
-	public int nestedAnnotationsSize() {
-		return this.associationOverrides.size();
-	}	
-
-	public NestableAssociationOverride addInternal(int index) {
-		NestableAssociationOverride associationOverride = createAssociationOverride(index);
-		this.associationOverrides.add(index, associationOverride);
-		return associationOverride;
-	}
-	
-	public NestableAssociationOverride add(int index) {
-		NestableAssociationOverride associationOverride = createAssociationOverride(index);
-		add(index, associationOverride);
-		return associationOverride;
-	}
-	
-	private void add(int index, NestableAssociationOverride associationOverride) {
-		addItemToList(index, associationOverride, this.associationOverrides, ASSOCIATION_OVERRIDES_LIST);
-	}
-
-	public void remove(NestableAssociationOverride associationOverride) {
-		removeItemFromList(associationOverride, this.associationOverrides, ASSOCIATION_OVERRIDES_LIST);
-	}
-	
-	public void remove(int index) {
-		removeItemFromList(index, this.associationOverrides, ASSOCIATION_OVERRIDES_LIST);
-	}
-	
-	public int indexOf(NestableAssociationOverride associationOverride) {
-		return this.associationOverrides.indexOf(associationOverride);
-	}
-	
-	public NestableAssociationOverride nestedAnnotationAt(int index) {
-		return this.associationOverrides.get(index);
-	}
-	
-	public NestableAssociationOverride nestedAnnotationFor(Annotation jdtAnnotation) {
-		for (NestableAssociationOverride associationOverride : this.associationOverrides) {
-			if (jdtAnnotation == associationOverride.getJdtAnnotation((CompilationUnit) jdtAnnotation.getRoot())) {
-				return associationOverride;
-			}
-		}
-		return null;
-	}
-	
-	public void move(int targetIndex, int sourceIndex) {
-		moveItemInList(targetIndex, sourceIndex, this.associationOverrides, ASSOCIATION_OVERRIDES_LIST);
-	}
-	
-	public void moveInternal(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.associationOverrides, targetIndex, sourceIndex);		
-	}
-
-	public String getElementName() {
-		return "value";
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		ContainerAnnotationTools.updateNestedAnnotationsFromJava(astRoot, this);
-	}
-	
-	private AssociationOverrideImpl createAssociationOverride(int index) {
-		return AssociationOverrideImpl.createNestedAssociationOverride(this, getMember(), index, getDeclarationAnnotationAdapter());
-	}
-
-	public static class AssociationOverridesAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final AssociationOverridesAnnotationDefinition INSTANCE = new AssociationOverridesAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private AssociationOverridesAnnotationDefinition() {
-			super();
-		}
-
-		public AssociationOverridesAnnotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new AssociationOverridesImpl(parent, member);
-		}
-		
-		public AssociationOverridesAnnotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverrideImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverrideImpl.java
deleted file mode 100644
index 94f9c20cba..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverrideImpl.java
+++ /dev/null
@@ -1,163 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.utility.jdt.MemberAnnotationAdapter;
-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.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation;
-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.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.core.resource.java.NestableAttributeOverride;
-import org.eclipse.jpt.core.utility.jdt.AnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.IndexedAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.IndexedDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-
-public class AttributeOverrideImpl 
-	extends OverrideImpl
-	implements NestableAttributeOverride
-{		
-	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final MemberAnnotationAdapter columnAdapter;
-		
-	private ColumnImpl column;
-	
-	
-	protected AttributeOverrideImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) {
-		super(parent, member, daa, annotationAdapter);
-		this.columnAdapter = new MemberAnnotationAdapter(getMember(), ColumnImpl.buildAttributeOverrideAnnotationAdapter(getDeclarationAnnotationAdapter()));
-	}
-
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		if (this.columnAdapter.getAnnotation(astRoot) != null) {
-			this.column = ColumnImpl.createAttributeOverrideColumn(this, getMember(), getDeclarationAnnotationAdapter());
-			this.column.initialize(astRoot);
-		}
-	}
-	
-	public String getAnnotationName() {
-		return AttributeOverrideAnnotation.ANNOTATION_NAME;
-	}
-	
-	@Override
-	public void initializeFrom(NestableAnnotation oldAnnotation) {
-		super.initializeFrom(oldAnnotation);
-		AttributeOverrideAnnotation oldAttributeOverride = (AttributeOverrideAnnotation) oldAnnotation;
-		if (oldAttributeOverride.getColumn() != null) {
-			ColumnAnnotation column = addColumn();
-			((NestableAnnotation) column).initializeFrom((NestableAnnotation) oldAttributeOverride.getColumn());
-		}
-	}
-	
-	//************ AttributeOverride implementation ****************
-	
-	public ColumnAnnotation getNonNullColumn() {
-		return (getColumn() != null) ? getColumn() : new NullAttributeOverrideColumn(this);
-	}
-	
-	public ColumnAnnotation getColumn() {
-		return this.column;
-	}
-	
-	public ColumnAnnotation addColumn() {
-		ColumnImpl column = ColumnImpl.createAttributeOverrideColumn(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(AttributeOverrideAnnotation.COLUMN_PROPERTY, oldColumn, newColumn);
-	}
-	
-	@Override
-	public void updateFromJava(CompilationUnit astRoot) {
-		super.updateFromJava(astRoot);
-		if (this.columnAdapter.getAnnotation(astRoot) == null) {
-			this.setColumn(null);
-		}
-		else {
-			if (getColumn() != null) {
-				getColumn().updateFromJava(astRoot);
-			}
-			else {
-				ColumnImpl column = ColumnImpl.createAttributeOverrideColumn(this, getMember(), getDeclarationAnnotationAdapter());
-				column.initialize(astRoot);
-				this.setColumn(column);
-			}
-		}
-	}
-
-	// ********** static methods **********
-	static AttributeOverrideImpl createAttributeOverride(JavaResourceNode parent, Member member) {
-		return new AttributeOverrideImpl(parent, member, DECLARATION_ANNOTATION_ADAPTER, new MemberAnnotationAdapter(member, DECLARATION_ANNOTATION_ADAPTER));
-	}
-
-	static AttributeOverrideImpl createNestedAttributeOverride(JavaResourceNode parent, Member member, int index, DeclarationAnnotationAdapter attributeOverridesAdapter) {
-		IndexedDeclarationAnnotationAdapter idaa = buildNestedDeclarationAnnotationAdapter(index, attributeOverridesAdapter);
-		IndexedAnnotationAdapter annotationAdapter = new MemberIndexedAnnotationAdapter(member, idaa);
-		return new AttributeOverrideImpl(parent, member, idaa, annotationAdapter);
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildNestedDeclarationAnnotationAdapter(int index, DeclarationAnnotationAdapter attributeOverridesAdapter) {
-		return new NestedIndexedDeclarationAnnotationAdapter(attributeOverridesAdapter, index, JPA.ATTRIBUTE_OVERRIDE);
-	}
-	
-	public static class AttributeOverrideAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final AttributeOverrideAnnotationDefinition INSTANCE = new AttributeOverrideAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private AttributeOverrideAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return AttributeOverrideImpl.createAttributeOverride(parent, member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return AttributeOverrideAnnotation.ANNOTATION_NAME;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverridesImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverridesImpl.java
deleted file mode 100644
index f8cbff5faf..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverridesImpl.java
+++ /dev/null
@@ -1,153 +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.core.internal.resource.java;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation;
-import org.eclipse.jpt.core.resource.java.AttributeOverridesAnnotation;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.NestableAttributeOverride;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-public class AttributeOverridesImpl extends AbstractResourceAnnotation<Member> implements AttributeOverridesAnnotation
-{	
-	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final List<NestableAttributeOverride> attributesOverrides;
-	
-	protected AttributeOverridesImpl(JavaResourceNode parent, Member member) {
-		super(parent, member, DECLARATION_ANNOTATION_ADAPTER);
-		this.attributesOverrides = new ArrayList<NestableAttributeOverride>();
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		ContainerAnnotationTools.initializeNestedAnnotations(astRoot, this);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public String getNestableAnnotationName() {
-		return AttributeOverrideAnnotation.ANNOTATION_NAME;
-	}
-		
-	public ListIterator<NestableAttributeOverride> nestedAnnotations() {
-		return new CloneListIterator<NestableAttributeOverride>(this.attributesOverrides);
-	}
-	
-	public int nestedAnnotationsSize() {
-		return this.attributesOverrides.size();
-	}	
-
-	public NestableAttributeOverride addInternal(int index) {
-		NestableAttributeOverride attributeOverride = createAttributeOverride(index);
-		this.attributesOverrides.add(index, attributeOverride);	
-		return attributeOverride;
-	}
-	
-	public NestableAttributeOverride add(int index) {
-		NestableAttributeOverride attributeOverride = createAttributeOverride(index);
-		add(index, attributeOverride);
-		return attributeOverride;
-	}
-	
-	private void add(int index, NestableAttributeOverride attributeOverride) {
-		addItemToList(index, attributeOverride, this.attributesOverrides, ATTRIBUTE_OVERRIDES_LIST);
-	}
-
-	public void remove(NestableAttributeOverride attributeOverride) {
-		removeItemFromList(attributeOverride, this.attributesOverrides, ATTRIBUTE_OVERRIDES_LIST);
-	}
-	
-	public void remove(int index) {
-		removeItemFromList(index, this.attributesOverrides, ATTRIBUTE_OVERRIDES_LIST);
-	}
-	
-	public int indexOf(NestableAttributeOverride attributeOverride) {
-		return this.attributesOverrides.indexOf(attributeOverride);
-	}
-	
-	public NestableAttributeOverride nestedAnnotationAt(int index) {
-		return this.attributesOverrides.get(index);
-	}
-	
-	public NestableAttributeOverride nestedAnnotationFor(Annotation jdtAnnotation) {
-		for (NestableAttributeOverride attributeOverride : this.attributesOverrides) {
-			if (jdtAnnotation == attributeOverride.getJdtAnnotation((CompilationUnit) jdtAnnotation.getRoot())) {
-				return attributeOverride;
-			}
-		}
-		return null;
-	}
-	
-	public void move(int targetIndex, int sourceIndex) {
-		moveItemInList(targetIndex, sourceIndex, this.attributesOverrides, ATTRIBUTE_OVERRIDES_LIST);
-	}
-	
-	public void moveInternal(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.attributesOverrides, targetIndex, sourceIndex);
-	}
-
-	public String getElementName() {
-		return "value";
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		ContainerAnnotationTools.updateNestedAnnotationsFromJava(astRoot, this);
-	}
-	
-	private AttributeOverrideImpl createAttributeOverride(int index) {
-		return AttributeOverrideImpl.createNestedAttributeOverride(this, getMember(), index, getDeclarationAnnotationAdapter());
-	}
-
-	
-	public static class AttributeOverridesAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final AttributeOverridesAnnotationDefinition INSTANCE = new AttributeOverridesAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private AttributeOverridesAnnotationDefinition() {
-			super();
-		}
-
-		public AttributeOverridesAnnotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new AttributeOverridesImpl(parent, member);
-		}
-		
-		public AttributeOverridesAnnotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/BaseColumnImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/BaseColumnImpl.java
deleted file mode 100644
index 5980461ada..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/BaseColumnImpl.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.utility.jdt.MemberAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.BaseColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationAdapter;
-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;
-
-public abstract class BaseColumnImpl extends AbstractNamedColumn implements BaseColumnAnnotation
-{
-	// hold this so we can get the 'table' text range
-	private final DeclarationAnnotationElementAdapter<String> tableDeclarationAdapter;
-	
-	// hold this so we can get the 'unique' text range
-	private final DeclarationAnnotationElementAdapter<Boolean> uniqueDeclarationAdapter;
-	
-	// hold this so we can get the 'nullable' text range
-	private final DeclarationAnnotationElementAdapter<Boolean> nullableDeclarationAdapter;
-	
-	// hold this so we can get the 'insertable' text range
-	private final DeclarationAnnotationElementAdapter<Boolean> insertableDeclarationAdapter;
-	
-	// hold this so we can get the 'updatable' text range
-	private final DeclarationAnnotationElementAdapter<Boolean> updatableDeclarationAdapter;
-
-	private final AnnotationElementAdapter<String> tableAdapter;
-
-	private final AnnotationElementAdapter<Boolean> uniqueAdapter;
-
-	private final AnnotationElementAdapter<Boolean> nullableAdapter;
-
-	private final AnnotationElementAdapter<Boolean> insertableAdapter;
-
-	private final AnnotationElementAdapter<Boolean> updatableAdapter;
-
-	private String table;
-	private Boolean unique;
-	private Boolean nullable;
-	private Boolean insertable;
-	private Boolean updatable;
-	
-
-	public BaseColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa) {
-		this(parent, member, daa, new MemberAnnotationAdapter(member, daa));
-	}
-	
-	public BaseColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) {
-		super(parent, member, daa, annotationAdapter);
-		this.tableDeclarationAdapter = this.buildStringElementAdapter(this.tableElementName());
-		this.tableAdapter = this.buildShortCircuitElementAdapter(this.tableDeclarationAdapter);
-		this.uniqueDeclarationAdapter = this.buildBooleanElementAdapter(this.uniqueElementName());
-		this.uniqueAdapter = this.buildShortCircuitBooleanElementAdapter(this.uniqueDeclarationAdapter);
-		this.nullableDeclarationAdapter = this.buildBooleanElementAdapter(this.nullableElementName());
-		this.nullableAdapter = this.buildShortCircuitBooleanElementAdapter(this.nullableDeclarationAdapter);
-		this.insertableDeclarationAdapter = this.buildBooleanElementAdapter(this.insertableElementName());
-		this.insertableAdapter = this.buildShortCircuitBooleanElementAdapter(this.insertableDeclarationAdapter);
-		this.updatableDeclarationAdapter = this.buildBooleanElementAdapter(this.updatableElementName());
-		this.updatableAdapter = this.buildShortCircuitBooleanElementAdapter(this.updatableDeclarationAdapter);
-	}
-	
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.table = this.table(astRoot);
-		this.unique = this.unique(astRoot);
-		this.nullable = this.nullable(astRoot);
-		this.insertable = this.insertable(astRoot);
-		this.updatable = this.updatable(astRoot);
-	}
-	
-	protected abstract String tableElementName();
-
-	protected abstract String uniqueElementName();
-
-	protected abstract String nullableElementName();
-
-	protected abstract String insertableElementName();
-
-	protected abstract String updatableElementName();
-
-	@Override
-	public void initializeFrom(NestableAnnotation oldAnnotation) {
-		super.initializeFrom(oldAnnotation);
-		BaseColumnAnnotation oldColumn = (BaseColumnAnnotation) oldAnnotation;
-		setTable(oldColumn.getTable());
-		setUnique(oldColumn.getUnique());
-		setNullable(oldColumn.getNullable());
-		setInsertable(oldColumn.getInsertable());
-		setUpdatable(oldColumn.getUpdatable());
-	}
-
-	//************* AbstractColumn implementation *************
-	public String getTable() {
-		return this.table;
-	}
-
-	public void setTable(String newTable) {
-		if (attributeValueHasNotChanged(this.table, newTable)) {
-			return;
-		}
-		String oldTable = this.table;
-		this.table = newTable;
-		this.tableAdapter.setValue(newTable);
-		firePropertyChanged(TABLE_PROPERTY, oldTable, newTable);
-	}
-	
-	public Boolean getUnique() {
-		return this.unique;
-	}
-
-	public void setUnique(Boolean newUnique) {
-		if (attributeValueHasNotChanged(this.unique, newUnique)) {
-			return;
-		}
-		Boolean oldUnique = this.unique;
-		this.unique = newUnique;
-		this.uniqueAdapter.setValue(newUnique);
-		firePropertyChanged(UNIQUE_PROPERTY, oldUnique, newUnique);
-	}
-
-	public Boolean getNullable() {
-		return this.nullable;
-	}
-
-	public void setNullable(Boolean newNullable) {
-		if (attributeValueHasNotChanged(this.nullable, newNullable)) {
-			return;
-		}
-		Boolean oldNullable = this.nullable;
-		this.nullable = newNullable;
-		this.nullableAdapter.setValue(newNullable);
-		firePropertyChanged(NULLABLE_PROPERTY, oldNullable, newNullable);
-	}
-
-	public Boolean getInsertable() {
-		return this.insertable;
-	}
-
-	public void setInsertable(Boolean newInsertable) {
-		if (attributeValueHasNotChanged(this.insertable, newInsertable)) {
-			return;
-		}
-		Boolean oldInsertable = this.insertable;
-		this.insertable = newInsertable;
-		this.insertableAdapter.setValue(newInsertable);
-		firePropertyChanged(INSERTABLE_PROPERTY, oldInsertable, newInsertable);
-	}
-
-	public Boolean getUpdatable() {
-		return this.updatable;
-	}
-
-	public void setUpdatable(Boolean newUpdatable) {
-		if (attributeValueHasNotChanged(this.updatable, newUpdatable)) {
-			return;
-		}
-		Boolean oldUpdatable = this.updatable;
-		this.updatable = newUpdatable;
-		this.updatableAdapter.setValue(newUpdatable);
-		firePropertyChanged(UPDATABLE_PROPERTY, oldUpdatable, newUpdatable);
-	}
-
-	public TextRange getNullableTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.nullableDeclarationAdapter, astRoot);
-	}
-	
-	public TextRange getInsertableTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.insertableDeclarationAdapter, astRoot);
-	}
-	
-	public TextRange getUniqueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.uniqueDeclarationAdapter, astRoot);
-	}
-	
-	public TextRange getUpdatableTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.updatableDeclarationAdapter, astRoot);
-	}
-	
-	public TextRange getTableTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.tableDeclarationAdapter, astRoot);
-	}
-	
-	public boolean tableTouches(int pos, CompilationUnit astRoot) {
-		return this.elementTouches(this.tableDeclarationAdapter, pos, astRoot);
-	}
-
-
-	@Override
-	public void updateFromJava(CompilationUnit astRoot) {
-		super.updateFromJava(astRoot);
-		this.setTable(this.table(astRoot));
-		this.setUnique(this.unique(astRoot));
-		this.setNullable(this.nullable(astRoot));
-		this.setInsertable(this.insertable(astRoot));
-		this.setUpdatable(this.updatable(astRoot));
-	}
-	
-	protected String table(CompilationUnit astRoot) {
-		return this.tableAdapter.getValue(astRoot);
-	}
-	
-	protected Boolean unique(CompilationUnit astRoot) {
-		return this.uniqueAdapter.getValue(astRoot);
-	}
-	
-	protected Boolean nullable(CompilationUnit astRoot) {
-		return this.nullableAdapter.getValue(astRoot);
-	}
-	
-	protected Boolean insertable(CompilationUnit astRoot) {
-		return this.insertableAdapter.getValue(astRoot);
-	}
-	
-	protected Boolean updatable(CompilationUnit astRoot) {
-		return this.updatableAdapter.getValue(astRoot);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/BasicImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/BasicImpl.java
deleted file mode 100644
index 7319cabad6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/BasicImpl.java
+++ /dev/null
@@ -1,155 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.BasicAnnotation;
-import org.eclipse.jpt.core.resource.java.FetchType;
-import org.eclipse.jpt.core.resource.java.JPA;
-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;
-
-
-public class BasicImpl extends AbstractResourceAnnotation<Attribute> implements BasicAnnotation
-{
-	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 BasicImpl(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;
-	}
-	
-	//*************** Basic 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 updateFromJava(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, JPA.BASIC__OPTIONAL, false, BooleanExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<String> buildFetchAdapter() {
-		return new EnumDeclarationAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.BASIC__FETCH, false);
-	}
-	
-	public static class BasicAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final BasicAnnotationDefinition INSTANCE = new BasicAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static BasicAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private BasicAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new BasicImpl((JavaResourcePersistentAttribute) parent, (Attribute) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new NullBasic(parent);
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ColumnImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ColumnImpl.java
deleted file mode 100644
index 56bed626d3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ColumnImpl.java
+++ /dev/null
@@ -1,242 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.utility.jdt.NestedDeclarationAnnotationAdapter;
-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.ColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-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.Member;
-
-public class ColumnImpl extends BaseColumnImpl implements ColumnAnnotation, NestableAnnotation
-{
-	// this adapter is only used by a Column annotation associated with a mapping annotation (e.g. Basic)
-	public static final DeclarationAnnotationAdapter MAPPING_DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	// hold this so we can get the 'length' text range
-	private final DeclarationAnnotationElementAdapter<Integer> lengthDeclarationAdapter;
-	
-	// hold this so we can get the 'precision' text range
-	private final DeclarationAnnotationElementAdapter<Integer> precisionDeclarationAdapter;
-	
-	// hold this so we can get the 'scale' text range
-	private final DeclarationAnnotationElementAdapter<Integer> scaleDeclarationAdapter;
-	
-	private final AnnotationElementAdapter<Integer> lengthAdapter;
-
-	private final AnnotationElementAdapter<Integer> precisionAdapter;
-
-	private final AnnotationElementAdapter<Integer> scaleAdapter;
-
-	private Integer length;
-	
-	private Integer precision;
-	
-	private Integer scale;
-	
-	protected ColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa) {
-		super(parent, member, daa);
-		this.lengthDeclarationAdapter = this.buildIntegerElementAdapter(JPA.COLUMN__LENGTH);
-		this.lengthAdapter = this.buildShortCircuitIntegerElementAdapter(this.lengthDeclarationAdapter);
-		this.precisionDeclarationAdapter = this.buildIntegerElementAdapter(JPA.COLUMN__PRECISION);
-		this.precisionAdapter = this.buildShortCircuitIntegerElementAdapter(this.precisionDeclarationAdapter);
-		this.scaleDeclarationAdapter = this.buildIntegerElementAdapter(JPA.COLUMN__SCALE);
-		this.scaleAdapter = this.buildShortCircuitIntegerElementAdapter(this.scaleDeclarationAdapter);
-	}
-	
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.length = this.length(astRoot);
-		this.precision = this.precision(astRoot);
-		this.scale = this.scale(astRoot);
-	}
-	
-	@Override
-	protected String nameElementName() {
-		return JPA.COLUMN__NAME;
-	}
-	
-	@Override
-	protected String columnDefinitionElementName() {
-		return JPA.COLUMN__COLUMN_DEFINITION;
-	}
-	
-	@Override
-	protected String tableElementName() {
-		return JPA.COLUMN__TABLE;
-	}
-
-	@Override
-	protected String uniqueElementName() {
-		return JPA.COLUMN__UNIQUE;
-	}
-
-	@Override
-	protected String nullableElementName() {
-		return JPA.COLUMN__NULLABLE;
-	}
-
-	@Override
-	protected String insertableElementName() {
-		return JPA.COLUMN__INSERTABLE;
-	}
-
-	@Override
-	protected String updatableElementName() {
-		return JPA.COLUMN__UPDATABLE;
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	public void moveAnnotation(int newIndex) {
-		//TODO move makes no sense for Column.  maybe NestableAnnotation
-		//needs to be split up and we could have IndexableAnnotation
-	}
-	
-	@Override
-	public void initializeFrom(NestableAnnotation oldAnnotation) {
-		super.initializeFrom(oldAnnotation);
-		ColumnAnnotation oldColumn = (ColumnAnnotation) oldAnnotation;
-		setLength(oldColumn.getLength());
-		setPrecision(oldColumn.getPrecision());
-		setScale(oldColumn.getScale());
-	}
-	
-	//************** Column implementation **************
-	public Integer getLength() {
-		return this.length;
-	}
-
-	public void setLength(Integer newLength) {
-		if (attributeValueHasNotChanged(this.length, newLength)) {
-			return;
-		}
-		Integer oldLength = this.length;
-		this.length = newLength;
-		this.lengthAdapter.setValue(newLength);
-		firePropertyChanged(LENGTH_PROPERTY, oldLength, newLength);
-	}
-
-	public Integer getPrecision() {
-		return this.precision;
-	}
-
-	public void setPrecision(Integer newPrecision) {
-		if (attributeValueHasNotChanged(this.precision, newPrecision)) {
-			return;
-		}
-		Integer oldPrecision = this.precision;
-		this.precision = newPrecision;
-		this.precisionAdapter.setValue(newPrecision);
-		firePropertyChanged(PRECISION_PROPERTY, oldPrecision, newPrecision);
-	}
-
-	public Integer getScale() {
-		return this.scale;
-	}
-
-	public void setScale(Integer newScale) {
-		if (attributeValueHasNotChanged(this.scale, newScale)) {
-			return;
-		}
-		Integer oldScale = this.scale;
-		this.scale = newScale;
-		this.scaleAdapter.setValue(newScale);
-		firePropertyChanged(SCALE_PROPERTY, oldScale, newScale);
-	}
-	
-	public TextRange getLengthTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.lengthDeclarationAdapter, astRoot);
-	}
-	
-	public TextRange getPrecisionTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.precisionDeclarationAdapter, astRoot);
-	}
-	
-	public TextRange getScaleTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.scaleDeclarationAdapter, astRoot);
-	}
-
-	@Override
-	public void updateFromJava(CompilationUnit astRoot) {
-		super.updateFromJava(astRoot);
-		this.setLength(this.length(astRoot));
-		this.setPrecision(this.precision(astRoot));
-		this.setScale(this.scale(astRoot));
-	}
-
-	protected Integer length(CompilationUnit astRoot) {
-		return this.lengthAdapter.getValue(astRoot);
-	}	
-	
-	protected Integer precision(CompilationUnit astRoot) {
-		return this.precisionAdapter.getValue(astRoot);
-	}	
-	
-	protected Integer scale(CompilationUnit astRoot) {
-		return this.scaleAdapter.getValue(astRoot);
-	}
-	
-	// ********** static methods **********
-
-	static ColumnImpl createAttributeOverrideColumn(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter attributeOverrideAnnotationAdapter) {
-		return new ColumnImpl(parent, member, buildAttributeOverrideAnnotationAdapter(attributeOverrideAnnotationAdapter));
-	}
-
-	static DeclarationAnnotationAdapter buildAttributeOverrideAnnotationAdapter(DeclarationAnnotationAdapter attributeOverrideAnnotationAdapter) {
-		return new NestedDeclarationAnnotationAdapter(attributeOverrideAnnotationAdapter, JPA.ATTRIBUTE_OVERRIDE__COLUMN, JPA.COLUMN);
-	}
-	
-	public static class ColumnAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final ColumnAnnotationDefinition INSTANCE = new ColumnAnnotationDefinition();
-
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private ColumnAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new ColumnImpl(parent, member, ColumnImpl.MAPPING_DECLARATION_ANNOTATION_ADAPTER);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new NullColumn(parent);
-		}
-		
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ContainerAnnotationTools.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ContainerAnnotationTools.java
deleted file mode 100644
index f316e72bd3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ContainerAnnotationTools.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.core.internal.resource.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jpt.core.internal.utility.jdt.JDTTools;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.ContainerAnnotation;
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-
-public class ContainerAnnotationTools
-{
-	
-	public static NestableAnnotation addNestedAnnotation(int index, ContainerAnnotation<? extends NestableAnnotation> containerAnnotation) {
-		int size = containerAnnotation.nestedAnnotationsSize();
-		NestableAnnotation nestedAnnotation = containerAnnotation.addInternal(size);
-		nestedAnnotation.newAnnotation();
-		containerAnnotation.moveInternal(index, size);
-		synchAnnotationsAfterMove(index, size, containerAnnotation);
-		return nestedAnnotation;
-	}
-
-	/**
-	 * synchronize the source annotations with the model nestableAnnotations,
-	 * starting at the end of the list to prevent overlap
-	 */
-	public static void synchAnnotationsAfterAdd(int index, ContainerAnnotation<? extends NestableAnnotation> containerAnnotation) {
-		List<NestableAnnotation> nestableAnnotations = CollectionTools.list(containerAnnotation.nestedAnnotations());
-		for (int i = nestableAnnotations.size(); i-- > index;) {
-			synch(nestableAnnotations.get(i), i);
-		}
-	}
-	
-	/**
-	 * synchronize the source annotations with the model nestableAnnotations,
-	 * starting at the specified index to prevent overlap
-	 */
-	public static void synchAnnotationsAfterRemove(int index, ContainerAnnotation<? extends NestableAnnotation> pluralAnnotation) {
-		List<NestableAnnotation> nestableAnnotations = CollectionTools.list(pluralAnnotation.nestedAnnotations());
-		for (int i = index; i < nestableAnnotations.size(); i++) {
-			synch(nestableAnnotations.get(i), i);
-		}
-	}
-	
-	private static void synch(NestableAnnotation nestableAnnotation, int index) {
-		nestableAnnotation.moveAnnotation(index);
-	}
-	
-	/**
-	 * synchronize the annotations with the model nestableAnnotations
-	 */
-	public static void synchAnnotationsAfterMove(int targetIndex, int sourceIndex, ContainerAnnotation<? extends NestableAnnotation> containerAnnotation) {
-		NestableAnnotation nestableAnnotation = containerAnnotation.nestedAnnotationAt(targetIndex);
-		
-		synch(nestableAnnotation, containerAnnotation.nestedAnnotationsSize());
-		
-		List<NestableAnnotation> nestableAnnotations = CollectionTools.list(containerAnnotation.nestedAnnotations());
-		if (sourceIndex < targetIndex) {
-			for (int i = sourceIndex; i < targetIndex; i++) {
-				synch(nestableAnnotations.get(i), i);
-			}
-		}
-		else {
-			for (int i = sourceIndex; i > targetIndex; i-- ) {
-				synch(nestableAnnotations.get(i), i);			
-			}
-		}
-		synch(nestableAnnotation, targetIndex);
-	}
-	
-	
-	public static void initializeNestedAnnotations(CompilationUnit astRoot, ContainerAnnotation<?> containerAnnotation) {
-		addAnnotationsFromSource(astRoot, containerAnnotation);
-	}	
-	
-	private static void addAnnotationsFromSource(CompilationUnit astRoot, ContainerAnnotation<? extends NestableAnnotation> containerAnnotation) {
-		containerAnnotation.getJdtAnnotation(astRoot).accept(initialJavaMemberAnnotationAstVisitor(astRoot, containerAnnotation));
-	}
-	
-	/**
-	 * Only visit the member value pair with the given element name.  
-	 * If there is no element name (like in the case of value elements)
-	 * then we will visit all annotations with the annotation name inside
-	 * the given container annotation
-	 */
-	private static ASTVisitor initialJavaMemberAnnotationAstVisitor(final CompilationUnit astRoot, final ContainerAnnotation<? extends NestableAnnotation> containerAnnotation) {
-		return new ASTVisitor() {
-			@Override
-			public boolean visit(MemberValuePair node) {
-				return node.getName().getFullyQualifiedName().equals(containerAnnotation.getElementName());
-			}
-			@Override
-			public boolean visit(SingleMemberAnnotation node) {
-				return visit((org.eclipse.jdt.core.dom.Annotation) node);
-			}
-		
-			@Override
-			public boolean visit(NormalAnnotation node) {
-				return visit((org.eclipse.jdt.core.dom.Annotation) node);
-			}
-		
-			@Override
-			public boolean visit(MarkerAnnotation node) {
-				return visit((org.eclipse.jdt.core.dom.Annotation) node);
-			}
-			
-			private boolean visit(org.eclipse.jdt.core.dom.Annotation node) {
-				if (containerAnnotation.getAnnotationName().equals(JDTTools.resolveAnnotation(node))) {
-					return true;
-				}
-				if (containerAnnotation.getNestableAnnotationName().equals(JDTTools.resolveAnnotation(node))) {
-					Annotation nestedAnnotation = containerAnnotation.addInternal(containerAnnotation.nestedAnnotationsSize());
-					nestedAnnotation.initialize(astRoot);
-				}
-				return false;
-			}
-		};
-	}
-	
-	public static void updateNestedAnnotationsFromJava(CompilationUnit astRoot, ContainerAnnotation<?> containerAnnotation) {
-		addOrUpdateAnnotationInSource(astRoot, containerAnnotation);
-		//TODO not sure how to handle generics here and get rid of this warning
-		removeAnnotationsNotInSource(astRoot, (ContainerAnnotation<NestableAnnotation>) containerAnnotation);
-	}
-
-	private static void addOrUpdateAnnotationInSource(CompilationUnit astRoot, ContainerAnnotation<? extends NestableAnnotation> containerAnnotation) {
-		containerAnnotation.getJdtAnnotation(astRoot).accept(javaMemberAnnotationAstVisitor(astRoot, containerAnnotation));
-	}
-	
-	private static void removeAnnotationsNotInSource(CompilationUnit astRoot, ContainerAnnotation<NestableAnnotation> containerAnnotation) {
-		for (NestableAnnotation annotation : CollectionTools.iterable(containerAnnotation.nestedAnnotations())) {
-			if (annotation.getJdtAnnotation(astRoot) == null) {
-				containerAnnotation.remove(annotation);
-			}
-		}		
-	}
-	
-	/**
-	 * Only visit the member value pair with the given element name.  
-	 * If there is no element name (like in the case of value elements)
-	 * then we will visit all annotations with the annotation name inside
-	 * the given container annotation
-	 */
-	private static ASTVisitor javaMemberAnnotationAstVisitor(final CompilationUnit astRoot, final ContainerAnnotation<? extends NestableAnnotation> containerAnnotation) {
-		return new ASTVisitor() {
-			@Override
-			public boolean visit(MemberValuePair node) {
-				return node.getName().getFullyQualifiedName().equals(containerAnnotation.getElementName());
-			}
-			
-			@Override
-			public boolean visit(SingleMemberAnnotation node) {
-				return visit((org.eclipse.jdt.core.dom.Annotation) node);
-			}
-		
-			@Override
-			public boolean visit(NormalAnnotation node) {
-				return visit((org.eclipse.jdt.core.dom.Annotation) node);
-			}
-		
-			@Override
-			public boolean visit(MarkerAnnotation node) {
-				return visit((org.eclipse.jdt.core.dom.Annotation) node);
-			}
-			
-			private boolean visit(org.eclipse.jdt.core.dom.Annotation node) {
-				if (containerAnnotation.getAnnotationName().equals(JDTTools.resolveAnnotation(node))) {
-					return true;
-				}
-				if (containerAnnotation.getNestableAnnotationName().equals(JDTTools.resolveAnnotation(node))) {
-					NestableAnnotation nestedAnnotation = containerAnnotation.nestedAnnotationFor(node);
-					if (nestedAnnotation != null) {
-						nestedAnnotation.updateFromJava(astRoot);
-					}
-					else {
-						nestedAnnotation = containerAnnotation.add(containerAnnotation.nestedAnnotationsSize());
-						nestedAnnotation.initialize(astRoot);
-					}
-				}
-				return false;
-			}
-		};
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorColumnImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorColumnImpl.java
deleted file mode 100644
index 106aceab94..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorColumnImpl.java
+++ /dev/null
@@ -1,168 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.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.DiscriminatorColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.DiscriminatorType;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-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;
-
-public class DiscriminatorColumnImpl extends AbstractNamedColumn implements DiscriminatorColumnAnnotation
-{
-	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-	
-	private static final DeclarationAnnotationElementAdapter<String> DISCRIMINATOR_TYPE_ADAPTER = buildDiscriminatorTypeAdapter();
-
-	// hold this so we can get the 'length' text range
-	private final DeclarationAnnotationElementAdapter<Integer> lengthDeclarationAdapter;
-
-	private final AnnotationElementAdapter<String> discriminatorTypeAdapter;
-
-	private final AnnotationElementAdapter<Integer> lengthAdapter;
-
-	private DiscriminatorType discriminatorType;
-
-	private Integer length;	
-	
-	protected DiscriminatorColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa) {
-		super(parent, member, daa,  new MemberAnnotationAdapter(member, daa));
-		this.discriminatorTypeAdapter = new ShortCircuitAnnotationElementAdapter<String>(member, DISCRIMINATOR_TYPE_ADAPTER);
-		this.lengthDeclarationAdapter = this.buildIntegerElementAdapter(JPA.DISCRIMINATOR_COLUMN__LENGTH);
-		this.lengthAdapter = this.buildShortCircuitIntegerElementAdapter(this.lengthDeclarationAdapter);
-	}
-	
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.discriminatorType = this.discriminatorType(astRoot);
-		this.length = this.length(astRoot);
-	}
-	
-	@Override
-	protected String nameElementName() {
-		return JPA.DISCRIMINATOR_COLUMN__NAME;
-	}
-	
-	@Override
-	protected String columnDefinitionElementName() {
-		return JPA.DISCRIMINATOR_COLUMN__COLUMN_DEFINITION;
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	public void moveAnnotation(int newIndex) {
-		//TODO move makes no sense for DiscriminatorColumn.  maybe NestableAnnotation
-		//needs to be split up and we could have IndexableAnnotation
-	}
-	
-	@Override
-	public void initializeFrom(NestableAnnotation oldAnnotation) {
-		super.initializeFrom(oldAnnotation);
-		DiscriminatorColumnAnnotation oldColumn = (DiscriminatorColumnAnnotation) oldAnnotation;
-		setLength(oldColumn.getLength());
-		setDiscriminatorType(oldColumn.getDiscriminatorType());
-	}
-	
-	public DiscriminatorType getDiscriminatorType() {
-		return this.discriminatorType;
-	}
-	
-	public void setDiscriminatorType(DiscriminatorType newDiscriminatorType) {
-		if (attributeValueHasNotChanged(this.discriminatorType, newDiscriminatorType)) {
-			return;
-		}
-		DiscriminatorType oldDiscriminatorType = this.discriminatorType;
-		this.discriminatorType = newDiscriminatorType;
-		this.discriminatorTypeAdapter.setValue(DiscriminatorType.toJavaAnnotationValue(newDiscriminatorType));
-		firePropertyChanged(DISCRIMINATOR_TYPE_PROPERTY, oldDiscriminatorType, newDiscriminatorType);
-	}
-	
-	public Integer getLength() {
-		return this.length;
-	}
-
-	public void setLength(Integer newLength) {
-		if (attributeValueHasNotChanged(this.length, newLength)) {
-			return;
-		}
-		Integer oldLength = this.length;
-		this.length = newLength;
-		this.lengthAdapter.setValue(newLength);
-		firePropertyChanged(LENGTH_PROPERTY, oldLength, newLength);
-	}
-	
-	@Override
-	public void updateFromJava(CompilationUnit astRoot) {
-		super.updateFromJava(astRoot);
-		this.setLength(this.length(astRoot));
-		this.setDiscriminatorType(this.discriminatorType(astRoot));
-	}
-
-	protected Integer length(CompilationUnit astRoot) {
-		return this.lengthAdapter.getValue(astRoot);
-	}
-	
-	protected DiscriminatorType discriminatorType(CompilationUnit astRoot) {
-		return DiscriminatorType.fromJavaAnnotationValue(this.discriminatorTypeAdapter.getValue(astRoot));
-	}
-	
-	// ********** static methods **********
-	private static DeclarationAnnotationElementAdapter<String> buildDiscriminatorTypeAdapter() {
-		return new EnumDeclarationAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.DISCRIMINATOR_COLUMN__DISCRIMINATOR_TYPE);
-	}
-	
-	public static class DiscriminatorColumnAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final DiscriminatorColumnAnnotationDefinition INSTANCE = new DiscriminatorColumnAnnotationDefinition();
-
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private DiscriminatorColumnAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new DiscriminatorColumnImpl(parent, member, DiscriminatorColumnImpl.DECLARATION_ANNOTATION_ADAPTER);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new NullDiscriminatorColumn(parent);
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorValueImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorValueImpl.java
deleted file mode 100644
index 96ba135b6a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorValueImpl.java
+++ /dev/null
@@ -1,115 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.DiscriminatorValueAnnotation;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-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;
-
-public class DiscriminatorValueImpl extends AbstractResourceAnnotation<Type> implements DiscriminatorValueAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-	private static final DeclarationAnnotationElementAdapter<String> VALUE_ADAPTER = buildValueAdapter();
-
-	
-	private final AnnotationElementAdapter<String> valueAdapter;
-
-	private String value;
-	
-	protected DiscriminatorValueImpl(JavaResourceNode 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;
-	}
-
-	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 updateFromJava(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 ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, JPA.DISCRIMINATOR_VALUE__VALUE);
-	}
-
-
-	public static class DiscriminatorValueAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final DiscriminatorValueAnnotationDefinition INSTANCE = new DiscriminatorValueAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private DiscriminatorValueAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new DiscriminatorValueImpl(parent, (Type) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new NullDiscriminatorValue(parent);
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddableImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddableImpl.java
deleted file mode 100644
index 283dcf3d20..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddableImpl.java
+++ /dev/null
@@ -1,76 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.EmbeddableAnnotation;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.core.utility.jdt.Type;
-
-
-public class EmbeddableImpl extends AbstractResourceAnnotation<Type> implements EmbeddableAnnotation
-{
-	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	protected EmbeddableImpl(JavaResourcePersistentType parent, Type type) {
-		super(parent, type, DECLARATION_ANNOTATION_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		//nothing to initialize	
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		//no annotation members
-	}
-
-	
-	public static class EmbeddableAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final EmbeddableAnnotationDefinition INSTANCE = new EmbeddableAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static EmbeddableAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private EmbeddableAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new EmbeddableImpl((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.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddedIdImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddedIdImpl.java
deleted file mode 100644
index c500e301c2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddedIdImpl.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.EmbeddedIdAnnotation;
-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;
-
-public class EmbeddedIdImpl extends AbstractResourceAnnotation<Attribute> implements EmbeddedIdAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	protected EmbeddedIdImpl(JavaResourcePersistentAttribute parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		//nothing to initialize
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		//no annotation members
-	}
-
-	
-	public static class EmbeddedIdAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final EmbeddedIdAnnotationDefinition INSTANCE = new EmbeddedIdAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static EmbeddedIdAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private EmbeddedIdAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new EmbeddedIdImpl((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.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddedImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddedImpl.java
deleted file mode 100644
index bb975fee65..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddedImpl.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.EmbeddedAnnotation;
-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;
-
-
-public class EmbeddedImpl extends AbstractResourceAnnotation<Attribute> implements EmbeddedAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	protected EmbeddedImpl(JavaResourcePersistentAttribute parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		//nothing to initialize
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		//no annotation members
-	}
-	
-	public static class EmbeddedAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final EmbeddedAnnotationDefinition INSTANCE = new EmbeddedAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static EmbeddedAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private EmbeddedAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new EmbeddedImpl((JavaResourcePersistentAttribute) parent, (Attribute) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new NullEmbedded(parent);
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EntityImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EntityImpl.java
deleted file mode 100644
index bff7e3ac5c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EntityImpl.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.EntityAnnotation;
-import org.eclipse.jpt.core.resource.java.JPA;
-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;
-
-
-public class EntityImpl extends AbstractResourceAnnotation<Type> implements EntityAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final AnnotationElementAdapter<String> nameAdapter;
-
-	private static final DeclarationAnnotationElementAdapter<String> NAME_ADAPTER = buildNameAdapter();
-
-	private String name;
-
-	protected EntityImpl(JavaResourcePersistentType parent, Type type) {
-		super(parent, type, DECLARATION_ANNOTATION_ADAPTER);
-		this.nameAdapter = new ShortCircuitAnnotationElementAdapter<String>(getMember(), NAME_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.name = this.name(astRoot);
-	}
-	
-	//*********** Annotation implementation ****************
-	public String getAnnotationName() {
-		return EntityAnnotation.ANNOTATION_NAME;
-	}
-	
-	//*********** Entity 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(EntityAnnotation.NAME_PROPERTY, oldName, newName);
-	}
-
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(NAME_ADAPTER, astRoot);
-	}
-	
-	//*********** JavaResource implementation ****************
-	public void updateFromJava(CompilationUnit astRoot) {
-		this.setName(this.name(astRoot));
-	}
-
-	protected String name(CompilationUnit astRoot) {
-		return this.nameAdapter.getValue(astRoot);
-	}
-
-	//*********** static methods ****************
-	private static DeclarationAnnotationElementAdapter<String> buildNameAdapter() {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, JPA.ENTITY__NAME, false); // false = do not remove annotation when empty
-	}
-
-	
-	public static class EntityAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final EntityAnnotationDefinition INSTANCE = new EntityAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static EntityAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private EntityAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new EntityImpl((JavaResourcePersistentType) parent, (Type) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-
-		public String getAnnotationName() {
-			return EntityAnnotation.ANNOTATION_NAME;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EnumeratedImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EnumeratedImpl.java
deleted file mode 100644
index ec03293bdb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EnumeratedImpl.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.EnumType;
-import org.eclipse.jpt.core.resource.java.EnumeratedAnnotation;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-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;
-
-public class EnumeratedImpl extends AbstractResourceAnnotation<Attribute> implements EnumeratedAnnotation
-{
-
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-	private static final DeclarationAnnotationElementAdapter<String> VALUE_ADAPTER = buildValueAdapter();
-
-	private final AnnotationElementAdapter<String> valueAdapter;
-
-	private EnumType value;
-	
-	protected EnumeratedImpl(JavaResourceNode 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;
-	}
-	
-	public EnumType getValue() {
-		return this.value;
-	}
-	
-	public void setValue(EnumType newValue) {
-		if (attributeValueHasNotChanged(this.value, newValue)) {
-			return;
-		}
-		EnumType oldValue = this.value;
-		this.value = newValue;
-		this.valueAdapter.setValue(EnumType.toJavaAnnotationValue(newValue));
-		firePropertyChanged(VALUE_PROPERTY, oldValue, newValue);
-	}
-	
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(VALUE_ADAPTER, astRoot);
-	}
-	
-	public void updateFromJava(CompilationUnit astRoot) {
-		this.setValue(this.value(astRoot));
-	}
-	
-	protected EnumType value(CompilationUnit astRoot) {
-		return EnumType.fromJavaAnnotationValue(this.valueAdapter.getValue(astRoot));
-	}
-	
-	// ********** static methods **********
-	private static DeclarationAnnotationElementAdapter<String> buildValueAdapter() {
-		return new EnumDeclarationAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.ENUMERATED__VALUE);
-	}
-	
-	public static class EnumeratedAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final EnumeratedAnnotationDefinition INSTANCE = new EnumeratedAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private EnumeratedAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new EnumeratedImpl(parent, (Attribute) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new NullEnumerated(parent);
-		}
-		
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/GeneratedValueImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/GeneratedValueImpl.java
deleted file mode 100644
index e34d0d7ab9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/GeneratedValueImpl.java
+++ /dev/null
@@ -1,152 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.GeneratedValueAnnotation;
-import org.eclipse.jpt.core.resource.java.GenerationType;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-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;
-
-public class GeneratedValueImpl extends AbstractResourceAnnotation<Member> implements GeneratedValueAnnotation
-{
-	private final AnnotationElementAdapter<String> strategyAdapter;
-
-	private final AnnotationElementAdapter<String> generatorAdapter;
-
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> STRATEGY_ADAPTER = buildStrategyAdapter();
-
-	private static final DeclarationAnnotationElementAdapter<String> GENERATOR_ADAPTER = buildGeneratorAdapter();
-
-	private GenerationType strategy;
-
-	private String generator;
-	
-		
-	protected GeneratedValueImpl(JavaResourceNode parent, Member member) {
-		super(parent, member, DECLARATION_ANNOTATION_ADAPTER);
-		this.strategyAdapter = new ShortCircuitAnnotationElementAdapter<String>(member, STRATEGY_ADAPTER);
-		this.generatorAdapter = new ShortCircuitAnnotationElementAdapter<String>(member, GENERATOR_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.strategy = this.strategy(astRoot);
-		this.generator = this.generator(astRoot);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public GenerationType getStrategy() {
-		return this.strategy;
-	}
-	
-	public void setStrategy(GenerationType newStrategy) {
-		if (attributeValueHasNotChanged(this.strategy, newStrategy)) {
-			return;
-		}
-		GenerationType oldStrategy = this.strategy;
-		this.strategy = newStrategy;
-		this.strategyAdapter.setValue(GenerationType.toJavaAnnotationValue(newStrategy));
-		firePropertyChanged(STRATEGY_PROPERTY, oldStrategy, newStrategy);
-	}
-	
-	public String getGenerator() {
-		return this.generator;
-	}
-	
-	public void setGenerator(String newGenerator) {
-		if (attributeValueHasNotChanged(this.generator, newGenerator)) {
-			return;
-		}
-		String oldGenerator = this.generator;
-		this.generator = newGenerator;
-		this.generatorAdapter.setValue(newGenerator);
-		firePropertyChanged(GENERATOR_PROPERTY, oldGenerator, newGenerator);
-	}
-
-	public TextRange getStrategyTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(STRATEGY_ADAPTER, astRoot);
-	}
-	
-	public TextRange getGeneratorTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(GENERATOR_ADAPTER, astRoot);
-	}
-
-	// ********** java annotations -> persistence model **********
-	public void updateFromJava(CompilationUnit astRoot) {
-		this.setStrategy(this.strategy(astRoot));
-		this.setGenerator(this.generator(astRoot));
-	}
-
-	protected GenerationType strategy(CompilationUnit astRoot) {
-		return GenerationType.fromJavaAnnotationValue(this.strategyAdapter.getValue(astRoot));
-	}
-	
-	protected String generator(CompilationUnit astRoot) {
-		return this.generatorAdapter.getValue(astRoot);
-	}
-	
-	// ********** static methods **********
-	private static DeclarationAnnotationElementAdapter<String> buildStrategyAdapter() {
-		return new EnumDeclarationAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.GENERATED_VALUE__STRATEGY, false);
-	}
-
-	private static DeclarationAnnotationElementAdapter<String> buildGeneratorAdapter() {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, JPA.GENERATED_VALUE__GENERATOR, false);
-	}
-	
-	public static class GeneratedValueAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final GeneratedValueAnnotationDefinition INSTANCE = new GeneratedValueAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private GeneratedValueAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new GeneratedValueImpl(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.core/src/org/eclipse/jpt/core/internal/resource/java/GeneratorImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/GeneratorImpl.java
deleted file mode 100644
index be017c645c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/GeneratorImpl.java
+++ /dev/null
@@ -1,163 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.GeneratorAnnotation;
-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.Member;
-
-public abstract class GeneratorImpl extends AbstractResourceAnnotation<Member> implements GeneratorAnnotation
-{
-	// hold this so we can get the 'name' text range
-	private final DeclarationAnnotationElementAdapter<String> nameDeclarationAdapter;
-
-	// hold this so we can get the 'initialValue' text range
-	private final DeclarationAnnotationElementAdapter<Integer> initialValueDeclarationAdapter;
-
-	// hold this so we can get the 'allocationSize' text range
-	private final DeclarationAnnotationElementAdapter<Integer> allocationSizeDeclarationAdapter;
-
-	private final AnnotationElementAdapter<String> nameAdapter;
-
-	private final AnnotationElementAdapter<Integer> initialValueAdapter;
-
-	private final AnnotationElementAdapter<Integer> allocationSizeAdapter;
-
-	private String name;
-	
-	private Integer initialValue;
-	
-	private Integer allocationSize;
-		
-	public GeneratorImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa) {
-		super(parent, member, daa);
-		this.nameDeclarationAdapter = this.nameAdapter();
-		this.nameAdapter = this.buildAdapter(this.nameDeclarationAdapter);
-		this.initialValueDeclarationAdapter = this.initialValueAdapter();
-		this.initialValueAdapter = this.buildIntegerAdapter(this.initialValueDeclarationAdapter);
-		this.allocationSizeDeclarationAdapter = this.allocationSizeAdapter();
-		this.allocationSizeAdapter = this.buildIntegerAdapter(this.allocationSizeDeclarationAdapter);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.name = this.name(astRoot);
-		this.initialValue = this.initialValue(astRoot);
-		this.allocationSize = this.allocationSize(astRoot);
-	}
-	
-	// ********** initialization **********
-	protected AnnotationElementAdapter<String> buildAdapter(DeclarationAnnotationElementAdapter<String> daea) {
-		return new ShortCircuitAnnotationElementAdapter<String>(getMember(), daea);
-	}
-
-	protected AnnotationElementAdapter<Integer> buildIntegerAdapter(DeclarationAnnotationElementAdapter<Integer> daea) {
-		return new ShortCircuitAnnotationElementAdapter<Integer>(getMember(), daea);
-	}
-
-	protected abstract DeclarationAnnotationAdapter annotationAdapter();
-
-	protected abstract DeclarationAnnotationElementAdapter<String> nameAdapter();
-
-	protected abstract DeclarationAnnotationElementAdapter<Integer> initialValueAdapter();
-
-	protected abstract DeclarationAnnotationElementAdapter<Integer> allocationSizeAdapter();
-
-	
-
-	public Integer getAllocationSize() {
-		return this.allocationSize;
-	}
-	
-	public void setAllocationSize(Integer newAllocationSize) {
-		if (attributeValueHasNotChanged(this.allocationSize, newAllocationSize)) {
-			return;
-		}
-		Integer oldAllocationSize = this.allocationSize;
-		this.allocationSize = newAllocationSize;
-		this.allocationSizeAdapter.setValue(newAllocationSize);
-		firePropertyChanged(ALLOCATION_SIZE_PROPERTY, oldAllocationSize, newAllocationSize);
-	}
-
-	public Integer getInitialValue() {
-		return this.initialValue;
-	}
-
-	public void setInitialValue(Integer newInitialValue) {
-		if (attributeValueHasNotChanged(this.initialValue, newInitialValue)) {
-			return;
-		}
-		Integer oldInitialValue = this.initialValue;
-		this.initialValue = newInitialValue;
-		this.initialValueAdapter.setValue(newInitialValue);
-		firePropertyChanged(INITIAL_VALUE_PROPERTY, oldInitialValue, newInitialValue);
-	}
-
-	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 TextRange getNameTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.nameDeclarationAdapter, astRoot);
-	}
-	
-	public TextRange getInitialValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.initialValueDeclarationAdapter, astRoot);
-	}
-	
-	public TextRange getAllocationSizeTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.allocationSizeDeclarationAdapter, astRoot);
-	}
-
-	// ********** java annotations -> persistence model **********
-	public void updateFromJava(CompilationUnit astRoot) {
-		this.setName(this.name(astRoot));
-		this.setAllocationSize(this.allocationSize(astRoot));
-		this.setInitialValue(this.initialValue(astRoot));
-	}
-
-	protected String name(CompilationUnit astRoot) {
-		return this.nameAdapter.getValue(astRoot);
-	}
-	
-	protected Integer allocationSize(CompilationUnit astRoot) {
-		return this.allocationSizeAdapter.getValue(astRoot);
-	}
-	
-	protected Integer initialValue(CompilationUnit astRoot) {
-		return this.initialValueAdapter.getValue(astRoot);
-	}
-	
-	// ********** static methods **********
-	protected static DeclarationAnnotationElementAdapter<String> buildAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName) {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(annotationAdapter, elementName);
-	}
-
-	protected static DeclarationAnnotationElementAdapter<Integer> buildIntegerAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName) {
-		return new ConversionDeclarationAnnotationElementAdapter<Integer>(annotationAdapter, elementName, NumberIntegerExpressionConverter.instance());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/IdClassImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/IdClassImpl.java
deleted file mode 100644
index 024657059e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/IdClassImpl.java
+++ /dev/null
@@ -1,139 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.IdClassAnnotation;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-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;
-
-public class IdClassImpl extends AbstractResourceAnnotation<Type> implements IdClassAnnotation
-{
-	private final AnnotationElementAdapter<String> valueAdapter;
-
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> VALUE_ADAPTER = buildValueAdapter();
-
-	private String value;
-
-	private String fullyQualifiedValue;
-
-	public IdClassImpl(JavaResourceNode 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);
-		this.fullyQualifiedValue = fullyQualifiedClass(astRoot);
-	}
-
-	public String getAnnotationName() {
-		return IdClassAnnotation.ANNOTATION_NAME;
-	}
-
-	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(IdClassAnnotation.VALUE_PROPERTY, oldValue, newValue);
-	}
-
-	public String getFullyQualifiedClass() {
-		return this.fullyQualifiedValue;
-	}
-	
-	private void setFullyQualifiedClass(String newQualifiedClass) {
-		String oldQualifiedClass = this.fullyQualifiedValue;
-		this.fullyQualifiedValue = newQualifiedClass;
-		firePropertyChanged(IdClassAnnotation.FULLY_QUALIFIED_CLASS_PROPERTY, oldQualifiedClass, newQualifiedClass);
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(VALUE_ADAPTER, astRoot);
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		this.setValue(this.value(astRoot));
-		this.setFullyQualifiedClass(this.fullyQualifiedClass(astRoot));
-	}
-
-	protected String value(CompilationUnit astRoot) {
-		return this.valueAdapter.getValue(astRoot);
-	}
-	
-	private String fullyQualifiedClass(CompilationUnit astRoot) {
-		if (getValue() == null) {
-			return null;
-		}
-		return JDTTools.resolveFullyQualifiedName(this.valueAdapter.getExpression(astRoot));
-	}
-	
-	// ********** static methods **********
-	protected static DeclarationAnnotationElementAdapter<String> buildValueAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, JPA.ID_CLASS__VALUE, SimpleTypeStringExpressionConverter.instance());
-	}
-
-	
-	public static class IdClassAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final IdClassAnnotationDefinition INSTANCE = new IdClassAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private IdClassAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new IdClassImpl(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.core/src/org/eclipse/jpt/core/internal/resource/java/IdImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/IdImpl.java
deleted file mode 100644
index a4fadcee93..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/IdImpl.java
+++ /dev/null
@@ -1,77 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.IdAnnotation;
-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;
-
-
-public class IdImpl extends AbstractResourceAnnotation<Attribute> implements IdAnnotation
-{	
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	protected IdImpl(JavaResourcePersistentAttribute parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		//nothing to initialize
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		//no annotation members
-	}
-	
-	public static class IdAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final IdAnnotationDefinition INSTANCE = new IdAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static IdAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private IdAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new IdImpl((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.core/src/org/eclipse/jpt/core/internal/resource/java/InheritanceImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/InheritanceImpl.java
deleted file mode 100644
index ea7f303f40..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/InheritanceImpl.java
+++ /dev/null
@@ -1,115 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.InheritanceAnnotation;
-import org.eclipse.jpt.core.resource.java.InheritanceType;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-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;
-
-public class InheritanceImpl extends AbstractResourceAnnotation<Type> implements InheritanceAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-	private static final DeclarationAnnotationElementAdapter<String> STRATEGY_ADAPTER = buildStrategyAdapter();
-
-	private final AnnotationElementAdapter<String> strategyAdapter;
-
-	private InheritanceType strategy;
-	
-	protected InheritanceImpl(JavaResourceNode parent, Type type) {
-		super(parent, type, DECLARATION_ANNOTATION_ADAPTER);
-		this.strategyAdapter = new ShortCircuitAnnotationElementAdapter<String>(type, STRATEGY_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.strategy = this.strategy(astRoot);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	public InheritanceType getStrategy() {
-		return this.strategy;
-	}
-	
-	public void setStrategy(InheritanceType newStrategy) {
-		if (attributeValueHasNotChanged(this.strategy, newStrategy)) {
-			return;
-		}
-		InheritanceType oldStrategy = this.strategy;
-		this.strategy = newStrategy;
-		this.strategyAdapter.setValue(InheritanceType.toJavaAnnotationValue(newStrategy));
-		firePropertyChanged(STRATEGY_PROPERTY, oldStrategy, newStrategy);
-	}
-
-	public TextRange getStrategyTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(STRATEGY_ADAPTER, astRoot);
-	}
-	
-	public void updateFromJava(CompilationUnit astRoot) {
-		this.setStrategy(this.strategy(astRoot));
-	}
-	
-	protected InheritanceType strategy(CompilationUnit astRoot) {
-		return InheritanceType.fromJavaAnnotationValue(this.strategyAdapter.getValue(astRoot));
-	}
-	
-	// ********** static methods **********
-	private static DeclarationAnnotationElementAdapter<String> buildStrategyAdapter() {
-		return new EnumDeclarationAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.INHERITANCE__STRATEGY);
-	}
-	
-	public static class InheritanceAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final InheritanceAnnotationDefinition INSTANCE = new InheritanceAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private InheritanceAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new InheritanceImpl(parent, (Type) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new NullInheritance(parent);
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourceModelImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourceModelImpl.java
deleted file mode 100644
index 72a535074d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourceModelImpl.java
+++ /dev/null
@@ -1,149 +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.core.internal.resource.java;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jpt.core.JpaAnnotationProvider;
-import org.eclipse.jpt.core.ResourceModelListener;
-import org.eclipse.jpt.core.internal.AbstractResourceModel;
-import org.eclipse.jpt.core.resource.java.JavaResourceModel;
-import org.eclipse.jpt.core.resource.java.JpaCompilationUnit;
-import org.eclipse.jpt.core.utility.jdt.AnnotationEditFormatter;
-import org.eclipse.jpt.utility.CommandExecutorProvider;
-import org.eclipse.jpt.utility.internal.BitTools;
-
-// TODO we need access to the JPA platform
-public class JavaResourceModelImpl
-	extends AbstractResourceModel
-	implements JavaResourceModel
-{
-	private final Collection<ResourceModelListener> resourceModelListeners;
-	
-	private final JpaCompilationUnit jpaCompilationUnit;
-	
-	
-	public JavaResourceModelImpl(
-			IFile file, JpaAnnotationProvider annotationProvider, 
-			CommandExecutorProvider modifySharedDocumentCommandExecutorProvider,
-			AnnotationEditFormatter annotationEditFormatter) {
-		super(file);
-		this.resourceModelListeners = new ArrayList<ResourceModelListener>();
-		// TODO use JPA factory, via the platform
-		this.jpaCompilationUnit = 
-			new JpaCompilationUnitImpl(file, annotationProvider, modifySharedDocumentCommandExecutorProvider, annotationEditFormatter, this);
-	}
-	
-	public String getResourceType() {
-		return JAVA_RESOURCE_TYPE;
-	}
-	
-	public JpaCompilationUnit getJpaCompilationUnit() {
-		return this.jpaCompilationUnit;
-	}
-	
-	public void addResourceModelChangeListener(ResourceModelListener listener) {
-		if (listener == null) {
-			throw new IllegalArgumentException("Listener cannot be null");
-		}
-		if (this.resourceModelListeners.contains(listener)) {
-			throw new IllegalArgumentException("Listener " + listener + " already added");		
-		}
-		this.resourceModelListeners.add(listener);
-	}
-	
-	public void removeResourceModelChangeListener(ResourceModelListener listener) {
-		if (!this.resourceModelListeners.contains(listener)) {
-			throw new IllegalArgumentException("Listener " + listener + " was never added");		
-		}
-		this.resourceModelListeners.add(listener);
-	}
-
-	public void resourceChanged() {
-		if (this.jpaCompilationUnit == null) {
-			throw new IllegalStateException("Change events should not be fired during construction");
-		}
-		for (ResourceModelListener listener : this.resourceModelListeners) {
-			listener.resourceModelChanged();
-		}
-	}
-	
-	public void javaElementChanged(ElementChangedEvent event) {
-		synchWithJavaDelta(event.getDelta());
-	}
-	
-	private void synchWithJavaDelta(IJavaElementDelta delta) {
-		switch (delta.getElement().getElementType()) {
-			case IJavaElement.JAVA_PROJECT :
-				if (this.updateOnClasspathChanges(delta)) {
-					break;
-				}
-			case IJavaElement.JAVA_MODEL :
-			case IJavaElement.PACKAGE_FRAGMENT_ROOT :
-			case IJavaElement.PACKAGE_FRAGMENT :
-				this.synchChildrenWithJavaDelta(delta);
-				break;
-			case IJavaElement.COMPILATION_UNIT :
-				this.synchCompilationUnitWithJavaDelta(delta);
-				break;
-			default :
-				break; // the event is somehow lower than a compilation unit
-		}
-	}
-
-	private void synchChildrenWithJavaDelta(IJavaElementDelta delta) {
-		for (IJavaElementDelta child : delta.getAffectedChildren()) {
-			this.synchWithJavaDelta(child); // recurse
-		}
-	}
-
-	private void synchCompilationUnitWithJavaDelta(IJavaElementDelta delta) {
-		// ignore changes to/from primary working copy - no content has changed;
-		// and make sure there are no other flags set that indicate both a change to/from
-		// primary working copy AND content has changed
-		if (BitTools.onlyFlagIsSet(delta.getFlags(), IJavaElementDelta.F_PRIMARY_WORKING_COPY)) {
-			return;
-		}
-		if (delta.getKind() == IJavaElementDelta.REMOVED) {
-			//we get the java notification for removal before we get the resource notification.
-			//we do not need to handle this event and will get exceptions building an astRoot if we try.
-			return;
-		}
-		if (delta.getElement().equals(this.jpaCompilationUnit.getCompilationUnit())) {
-			//TODO possibly hop on the UI thread here so that we know only 1 thread is changing our model
-			this.jpaCompilationUnit.updateFromJava();
-		}
-	}
-
-	//bug 235384 - we need to update all compilation units when a classpath change occurs.
-	//The persistence.jar could have been added/removed from the classpath which affects
-	//whether we know about the jpa annotations or not.
-	private boolean updateOnClasspathChanges(IJavaElementDelta delta) {
-		if (BitTools.flagIsSet(delta.getFlags(), IJavaElementDelta.F_RESOLVED_CLASSPATH_CHANGED) ||
-			BitTools.flagIsSet(delta.getFlags(), IJavaElementDelta.F_CLASSPATH_CHANGED)) {
-				this.jpaCompilationUnit.updateFromJava();
-				return true;
-		}
-		return false;
-	}
-
-	public void updateFromResource() {
-		this.jpaCompilationUnit.updateFromJava();
-	}
-
-	public void resolveTypes() {
-		this.jpaCompilationUnit.resolveTypes();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourcePersistentAttributeImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourcePersistentAttributeImpl.java
deleted file mode 100644
index 046e5ff195..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourcePersistentAttributeImpl.java
+++ /dev/null
@@ -1,500 +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.core.internal.resource.java;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IBinding;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.Modifier;
-import org.eclipse.jpt.core.internal.utility.jdt.JDTFieldAttribute;
-import org.eclipse.jpt.core.internal.utility.jdt.JDTMethodAttribute;
-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.resource.java.JpaCompilationUnit;
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.core.utility.jdt.Attribute;
-import org.eclipse.jpt.core.utility.jdt.MethodAttribute;
-import org.eclipse.jpt.core.utility.jdt.Type;
-import org.eclipse.jpt.utility.MethodSignature;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-
-public class JavaResourcePersistentAttributeImpl
-	extends AbstractJavaResourcePersistentMember<Attribute>
-	implements JavaResourcePersistentAttribute
-{
-
-	private boolean typeIsBasic;
-	
-	private String qualifiedTypeName;
-	
-	private boolean typeIsContainer;
-	
-	private String qualifiedReferenceEntityTypeName;
-	
-	private String qualifiedReferenceEntityElementTypeName;
-	
-	private boolean public_;  // 'public' is a reserved word
-	
-	private boolean final_;  // 'final' is a reserved word
-
-	/**
-	 * construct field attribute
-	 */
-	public static JavaResourcePersistentAttribute newInstance(
-			JavaResourcePersistentType parent,
-			Type declaringType,
-			String name,
-			int occurrence,
-			JpaCompilationUnit jpaCompilationUnit,
-			CompilationUnit astRoot) {
-		Attribute attribute = new JDTFieldAttribute(
-				declaringType,
-				name,
-				occurrence,
-				jpaCompilationUnit.getCompilationUnit(),
-				jpaCompilationUnit.getModifySharedDocumentCommandExecutorProvider(),
-				jpaCompilationUnit.getAnnotationEditFormatter());
-		JavaResourcePersistentAttribute field = new JavaResourcePersistentAttributeImpl(parent, attribute);
-		field.initialize(astRoot);
-		return field;
-	}
-	
-	/**
-	 * construct property attribute
-	 */
-	public static JavaResourcePersistentAttribute newInstance(
-			JavaResourcePersistentType parent,
-			Type declaringType,
-			MethodSignature signature,
-			int occurrence,
-			JpaCompilationUnit jpaCompilationUnit,
-			CompilationUnit astRoot) {
-		Attribute attribute = JDTMethodAttribute.newInstance(
-				declaringType,
-				signature,
-				occurrence,
-				jpaCompilationUnit.getCompilationUnit(),
-				jpaCompilationUnit.getModifySharedDocumentCommandExecutorProvider(),
-				jpaCompilationUnit.getAnnotationEditFormatter());
-		JavaResourcePersistentAttribute field = new JavaResourcePersistentAttributeImpl(parent, attribute);
-		field.initialize(astRoot);
-		return field;
-	}
-	
-	public JavaResourcePersistentAttributeImpl(JavaResourcePersistentType parent, Attribute attribute){
-		super(parent, attribute);
-	}
-	
-	public String getName() {
-		return getMember().getAttributeName();
-	}
-
-	// ******** AbstractJavaPersistentResource implementation ********
-	
-	@Override
-	protected Annotation buildMappingAnnotation(String mappingAnnotationName) {
-		return getAnnotationProvider().buildAttributeMappingAnnotation(this, getMember(), mappingAnnotationName);
-	}
-
-	@Override
-	protected Annotation buildAnnotation(String annotationName) {
-		return getAnnotationProvider().buildAttributeAnnotation(this, getMember(), annotationName);
-	}
-		
-	@Override
-	protected Annotation buildNullAnnotation(String annotationName) {
-		return getAnnotationProvider().buildNullAttributeAnnotation(this, getMember(), annotationName);
-	}
-	
-	@Override
-	protected Annotation buildNullMappingAnnotation(String annotationName) {
-		return getAnnotationProvider().buildNullAttributeMappingAnnotation(this, getMember(), annotationName);
-	}
-	
-	@Override
-	protected ListIterator<String> possibleMappingAnnotationNames() {
-		return getAnnotationProvider().attributeMappingAnnotationNames();
-	}
-		
-	@Override
-	protected boolean isPossibleAnnotation(String annotationName) {
-		return CollectionTools.contains(getAnnotationProvider().attributeAnnotationNames(), annotationName);
-	}
-	
-	@Override
-	protected boolean isPossibleMappingAnnotation(String annotationName) {
-		return CollectionTools.contains(getAnnotationProvider().attributeMappingAnnotationNames(), annotationName);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	//overriding purely to suppress the warning you get at the class level
-	public ListIterator<NestableAnnotation> annotations(String nestableAnnotationName, String containerAnnotationName) {
-		return super.annotations(nestableAnnotationName, containerAnnotationName);
-	}
-	
-	@Override
-	@SuppressWarnings("unchecked")
-	//overriding purely to suppress the warning you get at the class level
-	public Iterator<Annotation> mappingAnnotations() {
-		return super.mappingAnnotations();
-	}
-	
-	@Override
-	@SuppressWarnings("unchecked")
-	//overriding purely to suppress the warning you get at the class level
-	public Iterator<Annotation> annotations() {
-		return super.annotations();
-	}
-	
-	@Override
-	public boolean isFor(MethodSignature signature, int occurrence) {
-		return ((MethodAttribute) this.getMember()).matches(signature, occurrence);
-	}
-
-	// ******** JavaPersistentAttributeResource implementation ********
-		
-	public boolean isForField() {
-		return getMember().isField();
-	}
-	
-	public boolean isForProperty() {
-		return !isForField();
-	}
-	
-	public boolean hasAnyAnnotation() {
-		if (mappingAnnotationsSize() > 0) {
-			return true;
-		}
-		if (annotationsSize() > 0) {
-			return true;
-		}
-		return false;
-	}
-
-	public boolean isPublic() {
-		return this.public_;
-	}
-	
-	protected void setPublic(boolean newPublic) {
-		boolean oldPublic = this.public_;
-		this.public_ = newPublic;
-		firePropertyChanged(PUBLIC_PROPERTY, oldPublic, newPublic);
-	}
-	
-	public boolean isFinal() {
-		return this.final_;
-	}
-	
-	protected void setFinal(boolean newFinal) {
-		boolean oldFinal = this.final_;
-		this.final_ = newFinal;
-		firePropertyChanged(FINAL_PROPERTY, oldFinal, newFinal);
-	}
-	
-	public boolean typeIsBasic() {
-		return this.typeIsBasic;
-	}
-	
-	protected void setTypeIsBasic(boolean newTypeIsBasic) {
-		boolean oldTypeIsBasic = this.typeIsBasic;
-		this.typeIsBasic = newTypeIsBasic;
-		firePropertyChanged(TYPE_IS_BASIC_PROPERTY, oldTypeIsBasic, newTypeIsBasic);
-	}
-
-	public String getQualifiedTypeName() {
-		return this.qualifiedTypeName;
-	}
-	
-	protected void setQualifiedTypeName(String newQualifiedTypeName) {
-		String oldQualifiedTypeName = this.qualifiedTypeName;
-		this.qualifiedTypeName = newQualifiedTypeName;
-		firePropertyChanged(QUALIFIED_TYPE_NAME_PROPERTY, oldQualifiedTypeName, newQualifiedTypeName);		
-	}
-	
-	public String getQualifiedReferenceEntityTypeName() {
-		return this.qualifiedReferenceEntityTypeName;
-	}
-	
-	protected void setQualifiedReferenceEntityTypeName(String newQualifiedReferenceEntityTypeName) {
-		String oldQualifiedReferenceEntityTypeName = this.qualifiedReferenceEntityTypeName;
-		this.qualifiedReferenceEntityTypeName = newQualifiedReferenceEntityTypeName;
-		firePropertyChanged(QUALIFIED_REFERENCE_ENTITY_TYPE_NAME_PROPERTY, oldQualifiedReferenceEntityTypeName, newQualifiedReferenceEntityTypeName);
-	}
-	
-	public String getQualifiedReferenceEntityElementTypeName() {
-		return this.qualifiedReferenceEntityElementTypeName;
-	}
-	
-	protected void setQualifiedReferenceEntityElementTypeName(String newQualifiedReferenceEntityElementTypeName) {
-		String oldQualifiedReferenceEntityElementTypeName = this.qualifiedReferenceEntityElementTypeName;
-		this.qualifiedReferenceEntityElementTypeName = newQualifiedReferenceEntityElementTypeName;
-		firePropertyChanged(QUALIFIED_REFERENCE_ENTITY_ELEMENT_TYPE_NAME_PROPERTY, oldQualifiedReferenceEntityElementTypeName, newQualifiedReferenceEntityElementTypeName);
-	}
-	
-	public boolean typeIsContainer() {
-		return this.typeIsContainer;
-	}
-	
-	protected void setTypeIsContainer(boolean newTypeIsContainer) {
-		boolean oldTypeIsContainer = this.typeIsContainer;
-		this.typeIsContainer = newTypeIsContainer;
-		firePropertyChanged(TYPE_IS_CONTAINER_PROPERTY, oldTypeIsContainer, newTypeIsContainer);
-	}
-	
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.typeIsBasic = this.typeIsBasic(astRoot);
-		this.qualifiedTypeName = this.qualifiedTypeName(astRoot);
-		this.qualifiedReferenceEntityTypeName = this.qualifiedReferenceEntityTypeName(astRoot);
-		this.qualifiedReferenceEntityElementTypeName = this.qualifiedReferenceEntityElementTypeName(astRoot);
-		this.typeIsContainer = this.typeIsContainer(astRoot);
-		this.final_ = this.isFinal(astRoot);
-		this.public_ = this.isPublic(astRoot);
-	}
-
-	@Override
-	public void updateFromJava(CompilationUnit astRoot) {
-		super.updateFromJava(astRoot);
-		this.setTypeIsBasic(this.typeIsBasic(astRoot));
-		this.setQualifiedTypeName(this.qualifiedTypeName(astRoot));
-		this.setQualifiedReferenceEntityTypeName(this.qualifiedReferenceEntityTypeName(astRoot));
-		this.setQualifiedReferenceEntityElementTypeName(this.qualifiedReferenceEntityElementTypeName(astRoot));
-		this.setTypeIsContainer(this.typeIsContainer(astRoot));
-		this.setFinal(this.isFinal(astRoot));
-		this.setPublic(this.isPublic(astRoot));
-	}
-
-	@Override
-	public void resolveTypes(CompilationUnit astRoot) {
-		super.resolveTypes(astRoot);
-		this.setTypeIsBasic(this.typeIsBasic(astRoot));
-		this.setQualifiedTypeName(this.qualifiedTypeName(astRoot));
-		this.setQualifiedReferenceEntityTypeName(this.qualifiedReferenceEntityTypeName(astRoot));
-		this.setQualifiedReferenceEntityElementTypeName(this.qualifiedReferenceEntityElementTypeName(astRoot));
-		this.setTypeIsContainer(this.typeIsContainer(astRoot));
-	}
-
-	protected boolean typeIsBasic(CompilationUnit astRoot) {
-		return typeIsBasic(this.getMember().getTypeBinding(astRoot), astRoot.getAST());
-	}
-	
-	protected boolean isFinal(CompilationUnit astRoot) {
-		IBinding binding = getMember().getBinding(astRoot);
-		return (binding == null) ? false : Modifier.isFinal(binding.getModifiers());
-	}
-		
-	protected boolean isPublic(CompilationUnit astRoot) {
-		IBinding binding = getMember().getBinding(astRoot);	
-		return (binding == null) ? false : Modifier.isPublic(binding.getModifiers());
-	}
-	
-	protected String qualifiedReferenceEntityTypeName(CompilationUnit astRoot) {
-		ITypeBinding typeBinding = this.getMember().getTypeBinding(astRoot);
-		return (typeBinding == null) ? null : buildReferenceEntityTypeName(typeBinding);
-	}
-
-	public static String buildReferenceEntityTypeName(ITypeBinding typeBinding) {
-		if (typeBinding == null) {
-			return null;
-		}
-		if (typeBinding.isArray()) {
-			return null;  // arrays cannot be entities
-		}
-		return typeBinding.getTypeDeclaration().getQualifiedName();
-	}
-	
-	protected String qualifiedReferenceEntityElementTypeName(CompilationUnit astRoot) {
-		ITypeBinding typeBinding = this.getMember().getTypeBinding(astRoot);
-		if (typeBinding == null) {
-			return null;
-		}
-
-		ITypeBinding[] typeArguments = typeBinding.getTypeArguments();
-		ITypeBinding elementTypeBinding;
-		if (typeArguments.length == 1) {
-			elementTypeBinding = typeArguments[0];
-		}
-		else if (typeArguments.length == 2 && typeNamedIsMap(qualifiedTypeName(astRoot))) {
-			elementTypeBinding = typeArguments[1];
-		}
-		else {
-			return null;
-		}
-		String elementTypeName = buildReferenceEntityTypeName(elementTypeBinding);
-		return typeNamedIsContainer(elementTypeName) ? null : elementTypeName;
-	}
-	
-	protected boolean typeIsContainer(CompilationUnit astRoot) {
-		String typeName = buildReferenceEntityTypeName(this.getMember().getTypeBinding(astRoot));
-		return (typeName == null) ? false : typeNamedIsContainer(typeName);
-	}
-	
-	private static final String MAP_TYPE_NAME = java.util.Map.class.getName();
-
-	/**
-	 * return whether the specified non-array type is one of the container
-	 * types allowed by the JPA spec
-	 */
-	public static boolean typeNamedIsMap(String typeName) {
-		return MAP_TYPE_NAME.equals(typeName);
-	}
-	/**
-	 * return whether the specified non-array type is one of the container
-	 * types allowed by the JPA spec
-	 */
-	public static boolean typeNamedIsContainer(String typeName) {
-		return CollectionTools.contains(CONTAINER_TYPE_NAMES, typeName);
-	}
-
-	private static final String[] CONTAINER_TYPE_NAMES = {
-		java.util.Collection.class.getName(),
-		java.util.Set.class.getName(),
-		java.util.List.class.getName(),
-		MAP_TYPE_NAME
-	};
-	
-	protected String qualifiedTypeName(CompilationUnit astRoot) {
-		ITypeBinding typeBinding = this.getMember().getTypeBinding(astRoot);
-		return (typeBinding == null) ? null : typeBinding.getTypeDeclaration().getQualifiedName();
-	}
-
-	
-	/**
-	 * From the JPA spec, when the basic mapping applies:
-	 * If the type of the attribute (field or property) is one of the following
-	 * it must be mapped as @Basic:
-	 *     primitive types
-	 *     byte[]
-	 *     Byte[]
-	 *     char[]
-	 *     Character[]
-	 *     primitive wrappers
-	 *     java.lang.String
-	 *     java.math.BigInteger
-	 *     java.math.BigDecimal
-	 *     java.util.Date
-	 *     java.util.Calendar
-	 *     java.sql.Date
-	 *     java.sql.Time
-	 *     java.sql.Timestamp
-	 *     enums
-	 *     any other type that implements java.io.Serializable
-	 */
-	public static boolean typeIsBasic(ITypeBinding typeBinding, AST ast) {
-		if (typeBinding == null) {
-			return false; // type not found
-		}
-		if (typeBinding.isPrimitive()) {
-			return true;
-		}
-		if (typeBinding.isArray()) {
-			if (typeBinding.getDimensions() > 1) {
-				return false; // multi-dimensional arrays are not supported
-			}
-			ITypeBinding elementTypeBinding = typeBinding.getElementType();
-			if (elementTypeBinding == null) {
-				return false;// unable to resolve the type
-			}
-			return elementTypeIsValid(elementTypeBinding.getQualifiedName());
-		}
-		String typeName = typeBinding.getQualifiedName();
-		if (typeIsPrimitiveWrapper(typeName)) {
-			return true;
-		}
-		if (typeIsOtherSupportedType(typeName)) {
-			return true;
-		}
-		if (typeBinding.isEnum()) {
-			return true;
-		}
-		if (typeImplementsSerializable(typeBinding, ast)) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Return whether the specified type is a valid element type for
-	 * a one-dimensional array:
-	 *     byte
-	 *     char
-	 *     java.lang.Byte
-	 *     java.lang.Character
-	 */
-	private static boolean elementTypeIsValid(String elementTypeName) {
-		return CollectionTools.contains(VALID_ELEMENT_TYPE_NAMES, elementTypeName);
-	}
-
-	private static final String[] VALID_ELEMENT_TYPE_NAMES = {
-		byte.class.getName(),
-		char.class.getName(),
-		java.lang.Byte.class.getName(),
-		java.lang.Character.class.getName()
-	};
-
-	/**
-	 * Return whether the specified type is a primitive wrapper.
-	 */
-	private static boolean typeIsPrimitiveWrapper(String typeName) {
-		return CollectionTools.contains(PRIMITIVE_WRAPPER_TYPE_NAMES, typeName);
-	}
-	
-	private static final String[] PRIMITIVE_WRAPPER_TYPE_NAMES = {
-		java.lang.Byte.class.getName(),
-		java.lang.Character.class.getName(),
-		java.lang.Double.class.getName(),
-		java.lang.Float.class.getName(),
-		java.lang.Integer.class.getName(),
-		java.lang.Long.class.getName(),
-		java.lang.Short.class.getName(),
-		java.lang.Boolean.class.getName(),
-	};
-
-	/**
-	 * Return whether the specified type is among the various other types
-	 * that default to a Basic mapping.
-	 */
-	private static boolean typeIsOtherSupportedType(String typeName) {
-		return CollectionTools.contains(OTHER_SUPPORTED_TYPE_NAMES, typeName);
-	}
-	
-	private static final String[] OTHER_SUPPORTED_TYPE_NAMES = {
-		java.lang.String.class.getName(),
-		java.math.BigInteger.class.getName(),
-		java.math.BigDecimal.class.getName(),
-		java.util.Date.class.getName(),
-		java.util.Calendar.class.getName(),
-		java.sql.Date.class.getName(),
-		java.sql.Time.class.getName(),
-		java.sql.Timestamp.class.getName(),
-	};
-	
-	/**
-	 * Return whether the specified type implements java.io.Serializable.
-	 */
-	private static boolean typeImplementsSerializable(ITypeBinding typeBinding, AST ast) {
-		ITypeBinding serializableTypeBinding = ast.resolveWellKnownType(SERIALIZABLE_TYPE_NAME);
-		return typeBinding.isAssignmentCompatible(serializableTypeBinding);
-	}
-
-	private static final String SERIALIZABLE_TYPE_NAME = java.io.Serializable.class.getName();
-	
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(getName());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourcePersistentTypeImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourcePersistentTypeImpl.java
deleted file mode 100644
index ca6546963d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourcePersistentTypeImpl.java
+++ /dev/null
@@ -1,663 +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.core.internal.resource.java;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Vector;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.Modifier;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-import org.eclipse.jpt.core.internal.utility.jdt.JDTTools;
-import org.eclipse.jpt.core.internal.utility.jdt.JDTType;
-import org.eclipse.jpt.core.resource.java.AccessType;
-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.resource.java.JpaCompilationUnit;
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.core.utility.jdt.Type;
-import org.eclipse.jpt.utility.MethodSignature;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.Counter;
-import org.eclipse.jpt.utility.internal.iterators.CloneIterator;
-import org.eclipse.jpt.utility.internal.iterators.CompositeIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-
-public class JavaResourcePersistentTypeImpl
-	extends AbstractJavaResourcePersistentMember<Type>
-	implements JavaResourcePersistentType
-{
-	private String qualifiedName;
-
-	private String name;
-
-	private String superClassQualifiedName;
-
-	private boolean abstract_;  // 'abstract' is a reserved word
-
-	/**
-	 * store all member types including those that aren't persistable so we can
-	 * generate validation errors
-	 */
-	private final Vector<JavaResourcePersistentType> nestedTypes;
-
-	private final Vector<JavaResourcePersistentAttribute> fields;
-
-	private final Vector<JavaResourcePersistentAttribute> methods;
-
-	private AccessType accessType;
-
-
-	// ********** construction **********
-
-	/**
-	 * build top-level persistent type
-	 */
-	// TODO use JPA factory
-	public static JavaResourcePersistentType newInstance(
-			JpaCompilationUnit jpaCompilationUnit,
-			TypeDeclaration typeDeclaration,
-			CompilationUnit astRoot) {
-		Type type = new JDTType(
-				typeDeclaration,
-				jpaCompilationUnit.getCompilationUnit(),
-				jpaCompilationUnit.getModifySharedDocumentCommandExecutorProvider(),
-				jpaCompilationUnit.getAnnotationEditFormatter());
-		JavaResourcePersistentType jrpt = new JavaResourcePersistentTypeImpl(jpaCompilationUnit, type);
-		jrpt.initialize(astRoot);
-		return jrpt;	
-	}
-
-	/**
-	 * build nested persistent type
-	 */
-	// TODO use JPA factory
-	protected static JavaResourcePersistentType newInstance(
-			JpaCompilationUnit jpaCompilationUnit,
-			Type declaringType,
-			TypeDeclaration typeDeclaration,
-			int occurrence,
-			CompilationUnit astRoot) {
-		Type type = new JDTType(
-				declaringType,
-				typeDeclaration,
-				occurrence,
-				jpaCompilationUnit.getCompilationUnit(),
-				jpaCompilationUnit.getModifySharedDocumentCommandExecutorProvider(),
-				jpaCompilationUnit.getAnnotationEditFormatter());
-		JavaResourcePersistentType jrpt = new JavaResourcePersistentTypeImpl(jpaCompilationUnit, type);
-		jrpt.initialize(astRoot);
-		return jrpt;	
-	}
-
-	public JavaResourcePersistentTypeImpl(JpaCompilationUnit jpaCompilationUnit, Type type) {
-		super(jpaCompilationUnit, type);
-		this.nestedTypes = new Vector<JavaResourcePersistentType>(); 
-		this.fields = new Vector<JavaResourcePersistentAttribute>();
-		this.methods = new Vector<JavaResourcePersistentAttribute>();
-	}
-
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.qualifiedName = this.buildQualifiedName(astRoot);
-		this.name = this.buildName(astRoot);
-		this.superClassQualifiedName = this.buildSuperClassQualifiedName(astRoot);
-		this.abstract_ = this.buildAbstract(astRoot);
-		this.initializeNestedTypes(astRoot);
-		this.initializeFields(astRoot);
-		this.initializeMethods(astRoot);
-		this.accessType = this.buildAccessType();
-	}
-
-	protected void initializeNestedTypes(CompilationUnit astRoot) {
-		CounterMap counters = new CounterMap();
-		for (TypeDeclaration td : this.getMember().getTypes(astRoot)) {
-			String tdName = td.getName().getFullyQualifiedName();
-			int occurrence = counters.increment(tdName);
-			this.nestedTypes.add(this.buildNestedType(td, occurrence, astRoot));
-		}
-	}
-
-	protected void initializeFields(CompilationUnit astRoot) {
-		CounterMap counters = new CounterMap();
-		for (FieldDeclaration fieldDeclaration : this.getMember().getFields(astRoot)) {
-			for (VariableDeclarationFragment fragment : fragments(fieldDeclaration)) {
-				String fieldName = fragment.getName().getFullyQualifiedName();
-				int occurrence = counters.increment(fieldName);
-				this.fields.add(this.buildField(fieldName, occurrence, astRoot));
-			}
-		}
-	}
-
-	protected void initializeMethods(CompilationUnit astRoot) {
-		CounterMap counters = new CounterMap();
-		for (MethodDeclaration methodDeclaration : this.getMember().getMethods(astRoot)) {
-			MethodSignature signature = JDTTools.buildMethodSignature(methodDeclaration);
-			int occurrence = counters.increment(signature);
-			this.methods.add(this.buildMethod(signature, occurrence, astRoot));
-		}
-	}
-
-
-	// ********** AbstractJavaResourcePersistentMember implementation **********
-
-	@Override
-	protected Annotation buildMappingAnnotation(String mappingAnnotationName) {
-		return getAnnotationProvider().buildTypeMappingAnnotation(this, getMember(), mappingAnnotationName);
-	}
-	
-	@Override
-	protected Annotation buildNullMappingAnnotation(String annotationName) {
-		return getAnnotationProvider().buildNullTypeMappingAnnotation(this, getMember(), annotationName);
-	}
-
-	@Override
-	protected Annotation buildAnnotation(String annotationName) {
-		return getAnnotationProvider().buildTypeAnnotation(this, getMember(), annotationName);
-	}
-	
-	@Override
-	protected Annotation buildNullAnnotation(String annotationName) {
-		return getAnnotationProvider().buildNullTypeAnnotation(this, getMember(), annotationName);
-	}
-	
-	@Override
-	protected ListIterator<String> possibleMappingAnnotationNames() {
-		return getAnnotationProvider().typeMappingAnnotationNames();
-	}
-	
-	@Override
-	protected boolean isPossibleAnnotation(String annotationName) {
-		return CollectionTools.contains(getAnnotationProvider().typeAnnotationNames(), annotationName);
-	}
-	
-	@Override
-	protected boolean isPossibleMappingAnnotation(String annotationName) {
-		return CollectionTools.contains(getAnnotationProvider().typeMappingAnnotationNames(), annotationName);
-	}
-	
-	@Override
-	@SuppressWarnings("unchecked")
-	//overriding purely to suppress the warning you get at the class level
-	public ListIterator<NestableAnnotation> annotations(String nestableAnnotationName, String containerAnnotationName) {
-		return super.annotations(nestableAnnotationName, containerAnnotationName);
-	}
-	
-	@Override
-	@SuppressWarnings("unchecked")
-	//overriding purely to suppress the warning you get at the class level
-	public Iterator<Annotation> mappingAnnotations() {
-		return super.mappingAnnotations();
-	}
-	
-	@Override
-	@SuppressWarnings("unchecked")
-	//overriding purely to suppress the warning you get at the class level
-	public Iterator<Annotation> annotations() {
-		return super.annotations();
-	}
-
-	@Override
-	public void resolveTypes(CompilationUnit astRoot) {
-		super.resolveTypes(astRoot);
-
-		this.setSuperClassQualifiedName(this.buildSuperClassQualifiedName(astRoot));
-
-		for (Iterator<JavaResourcePersistentAttribute> stream = this.fields_(); stream.hasNext(); ) {
-			stream.next().resolveTypes(astRoot);
-		}
-
-		// a new type can trigger a method parameter type to be a resolved,
-		// fully-qualified name, so we need to rebuild our list of methods:
-		//     "setFoo(Foo)" is not the same as "setFoo(com.bar.Foo)"
-		// and, vice-versa, a removed type can "unresolve" a parameter type
-		this.updateMethods(astRoot);
-
-		for (Iterator<JavaResourcePersistentAttribute> stream = this.methods_(); stream.hasNext(); ) {
-			stream.next().resolveTypes(astRoot);
-		}
-		for (Iterator<JavaResourcePersistentType> stream = this.nestedTypes_(); stream.hasNext(); ) {
-			stream.next().resolveTypes(astRoot);
-		}
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.name);
-	}
-
-
-	// ******** JavaResourcePersistentType implementation ********
-
-	public JavaResourcePersistentType getJavaPersistentTypeResource(String fullyQualifiedTypeName) {
-		// TODO not sure why a null name is coming through here...  ~bjv
-//		if (fullyQualifiedTypeName.equals(this.getQualifiedName())) {
-		if (this.getQualifiedName().equals(fullyQualifiedTypeName)) {
-			return this;
-		}
-		for (Iterator<JavaResourcePersistentType> stream = this.nestedTypes(); stream.hasNext(); ) {
-			JavaResourcePersistentType jrpt = stream.next();
-			// recurse
-			JavaResourcePersistentType nestedJRPT = jrpt.getJavaPersistentTypeResource(fullyQualifiedTypeName);
-			if (nestedJRPT != null) {
-				return nestedJRPT;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * check only persistable attributes
-	 */
-	public boolean hasAnyAttributeAnnotations() {
-		for (Iterator<JavaResourcePersistentAttribute> stream = this.attributes(); stream.hasNext(); ) {
-			if (stream.next().hasAnyAnnotation()) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-
-	// ********** nested types **********
-
-	/**
-	 * return only persistable nested types
-	 */
-	public Iterator<JavaResourcePersistentType> nestedTypes() {
-		//TODO since we are filtering how do we handle the case where a type becomes persistable?
-		//what kind of change notificiation for that case?
-		return new FilteringIterator<JavaResourcePersistentType, JavaResourcePersistentType>(this.nestedTypes_()) {
-			@Override
-			protected boolean accept(JavaResourcePersistentType jrpt) {
-				return jrpt.isPersistable();
-			}
-		};
-	}
-
-	/**
-	 * *all* nested types
-	 */
-	protected Iterator<JavaResourcePersistentType> nestedTypes_() {
-		return new CloneIterator<JavaResourcePersistentType>(this.nestedTypes);
-	}
-
-	protected void addNestedType(JavaResourcePersistentType nestedType) {
-		this.addItemToCollection(nestedType, this.nestedTypes, NESTED_TYPES_COLLECTION);
-	}
-
-	protected void removeNestedType(JavaResourcePersistentType nestedType) {
-		this.removeItemFromCollection(nestedType, this.nestedTypes, NESTED_TYPES_COLLECTION);
-	}
-
-	protected void removeNestedTypes(Collection<JavaResourcePersistentType> remove) {
-		this.removeItemsFromCollection(remove, this.nestedTypes, NESTED_TYPES_COLLECTION);
-	}
-
-	protected JavaResourcePersistentType getNestedType(String typeName, int occurrence) {
-		for (Iterator<JavaResourcePersistentType> stream = this.nestedTypes_(); stream.hasNext(); ) {
-			JavaResourcePersistentType nestedType = stream.next();
-			if (nestedType.isFor(typeName, occurrence)) {
-				return nestedType;
-			}
-		}
-		return null;
-	}
-
-
-	// ********** attributes **********
-
-	/**
-	 * return only persistable attributes
-	 */
-	// TODO since we are filtering, how do we handle the case where an attribute becomes persistable?
-	// what kind of change notification for that case?
-	public Iterator<JavaResourcePersistentAttribute> attributes() {
-		return persistableMembers(this.attributes_());
-	}
-
-	/**
-	 * *all* fields and methods
-	 */
-	@SuppressWarnings("unchecked")
-	protected Iterator<JavaResourcePersistentAttribute> attributes_() {
-		return new CompositeIterator<JavaResourcePersistentAttribute>(this.fields_(), this.methods_());
-	}
-
-
-	// ********** fields **********
-
-	/**
-	 * return only persistable fields
-	 */
-	public Iterator<JavaResourcePersistentAttribute> fields() {
-		return persistableMembers(this.fields_());
-	}
-	
-	/**
-	 * *all* fields
-	 */
-	protected Iterator<JavaResourcePersistentAttribute> fields_() {
-		return new CloneIterator<JavaResourcePersistentAttribute>(this.fields);
-	}
-
-	protected void addField(JavaResourcePersistentAttribute attribute) {
-		this.addItemToCollection(attribute, this.fields, ATTRIBUTES_COLLECTION);
-	}
-
-	protected void removeField(JavaResourcePersistentAttribute attribute) {
-		this.removeItemFromCollection(attribute, this.fields, ATTRIBUTES_COLLECTION);
-	}
-
-	protected void removeFields(Collection<JavaResourcePersistentAttribute> remove) {
-		this.removeItemsFromCollection(remove, this.fields, ATTRIBUTES_COLLECTION);
-	}
-
-	protected JavaResourcePersistentAttribute getField(String fieldName, int occurrence) {
-		for (Iterator<JavaResourcePersistentAttribute> stream = this.fields_(); stream.hasNext(); ) {
-			JavaResourcePersistentAttribute field = stream.next();
-			if (field.isFor(fieldName, occurrence)) {
-				return field;
-			}
-		}
-		return null;
-	}
-
-
-	// ********** methods **********
-
-	/**
-	 * return only persistable properties
-	 */
-	public Iterator<JavaResourcePersistentAttribute> properties() {
-		return persistableMembers(this.methods_());
-	}
-
-	/**
-	 * *all* methods
-	 */
-	protected Iterator<JavaResourcePersistentAttribute> methods_() {
-		return new CloneIterator<JavaResourcePersistentAttribute>(this.methods);
-	}
-
-	protected void addMethod(JavaResourcePersistentAttribute attribute) {
-		this.addItemToCollection(attribute, this.methods, ATTRIBUTES_COLLECTION);
-	}
-
-	protected void removeMethod(JavaResourcePersistentAttribute attribute) {
-		this.removeItemFromCollection(attribute, this.methods, ATTRIBUTES_COLLECTION);
-	}
-
-	protected void removeMethods(Collection<JavaResourcePersistentAttribute> remove) {
-		this.removeItemsFromCollection(remove, this.methods, ATTRIBUTES_COLLECTION);
-	}
-
-	protected JavaResourcePersistentAttribute getMethod(MethodSignature signature, int occurrence) {
-		for (Iterator<JavaResourcePersistentAttribute> stream = this.methods_(); stream.hasNext(); ) {
-			JavaResourcePersistentAttribute method = stream.next();
-			if (method.isFor(signature, occurrence)) {
-				return method;
-			}
-		}
-		return null;
-	}
-
-
-	// ********** simple instance variables **********
-
-	public String getQualifiedName() {
-		return this.qualifiedName;
-	}
-
-	protected void setQualifiedName(String qualifiedName) {
-		String old = this.qualifiedName;
-		this.qualifiedName = qualifiedName;
-		this.firePropertyChanged(QUALIFIED_NAME_PROPERTY, old, qualifiedName);
-	}
-
-	public String getName() {
-		return this.name;
-	}
-
-	protected void setName(String name) {
-		String old = this.name;
-		this.name = name;
-		this.firePropertyChanged(NAME_PROPERTY, old, name);
-	}
-
-	public String getSuperClassQualifiedName() {
-		return this.superClassQualifiedName;
-	}
-
-	protected void setSuperClassQualifiedName(String superClassQualifiedName) {
-		String old = this.superClassQualifiedName;
-		this.superClassQualifiedName = superClassQualifiedName;
-		this.firePropertyChanged(SUPER_CLASS_QUALIFIED_NAME_PROPERTY, old, superClassQualifiedName);
-	}
-
-	public boolean isAbstract() {
-		return this.abstract_;
-	}
-
-	protected void setAbstract(boolean abstract_) {
-		boolean old = this.abstract_;
-		this.abstract_ = abstract_;
-		this.firePropertyChanged(ABSTRACT_PROPERTY, old, abstract_);
-	}
-
-	public AccessType getAccess() {
-		return this.accessType;
-	}
-
-	// TODO
-	//seems we could have a public changeAccess() api which would
-	//move all annotations from fields to their corresponding methods or vice versa
-	//though of course it's more complicated than that since what if the
-	//corresponding field/method does not exist?
-	//making this internal since it should only be set based on changes in the source, the
-	//context model should not need to set this
-	protected void setAccess(AccessType accessType) {
-		AccessType old = this.accessType;
-		this.accessType = accessType;
-		this.firePropertyChanged(ACCESS_PROPERTY, old, accessType);
-	}
-
-
-	// ********** update from Java **********
-
-	@Override
-	public void updateFromJava(CompilationUnit astRoot) {
-		super.updateFromJava(astRoot);
-		this.setQualifiedName(this.buildQualifiedName(astRoot));
-		this.setName(this.buildName(astRoot));
-		this.setSuperClassQualifiedName(this.buildSuperClassQualifiedName(astRoot));
-		this.setAbstract(this.buildAbstract(astRoot));
-		this.updateNestedTypes(astRoot);
-		this.updateFields(astRoot);
-		this.updateMethods(astRoot);
-		this.setAccess(this.buildAccessType());
-	}
-
-	protected void updateNestedTypes(CompilationUnit astRoot) {
-		CounterMap counters = new CounterMap();
-		@SuppressWarnings("unchecked")
-		Vector<JavaResourcePersistentType> nestedTypesToRemove = (Vector<JavaResourcePersistentType>) this.nestedTypes.clone();
-		for (TypeDeclaration typeDeclaration : this.getMember().getTypes(astRoot)) {
-			String tdName = typeDeclaration.getName().getFullyQualifiedName();
-			int occurrence = counters.increment(tdName);
-
-			JavaResourcePersistentType nestedType = this.getNestedType(tdName, occurrence);
-			if (nestedType == null) {
-				this.addNestedType(this.buildNestedType(typeDeclaration, occurrence, astRoot));
-			} else {
-				nestedTypesToRemove.remove(nestedType);
-				nestedType.updateFromJava(astRoot);
-			}
-		}
-		this.removeNestedTypes(nestedTypesToRemove);
-	}
-
-	protected void updateFields(CompilationUnit astRoot) {
-		CounterMap counters = new CounterMap();
-		@SuppressWarnings("unchecked")
-		Vector<JavaResourcePersistentAttribute> fieldsToRemove = (Vector<JavaResourcePersistentAttribute>) this.fields.clone();
-		for (FieldDeclaration fieldDeclaration : this.getMember().getFields(astRoot)) {
-			for (VariableDeclarationFragment fragment : fragments(fieldDeclaration)) {
-				String fieldName = fragment.getName().getFullyQualifiedName();
-				int occurrence = counters.increment(fieldName);
-
-				JavaResourcePersistentAttribute field = this.getField(fieldName, occurrence);
-				if (field == null) {
-					this.addField(this.buildField(fieldName, occurrence, astRoot));
-				} else {
-					fieldsToRemove.remove(field);
-					field.updateFromJava(astRoot);
-				}
-			}
-		}
-		this.removeFields(fieldsToRemove);
-	}
-
-	protected void updateMethods(CompilationUnit astRoot) {
-		CounterMap counters = new CounterMap();
-		@SuppressWarnings("unchecked")
-		Vector<JavaResourcePersistentAttribute> methodsToRemove = (Vector<JavaResourcePersistentAttribute>) this.methods.clone();
-		for (MethodDeclaration methodDeclaration : this.getMember().getMethods(astRoot)) {
-			MethodSignature signature = JDTTools.buildMethodSignature(methodDeclaration);
-			int occurrence = counters.increment(signature);
-
-			JavaResourcePersistentAttribute method = this.getMethod(signature, occurrence);
-			if (method == null) {
-				this.addMethod(this.buildMethod(signature, occurrence, astRoot));
-			} else {
-				methodsToRemove.remove(method);
-				method.updateFromJava(astRoot);
-			}
-		}
-		this.removeMethods(methodsToRemove);
-	}
-
-
-	// ********** building state from AST **********
-
-	protected String buildQualifiedName(CompilationUnit astRoot) {
-		return this.getMember().getBinding(astRoot).getQualifiedName();
-	}
-
-	protected String buildName(CompilationUnit astRoot) {
-		return this.getMember().getBinding(astRoot).getName();
-	}
-
-	protected String buildSuperClassQualifiedName(CompilationUnit astRoot) {
-		ITypeBinding typeBinding = this.getMember().getBinding(astRoot);
-		if (typeBinding == null) {
-			return null;
-		}
-		ITypeBinding superClassTypeBinding = typeBinding.getSuperclass();
-		if (superClassTypeBinding == null) {
-			return null;
-		}
-		return superClassTypeBinding.getTypeDeclaration().getQualifiedName();
-	}
-
-	protected boolean buildAbstract(CompilationUnit astRoot) {
-		return Modifier.isAbstract(this.getMember().getBinding(astRoot).getModifiers());	
-	}
-
-	// TODO use JPA factory
-	protected JavaResourcePersistentType buildNestedType(TypeDeclaration nestedTypeDeclaration, int occurrence, CompilationUnit astRoot) {
-		return newInstance(this.getJpaCompilationUnit(), this.getMember(), nestedTypeDeclaration, occurrence, astRoot);
-	}
-
-	// TODO use JPA factory
-	protected JavaResourcePersistentAttribute buildField(String fieldName, int occurrence, CompilationUnit astRoot) {
-		return JavaResourcePersistentAttributeImpl.newInstance(this, this.getMember(), fieldName, occurrence, this.getJpaCompilationUnit(), astRoot);
-	}
-
-	// TODO use JPA factory
-	protected JavaResourcePersistentAttribute buildMethod(MethodSignature signature, int occurrence, CompilationUnit astRoot) {
-		return JavaResourcePersistentAttributeImpl.newInstance(this, this.getMember(), signature, occurrence, this.getJpaCompilationUnit(), astRoot);
-	}
-
-	/**
-	 * Return the AccessType currently implied by the Java source code:
-	 *     - if only Fields are annotated => FIELD
-	 *     - if only Properties are annotated => PROPERTY
-	 *     - if both Fields and Properties are annotated => FIELD
-	 *     - if nothing is annotated
-	 *     		- and fields exist => FIELD
-	 *     		- and properties exist, but no fields exist => PROPERTY
-	 *     		- and neither fields nor properties exist => null at this level (FIELD in the context model)
-	 */
-	protected AccessType buildAccessType() {
-		boolean hasPersistableFields = false;
-		boolean hasPersistableProperties = false;
-		for (JavaResourcePersistentAttribute field : CollectionTools.iterable(fields())) {
-			hasPersistableFields = true;
-			if (field.hasAnyAnnotation()) {
-				// any field is annotated => FIELD
-				return AccessType.FIELD;
-			}
-		}
-		for (JavaResourcePersistentAttribute property : CollectionTools.iterable(properties())) {
-			hasPersistableProperties = true;
-			if (property.hasAnyAnnotation()) {
-				// none of the fields are annotated and a getter is annotated => PROPERTY
-				return AccessType.PROPERTY;
-			}
-		}
-
-		if (hasPersistableProperties && !hasPersistableFields) {
-			return AccessType.PROPERTY;
-		}
-		//no annotations exist, access is null at the resource model level
-		return null;
-	}
-
-
-	// ********** static methods **********
-
-	// minimize scope of suppressed warnings
-	@SuppressWarnings("unchecked")
-	protected static List<VariableDeclarationFragment> fragments(FieldDeclaration fd) {
-		return fd.fragments();
-	}
-
-
-	// ********** StringCounter **********
-
-	protected static class CounterMap {
-		HashMap<Object, Counter> counters = new HashMap<Object, Counter>();
-
-		/**
-		 * Return the incremented count for the specified object.
-		 */
-		int increment(Object o) {
-			Counter counter = this.counters.get(o);
-			if (counter == null) {
-				counter = new Counter();
-				this.counters.put(o, counter);
-			}
-			counter.increment();
-			return counter.count();
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnImpl.java
deleted file mode 100644
index 62a8b10187..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnImpl.java
+++ /dev/null
@@ -1,225 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.utility.jdt.MemberAnnotationAdapter;
-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.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.core.resource.java.NestableJoinColumn;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationAdapter;
-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;
-
-public class JoinColumnImpl extends BaseColumnImpl implements NestableJoinColumn
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	// hold this so we can get the 'referenced column name' text range
-	private final DeclarationAnnotationElementAdapter<String> referencedColumnNameDeclarationAdapter;
-
-	private final AnnotationElementAdapter<String> referencedColumnNameAdapter;
-
-	private String referencedColumnName;
-	
-	public JoinColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) {
-		super(parent, member, daa, annotationAdapter);
-		this.referencedColumnNameDeclarationAdapter = this.buildStringElementAdapter(JPA.JOIN_COLUMN__REFERENCED_COLUMN_NAME);
-		this.referencedColumnNameAdapter = this.buildShortCircuitElementAdapter(this.referencedColumnNameDeclarationAdapter);
-	}
-	
-	public JoinColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa) {
-		this(parent, member, daa, new MemberAnnotationAdapter(member, daa));
-	}
-	
-	public JoinColumnImpl(JavaResourceNode parent, Member member, IndexedDeclarationAnnotationAdapter idaa) {
-		this(parent, member, idaa, new MemberIndexedAnnotationAdapter(member, idaa));
-	}
-	
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.referencedColumnName = this.referencedColumnName(astRoot);
-	}
-	
-	@Override
-	protected String nameElementName() {
-		return JPA.JOIN_COLUMN__NAME;
-	}
-	
-	@Override
-	protected String columnDefinitionElementName() {
-		return JPA.JOIN_COLUMN__COLUMN_DEFINITION;
-	}
-	
-	@Override
-	protected String tableElementName() {
-		return JPA.JOIN_COLUMN__TABLE;
-	}
-
-	@Override
-	protected String uniqueElementName() {
-		return JPA.JOIN_COLUMN__UNIQUE;
-	}
-
-	@Override
-	protected String nullableElementName() {
-		return JPA.JOIN_COLUMN__NULLABLE;
-	}
-
-	@Override
-	protected String insertableElementName() {
-		return JPA.JOIN_COLUMN__INSERTABLE;
-	}
-
-	@Override
-	protected String updatableElementName() {
-		return JPA.JOIN_COLUMN__UPDATABLE;
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	private IndexedAnnotationAdapter getIndexedAnnotationAdapter() {
-		return (IndexedAnnotationAdapter) super.getAnnotationAdapter();
-	}
-
-	public void moveAnnotation(int newIndex) {
-		getIndexedAnnotationAdapter().moveAnnotation(newIndex);
-	}
-	
-	@Override
-	public void initializeFrom(NestableAnnotation oldAnnotation) {
-		super.initializeFrom(oldAnnotation);
-		JoinColumnAnnotation oldColumn = (JoinColumnAnnotation) oldAnnotation;
-		setReferencedColumnName(oldColumn.getReferencedColumnName());
-	}
-	
-	//************ JoinColumn implementation ***************
-	public String getReferencedColumnName() {
-		return this.referencedColumnName;
-	}
-	
-	public void setReferencedColumnName(String newReferencedColumnName) {
-		if (attributeValueHasNotChanged(this.referencedColumnName, newReferencedColumnName)) {
-			return;
-		}
-		String oldReferencedColumnName = this.referencedColumnName;
-		this.referencedColumnName = newReferencedColumnName;
-		this.referencedColumnNameAdapter.setValue(newReferencedColumnName);
-		firePropertyChanged(REFERENCED_COLUMN_NAME_PROPERTY, oldReferencedColumnName, newReferencedColumnName);
-	}
-	
-	public TextRange getReferencedColumnNameTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.referencedColumnNameDeclarationAdapter, astRoot);
-	}
-
-	public boolean referencedColumnNameTouches(int pos, CompilationUnit astRoot) {
-		return this.elementTouches(this.referencedColumnNameDeclarationAdapter, pos, astRoot);
-	}
-	
-	@Override
-	public void updateFromJava(CompilationUnit astRoot) {
-		super.updateFromJava(astRoot);
-		this.setReferencedColumnName(this.referencedColumnName(astRoot));
-	}
-	
-	protected String referencedColumnName(CompilationUnit astRoot) {
-		return this.referencedColumnNameAdapter.getValue(astRoot);
-	}
-	
-	// ********** static methods **********
-
-	static JoinColumnImpl createJoinColumn(JavaResourceNode parent, Member member) {
-		return new JoinColumnImpl(parent, member, DECLARATION_ANNOTATION_ADAPTER);
-	}
-	
-	static JoinColumnImpl createNestedJoinColumn(JavaResourceNode parent, Member member, int index, DeclarationAnnotationAdapter joinColumnsAdapter) {
-		IndexedDeclarationAnnotationAdapter idaa = buildNestedDeclarationAnnotationAdapter(index, joinColumnsAdapter);
-		IndexedAnnotationAdapter annotationAdapter = new MemberIndexedAnnotationAdapter(member, idaa);
-		return new JoinColumnImpl(parent, member, idaa, annotationAdapter);
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildNestedDeclarationAnnotationAdapter(int index, DeclarationAnnotationAdapter joinColumnsAdapter) {
-		return new NestedIndexedDeclarationAnnotationAdapter(joinColumnsAdapter, index, JPA.JOIN_COLUMN);
-	}
-	static NestableJoinColumn createJoinTableJoinColumn(JavaResourceNode parent, Member member, int index) {
-		return new JoinColumnImpl(parent, member, buildJoinTableAnnotationAdapter(index));
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildJoinTableAnnotationAdapter(int index) {
-		return new NestedIndexedDeclarationAnnotationAdapter(JoinTableImpl.DECLARATION_ANNOTATION_ADAPTER, JPA.JOIN_TABLE__JOIN_COLUMNS, index, JPA.JOIN_COLUMN);
-	}
-
-	static NestableJoinColumn createJoinTableInverseJoinColumn(JavaResourceNode parent, Member member, int index) {
-		return new JoinColumnImpl(parent, member, buildJoinTableInverseAnnotationAdapter(index));
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildJoinTableInverseAnnotationAdapter(int index) {
-		return new NestedIndexedDeclarationAnnotationAdapter(JoinTableImpl.DECLARATION_ANNOTATION_ADAPTER, JPA.JOIN_TABLE__INVERSE_JOIN_COLUMNS, index, JPA.JOIN_COLUMN);
-	}
-	
-	
-	static NestableJoinColumn createAssociationOverrideJoinColumn(DeclarationAnnotationAdapter associationOverrideAdapter, JavaResourceNode parent, Member member, int index) {
-		return new JoinColumnImpl(parent, member, buildAssociationOverrideAnnotationAdapter(associationOverrideAdapter, index));
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildAssociationOverrideAnnotationAdapter(DeclarationAnnotationAdapter associationOverrideAdapter, int index) {
-		return new NestedIndexedDeclarationAnnotationAdapter(associationOverrideAdapter, JPA.ASSOCIATION_OVERRIDE__JOIN_COLUMNS, index, JPA.JOIN_COLUMN);
-	}
-
-
-	public static class JoinColumnAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final JoinColumnAnnotationDefinition INSTANCE = new JoinColumnAnnotationDefinition();
-
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private JoinColumnAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return JoinColumnImpl.createJoinColumn(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.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnsImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnsImpl.java
deleted file mode 100644
index 262c7c896a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnsImpl.java
+++ /dev/null
@@ -1,156 +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.core.internal.resource.java;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-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.resource.java.JoinColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.JoinColumnsAnnotation;
-import org.eclipse.jpt.core.resource.java.NestableJoinColumn;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-public class JoinColumnsImpl extends AbstractResourceAnnotation<Member> implements JoinColumnsAnnotation
-{
-	
-	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private List<NestableJoinColumn> joinColumns;
-	
-	protected JoinColumnsImpl(JavaResourceNode parent, Member member) {
-		super(parent, member, DECLARATION_ANNOTATION_ADAPTER);
-		this.joinColumns = new ArrayList<NestableJoinColumn>();
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		ContainerAnnotationTools.initializeNestedAnnotations(astRoot, this);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public String getNestableAnnotationName() {
-		return JoinColumnAnnotation.ANNOTATION_NAME;
-	}
-		
-	public ListIterator<NestableJoinColumn> nestedAnnotations() {
-		return new CloneListIterator<NestableJoinColumn>(this.joinColumns);
-	}
-	
-	public int nestedAnnotationsSize() {
-		return this.joinColumns.size();
-	}	
-
-	public NestableJoinColumn addInternal(int index) {
-		JoinColumnImpl joinColumn = createJoinColumn(index);
-		this.joinColumns.add(index, joinColumn);
-		return joinColumn;
-	}
-	
-	public NestableJoinColumn add(int index) {
-		JoinColumnImpl joinColumn = createJoinColumn(index);
-		add(index, joinColumn);
-		return joinColumn;
-	}
-	
-	protected void add(int index, NestableJoinColumn joinColumn) {
-		addItemToList(index, joinColumn, this.joinColumns, JOIN_COLUMNS_LIST);
-	}
-
-	public void remove(NestableJoinColumn joinColumn) {
-		removeItemFromList(joinColumn, this.joinColumns, JOIN_COLUMNS_LIST);
-	}
-	
-	public void remove(int index) {
-		removeItemFromList(index, this.joinColumns, JOIN_COLUMNS_LIST);
-	}
-	
-	public int indexOf(NestableJoinColumn joinColumn) {
-		return this.joinColumns.indexOf(joinColumn);
-	}
-	
-	public NestableJoinColumn nestedAnnotationAt(int index) {
-		return this.joinColumns.get(index);
-	}
-	
-	public NestableJoinColumn nestedAnnotationFor(Annotation jdtAnnotation) {
-		for (NestableJoinColumn joinColumn : this.joinColumns) {
-			if (jdtAnnotation == joinColumn.getJdtAnnotation((CompilationUnit) jdtAnnotation.getRoot())) {
-				return joinColumn;
-			}
-		}
-		return null;
-	}
-	
-	public void move(int targetIndex, int sourceIndex) {
-		moveItemInList(targetIndex, sourceIndex, this.joinColumns, JOIN_COLUMNS_LIST);
-	}
-	
-	public void moveInternal(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.joinColumns, targetIndex, sourceIndex);
-	}
-
-	public String getElementName() {
-		return "value";
-	}
-	
-	public void updateFromJava(CompilationUnit astRoot) {
-		ContainerAnnotationTools.updateNestedAnnotationsFromJava(astRoot, this);
-	}
-		
-	private JoinColumnImpl createJoinColumn(int index) {
-		return JoinColumnImpl.createNestedJoinColumn(this, getMember(), index, getDeclarationAnnotationAdapter());
-	}
-
-	
-	public static class JoinColumnsAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final JoinColumnsAnnotationDefinition INSTANCE = new JoinColumnsAnnotationDefinition();
-
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private JoinColumnsAnnotationDefinition() {
-			super();
-		}
-
-		public JoinColumnsAnnotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new JoinColumnsImpl(parent, member);
-		}
-		
-		public JoinColumnsAnnotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinTableImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinTableImpl.java
deleted file mode 100644
index e7c3fa0dfe..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinTableImpl.java
+++ /dev/null
@@ -1,389 +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.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.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.MemberAnnotationAdapter;
-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.ContainerAnnotation;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.JoinTableAnnotation;
-import org.eclipse.jpt.core.resource.java.NestableJoinColumn;
-import org.eclipse.jpt.core.resource.java.NestableUniqueConstraint;
-import org.eclipse.jpt.core.utility.TextRange;
-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.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-public class JoinTableImpl extends AbstractResourceTable implements JoinTableAnnotation
-{
-	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(JoinTableAnnotation.ANNOTATION_NAME);
-	
-	private static final DeclarationAnnotationElementAdapter<String> NAME_ADAPTER = ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, JPA.JOIN_TABLE__NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> SCHEMA_ADAPTER = ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, JPA.JOIN_TABLE__SCHEMA);
-
-	private static final DeclarationAnnotationElementAdapter<String> CATALOG_ADAPTER = ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, JPA.JOIN_TABLE__CATALOG);
-	
-	private final List<NestableJoinColumn> joinColumns;
-	
-	private final List<NestableJoinColumn> inverseJoinColumns;
-	
-	private final JoinColumnsContainerAnnotation joinColumnsContainerAnnotation;
-	
-	private final InverseJoinColumnsContainerAnnotation inverseJoinColumnsContainerAnnotation;
-
-	protected JoinTableImpl(JavaResourceNode parent, Member member) {
-		super(parent, member, DECLARATION_ANNOTATION_ADAPTER, new MemberAnnotationAdapter(member, DECLARATION_ANNOTATION_ADAPTER));
-		this.joinColumns = new ArrayList<NestableJoinColumn>();
-		this.inverseJoinColumns = new ArrayList<NestableJoinColumn>();
-		this.joinColumnsContainerAnnotation = new JoinColumnsContainerAnnotation();
-		this.inverseJoinColumnsContainerAnnotation = new InverseJoinColumnsContainerAnnotation();
-	}
-	
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		ContainerAnnotationTools.initializeNestedAnnotations(astRoot, this.joinColumnsContainerAnnotation);
-		ContainerAnnotationTools.initializeNestedAnnotations(astRoot, this.inverseJoinColumnsContainerAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return JoinTableAnnotation.ANNOTATION_NAME;
-	}
-	
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> nameAdapter(DeclarationAnnotationAdapter declarationAnnotationAdapter) {
-		// ignore the daa passed in, @JoinTable is never nested
-		return NAME_ADAPTER;
-	}
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> schemaAdapter(DeclarationAnnotationAdapter declarationAnnotationAdapter) {
-		// ignore the daa passed in, @JoinTable is never nested
-		return SCHEMA_ADAPTER;
-	}
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> catalogAdapter(DeclarationAnnotationAdapter declarationAnnotationAdapter) {
-		// ignore the daa passed in, @JoinTable is never nested
-		return CATALOG_ADAPTER;
-	}
-	
-	@Override
-	protected NestableUniqueConstraint createUniqueConstraint(int index) {
-		return UniqueConstraintImpl.createJoinTableUniqueConstraint(this, this.getMember(), index);
-	}
-	
-	@Override
-	public void updateFromJava(CompilationUnit astRoot) {
-		super.updateFromJava(astRoot);
-		this.updateJoinColumnsFromJava(astRoot);
-		this.updateInverseJoinColumnsFromJava(astRoot);
-	}
-	
-	private void updateJoinColumnsFromJava(CompilationUnit astRoot) {
-		ContainerAnnotationTools.updateNestedAnnotationsFromJava(astRoot, this.joinColumnsContainerAnnotation);
-	}
-	
-	private void updateInverseJoinColumnsFromJava(CompilationUnit astRoot) {
-		ContainerAnnotationTools.updateNestedAnnotationsFromJava(astRoot, this.inverseJoinColumnsContainerAnnotation);
-	}
-	
-	public ListIterator<JoinColumnAnnotation> joinColumns() {
-		return new CloneListIterator<JoinColumnAnnotation>(this.joinColumns);
-	}
-	
-	public int joinColumnsSize() {
-		return this.joinColumns.size();
-	}
-	
-	public NestableJoinColumn joinColumnAt(int index) {
-		return this.joinColumns.get(index);
-	}
-	
-	public int indexOfJoinColumn(JoinColumnAnnotation joinColumn) {
-		return this.joinColumns.indexOf(joinColumn);
-	}
-	
-	public JoinColumnAnnotation addJoinColumn(int index) {
-		NestableJoinColumn joinColumn = (NestableJoinColumn) ContainerAnnotationTools.addNestedAnnotation(index, this.joinColumnsContainerAnnotation);
-		fireItemAdded(JoinTableAnnotation.JOIN_COLUMNS_LIST, index, joinColumn);
-		return joinColumn;
-	}
-	
-	protected void addJoinColumn(int index, NestableJoinColumn joinColumn) {
-		addItemToList(index, joinColumn, this.joinColumns, JOIN_COLUMNS_LIST);
-	}
-	
-	public void removeJoinColumn(int index) {
-		NestableJoinColumn joinColumn = this.joinColumns.get(index);
-		removeJoinColumn(joinColumn);
-		joinColumn.removeAnnotation();
-		ContainerAnnotationTools.synchAnnotationsAfterRemove(index, this.joinColumnsContainerAnnotation);
-	}
-	
-	protected void removeJoinColumn(NestableJoinColumn joinColumn) {
-		removeItemFromList(joinColumn, this.joinColumns, JOIN_COLUMNS_LIST);
-	}
-	
-	public void moveJoinColumn(int targetIndex, int sourceIndex) {
-		moveJoinColumnInternal(targetIndex, sourceIndex);
-		ContainerAnnotationTools.synchAnnotationsAfterMove(targetIndex, sourceIndex, this.joinColumnsContainerAnnotation);
-		fireItemMoved(JoinTableAnnotation.JOIN_COLUMNS_LIST, targetIndex, sourceIndex);
-	}
-	
-	protected void moveJoinColumnInternal(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.joinColumns, targetIndex, sourceIndex);
-	}
-
-	public ListIterator<JoinColumnAnnotation> inverseJoinColumns() {
-		return new CloneListIterator<JoinColumnAnnotation>(this.inverseJoinColumns);
-	}
-	
-	public int inverseJoinColumnsSize() {
-		return this.inverseJoinColumns.size();
-	}
-	
-	public NestableJoinColumn inverseJoinColumnAt(int index) {
-		return this.inverseJoinColumns.get(index);
-	}
-	
-	public int indexOfInverseJoinColumn(JoinColumnAnnotation joinColumn) {
-		return this.inverseJoinColumns.indexOf(joinColumn);
-	}
-	
-	public JoinColumnAnnotation addInverseJoinColumn(int index) {
-		NestableJoinColumn inverseJoinColumn = (NestableJoinColumn) ContainerAnnotationTools.addNestedAnnotation(index, this.inverseJoinColumnsContainerAnnotation);
-		fireItemAdded(JoinTableAnnotation.INVERSE_JOIN_COLUMNS_LIST, index, inverseJoinColumn);
-		return inverseJoinColumn;
-	}
-	
-	private void addInverseJoinColumn(int index, NestableJoinColumn joinColumn) {
-		addItemToList(index, joinColumn, this.inverseJoinColumns, INVERSE_JOIN_COLUMNS_LIST);
-	}
-	
-	public void removeInverseJoinColumn(int index) {
-		NestableJoinColumn joinColumn = this.inverseJoinColumns.get(index);
-		this.removeInverseJoinColumn(joinColumn);
-		joinColumn.removeAnnotation();
-		ContainerAnnotationTools.synchAnnotationsAfterRemove(index, this.inverseJoinColumnsContainerAnnotation);
-	}
-
-	protected void removeInverseJoinColumn(NestableJoinColumn joinColumn) {
-		removeItemFromList(joinColumn, this.inverseJoinColumns, INVERSE_JOIN_COLUMNS_LIST);
-	}
-	
-	public void moveInverseJoinColumn(int targetIndex, int sourceIndex) {
-		moveInverseJoinColumnInternal(targetIndex, sourceIndex);
-		ContainerAnnotationTools.synchAnnotationsAfterMove(targetIndex, sourceIndex, this.inverseJoinColumnsContainerAnnotation);
-		fireItemMoved(JoinTableAnnotation.INVERSE_JOIN_COLUMNS_LIST, targetIndex, sourceIndex);
-	}
-	
-	protected void moveInverseJoinColumnInternal(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.inverseJoinColumns, targetIndex, sourceIndex);
-	}
-
-	protected NestableJoinColumn createJoinColumn(int index) {
-		return JoinColumnImpl.createJoinTableJoinColumn(this, getMember(), index);
-	}
-
-	protected NestableJoinColumn createInverseJoinColumn(int index) {
-		return JoinColumnImpl.createJoinTableInverseJoinColumn(this, getMember(), index);
-	}
-
-	private class JoinColumnsContainerAnnotation extends AbstractContainerAnnotation {
-
-		public NestableJoinColumn addInternal(int index) {
-			NestableJoinColumn joinColumn = JoinTableImpl.this.createJoinColumn(index);
-			JoinTableImpl.this.joinColumns.add(index, joinColumn);
-			return joinColumn;
-		}
-		
-		public NestableJoinColumn add(int index) {
-			NestableJoinColumn joinColumn = JoinTableImpl.this.createJoinColumn(index);
-			JoinTableImpl.this.addJoinColumn(index, joinColumn);
-			return joinColumn;
-		}
-
-		public int indexOf(NestableJoinColumn joinColumn) {
-			return JoinTableImpl.this.indexOfJoinColumn(joinColumn);
-		}
-
-		public void move(int targetIndex, int sourceIndex) {
-			JoinTableImpl.this.moveJoinColumn(targetIndex, sourceIndex);
-		}
-
-		public void moveInternal(int targetIndex, int sourceIndex) {
-			JoinTableImpl.this.moveJoinColumnInternal(targetIndex, sourceIndex);			
-		}
-
-		public NestableJoinColumn nestedAnnotationAt(int index) {
-			return JoinTableImpl.this.joinColumnAt(index);
-		}
-
-		public ListIterator<NestableJoinColumn> nestedAnnotations() {
-			return new CloneListIterator<NestableJoinColumn>(JoinTableImpl.this.joinColumns);
-		}
-
-		public int nestedAnnotationsSize() {
-			return joinColumnsSize();
-		}
-
-		public void remove(NestableJoinColumn nestedAnnotation) {
-			JoinTableImpl.this.removeJoinColumn(nestedAnnotation);	
-		}
-		public String getElementName() {
-			return "joinColumns";
-		}
-	}
-	
-	private class InverseJoinColumnsContainerAnnotation extends AbstractContainerAnnotation {
-
-		public NestableJoinColumn addInternal(int index) {
-			NestableJoinColumn joinColumn = JoinTableImpl.this.createInverseJoinColumn(index);
-			JoinTableImpl.this.inverseJoinColumns.add(index, joinColumn);
-			return joinColumn;
-		}
-		
-		public NestableJoinColumn add(int index) {
-			NestableJoinColumn joinColumn = JoinTableImpl.this.createInverseJoinColumn(index);
-			JoinTableImpl.this.addInverseJoinColumn(index, joinColumn);
-			return joinColumn;
-		}
-
-		public int indexOf(NestableJoinColumn joinColumn) {
-			return JoinTableImpl.this.indexOfInverseJoinColumn(joinColumn);
-		}
-
-		public void move(int targetIndex, int sourceIndex) {
-			JoinTableImpl.this.moveInverseJoinColumn(targetIndex, sourceIndex);
-		}
-
-		public void moveInternal(int targetIndex, int sourceIndex) {
-			JoinTableImpl.this.moveInverseJoinColumnInternal(targetIndex, sourceIndex);			
-		}
-
-		public NestableJoinColumn nestedAnnotationAt(int index) {
-			return JoinTableImpl.this.inverseJoinColumnAt(index);
-		}
-
-		public ListIterator<NestableJoinColumn> nestedAnnotations() {
-			return new CloneListIterator<NestableJoinColumn>(JoinTableImpl.this.inverseJoinColumns);
-		}
-
-		public int nestedAnnotationsSize() {
-			return inverseJoinColumnsSize();
-		}
-
-		public void remove(NestableJoinColumn nestedAnnotation) {
-			JoinTableImpl.this.removeInverseJoinColumn(nestedAnnotation);	
-		}
-		
-		public String getElementName() {
-			return "inverseJoinColumns";
-		}
-	}
-
-	private abstract class AbstractContainerAnnotation extends AbstractJavaResourceNode implements ContainerAnnotation<NestableJoinColumn> {
-
-		public AbstractContainerAnnotation() {
-			super(JoinTableImpl.this);
-		}
-		
-		public void initialize(CompilationUnit astRoot) {
-			//nothing to initialize
-		}
-		
-		public String getAnnotationName() {
-			return JoinTableImpl.this.getAnnotationName();
-		}
-
-		public String getNestableAnnotationName() {
-			return JPA.JOIN_COLUMN;
-		}
-		
-		public void remove(int index) {
-			this.remove(nestedAnnotationAt(index));	
-		}		
-
-		public NestableJoinColumn nestedAnnotationFor(org.eclipse.jdt.core.dom.Annotation jdtAnnotation) {
-			for (NestableJoinColumn joinColumn : CollectionTools.iterable(nestedAnnotations())) {
-				if (jdtAnnotation == joinColumn.getJdtAnnotation((CompilationUnit) jdtAnnotation.getRoot())) {
-					return joinColumn;
-				}
-			}
-			return null;
-		}
-
-		public org.eclipse.jdt.core.dom.Annotation getJdtAnnotation(CompilationUnit astRoot) {
-			return JoinTableImpl.this.getJdtAnnotation(astRoot);
-		}
-
-		public void newAnnotation() {
-			JoinTableImpl.this.newAnnotation();
-		}
-
-		public void removeAnnotation() {
-			JoinTableImpl.this.removeAnnotation();
-		}
-
-		public void updateFromJava(CompilationUnit astRoot) {
-			JoinTableImpl.this.updateFromJava(astRoot);
-		}
-		
-		public TextRange getTextRange(CompilationUnit astRoot) {
-			return JoinTableImpl.this.getTextRange(astRoot);
-		}
-	}
-	public static class JoinTableAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final JoinTableAnnotationDefinition INSTANCE = new JoinTableAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private JoinTableAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new JoinTableImpl(parent, member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new NullJoinTable(parent);
-		}
-		
-		public String getAnnotationName() {
-			return JoinTableAnnotation.ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JpaCompilationUnitImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JpaCompilationUnitImpl.java
deleted file mode 100644
index 5d9cf19905..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JpaCompilationUnitImpl.java
+++ /dev/null
@@ -1,242 +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.core.internal.resource.java;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jpt.core.JpaAnnotationProvider;
-import org.eclipse.jpt.core.internal.utility.jdt.JDTTools;
-import org.eclipse.jpt.core.resource.java.JavaResourceModel;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.resource.java.JpaCompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationEditFormatter;
-import org.eclipse.jpt.utility.CommandExecutorProvider;
-
-public class JpaCompilationUnitImpl
-	extends AbstractJavaResourceNode
-	implements JpaCompilationUnit
-{
-	protected final JpaAnnotationProvider annotationProvider;
-
-	protected final CommandExecutorProvider modifySharedDocumentCommandExecutorProvider;
-
-	protected final AnnotationEditFormatter annotationEditFormatter;
-
-	protected final JavaResourceModel javaResourceModel;
-
-	protected final ICompilationUnit compilationUnit;
-
-	/**
-	 * The primary type of the AST compilation unit. We are not going to handle
-	 * multiple types defined in a single compilation unit. Entities must have
-	 * a public/protected no-arg constructor, and there is no way to access
-	 * the constructor in a package class (which is what all top-level,
-	 * non-primary classes must be).
-	 */
-	protected JavaResourcePersistentType persistentType;	
-
-
-	// ********** construction **********
-
-	public JpaCompilationUnitImpl(
-			IFile file, 
-			JpaAnnotationProvider annotationProvider, 
-			CommandExecutorProvider modifySharedDocumentCommandExecutorProvider,
-			AnnotationEditFormatter annotationEditFormatter,
-			JavaResourceModel javaResourceModel) {
-		super(null);  // the JPA compilation unit is the root of its sub-tree
-		this.annotationProvider = annotationProvider;
-		this.modifySharedDocumentCommandExecutorProvider = modifySharedDocumentCommandExecutorProvider;
-		this.annotationEditFormatter = annotationEditFormatter;
-		this.javaResourceModel = javaResourceModel;
-		this.compilationUnit = JavaCore.createCompilationUnitFrom(file);
-		this.openCompilationUnit();
-		this.persistentType = this.buildJavaResourcePersistentType();
-	}
-
-	protected void openCompilationUnit() {
-		try {
-			this.compilationUnit.open(null);
-		} catch (JavaModelException ex) {
-			// do nothing - we just won't have a primary type in this case
-		}
-	}
-
-	protected JavaResourcePersistentType buildJavaResourcePersistentType() {
-		return this.buildJavaResourcePersistentType(this.buildASTRoot());
-	}
-
-	protected JavaResourcePersistentType buildJavaResourcePersistentType(CompilationUnit astRoot) {
-		TypeDeclaration td = this.getPrimaryType(astRoot);
-		return (td == null) ? null : this.buildJavaResourcePersistentType(astRoot, td);
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		// never called?
-	}
-
-
-	// ********** overrides **********
-
-	@Override
-	protected boolean requiresParent() {
-		return false;
-	}
-
-	@Override
-	public JpaCompilationUnit getJpaCompilationUnit() {
-		return this;
-	}
-
-	@Override
-	public JpaAnnotationProvider getAnnotationProvider() {
-		return this.annotationProvider;
-	}
-	
-	@Override
-	public CommandExecutorProvider getModifySharedDocumentCommandExecutorProvider() {
-		return this.modifySharedDocumentCommandExecutorProvider;
-	}
-	
-	@Override
-	public AnnotationEditFormatter getAnnotationEditFormatter()  {
-		return this.annotationEditFormatter;
-	}
-	
-	@Override
-	public JavaResourceModel getResourceModel() {
-		return this.javaResourceModel;
-	}
-	
-
-	// ********** JpaCompilationUnit implementation **********
-
-	public ICompilationUnit getCompilationUnit() {
-		return this.compilationUnit;
-	}
-	
-	public JavaResourcePersistentType getJavaPersistentTypeResource(String fullyQualifiedTypeName) {
-		return (this.persistentType == null) ? null : this.persistentType.getJavaPersistentTypeResource(fullyQualifiedTypeName);
-	}
-
-	/**
-	 * The persistentType resource for the compilation unit's primary type.
-	 * Will be null if the primary type is null.
-	 */
-	public JavaResourcePersistentType getPersistentType() {	
-		return this.persistentType;
-		//TODO should i only be returning this if it returns true to isPersistable?
-		//that's how we handle nestedTypes on JavaPersistentTypeResource
-		//return this.persistentType.isPersistable() ? this.persistentType : null;
-	}
-	
-	protected void setPersistentType(JavaResourcePersistentType persistentType) {
-		JavaResourcePersistentType old = this.persistentType;
-		this.persistentType = persistentType;
-		this.firePropertyChanged(PERSISTENT_TYPE_PROPERTY, old, persistentType);
-	}
-
-	public void updateFromJava() {
-		this.updateFromJava(this.buildASTRoot());
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		TypeDeclaration td = this.getPrimaryType(astRoot);
-		if (td == null) {
-			this.setPersistentType(null);
-		} else {
-			if (this.persistentType == null) {
-				this.setPersistentType(this.buildJavaResourcePersistentType(astRoot, td));
-			} else {
-				this.persistentType.updateFromJava(astRoot);
-			}
-		}
-	}
-
-	public TextRange getTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	public void resourceChanged() {
-		this.javaResourceModel.resourceChanged();
-	}
-
-	public void resolveTypes() {
-		if (this.persistentType != null) {
-			this.persistentType.resolveTypes(this.buildASTRoot());
-		}
-	}
-
-
-	// ********** internal **********
-
-	protected CompilationUnit buildASTRoot() {
-		return JDTTools.buildASTRoot(this.compilationUnit);
-	}
-
-	// TODO use JPA factory
-	protected JavaResourcePersistentType buildJavaResourcePersistentType(CompilationUnit astRoot, TypeDeclaration typeDeclaration) {
-		return JavaResourcePersistentTypeImpl.newInstance(this, typeDeclaration, astRoot);
-	}
-
-	/**
-	 * i.e. the type with the same name as the compilation unit;
-	 * return the first class or interface (ignore annotations and enums) with
-	 * the same name as the compilation unit (file);
-	 * NB: this type could be in error if there is an annotation or enum
-	 * with the same name preceding it in the compilation unit
-	 * 
-	 * Return null if resolveBinding() on the TypeDeclaration returns null
-	 * This can occur if the project JRE is removed (bug 225332)
-	 */
-	protected TypeDeclaration getPrimaryType(CompilationUnit astRoot) {
-		String primaryTypeName = this.getPrimaryTypeName();
-		for (AbstractTypeDeclaration atd : types(astRoot)) {
-			if ((atd.getNodeType() == ASTNode.TYPE_DECLARATION)
-					&& atd.getName().getFullyQualifiedName().equals(primaryTypeName)) {
-				return atd.resolveBinding() != null ? (TypeDeclaration) atd : null;
-			}
-		}
-		return null;
-	}
-
-	// minimize scope of suppressed warnings
-	@SuppressWarnings("unchecked")
-	protected static List<AbstractTypeDeclaration> types(CompilationUnit astRoot) {
-		return astRoot.types();
-	}
-
-	/**
-	 * i.e. the name of the compilation unit
-	 */
-	protected String getPrimaryTypeName() {
-		return removeJavaExtension(this.compilationUnit.getElementName());
-	}
-
-	protected static String removeJavaExtension(String fileName) {
-		int index = fileName.lastIndexOf(".java");
-		return (index == -1) ? fileName : fileName.substring(0, index);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.persistentType.getName());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/LobImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/LobImpl.java
deleted file mode 100644
index c6dbc97bf4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/LobImpl.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.resource.java.LobAnnotation;
-import org.eclipse.jpt.core.utility.jdt.Attribute;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-
-public class LobImpl extends AbstractResourceAnnotation<Attribute> implements LobAnnotation
-{
-	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	protected LobImpl(JavaResourceNode parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		//nothing to initialize
-	}
-	
-	public void updateFromJava(CompilationUnit astRoot) {
-		//nothing to update
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	
-	public static class LobAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final LobAnnotationDefinition INSTANCE = new LobAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private LobAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new LobImpl(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.core/src/org/eclipse/jpt/core/internal/resource/java/ManyToManyImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ManyToManyImpl.java
deleted file mode 100644
index 631b9e714a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ManyToManyImpl.java
+++ /dev/null
@@ -1,165 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-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.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.ManyToManyAnnotation;
-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;
-
-
-public class ManyToManyImpl extends AbstractRelationshipMappingAnnotation implements ManyToManyAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> TARGET_ENTITY_ADAPTER = buildTargetEntityAdapter();	
-
-	private static final DeclarationAnnotationElementAdapter<String[]> CASCADE_ADAPTER = buildCascadeAdapter();
-
-	private static final DeclarationAnnotationElementAdapter<String> FETCH_ADAPTER = buildFetchAdapter();
-	
-	private static final DeclarationAnnotationElementAdapter<String> MAPPED_BY_ADAPTER = buildMappedByAdapter();	
-
-	private final AnnotationElementAdapter<String> mappedByAdapter;
-
-	private String mappedBy;
-	
-	protected ManyToManyImpl(JavaResourcePersistentAttribute parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-		this.mappedByAdapter = buildAnnotationElementAdapter(MAPPED_BY_ADAPTER);
-	}
-
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.mappedBy = this.mappedBy(astRoot);
-	}
-	
-	//**************** AbstractRelationshipMappingAnnotation implementation **************
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> targetEntityAdapter() {
-		return TARGET_ENTITY_ADAPTER;
-	}
-	
-	@Override
-	protected DeclarationAnnotationElementAdapter<String[]> cascadeAdapter() {
-		return CASCADE_ADAPTER;
-	}
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> fetchAdapter() {
-		return FETCH_ADAPTER;
-	}
-	
-	
-	//**************** Annotation implementation **************
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	
-	public String getMappedBy() {
-		return this.mappedBy;
-	}
-	
-	public void setMappedBy(String newMappedBy) {
-		if (attributeValueHasNotChanged(this.mappedBy, newMappedBy)) {
-			return;
-		}
-		String oldMappedBy = this.mappedBy;
-		this.mappedBy = newMappedBy;
-		this.mappedByAdapter.setValue(newMappedBy);
-		firePropertyChanged(MAPPED_BY_PROPERTY, oldMappedBy, newMappedBy);
-	}
-	
-	@Override
-	public void updateFromJava(CompilationUnit astRoot) {
-		super.updateFromJava(astRoot);
-		this.setMappedBy(this.mappedBy(astRoot));
-	}
-	
-	protected String mappedBy(CompilationUnit astRoot) {
-		return this.mappedByAdapter.getValue(astRoot);
-	}
-
-	public TextRange getMappedByTextRange(CompilationUnit astRoot) {
-		return getElementTextRange(MAPPED_BY_ADAPTER, astRoot);
-	}
-
-	public boolean mappedByTouches(int pos, CompilationUnit astRoot) {
-		return this.elementTouches(MAPPED_BY_ADAPTER, pos, astRoot);
-	}
-
-	// ********** static methods **********
-
-	private static DeclarationAnnotationElementAdapter<String> buildTargetEntityAdapter() {
-		return buildTargetEntityAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.MANY_TO_MANY__TARGET_ENTITY);
-	}
-
-	private static DeclarationAnnotationElementAdapter<String[]> buildCascadeAdapter() {
-		return buildEnumArrayAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.MANY_TO_MANY__CASCADE);
-	}
-	
-	private static DeclarationAnnotationElementAdapter<String> buildFetchAdapter() {
-		return buildFetchAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.MANY_TO_MANY__FETCH);
-	}
-
-	
-	private static DeclarationAnnotationElementAdapter<String> buildMappedByAdapter() {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, JPA.MANY_TO_MANY__MAPPED_BY, false); // false = do not remove annotation when empty
-	}
-
-	
-	public static class ManyToManyAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final ManyToManyAnnotationDefinition INSTANCE = new ManyToManyAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static ManyToManyAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private ManyToManyAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new ManyToManyImpl((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.core/src/org/eclipse/jpt/core/internal/resource/java/ManyToOneImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ManyToOneImpl.java
deleted file mode 100644
index eb891d1d70..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ManyToOneImpl.java
+++ /dev/null
@@ -1,164 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.ManyToOneAnnotation;
-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;
-
-
-public class ManyToOneImpl extends AbstractRelationshipMappingAnnotation implements ManyToOneAnnotation
-{	
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-	
-	private static final DeclarationAnnotationElementAdapter<String> TARGET_ENTITY_ADAPTER = buildTargetEntityAdapter();	
-
-	private static final DeclarationAnnotationElementAdapter<String[]> CASCADE_ADAPTER = buildCascadeAdapter();
-
-	private static final DeclarationAnnotationElementAdapter<String> FETCH_ADAPTER = buildFetchAdapter();
-	
-	private static final DeclarationAnnotationElementAdapter<Boolean> OPTIONAL_ADAPTER = buildOptionalAdapter();
-	
-	private final AnnotationElementAdapter<Boolean> optionalAdapter;
-
-	private Boolean optional;
-
-	protected ManyToOneImpl(JavaResourcePersistentAttribute parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-		this.optionalAdapter = this.buildBooleanAnnotationElementAdapter(OPTIONAL_ADAPTER);
-	}
-
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.optional = this.optional(astRoot);
-	}
-	
-	//**************** AbstractRelationshipMappingAnnotation implementation **************
-	
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> targetEntityAdapter() {
-		return TARGET_ENTITY_ADAPTER;
-	}
-	
-	@Override
-	protected DeclarationAnnotationElementAdapter<String[]> cascadeAdapter() {
-		return CASCADE_ADAPTER;
-	}
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> fetchAdapter() {
-		return FETCH_ADAPTER;
-	}
-	
-	//**************** Annotation implementation **************
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	
-	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 TextRange getOptionalTextRange(CompilationUnit astRoot) {
-		return getElementTextRange(OPTIONAL_ADAPTER, astRoot);
-	}
-
-	@Override
-	public void updateFromJava(CompilationUnit astRoot) {
-		super.updateFromJava(astRoot);
-		this.setOptional(this.optional(astRoot));
-	}
-	
-	protected Boolean optional(CompilationUnit astRoot) {
-		return this.optionalAdapter.getValue(astRoot);
-	}
-
-	// ********** static methods **********
-	
-	private static DeclarationAnnotationElementAdapter<String> buildTargetEntityAdapter() {
-		return buildTargetEntityAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.MANY_TO_ONE__TARGET_ENTITY);
-	}
-
-	private static DeclarationAnnotationElementAdapter<String[]> buildCascadeAdapter() {
-		return buildEnumArrayAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.MANY_TO_ONE__CASCADE);
-	}
-
-	private static DeclarationAnnotationElementAdapter<String> buildFetchAdapter() {
-		return buildFetchAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.MANY_TO_ONE__FETCH);
-	}
-	
-	private static DeclarationAnnotationElementAdapter<Boolean> buildOptionalAdapter() {
-		return buildOptionalAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.MANY_TO_ONE__OPTIONAL);
-	}
-	
-	private static DeclarationAnnotationElementAdapter<Boolean> buildOptionalAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName) {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(annotationAdapter, elementName, false, BooleanExpressionConverter.instance());
-	}
-
-	
-	public static class ManyToOneAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final ManyToOneAnnotationDefinition INSTANCE = new ManyToOneAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static ManyToOneAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private ManyToOneAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new ManyToOneImpl((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.core/src/org/eclipse/jpt/core/internal/resource/java/MapKeyImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/MapKeyImpl.java
deleted file mode 100644
index 8f99c380e3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/MapKeyImpl.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.MapKeyAnnotation;
-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;
-
-public class MapKeyImpl extends AbstractResourceAnnotation<Attribute> implements MapKeyAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-	
-	private static final DeclarationAnnotationElementAdapter<String> NAME_ADAPTER = buildNameAdapter();
-
-	
-	private final AnnotationElementAdapter<String> nameAdapter;
-
-	private String name;
-	
-	protected MapKeyImpl(JavaResourceNode parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-		this.nameAdapter = new ShortCircuitAnnotationElementAdapter<String>(attribute, NAME_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.name = name(astRoot);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	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 TextRange getNameTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(NAME_ADAPTER, astRoot);
-	}
-
-	public boolean nameTouches(int pos, CompilationUnit astRoot) {
-		return this.elementTouches(NAME_ADAPTER, pos, astRoot);
-	}
-	
-	public void updateFromJava(CompilationUnit astRoot) {
-		this.setName(this.name(astRoot));
-	}
-	
-	protected String name(CompilationUnit astRoot) {
-		return this.nameAdapter.getValue(astRoot);
-	}
-	
-	// ********** static methods **********
-	private static DeclarationAnnotationElementAdapter<String> buildNameAdapter() {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, JPA.MAP_KEY__NAME, false);
-	}
-
-
-	public static class MapKeyAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final MapKeyAnnotationDefinition INSTANCE = new MapKeyAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private MapKeyAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new MapKeyImpl(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.core/src/org/eclipse/jpt/core/internal/resource/java/MappedSuperclassImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/MappedSuperclassImpl.java
deleted file mode 100644
index b3c458714e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/MappedSuperclassImpl.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.resource.java.MappedSuperclassAnnotation;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.core.utility.jdt.Type;
-
-
-public class MappedSuperclassImpl extends AbstractResourceAnnotation<Type> implements MappedSuperclassAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	protected MappedSuperclassImpl(JavaResourcePersistentType parent, Type type) {
-		super(parent, type, DECLARATION_ANNOTATION_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		//nothing to initialize
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		//no annotation members
-	}
-	
-	public static class MappedSuperclassAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final MappedSuperclassAnnotationDefinition INSTANCE = new MappedSuperclassAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static MappedSuperclassAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private MappedSuperclassAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new MappedSuperclassImpl((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.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueriesImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueriesImpl.java
deleted file mode 100644
index 790d1727b3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueriesImpl.java
+++ /dev/null
@@ -1,156 +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.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.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.resource.java.NamedNativeQueriesAnnotation;
-import org.eclipse.jpt.core.resource.java.NamedNativeQueryAnnotation;
-import org.eclipse.jpt.core.resource.java.NestableNamedNativeQuery;
-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.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-public class NamedNativeQueriesImpl extends AbstractResourceAnnotation<Type> implements NamedNativeQueriesAnnotation
-{
-	
-	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private List<NestableNamedNativeQuery> namedNativeQueries;
-	
-	protected NamedNativeQueriesImpl(JavaResourceNode parent, Type type) {
-		super(parent, type, DECLARATION_ANNOTATION_ADAPTER);
-		this.namedNativeQueries = new ArrayList<NestableNamedNativeQuery>();
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		ContainerAnnotationTools.initializeNestedAnnotations(astRoot, this);
-	}
-
-	public String getAnnotationName() {
-		return NamedNativeQueriesAnnotation.ANNOTATION_NAME;
-	}
-
-	public String getNestableAnnotationName() {
-		return NamedNativeQueryAnnotation.ANNOTATION_NAME;
-	}
-
-	public String getElementName() {
-		return "value";
-	}
-		
-	public ListIterator<NestableNamedNativeQuery> nestedAnnotations() {
-		return new CloneListIterator<NestableNamedNativeQuery>(this.namedNativeQueries);
-	}
-	
-	public int nestedAnnotationsSize() {
-		return this.namedNativeQueries.size();
-	}	
-
-	public NestableNamedNativeQuery addInternal(int index) {
-		NestableNamedNativeQuery namedNativeQuery = createNamedNativeQuery(index);
-		this.namedNativeQueries.add(index, namedNativeQuery);
-		return namedNativeQuery;
-	}
-	
-	public NestableNamedNativeQuery add(int index) {
-		NestableNamedNativeQuery namedNativeQuery = createNamedNativeQuery(index);
-		add(index, namedNativeQuery);
-		return namedNativeQuery;
-	}
-	
-	protected void add(int index, NestableNamedNativeQuery query) {
-		addItemToList(index, query, this.namedNativeQueries, NamedNativeQueriesAnnotation.NAMED_NATIVE_QUERIES_LIST);
-	}
-
-	public void remove(NestableNamedNativeQuery query) {
-		removeItemFromList(query, this.namedNativeQueries, NamedNativeQueriesAnnotation.NAMED_NATIVE_QUERIES_LIST);
-	}
-	
-	public void remove(int index) {
-		removeItemFromList(index, this.namedNativeQueries, NamedNativeQueriesAnnotation.NAMED_NATIVE_QUERIES_LIST);
-	}
-	
-	public int indexOf(NestableNamedNativeQuery query) {
-		return this.namedNativeQueries.indexOf(query);
-	}
-	
-	public NestableNamedNativeQuery nestedAnnotationAt(int index) {
-		return this.namedNativeQueries.get(index);
-	}
-	
-	public NestableNamedNativeQuery nestedAnnotationFor(org.eclipse.jdt.core.dom.Annotation jdtAnnotation) {
-		for (NestableNamedNativeQuery namedQuery : this.namedNativeQueries) {
-			if (jdtAnnotation == namedQuery.getJdtAnnotation((CompilationUnit) jdtAnnotation.getRoot())) {
-				return namedQuery;
-			}
-		}
-		return null;
-	}
-	
-	public void move(int targetIndex, int sourceIndex) {
-		moveItemInList(targetIndex, sourceIndex, this.namedNativeQueries, NAMED_NATIVE_QUERIES_LIST);
-	}
-	
-	public void moveInternal(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.namedNativeQueries, targetIndex, sourceIndex);
-	}
-	
-	public void updateFromJava(CompilationUnit astRoot) {
-		ContainerAnnotationTools.updateNestedAnnotationsFromJava(astRoot, this);
-	}
-	
-	private NamedNativeQueryImpl createNamedNativeQuery(int index) {
-		return NamedNativeQueryImpl.createNestedNamedNativeQuery(this, getMember(), index, getDeclarationAnnotationAdapter());
-	}
-
-	
-	public static class NamedNativeQueriesAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final NamedNativeQueriesAnnotationDefinition INSTANCE = new NamedNativeQueriesAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private NamedNativeQueriesAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new NamedNativeQueriesImpl(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.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueryImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueryImpl.java
deleted file mode 100644
index 8f8f87a88f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueryImpl.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.MemberAnnotationAdapter;
-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.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.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.NamedNativeQueryAnnotation;
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.core.resource.java.NestableNamedNativeQuery;
-import org.eclipse.jpt.core.resource.java.NestableQueryHint;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationAdapter;
-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.core.utility.jdt.Type;
-
-public class NamedNativeQueryImpl extends AbstractNamedQuery
-	implements NestableNamedNativeQuery
-{
-
-	public static final SimpleDeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	// hold this so we can get the 'resultClass' text range
-	private final DeclarationAnnotationElementAdapter<String> resultClassDeclarationAdapter;
-
-	// hold this so we can get the 'resultSetMapping' text range
-	private final DeclarationAnnotationElementAdapter<String> resultSetMappingDeclarationAdapter;
-
-
-	private final AnnotationElementAdapter<String> resultClassAdapter;
-
-	private final AnnotationElementAdapter<String> resultSetMappingAdapter;
-
-	private String resultClass;
-	
-	private String fullyQualifiedResultClass;
-	
-	private String resultSetMapping;
-	
-	protected NamedNativeQueryImpl(JavaResourceNode parent, Type type, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) {
-		super(parent, type, daa, annotationAdapter);
-		this.resultClassDeclarationAdapter = resultClassAdapter(daa);
-		this.resultClassAdapter = this.buildAdapter(this.resultClassDeclarationAdapter);
-		this.resultSetMappingDeclarationAdapter = resultSetMappingAdapter(daa);
-		this.resultSetMappingAdapter = this.buildAdapter(this.resultSetMappingDeclarationAdapter);
-	}
-
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.resultClass = this.resultClass(astRoot);
-		this.fullyQualifiedResultClass = this.fullyQualifiedResultClass(astRoot);
-		this.resultSetMapping = this.resultSetMapping(astRoot);
-	}
-	
-
-	// ********** initialization **********
-	protected DeclarationAnnotationElementAdapter<String> resultClassAdapter(DeclarationAnnotationAdapter daa) {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(daa, JPA.NAMED_NATIVE_QUERY__RESULT_CLASS, SimpleTypeStringExpressionConverter.instance());
-	}
-
-	protected DeclarationAnnotationElementAdapter<String> resultSetMappingAdapter(DeclarationAnnotationAdapter daa) {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(daa, JPA.NAMED_NATIVE_QUERY__RESULT_SET_MAPPING);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	//************* AbstractNamedQuery implementation *************
-
-	@Override
-	protected String nameElementName() {
-		return JPA.NAMED_NATIVE_QUERY__NAME;
-	}
-
-	@Override
-	protected String queryElementName() {
-		return JPA.NAMED_NATIVE_QUERY__QUERY;
-	}
-	
-	@Override
-	public void initializeFrom(NestableAnnotation oldAnnotation) {
-		super.initializeFrom(oldAnnotation);
-		NamedNativeQueryAnnotation oldNamedQuery = (NamedNativeQueryAnnotation) oldAnnotation;
-		setResultClass(oldNamedQuery.getResultClass());
-		setResultSetMapping(oldNamedQuery.getResultSetMapping());
-	}
-	
-	public String getResultClass() {
-		return this.resultClass;
-	}
-	
-	public void setResultClass(String newResultClass) {
-		if (attributeValueHasNotChanged(this.resultClass, newResultClass)) {
-			return;
-		}
-		String oldResultClass = this.resultClass;
-		this.resultClass = newResultClass;
-		this.resultClassAdapter.setValue(newResultClass);
-		firePropertyChanged(RESULT_CLASS_PROPERTY, oldResultClass, newResultClass);
-	}
-	
-	public String getFullyQualifiedResultClass()  {
-		return this.fullyQualifiedResultClass;
-	}
-	
-	protected void setFullyQualifiedResultClass(String newQualifiedResultClass) {
-		String oldFullyQualifiedResultClass = this.fullyQualifiedResultClass;
-		this.fullyQualifiedResultClass = newQualifiedResultClass;
-		firePropertyChanged(FULLY_QUALIFIED_RESULT_CLASS_PROPERTY, oldFullyQualifiedResultClass, newQualifiedResultClass);
-	}
-
-	public String getResultSetMapping() {
-		return this.resultSetMapping;
-	}
-	
-	public void setResultSetMapping(String newResultSetMapping) {
-		if (attributeValueHasNotChanged(this.resultSetMapping, newResultSetMapping)) {
-			return;
-		}
-		String oldResultSetMapping = this.resultSetMapping;
-		this.resultSetMapping = newResultSetMapping;
-		this.resultSetMappingAdapter.setValue(newResultSetMapping);
-		firePropertyChanged(RESULT_SET_MAPPING_PROPERTY, oldResultSetMapping, newResultSetMapping);
-	}
-
-	public TextRange getResultClassTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.resultClassDeclarationAdapter, astRoot);
-	}
-	
-	public TextRange getResultSetMappingTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.resultSetMappingDeclarationAdapter, astRoot);
-	}
-	
-	@Override
-	public void updateFromJava(CompilationUnit astRoot) {
-		super.updateFromJava(astRoot);
-		this.setResultClass(this.resultClass(astRoot));
-		this.setFullyQualifiedResultClass(this.fullyQualifiedResultClass(astRoot));
-		this.setResultSetMapping(this.resultSetMapping(astRoot));
-	}
-
-	protected String resultClass(CompilationUnit astRoot) {
-		return this.resultClassAdapter.getValue(astRoot);
-	}
-	
-	protected String resultSetMapping(CompilationUnit astRoot) {
-		return this.resultSetMappingAdapter.getValue(astRoot);
-	}
-	
-	protected String fullyQualifiedResultClass(CompilationUnit astRoot) {
-		if (getResultClass() == null) {
-			return null;
-		}
-		return JDTTools.resolveFullyQualifiedName(this.resultClassAdapter.getExpression(astRoot));
-	}
-
-	@Override
-	protected NestableQueryHint createQueryHint(int index) {
-		return QueryHintImpl.createNamedNativeQueryQueryHint(this, this.getMember(), this.getDeclarationAnnotationAdapter(), index);
-	}
-
-	// ********** static methods **********
-	static NamedNativeQueryImpl createNamedNativeQuery(JavaResourceNode parent, Type type) {
-		return new NamedNativeQueryImpl(parent, type, DECLARATION_ANNOTATION_ADAPTER, new MemberAnnotationAdapter(type, DECLARATION_ANNOTATION_ADAPTER));
-	}
-
-	static NamedNativeQueryImpl createNestedNamedNativeQuery(JavaResourceNode parent, Type type, int index, DeclarationAnnotationAdapter attributeOverridesAdapter) {
-		IndexedDeclarationAnnotationAdapter idaa = buildNestedDeclarationAnnotationAdapter(index, attributeOverridesAdapter);
-		IndexedAnnotationAdapter annotationAdapter = new MemberIndexedAnnotationAdapter(type, idaa);
-		return new NamedNativeQueryImpl(parent, type, idaa, annotationAdapter);
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildNestedDeclarationAnnotationAdapter(int index, DeclarationAnnotationAdapter namedQueriesAdapter) {
-		return new NestedIndexedDeclarationAnnotationAdapter(namedQueriesAdapter, index, JPA.NAMED_NATIVE_QUERY);
-	}
-	
-	public static class NamedNativeQueryAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final NamedNativeQueryAnnotationDefinition INSTANCE = new NamedNativeQueryAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private NamedNativeQueryAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return NamedNativeQueryImpl.createNamedNativeQuery(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.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueriesImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueriesImpl.java
deleted file mode 100644
index 503cd6fe62..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueriesImpl.java
+++ /dev/null
@@ -1,155 +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.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.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.resource.java.NamedQueriesAnnotation;
-import org.eclipse.jpt.core.resource.java.NamedQueryAnnotation;
-import org.eclipse.jpt.core.resource.java.NestableNamedQuery;
-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.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-public class NamedQueriesImpl extends AbstractResourceAnnotation<Type> implements NamedQueriesAnnotation
-{
-	
-	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(NamedQueriesAnnotation.ANNOTATION_NAME);
-
-	private List<NestableNamedQuery> namedQueries;
-	
-	protected NamedQueriesImpl(JavaResourceNode parent, Type type) {
-		super(parent, type, DECLARATION_ANNOTATION_ADAPTER);
-		this.namedQueries = new ArrayList<NestableNamedQuery>();
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		ContainerAnnotationTools.initializeNestedAnnotations(astRoot, this);
-	}
-	
-	public String getAnnotationName() {
-		return NamedQueriesAnnotation.ANNOTATION_NAME;
-	}
-
-	public String getNestableAnnotationName() {
-		return NamedQueryAnnotation.ANNOTATION_NAME;
-	}
-
-	public String getElementName() {
-		return "value";
-	}
-		
-	public ListIterator<NestableNamedQuery> nestedAnnotations() {
-		return new CloneListIterator<NestableNamedQuery>(this.namedQueries);
-	}
-	
-	public int nestedAnnotationsSize() {
-		return this.namedQueries.size();
-	}	
-
-	public NestableNamedQuery addInternal(int index) {
-		NestableNamedQuery namedQuery = createNamedQuery(index);
-		this.namedQueries.add(index, namedQuery);
-		return namedQuery;
-	}
-	
-	public NestableNamedQuery add(int index) {
-		NestableNamedQuery namedQuery = createNamedQuery(index);
-		add(index, namedQuery);
-		return namedQuery;
-	}
-	
-	protected void add(int index, NestableNamedQuery namedQuery) {
-		addItemToList(index, namedQuery, this.namedQueries, NamedQueriesAnnotation.NAMED_QUERIES_LIST);
-	}
-
-	public void remove(NestableNamedQuery namedQuery) {
-		removeItemFromList(namedQuery, this.namedQueries, NamedQueriesAnnotation.NAMED_QUERIES_LIST);
-	}
-	
-	public void remove(int index) {
-		removeItemFromList(index, this.namedQueries, NamedQueriesAnnotation.NAMED_QUERIES_LIST);
-	}
-	
-	public int indexOf(NestableNamedQuery attributeOverride) {
-		return this.namedQueries.indexOf(attributeOverride);
-	}
-	
-	public NestableNamedQuery nestedAnnotationAt(int index) {
-		return this.namedQueries.get(index);
-	}
-	
-	public NestableNamedQuery nestedAnnotationFor(org.eclipse.jdt.core.dom.Annotation jdtAnnotation) {
-		for (NestableNamedQuery namedQuery : this.namedQueries) {
-			if (jdtAnnotation == namedQuery.getJdtAnnotation((CompilationUnit) jdtAnnotation.getRoot())) {
-				return namedQuery;
-			}
-		}
-		return null;
-	}
-	
-	public void move(int targetIndex, int sourceIndex) {
-		moveItemInList(targetIndex, sourceIndex, this.namedQueries, NamedQueriesAnnotation.NAMED_QUERIES_LIST);
-	}
-	
-	public void moveInternal(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.namedQueries, targetIndex, sourceIndex);
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		ContainerAnnotationTools.updateNestedAnnotationsFromJava(astRoot, this);
-	}
-	
-	private NamedQueryImpl createNamedQuery(int index) {
-		return NamedQueryImpl.createNestedNamedQuery(this, getMember(), index, getDeclarationAnnotationAdapter());
-	}
-
-	public static class NamedQueriesAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final NamedQueriesAnnotationDefinition INSTANCE = new NamedQueriesAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private NamedQueriesAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new NamedQueriesImpl(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.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueryImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueryImpl.java
deleted file mode 100644
index ae1c4f09f4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueryImpl.java
+++ /dev/null
@@ -1,107 +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.core.internal.resource.java;
-
-import org.eclipse.jpt.core.internal.utility.jdt.MemberAnnotationAdapter;
-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.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.NestableNamedQuery;
-import org.eclipse.jpt.core.resource.java.NestableQueryHint;
-import org.eclipse.jpt.core.utility.jdt.AnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-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.core.utility.jdt.Type;
-
-public class NamedQueryImpl extends AbstractNamedQuery
-	implements NestableNamedQuery
-{
-
-	public static final SimpleDeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	protected NamedQueryImpl(JavaResourceNode parent, Type type, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) {
-		super(parent, type, daa, annotationAdapter);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	//************* AbstractNamedQuery implementation *************
-	@Override
-	protected String nameElementName() {
-		return JPA.NAMED_QUERY__NAME;
-	}
-	
-	@Override
-	protected String queryElementName() {
-		return JPA.NAMED_QUERY__QUERY;
-	}
-	
-	@Override
-	protected NestableQueryHint createQueryHint(int index) {
-		return QueryHintImpl.createNamedQueryQueryHint(this, getMember(), this.getDeclarationAnnotationAdapter(), index);
-	}
-
-	// ********** static methods **********
-	static NamedQueryImpl createNamedQuery(JavaResourceNode parent, Type type) {
-		return new NamedQueryImpl(parent, type, DECLARATION_ANNOTATION_ADAPTER, new MemberAnnotationAdapter(type, DECLARATION_ANNOTATION_ADAPTER));
-	}
-
-	static NamedQueryImpl createNestedNamedQuery(JavaResourceNode parent, Type type, int index, DeclarationAnnotationAdapter attributeOverridesAdapter) {
-		IndexedDeclarationAnnotationAdapter idaa = buildNestedDeclarationAnnotationAdapter(index, attributeOverridesAdapter);
-		IndexedAnnotationAdapter annotationAdapter = new MemberIndexedAnnotationAdapter(type, idaa);
-		return new NamedQueryImpl(parent, type, idaa, annotationAdapter);
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildNestedDeclarationAnnotationAdapter(int index, DeclarationAnnotationAdapter namedQueriesAdapter) {
-		return new NestedIndexedDeclarationAnnotationAdapter(namedQueriesAdapter, index, JPA.NAMED_QUERY);
-	}
-
-	public static class NamedQueryAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final NamedQueryAnnotationDefinition INSTANCE = new NamedQueryAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private NamedQueryAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return NamedQueryImpl.createNamedQuery(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.core/src/org/eclipse/jpt/core/internal/resource/java/NullAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAssociationOverride.java
deleted file mode 100644
index 7628b8ac81..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAssociationOverride.java
+++ /dev/null
@@ -1,116 +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.core.internal.resource.java;
-
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-
-
-public class NullAssociationOverride extends AbstractJavaResourceNode implements AssociationOverrideAnnotation, Annotation
-{	
-	private String name;
-
-	public NullAssociationOverride(JavaResourceNode parent, String name) {
-		super(parent);
-		this.name = 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();
-	}
-
-	public String getAnnotationName() {
-		return AssociationOverrideAnnotation.ANNOTATION_NAME;
-	}
-
-	public String getName() {
-		return this.name;
-	}
-	
-	public void setName(String name) {
-		if (name != null) {
-			createAssociationOverrideResource().setName(name);
-		}		
-	}
-
-	public ListIterator<JoinColumnAnnotation> joinColumns() {
-		return EmptyListIterator.instance();
-	}
-	
-	public JoinColumnAnnotation joinColumnAt(int index) {
-		return null;
-	}
-	
-	public int indexOfJoinColumn(JoinColumnAnnotation joinColumn) {
-		throw new UnsupportedOperationException();
-	}
-	
-	public int joinColumnsSize() {
-		return 0;
-	}
-	
-	public JoinColumnAnnotation addJoinColumn(int index) {
-		throw new UnsupportedOperationException();
-	}
-	
-	public void removeJoinColumn(int index) {
-		throw new UnsupportedOperationException();
-	}
-	
-	public void moveJoinColumn(int targetIndex, int sourceIndex) {
-		throw new UnsupportedOperationException();
-	}
-	
-	@Override
-	public JavaResourcePersistentMember getParent() {
-		return (JavaResourcePersistentMember) super.getParent();
-	}
-	
-	protected AssociationOverrideAnnotation createAssociationOverrideResource() {
-		return (AssociationOverrideAnnotation) getParent().addAnnotation(getAnnotationName());
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	
-	}
-
-	public boolean nameTouches(int pos, CompilationUnit astRoot) {
-		return false;
-	}
-	
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	public TextRange getTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverrideColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverrideColumn.java
deleted file mode 100644
index b73262e6a2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverrideColumn.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation;
-import org.eclipse.jpt.core.resource.java.ColumnAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-public class NullAttributeOverrideColumn extends NullBaseColumn implements ColumnAnnotation, Annotation
-{	
-	public NullAttributeOverrideColumn(AttributeOverrideAnnotation parent) {
-		super(parent);
-	}
-
-	@Override
-	public AttributeOverrideAnnotation getParent() {
-		return (AttributeOverrideAnnotation) super.getParent();
-	}
-	
-	public String getAnnotationName() {
-		return ColumnAnnotation.ANNOTATION_NAME;
-	}
-
-	@Override
-	protected ColumnAnnotation createColumnResource() {
-		return getParent().addColumn();
-	}
-
-	public Integer getLength() {
-		return null;
-	}
-	
-	public void setLength(Integer length) {
-		if (length != null) {
-			createColumnResource().setLength(length);
-		}
-	}
-	
-	public Integer getScale() {
-		return null;
-	}
-	
-	public void setScale(Integer scale) {
-		if (scale != null) {
-			createColumnResource().setScale(scale);
-		}
-	}
-	
-	public Integer getPrecision() {
-		return null;
-	}
-	
-	public void setPrecision(Integer precision) {
-		if (precision != null) {
-			createColumnResource().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.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseColumn.java
deleted file mode 100644
index 3639b674e1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseColumn.java
+++ /dev/null
@@ -1,101 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.BaseColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-public abstract class NullBaseColumn extends NullNamedColumn implements BaseColumnAnnotation, Annotation
-{	
-	protected NullBaseColumn(JavaResourceNode parent) {
-		super(parent);
-	}
-
-	@Override
-	protected abstract BaseColumnAnnotation createColumnResource();
-
-	public String getTable() {
-		return null;
-	}
-	
-	public void setTable(String table) {
-		if (table != null) {
-			createColumnResource().setTable(table);
-		}
-	}
-	
-	public Boolean getUnique() {
-		return null;
-	}
-	
-	public void setUnique(Boolean unique) {
-		if (unique != null) {
-			createColumnResource().setUnique(unique);
-		}
-	}
-	
-	public Boolean getUpdatable() {
-		return null;
-	}
-	
-	public void setUpdatable(Boolean updatable) {
-		if (updatable != null) {
-			createColumnResource().setUpdatable(updatable);
-		}
-	}
-	
-	public Boolean getInsertable() {
-		return null;
-	}
-	
-	public void setInsertable(Boolean insertable) {
-		if (insertable != null) {
-			createColumnResource().setInsertable(insertable);
-		}
-	}
-	
-	public Boolean getNullable() {
-		return null;
-	}
-	
-	public void setNullable(Boolean nullable) {
-		if (nullable != null) {
-			createColumnResource().setNullable(nullable);
-		}
-	}
-	
-	public TextRange getTableTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public TextRange getUniqueTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public TextRange getUpdatableTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public TextRange getInsertableTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public TextRange getNullableTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public boolean tableTouches(int pos, CompilationUnit astRoot) {
-		return false;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseTable.java
deleted file mode 100644
index f63ef02307..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseTable.java
+++ /dev/null
@@ -1,141 +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.core.internal.resource.java;
-
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.TableAnnotation;
-import org.eclipse.jpt.core.resource.java.UniqueConstraintAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-
-public abstract class NullBaseTable extends AbstractJavaResourceNode implements Annotation
-{
-	protected NullBaseTable(JavaResourcePersistentMember parent) {
-		super(parent);
-	}
-	
-	@Override
-	public JavaResourcePersistentMember getParent() {
-		return (JavaResourcePersistentMember) super.getParent();
-	}
-	
-	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 TableAnnotation createTableResource() {
-		return (TableAnnotation) getParent().addAnnotation(getAnnotationName());
-	}
-	
-	public String getName() {
-		return null;
-	}
-	
-	public void setName(String name) {
-		if (name != null) {
-			createTableResource().setName(name);
-		}
-	}
-
-	public String getCatalog() {
-		return null;
-	}
-	
-	public void setCatalog(String catalog) {
-		if (catalog != null) {
-			createTableResource().setCatalog(catalog);
-		}
-	}
-
-	public String getSchema() {
-		return null;
-	}
-	
-	public void setSchema(String schema) {
-		if (schema != null) {
-			createTableResource().setSchema(schema);
-		}
-	}
-
-	public UniqueConstraintAnnotation addUniqueConstraint(int index) {
-		return createTableResource().addUniqueConstraint(index);		
-	}
-
-	public void removeUniqueConstraint(int index) {
-		throw new UnsupportedOperationException();
-	}
-
-	public int indexOfUniqueConstraint(UniqueConstraintAnnotation uniqueConstraint) {
-		throw new UnsupportedOperationException();
-	}
-
-	public void moveUniqueConstraint(int targetIndex, int sourceIndex) {
-		throw new UnsupportedOperationException();
-	}
-	public UniqueConstraintAnnotation uniqueConstraintAt(int index) {
-		throw new UnsupportedOperationException();
-	}
-
-	public ListIterator<UniqueConstraintAnnotation> uniqueConstraints() {
-		return EmptyListIterator.instance();
-	}
-
-	public int uniqueConstraintsSize() {
-		return 0;
-	}
-
-	public TextRange getTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	public TextRange getCatalogTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	public TextRange getSchemaTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	public boolean nameTouches(int pos, CompilationUnit astRoot) {
-		return false;
-	}
-
-	public boolean catalogTouches(int pos, CompilationUnit astRoot) {
-		return false;
-	}
-
-	public boolean schemaTouches(int pos, CompilationUnit astRoot) {
-		return false;
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBasic.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBasic.java
deleted file mode 100644
index 0ff7116ecd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBasic.java
+++ /dev/null
@@ -1,91 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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;
-
-
-public class NullBasic extends AbstractJavaResourceNode implements BasicAnnotation, Annotation
-{	
-	protected NullBasic(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 BasicAnnotation.ANNOTATION_NAME;
-	}
-	
-	@Override
-	public JavaResourcePersistentMember getParent() {
-		return (JavaResourcePersistentMember) super.getParent();
-	}
-	
-	protected BasicAnnotation createBasicResource() {
-		getParent().setMappingAnnotation(getAnnotationName());
-		return (BasicAnnotation) getParent().getMappingAnnotation();
-	}
-
-	public FetchType getFetch() {
-		return null;
-	}
-	
-	public void setFetch(FetchType fetch) {
-		if (fetch != null) {
-			createBasicResource().setFetch(fetch);
-		}				
-	}
-	
-	public Boolean getOptional() {
-		return null;
-	}
-
-	public void setOptional(Boolean optional) {
-		if (optional != null) {
-			createBasicResource().setOptional(optional);
-		}				
-	}
-
-	public void updateFromJava(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.core/src/org/eclipse/jpt/core/internal/resource/java/NullColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullColumn.java
deleted file mode 100644
index 9691145c81..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullColumn.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.ColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-public class NullColumn extends NullBaseColumn implements ColumnAnnotation, Annotation
-{	
-	public NullColumn(JavaResourcePersistentMember parent) {
-		super(parent);
-	}
-
-	@Override
-	public JavaResourcePersistentMember getParent() {
-		return (JavaResourcePersistentMember) super.getParent();
-	}
-	
-	public String getAnnotationName() {
-		return ColumnAnnotation.ANNOTATION_NAME;
-	}
-
-	@Override
-	protected ColumnAnnotation createColumnResource() {
-		return (ColumnAnnotation) getParent().addAnnotation(getAnnotationName());
-	}
-
-	public Integer getLength() {
-		return null;
-	}
-	
-	public void setLength(Integer length) {
-		if (length != null) {
-			createColumnResource().setLength(length);
-		}
-	}
-	
-	public Integer getScale() {
-		return null;
-	}
-	
-	public void setScale(Integer scale) {
-		if (scale != null) {
-			createColumnResource().setScale(scale);
-		}
-	}
-	
-	public Integer getPrecision() {
-		return null;
-	}
-	
-	public void setPrecision(Integer precision) {
-		if (precision != null) {
-			createColumnResource().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.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorColumn.java
deleted file mode 100644
index 5f00a9132d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorColumn.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.core.internal.resource.java;
-
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.DiscriminatorColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.DiscriminatorType;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-
-
-
-public class NullDiscriminatorColumn extends NullNamedColumn implements DiscriminatorColumnAnnotation, Annotation
-{	
-	public NullDiscriminatorColumn(JavaResourcePersistentMember parent) {
-		super(parent);
-	}
-	
-	@Override
-	public JavaResourcePersistentMember getParent() {
-		return (JavaResourcePersistentMember) super.getParent();
-	}
-
-	public String getAnnotationName() {
-		return DiscriminatorColumnAnnotation.ANNOTATION_NAME;
-	}
-
-	@Override
-	protected DiscriminatorColumnAnnotation createColumnResource() {
-		return (DiscriminatorColumnAnnotation) getParent().addAnnotation(getAnnotationName());
-	}
-
-	public DiscriminatorType getDiscriminatorType() {
-		return null;
-	}
-
-	public void setDiscriminatorType(DiscriminatorType discriminatorType) {
-		if (discriminatorType != null) {
-			createColumnResource().setDiscriminatorType(discriminatorType);
-		}
-	}
-
-	public Integer getLength() {
-		return null;
-	}
-
-	public void setLength(Integer length) {
-		if (length != null) {
-			createColumnResource().setLength(length);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorValue.java
deleted file mode 100644
index 945c98b120..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorValue.java
+++ /dev/null
@@ -1,77 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.DiscriminatorValueAnnotation;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-public class NullDiscriminatorValue extends AbstractJavaResourceNode implements DiscriminatorValueAnnotation, Annotation
-{	
-	protected NullDiscriminatorValue(JavaResourcePersistentMember parent) {
-		super(parent);
-	}
-	
-	@Override
-	public JavaResourcePersistentMember getParent() {
-		return (JavaResourcePersistentMember) super.getParent();
-	}
-
-	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 DiscriminatorValueAnnotation.ANNOTATION_NAME;
-	}
-
-	public String getValue() {
-		return null;
-	}
-	
-	public void setValue(String value) {
-		if (value != null) {
-			createDiscriminatorValueResource().setValue(value);
-		}		
-	}
-	
-	protected DiscriminatorValueAnnotation createDiscriminatorValueResource() {
-		return (DiscriminatorValueAnnotation) getParent().addAnnotation(getAnnotationName());
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	public TextRange getTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEmbedded.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEmbedded.java
deleted file mode 100644
index 6c0f861a1f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEmbedded.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.EmbeddedAnnotation;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-public class NullEmbedded extends AbstractJavaResourceNode implements EmbeddedAnnotation, Annotation
-{	
-	protected NullEmbedded(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 EmbeddedAnnotation.ANNOTATION_NAME;
-	}
-	
-	@Override
-	public JavaResourcePersistentMember getParent() {
-		return (JavaResourcePersistentMember) super.getParent();
-	}
-
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	public TextRange getTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEnumerated.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEnumerated.java
deleted file mode 100644
index 3b77650cfa..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEnumerated.java
+++ /dev/null
@@ -1,77 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.EnumType;
-import org.eclipse.jpt.core.resource.java.EnumeratedAnnotation;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-public class NullEnumerated extends AbstractJavaResourceNode implements EnumeratedAnnotation, Annotation
-{	
-	protected NullEnumerated(JavaResourcePersistentMember parent) {
-		super(parent);
-	}
-
-	@Override
-	public JavaResourcePersistentMember getParent() {
-		return (JavaResourcePersistentMember) super.getParent();
-	}
-
-	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 EnumeratedAnnotation.ANNOTATION_NAME;
-	}
-		
-	protected EnumeratedAnnotation createEnumeratedResource() {
-		return (EnumeratedAnnotation) getParent().addAnnotation(getAnnotationName());
-	}
-
-
-	public EnumType getValue() {
-		return null;
-	}
-	
-	public void setValue(EnumType value) {
-		if (value != null) {
-			createEnumeratedResource().setValue(value);
-		}		
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	public TextRange getTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullInheritance.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullInheritance.java
deleted file mode 100644
index 8bed7fb107..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullInheritance.java
+++ /dev/null
@@ -1,79 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.InheritanceAnnotation;
-import org.eclipse.jpt.core.resource.java.InheritanceType;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-public class NullInheritance extends AbstractJavaResourceNode implements InheritanceAnnotation, Annotation
-{	
-	protected NullInheritance(JavaResourcePersistentMember parent) {
-		super(parent);
-	}
-	
-	@Override
-	public JavaResourcePersistentMember getParent() {
-		return (JavaResourcePersistentMember) super.getParent();
-	}
-
-	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 InheritanceAnnotation.ANNOTATION_NAME;
-	}
-
-	public InheritanceType getStrategy() {
-		return null;
-	}
-
-	public void setStrategy(InheritanceType strategy) {
-		if (strategy != null) {
-			createInheritanceResource().setStrategy(strategy);
-		}
-		
-	}
-	
-	protected InheritanceAnnotation createInheritanceResource() {
-		return (InheritanceAnnotation) getParent().addAnnotation(getAnnotationName());
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	
-	}
-
-	public TextRange getStrategyTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	public TextRange getTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinColumn.java
deleted file mode 100644
index 4fc798cf24..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinColumn.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-
-public class NullJoinColumn extends NullBaseColumn implements JoinColumnAnnotation, Annotation
-{	
-	public NullJoinColumn(JavaResourceNode parent) {
-		super(parent);
-	}
-
-	public String getAnnotationName() {
-		return JoinColumnAnnotation.ANNOTATION_NAME;
-	}
-
-	@Override
-	protected JoinColumnAnnotation createColumnResource() {
-		throw new UnsupportedOperationException();
-	}
-
-	public String getReferencedColumnName() {
-		return null;
-	}
-
-	public void setReferencedColumnName(String referencedColumnName) {
-		throw new UnsupportedOperationException();
-	}
-
-	public TextRange getReferencedColumnNameTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public boolean referencedColumnNameTouches(int pos, CompilationUnit astRoot) {
-		return false;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinTable.java
deleted file mode 100644
index cd6098a296..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinTable.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.core.internal.resource.java;
-
-import java.util.ListIterator;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.JoinTableAnnotation;
-import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
-
-
-public class NullJoinTable extends NullBaseTable implements JoinTableAnnotation
-{	
-	protected NullJoinTable(JavaResourcePersistentMember parent) {
-		super(parent);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public JoinColumnAnnotation addInverseJoinColumn(int index) {
-		throw new UnsupportedOperationException();
-	}
-
-	public JoinColumnAnnotation addJoinColumn(int index) {
-		throw new UnsupportedOperationException();
-	}
-
-	public int indexOfInverseJoinColumn(JoinColumnAnnotation joinColumn) {
-		throw new UnsupportedOperationException();
-	}
-
-	public int indexOfJoinColumn(JoinColumnAnnotation joinColumn) {
-		throw new UnsupportedOperationException();
-	}
-
-	public JoinColumnAnnotation inverseJoinColumnAt(int index) {
-		return null;
-	}
-
-	public ListIterator<JoinColumnAnnotation> inverseJoinColumns() {
-		return EmptyListIterator.instance();
-	}
-
-	public int inverseJoinColumnsSize() {
-		return 0;
-	}
-
-	public JoinColumnAnnotation joinColumnAt(int index) {
-		return null;
-	}
-
-	public ListIterator<JoinColumnAnnotation> joinColumns() {
-		return EmptyListIterator.instance();
-	}
-
-	public int joinColumnsSize() {
-		return 0;
-	}
-
-	public void moveInverseJoinColumn(int targetIndex, int sourceIndex) {
-		throw new UnsupportedOperationException();
-	}
-
-	public void moveJoinColumn(int targetIndex, int sourceIndex) {
-		throw new UnsupportedOperationException();
-	}
-
-	public void removeInverseJoinColumn(int index) {
-		throw new UnsupportedOperationException();
-	}
-
-	public void removeJoinColumn(int index) {
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullNamedColumn.java
deleted file mode 100644
index 1f34617f07..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullNamedColumn.java
+++ /dev/null
@@ -1,82 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.NamedColumnAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-public abstract class NullNamedColumn extends AbstractJavaResourceNode implements NamedColumnAnnotation, Annotation
-{	
-	protected NullNamedColumn(JavaResourceNode 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();
-	}
-	
-	protected abstract NamedColumnAnnotation createColumnResource();
-
-	public String getName() {
-		return null;
-	}
-	
-	public void setName(String name) {
-		if (name != null) {
-			createColumnResource().setName(name);
-		}		
-	}
-
-	public String getColumnDefinition() {
-		return null;
-	}
-	
-	public void setColumnDefinition(String columnDefinition) {
-		if (columnDefinition != null) {
-			createColumnResource().setColumnDefinition(columnDefinition);
-		}		
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	public TextRange getTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	public TextRange getColumnDefinitionTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	public boolean nameTouches(int pos, CompilationUnit astRoot) {
-		return false;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullPrimaryKeyJoinColumn.java
deleted file mode 100644
index d7d91f1387..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullPrimaryKeyJoinColumn.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-
-public class NullPrimaryKeyJoinColumn extends NullNamedColumn implements PrimaryKeyJoinColumnAnnotation, Annotation
-{	
-	public NullPrimaryKeyJoinColumn(JavaResourceNode parent) {
-		super(parent);
-	}
-
-	public String getAnnotationName() {
-		return PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME;
-	}
-
-	@Override
-	protected PrimaryKeyJoinColumnAnnotation createColumnResource() {
-		throw new UnsupportedOperationException();
-	}
-
-	public String getReferencedColumnName() {
-		return null;
-	}
-
-	public void setReferencedColumnName(String referencedColumnName) {
-		throw new UnsupportedOperationException();
-	}
-
-	public TextRange getReferencedColumnNameTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	public boolean referencedColumnNameTouches(int pos, CompilationUnit astRoot) {
-		return false;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTable.java
deleted file mode 100644
index 1d5f9f6185..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTable.java
+++ /dev/null
@@ -1,28 +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.core.internal.resource.java;
-
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.TableAnnotation;
-
-
-public class NullTable extends NullBaseTable implements TableAnnotation
-{	
-	protected NullTable(JavaResourcePersistentMember parent) {
-		super(parent);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTemporal.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTemporal.java
deleted file mode 100644
index 57ad7f4984..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTemporal.java
+++ /dev/null
@@ -1,77 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.TemporalAnnotation;
-import org.eclipse.jpt.core.resource.java.TemporalType;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-public class NullTemporal extends AbstractJavaResourceNode implements TemporalAnnotation, Annotation
-{	
-	protected NullTemporal(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 TemporalAnnotation.ANNOTATION_NAME;
-	}
-	
-	@Override
-	public JavaResourcePersistentMember getParent() {
-		return (JavaResourcePersistentMember) super.getParent();
-	}
-	
-	protected TemporalAnnotation createTemporalResource() {
-		return (TemporalAnnotation) getParent().addAnnotation(getAnnotationName());
-	}
-
-
-	public TemporalType getValue() {
-		return null;
-	}
-	
-	public void setValue(TemporalType value) {
-		if (value != null) {
-			createTemporalResource().setValue(value);
-		}		
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	public TextRange getTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OneToManyImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OneToManyImpl.java
deleted file mode 100644
index 5eeb3f6715..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OneToManyImpl.java
+++ /dev/null
@@ -1,161 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-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.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.OneToManyAnnotation;
-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;
-
-public class OneToManyImpl extends AbstractRelationshipMappingAnnotation implements OneToManyAnnotation
-{	
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> TARGET_ENTITY_ADAPTER = buildTargetEntityAdapter();	
-
-	private static final DeclarationAnnotationElementAdapter<String[]> CASCADE_ADAPTER = buildCascadeAdapter();
-
-	private static final DeclarationAnnotationElementAdapter<String> FETCH_ADAPTER = buildFetchAdapter();
-
-	private static final DeclarationAnnotationElementAdapter<String> MAPPED_BY_ADAPTER = buildMappedByAdapter();	
-
-	private final AnnotationElementAdapter<String> mappedByAdapter;
-
-	private String mappedBy;
-
-	protected OneToManyImpl(JavaResourcePersistentAttribute parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-		this.mappedByAdapter = buildAnnotationElementAdapter(MAPPED_BY_ADAPTER);
-	}
-	
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.mappedBy = this.mappedBy(astRoot);
-	}
-	
-	//**************** AbstractRelationshipMappingAnnotation implementation **************
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> targetEntityAdapter() {
-		return TARGET_ENTITY_ADAPTER;
-	}
-	
-	@Override
-	protected DeclarationAnnotationElementAdapter<String[]> cascadeAdapter() {
-		return CASCADE_ADAPTER;
-	}
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> fetchAdapter() {
-		return FETCH_ADAPTER;
-	}
-	
-	//**************** Annotation implementation **************
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	
-	public String getMappedBy() {
-		return this.mappedBy;
-	}
-	
-	public void setMappedBy(String newMappedBy) {
-		if (attributeValueHasNotChanged(this.mappedBy, newMappedBy)) {
-			return;
-		}
-		String oldMappedBy = this.mappedBy;
-		this.mappedBy = newMappedBy;
-		this.mappedByAdapter.setValue(newMappedBy);
-		firePropertyChanged(MAPPED_BY_PROPERTY, oldMappedBy, newMappedBy);
-	}
-	
-	public TextRange getMappedByTextRange(CompilationUnit astRoot) {
-		return getElementTextRange(MAPPED_BY_ADAPTER, astRoot);
-	}
-
-	public boolean mappedByTouches(int pos, CompilationUnit astRoot) {
-		return this.elementTouches(MAPPED_BY_ADAPTER, pos, astRoot);
-	}
-
-	@Override
-	public void updateFromJava(CompilationUnit astRoot) {
-		super.updateFromJava(astRoot);
-		this.setMappedBy(this.mappedBy(astRoot));
-	}
-
-	protected String mappedBy(CompilationUnit astRoot) {
-		return this.mappedByAdapter.getValue(astRoot);
-	}
-	
-	// ********** static methods **********
-
-	private static DeclarationAnnotationElementAdapter<String> buildTargetEntityAdapter() {
-		return buildTargetEntityAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.ONE_TO_MANY__TARGET_ENTITY);
-	}
-
-	private static DeclarationAnnotationElementAdapter<String[]> buildCascadeAdapter() {
-		return buildEnumArrayAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.ONE_TO_MANY__CASCADE);
-	}
-
-	private static DeclarationAnnotationElementAdapter<String> buildFetchAdapter() {
-		return buildFetchAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.ONE_TO_MANY__FETCH);
-	}
-	
-	private static DeclarationAnnotationElementAdapter<String> buildMappedByAdapter() {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, JPA.ONE_TO_MANY__MAPPED_BY, false); // false = do not remove annotation when empty
-	}
-
-	public static class OneToManyAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final OneToManyAnnotationDefinition INSTANCE = new OneToManyAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static OneToManyAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private OneToManyAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new OneToManyImpl((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.core/src/org/eclipse/jpt/core/internal/resource/java/OneToOneImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OneToOneImpl.java
deleted file mode 100644
index 38a41acdd5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OneToOneImpl.java
+++ /dev/null
@@ -1,205 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.OneToOneAnnotation;
-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;
-
-public class OneToOneImpl extends AbstractRelationshipMappingAnnotation implements OneToOneAnnotation
-{
-	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	static final DeclarationAnnotationElementAdapter<String> TARGET_ENTITY_ADAPTER = buildTargetEntityAdapter();	
-
-	private static final DeclarationAnnotationElementAdapter<String[]> CASCADE_ADAPTER = buildCascadeAdapter();
-
-	private static final DeclarationAnnotationElementAdapter<String> FETCH_ADAPTER = buildFetchAdapter();
-
-	private static final DeclarationAnnotationElementAdapter<Boolean> OPTIONAL_ADAPTER = buildOptionalAdapter();
-
-	private static final DeclarationAnnotationElementAdapter<String> MAPPED_BY_ADAPTER = buildMappedByAdapter();	
-
-	private final AnnotationElementAdapter<Boolean> optionalAdapter;
-
-	private final AnnotationElementAdapter<String> mappedByAdapter;
-
-
-	private Boolean optional;
-	
-	private String mappedBy;
-
-	public OneToOneImpl(JavaResourcePersistentAttribute parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-		this.mappedByAdapter = buildAnnotationElementAdapter(MAPPED_BY_ADAPTER);
-		this.optionalAdapter = this.buildBooleanAnnotationElementAdapter(OPTIONAL_ADAPTER);
-	}
-	
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.mappedBy = this.mappedBy(astRoot);
-		this.optional = this.optional(astRoot);
-	}
-	
-	//**************** AbstractRelationshipMappingAnnotation implementation **************
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> targetEntityAdapter() {
-		return TARGET_ENTITY_ADAPTER;
-	}
-	
-	@Override
-	protected DeclarationAnnotationElementAdapter<String[]> cascadeAdapter() {
-		return CASCADE_ADAPTER;
-	}
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> fetchAdapter() {
-		return FETCH_ADAPTER;
-	}	
-
-	//**************** Annotation implementation **************
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	
-	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 String getMappedBy() {
-		return this.mappedBy;
-	}
-	
-	public void setMappedBy(String newMappedBy) {
-		if (attributeValueHasNotChanged(this.mappedBy, newMappedBy)) {
-			return;
-		}
-		String oldMappedBy = this.mappedBy;
-		this.mappedBy = newMappedBy;
-		this.mappedByAdapter.setValue(newMappedBy);
-		firePropertyChanged(MAPPED_BY_PROPERTY, oldMappedBy, newMappedBy);
-	}
-	
-	public TextRange getMappedByTextRange(CompilationUnit astRoot) {
-		return getElementTextRange(MAPPED_BY_ADAPTER, astRoot);
-	}
-	
-	public TextRange getOptionalTextRange(CompilationUnit astRoot) {
-		return getElementTextRange(OPTIONAL_ADAPTER, astRoot);
-	}
-	
-	public boolean mappedByTouches(int pos, CompilationUnit astRoot) {
-		return this.elementTouches(MAPPED_BY_ADAPTER, pos, astRoot);
-	}
-
-	@Override
-	public void updateFromJava(CompilationUnit astRoot) {
-		super.updateFromJava(astRoot);
-		this.setOptional(this.optional(astRoot));
-		this.setMappedBy(this.mappedByAdapter.getValue(astRoot));
-	}
-
-	protected String mappedBy(CompilationUnit astRoot) {
-		return this.mappedByAdapter.getValue(astRoot);
-	}
-	
-	protected Boolean optional(CompilationUnit astRoot) {
-		return this.optionalAdapter.getValue(astRoot);
-	}
-
-
-	// ********** static methods **********
-
-	private static DeclarationAnnotationElementAdapter<String> buildTargetEntityAdapter() {
-		return buildTargetEntityAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.ONE_TO_ONE__TARGET_ENTITY);
-	}
-
-	private static DeclarationAnnotationElementAdapter<String[]> buildCascadeAdapter() {
-		return buildEnumArrayAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.ONE_TO_ONE__CASCADE);
-	}
-
-	private static DeclarationAnnotationElementAdapter<String> buildFetchAdapter() {
-		return buildFetchAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.ONE_TO_ONE__FETCH);
-	}
-	
-	private static DeclarationAnnotationElementAdapter<Boolean> buildOptionalAdapter() {
-		return buildOptionalAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.ONE_TO_ONE__OPTIONAL);
-	}
-	
-	private static DeclarationAnnotationElementAdapter<Boolean> buildOptionalAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName) {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(annotationAdapter, elementName, false, BooleanExpressionConverter.instance());
-	}
-	
-	private static DeclarationAnnotationElementAdapter<String> buildMappedByAdapter() {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, JPA.ONE_TO_ONE__MAPPED_BY, false); // false = do not remove annotation when empty
-	}
-	
-	public static class OneToOneAnnotationDefinition implements AnnotationDefinition
-	{
-
-		// singleton
-		private static final OneToOneAnnotationDefinition INSTANCE = new OneToOneAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static OneToOneAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private OneToOneAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new OneToOneImpl((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.core/src/org/eclipse/jpt/core/internal/resource/java/OrderByImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OrderByImpl.java
deleted file mode 100644
index fde4501657..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OrderByImpl.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.OrderByAnnotation;
-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;
-
-public class OrderByImpl extends AbstractResourceAnnotation<Attribute> implements OrderByAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-	
-	private static final DeclarationAnnotationElementAdapter<String> VALUE_ADAPTER = buildValueAdapter();
-
-	
-	private final AnnotationElementAdapter<String> valueAdapter;
-
-	private String value;
-	
-	protected OrderByImpl(JavaResourceNode 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;
-	}
-
-	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 updateFromJava(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 ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, JPA.ORDER_BY__VALUE, false);
-	}
-
-
-	public static class OrderByAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final OrderByAnnotationDefinition INSTANCE = new OrderByAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private OrderByAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new OrderByImpl(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.core/src/org/eclipse/jpt/core/internal/resource/java/OverrideImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OverrideImpl.java
deleted file mode 100644
index bd76ba56d6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OverrideImpl.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.core.resource.java.OverrideAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationAdapter;
-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.Member;
-
-public abstract class OverrideImpl 
-	extends AbstractResourceAnnotation<Member>  
-	implements OverrideAnnotation
-{		
-	// hold this so we can get the 'name' text range
-	private final DeclarationAnnotationElementAdapter<String> nameDeclarationAdapter;
-
-	private final AnnotationElementAdapter<String> nameAdapter;
-	
-	private String name;
-		
-	
-	protected OverrideImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) {
-		super(parent, member, daa, annotationAdapter);
-		this.nameDeclarationAdapter = ConversionDeclarationAnnotationElementAdapter.forStrings(daa, JPA.ATTRIBUTE_OVERRIDE__NAME, false); // false = do not remove annotation when empty
-		this.nameAdapter = new ShortCircuitAnnotationElementAdapter<String>(getMember(),this.nameDeclarationAdapter);
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		this.name = this.name(astRoot);
-	}
-	
-	public IndexedAnnotationAdapter getIndexedAnnotationAdapter() {
-		return (IndexedAnnotationAdapter) super.getAnnotationAdapter();
-	}
-			
-	public void moveAnnotation(int newIndex) {
-		getIndexedAnnotationAdapter().moveAnnotation(newIndex);
-	}
-	
-	public void initializeFrom(NestableAnnotation oldAnnotation) {
-		OverrideAnnotation oldOverride = (OverrideAnnotation) oldAnnotation;
-		setName(oldOverride.getName());
-	}
-	
-	//************ AttriubteOverride 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(OverrideAnnotation.NAME_PROPERTY, oldName, newName);
-	}
-
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.nameDeclarationAdapter, astRoot);
-	}
-
-	public boolean nameTouches(int pos, CompilationUnit astRoot) {
-		return this.elementTouches(this.nameDeclarationAdapter, pos, astRoot);
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		this.setName(this.name(astRoot));
-	}
-	
-	protected String name(CompilationUnit astRoot) {
-		return this.nameAdapter.getValue(astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumnImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumnImpl.java
deleted file mode 100644
index e151b35959..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumnImpl.java
+++ /dev/null
@@ -1,184 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.utility.jdt.MemberAnnotationAdapter;
-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.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.core.resource.java.NestablePrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationAdapter;
-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;
-
-public class PrimaryKeyJoinColumnImpl extends AbstractNamedColumn implements NestablePrimaryKeyJoinColumn
-{
-
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	// hold this so we can get the 'referenced column name' text range
-	private final DeclarationAnnotationElementAdapter<String> referencedColumnNameDeclarationAdapter;
-
-	private final AnnotationElementAdapter<String> referencedColumnNameAdapter;
-
-	private String referencedColumnName;
-	
-	protected PrimaryKeyJoinColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) {
-		super(parent, member, daa, annotationAdapter);
-		this.referencedColumnNameDeclarationAdapter = this.buildStringElementAdapter(JPA.PRIMARY_KEY_JOIN_COLUMN__REFERENCED_COLUMN_NAME);
-		this.referencedColumnNameAdapter = this.buildShortCircuitElementAdapter(this.referencedColumnNameDeclarationAdapter);
-	}
-	
-	protected PrimaryKeyJoinColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa) {
-		this(parent, member, daa, new MemberAnnotationAdapter(member, daa));
-	}
-	
-	protected PrimaryKeyJoinColumnImpl(JavaResourceNode parent, Member member, IndexedDeclarationAnnotationAdapter idaa) {
-		this(parent, member, idaa, new MemberIndexedAnnotationAdapter(member, idaa));
-	}
-	
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.referencedColumnName = this.referencedColumnName(astRoot);
-	}
-	
-	@Override
-	protected String nameElementName() {
-		return JPA.PRIMARY_KEY_JOIN_COLUMN__NAME;
-	}
-	
-	@Override
-	protected String columnDefinitionElementName() {
-		return JPA.PRIMARY_KEY_JOIN_COLUMN__COLUMN_DEFINITION;
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	private IndexedAnnotationAdapter getIndexedAnnotationAdapter() {
-		return (IndexedAnnotationAdapter) super.getAnnotationAdapter();
-	}
-
-	public void moveAnnotation(int newIndex) {
-		getIndexedAnnotationAdapter().moveAnnotation(newIndex);
-	}
-	
-	@Override
-	public void initializeFrom(NestableAnnotation oldAnnotation) {
-		super.initializeFrom(oldAnnotation);
-		PrimaryKeyJoinColumnAnnotation oldColumn = (PrimaryKeyJoinColumnAnnotation) oldAnnotation;
-		setReferencedColumnName(oldColumn.getReferencedColumnName());
-	}
-	
-	public String getReferencedColumnName() {
-		return this.referencedColumnName;
-	}
-	
-	public void setReferencedColumnName(String newReferencedColumnName) {
-		if (attributeValueHasNotChanged(this.referencedColumnName, newReferencedColumnName)) {
-			return;
-		}
-		String oldReferencedColumnName = this.referencedColumnName;
-		this.referencedColumnName = newReferencedColumnName;
-		this.referencedColumnNameAdapter.setValue(newReferencedColumnName);
-		firePropertyChanged(REFERENCED_COLUMN_NAME_PROPERTY, oldReferencedColumnName, newReferencedColumnName);
-	}
-	
-	@Override
-	public void updateFromJava(CompilationUnit astRoot) {
-		super.updateFromJava(astRoot);
-		this.setReferencedColumnName(this.referencedColumnName(astRoot));
-	}
-	
-	protected String referencedColumnName(CompilationUnit astRoot) {
-		return this.referencedColumnNameAdapter.getValue(astRoot);
-	}
-	
-	public boolean referencedColumnNameTouches(int pos, CompilationUnit astRoot) {
-		return this.elementTouches(this.referencedColumnNameDeclarationAdapter, pos, astRoot);
-	}
-
-	public TextRange getReferencedColumnNameTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.referencedColumnNameDeclarationAdapter, astRoot);
-	}
-	
-	// ********** static methods **********
-
-	static PrimaryKeyJoinColumnImpl createPrimaryKeyJoinColumn(JavaResourceNode parent, Member member) {
-		return new PrimaryKeyJoinColumnImpl(parent, member, DECLARATION_ANNOTATION_ADAPTER);
-	}
-	
-	static PrimaryKeyJoinColumnImpl createNestedPrimaryKeyJoinColumn(JavaResourceNode parent, Member member, int index, DeclarationAnnotationAdapter pkJoinColumnsAdapter) {
-		IndexedDeclarationAnnotationAdapter idaa = buildNestedDeclarationAnnotationAdapter(index, pkJoinColumnsAdapter);
-		IndexedAnnotationAdapter annotationAdapter = new MemberIndexedAnnotationAdapter(member, idaa);
-		return new PrimaryKeyJoinColumnImpl(parent, member, idaa, annotationAdapter);
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildNestedDeclarationAnnotationAdapter(int index, DeclarationAnnotationAdapter pkJoinColumnsAdapter) {
-		return new NestedIndexedDeclarationAnnotationAdapter(pkJoinColumnsAdapter, index, JPA.PRIMARY_KEY_JOIN_COLUMN);
-	}
-
-
-	static NestablePrimaryKeyJoinColumn createSecondaryTablePrimaryKeyJoinColumn(DeclarationAnnotationAdapter secondaryTableAdapter, JavaResourceNode parent, Member member, int index) {
-		return new PrimaryKeyJoinColumnImpl(parent, member, buildSecondaryTableAnnotationAdapter(secondaryTableAdapter, index));
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildSecondaryTableAnnotationAdapter(DeclarationAnnotationAdapter secondaryTableAdapter, int index) {
-		return new NestedIndexedDeclarationAnnotationAdapter(secondaryTableAdapter, JPA.SECONDARY_TABLE__PK_JOIN_COLUMNS, index, JPA.PRIMARY_KEY_JOIN_COLUMN);
-	}
-
-	public static class PrimaryKeyJoinColumnAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final PrimaryKeyJoinColumnAnnotationDefinition INSTANCE = new PrimaryKeyJoinColumnAnnotationDefinition();
-
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private PrimaryKeyJoinColumnAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return PrimaryKeyJoinColumnImpl.createPrimaryKeyJoinColumn(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.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumnsImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumnsImpl.java
deleted file mode 100644
index df517c84f0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumnsImpl.java
+++ /dev/null
@@ -1,156 +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.core.internal.resource.java;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-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.resource.java.NestablePrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumns;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-public class PrimaryKeyJoinColumnsImpl extends AbstractResourceAnnotation<Member> implements PrimaryKeyJoinColumns
-{
-	
-	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private List<NestablePrimaryKeyJoinColumn> pkJoinColumns;
-	
-	protected PrimaryKeyJoinColumnsImpl(JavaResourceNode parent, Member member) {
-		super(parent, member, DECLARATION_ANNOTATION_ADAPTER);
-		this.pkJoinColumns = new ArrayList<NestablePrimaryKeyJoinColumn>();
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		ContainerAnnotationTools.initializeNestedAnnotations(astRoot, this);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public String getNestableAnnotationName() {
-		return PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME;
-	}
-
-	public String getElementName() {
-		return "value";
-	}
-		
-	public ListIterator<NestablePrimaryKeyJoinColumn> nestedAnnotations() {
-		return new CloneListIterator<NestablePrimaryKeyJoinColumn>(this.pkJoinColumns);
-	}
-	
-	public int nestedAnnotationsSize() {
-		return this.pkJoinColumns.size();
-	}	
-
-	public NestablePrimaryKeyJoinColumn addInternal(int index) {
-		NestablePrimaryKeyJoinColumn pkJoinColumn = createPrimaryKeyJoinColumn(index);
-		this.pkJoinColumns.add(index, pkJoinColumn);
-		return pkJoinColumn;
-	}
-	
-	public NestablePrimaryKeyJoinColumn add(int index) {
-		NestablePrimaryKeyJoinColumn pkJoinColumn = createPrimaryKeyJoinColumn(index);
-		add(index, pkJoinColumn);
-		return pkJoinColumn;
-	}
-	
-	protected void add(int index, NestablePrimaryKeyJoinColumn pkJoinColumn) {
-		addItemToList(index, pkJoinColumn, this.pkJoinColumns, PK_JOIN_COLUMNS_LIST);
-	}
-
-	public void remove(NestablePrimaryKeyJoinColumn pkJoinColumn) {
-		removeItemFromList(pkJoinColumn, this.pkJoinColumns, PK_JOIN_COLUMNS_LIST);
-	}
-	
-	public void remove(int index) {
-		removeItemFromList(index, this.pkJoinColumns, PK_JOIN_COLUMNS_LIST);
-	}
-	
-	public int indexOf(NestablePrimaryKeyJoinColumn pkJoinColumn) {
-		return this.pkJoinColumns.indexOf(pkJoinColumn);
-	}
-	
-	public NestablePrimaryKeyJoinColumn nestedAnnotationAt(int index) {
-		return this.pkJoinColumns.get(index);
-	}
-	
-	public NestablePrimaryKeyJoinColumn nestedAnnotationFor(Annotation jdtAnnotation) {
-		for (NestablePrimaryKeyJoinColumn pkJoinColumn : this.pkJoinColumns) {
-			if (jdtAnnotation == pkJoinColumn.getJdtAnnotation((CompilationUnit) jdtAnnotation.getRoot())) {
-				return pkJoinColumn;
-			}
-		}
-		return null;
-	}
-	
-	public void move(int targetIndex, int sourceIndex) {
-		moveItemInList(targetIndex, sourceIndex, this.pkJoinColumns, PK_JOIN_COLUMNS_LIST);
-	}
-	
-	public void moveInternal(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.pkJoinColumns, targetIndex, sourceIndex);
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		ContainerAnnotationTools.updateNestedAnnotationsFromJava(astRoot, this);
-	}
-	
-	private PrimaryKeyJoinColumnImpl createPrimaryKeyJoinColumn(int index) {
-		return PrimaryKeyJoinColumnImpl.createNestedPrimaryKeyJoinColumn(this, getMember(), index, getDeclarationAnnotationAdapter());
-	}
-
-	
-	public static class PrimaryKeyJoinColumnsAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final PrimaryKeyJoinColumnsAnnotationDefinition INSTANCE = new PrimaryKeyJoinColumnsAnnotationDefinition();
-
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private PrimaryKeyJoinColumnsAnnotationDefinition() {
-			super();
-		}
-
-		public PrimaryKeyJoinColumns buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new PrimaryKeyJoinColumnsImpl(parent, member);
-		}
-		
-		public PrimaryKeyJoinColumns buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/QueryHintImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/QueryHintImpl.java
deleted file mode 100644
index de03b1dd13..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/QueryHintImpl.java
+++ /dev/null
@@ -1,159 +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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.core.resource.java.NestableQueryHint;
-import org.eclipse.jpt.core.resource.java.QueryHintAnnotation;
-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.Type;
-
-public class QueryHintImpl extends AbstractResourceAnnotation<Type>
-	implements NestableQueryHint
-{
-
-	// hold this so we can get the 'name' text range
-	private final DeclarationAnnotationElementAdapter<String> nameDeclarationAdapter;
-	
-	// hold this so we can get the 'value' text range
-	private final DeclarationAnnotationElementAdapter<String> valueDeclarationAdapter;
-	
-	private final AnnotationElementAdapter<String> nameAdapter;
-
-	private final AnnotationElementAdapter<String> valueAdapter;
-
-	private String name;
-	
-	private String value;
-	
-	public QueryHintImpl(JavaResourceNode parent, Type type, IndexedDeclarationAnnotationAdapter idaa) {
-		super(parent, type, idaa, new MemberIndexedAnnotationAdapter(type, idaa));
-		this.nameDeclarationAdapter = this.nameAdapter(idaa);
-		this.nameAdapter = this.buildAdapter(this.nameDeclarationAdapter);
-		this.valueDeclarationAdapter = this.valueAdapter(idaa);
-		this.valueAdapter = this.buildAdapter(this.valueDeclarationAdapter);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		this.name = this.name(astRoot);
-		this.value = this.value(astRoot);		
-	}
-	
-	// ********** initialization **********
-	protected AnnotationElementAdapter<String> buildAdapter(DeclarationAnnotationElementAdapter<String> daea) {
-		return new ShortCircuitAnnotationElementAdapter<String>(getMember(), daea);
-	}
-
-	protected DeclarationAnnotationElementAdapter<String> nameAdapter(DeclarationAnnotationAdapter daa) {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(daa, JPA.QUERY_HINT__NAME);
-	}
-
-	protected DeclarationAnnotationElementAdapter<String> valueAdapter(DeclarationAnnotationAdapter daa) {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(daa, JPA.QUERY_HINT__VALUE);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	@Override
-	public IndexedAnnotationAdapter getAnnotationAdapter() {
-		return (IndexedAnnotationAdapter) super.getAnnotationAdapter();
-	}
-	
-	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 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 getNameTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.nameDeclarationAdapter, astRoot);
-	}
-	
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.valueDeclarationAdapter, astRoot);
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		this.setName(this.name(astRoot));
-		this.setValue(this.value(astRoot));
-	}
-	
-	protected String name(CompilationUnit astRoot) {
-		return this.nameAdapter.getValue(astRoot);
-	}
-	
-	protected String value(CompilationUnit astRoot) {
-		return this.valueAdapter.getValue(astRoot);
-	}
-
-	// ********** persistence model -> java annotations **********
-	public void moveAnnotation(int newIndex) {
-		getAnnotationAdapter().moveAnnotation(newIndex);
-	}
-
-	public void initializeFrom(NestableAnnotation oldAnnotation) {
-		QueryHintAnnotation oldQueryHint = (QueryHintAnnotation) oldAnnotation;
-		setName(oldQueryHint.getName());
-		setValue(oldQueryHint.getValue());
-	}
-	
-	// ********** static methods **********
-	static QueryHintImpl createNamedQueryQueryHint(JavaResourceNode parent, Type type,  DeclarationAnnotationAdapter namedQueryAdapter, int index) {
-		return new QueryHintImpl(parent, type, buildNamedQueryQueryHintAnnotationAdapter(namedQueryAdapter, index));
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildNamedQueryQueryHintAnnotationAdapter(DeclarationAnnotationAdapter namedQueryAdapter, int index) {
-		return new NestedIndexedDeclarationAnnotationAdapter(namedQueryAdapter, JPA.NAMED_QUERY__HINTS, index, JPA.QUERY_HINT);
-	}
-
-	static QueryHintImpl createNamedNativeQueryQueryHint(JavaResourceNode parent, Type type, DeclarationAnnotationAdapter namedNativeQueryAdapter, int index) {
-		return new QueryHintImpl(parent, type, buildNamedNativeQueryQueryHintAnnotationAdapter(namedNativeQueryAdapter, index));
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildNamedNativeQueryQueryHintAnnotationAdapter(DeclarationAnnotationAdapter namedNativeQueryAdapter, int index) {
-		return new NestedIndexedDeclarationAnnotationAdapter(namedNativeQueryAdapter, JPA.NAMED_NATIVE_QUERY__HINTS, index, JPA.QUERY_HINT);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTableImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTableImpl.java
deleted file mode 100644
index a8f05772c4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTableImpl.java
+++ /dev/null
@@ -1,322 +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.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.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.MemberAnnotationAdapter;
-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.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.ContainerAnnotation;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.core.resource.java.NestablePrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.resource.java.NestableSecondaryTable;
-import org.eclipse.jpt.core.resource.java.NestableUniqueConstraint;
-import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation;
-import org.eclipse.jpt.core.resource.java.SecondaryTableAnnotation;
-import org.eclipse.jpt.core.resource.java.UniqueConstraintAnnotation;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationAdapter;
-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.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-public class SecondaryTableImpl extends AbstractResourceTable implements NestableSecondaryTable
-{	
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(SecondaryTableAnnotation.ANNOTATION_NAME);
-	
-	private final List<NestablePrimaryKeyJoinColumn> pkJoinColumns;
-	
-	private final PkJoinColumnsContainerAnnotation pkJoinColumnsContainerAnnotation;
-	
-
-	protected SecondaryTableImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) {
-		super(parent, member, daa, annotationAdapter);
-		this.pkJoinColumns = new ArrayList<NestablePrimaryKeyJoinColumn>();
-		this.pkJoinColumnsContainerAnnotation = new PkJoinColumnsContainerAnnotation();
-	}
-	
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		ContainerAnnotationTools.initializeNestedAnnotations(astRoot, this.pkJoinColumnsContainerAnnotation);
-	}
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> catalogAdapter(DeclarationAnnotationAdapter declarationAnnotationAdapter) {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(declarationAnnotationAdapter, JPA.SECONDARY_TABLE__CATALOG);
-	}
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> nameAdapter(DeclarationAnnotationAdapter declarationAnnotationAdapter) {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(declarationAnnotationAdapter, JPA.SECONDARY_TABLE__NAME);
-	}
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> schemaAdapter(DeclarationAnnotationAdapter declarationAnnotationAdapter) {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(declarationAnnotationAdapter, JPA.SECONDARY_TABLE__SCHEMA);
-	}
-
-	public IndexedAnnotationAdapter getIndexedAnnotationAdapter() {
-		return (IndexedAnnotationAdapter) super.getAnnotationAdapter();
-	}
-	
-	public String getAnnotationName() {
-		return SecondaryTableAnnotation.ANNOTATION_NAME;
-	}
-	
-	public void moveAnnotation(int newIndex) {
-		getIndexedAnnotationAdapter().moveAnnotation(newIndex);
-	}
-	
-	public void initializeFrom(NestableAnnotation oldAnnotation) {
-		SecondaryTableAnnotation oldSecondaryTable = (SecondaryTableAnnotation) oldAnnotation;
-		setName(oldSecondaryTable.getName());
-		setCatalog(oldSecondaryTable.getCatalog());
-		setSchema(oldSecondaryTable.getSchema());
-		for (UniqueConstraintAnnotation uniqueConstraint : CollectionTools.iterable(oldSecondaryTable.uniqueConstraints())) {
-			NestableUniqueConstraint newUniqueConstraint = addUniqueConstraint(oldSecondaryTable.indexOfUniqueConstraint(uniqueConstraint));
-			newUniqueConstraint.initializeFrom((NestableAnnotation) uniqueConstraint);
-		}
-		for (PrimaryKeyJoinColumnAnnotation pkJoinColumn : CollectionTools.iterable(oldSecondaryTable.pkJoinColumns())) {
-			NestablePrimaryKeyJoinColumn newPkJoinColumn = addPkJoinColumn(oldSecondaryTable.indexOfPkJoinColumn(pkJoinColumn));
-			newPkJoinColumn.initializeFrom((NestableAnnotation) pkJoinColumn);
-		}
-	}
-	
-	@Override
-	protected NestableUniqueConstraint createUniqueConstraint(int index) {
-		return UniqueConstraintImpl.createSecondaryTableUniqueConstraint(this, this.getMember(), this.getDeclarationAnnotationAdapter(), index);
-	}
-	
-	// ************* SecondaryTable implementation *******************
-	
-	
-	public ListIterator<PrimaryKeyJoinColumnAnnotation> pkJoinColumns() {
-		return new CloneListIterator<PrimaryKeyJoinColumnAnnotation>(this.pkJoinColumns);
-	}
-	
-	public int pkJoinColumnsSize() {
-		return this.pkJoinColumns.size();
-	}
-	
-	public NestablePrimaryKeyJoinColumn pkJoinColumnAt(int index) {
-		return this.pkJoinColumns.get(index);
-	}
-	
-	public int indexOfPkJoinColumn(PrimaryKeyJoinColumnAnnotation joinColumn) {
-		return this.pkJoinColumns.indexOf(joinColumn);
-	}
-
-	public NestablePrimaryKeyJoinColumn addPkJoinColumn(int index) {
-		NestablePrimaryKeyJoinColumn pkJoinColumn = (NestablePrimaryKeyJoinColumn) ContainerAnnotationTools.addNestedAnnotation(index, this.pkJoinColumnsContainerAnnotation);
-		fireItemAdded(SecondaryTableAnnotation.PK_JOIN_COLUMNS_LIST, index, pkJoinColumn);
-		return pkJoinColumn;
-	}
-	
-	protected void addPkJoinColumn(int index, NestablePrimaryKeyJoinColumn pkJoinColumn) {
-		addItemToList(index, pkJoinColumn, this.pkJoinColumns, PK_JOIN_COLUMNS_LIST);
-	}
-	
-	public void removePkJoinColumn(int index) {
-		NestablePrimaryKeyJoinColumn pkJoinColumn = this.pkJoinColumns.get(index);
-		removePkJoinColumn(pkJoinColumn);
-		pkJoinColumn.removeAnnotation();
-		ContainerAnnotationTools.synchAnnotationsAfterRemove(index, this.pkJoinColumnsContainerAnnotation);
-	}
-	
-	protected void removePkJoinColumn(NestablePrimaryKeyJoinColumn pkJoinColumn) {
-		removeItemFromList(pkJoinColumn, this.pkJoinColumns, SecondaryTableAnnotation.PK_JOIN_COLUMNS_LIST);
-	}
-
-	public void movePkJoinColumn(int targetIndex, int sourceIndex) {
-		movePkJoinColumnInternal(targetIndex, sourceIndex);
-		ContainerAnnotationTools.synchAnnotationsAfterMove(targetIndex, sourceIndex, this.pkJoinColumnsContainerAnnotation);
-		fireItemMoved(SecondaryTableAnnotation.PK_JOIN_COLUMNS_LIST, targetIndex, sourceIndex);
-	}
-	
-	protected void movePkJoinColumnInternal(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.pkJoinColumns, targetIndex, sourceIndex);
-	}
-
-
-	protected NestablePrimaryKeyJoinColumn createPrimaryKeyJoinColumn(int index) {
-		return PrimaryKeyJoinColumnImpl.createSecondaryTablePrimaryKeyJoinColumn(getDeclarationAnnotationAdapter(), this, getMember(), index);
-	}
-
-	@Override
-	public void updateFromJava(CompilationUnit astRoot) {
-		super.updateFromJava(astRoot);
-		this.updatePkJoinColumnsFromJava(astRoot);
-	}
-	
-	private void updatePkJoinColumnsFromJava(CompilationUnit astRoot) {
-		ContainerAnnotationTools.updateNestedAnnotationsFromJava(astRoot, this.pkJoinColumnsContainerAnnotation);
-	}
-
-	// ********** static methods **********
-	static SecondaryTableImpl createSecondaryTable(JavaResourceNode parent, Member member) {
-		return new SecondaryTableImpl(parent, member, DECLARATION_ANNOTATION_ADAPTER, new MemberAnnotationAdapter(member, DECLARATION_ANNOTATION_ADAPTER));
-	}
-
-	static SecondaryTableImpl createNestedSecondaryTable(JavaResourceNode parent, Member member, int index, DeclarationAnnotationAdapter secondaryTablesAdapter) {
-		IndexedDeclarationAnnotationAdapter idaa = buildNestedDeclarationAnnotationAdapter(index, secondaryTablesAdapter);
-		IndexedAnnotationAdapter annotationAdapter = new MemberIndexedAnnotationAdapter(member, idaa);
-		return new SecondaryTableImpl(parent, member, idaa, annotationAdapter);
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildNestedDeclarationAnnotationAdapter(int index, DeclarationAnnotationAdapter secondaryTablesAdapter) {
-		return new NestedIndexedDeclarationAnnotationAdapter(secondaryTablesAdapter, index, JPA.SECONDARY_TABLE);
-	}
-	
-	
-	private class PkJoinColumnsContainerAnnotation extends AbstractJavaResourceNode 
-		implements ContainerAnnotation<NestablePrimaryKeyJoinColumn> 
-	{
-		public PkJoinColumnsContainerAnnotation() {
-			super(SecondaryTableImpl.this);
-		}
-		
-		public void initialize(CompilationUnit astRoot) {
-			//nothing to initialize
-		}
-		
-		public NestablePrimaryKeyJoinColumn addInternal(int index) {
-			NestablePrimaryKeyJoinColumn pKJoinColumn = SecondaryTableImpl.this.createPrimaryKeyJoinColumn(index);
-			SecondaryTableImpl.this.pkJoinColumns.add(index, pKJoinColumn);
-			return pKJoinColumn;
-		}
-		
-		public NestablePrimaryKeyJoinColumn add(int index) {
-			NestablePrimaryKeyJoinColumn pKJoinColumn = SecondaryTableImpl.this.createPrimaryKeyJoinColumn(index);
-			SecondaryTableImpl.this.addPkJoinColumn(index, pKJoinColumn);
-			return pKJoinColumn;
-		}
-
-		public int indexOf(NestablePrimaryKeyJoinColumn pkJoinColumn) {
-			return SecondaryTableImpl.this.indexOfPkJoinColumn(pkJoinColumn);
-		}
-
-		public void move(int targetIndex, int sourceIndex) {
-			SecondaryTableImpl.this.movePkJoinColumn(targetIndex, sourceIndex);
-		}
-		
-		public void moveInternal(int targetIndex, int sourceIndex) {
-			SecondaryTableImpl.this.movePkJoinColumnInternal(targetIndex, sourceIndex);
-		}
-
-		public NestablePrimaryKeyJoinColumn nestedAnnotationAt(int index) {
-			return SecondaryTableImpl.this.pkJoinColumnAt(index);
-		}
-
-		public ListIterator<NestablePrimaryKeyJoinColumn> nestedAnnotations() {
-			return new CloneListIterator<NestablePrimaryKeyJoinColumn>(SecondaryTableImpl.this.pkJoinColumns);
-		}
-
-		public int nestedAnnotationsSize() {
-			return pkJoinColumnsSize();
-		}
-
-		public String getAnnotationName() {
-			return SecondaryTableImpl.this.getAnnotationName();
-		}
-
-		public String getNestableAnnotationName() {
-			return JPA.PRIMARY_KEY_JOIN_COLUMN;
-		}
-
-		public NestablePrimaryKeyJoinColumn nestedAnnotationFor(org.eclipse.jdt.core.dom.Annotation jdtAnnotation) {
-			for (NestablePrimaryKeyJoinColumn pkJoinColumn : CollectionTools.iterable(nestedAnnotations())) {
-				if (jdtAnnotation == pkJoinColumn.getJdtAnnotation((CompilationUnit) jdtAnnotation.getRoot())) {
-					return pkJoinColumn;
-				}
-			}
-			return null;
-		}
-
-		public void remove(int index) {
-			this.remove(nestedAnnotationAt(index));	
-		}		
-
-		public void remove(NestablePrimaryKeyJoinColumn pkJoinColumn) {
-			SecondaryTableImpl.this.removePkJoinColumn(pkJoinColumn);
-		}
-
-		public org.eclipse.jdt.core.dom.Annotation getJdtAnnotation(CompilationUnit astRoot) {
-			return SecondaryTableImpl.this.getJdtAnnotation(astRoot);
-		}
-
-		public void newAnnotation() {
-			SecondaryTableImpl.this.newAnnotation();
-		}
-
-		public void removeAnnotation() {
-			SecondaryTableImpl.this.removeAnnotation();
-		}
-
-		public void updateFromJava(CompilationUnit astRoot) {
-			SecondaryTableImpl.this.updateFromJava(astRoot);
-		}
-		
-		public TextRange getTextRange(CompilationUnit astRoot) {
-			return SecondaryTableImpl.this.getTextRange(astRoot);
-		}
-		
-		public String getElementName() {
-			return "pkJoinColumns";
-		}
-	}
-
-	public static class SecondaryTableAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final SecondaryTableAnnotationDefinition INSTANCE = new SecondaryTableAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private SecondaryTableAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return SecondaryTableImpl.createSecondaryTable(parent, member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return null;
-		}
-		
-		public String getAnnotationName() {
-			return SecondaryTableAnnotation.ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTablesImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTablesImpl.java
deleted file mode 100644
index e8e2963566..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTablesImpl.java
+++ /dev/null
@@ -1,160 +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.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.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.resource.java.NestableSecondaryTable;
-import org.eclipse.jpt.core.resource.java.SecondaryTableAnnotation;
-import org.eclipse.jpt.core.resource.java.SecondaryTablesAnnotation;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-public class SecondaryTablesImpl extends AbstractResourceAnnotation<Member> implements SecondaryTablesAnnotation
-{
-	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final List<NestableSecondaryTable> secondaryTables;
-	
-	protected SecondaryTablesImpl(JavaResourcePersistentType parent, Member member) {
-		super(parent, member, DECLARATION_ANNOTATION_ADAPTER);
-		this.secondaryTables = new ArrayList<NestableSecondaryTable>();
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		ContainerAnnotationTools.initializeNestedAnnotations(astRoot, this);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public String getNestableAnnotationName() {
-		return SecondaryTableAnnotation.ANNOTATION_NAME;
-	}
-
-	public String getElementName() {
-		return "value";
-	}
-	
-	public ListIterator<NestableSecondaryTable> nestedAnnotations() {
-		return new CloneListIterator<NestableSecondaryTable>(this.secondaryTables);
-	}
-	
-	public int nestedAnnotationsSize() {
-		return this.secondaryTables.size();
-	}
-	
-	public NestableSecondaryTable addInternal(int index) {
-		NestableSecondaryTable secondaryTable = createSecondaryTable(index);
-		this.secondaryTables.add(index, secondaryTable);
-		return secondaryTable;
-	}
-
-	public NestableSecondaryTable add(int index) {
-		NestableSecondaryTable secondaryTable = createSecondaryTable(index);
-		this.add(index, secondaryTable);
-		return secondaryTable;
-	}
-	
-	protected void add(int index, NestableSecondaryTable secondaryTable) {
-		addItemToList(index, secondaryTable, this.secondaryTables, SecondaryTablesAnnotation.SECONDARY_TABLES_LIST);
-	}
-	
-	public void remove(NestableSecondaryTable secondaryTable) {
-		removeItemFromList(secondaryTable, this.secondaryTables, SecondaryTablesAnnotation.SECONDARY_TABLES_LIST);
-	}
-	
-	public void remove(int index) {
-		removeItemFromList(index, this.secondaryTables, SecondaryTablesAnnotation.SECONDARY_TABLES_LIST);
-	}
-	
-	public int indexOf(NestableSecondaryTable secondaryTable) {
-		return this.secondaryTables.indexOf(secondaryTable);
-	}
-	
-	public NestableSecondaryTable nestedAnnotationAt(int index) {
-		return this.secondaryTables.get(index);
-	}
-	
-	public NestableSecondaryTable nestedAnnotationFor(org.eclipse.jdt.core.dom.Annotation jdtAnnotation) {
-		for (NestableSecondaryTable secondaryTable : this.secondaryTables) {
-			if (jdtAnnotation == secondaryTable.getJdtAnnotation((CompilationUnit) jdtAnnotation.getRoot())) {
-				return secondaryTable;
-			}
-		}
-		return null;
-	}
-
-	public void move(int targetIndex, int sourceIndex) {
-		moveItemInList(targetIndex, sourceIndex,  this.secondaryTables, SecondaryTablesAnnotation.SECONDARY_TABLES_LIST);
-	}
-	//TODO this move is different than how we handle SecondarTable.pkJoinColumns
-//	public void movePkJoinColumn(int oldIndex, int newIndex) {
-//		movePkJoinColumnInternal(oldIndex, newIndex);
-//		ContainerAnnotationTools.synchAnnotationsAfterMove(newIndex, oldIndex, this.pkJoinColumnsContainerAnnotation);
-//		fireItemMoved(SecondaryTable.PK_JOIN_COLUMNS_LIST, newIndex, oldIndex);
-//	}
-	
-	public void moveInternal(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.secondaryTables, targetIndex, sourceIndex);
-	}
-	
-	public void updateFromJava(CompilationUnit astRoot) {
-		ContainerAnnotationTools.updateNestedAnnotationsFromJava(astRoot, this);
-	}
-	
-	private SecondaryTableImpl createSecondaryTable(int index) {
-		return SecondaryTableImpl.createNestedSecondaryTable(this, getMember(), index, getDeclarationAnnotationAdapter());
-	}
-	
-	public static class SecondaryTablesAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final SecondaryTablesAnnotationDefinition INSTANCE = new SecondaryTablesAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private SecondaryTablesAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new SecondaryTablesImpl((JavaResourcePersistentType) 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.core/src/org/eclipse/jpt/core/internal/resource/java/SequenceGeneratorImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SequenceGeneratorImpl.java
deleted file mode 100644
index 548d3fef86..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SequenceGeneratorImpl.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation;
-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;
-
-public class SequenceGeneratorImpl extends GeneratorImpl implements SequenceGeneratorAnnotation
-{
-	private final AnnotationElementAdapter<String> sequenceNameAdapter;
-
-	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> NAME_ADAPTER = buildAdapter(JPA.SEQUENCE_GENERATOR__NAME);
-
-	private static final DeclarationAnnotationElementAdapter<Integer> INITIAL_VALUE_ADAPTER = buildIntegerAdapter(JPA.SEQUENCE_GENERATOR__INITIAL_VALUE);
-
-	private static final DeclarationAnnotationElementAdapter<Integer> ALLOCATION_SIZE_ADAPTER = buildIntegerAdapter(JPA.SEQUENCE_GENERATOR__ALLOCATION_SIZE);
-
-	private static final DeclarationAnnotationElementAdapter<String> SEQUENCE_NAME_ADAPTER = buildAdapter(JPA.SEQUENCE_GENERATOR__SEQUENCE_NAME);
-	
-	private String sequenceName;
-
-	protected SequenceGeneratorImpl(JavaResourceNode parent, Member member) {
-		super(parent, member, DECLARATION_ANNOTATION_ADAPTER);
-		this.sequenceNameAdapter = this.buildAdapter(SEQUENCE_NAME_ADAPTER);
-	}
-
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.sequenceName = this.sequenceName(astRoot);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	//************ GeneratorImpl implementation **************
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<Integer> allocationSizeAdapter() {
-		return ALLOCATION_SIZE_ADAPTER;
-	}
-
-	@Override
-	protected DeclarationAnnotationAdapter annotationAdapter() {
-		return DECLARATION_ANNOTATION_ADAPTER;
-	}
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<Integer> initialValueAdapter() {
-		return INITIAL_VALUE_ADAPTER;
-	}
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> nameAdapter() {
-		return NAME_ADAPTER;
-	}
-
-
-	public String getSequenceName() {
-		return this.sequenceName;
-	}
-
-	public void setSequenceName(String newSequenceName) {
-		if (attributeValueHasNotChanged(this.sequenceName, newSequenceName)) {
-			return;
-		}
-		String oldSequenceName = this.sequenceName;
-		this.sequenceName = newSequenceName;
-		this.sequenceNameAdapter.setValue(newSequenceName);
-		firePropertyChanged(SEQUENCE_NAME_PROPERTY, oldSequenceName, newSequenceName);
-	}
-	
-	public TextRange getSequenceNameTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(SEQUENCE_NAME_ADAPTER, astRoot);
-	}
-
-	// ********** java annotations -> persistence model **********
-	@Override
-	public void updateFromJava(CompilationUnit astRoot) {
-		super.updateFromJava(astRoot);
-		this.setSequenceName(this.sequenceName(astRoot));
-	}
-	
-	protected String sequenceName(CompilationUnit astRoot) {
-		return this.sequenceNameAdapter.getValue(astRoot);
-	}
-
-	// ********** static methods **********
-	private static DeclarationAnnotationElementAdapter<String> buildAdapter(String elementName) {
-		return buildAdapter(DECLARATION_ANNOTATION_ADAPTER, elementName);
-	}
-
-	private static DeclarationAnnotationElementAdapter<Integer> buildIntegerAdapter(String elementName) {
-		return buildIntegerAdapter(DECLARATION_ANNOTATION_ADAPTER, elementName);
-	}
-	
-	public static class SequenceGeneratorAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final SequenceGeneratorAnnotationDefinition INSTANCE = new SequenceGeneratorAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private SequenceGeneratorAnnotationDefinition() {
-			super();
-		}
-		
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new SequenceGeneratorImpl(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.core/src/org/eclipse/jpt/core/internal/resource/java/TableGeneratorImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableGeneratorImpl.java
deleted file mode 100644
index 4ca173f104..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableGeneratorImpl.java
+++ /dev/null
@@ -1,483 +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.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.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.ContainerAnnotation;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.NestableUniqueConstraint;
-import org.eclipse.jpt.core.resource.java.TableAnnotation;
-import org.eclipse.jpt.core.resource.java.TableGeneratorAnnotation;
-import org.eclipse.jpt.core.resource.java.UniqueConstraintAnnotation;
-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.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-public class TableGeneratorImpl extends GeneratorImpl implements TableGeneratorAnnotation
-{
-	private final AnnotationElementAdapter<String> tableAdapter;
-
-	private final AnnotationElementAdapter<String> catalogAdapter;
-
-	private final AnnotationElementAdapter<String> schemaAdapter;
-
-	private final AnnotationElementAdapter<String> pkColumnNameAdapter;
-
-	private final AnnotationElementAdapter<String> valueColumnNameAdapter;
-
-	private final AnnotationElementAdapter<String> pkColumnValueAdapter;
-
-	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> NAME_ADAPTER = buildAdapter(JPA.TABLE_GENERATOR__NAME);
-
-	private static final DeclarationAnnotationElementAdapter<Integer> INITIAL_VALUE_ADAPTER = buildIntegerAdapter(JPA.TABLE_GENERATOR__INITIAL_VALUE);
-
-	private static final DeclarationAnnotationElementAdapter<Integer> ALLOCATION_SIZE_ADAPTER = buildIntegerAdapter(JPA.TABLE_GENERATOR__ALLOCATION_SIZE);
-
-	private static final DeclarationAnnotationElementAdapter<String> TABLE_ADAPTER = buildAdapter(JPA.TABLE_GENERATOR__TABLE);
-
-	private static final DeclarationAnnotationElementAdapter<String> CATALOG_ADAPTER = buildAdapter(JPA.TABLE_GENERATOR__CATALOG);
-
-	private static final DeclarationAnnotationElementAdapter<String> SCHEMA_ADAPTER = buildAdapter(JPA.TABLE_GENERATOR__SCHEMA);
-
-	private static final DeclarationAnnotationElementAdapter<String> PK_COLUMN_NAME_ADAPTER = buildAdapter(JPA.TABLE_GENERATOR__PK_COLUMN_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> VALUE_COLUMN_NAME_ADAPTER = buildAdapter(JPA.TABLE_GENERATOR__VALUE_COLUMN_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> PK_COLUMN_VALUE_ADAPTER = buildAdapter(JPA.TABLE_GENERATOR__PK_COLUMN_VALUE);
-	
-	private String table;
-	
-	private String catalog;
-	
-	private String schema;
-	
-	private String pkColumnName;
-	
-	private String valueColumnName;
-	
-	private String pkColumnValue;
-	
-	private final List<NestableUniqueConstraint> uniqueConstraints;
-	
-	private final UniqueConstraintsContainerAnnotation uniqueConstraintsContainerAnnotation;
-	
-
-	protected TableGeneratorImpl(JavaResourceNode parent, Member member) {
-		super(parent, member, DECLARATION_ANNOTATION_ADAPTER);
-		this.tableAdapter = this.buildAdapter(TABLE_ADAPTER);
-		this.catalogAdapter = this.buildAdapter(CATALOG_ADAPTER);
-		this.schemaAdapter = this.buildAdapter(SCHEMA_ADAPTER);
-		this.pkColumnNameAdapter = this.buildAdapter(PK_COLUMN_NAME_ADAPTER);
-		this.valueColumnNameAdapter = this.buildAdapter(VALUE_COLUMN_NAME_ADAPTER);
-		this.pkColumnValueAdapter = this.buildAdapter(PK_COLUMN_VALUE_ADAPTER);
-		this.uniqueConstraints = new ArrayList<NestableUniqueConstraint>();
-		this.uniqueConstraintsContainerAnnotation = new UniqueConstraintsContainerAnnotation();
-	}
-	
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.table = this.table(astRoot);
-		this.catalog = this.catalog(astRoot);
-		this.schema = this.schema(astRoot);
-		this.pkColumnName = this.pkColumnName(astRoot);
-		this.valueColumnName = this.valueColumnName(astRoot);
-		this.pkColumnValue = this.pkColumnValue(astRoot);
-		ContainerAnnotationTools.initializeNestedAnnotations(astRoot, this.uniqueConstraintsContainerAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	
-	//************ GeneratorImpl implementation **************
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<Integer> allocationSizeAdapter() {
-		return ALLOCATION_SIZE_ADAPTER;
-	}
-
-	@Override
-	protected DeclarationAnnotationAdapter annotationAdapter() {
-		return DECLARATION_ANNOTATION_ADAPTER;
-	}
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<Integer> initialValueAdapter() {
-		return INITIAL_VALUE_ADAPTER;
-	}
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> nameAdapter() {
-		return NAME_ADAPTER;
-	}
-
-	public String getTable() {
-		return this.table;
-	}
-	
-	public void setTable(String newTable) {
-		if (attributeValueHasNotChanged(this.table, newTable)) {
-			return;
-		}
-		String oldTable = this.table;
-		this.table = newTable;
-		this.tableAdapter.setValue(newTable);
-		firePropertyChanged(TABLE_PROPERTY, oldTable, newTable);
-	}
-
-	public String getCatalog() {
-		return this.catalog;
-	}
-	
-	public void setCatalog(String newCatalog) {
-		if (attributeValueHasNotChanged(this.catalog, newCatalog)) {
-			return;
-		}
-		String oldCatalog = this.catalog;
-		this.catalog = newCatalog;
-		this.catalogAdapter.setValue(newCatalog);
-		firePropertyChanged(CATALOG_PROPERTY, oldCatalog, newCatalog);
-	}
-	
-	public String getSchema() {
-		return this.schema;
-	}
-	
-	public void setSchema(String newSchema) {
-		if (attributeValueHasNotChanged(this.schema, newSchema)) {
-			return;
-		}
-		String oldSchema = this.schema;
-		this.schema = newSchema;
-		this.schemaAdapter.setValue(newSchema);
-		firePropertyChanged(SCHEMA_PROPERTY, oldSchema, newSchema);
-	}
-
-	public String getPkColumnName() {
-		return this.pkColumnName;
-	}
-	
-	public void setPkColumnName(String newPkColumnName) {
-		if (attributeValueHasNotChanged(this.pkColumnName, newPkColumnName)) {
-			return;
-		}
-		String oldPkColumnName = this.pkColumnName;
-		this.pkColumnName = newPkColumnName;
-		this.pkColumnNameAdapter.setValue(newPkColumnName);
-		firePropertyChanged(PK_COLUMN_NAME_PROPERTY, oldPkColumnName, newPkColumnName);
-	}
-	
-	public String getValueColumnName() {
-		return this.valueColumnName;
-	}
-	
-	public void setValueColumnName(String newValueColumnName) {
-		if (attributeValueHasNotChanged(this.valueColumnName, newValueColumnName)) {
-			return;
-		}
-		String oldValueColumnName = this.valueColumnName;
-		this.valueColumnName = newValueColumnName;
-		this.valueColumnNameAdapter.setValue(newValueColumnName);
-		firePropertyChanged(VALUE_COLUMN_NAME_PROPERTY, oldValueColumnName, newValueColumnName);
-	}
-
-	public String getPkColumnValue() {
-		return this.pkColumnValue;
-	}
-	
-	public void setPkColumnValue(String newPkColumnValue) {
-		if (attributeValueHasNotChanged(this.pkColumnValue, newPkColumnValue)) {
-			return;
-		}
-		String oldPkColumnValue = this.pkColumnValue;
-		this.pkColumnValue = newPkColumnValue;
-		this.pkColumnValueAdapter.setValue(newPkColumnValue);
-		firePropertyChanged(PK_COLUMN_VALUE_PROPERTY, oldPkColumnValue, newPkColumnValue);
-	}
-
-	public ListIterator<UniqueConstraintAnnotation> uniqueConstraints() {
-		return new CloneListIterator<UniqueConstraintAnnotation>(this.uniqueConstraints);
-	}
-	
-	public int uniqueConstraintsSize() {
-		return this.uniqueConstraints.size();
-	}
-	
-	public NestableUniqueConstraint uniqueConstraintAt(int index) {
-		return this.uniqueConstraints.get(index);
-	}
-	
-	public int indexOfUniqueConstraint(UniqueConstraintAnnotation uniqueConstraint) {
-		return this.uniqueConstraints.indexOf(uniqueConstraint);
-	}
-	
-	public NestableUniqueConstraint addUniqueConstraint(int index) {
-		NestableUniqueConstraint uniqueConstraint = (NestableUniqueConstraint) ContainerAnnotationTools.addNestedAnnotation(index, this.uniqueConstraintsContainerAnnotation);
-		fireItemAdded(TableGeneratorAnnotation.UNIQUE_CONSTRAINTS_LIST, index, uniqueConstraint);
-		return uniqueConstraint;
-	}
-	
-	private void addUniqueConstraint(int index, NestableUniqueConstraint uniqueConstraint) {
-		addItemToList(index, uniqueConstraint, this.uniqueConstraints, UNIQUE_CONSTRAINTS_LIST);
-	}
-	
-	public void removeUniqueConstraint(int index) {
-		NestableUniqueConstraint uniqueConstraint = this.uniqueConstraints.get(index);
-		removeUniqueConstraint(uniqueConstraint);
-		uniqueConstraint.removeAnnotation();
-		synchUniqueConstraintAnnotationsAfterRemove(index);
-	}
-	
-	protected void removeUniqueConstraint(NestableUniqueConstraint uniqueConstraint) {
-		removeItemFromList(uniqueConstraint, this.uniqueConstraints, UNIQUE_CONSTRAINTS_LIST);
-	}
-
-	public void moveUniqueConstraint(int targetIndex, int sourceIndex) {
-		moveUniqueConstraintInternal(targetIndex, sourceIndex);
-		ContainerAnnotationTools.synchAnnotationsAfterMove(targetIndex, sourceIndex, this.uniqueConstraintsContainerAnnotation);
-		fireItemMoved(TableAnnotation.UNIQUE_CONSTRAINTS_LIST, targetIndex, sourceIndex);
-	}
-	
-	protected void moveUniqueConstraintInternal(int targetIndex, int sourceIndex) {
-		CollectionTools.move(this.uniqueConstraints, targetIndex, sourceIndex);
-	}
-
-	/**
-	 * synchronize the annotations with the model join columns,
-	 * starting at the specified index to prevent overlap
-	 */
-	private void synchUniqueConstraintAnnotationsAfterRemove(int index) {
-		ContainerAnnotationTools.synchAnnotationsAfterRemove(index, this.uniqueConstraintsContainerAnnotation);
-	}
-	
-	protected NestableUniqueConstraint createUniqueConstraint(int index) {
-		return UniqueConstraintImpl.createTableGeneratorUniqueConstraint(this, this.getMember(), index);
-	}
-
-	public TextRange getTableTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(TABLE_ADAPTER, astRoot);
-	}
-	
-	public TextRange getCatalogTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(CATALOG_ADAPTER, astRoot);
-	}
-	
-	public TextRange getSchemaTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(SCHEMA_ADAPTER, astRoot);
-	}
-	
-	public TextRange getPkColumnNameTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(PK_COLUMN_NAME_ADAPTER, astRoot);
-	}
-	
-	public TextRange getPkColumnValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(PK_COLUMN_VALUE_ADAPTER, astRoot);
-	}
-	
-	public TextRange getValueColumnNameTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(VALUE_COLUMN_NAME_ADAPTER, astRoot);
-	}
-
-	// ********** java annotations -> persistence model **********
-	@Override
-	public void updateFromJava(CompilationUnit astRoot) {
-		super.updateFromJava(astRoot);
-		this.setTable(this.table(astRoot));
-		this.setCatalog(this.catalog(astRoot));
-		this.setSchema(this.schema(astRoot));
-		this.setPkColumnName(this.pkColumnName(astRoot));
-		this.setValueColumnName(this.valueColumnName(astRoot));
-		this.setPkColumnValue(this.pkColumnValue(astRoot));
-		this.updateUniqueConstraintsFromJava(astRoot);
-	}
-
-	protected String table(CompilationUnit astRoot) {
-		return this.tableAdapter.getValue(astRoot);
-	}
-	protected String catalog(CompilationUnit astRoot) {
-		return this.catalogAdapter.getValue(astRoot);
-	}
-	protected String schema(CompilationUnit astRoot) {
-		return this.schemaAdapter.getValue(astRoot);
-	}
-	protected String pkColumnName(CompilationUnit astRoot) {
-		return this.pkColumnNameAdapter.getValue(astRoot);
-	}
-	protected String valueColumnName(CompilationUnit astRoot) {
-		return this.valueColumnNameAdapter.getValue(astRoot);
-	}
-	protected String pkColumnValue(CompilationUnit astRoot) {
-		return this.pkColumnValueAdapter.getValue(astRoot);
-	}
-	
-	/**
-	 * here we just worry about getting the unique constraints lists the same size;
-	 * then we delegate to the unique constraints to synch themselves up
-	 */
-	private void updateUniqueConstraintsFromJava(CompilationUnit astRoot) {
-		ContainerAnnotationTools.updateNestedAnnotationsFromJava(astRoot, this.uniqueConstraintsContainerAnnotation);
-	}
-
-	// ********** static methods **********
-	private static DeclarationAnnotationElementAdapter<String> buildAdapter(String elementName) {
-		return buildAdapter(DECLARATION_ANNOTATION_ADAPTER, elementName);
-	}
-
-	private static DeclarationAnnotationElementAdapter<Integer> buildIntegerAdapter(String elementName) {
-		return buildIntegerAdapter(DECLARATION_ANNOTATION_ADAPTER, elementName);
-	}
-
-	
-	private class UniqueConstraintsContainerAnnotation extends AbstractJavaResourceNode 
-		implements ContainerAnnotation<NestableUniqueConstraint> 
-	{
-		public UniqueConstraintsContainerAnnotation() {
-			super(TableGeneratorImpl.this);
-		}
-		
-		public void initialize(CompilationUnit astRoot) {
-			//nothing to initialize
-		}
-		
-		public NestableUniqueConstraint addInternal(int index) {
-			NestableUniqueConstraint uniqueConstraint = TableGeneratorImpl.this.createUniqueConstraint(index);
-			TableGeneratorImpl.this.uniqueConstraints.add(index, uniqueConstraint);
-			return uniqueConstraint;
-		}
-		
-		public NestableUniqueConstraint add(int index) {
-			NestableUniqueConstraint uniqueConstraint = TableGeneratorImpl.this.createUniqueConstraint(index);
-			TableGeneratorImpl.this.addUniqueConstraint(index, uniqueConstraint);
-			return uniqueConstraint;
-		}
-
-		public String getAnnotationName() {
-			return TableGeneratorImpl.this.getAnnotationName();
-		}
-
-		public String getNestableAnnotationName() {
-			return JPA.UNIQUE_CONSTRAINT;
-		}
-
-		public int indexOf(NestableUniqueConstraint uniqueConstraint) {
-			return TableGeneratorImpl.this.indexOfUniqueConstraint(uniqueConstraint);
-		}
-
-		public void move(int targetIndex, int sourceIndex) {
-			TableGeneratorImpl.this.moveUniqueConstraint(targetIndex, sourceIndex);
-		}
-
-		public void moveInternal(int targetIndex, int sourceIndex) {
-			TableGeneratorImpl.this.moveUniqueConstraintInternal(targetIndex, sourceIndex);
-		}
-
-		public NestableUniqueConstraint nestedAnnotationAt(int index) {
-			return TableGeneratorImpl.this.uniqueConstraintAt(index);
-		}
-
-		public NestableUniqueConstraint nestedAnnotationFor(org.eclipse.jdt.core.dom.Annotation jdtAnnotation) {
-			for (NestableUniqueConstraint uniqueConstraint : CollectionTools.iterable(nestedAnnotations())) {
-				if (jdtAnnotation == uniqueConstraint.getJdtAnnotation((CompilationUnit) jdtAnnotation.getRoot())) {
-					return uniqueConstraint;
-				}
-			}
-			return null;
-		}
-
-		public ListIterator<NestableUniqueConstraint> nestedAnnotations() {
-			return new CloneListIterator<NestableUniqueConstraint>(TableGeneratorImpl.this.uniqueConstraints);
-		}
-
-		public int nestedAnnotationsSize() {
-			return TableGeneratorImpl.this.uniqueConstraints.size();
-		}
-
-		public void remove(NestableUniqueConstraint uniqueConstraint) {
-			TableGeneratorImpl.this.removeUniqueConstraint(uniqueConstraint);	
-		}
-
-		public void remove(int index) {
-			this.remove(nestedAnnotationAt(index));
-		}
-
-		public org.eclipse.jdt.core.dom.Annotation getJdtAnnotation(CompilationUnit astRoot) {
-			return TableGeneratorImpl.this.getJdtAnnotation(astRoot);
-		}
-
-		public void newAnnotation() {
-			TableGeneratorImpl.this.newAnnotation();
-		}
-
-		public void removeAnnotation() {
-			TableGeneratorImpl.this.removeAnnotation();
-		}
-
-		public void updateFromJava(CompilationUnit astRoot) {
-			TableGeneratorImpl.this.updateFromJava(astRoot);
-		}
-		
-		public TextRange getTextRange(CompilationUnit astRoot) {
-			return TableGeneratorImpl.this.getTextRange(astRoot);
-		}
-		
-		public String getElementName() {
-			return "uniqueConstraints";
-		}
-	}
-	
-	public static class TableGeneratorAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final TableGeneratorAnnotationDefinition INSTANCE = new TableGeneratorAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private TableGeneratorAnnotationDefinition() {
-			super();
-		}
-		
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new TableGeneratorImpl(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.core/src/org/eclipse/jpt/core/internal/resource/java/TableImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableImpl.java
deleted file mode 100644
index b7a7d57a5e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableImpl.java
+++ /dev/null
@@ -1,99 +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.core.internal.resource.java;
-
-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.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.Annotation;
-import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.NestableUniqueConstraint;
-import org.eclipse.jpt.core.resource.java.TableAnnotation;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-
-public class TableImpl extends AbstractResourceTable
-{
-	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> NAME_ADAPTER = ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, JPA.TABLE__NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> SCHEMA_ADAPTER = ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, JPA.TABLE__SCHEMA);
-
-	private static final DeclarationAnnotationElementAdapter<String> CATALOG_ADAPTER = ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, JPA.TABLE__CATALOG);
-	
-	protected TableImpl(JavaResourceNode parent, Member member) {
-		super(parent, member, DECLARATION_ANNOTATION_ADAPTER, new MemberAnnotationAdapter(member, DECLARATION_ANNOTATION_ADAPTER));
-	}
-
-	public String getAnnotationName() {
-		return TableAnnotation.ANNOTATION_NAME;
-	}
-	
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> nameAdapter(DeclarationAnnotationAdapter declarationAnnotationAdapter) {
-		// ignore the daa passed in, @Table is never nested
-		return NAME_ADAPTER;
-	}
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> schemaAdapter(DeclarationAnnotationAdapter declarationAnnotationAdapter) {
-		// ignore the daa passed in, @Table is never nested
-		return SCHEMA_ADAPTER;
-	}
-
-	@Override
-	protected DeclarationAnnotationElementAdapter<String> catalogAdapter(DeclarationAnnotationAdapter declarationAnnotationAdapter) {
-		// ignore the daa passed in, @Table is never nested
-		return CATALOG_ADAPTER;
-	}
-	
-	@Override
-	protected NestableUniqueConstraint createUniqueConstraint(int index) {
-		return UniqueConstraintImpl.createTableUniqueConstraint(this, this.getMember(), index);
-	}
-	
-	public static class TableAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final TableAnnotationDefinition INSTANCE = new TableAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private TableAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new TableImpl(parent, member);
-		}
-
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new NullTable(parent);
-		}
-		
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TemporalImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TemporalImpl.java
deleted file mode 100644
index 0796162e82..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TemporalImpl.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
-import org.eclipse.jpt.core.resource.java.TemporalAnnotation;
-import org.eclipse.jpt.core.resource.java.TemporalType;
-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;
-
-public class TemporalImpl extends AbstractResourceAnnotation<Attribute> implements TemporalAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-	
-	private static final DeclarationAnnotationElementAdapter<String> VALUE_ADAPTER = buildValueAdapter();
-
-	private final AnnotationElementAdapter<String> valueAdapter;
-
-	private TemporalType value;
-	
-	protected TemporalImpl(JavaResourceNode 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;
-	}
-	
-	public TemporalType getValue() {
-		return this.value;
-	}
-	
-	public void setValue(TemporalType newValue) {
-		if (attributeValueHasNotChanged(this.value, newValue)) {
-			return;
-		}
-		TemporalType oldValue = this.value;
-		this.value = newValue;
-		this.valueAdapter.setValue(TemporalType.toJavaAnnotationValue(newValue));
-		firePropertyChanged(VALUE_PROPERTY, oldValue, newValue);
-	}
-	
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(VALUE_ADAPTER, astRoot);
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		this.setValue(this.value(astRoot));
-	}
-	
-	protected TemporalType value(CompilationUnit astRoot) {
-		return TemporalType.fromJavaAnnotationValue(this.valueAdapter.getValue(astRoot));
-	}
-	
-	// ********** static methods **********
-	private static DeclarationAnnotationElementAdapter<String> buildValueAdapter() {
-		return new EnumDeclarationAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, JPA.TEMPORAL__VALUE);
-	}
-	
-	public static class TemporalAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final TemporalAnnotationDefinition INSTANCE = new TemporalAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static AnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private TemporalAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new TemporalImpl(parent, (Attribute) member);
-		}
-		
-		public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new NullTemporal(parent);
-		}
-		
-		public String getAnnotationName() {
-			return ANNOTATION_NAME;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TransientImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TransientImpl.java
deleted file mode 100644
index 7a50681c8e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TransientImpl.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.resource.java.TransientAnnotation;
-import org.eclipse.jpt.core.utility.jdt.Attribute;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-
-public class TransientImpl extends AbstractResourceAnnotation<Attribute> implements TransientAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-	
-	protected TransientImpl(JavaResourcePersistentAttribute parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		//nothing to initialize
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		//no annotation members
-	}
-	
-	public static class TransientAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final TransientAnnotationDefinition INSTANCE = new TransientAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static TransientAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private TransientAnnotationDefinition() {
-			super();
-		}
-
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new TransientImpl((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.core/src/org/eclipse/jpt/core/internal/resource/java/UniqueConstraintImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/UniqueConstraintImpl.java
deleted file mode 100644
index fafa46e559..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/UniqueConstraintImpl.java
+++ /dev/null
@@ -1,184 +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.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.utility.jdt.AnnotationStringArrayExpressionConverter;
-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.ShortCircuitArrayAnnotationElementAdapter;
-import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.core.resource.java.NestableUniqueConstraint;
-import org.eclipse.jpt.core.resource.java.UniqueConstraintAnnotation;
-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.ExpressionConverter;
-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.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-
-public class UniqueConstraintImpl extends AbstractResourceAnnotation<Member> implements NestableUniqueConstraint
-{
-	
-	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(JPA.UNIQUE_CONSTRAINT);
-
-	private final DeclarationAnnotationElementAdapter<String[]> columnNamesDeclarationAdapter;
-
-	private final AnnotationElementAdapter<String[]> columnNamesAdapter;
-
-	private final List<String> columnNames;
-
-
-	public UniqueConstraintImpl(JavaResourceNode parent, Member member, IndexedDeclarationAnnotationAdapter idaa) {
-		super(parent, member, idaa, new MemberIndexedAnnotationAdapter(member, idaa));
-		this.columnNamesDeclarationAdapter = buildArrayAnnotationElementAdapter(idaa, JPA.UNIQUE_CONSTRAINT__COLUMN_NAMES);
-		this.columnNamesAdapter = this.buildAnnotationElementAdapter(this.columnNamesDeclarationAdapter);
-		this.columnNames = new ArrayList<String>();
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		String[] javaColumnNames = this.columnNamesAdapter.getValue(astRoot);
-		for (int i = 0; i < javaColumnNames.length; i++) {
-			this.columnNames.add(javaColumnNames[i]);
-		}
-	}
-	
-	protected AnnotationElementAdapter<String[]> buildAnnotationElementAdapter(DeclarationAnnotationElementAdapter<String[]> daea) {
-		return new ShortCircuitArrayAnnotationElementAdapter<String>(getMember(), daea);
-	}
-
-	protected static DeclarationAnnotationElementAdapter<String[]> buildArrayAnnotationElementAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName) {
-		return buildArrayAnnotationElementAdapter(annotationAdapter, elementName, AnnotationStringArrayExpressionConverter.forStrings());
-	}
-
-	protected static DeclarationAnnotationElementAdapter<String[]> buildArrayAnnotationElementAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName, ExpressionConverter<String[]> converter) {
-		return new ConversionDeclarationAnnotationElementAdapter<String[]>(annotationAdapter, elementName, false, converter);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	@Override
-	public IndexedAnnotationAdapter getAnnotationAdapter() {
-		return (IndexedAnnotationAdapter) super.getAnnotationAdapter();
-	}
-	
-	public void initializeFrom(NestableAnnotation oldAnnotation) {
-		UniqueConstraintAnnotation oldUniqueConstraint = (UniqueConstraintAnnotation) oldAnnotation;
-		for (String columnName : CollectionTools.iterable(oldUniqueConstraint.columnNames())) {
-			addColumnName(columnNamesSize(), columnName);
-		}
-	}
-	
-	public ListIterator<String> columnNames() {
-		return new CloneListIterator<String>(this.columnNames);
-	}
-
-	public int columnNamesSize() {
-		return this.columnNames.size();
-	}
-	
-	public void addColumnName(String columnName) {
-		addColumnName(columnNamesSize(), columnName);
-	}
-	
-	public void addColumnName(int index, String columnName) {
-		addColumnName_(index, columnName);
-		this.columnNamesAdapter.setValue(this.columnNames.toArray(new String[this.columnNames.size()]));
-	}
-	
-	protected void addColumnName_(int index, String columnName) {
-		addItemToList(index, columnName, this.columnNames, COLUMN_NAMES_LIST);
-	}
-	
-	public void removeColumnName(String columnName) {
-		removeItemFromList(columnName, this.columnNames, COLUMN_NAMES_LIST);
-		this.columnNamesAdapter.setValue(this.columnNames.toArray(new String[this.columnNames.size()]));
-	}
-
-	public void removeColumnName(int index) {
-		removeItemFromList(index, this.columnNames, COLUMN_NAMES_LIST);
-		this.columnNamesAdapter.setValue(this.columnNames.toArray(new String[this.columnNames.size()]));
-	}
-	
-	public void moveColumnName(int targetIndex, int sourceIndex) {
-		moveItemInList(targetIndex, sourceIndex, this.columnNames, COLUMN_NAMES_LIST);
-		this.columnNamesAdapter.setValue(this.columnNames.toArray(new String[this.columnNames.size()]));
-	}
-	
-	public boolean columnNamesTouches(int pos, CompilationUnit astRoot) {
-		return this.elementTouches(this.columnNamesDeclarationAdapter, pos, astRoot);
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		this.updateColumnNamesFromJava(astRoot);
-	}
-
-	protected void updateColumnNamesFromJava(CompilationUnit astRoot) {
-		String[] javaColumnNames = this.columnNamesAdapter.getValue(astRoot);
-		//TODO hmm, seems we need change notification for this
-		CollectionTools.retainAll(this.columnNames, javaColumnNames);
-		for (int i = 0; i < javaColumnNames.length; i++) {
-			String columnName = javaColumnNames[i];
-			if (!this.columnNames.contains(columnName)) {
-				addColumnName_(columnNamesSize(), columnName);
-			}
-		}
-	}
-
-	// ********** persistence model -> java annotations **********
-	public void moveAnnotation(int newIndex) {
-		getAnnotationAdapter().moveAnnotation(newIndex);
-	}
-
-	// ********** static methods **********
-	static NestableUniqueConstraint createSecondaryTableUniqueConstraint(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter declarationAnnotationAdapter, int index) {
-		return new UniqueConstraintImpl(parent, member, buildSecondaryTableUniqueConstraintAnnotationAdapter(declarationAnnotationAdapter, index));
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildSecondaryTableUniqueConstraintAnnotationAdapter(DeclarationAnnotationAdapter declarationAnnotationAdapter, int index) {
-		return new NestedIndexedDeclarationAnnotationAdapter(declarationAnnotationAdapter, JPA.SECONDARY_TABLE__UNIQUE_CONSTRAINTS, index, JPA.UNIQUE_CONSTRAINT);
-	}
-
-	static NestableUniqueConstraint createJoinTableUniqueConstraint(JavaResourceNode parent, Member member, int index) {
-		return new UniqueConstraintImpl(parent, member, buildJoinTableUniqueConstraintAnnotationAdapter(index));
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildJoinTableUniqueConstraintAnnotationAdapter(int index) {
-		return new NestedIndexedDeclarationAnnotationAdapter(JoinTableImpl.DECLARATION_ANNOTATION_ADAPTER, JPA.JOIN_TABLE__UNIQUE_CONSTRAINTS, index, JPA.UNIQUE_CONSTRAINT);
-	}
-
-	static NestableUniqueConstraint createTableUniqueConstraint(JavaResourceNode parent, Member member, int index) {
-		return new UniqueConstraintImpl(parent, member, buildTableUniqueConstraintAnnotationAdapter(index));
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildTableUniqueConstraintAnnotationAdapter(int index) {
-		return new NestedIndexedDeclarationAnnotationAdapter(TableImpl.DECLARATION_ANNOTATION_ADAPTER, JPA.TABLE__UNIQUE_CONSTRAINTS, index, JPA.UNIQUE_CONSTRAINT);
-	}
-
-	static NestableUniqueConstraint createTableGeneratorUniqueConstraint(JavaResourceNode parent, Member member, int index) {
-		return new UniqueConstraintImpl(parent, member, buildTableGeneratorUniqueConstraintAnnotationAdapter(index));
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildTableGeneratorUniqueConstraintAnnotationAdapter(int index) {
-		return new NestedIndexedDeclarationAnnotationAdapter(TableGeneratorImpl.DECLARATION_ANNOTATION_ADAPTER, JPA.TABLE_GENERATOR__UNIQUE_CONSTRAINTS, index, JPA.UNIQUE_CONSTRAINT);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/VersionImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/VersionImpl.java
deleted file mode 100644
index 97ce0278aa..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/VersionImpl.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.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.resource.java.VersionAnnotation;
-import org.eclipse.jpt.core.utility.jdt.Attribute;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-
-public class VersionImpl extends AbstractResourceAnnotation<Attribute> implements VersionAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	public VersionImpl(JavaResourcePersistentAttribute parent, Attribute attribute) {
-		super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER);
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		//nothing to initialize
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void updateFromJava(CompilationUnit astRoot) {
-		//no annotation members
-	}
-	
-	public static class VersionAnnotationDefinition implements AnnotationDefinition
-	{
-		// singleton
-		private static final VersionAnnotationDefinition INSTANCE = new VersionAnnotationDefinition();
-
-		/**
-		 * Return the singleton.
-		 */
-		public static VersionAnnotationDefinition instance() {
-			return INSTANCE;
-		}
-
-		/**
-		 * Ensure non-instantiability.
-		 */
-		private VersionAnnotationDefinition() {
-			super();
-		}
-		
-		public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) {
-			return new VersionImpl((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.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/AssociationOverrideTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/AssociationOverrideTranslator.java
deleted file mode 100644
index 13fd060358..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/AssociationOverrideTranslator.java
+++ /dev/null
@@ -1,53 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class AssociationOverrideTranslator extends Translator
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public AssociationOverrideTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlAssociationOverrideImpl();
-	}
-		
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createJoinColumnTranslator()
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlAssociationOverride_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createJoinColumnTranslator() {
-		return new JoinColumnTranslator(JOIN_COLUMN, ORM_PKG.getXmlAssociationOverride_JoinColumns());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/AttributeOverrideTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/AttributeOverrideTranslator.java
deleted file mode 100644
index 4edfc341c4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/AttributeOverrideTranslator.java
+++ /dev/null
@@ -1,53 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class AttributeOverrideTranslator extends Translator 
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public AttributeOverrideTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl();
-	}
-
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createColumnTranslator()
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlAttributeOverride_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createColumnTranslator() {
-		return new ColumnTranslator(COLUMN, ORM_PKG.getXmlAttributeOverride_Column());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/AttributesTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/AttributesTranslator.java
deleted file mode 100644
index 0b78832ee0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/AttributesTranslator.java
+++ /dev/null
@@ -1,88 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class AttributesTranslator extends Translator 
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public AttributesTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createIdTranslator(),
-			createEmbeddedIdTranslator(),
-			createBasicTranslator(),
-			createVersionTranslator(),
-			createManyToOneTranslator(),
-			createOneToManyTranslator(),
-			createOneToOneTranslator(),
-			createManyToManyTranslator(),
-			createEmbeddedTranslator(),
-			createTransientTranslator()
-		};
-	}
-	
-	private Translator createIdTranslator() {
-		return new IdTranslator(ID, ORM_PKG.getAttributes_Ids());
-	}
-	
-	private Translator createEmbeddedIdTranslator() {
-		return new EmbeddedIdTranslator(EMBEDDED_ID, ORM_PKG.getAttributes_EmbeddedIds());
-	}
-	
-	private Translator createBasicTranslator() {
-		return new BasicTranslator(BASIC, ORM_PKG.getAttributes_Basics());
-	}
-	
-	private Translator createVersionTranslator() {
-		return new VersionTranslator(VERSION, ORM_PKG.getAttributes_Versions());
-	}
-	
-	private Translator createManyToOneTranslator() {
-		return new ManyToOneTranslator(MANY_TO_ONE, ORM_PKG.getAttributes_ManyToOnes());
-	}
-	
-	private Translator createOneToManyTranslator() {
-		return new OneToManyTranslator(ONE_TO_MANY, ORM_PKG.getAttributes_OneToManys());
-	}
-	
-	private Translator createOneToOneTranslator() {
-		return new OneToOneTranslator(ONE_TO_ONE, ORM_PKG.getAttributes_OneToOnes());
-	}
-	
-	private Translator createManyToManyTranslator() {
-		return new ManyToManyTranslator(MANY_TO_MANY, ORM_PKG.getAttributes_ManyToManys());
-	}
-	
-	private Translator createEmbeddedTranslator() {
-		return new EmbeddedTranslator(EMBEDDED, ORM_PKG.getAttributes_Embeddeds());
-	}
-	
-	private Translator createTransientTranslator() {
-		return new TransientTranslator(TRANSIENT, ORM_PKG.getAttributes_Transients());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/BasicTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/BasicTranslator.java
deleted file mode 100644
index 556c5ccc7f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/BasicTranslator.java
+++ /dev/null
@@ -1,79 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.common.translators.BooleanTranslator;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class BasicTranslator extends Translator 
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public BasicTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlBasicImpl();
-	}
-
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createFetchTranslator(),
-			createOptionalTranslator(),
-			createColumnTranslator(), 
-			createLobTranslator(),
-			createTemporalTranslator(),
-			createEnumeratedTranslator()
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlAttributeMapping_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createFetchTranslator() {
-		return new Translator(FETCH, ORM_PKG.getXmlBasic_Fetch(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createOptionalTranslator() {
-		return new BooleanTranslator(OPTIONAL, ORM_PKG.getXmlBasic_Optional(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createColumnTranslator() {
-		return new ColumnTranslator(COLUMN, ORM_PKG.getColumnMapping_Column());
-	}
-	
-	private Translator createLobTranslator() {
-		return new EmptyTagBooleanTranslator(LOB, ORM_PKG.getXmlBasic_Lob());
-	}
-	
-	private Translator createTemporalTranslator() {
-		return new Translator(TEMPORAL, ORM_PKG.getXmlBasic_Temporal());
-	}
-	
-	private Translator createEnumeratedTranslator() {
-		return new Translator(ENUMERATED, ORM_PKG.getXmlBasic_Enumerated());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/CascadeTypeTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/CascadeTypeTranslator.java
deleted file mode 100644
index d66f4a515c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/CascadeTypeTranslator.java
+++ /dev/null
@@ -1,68 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class CascadeTypeTranslator extends Translator 
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public CascadeTypeTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createCascadeTypeImpl();
-	}
-	
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createCascadeAllTranslator(),
-			createCascadePersistTranslator(),
-			createCascadeMergeTranslator(),
-			createCascadeRemoveTranslator(),
-			createCascadeRefreshTranslator()
-		};
-	}
-	
-	private Translator createCascadeAllTranslator() {
-		return new EmptyTagBooleanTranslator(CASCADE_ALL, ORM_PKG.getCascadeType_CascadeAll());
-	}
-	
-	private Translator createCascadePersistTranslator() {
-		return new EmptyTagBooleanTranslator(CASCADE_PERSIST, ORM_PKG.getCascadeType_CascadePersist());
-	}
-	
-	private Translator createCascadeMergeTranslator() {
-		return new EmptyTagBooleanTranslator(CASCADE_MERGE, ORM_PKG.getCascadeType_CascadeMerge());
-	}
-	
-	private Translator createCascadeRemoveTranslator() {
-		return new EmptyTagBooleanTranslator(CASCADE_REMOVE, ORM_PKG.getCascadeType_CascadeRemove());
-	}
-
-	private Translator createCascadeRefreshTranslator() {
-		return new EmptyTagBooleanTranslator(CASCADE_REFRESH, ORM_PKG.getCascadeType_CascadeRefresh());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ColumnResultTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ColumnResultTranslator.java
deleted file mode 100644
index e59c405adb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ColumnResultTranslator.java
+++ /dev/null
@@ -1,43 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class ColumnResultTranslator extends Translator 
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public ColumnResultTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator()
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getColumnResult_Name(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ColumnTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ColumnTranslator.java
deleted file mode 100644
index 03941953bb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ColumnTranslator.java
+++ /dev/null
@@ -1,95 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.common.translators.BooleanTranslator;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class ColumnTranslator extends Translator
-	implements OrmXmlMapper
-{		
-	private Translator[] children;	
-	
-	
-	public ColumnTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlColumnImpl();
-	}
-
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createUniqueTranslator(),
-			createNullableTranslator(),
-			createInsertableTranslator(),
-			createUpdatableTranslator(),
-			createColumnDefinitionTranslator(),
-			createTableTranslator(),
-			createLengthTranslator(),
-			createPrecisionTranslator(),
-			createScaleTranslator(),
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlNamedColumn_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createUniqueTranslator() {
-		return new BooleanTranslator(UNIQUE, ORM_PKG.getXmlAbstractColumn_Unique(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createNullableTranslator() {
-		return new BooleanTranslator(NULLABLE, ORM_PKG.getXmlAbstractColumn_Nullable(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createInsertableTranslator() {
-		return new BooleanTranslator(INSERTABLE, ORM_PKG.getXmlAbstractColumn_Insertable(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createUpdatableTranslator() {
-		return new BooleanTranslator(UPDATABLE, ORM_PKG.getXmlAbstractColumn_Updatable(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createColumnDefinitionTranslator() {
-		return new Translator(COLUMN_DEFINITION, ORM_PKG.getXmlNamedColumn_ColumnDefinition(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createTableTranslator() {
-		return new Translator(TABLE, ORM_PKG.getXmlAbstractColumn_Table(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createLengthTranslator() {
-		return new Translator(LENGTH, ORM_PKG.getXmlColumn_Length(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createPrecisionTranslator() {
-		return new Translator(PRECISION, ORM_PKG.getXmlColumn_Precision(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createScaleTranslator() {
-		return new Translator(SCALE, ORM_PKG.getXmlColumn_Scale(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/DiscriminatorColumnTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/DiscriminatorColumnTranslator.java
deleted file mode 100644
index 1566293eb8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/DiscriminatorColumnTranslator.java
+++ /dev/null
@@ -1,56 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class DiscriminatorColumnTranslator extends Translator
-	implements OrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public DiscriminatorColumnTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createDiscrminiatorTypeTranslator(),
-			createColumnDefinitionTranslator(),
-			createLengthTranslator()
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlNamedColumn_Name(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createDiscrminiatorTypeTranslator() {
-		return new Translator(DISCRIMINATOR_TYPE, ORM_PKG.getXmlDiscriminatorColumn_DiscriminatorType(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createColumnDefinitionTranslator() {
-		return new Translator(COLUMN_DEFINITION, ORM_PKG.getXmlNamedColumn_ColumnDefinition(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createLengthTranslator() {
-		return new Translator(LENGTH, ORM_PKG.getXmlDiscriminatorColumn_Length(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmbeddableTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmbeddableTranslator.java
deleted file mode 100644
index 881359acd2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmbeddableTranslator.java
+++ /dev/null
@@ -1,61 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EmbeddableTranslator extends Translator
-	implements OrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public EmbeddableTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}	
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createClassTranslator(),
-			createAccessTranslator(),
-			createMetadataCompleteTranslator(),
-			createDescriptionTranslator(),
-			createAttributesTranslator()
-		};
-	}
-	
-	private Translator createClassTranslator() {
-		return new Translator(CLASS, ORM_PKG.getAbstractXmlTypeMapping_ClassName(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createAccessTranslator() {
-		return new Translator(ACCESS, ORM_PKG.getAbstractXmlTypeMapping_Access(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createMetadataCompleteTranslator() {
-		return new Translator(METADATA_COMPLETE, ORM_PKG.getAbstractXmlTypeMapping_MetadataComplete(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createDescriptionTranslator() {
-		return new Translator(DESCRIPTION, ORM_PKG.getAbstractXmlTypeMapping_Description());
-	}
-	
-	private Translator createAttributesTranslator() {
-		return new AttributesTranslator(ATTRIBUTES, ORM_PKG.getAbstractXmlTypeMapping_Attributes());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmbeddedIdTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmbeddedIdTranslator.java
deleted file mode 100644
index 48c1e2fdab..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmbeddedIdTranslator.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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EmbeddedIdTranslator extends Translator
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public EmbeddedIdTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlEmbeddedIdImpl();
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createAttributeOverrideTranslator()
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlAttributeMapping_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createAttributeOverrideTranslator() {
-		return new AttributeOverrideTranslator(ATTRIBUTE_OVERRIDE, ORM_PKG.getBaseXmlEmbedded_AttributeOverrides());
-	}	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmbeddedTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmbeddedTranslator.java
deleted file mode 100644
index 184b8b25de..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmbeddedTranslator.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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EmbeddedTranslator extends Translator
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public EmbeddedTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlEmbeddedImpl();
-	}
-
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createAttributeOverrideTranslator()
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlAttributeMapping_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createAttributeOverrideTranslator() {
-		return new AttributeOverrideTranslator(ATTRIBUTE_OVERRIDE, ORM_PKG.getBaseXmlEmbedded_AttributeOverrides());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmptyTagBooleanTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmptyTagBooleanTranslator.java
deleted file mode 100644
index b2bdee2c86..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmptyTagBooleanTranslator.java
+++ /dev/null
@@ -1,52 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * This translator is to be used for empty xml tags that correspond
- * to a boolean attribute in the emf model.  
- * cascade-persist is an example from the orm.xsd:
- * 
- * 	<persistence-unit-defaults>
- * 		<cascade-persist/>        
- * 	</persistence-unit-defaults>  ==>  cascadePersist == true
- * 
- * vs.
- * 
- * 	<persistence-unit-defaults>  
- * 	</persistence-unit-defaults>  ==>  cascadePersist == false
- * 
- */
-public class EmptyTagBooleanTranslator extends Translator
-{
-	public EmptyTagBooleanTranslator(String domNameAndPath, EStructuralFeature feature) {
-		super(domNameAndPath, feature, EMPTY_TAG | BOOLEAN_FEATURE);
-	}
-
-	public EmptyTagBooleanTranslator(String domNameAndPath, EStructuralFeature aFeature, int style) {
-		super(domNameAndPath, aFeature, style | EMPTY_TAG | BOOLEAN_FEATURE);
-	}
-	
-	@Override
-	public Object getMOFValue(EObject mofObject) {
-		// I am overriding this method.  This is so the tag will be removed when 
-		// the value is false.
-		// I'm not sure if this is a bug in the ecore or maybe in the translators, 
-		// but I really don't think that we should have to depend on the boolean
-		// being "unset" to remove the tag.
-		Boolean value = (Boolean) super.getMOFValue(mofObject);
-		return (value == Boolean.TRUE) ? value : null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EntityListenerTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EntityListenerTranslator.java
deleted file mode 100644
index f42801fb7a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EntityListenerTranslator.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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EntityListenerTranslator extends Translator
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public EntityListenerTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	private Translator[] createChildren() {
-		return new Translator[] {
-			createClassTranslator(),
-			createPrePersistTranslator(),
-			createPostPersistTranslator(),
-			createPreRemoveTranslator(),
-			createPostRemoveTranslator(),
-			createPreUpdateTranslator(),
-			createPostUpdateTranslator(),
-			createPostLoadTranslator()
-		};
-	}
-	
-	private Translator createClassTranslator() {
-		return new Translator(CLASS, ORM_PKG.getEntityListener_ClassName());
-	}
-	
-	private Translator createPrePersistTranslator() {
-		return new EventMethodTranslator(PRE_PERSIST, ORM_PKG.getEntityListener_PrePersist());
-	}
-	
-	private Translator createPostPersistTranslator() {
-		return new EventMethodTranslator(POST_PERSIST, ORM_PKG.getEntityListener_PostPersist());
-	}
-	
-	private Translator createPreRemoveTranslator() {
-		return new EventMethodTranslator(PRE_REMOVE, ORM_PKG.getEntityListener_PreRemove());
-	}
-	
-	private Translator createPostRemoveTranslator() {
-		return new EventMethodTranslator(POST_REMOVE, ORM_PKG.getEntityListener_PostRemove());
-	}
-	
-	private Translator createPreUpdateTranslator() {
-		return new EventMethodTranslator(PRE_UPDATE, ORM_PKG.getEntityListener_PreUpdate());
-	}
-	
-	private Translator createPostUpdateTranslator() {
-		return new EventMethodTranslator(POST_UPDATE, ORM_PKG.getEntityListener_PostUpdate());
-	}
-	
-	private Translator createPostLoadTranslator() {
-		return new EventMethodTranslator(POST_LOAD, ORM_PKG.getEntityListener_PostLoad());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EntityListenersTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EntityListenersTranslator.java
deleted file mode 100644
index 959a660ea2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EntityListenersTranslator.java
+++ /dev/null
@@ -1,43 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EntityListenersTranslator extends Translator
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public EntityListenersTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	private Translator[] createChildren() {
-		return new Translator[] {
-			createEntityListenerTranslator()
-		};
-	}
-	
-	private Translator createEntityListenerTranslator() {
-		return new EntityListenerTranslator(ENTITY_LISTENER, ORM_PKG.getEntityListeners_EntityListeners());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EntityMappingsTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EntityMappingsTranslator.java
deleted file mode 100644
index 5e597752ed..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EntityMappingsTranslator.java
+++ /dev/null
@@ -1,118 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.wst.common.internal.emf.resource.ConstantAttributeTranslator;
-import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EntityMappingsTranslator extends RootTranslator
-	implements OrmXmlMapper
-{
-	public static EntityMappingsTranslator INSTANCE = new EntityMappingsTranslator();
-	
-	
-	private Translator[] children;
-	
-	
-	public EntityMappingsTranslator() {
-		super(ENTITY_MAPPINGS, ORM_PKG.getXmlEntityMappings());
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	private Translator[] createChildren() {
-		return new Translator[] {
-			new ConstantAttributeTranslator(XML_NS, PERSISTENCE_NS_URL),
-			new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL),
-			new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, PERSISTENCE_NS_URL + ' ' + ORM_SCHEMA_LOC_1_0),
-			createVersionTranslator(),
-			createDescriptionTranslator(),
-			createPersistenceUnitMetadataTranslator(),
-			createPackageTranslator(),
-			createSchemaTranslator(),
-			createCatalogTranslator(),
-			createAccessTranslator(),
-			createSequenceGeneratorTranslator(),
-			createTableGeneratorTranslator(),
-			createNamedQueryTranslator(),
-			createNamedNativeQueryTranslator(),
-			createSqlResultSetMappingTranslator(),
-			createMappedSuperclassTranslator(),
-			createEntityTranslator(),
-			createEmbeddableTranslator()
-		};
-	}	
-	
-	private Translator createVersionTranslator() {
-		return new Translator(VERSION, ORM_PKG.getXmlEntityMappings_Version(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createDescriptionTranslator() {
-		return new Translator(DESCRIPTION, ORM_PKG.getXmlEntityMappings_Description());
-	}
-	
-	private Translator createPersistenceUnitMetadataTranslator() {
-		return new PersistenceUnitMetadataTranslator(PERSISTENCE_UNIT_METADATA, ORM_PKG.getXmlEntityMappings_PersistenceUnitMetadata());
-	}
-	
-	private Translator createPackageTranslator() {
-		return new Translator(PACKAGE, ORM_PKG.getXmlEntityMappings_Package());
-	}
-	
-	private Translator createSchemaTranslator() {
-		return new Translator(SCHEMA, ORM_PKG.getXmlEntityMappings_Schema());
-	}
-	
-	private Translator createCatalogTranslator() {
-		return new Translator(CATALOG, ORM_PKG.getXmlEntityMappings_Catalog());
-	}
-	
-	private Translator createAccessTranslator() {
-		return new Translator(ACCESS, ORM_PKG.getXmlEntityMappings_Access());
-	}
-	
-	private Translator createSequenceGeneratorTranslator() {
-		return new SequenceGeneratorTranslator(SEQUENCE_GENERATOR, ORM_PKG.getXmlEntityMappings_SequenceGenerators());
-	}
-	
-	private Translator createTableGeneratorTranslator() {
-		return new TableGeneratorTranslator(TABLE_GENERATOR, ORM_PKG.getXmlEntityMappings_TableGenerators());
-	}
-	
-	private Translator createNamedQueryTranslator() {
-		return new NamedQueryTranslator(NAMED_QUERY, ORM_PKG.getXmlEntityMappings_NamedQueries());
-	}
-	
-	private Translator createNamedNativeQueryTranslator() {
-		return new NamedNativeQueryTranslator(NAMED_NATIVE_QUERY, ORM_PKG.getXmlEntityMappings_NamedNativeQueries());
-	}
-	
-	private Translator createSqlResultSetMappingTranslator() {
-		return new SqlResultSetMappingTranslator(SQL_RESULT_SET_MAPPING, ORM_PKG.getXmlEntityMappings_SqlResultSetMappings());
-	}
-	
-	private Translator createMappedSuperclassTranslator() {
-		return new MappedSuperclassTranslator(MAPPED_SUPERCLASS, ORM_PKG.getXmlEntityMappings_MappedSuperclasses());
-	}
-	
-	private Translator createEntityTranslator() {
-		return new EntityTranslator(ENTITY, ORM_PKG.getXmlEntityMappings_Entities());
-	}
-	
-	private Translator createEmbeddableTranslator() {
-		return new EmbeddableTranslator(EMBEDDABLE, ORM_PKG.getXmlEntityMappings_Embeddables());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EntityResultTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EntityResultTranslator.java
deleted file mode 100644
index f618d41413..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EntityResultTranslator.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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EntityResultTranslator extends Translator 
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public EntityResultTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createEntityClassTranslator(),
-			createDiscriminatorColumnTranslator(),
-			createFieldResultTranslator()
-		};
-	}
-	
-	private Translator createEntityClassTranslator() {
-		return new Translator(ENTITY_CLASS, ORM_PKG.getEntityResult_EntityClass(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createDiscriminatorColumnTranslator() {
-		return new Translator(DISCRIMINATOR_COLUMN, ORM_PKG.getEntityResult_DiscriminatorColumn(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createFieldResultTranslator() {
-		return new FieldResultTranslator(FIELD_RESULT, ORM_PKG.getEntityResult_FieldResults());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EntityTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EntityTranslator.java
deleted file mode 100644
index e44eaaa0c0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EntityTranslator.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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EntityTranslator extends Translator
-	implements OrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public EntityTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createClassTranslator(),
-			createAccessTranslator(),
-			createMetadataCompleteTranslator(),
-			createDescriptionTranslator(),
-			createTableTranslator(),
-			createSecondaryTableTranslator(),
-			createPrimaryKeyJoinColumnTranslator(),
-			createIdClassTranslator(),
-			createInheritanceTranslator(),
-			createDiscriminatorValueTranslator(),
-			createDiscriminatorColumnTranslator(),
-			createSequenceGeneratorTranslator(),
-			createTableGeneratorTranslator(),
-			createNamedQueryTranslator(),
-			createNamedNativeQueryTranslator(),
-			createSqlResultSetMappingTranslator(),
-			createExcludeDefaultListenersTranslator(),
-			createExcludeSuperclassListenersTranslator(),
-			createEntityListenersTranslator(),
-			createPrePersistTranslator(),
-			createPostPersistTranslator(),
-			createPreRemoveTranslator(),
-			createPostRemoveTranslator(),
-			createPreUpdateTranslator(),
-			createPostUpdateTranslator(),
-			createPostLoadTranslator(),
-			createAttributeOverrideTranslator(),
-			createAssociationOverrideTranslator(),
-			createAttributesTranslator()
-		};
-	}
-
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlEntity_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createClassTranslator() {
-		return new Translator(CLASS, ORM_PKG.getAbstractXmlTypeMapping_ClassName(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createAccessTranslator() {
-		return new Translator(ACCESS, ORM_PKG.getAbstractXmlTypeMapping_Access(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createMetadataCompleteTranslator() {
-		return new Translator(METADATA_COMPLETE, ORM_PKG.getAbstractXmlTypeMapping_MetadataComplete(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createDescriptionTranslator() {
-		return new Translator(DESCRIPTION, ORM_PKG.getAbstractXmlTypeMapping_Description());
-	}
-	
-	private Translator createTableTranslator() {
-		return new TableTranslator(TABLE, ORM_PKG.getXmlEntity_Table());
-	}
-	
-	private Translator createSecondaryTableTranslator() {
-		return new SecondaryTableTranslator(SECONDARY_TABLE, ORM_PKG.getXmlEntity_SecondaryTables());
-	}	
-	
-	private Translator createPrimaryKeyJoinColumnTranslator() {
-		return new PrimaryKeyJoinColumnTranslator(PRIMARY_KEY_JOIN_COLUMN, ORM_PKG.getXmlEntity_PrimaryKeyJoinColumns());
-	}
-	
-	private Translator createIdClassTranslator() {
-		return new IdClassTranslator(ID_CLASS, ORM_PKG.getXmlEntity_IdClass());
-	}
-	
-	private Translator createInheritanceTranslator() {
-		return new InheritanceTranslator(INHERITANCE, ORM_PKG.getXmlEntity_Inheritance());
-	}
-	
-	private Translator createDiscriminatorValueTranslator() {
-		return new Translator(DISCRIMINATOR_VALUE, ORM_PKG.getXmlEntity_DiscriminatorValue());
-	}
-	
-	private Translator createDiscriminatorColumnTranslator() {
-		return new DiscriminatorColumnTranslator(DISCRIMINATOR_COLUMN, ORM_PKG.getXmlEntity_DiscriminatorColumn());
-	}
-	
-	private Translator createSequenceGeneratorTranslator() {
-		return new SequenceGeneratorTranslator(SEQUENCE_GENERATOR, ORM_PKG.getXmlEntity_SequenceGenerator());
-	}
-	
-	private Translator createTableGeneratorTranslator() {
-		return new TableGeneratorTranslator(TABLE_GENERATOR, ORM_PKG.getXmlEntity_TableGenerator());
-	}
-	
-	private Translator createNamedQueryTranslator() {
-		return new NamedQueryTranslator(NAMED_QUERY, ORM_PKG.getXmlEntity_NamedQueries());
-	}
-	
-	private Translator createNamedNativeQueryTranslator() {
-		return new NamedNativeQueryTranslator(NAMED_NATIVE_QUERY, ORM_PKG.getXmlEntity_NamedNativeQueries());
-	}
-	
-	private Translator createSqlResultSetMappingTranslator() {
-		return new SqlResultSetMappingTranslator(SQL_RESULT_SET_MAPPING, ORM_PKG.getXmlEntity_SqlResultSetMappings());
-	}
-	
-	private Translator createExcludeDefaultListenersTranslator() {
-		return new EmptyTagBooleanTranslator(EXCLUDE_DEFAULT_LISTENERS, ORM_PKG.getXmlEntity_ExcludeDefaultListeners());
-	}
-	
-	private Translator createExcludeSuperclassListenersTranslator() {
-		return new EmptyTagBooleanTranslator(EXCLUDE_SUPERCLASS_LISTENERS, ORM_PKG.getXmlEntity_ExcludeSuperclassListeners());
-	}
-	
-	private Translator createEntityListenersTranslator() {
-		return new EntityListenersTranslator(ENTITY_LISTENERS, ORM_PKG.getXmlEntity_EntityListeners());
-	}
-	
-	private Translator createPrePersistTranslator() {
-		return new EventMethodTranslator(PRE_PERSIST, ORM_PKG.getXmlEntity_PrePersist());
-	}
-	
-	private Translator createPostPersistTranslator() {
-		return new EventMethodTranslator(POST_PERSIST, ORM_PKG.getXmlEntity_PostPersist());
-	}
-	
-	private Translator createPreRemoveTranslator() {
-		return new EventMethodTranslator(PRE_REMOVE, ORM_PKG.getXmlEntity_PreRemove());
-	}
-	
-	private Translator createPostRemoveTranslator() {
-		return new EventMethodTranslator(POST_REMOVE, ORM_PKG.getXmlEntity_PostRemove());
-	}
-	
-	private Translator createPreUpdateTranslator() {
-		return new EventMethodTranslator(PRE_UPDATE, ORM_PKG.getXmlEntity_PreUpdate());
-	}
-	
-	private Translator createPostUpdateTranslator() {
-		return new EventMethodTranslator(POST_UPDATE, ORM_PKG.getXmlEntity_PostUpdate());
-	}
-	
-	private Translator createPostLoadTranslator() {
-		return new EventMethodTranslator(POST_LOAD, ORM_PKG.getXmlEntity_PostLoad());
-	}
-	
-	private Translator createAttributeOverrideTranslator() {
-		return new AttributeOverrideTranslator(ATTRIBUTE_OVERRIDE, ORM_PKG.getXmlEntity_AttributeOverrides());
-	}
-	
-	private Translator createAssociationOverrideTranslator() {
-		return new AssociationOverrideTranslator(ASSOCIATION_OVERRIDE, ORM_PKG.getXmlEntity_AssociationOverrides());
-	}
-	
-	private Translator createAttributesTranslator() {
-		return new AttributesTranslator(ATTRIBUTES, ORM_PKG.getAbstractXmlTypeMapping_Attributes());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EventMethodTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EventMethodTranslator.java
deleted file mode 100644
index 32b528a38d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EventMethodTranslator.java
+++ /dev/null
@@ -1,43 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EventMethodTranslator extends Translator 
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public EventMethodTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	private Translator[] createChildren() {
-		return new Translator[] {
-			createMethodNameTranslator()
-		};
-	}
-	
-	private Translator createMethodNameTranslator() {
-		return new Translator(METHOD_NAME, ORM_PKG.getEventMethod_MethodName(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/FieldResultTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/FieldResultTranslator.java
deleted file mode 100644
index 4667523cd5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/FieldResultTranslator.java
+++ /dev/null
@@ -1,48 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class FieldResultTranslator extends Translator 
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public FieldResultTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createColumnTranslator()
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getFieldResult_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createColumnTranslator() {
-		return new Translator(COLUMN, ORM_PKG.getFieldResult_Column(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/GeneratedValueTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/GeneratedValueTranslator.java
deleted file mode 100644
index d0fde3d42f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/GeneratedValueTranslator.java
+++ /dev/null
@@ -1,53 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class GeneratedValueTranslator extends Translator 
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public GeneratedValueTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlGeneratedValueImpl();
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createStrategyTranslator(),
-			createGeneratorTranslator()
-		};
-	}
-	
-	protected Translator createStrategyTranslator() {
-		return new Translator(STRATEGY, ORM_PKG.getXmlGeneratedValue_Strategy(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createGeneratorTranslator() {
-		return new Translator(GENERATOR, ORM_PKG.getXmlGeneratedValue_Generator(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/IdClassTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/IdClassTranslator.java
deleted file mode 100644
index b20a6efc61..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/IdClassTranslator.java
+++ /dev/null
@@ -1,41 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class IdClassTranslator extends Translator 
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public IdClassTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createClassTranslator()
-		};
-	}
-	
-	protected Translator createClassTranslator() {
-		return new Translator(CLASS, ORM_PKG.getXmlIdClass_ClassName(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/IdTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/IdTranslator.java
deleted file mode 100644
index db7e3bba39..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/IdTranslator.java
+++ /dev/null
@@ -1,73 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class IdTranslator extends Translator 
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public IdTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlIdImpl();
-	}
-
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createColumnTranslator(),
-			createGeneratedValueTranslator(),
-			createTemporalTranslator(),
-			createTableGeneratorTranslator(),
-			createSequenceGeneratorTranslator()
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlAttributeMapping_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createColumnTranslator() {
-		return new ColumnTranslator(COLUMN, ORM_PKG.getColumnMapping_Column());
-	}
-	
-	private Translator createGeneratedValueTranslator() {
-		return new GeneratedValueTranslator(GENERATED_VALUE, ORM_PKG.getXmlId_GeneratedValue());
-	}
-	
-	private Translator createTemporalTranslator() {
-		return new Translator(TEMPORAL, ORM_PKG.getXmlId_Temporal());
-	}
-	
-	private Translator createTableGeneratorTranslator() {
-		return new TableGeneratorTranslator(TABLE_GENERATOR, ORM_PKG.getXmlId_TableGenerator());
-	}
-	
-	private Translator createSequenceGeneratorTranslator() {
-		return new SequenceGeneratorTranslator(SEQUENCE_GENERATOR, ORM_PKG.getXmlId_SequenceGenerator());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/InheritanceTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/InheritanceTranslator.java
deleted file mode 100644
index 0387fb8b08..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/InheritanceTranslator.java
+++ /dev/null
@@ -1,41 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class InheritanceTranslator extends Translator
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public InheritanceTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createStrategyTranslator(),
-		};
-	}
-	
-	private Translator createStrategyTranslator() {
-		return new Translator(STRATEGY, ORM_PKG.getInheritance_Strategy(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/JoinColumnTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/JoinColumnTranslator.java
deleted file mode 100644
index 1647c4cb66..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/JoinColumnTranslator.java
+++ /dev/null
@@ -1,85 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.common.translators.BooleanTranslator;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class JoinColumnTranslator extends Translator
-	implements OrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public JoinColumnTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlJoinColumnImpl();
-	}
-
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createReferencedColumnNameTranslator(),
-			createUniqueTranslator(),
-			createNullableTranslator(),
-			createInsertableTranslator(),
-			createUpdatableTranslator(),
-			createColumnDefinitionTranslator(),
-			createTableTranslator(),
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlNamedColumn_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createReferencedColumnNameTranslator() {
-		return new Translator(REFERENCED_COLUMN_NAME, ORM_PKG.getXmlJoinColumn_ReferencedColumnName(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createUniqueTranslator() {
-		return new BooleanTranslator(UNIQUE, ORM_PKG.getXmlAbstractColumn_Unique(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createNullableTranslator() {
-		return new BooleanTranslator(NULLABLE, ORM_PKG.getXmlAbstractColumn_Nullable(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createInsertableTranslator() {
-		return new BooleanTranslator(INSERTABLE, ORM_PKG.getXmlAbstractColumn_Insertable(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createUpdatableTranslator() {
-		return new BooleanTranslator(UPDATABLE, ORM_PKG.getXmlAbstractColumn_Updatable(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createColumnDefinitionTranslator() {
-		return new Translator(COLUMN_DEFINITION, ORM_PKG.getXmlNamedColumn_ColumnDefinition(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createTableTranslator() {
-		return new Translator(TABLE, ORM_PKG.getXmlAbstractColumn_Table(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/JoinTableTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/JoinTableTranslator.java
deleted file mode 100644
index 3d0bbccb02..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/JoinTableTranslator.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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class JoinTableTranslator extends Translator
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public JoinTableTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlJoinTableImpl();
-	}
-
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createCatalogTranslator(),
-			createSchemaTranslator(),
-			createJoinColumnTranslator(),
-			createInverseJoinColumnTranslator(),
-			createUniqueConstraintTranslator()
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlBaseTable_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createCatalogTranslator() {
-		return new Translator(CATALOG, ORM_PKG.getXmlBaseTable_Catalog(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createSchemaTranslator() {
-		return new Translator(SCHEMA, ORM_PKG.getXmlBaseTable_Schema(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createJoinColumnTranslator() {
-		return new JoinColumnTranslator(JOIN_COLUMN, ORM_PKG.getXmlJoinTable_JoinColumns());
-	}
-	
-	private Translator createInverseJoinColumnTranslator() {
-		return new JoinColumnTranslator(INVERSE_JOIN_COLUMN, ORM_PKG.getXmlJoinTable_InverseJoinColumns());
-	}
-	
-	private Translator createUniqueConstraintTranslator() {
-		return new UniqueConstraintTranslator(UNIQUE_CONSTRAINT, ORM_PKG.getXmlBaseTable_UniqueConstraints());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ManyToManyTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ManyToManyTranslator.java
deleted file mode 100644
index 2056e81d13..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ManyToManyTranslator.java
+++ /dev/null
@@ -1,83 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class ManyToManyTranslator extends Translator
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public ManyToManyTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlManyToManyImpl();
-	}
-
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createTargetEntityTranslator(),
-			createFetchTranslator(),
-			createMappedByTranslator(),
-			createOrderByTranslator(),
-			createMapKeyTranslator(),
-			createJoinTableTranslator(),
-			createCascadeTranslator()
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlAttributeMapping_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createTargetEntityTranslator() {
-		return new Translator(TARGET_ENTITY, ORM_PKG.getXmlRelationshipMapping_TargetEntity(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createFetchTranslator() {
-		return new Translator(FETCH, ORM_PKG.getXmlRelationshipMapping_Fetch(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createMappedByTranslator() {
-		return new Translator(MAPPED_BY, ORM_PKG.getXmlMultiRelationshipMapping_MappedBy(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createOrderByTranslator() {
-		return new Translator(ORDER_BY, ORM_PKG.getXmlMultiRelationshipMapping_OrderBy());
-	}
-	
-	private Translator createMapKeyTranslator() {
-		return new MapKeyTranslator(MAP_KEY, ORM_PKG.getXmlMultiRelationshipMapping_MapKey());
-	}
-	
-	private Translator createJoinTableTranslator() {
-		return new JoinTableTranslator(JOIN_TABLE, ORM_PKG.getXmlRelationshipMapping_JoinTable());
-	}
-	
-	private Translator createCascadeTranslator() {
-		return new CascadeTypeTranslator(CASCADE, ORM_PKG.getXmlRelationshipMapping_Cascade());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ManyToOneTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ManyToOneTranslator.java
deleted file mode 100644
index aebc86cbd9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ManyToOneTranslator.java
+++ /dev/null
@@ -1,78 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class ManyToOneTranslator extends Translator
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public ManyToOneTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlManyToOneImpl();
-	}
-
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createTargetEntityTranslator(),
-			createFetchTranslator(),
-			createOptionalTranslator(),
-			createJoinColumnTranslator(),
-			createJoinTableTranslator(),
-			createCascadeTranslator()
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlAttributeMapping_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createTargetEntityTranslator() {
-		return new Translator(TARGET_ENTITY, ORM_PKG.getXmlRelationshipMapping_TargetEntity(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createFetchTranslator() {
-		return new Translator(FETCH, ORM_PKG.getXmlRelationshipMapping_Fetch(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createOptionalTranslator() {
-		return new Translator(OPTIONAL, ORM_PKG.getXmlSingleRelationshipMapping_Optional(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createJoinColumnTranslator() {
-		return new JoinColumnTranslator(JOIN_COLUMN, ORM_PKG.getXmlSingleRelationshipMapping_JoinColumns());
-	}
-	
-	private Translator createJoinTableTranslator() {
-		return new JoinTableTranslator(JOIN_TABLE, ORM_PKG.getXmlRelationshipMapping_JoinTable());
-	}
-		
-	private Translator createCascadeTranslator() {
-		return new CascadeTypeTranslator(CASCADE, ORM_PKG.getXmlRelationshipMapping_Cascade());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/MapKeyTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/MapKeyTranslator.java
deleted file mode 100644
index e30517274b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/MapKeyTranslator.java
+++ /dev/null
@@ -1,42 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-public class MapKeyTranslator extends Translator 
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public MapKeyTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		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.getMapKey_Name(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/MappedSuperclassTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/MappedSuperclassTranslator.java
deleted file mode 100644
index 4cfa4c6162..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/MappedSuperclassTranslator.java
+++ /dev/null
@@ -1,116 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class MappedSuperclassTranslator extends Translator
-	implements OrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public MappedSuperclassTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createClassTranslator(),
-			createAccessTranslator(),
-			createMetadataCompleteTranslator(),
-			createDescriptionTranslator(),
-			createIdClassTranslator(),
-			createExcludeDefaultListenersTranslator(),
-			createExcludeSuperclassListenersTranslator(),
-			createEntityListenersTranslator(),
-			createPrePersistTranslator(),
-			createPostPersistTranslator(),
-			createPreRemoveTranslator(),
-			createPostRemoveTranslator(),
-			createPreUpdateTranslator(),
-			createPostUpdateTranslator(),
-			createPostLoadTranslator(),
-			createAttributesTranslator()
-		};
-	}
-	
-	private Translator createClassTranslator() {
-		return new Translator(CLASS, ORM_PKG.getAbstractXmlTypeMapping_ClassName(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createAccessTranslator() {
-		return new Translator(ACCESS, ORM_PKG.getAbstractXmlTypeMapping_Access(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createMetadataCompleteTranslator() {
-		return new Translator(METADATA_COMPLETE, ORM_PKG.getAbstractXmlTypeMapping_MetadataComplete(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createDescriptionTranslator() {
-		return new Translator(DESCRIPTION, ORM_PKG.getAbstractXmlTypeMapping_Description());
-	}
-	
-	private Translator createIdClassTranslator() {
-		return new IdClassTranslator(ID_CLASS, ORM_PKG.getXmlMappedSuperclass_IdClass());
-	}
-	
-	private Translator createExcludeDefaultListenersTranslator() {
-		return new EmptyTagBooleanTranslator(EXCLUDE_DEFAULT_LISTENERS, ORM_PKG.getXmlMappedSuperclass_ExcludeDefaultListeners());
-	}
-	
-	private Translator createExcludeSuperclassListenersTranslator() {
-		return new EmptyTagBooleanTranslator(EXCLUDE_SUPERCLASS_LISTENERS, ORM_PKG.getXmlMappedSuperclass_ExcludeSuperclassListeners());
-	}
-	
-	private Translator createEntityListenersTranslator() {
-		return new EntityListenersTranslator(ENTITY_LISTENERS, ORM_PKG.getXmlMappedSuperclass_EntityListeners());
-	}
-	
-	private Translator createPrePersistTranslator() {
-		return new EventMethodTranslator(PRE_PERSIST, ORM_PKG.getXmlMappedSuperclass_PrePersist());
-	}
-	
-	private Translator createPostPersistTranslator() {
-		return new EventMethodTranslator(POST_PERSIST, ORM_PKG.getXmlMappedSuperclass_PostPersist());
-	}
-	
-	private Translator createPreRemoveTranslator() {
-		return new EventMethodTranslator(PRE_REMOVE, ORM_PKG.getXmlMappedSuperclass_PreRemove());
-	}
-	
-	private Translator createPostRemoveTranslator() {
-		return new EventMethodTranslator(POST_REMOVE, ORM_PKG.getXmlMappedSuperclass_PostRemove());
-	}
-	
-	private Translator createPreUpdateTranslator() {
-		return new EventMethodTranslator(PRE_UPDATE, ORM_PKG.getXmlMappedSuperclass_PreUpdate());
-	}
-	
-	private Translator createPostUpdateTranslator() {
-		return new EventMethodTranslator(POST_UPDATE, ORM_PKG.getXmlMappedSuperclass_PostUpdate());
-	}
-	
-	private Translator createPostLoadTranslator() {
-		return new EventMethodTranslator(POST_LOAD, ORM_PKG.getXmlMappedSuperclass_PostLoad());
-	}
-	
-	private Translator createAttributesTranslator() {
-		return new AttributesTranslator(ATTRIBUTES, ORM_PKG.getAbstractXmlTypeMapping_Attributes());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/NamedNativeQueryTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/NamedNativeQueryTranslator.java
deleted file mode 100644
index ba758b9b33..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/NamedNativeQueryTranslator.java
+++ /dev/null
@@ -1,61 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class NamedNativeQueryTranslator extends Translator 
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public NamedNativeQueryTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createResultClassTranslator(),
-			createResultSetMappingTranslator(),
-			createQueryTranslator(),
-			createHintTranslator()
-		};
-	}
-
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlQuery_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createResultClassTranslator() {
-		return new Translator(RESULT_CLASS, ORM_PKG.getXmlNamedNativeQuery_ResultClass(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createResultSetMappingTranslator() {
-		return new Translator(RESULT_SET_MAPPING, ORM_PKG.getXmlNamedNativeQuery_ResultSetMapping(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createQueryTranslator() {
-		return new Translator(QUERY, ORM_PKG.getXmlQuery_Query());
-	}
-	
-	private Translator createHintTranslator() {
-		return new QueryHintTranslator(HINT, ORM_PKG.getXmlQuery_Hints());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/NamedQueryTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/NamedQueryTranslator.java
deleted file mode 100644
index 917645dc94..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/NamedQueryTranslator.java
+++ /dev/null
@@ -1,51 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class NamedQueryTranslator extends Translator 
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public NamedQueryTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createQueryTranslator(),
-			createHintTranslator()
-		};
-	}
-
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlQuery_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createQueryTranslator() {
-		return new Translator(QUERY, ORM_PKG.getXmlQuery_Query());
-	}
-	
-	private Translator createHintTranslator() {
-		return new QueryHintTranslator(HINT, ORM_PKG.getXmlQuery_Hints());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OneToManyTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OneToManyTranslator.java
deleted file mode 100644
index a0184df246..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OneToManyTranslator.java
+++ /dev/null
@@ -1,88 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class OneToManyTranslator extends Translator
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public OneToManyTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlOneToManyImpl();
-	}
-
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createTargetEntityTranslator(),
-			createFetchTranslator(),
-			createMappedByTranslator(),
-			createOrderByTranslator(),
-			createMapKeyTranslator(),
-			createJoinTableTranslator(),
-			createJoinColumnTranslator(),
-			createCascadeTranslator()
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlAttributeMapping_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createTargetEntityTranslator() {
-		return new Translator(TARGET_ENTITY, ORM_PKG.getXmlRelationshipMapping_TargetEntity(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createFetchTranslator() {
-		return new Translator(FETCH, ORM_PKG.getXmlRelationshipMapping_Fetch(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createMappedByTranslator() {
-		return new Translator(MAPPED_BY, ORM_PKG.getXmlMultiRelationshipMapping_MappedBy(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createOrderByTranslator() {
-		return new Translator(ORDER_BY, ORM_PKG.getXmlMultiRelationshipMapping_OrderBy());
-	}
-	
-	private Translator createMapKeyTranslator() {
-		return new MapKeyTranslator(MAP_KEY, ORM_PKG.getXmlMultiRelationshipMapping_MapKey());
-	}
-	
-	private Translator createJoinTableTranslator() {
-		return new JoinTableTranslator(JOIN_TABLE, ORM_PKG.getXmlRelationshipMapping_JoinTable());
-	}
-		
-	private Translator createJoinColumnTranslator() {
-		return new JoinColumnTranslator(JOIN_COLUMN, ORM_PKG.getXmlOneToMany_JoinColumns());
-	}
-	
-	private Translator createCascadeTranslator() {
-		return new CascadeTypeTranslator(CASCADE, ORM_PKG.getXmlRelationshipMapping_Cascade());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OneToOneTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OneToOneTranslator.java
deleted file mode 100644
index 0b06c3ae23..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OneToOneTranslator.java
+++ /dev/null
@@ -1,90 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class OneToOneTranslator extends Translator
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public OneToOneTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlOneToOneImpl();
-	}
-
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createTargetEntityTranslator(),
-			createFetchTranslator(),
-			createOptionalTranslator(),
-			createMappedByTranslator(),
-			createPrimaryKeyJoinColumnTranslator(),
-			createJoinColumnTranslator(),
-			createJoinTableTranslator(),
-			createCascadeTranslator()
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlAttributeMapping_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createTargetEntityTranslator() {
-		return new Translator(TARGET_ENTITY, ORM_PKG.getXmlRelationshipMapping_TargetEntity(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createFetchTranslator() {
-		return new Translator(FETCH, ORM_PKG.getXmlRelationshipMapping_Fetch(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createOptionalTranslator() {
-		return new Translator(OPTIONAL, ORM_PKG.getXmlSingleRelationshipMapping_Optional(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createMappedByTranslator() {
-		return new Translator(MAPPED_BY, ORM_PKG.getXmlOneToOne_MappedBy(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createPrimaryKeyJoinColumnTranslator() {
-		return new PrimaryKeyJoinColumnTranslator(PRIMARY_KEY_JOIN_COLUMN, ORM_PKG.getXmlOneToOne_PrimaryKeyJoinColumns());
-	}
-	
-	private Translator createJoinColumnTranslator() {
-		return new JoinColumnTranslator(JOIN_COLUMN, ORM_PKG.getXmlSingleRelationshipMapping_JoinColumns());
-	}
-	
-	private Translator createJoinTableTranslator() {
-		return new JoinTableTranslator(JOIN_TABLE, ORM_PKG.getXmlRelationshipMapping_JoinTable());
-	}
-		
-	private Translator createCascadeTranslator() {
-		return new CascadeTypeTranslator(CASCADE, ORM_PKG.getXmlRelationshipMapping_Cascade());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OrmXmlMapper.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OrmXmlMapper.java
deleted file mode 100644
index 9b7a58c042..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OrmXmlMapper.java
+++ /dev/null
@@ -1,126 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.jpt.core.resource.orm.OrmPackage;
-
-public interface OrmXmlMapper
-{
-	OrmPackage ORM_PKG = OrmPackage.eINSTANCE;
-	
-	String XML_NS = "xmlns";  //$NON-NLS-1$
-	String XML_NS_XSI = "xmlns:xsi";  //$NON-NLS-1$
-	String XSI_SCHEMA_LOCATION = "xsi:schemaLocation";  //$NON-NLS-1$
-	String XSI_NS_URL = "http://www.w3.org/2001/XMLSchema-instance";  //$NON-NLS-1$
-	String PERSISTENCE_NS_URL = "http://java.sun.com/xml/ns/persistence/orm";  //$NON-NLS-1$
-	String ORM_SCHEMA_LOC_1_0 = "http://java.sun.com/xml/ns/persistence/orm_1_0.xsd";  //$NON-NLS-1$
-	
-	
-	String ACCESS = "access";  //$NON-NLS-1$
-	String ALLOCATION_SIZE = "allocation-size";  //$NON-NLS-1$
-	String ASSOCIATION_OVERRIDE = "association-override";  //$NON-NLS-1$
-	String ATTRIBUTE_OVERRIDE = "attribute-override";  //$NON-NLS-1$
-	String ATTRIBUTES = "attributes";  //$NON-NLS-1$
-	String BASIC = "basic";  //$NON-NLS-1$
-	String CASCADE = "cascade";  //$NON-NLS-1$
-	String CASCADE_ALL = "cascade-all";  //$NON-NLS-1$
-	String CASCADE_MERGE = "cascade-merge";  //$NON-NLS-1$
-	String CASCADE_PERSIST = "cascade-persist";  //$NON-NLS-1$
-	String CASCADE_REFRESH = "cascade-refresh";  //$NON-NLS-1$	
-	String CASCADE_REMOVE = "cascade-remove";  //$NON-NLS-1$	
-	String CATALOG = "catalog";  //$NON-NLS-1$
-	String CLASS = "class";  //$NON-NLS-1$
-	String COLUMN = "column";  //$NON-NLS-1$
-	String COLUMN_DEFINITION= "column-definition";  //$NON-NLS-1$
-	String COLUMN_NAME = "column-name";  //$NON-NLS-1$
-	String COLUMN_RESULT = "column-result";  //$NON-NLS-1$
-	String DESCRIPTION = "description";  //$NON-NLS-1$
-	String DISCRIMINATOR_COLUMN = "discriminator-column";  //$NON-NLS-1$
-	String DISCRIMINATOR_TYPE = "discriminator-type";  //$NON-NLS-1$
-	String DISCRIMINATOR_VALUE = "discriminator-value";  //$NON-NLS-1$
-	String EMBEDDABLE = "embeddable";  //$NON-NLS-1$
-	String EMBEDDED = "embedded";  //$NON-NLS-1$
-	String EMBEDDED_ID = "embedded-id";  //$NON-NLS-1$
-	String ENTITY = "entity";  //$NON-NLS-1$
-	String ENTITY_CLASS = "entity-class";  //$NON-NLS-1$
-	String ENTITY_LISTENER = "entity-listener";  //$NON-NLS-1$
-	String ENTITY_LISTENERS = "entity-listeners";  //$NON-NLS-1$
-	String ENTITY_MAPPINGS = "entity-mappings";  //$NON-NLS-1$
-	String ENTITY_RESULT = "entity-result";  //$NON-NLS-1$
-	String ENUMERATED = "enumerated";  //$NON-NLS-1$
-	String EXCLUDE_DEFAULT_LISTENERS = "exclude-default-listeners";  //$NON-NLS-1$
-	String EXCLUDE_SUPERCLASS_LISTENERS = "exclude-superclass-listeners";  //$NON-NLS-1$
-	String FETCH = "fetch";  //$NON-NLS-1$
-	String FIELD_RESULT = "field-result";  //$NON-NLS-1$
-	String GENERATED_VALUE = "generated-value";  //$NON-NLS-1$
-	String GENERATOR = "generator";  //$NON-NLS-1$
-	String HINT = "hint";  //$NON-NLS-1$
-	String ID = "id";  //$NON-NLS-1$
-	String ID_CLASS = "id-class";  //$NON-NLS-1$
-	String INHERITANCE = "inheritance";  //$NON-NLS-1$
-	String INITIAL_VALUE = "initial-value";  //$NON-NLS-1$
-	String INSERTABLE = "insertable";  //$NON-NLS-1$
-	String INVERSE_JOIN_COLUMN = "inverse-join-column";  //$NON-NLS-1$
-	String JOIN_COLUMN = "join-column";  //$NON-NLS-1$
-	String JOIN_TABLE = "join-table";  //$NON-NLS-1$
-	String LENGTH = "length";  //$NON-NLS-1$
-	String LOB = "lob";  //$NON-NLS-1$
-	String MANY_TO_MANY = "many-to-many";  //$NON-NLS-1$
-	String MANY_TO_ONE = "many-to-one";  //$NON-NLS-1$
-	String MAP_KEY = "map-key";  //$NON-NLS-1$
-	String MAPPED_BY = "mapped-by";  //$NON-NLS-1$
-	String MAPPED_SUPERCLASS = "mapped-superclass";  //$NON-NLS-1$
-	String METADATA_COMPLETE = "metadata-complete";  //$NON-NLS-1$
-	String METHOD_NAME = "method-name";  //$NON-NLS-1$
-	String NAME = "name";  //$NON-NLS-1$
-	String NAMED_NATIVE_QUERY = "named-native-query";  //$NON-NLS-1$
-	String NAMED_QUERY = "named-query";  //$NON-NLS-1$
-	String NULLABLE = "nullable";  //$NON-NLS-1$
-	String ONE_TO_MANY = "one-to-many";  //$NON-NLS-1$
-	String ONE_TO_ONE = "one-to-one";  //$NON-NLS-1$
-	String OPTIONAL = "optional";  //$NON-NLS-1$
-	String ORDER_BY = "order-by";  //$NON-NLS-1$
-	String PACKAGE = "package";  //$NON-NLS-1$
-	String PERSISTENCE_UNIT_DEFAULTS = "persistence-unit-defaults";  //$NON-NLS-1$
-	String PERSISTENCE_UNIT_METADATA = "persistence-unit-metadata";  //$NON-NLS-1$
-	String PK_COLUMN_NAME = "pk-column-name";  //$NON-NLS-1$
-	String PK_COLUMN_VALUE = "pk-column-value";  //$NON-NLS-1$
-	String POST_LOAD = "post-load";  //$NON-NLS-1$
-	String POST_PERSIST = "post-persist";  //$NON-NLS-1$
-	String POST_REMOVE = "post-remove";  //$NON-NLS-1$
-	String POST_UPDATE = "post-update";  //$NON-NLS-1$
-	String PRE_PERSIST = "pre-persist";  //$NON-NLS-1$
-	String PRE_REMOVE = "pre-remove";  //$NON-NLS-1$
-	String PRE_UPDATE = "pre-update";  //$NON-NLS-1$
-	String PRECISION= "precision";  //$NON-NLS-1$
-	String PRIMARY_KEY_JOIN_COLUMN = "primary-key-join-column";  //$NON-NLS-1$
-	String QUERY = "query";  //$NON-NLS-1$
-	String REFERENCED_COLUMN_NAME = "referenced-column-name";  //$NON-NLS-1$
-	String RESULT_CLASS = "result-class";  //$NON-NLS-1$
-	String RESULT_SET_MAPPING = "result-set-mapping";  //$NON-NLS-1$
-	String SCALE= "scale";  //$NON-NLS-1$
-	String SCHEMA = "schema";  //$NON-NLS-1$
-	String SECONDARY_TABLE = "secondary-table";  //$NON-NLS-1$
-	String SEQUENCE_GENERATOR = "sequence-generator";  //$NON-NLS-1$
-	String SEQUENCE_NAME = "sequence-name";  //$NON-NLS-1$
-	String SQL_RESULT_SET_MAPPING = "sql-result-set-mapping";  //$NON-NLS-1$
-	String STRATEGY = "strategy";  //$NON-NLS-1$
-	String TABLE = "table";  //$NON-NLS-1$
-	String TABLE_GENERATOR = "table-generator";  //$NON-NLS-1$
-	String TARGET_ENTITY = "target-entity";  //$NON-NLS-1$
-	String TEMPORAL = "temporal";  //$NON-NLS-1$
-	String TRANSIENT = "transient";  //$NON-NLS-1$
-	String UNIQUE = "unique";  //$NON-NLS-1$
-	String UNIQUE_CONSTRAINT = "unique-constraint";  //$NON-NLS-1$
-	String UPDATABLE = "updatable";  //$NON-NLS-1$
-	String VALUE = "value";  //$NON-NLS-1$
-	String VALUE_COLUMN_NAME = "value-column-name";  //$NON-NLS-1$
-	String VERSION = "version";  //$NON-NLS-1$
-	String XML_MAPPING_METADATA_COMPLETE = "xml-mapping-metadata-complete";  //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/PersistenceUnitDefaultsTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/PersistenceUnitDefaultsTranslator.java
deleted file mode 100644
index efccf07385..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/PersistenceUnitDefaultsTranslator.java
+++ /dev/null
@@ -1,61 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class PersistenceUnitDefaultsTranslator extends Translator 
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public PersistenceUnitDefaultsTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	private Translator[] createChildren() {
-		return new Translator[] {
-			createSchemaTranslator(),
-			createCatalogTranslator(),
-			createAccessTranslator(),
-			createCascadePersistTranslator(),
-			createEntityListenersTranslator()
-		};
-	}
-	
-	private Translator createSchemaTranslator() {
-		return new Translator(SCHEMA, ORM_PKG.getXmlPersistenceUnitDefaults_Schema());
-	}
-	
-	private Translator createCatalogTranslator() {
-		return new Translator(CATALOG, ORM_PKG.getXmlPersistenceUnitDefaults_Catalog());
-	}
-	
-	private Translator createAccessTranslator() {
-		return new Translator(ACCESS, ORM_PKG.getXmlPersistenceUnitDefaults_Access());
-	}
-	
-	private Translator createCascadePersistTranslator() {
-		return new EmptyTagBooleanTranslator(CASCADE_PERSIST, ORM_PKG.getXmlPersistenceUnitDefaults_CascadePersist());
-	}
-	
-	private Translator createEntityListenersTranslator() {
-		return new EntityListenersTranslator(ENTITY_LISTENERS, ORM_PKG.getXmlPersistenceUnitDefaults_EntityListeners());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/PersistenceUnitMetadataTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/PersistenceUnitMetadataTranslator.java
deleted file mode 100644
index 6dc94709cb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/PersistenceUnitMetadataTranslator.java
+++ /dev/null
@@ -1,45 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class PersistenceUnitMetadataTranslator extends Translator implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public PersistenceUnitMetadataTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	private Translator[] createChildren() {
-		return new Translator[] {
-			createXmlMappingMetadataCompleteTranslator(),
-			createPersistenceUnitDefaultsTranslator(),
-		};
-	}
-
-	private Translator createXmlMappingMetadataCompleteTranslator() {
-		return new EmptyTagBooleanTranslator(XML_MAPPING_METADATA_COMPLETE, ORM_PKG.getXmlPersistenceUnitMetadata_XmlMappingMetadataComplete());
-	}
-	
-	private Translator createPersistenceUnitDefaultsTranslator() {
-		return new PersistenceUnitDefaultsTranslator(PERSISTENCE_UNIT_DEFAULTS, ORM_PKG.getXmlPersistenceUnitMetadata_PersistenceUnitDefaults());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/PrimaryKeyJoinColumnTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/PrimaryKeyJoinColumnTranslator.java
deleted file mode 100644
index 47147b5fa9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/PrimaryKeyJoinColumnTranslator.java
+++ /dev/null
@@ -1,59 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class PrimaryKeyJoinColumnTranslator extends Translator
-	implements OrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public PrimaryKeyJoinColumnTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlPrimaryKeyJoinColumnImpl();
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createReferencedColumnNameTranslator(),
-			createColumnDefinitionTranslator(),
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlNamedColumn_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createReferencedColumnNameTranslator() {
-		return new Translator(REFERENCED_COLUMN_NAME, ORM_PKG.getXmlPrimaryKeyJoinColumn_ReferencedColumnName(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createColumnDefinitionTranslator() {
-		return new Translator(COLUMN_DEFINITION, ORM_PKG.getXmlNamedColumn_ColumnDefinition(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/QueryHintTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/QueryHintTranslator.java
deleted file mode 100644
index af4849679a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/QueryHintTranslator.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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class QueryHintTranslator extends Translator 
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public QueryHintTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createValueTranslator(),
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlQueryHint_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createValueTranslator() {
-		return new Translator(VALUE, ORM_PKG.getXmlQueryHint_Value(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/SecondaryTableTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/SecondaryTableTranslator.java
deleted file mode 100644
index 8ee733a595..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/SecondaryTableTranslator.java
+++ /dev/null
@@ -1,69 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class SecondaryTableTranslator extends Translator
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public SecondaryTableTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlSecondaryTableImpl();
-	}
-
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createCatalogTranslator(),
-			createSchemaTranslator(),
-			createPrimaryKeyJoinColumnsTranslator(),
-			createUniqueConstraintTranslator()
-		};
-	}
-
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlBaseTable_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createCatalogTranslator() {
-		return new Translator(CATALOG, ORM_PKG.getXmlBaseTable_Catalog(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createSchemaTranslator() {
-		return new Translator(SCHEMA, ORM_PKG.getXmlBaseTable_Schema(), DOM_ATTRIBUTE);
-	}
-	
-	protected Translator createPrimaryKeyJoinColumnsTranslator() {
-		return new PrimaryKeyJoinColumnTranslator(PRIMARY_KEY_JOIN_COLUMN, ORM_PKG.getXmlSecondaryTable_PrimaryKeyJoinColumns());
-	}
-	
-	private Translator createUniqueConstraintTranslator() {
-		return new UniqueConstraintTranslator(UNIQUE_CONSTRAINT, ORM_PKG.getXmlBaseTable_UniqueConstraints());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/SequenceGeneratorTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/SequenceGeneratorTranslator.java
deleted file mode 100644
index 520c046d6e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/SequenceGeneratorTranslator.java
+++ /dev/null
@@ -1,63 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class SequenceGeneratorTranslator extends Translator
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public SequenceGeneratorTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlSequenceGeneratorImpl();
-	}
-
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createSequenceNameTranslator(),
-			createInitialValueTranslator(),
-			createAllocationSizeTranslator(),
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlGenerator_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createSequenceNameTranslator() {
-		return new Translator(SEQUENCE_NAME, ORM_PKG.getXmlSequenceGenerator_SequenceName(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createInitialValueTranslator() {
-		return new Translator(INITIAL_VALUE, ORM_PKG.getXmlGenerator_InitialValue(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createAllocationSizeTranslator() {
-		return new Translator(ALLOCATION_SIZE, ORM_PKG.getXmlGenerator_AllocationSize(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/SqlResultSetMappingTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/SqlResultSetMappingTranslator.java
deleted file mode 100644
index 4a53b3557e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/SqlResultSetMappingTranslator.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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class SqlResultSetMappingTranslator extends Translator
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public SqlResultSetMappingTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createEntityResultTranslator(),
-			createColumnResultTranslator()
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getSqlResultSetMapping_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createEntityResultTranslator() {
-		return new EntityResultTranslator(ENTITY_RESULT, ORM_PKG.getSqlResultSetMapping_EntityResults());
-	}
-	
-	private Translator createColumnResultTranslator() {
-		return new ColumnResultTranslator(COLUMN_RESULT, ORM_PKG.getSqlResultSetMapping_ColumnResults());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/TableGeneratorTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/TableGeneratorTranslator.java
deleted file mode 100644
index 5b97b365eb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/TableGeneratorTranslator.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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class TableGeneratorTranslator extends Translator
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public TableGeneratorTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlTableGeneratorImpl();
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createTableTranslator(),
-			createCatalogTranslator(),
-			createSchemaTranslator(),
-			createPkColumnNameTranslator(),
-			createValueColumnNameTranslator(),
-			createPkColumnValueTranslator(),
-			createInitialValueTranslator(),
-			createAllocationSizeTranslator(),
-			createUniqueConstraintTranslator(),
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlGenerator_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createTableTranslator() {
-		return new Translator(TABLE, ORM_PKG.getXmlTableGenerator_Table(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createCatalogTranslator() {
-		return new Translator(CATALOG, ORM_PKG.getXmlTableGenerator_Catalog(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createSchemaTranslator() {
-		return new Translator(SCHEMA, ORM_PKG.getXmlTableGenerator_Schema(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createPkColumnNameTranslator() {
-		return new Translator(PK_COLUMN_NAME, ORM_PKG.getXmlTableGenerator_PkColumnName(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createValueColumnNameTranslator() {
-		return new Translator(VALUE_COLUMN_NAME, ORM_PKG.getXmlTableGenerator_ValueColumnName(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createPkColumnValueTranslator() {
-		return new Translator(PK_COLUMN_VALUE, ORM_PKG.getXmlTableGenerator_PkColumnValue(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createInitialValueTranslator() {
-		return new Translator(INITIAL_VALUE, ORM_PKG.getXmlGenerator_InitialValue(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createAllocationSizeTranslator() {
-		return new Translator(ALLOCATION_SIZE, ORM_PKG.getXmlGenerator_AllocationSize(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createUniqueConstraintTranslator() {
-		return new UniqueConstraintTranslator(UNIQUE_CONSTRAINT, ORM_PKG.getXmlTableGenerator_UniqueConstraints());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/TableTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/TableTranslator.java
deleted file mode 100644
index c983fcabcc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/TableTranslator.java
+++ /dev/null
@@ -1,56 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class TableTranslator extends Translator
-	implements OrmXmlMapper
-{	
-	private Translator[] children;	
-	
-	
-	public TableTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createCatalogTranslator(),
-			createSchemaTranslator(),
-			createUniqueConstraintTranslator()
-		};
-	}
-
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlBaseTable_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createCatalogTranslator() {
-		return new Translator(CATALOG, ORM_PKG.getXmlBaseTable_Catalog(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createSchemaTranslator() {
-		return new Translator(SCHEMA, ORM_PKG.getXmlBaseTable_Schema(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createUniqueConstraintTranslator() {
-		return new UniqueConstraintTranslator(UNIQUE_CONSTRAINT, ORM_PKG.getXmlBaseTable_UniqueConstraints());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/TransientTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/TransientTranslator.java
deleted file mode 100644
index f830d2a0c4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/TransientTranslator.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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class TransientTranslator extends Translator
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public TransientTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlTransientImpl();
-	}
-
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator()
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlAttributeMapping_Name(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/UniqueConstraintTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/UniqueConstraintTranslator.java
deleted file mode 100644
index 38d8d3404e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/UniqueConstraintTranslator.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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class UniqueConstraintTranslator extends Translator 
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public UniqueConstraintTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlUniqueConstraintImpl();
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-	
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createColumnNameTranslator(),
-		};
-	}
-	
-	private Translator createColumnNameTranslator() {
-		return new Translator(COLUMN_NAME, ORM_PKG.getXmlUniqueConstraint_ColumnNames());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/VersionTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/VersionTranslator.java
deleted file mode 100644
index b257fac57b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/VersionTranslator.java
+++ /dev/null
@@ -1,59 +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.core.internal.resource.orm.translators;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class VersionTranslator extends Translator 
-	implements OrmXmlMapper
-{
-	private Translator[] children;	
-	
-	
-	public VersionTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return OrmFactory.eINSTANCE.createXmlVersionImpl();
-	}
-
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (this.children == null) {
-			this.children = createChildren();
-		}
-		return this.children;
-	}
-		
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createColumnTranslator(), 
-			createTemporalTranslator(),
-		};
-	}
-
-	private Translator createNameTranslator() {
-		return new Translator(NAME, ORM_PKG.getXmlAttributeMapping_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createColumnTranslator() {
-		return new ColumnTranslator(COLUMN, ORM_PKG.getColumnMapping_Column());
-	}
-	
-	private Translator createTemporalTranslator() {
-		return new Translator(TEMPORAL, ORM_PKG.getXmlVersion_Temporal());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/JavaClassRefTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/JavaClassRefTranslator.java
deleted file mode 100644
index b16626bd3b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/JavaClassRefTranslator.java
+++ /dev/null
@@ -1,44 +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.core.internal.resource.persistence.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.persistence.PersistencePackage;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class JavaClassRefTranslator extends Translator
-{
-	private static Translator[] children;
-	
-	
-	public JavaClassRefTranslator(String domNameAndPath, EStructuralFeature feature, int style) {
-		super(domNameAndPath, feature, style);
-	}
-	
-	public JavaClassRefTranslator(String domNameAndPath, EStructuralFeature feature) {
-		super(domNameAndPath, feature);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (children == null) {
-			children = createChildren();
-		}
-		return children;
-	}
-	
-	private static Translator[] createChildren() {
-		return new Translator[] {
-			new Translator(TEXT_ATTRIBUTE_VALUE, PersistencePackage.eINSTANCE.getXmlJavaClassRef_JavaClass())
-		};
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/MappingFileTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/MappingFileTranslator.java
deleted file mode 100644
index f6c0c6db8e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/MappingFileTranslator.java
+++ /dev/null
@@ -1,40 +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.core.internal.resource.persistence.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.resource.persistence.PersistencePackage;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class MappingFileTranslator extends Translator
-{
-	private Translator[] children;
-	
-	
-	public MappingFileTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, Translator.END_TAG_NO_INDENT);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (children == null) {
-			children = createChildren();
-		}
-		return children;
-	}
-	
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			new Translator(TEXT_ATTRIBUTE_VALUE, PersistencePackage.eINSTANCE.getXmlMappingFileRef_FileName())
-		};
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PersistenceTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PersistenceTranslator.java
deleted file mode 100644
index 4350a1f365..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PersistenceTranslator.java
+++ /dev/null
@@ -1,54 +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.core.internal.resource.persistence.translators;
-
-import org.eclipse.wst.common.internal.emf.resource.ConstantAttributeTranslator;
-import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class PersistenceTranslator extends RootTranslator
-	implements PersistenceXmlMapper
-{
-	public static PersistenceTranslator INSTANCE = new PersistenceTranslator();
-	
-	private Translator[] children;
-	
-	
-	public PersistenceTranslator() {
-		super(PERSISTENCE, PERSISTENCE_PKG.getXmlPersistence());
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (children == null) {
-			children = createChildren();
-		}
-		return children;
-	}
-	
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createVersionTranslator(),
-			new ConstantAttributeTranslator(XML_NS, PERSISTENCE_NS_URL),
-			new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL),
-			new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, PERSISTENCE_NS_URL + ' ' + PERSISTENCE_SCHEMA_LOC_1_0),
-			createPersistenceUnitTranslator()
-		};
-	}
-	
-	private Translator createVersionTranslator() {
-		return new Translator(VERSION, PERSISTENCE_PKG.getXmlPersistence_Version(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createPersistenceUnitTranslator() {
-		return new PersistenceUnitTranslator(PERSISTENCE_UNIT, PERSISTENCE_PKG.getXmlPersistence_PersistenceUnits());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PersistenceUnitTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PersistenceUnitTranslator.java
deleted file mode 100644
index 0d3676f890..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PersistenceUnitTranslator.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.core.internal.resource.persistence.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jpt.core.internal.resource.common.translators.BooleanTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class PersistenceUnitTranslator extends Translator
-	implements PersistenceXmlMapper
-{
-	private Translator[] children;
-	
-	
-	public PersistenceUnitTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override
-	public Translator[] getChildren(Object target, int versionID) {
-		if (children == null) {
-			children = createChildren();
-		}
-		return children;
-	}
-	
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createTransactionTypeTranslator(),
-			createDescriptionTranslator(),
-			createProviderTranslator(),
-			createJtaDataSourceTranslator(),
-			createNonJtaDataSourceTranslator(),
-			createMappingFileTranslator(),
-			createJarFileTranslator(),
-			createClassTranslator(),
-			createExcludeUnlistedClassesTranslator(),
-			createPropertiesTranslator()
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, PERSISTENCE_PKG.getXmlPersistenceUnit_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createTransactionTypeTranslator() {
-		return new Translator(TRANSACTION_TYPE, PERSISTENCE_PKG.getXmlPersistenceUnit_TransactionType(), DOM_ATTRIBUTE | UNSET_IF_NULL);
-	}
-	
-	private Translator createDescriptionTranslator() {
-		return new Translator(DESCRIPTION, PERSISTENCE_PKG.getXmlPersistenceUnit_Description());
-	}
-	
-	private Translator createProviderTranslator() {
-		return new Translator(PROVIDER, PERSISTENCE_PKG.getXmlPersistenceUnit_Provider());
-	}
-	
-	private Translator createJtaDataSourceTranslator() {
-		return new Translator(JTA_DATA_SOURCE, PERSISTENCE_PKG.getXmlPersistenceUnit_JtaDataSource());
-	}
-	
-	private Translator createNonJtaDataSourceTranslator() {
-		return new Translator(NON_JTA_DATA_SOURCE, PERSISTENCE_PKG.getXmlPersistenceUnit_NonJtaDataSource());
-	}
-	
-	private Translator createMappingFileTranslator() {
-		return new MappingFileTranslator(MAPPING_FILE, PERSISTENCE_PKG.getXmlPersistenceUnit_MappingFiles());
-	}
-	
-	private Translator createJarFileTranslator() {
-		return new Translator(JAR_FILE, PERSISTENCE_PKG.getXmlPersistenceUnit_JarFiles(), Translator.END_TAG_NO_INDENT);
-	}
-	
-	private Translator createClassTranslator() {
-		return new JavaClassRefTranslator(CLASS, PERSISTENCE_PKG.getXmlPersistenceUnit_Classes(), Translator.END_TAG_NO_INDENT);
-	}
-	
-	private Translator createExcludeUnlistedClassesTranslator() {
-		return new BooleanTranslator(EXCLUDE_UNLISTED_CLASSES, PERSISTENCE_PKG.getXmlPersistenceUnit_ExcludeUnlistedClasses());
-	}
-	
-	private Translator createPropertiesTranslator() {
-		return new PropertiesTranslator(PROPERTIES, PERSISTENCE_PKG.getXmlPersistenceUnit_Properties());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PersistenceXmlMapper.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PersistenceXmlMapper.java
deleted file mode 100644
index dfc4186d4e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PersistenceXmlMapper.java
+++ /dev/null
@@ -1,43 +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.core.internal.resource.persistence.translators;
-
-import org.eclipse.jpt.core.resource.persistence.PersistencePackage;
-
-public interface PersistenceXmlMapper
-{
-	PersistencePackage PERSISTENCE_PKG = PersistencePackage.eINSTANCE;
-	
-	String XML_NS = "xmlns";  //$NON-NLS-1$
-	String XML_NS_XSI = "xmlns:xsi";  //$NON-NLS-1$
-	String XSI_SCHEMA_LOCATION = "xsi:schemaLocation";  //$NON-NLS-1$
-	String XSI_NS_URL = "http://www.w3.org/2001/XMLSchema-instance";  //$NON-NLS-1$
-	String PERSISTENCE_NS_URL = "http://java.sun.com/xml/ns/persistence";  //$NON-NLS-1$
-	String PERSISTENCE_SCHEMA_LOC_1_0 = "http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd";  //$NON-NLS-1$
-	
-	
-	String CLASS = "class";  //$NON-NLS-1$
-	String DESCRIPTION = "description";  //$NON-NLS-1$
-	String EXCLUDE_UNLISTED_CLASSES = "exclude-unlisted-classes";  //$NON-NLS-1$
-	String JAR_FILE = "jar-file";  //$NON-NLS-1$
-	String JTA_DATA_SOURCE = "jta-data-source";  //$NON-NLS-1$
-	String MAPPING_FILE = "mapping-file";  //$NON-NLS-1$
-	String NAME = "name";  //$NON-NLS-1$
-	String NON_JTA_DATA_SOURCE = "non-jta-data-source";  //$NON-NLS-1$
-	String PERSISTENCE = "persistence";  //$NON-NLS-1$
-	String PERSISTENCE_UNIT = "persistence-unit";  //$NON-NLS-1$
-	String PROPERTIES = "properties";  //$NON-NLS-1$
-	String PROPERTY = "property";  //$NON-NLS-1$
-	String PROVIDER = "provider";  //$NON-NLS-1$
-	String TRANSACTION_TYPE = "transaction-type";  //$NON-NLS-1$
-	String VALUE = "value";  //$NON-NLS-1$
-	String VERSION = "version";  //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PropertiesTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PropertiesTranslator.java
deleted file mode 100644
index 4e893572e7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PropertiesTranslator.java
+++ /dev/null
@@ -1,43 +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.core.internal.resource.persistence.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class PropertiesTranslator extends Translator
-	implements PersistenceXmlMapper
-{
-	private Translator[] children;
-	
-	
-	public PropertiesTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-	
-	@Override	
-	public Translator[] getChildren(Object target, int versionID) {
-		if (children == null) {
-			children = createChildren();
-		}
-		return children;
-	}
-	
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createPropertyTranslator()
-		};
-	}
-	
-	private Translator createPropertyTranslator() {
-		return new PropertyTranslator(PROPERTY, PERSISTENCE_PKG.getXmlProperties_Properties());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PropertyTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PropertyTranslator.java
deleted file mode 100644
index 07755b320a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PropertyTranslator.java
+++ /dev/null
@@ -1,48 +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.core.internal.resource.persistence.translators;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class PropertyTranslator extends Translator
-	implements PersistenceXmlMapper
-{
-	private Translator[] children;
-	
-	
-	public PropertyTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, END_TAG_NO_INDENT);
-	}
-	
-	@Override	
-	public Translator[] getChildren(Object target, int versionID) {
-		if (children == null) {
-			children = createChildren();
-		}
-		return children;
-	}
-	
-	protected Translator[] createChildren() {
-		return new Translator[] {
-			createNameTranslator(),
-			createValueTranslator()
-		};
-	}
-	
-	private Translator createNameTranslator() {
-		return new Translator(NAME, PERSISTENCE_PKG.getXmlProperty_Name(), DOM_ATTRIBUTE);
-	}
-	
-	private Translator createValueTranslator() {
-		return new Translator(VALUE, PERSISTENCE_PKG.getXmlProperty_Value(), DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/synch/SynchronizeClassesJob.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/synch/SynchronizeClassesJob.java
deleted file mode 100644
index fbf88c16b5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/synch/SynchronizeClassesJob.java
+++ /dev/null
@@ -1,133 +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.core.internal.synch;
-
-import java.io.IOException;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.JptCorePlugin;
-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.context.persistence.PersistenceXml;
-import org.eclipse.jpt.core.internal.JptCoreMessages;
-import org.eclipse.jpt.core.resource.persistence.PersistenceArtifactEdit;
-import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
-import org.eclipse.jpt.core.resource.persistence.PersistenceResource;
-import org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef;
-import org.eclipse.jpt.core.resource.persistence.XmlPersistence;
-import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-
-/**
- * Synchronizes the lists of persistent classes in a persistence unit and a 
- * persistence project.
- */
-public class SynchronizeClassesJob extends WorkspaceJob
-{
-	private IFile persistenceXmlFile;
-	
-	
-	public SynchronizeClassesJob(IFile file) {
-		super(JptCoreMessages.SYNCHRONIZE_CLASSES_JOB);
-		setRule(file.getProject());
-		this.persistenceXmlFile = file;
-	}
-	
-	@Override
-	public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
-		monitor.beginTask(JptCoreMessages.SYNCHRONIZING_CLASSES_TASK, 200);
-		
-		if (monitor.isCanceled()) {
-			return Status.CANCEL_STATUS;
-		}
-		
-		JpaProject jpaProject = JptCorePlugin.getJpaProject(this.persistenceXmlFile.getProject());
-
-		PersistenceArtifactEdit persistenceArtifactEdit = PersistenceArtifactEdit.getArtifactEditForWrite(this.persistenceXmlFile.getProject());
-		PersistenceResource persistenceResource = persistenceArtifactEdit.getResource(this.persistenceXmlFile);
-		
-		monitor.worked(25);
-
-		XmlPersistence persistence = persistenceResource.getPersistence();
-		
-		if (persistence == null) {
-			persistence = PersistenceFactory.eINSTANCE.createXmlPersistence();
-			persistenceResource.getContents().add(persistence);
-		}
-		
-		XmlPersistenceUnit persistenceUnitResource;
-		
-		if (persistence.getPersistenceUnits().size() > 0) {
-			persistenceUnitResource = persistence.getPersistenceUnits().get(0);
-		}
-		else {
-			persistenceUnitResource = PersistenceFactory.eINSTANCE.createXmlPersistenceUnit();
-			persistenceUnitResource.setName(this.persistenceXmlFile.getProject().getName());
-			persistence.getPersistenceUnits().add(persistenceUnitResource);
-		}
-		
-		persistenceUnitResource.getClasses().clear();
-		
-		monitor.worked(25);
-
-		for (Iterator<String> stream = jpaProject.annotatedClassNames(); stream.hasNext(); ) {
-			String fullyQualifiedTypeName = stream.next();
-			if ( ! mappingFileContains(jpaProject, fullyQualifiedTypeName)) {
-				XmlJavaClassRef classRef = PersistenceFactory.eINSTANCE.createXmlJavaClassRef();
-				classRef.setJavaClass(fullyQualifiedTypeName);
-				persistenceUnitResource.getClasses().add(classRef);
-			}
-		}
-		
-		monitor.worked(100);
-		
-		try {
-			persistenceResource.save(null);
-		}
-		catch (IOException ioe) {
-			return new Status(IStatus.ERROR, JptCorePlugin.PLUGIN_ID, JptCoreMessages.ERROR_WRITING_FILE, ioe);
-		}
-		finally {
-			persistenceArtifactEdit.dispose();			
-			monitor.done();
-		}
-
-		return Status.OK_STATUS;
-	}
-	
-	private boolean mappingFileContains(JpaProject jpaProject, String fullyQualifiedTypeName) {
-		PersistenceXml persistenceXml = jpaProject.getRootContext().getPersistenceXml();
-		if (persistenceXml == null) {
-			return false;
-		}
-		Persistence persistence = persistenceXml.getPersistence();
-		if (persistence == null) {
-			return false;
-		}
-		if (persistence.persistenceUnitsSize() == 0) {
-			return false;
-		}
-		PersistenceUnit persistenceUnit = persistence.persistenceUnits().next();
-		for (MappingFileRef mappingFileRef : CollectionTools.iterable(persistenceUnit.mappingFileRefs())) {
-			if (mappingFileRef.getPersistentType(fullyQualifiedTypeName) != null) {
-				return true;
-			}
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/SimpleSchedulingRule.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/SimpleSchedulingRule.java
deleted file mode 100644
index a77b0c03aa..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/SimpleSchedulingRule.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.core.internal.utility;
-
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-
-/**
- * A job scheduling rule that conflicts only with itself.
- */
-public final class SimpleSchedulingRule
-	implements ISchedulingRule
-{
-
-	// singleton
-	private static final SimpleSchedulingRule INSTANCE = new SimpleSchedulingRule();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static ISchedulingRule instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private SimpleSchedulingRule() {
-		super();
-	}
-
-	public boolean contains(ISchedulingRule rule) {
-		return rule == this;
-	}
-
-	public boolean isConflicting(ISchedulingRule rule) {
-		return rule == this;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/SimpleTextRange.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/SimpleTextRange.java
deleted file mode 100644
index bbb398fc84..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/SimpleTextRange.java
+++ /dev/null
@@ -1,41 +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.core.internal.utility;
-
-import org.eclipse.jpt.core.utility.AbstractTextRange;
-
-/**
- * Straightforward implementation of TextRange.
- */
-public class SimpleTextRange extends AbstractTextRange {
-	private final int offset;
-	private final int length;
-	private final int lineNumber;
-
-	public SimpleTextRange(int offset, int length, int lineNumber) {
-		super();
-		this.offset = offset;
-		this.length = length;
-		this.lineNumber = lineNumber;
-	}
-
-	public int getOffset() {
-		return this.offset;
-	}
-
-	public int getLength() {
-		return this.length;
-	}
-
-	public int getLineNumber() {
-		return this.lineNumber;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/emf/ComponentUtilities.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/emf/ComponentUtilities.java
deleted file mode 100644
index ecd26d1f84..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/emf/ComponentUtilities.java
+++ /dev/null
@@ -1,76 +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.core.internal.utility.emf;
-
-import java.util.Iterator;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-import org.eclipse.jpt.utility.internal.iterators.TreeIterator;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-public class ComponentUtilities
-{
-	/**
-	 * Return the deployment path for the given source file.  If there is no
-	 * corresponding deployment file, null will be returned.
-	 */
-	public static IPath computeDeployPath(IFile sourceFile) {
-		// Unfortunately, the only current way to do this is to exhaustively 
-		// search all deployment files and attempt to match to this file.
-		// Bug 202943 has been logged to track this issue.
-		for (IVirtualFile virtualFile : CollectionTools.iterable(allVirtualFiles(sourceFile.getProject()))) {
-			for (IFile underlyingFile : virtualFile.getUnderlyingFiles()) {
-				if (sourceFile.equals(underlyingFile)) {
-					return virtualFile.getRuntimePath();
-				}
-			}
-		}
-		return null;
-	}
-	
-	private static Iterator<IVirtualFile> allVirtualFiles(IProject project) {
-		return new FilteringIterator<IVirtualResource, IVirtualFile>(allVirtualResources(project)) {
-			@Override
-			protected boolean accept(IVirtualResource o) {
-				return o.getType() == IVirtualResource.FILE;
-			}
-		};
-	}
-	
-	private static Iterator<IVirtualResource> allVirtualResources(IProject project) {
-		IVirtualComponent virtualComponent = ComponentCore.createComponent(project);
-		
-		if (virtualComponent == null) {
-			return EmptyIterator.instance();
-		}
-		
-		return new TreeIterator<IVirtualResource>(virtualComponent.getRootFolder()) {
-			@Override
-			protected Iterator<? extends IVirtualResource> children(IVirtualResource next) {
-				if (next.getType() == IVirtualResource.FOLDER) {
-					try {
-						return CollectionTools.iterator(((IVirtualFolder) next).members());
-					}
-					catch (CoreException ce) { /* fall through, return default case */ }
-				}
-				return EmptyIterator.instance();
-			}
-		};
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/emf/DOMUtilities.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/emf/DOMUtilities.java
deleted file mode 100644
index b23a0f1343..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/emf/DOMUtilities.java
+++ /dev/null
@@ -1,23 +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.core.internal.utility.emf;
-
-import org.w3c.dom.Node;
-
-public class DOMUtilities
-	extends org.eclipse.wst.common.internal.emf.utilities.DOMUtilities
-{
-	/**
-	 * Get the attribute Node with the specified name 
-	 */
-	static public Node childAttributeNode(Node node, String attributeName) {
-		return node.getAttributes().getNamedItem(attributeName);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/ASTNodeTextRange.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/ASTNodeTextRange.java
deleted file mode 100644
index 1cb404987c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/ASTNodeTextRange.java
+++ /dev/null
@@ -1,39 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.AbstractTextRange;
-
-/**
- * Adapt an ASTNode to the TextRange interface.
- */
-public class ASTNodeTextRange extends AbstractTextRange {
-	private final ASTNode astNode;
-
-	public ASTNodeTextRange(ASTNode astNode) {
-		super();
-		this.astNode = astNode;
-	}
-
-	public int getOffset() {
-		return this.astNode.getStartPosition();
-	}
-
-	public int getLength() {
-		return this.astNode.getLength();
-	}
-
-	public int getLineNumber() {
-		return ((CompilationUnit) this.astNode.getRoot()).getLineNumber(this.getOffset());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/AbstractAnnotationAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/AbstractAnnotationAdapter.java
deleted file mode 100644
index 09631dee2e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/AbstractAnnotationAdapter.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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.jdt.AnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * Adapt a member and a declaration annotation adapter.
- */
-public abstract class AbstractAnnotationAdapter implements AnnotationAdapter {
-	private final Member member;
-	private final DeclarationAnnotationAdapter daa;
-
-
-	// ********** constructor **********
-
-	public AbstractAnnotationAdapter(Member member, DeclarationAnnotationAdapter daa) {
-		super();
-		this.member = member;
-		this.daa = daa;
-	}
-
-
-	// ********** AnnotationAdapter implementation **********
-
-	public Annotation getAnnotation(CompilationUnit astRoot) {
-		return this.daa.getAnnotation(this.member.getModifiedDeclaration(astRoot));
-	}
-
-	public void newMarkerAnnotation() {
-		this.edit(this.buildNewMarkerAnnotationEditor());
-	}
-
-	public void newSingleMemberAnnotation() {
-		this.edit(this.buildNewSingleMemberAnnotationEditor());
-	}
-
-	public void newNormalAnnotation() {
-		this.edit(this.buildNewNormalAnnotationEditor());
-	}
-
-	public void removeAnnotation() {
-		this.edit(this.buildRemoveAnnotationEditor());
-	}
-
-	public ASTNode getAstNode(CompilationUnit astRoot) {
-		return this.daa.getAstNode(this.member.getModifiedDeclaration(astRoot));
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.daa);
-	}
-
-
-	// ********** internal methods **********
-
-	protected void edit(Member.Editor editor) {
-		this.member.edit(editor);
-	}
-
-
-	// ********** factory methods **********
-
-	protected Member.Editor buildNewMarkerAnnotationEditor() {
-		return new NewMarkerAnnotationEditor(this.daa);
-	}
-
-	protected Member.Editor buildNewSingleMemberAnnotationEditor() {
-		return new NewSingleMemberAnnotationEditor(this.daa);
-	}
-
-	protected Member.Editor buildNewNormalAnnotationEditor() {
-		return new NewNormalAnnotationEditor(this.daa);
-	}
-
-	protected Member.Editor buildRemoveAnnotationEditor() {
-		return new RemoveAnnotationEditor(this.daa);
-	}
-
-
-	// ********** member classes **********
-
-	protected static class NewMarkerAnnotationEditor implements Member.Editor {
-		private final DeclarationAnnotationAdapter daa;
-
-		NewMarkerAnnotationEditor(DeclarationAnnotationAdapter daa) {
-			super();
-			this.daa = daa;
-		}
-		public void edit(ModifiedDeclaration declaration) {
-			this.daa.newMarkerAnnotation(declaration);
-		}
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this);
-		}
-	}
-
-
-	protected static class NewSingleMemberAnnotationEditor implements Member.Editor {
-		private final DeclarationAnnotationAdapter daa;
-
-		NewSingleMemberAnnotationEditor(DeclarationAnnotationAdapter daa) {
-			super();
-			this.daa = daa;
-		}
-		public void edit(ModifiedDeclaration declaration) {
-			this.daa.newSingleMemberAnnotation(declaration);
-		}
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this);
-		}
-	}
-
-
-	protected static class NewNormalAnnotationEditor implements Member.Editor {
-		private final DeclarationAnnotationAdapter daa;
-
-		NewNormalAnnotationEditor(DeclarationAnnotationAdapter daa) {
-			super();
-			this.daa = daa;
-		}
-		public void edit(ModifiedDeclaration declaration) {
-			this.daa.newNormalAnnotation(declaration);
-		}
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this);
-		}
-	}
-
-
-	protected static class RemoveAnnotationEditor implements Member.Editor {
-		private final DeclarationAnnotationAdapter daa;
-
-		RemoveAnnotationEditor(DeclarationAnnotationAdapter daa) {
-			super();
-			this.daa = daa;
-		}
-		public void edit(ModifiedDeclaration declaration) {
-			this.daa.removeAnnotation(declaration);
-		}
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/AbstractDeclarationAnnotationAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/AbstractDeclarationAnnotationAdapter.java
deleted file mode 100644
index e74866a42c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/AbstractDeclarationAnnotationAdapter.java
+++ /dev/null
@@ -1,140 +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.core.internal.utility.jdt;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * 
- */
-public abstract class AbstractDeclarationAnnotationAdapter implements DeclarationAnnotationAdapter {
-	private final String annotationName;
-
-
-	// ********** constructors **********
-
-	protected AbstractDeclarationAnnotationAdapter(String annotationName) {
-		super();
-		this.annotationName = annotationName;
-	}
-
-
-	// ********** DeclarationAnnotationAdapter implementation **********
-
-	public MarkerAnnotation newMarkerAnnotation(ModifiedDeclaration declaration) {
-		MarkerAnnotation annotation = this.newMarkerAnnotation(declaration.getAst());
-		this.addAnnotationAndImport(declaration, annotation);
-		return annotation;
-	}
-
-	public SingleMemberAnnotation newSingleMemberAnnotation(ModifiedDeclaration declaration) {
-		SingleMemberAnnotation annotation = this.newSingleMemberAnnotation(declaration.getAst());
-		this.addAnnotationAndImport(declaration, annotation);
-		return annotation;
-	}
-
-	public NormalAnnotation newNormalAnnotation(ModifiedDeclaration declaration) {
-		NormalAnnotation annotation = this.newNormalAnnotation(declaration.getAst());
-		this.addAnnotationAndImport(declaration, annotation);
-		return annotation;
-	}
-
-	/**
-	 * Add the appropriate import statement, then shorten the annotation's
-	 * name before adding it to the declaration.
-	 */
-	protected void addAnnotationAndImport(ModifiedDeclaration declaration, Annotation annotation) {
-		declaration.addImport(this.annotationName);
-		annotation.setTypeName(declaration.getAst().newName(this.shortAnnotationName()));
-		this.addAnnotation(declaration, annotation);
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.annotationName);
-	}
-
-	/**
-	 * Add the specified annotation to the specified declaration,
-	 * replacing the original annotation if present.
-	 */
-	protected abstract void addAnnotation(ModifiedDeclaration declaration, Annotation annotation);
-
-
-	// ********** public methods **********
-
-	public String getAnnotationName() {
-		return this.annotationName;
-	}
-
-
-	// ********** helper methods **********
-
-	protected boolean nameMatches(ModifiedDeclaration declaration, Annotation annotation) {
-		return this.nameMatches(declaration, annotation, this.annotationName);
-	}
-
-	protected boolean nameMatches(ModifiedDeclaration declaration, Annotation annotation, String name) {
-		return declaration.annotationIsNamed(annotation, name);
-	}
-
-	protected MarkerAnnotation newMarkerAnnotation(AST ast) {
-		return this.newMarkerAnnotation(ast, this.annotationName);
-	}
-
-	protected MarkerAnnotation newMarkerAnnotation(AST ast, String name) {
-		MarkerAnnotation annotation = ast.newMarkerAnnotation();
-		annotation.setTypeName(ast.newName(name));
-		return annotation;
-	}
-
-	protected SingleMemberAnnotation newSingleMemberAnnotation(AST ast) {
-		return this.newSingleMemberAnnotation(ast, this.annotationName);
-	}
-
-	protected SingleMemberAnnotation newSingleMemberAnnotation(AST ast, String name) {
-		SingleMemberAnnotation annotation = ast.newSingleMemberAnnotation();
-		annotation.setTypeName(ast.newName(name));
-		return annotation;
-	}
-
-	protected NormalAnnotation newNormalAnnotation(AST ast) {
-		return this.newNormalAnnotation(ast, this.annotationName);
-	}
-
-	protected NormalAnnotation newNormalAnnotation(AST ast, String name) {
-		NormalAnnotation annotation = ast.newNormalAnnotation();
-		annotation.setTypeName(ast.newName(name));
-		return annotation;
-	}
-
-	protected String shortAnnotationName() {
-		return this.shortName(this.annotationName);
-	}
-	
-	protected String shortName(String name) {
-		return name.substring(name.lastIndexOf('.') + 1);
-	}
-	
-	@SuppressWarnings("unchecked")
-	protected List<MemberValuePair> values(NormalAnnotation na) {
-		return na.values();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/AbstractExpressionConverter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/AbstractExpressionConverter.java
deleted file mode 100644
index eb69e6457a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/AbstractExpressionConverter.java
+++ /dev/null
@@ -1,82 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jpt.core.utility.jdt.ExpressionConverter;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * Gather together the common implementation behavior.
- * T is the type of the object to be converted to and from an expression.
- * 
- * We're still figuring out Java Generics here.... The methods in this abstract
- * class work fine with any subclass of Expression E; but a ClassCastException
- * will occur as soon as we call any method implemented by a subclass
- * (e.g. StringExpressionConverter) that expects a particular subclass of
- * Expression (e.g. StringLiteral).
- */
-public abstract class AbstractExpressionConverter<T>
-	implements ExpressionConverter<T>
-{
-
-	protected AbstractExpressionConverter() {
-		super();
-	}
-
-
-	// ********** object -> expression **********
-
-	public Expression convert(T object, AST ast) {
-		return (object == null) ? this.convertNull(ast) : this.convertObject(object, ast);
-	}
-
-	/**
-	 * Return the expression for a null object. By default, a null object will
-	 * be converted into a null expression.
-	 */
-	protected Expression convertNull(AST ast) {
-		return null;
-	}
-
-	/**
-	 * The specified object is not null.
-	 * @see #convert(T, AST)
-	 */
-	protected abstract Expression convertObject(T object, AST ast);
-
-
-	// ********** expression -> object **********
-
-	public T convert(Expression expression) {
-		return (expression == null) ? this.convertNull() : this.convertExpression(expression);
-	}
-
-	/**
-	 * Return the object for a null expression. By default, a null expression will
-	 * be converted into a null object.
-	 */
-	protected T convertNull() {
-		return null;
-	}
-
-	/**
-	 * The specified expression is not null.
-	 * @see #convert(Expression)
-	 */
-	protected abstract T convertExpression(Expression expression);
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/AbstractNestedDeclarationAnnotationAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/AbstractNestedDeclarationAnnotationAdapter.java
deleted file mode 100644
index df8556f693..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/AbstractNestedDeclarationAnnotationAdapter.java
+++ /dev/null
@@ -1,419 +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.core.internal.utility.jdt;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.ModifiedDeclaration;
-
-/**
- * Pull together some of the behavior common to NestedDeclarationAnnotationAdapter
- * and IndexedNestedDeclarationAnnotationAdapter
- */
-public abstract class AbstractNestedDeclarationAnnotationAdapter extends AbstractDeclarationAnnotationAdapter {
-	private final DeclarationAnnotationAdapter outerAnnotationAdapter;
-	private final String elementName;
-	private final boolean removeOuterAnnotationWhenEmpty;
-
-
-	// ********** constructors **********
-
-	/**
-	 * default element name is "value";
-	 * default behavior is to remove the outer annotation when it is empty
-	 */
-	protected AbstractNestedDeclarationAnnotationAdapter(DeclarationAnnotationAdapter outerAnnotationAdapter, String annotationName) {
-		this(outerAnnotationAdapter, "value", annotationName);
-	}
-
-	/**
-	 * default behavior is to remove the outer annotation when it is empty
-	 */
-	protected AbstractNestedDeclarationAnnotationAdapter(DeclarationAnnotationAdapter outerAnnotationAdapter, String elementName, String annotationName) {
-		this(outerAnnotationAdapter, elementName, annotationName, true);
-	}
-
-	protected AbstractNestedDeclarationAnnotationAdapter(DeclarationAnnotationAdapter outerAnnotationAdapter, String elementName, String annotationName, boolean removeOuterAnnotationWhenEmpty) {
-		super(annotationName);
-		this.outerAnnotationAdapter = outerAnnotationAdapter;
-		this.elementName = elementName;
-		this.removeOuterAnnotationWhenEmpty = removeOuterAnnotationWhenEmpty;
-	}
-
-
-	// ********** DeclarationAnnotationAdapter implementation **********
-
-	public Annotation getAnnotation(ModifiedDeclaration declaration) {
-		Annotation outer = this.outerAnnotationAdapter.getAnnotation(declaration);
-		if (outer == null) {
-			return null;
-		}
-		Expression value = this.elementValue(outer);
-		if (value == null) {
-			return null;
-		}
-		Annotation inner = this.getAnnotation(value);
-		if (inner == null) {
-			return null;
-		}
-		// return the annotation only if it has a matching name(?)
-		return this.nameMatches(declaration, inner) ? inner : null;
-	}
-
-	public void removeAnnotation(ModifiedDeclaration declaration) {
-		Annotation outer = this.outerAnnotationAdapter.getAnnotation(declaration);
-		if (outer == null) {
-			return;
-		}
-		Expression value = this.elementValue(outer);
-		if (value == null) {
-			return;
-		}
-		// hack to allow short-circuit when the value is an array initializer
-		if (this.removeAnnotation(declaration, outer, value)) {
-			return;
-		}
-		Annotation inner = this.annotationValue(value);
-		if (inner == null) {
-			return;
-		}
-		// remove the annotation only if it has a matching name(?)
-		if (this.nameMatches(declaration, inner)) {
-			this.removeElementAndNormalize(declaration, outer);
-		}
-	}
-
-	public ASTNode getAstNode(ModifiedDeclaration declaration) {
-		// if the annotation is missing, return the outer annotation's node
-		Annotation annotation = this.getAnnotation(declaration);
-		return (annotation != null) ? annotation : this.outerAnnotationAdapter.getAstNode(declaration);
-	}
-
-	@Override
-	protected void addAnnotation(ModifiedDeclaration declaration, Annotation inner) {
-		Annotation outer = this.outerAnnotationAdapter.getAnnotation(declaration);
-		if (outer == null) {
-			this.buildNewOuterAnnotation(declaration, inner);
-		} else if (outer.isMarkerAnnotation()) {
-			this.modifyAnnotation(declaration, (MarkerAnnotation) outer, inner);
-		} else if (outer.isSingleMemberAnnotation()) {
-			this.modifyAnnotation(declaration, (SingleMemberAnnotation) outer, inner);
-		} else if (outer.isNormalAnnotation()) {
-			this.modifyAnnotation(declaration, (NormalAnnotation) outer, inner);
-		} else {
-			throw new IllegalStateException("unknown annotation type: " + outer);
-		}
-	}
-
-
-	// ********** abstract methods **********
-
-	/**
-	 * Return an annotation extracted from the specified expression,
-	 * which is the value of the adapter's element.
-	 */
-	protected abstract Annotation getAnnotation(Expression value);
-
-	/**
-	 * Remove the annotation from the specified expression,
-	 * which is the value of the adapter's element.
-	 * Return whether the removal was successful.
-	 */
-	protected abstract boolean removeAnnotation(ModifiedDeclaration declaration, Annotation outer, Expression value);
-
-	/**
-	 * Set the value of the specified outer annotation to the
-	 * specified inner annotation.
-	 */
-	protected abstract void modifyAnnotationValue(SingleMemberAnnotation outer, Annotation inner);
-
-	/**
-	 * Set the value of the specified member value pair to the
-	 * specified inner annotation.
-	 */
-	protected abstract void modifyMemberValuePair(MemberValuePair pair, Annotation inner);
-
-
-	// ********** public methods **********
-
-	public DeclarationAnnotationAdapter getOuterAnnotationAdapter() {
-		return this.outerAnnotationAdapter;
-	}
-
-	public String getElementName() {
-		return this.elementName;
-	}
-
-
-	// ********** internal methods **********
-
-	/**
-	 * If the specified expression is an annotation, cast it to an annotation;
-	 * otherwise return null.
-	 */
-	protected Annotation annotationValue(Expression expression) {
-		switch (expression.getNodeType()) {
-			case ASTNode.NORMAL_ANNOTATION:
-			case ASTNode.SINGLE_MEMBER_ANNOTATION:
-			case ASTNode.MARKER_ANNOTATION:
-				return (Annotation) expression;
-			default:
-				return null;
-		}
-	}
-
-	/**
-	 * Remove the *first* annotation element with the specified name
-	 * from the specified annotation, converting the annotation as appropriate.
-	 */
-	protected void removeElementAndNormalize(ModifiedDeclaration declaration, Annotation outer) {
-		if (outer.isNormalAnnotation()) {
-			this.removeElementAndNormalize(declaration, (NormalAnnotation) outer);
-		} else if (outer.isSingleMemberAnnotation()) {
-			this.removeElementAndNormalize(declaration, (SingleMemberAnnotation) outer);
-		} else if (outer.isMarkerAnnotation()) {
-			this.removeElementAndNormalize(declaration, (MarkerAnnotation) outer);
-		} else {
-			throw new IllegalArgumentException("unknown annotation type: " + outer);
-		}
-	}
-
-	/**
-	 * Remove the *first* annotation element with the adapter's element name
-	 * from the specified annotation. Convert the annotation to
-	 * a marker annotation or single member annotation if appropriate.
-	 * <pre>
-	 * &#64;Outer(name="Fred", foo=&#64;Inner) => &#64;Outer(name="Fred")
-	 * &#64;Outer(foo=&#64;Inner) => &#64;Outer
-	 * </pre>
-	 */
-	protected void removeElementAndNormalize(ModifiedDeclaration declaration, NormalAnnotation outer) {
-		this.removeElement(outer);
-		this.normalizeAnnotation(declaration, outer);
-	}
-
-	/**
-	 * Remove from the specified annotation the element with
-	 * the adapter's element name.
-	 */
-	protected void removeElement(NormalAnnotation annotation) {
-		for (Iterator<MemberValuePair> stream = this.values(annotation).iterator(); stream.hasNext(); ) {
-			MemberValuePair pair = stream.next();
-			if (pair.getName().getFullyQualifiedName().equals(this.elementName)) {
-				stream.remove();
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Convert the specified normal annotation to a marker annotation or
-	 * single member annotation if appropriate.
-	 */
-	protected void normalizeAnnotation(ModifiedDeclaration declaration, NormalAnnotation outer) {
-		List<MemberValuePair> values = this.values(outer);
-		switch (values.size()) {
-			case 0:
-				// if the elements are all gone, remove the annotation or convert it to a marker annotation
-				if (this.removeOuterAnnotationWhenEmpty) {
-					this.outerAnnotationAdapter.removeAnnotation(declaration);
-				} else {
-					// convert the annotation to a marker annotation
-					this.outerAnnotationAdapter.newMarkerAnnotation(declaration);
-				}
-				break;
-			case 1:
-				MemberValuePair pair = values.get(0);
-				if (pair.getName().getFullyQualifiedName().equals("value")) {
-					// if the last remaining element is 'value', convert the annotation to a single member annotation
-					Expression vv = pair.getValue();
-					vv = (Expression) ASTNode.copySubtree(vv.getAST(), vv);
-					this.outerAnnotationAdapter.newSingleMemberAnnotation(declaration).setValue(vv);
-				}
-				break;
-			default:
-				// do nothing
-				break;
-		}
-	}
-
-	/**
-	 * Convert the specified single member annotation to a marker annotation
-	 * if the adapter's element name is "value".
-	 */
-	protected void removeElementAndNormalize(ModifiedDeclaration declaration, SingleMemberAnnotation outer) {
-		if (this.elementName.equals("value")) {
-			if (this.removeOuterAnnotationWhenEmpty) {
-				this.outerAnnotationAdapter.removeAnnotation(declaration);
-			} else {
-				// convert the annotation to a marker annotation
-				this.outerAnnotationAdapter.newMarkerAnnotation(declaration);
-			}
-		}
-	}
-
-	protected void removeElementAndNormalize(ModifiedDeclaration declaration, MarkerAnnotation outer) {
-		if (this.removeOuterAnnotationWhenEmpty) {
-			this.outerAnnotationAdapter.removeAnnotation(declaration);
-		}
-	}
-
-	/**
-	 * Return the value of the *first* annotation element
-	 * with the adapter's element name.
-	 * Return null if the annotation has no such element.
-	 * (An element name of "value" will return the value of a single
-	 * member annotation.)
-	 */
-	protected Expression elementValue(Annotation annotation) {
-		if (annotation.isNormalAnnotation()) {
-			return this.elementValue((NormalAnnotation) annotation);
-		}
-		if (annotation.isSingleMemberAnnotation()) {
-			return this.elementValue((SingleMemberAnnotation) annotation);
-		}
-		return null;
-	}
-
-	protected Expression elementValue(NormalAnnotation annotation) {
-		MemberValuePair pair = this.memberValuePair(annotation);
-		return (pair == null) ? null : pair.getValue();
-	}
-
-	/**
-	 * If the adapter's element name is "value", return the value of the
-	 * annotation, otherwise return null.
-	 */
-	protected Expression elementValue(SingleMemberAnnotation annotation) {
-		return this.elementName.equals("value") ? annotation.getValue() : null;
-	}
-
-	/**
-	 * Return the *first* member value pair for the adapter's element name.
-	 * Return null if the specified annotation has no such element.
-	 */
-	protected MemberValuePair memberValuePair(NormalAnnotation annotation) {
-		for (MemberValuePair pair : this.values(annotation)) {
-			if (pair.getName().getFullyQualifiedName().equals(this.elementName)) {
-				return pair;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Build a new outer annotation and add the specified
-	 * inner annotation to it:
-	 * <pre>
-	 *     &#64;Outer(&#64;Inner)
-	 * </pre>
-	 * or
-	 * <pre>
-	 *     &#64;Outer(foo=&#64;Inner)
-	 * </pre>
-	 */
-	protected void buildNewOuterAnnotation(ModifiedDeclaration declaration, Annotation inner) {
-		if (this.elementName.equals("value")) {
-			this.outerAnnotationAdapter.newSingleMemberAnnotation(declaration).setValue(this.buildNewInnerExpression(inner));
-		} else {
-			List<MemberValuePair> values = this.values(this.outerAnnotationAdapter.newNormalAnnotation(declaration));
-			values.add(this.newMemberValuePair(this.buildNewInnerExpression(inner)));
-		}
-	}
-
-	/**
-	 * Build an expression to be added to a new outer annotation
-	 * for the specified inner annotation.
-	 */
-	protected abstract Expression buildNewInnerExpression(Annotation inner);
-
-	/**
-	 * Build a new member value pair with the specified name and value.
-	 */
-	protected MemberValuePair newMemberValuePair(String name, Expression value) {
-		AST ast = value.getAST();
-		MemberValuePair pair = ast.newMemberValuePair();
-		pair.setName(ast.newSimpleName(name));
-		pair.setValue(value);
-		return pair;
-	}
-
-	/**
-	 * Build a new member value pair with the adapter's element name
-	 * and the specified inner annotation.
-	 */
-	protected MemberValuePair newMemberValuePair(Expression value) {
-		return this.newMemberValuePair(this.elementName, value);
-	}
-
-	/**
-	 * Add the specified inner annotation to the marker annotation.
-	 */
-	protected void modifyAnnotation(ModifiedDeclaration declaration, MarkerAnnotation outer, Annotation inner) {
-		this.buildNewOuterAnnotation(declaration, inner);
-	}
-
-	/**
-	 * Add the specified inner annotation to the single member annotation.
-	 */
-	protected void modifyAnnotation(ModifiedDeclaration declaration, SingleMemberAnnotation outer, Annotation inner) {
-		if (this.elementName.equals("value")) {
-			this.modifyAnnotationValue(outer, inner);
-		} else {
-			this.modifyAnnotationNonValue(declaration, outer, inner);
-		}
-	}
-
-	/**
-	 * Add the specified inner annotation to the single member annotation,
-	 * converting it to a normal annotation:
-	 * <pre>
-	 *     &#64;Outer("lorem ipsum") => &#64;Outer(value="lorem ipsum", foo=&#64;Inner)
-	 * </pre>
-	 */
-	protected void modifyAnnotationNonValue(ModifiedDeclaration declaration, SingleMemberAnnotation outer, Annotation inner) {
-		Expression vv = outer.getValue();
-		vv = (Expression) ASTNode.copySubtree(vv.getAST(), vv);
-		NormalAnnotation newOuter = this.outerAnnotationAdapter.newNormalAnnotation(declaration);
-		List<MemberValuePair> values = this.values(newOuter);
-		values.add(this.newMemberValuePair("value", vv));
-		values.add(this.newMemberValuePair(this.buildNewInnerExpression(inner)));
-	}
-
-	/**
-	 * Add the specified inner annotation to the normal annotation:
-	 * <pre>
-	 *     &#64;Outer(bar="lorem ipsum") => &#64;Outer(bar="lorem ipsum", foo=&#64;Inner)
-	 * </pre>
-	 * or
-	 * <pre>
-	 *     &#64;Outer(foo=&#64;Inner("lorem ipsum")) => &#64;Outer(foo=&#64;Inner)
-	 * </pre>
-	 */
-	protected void modifyAnnotation(ModifiedDeclaration declaration, NormalAnnotation outer, Annotation inner) {
-		MemberValuePair pair = this.memberValuePair(outer);
-		if (pair == null) {
-			List<MemberValuePair> values = this.values(outer);
-			values.add(this.newMemberValuePair(inner));
-		} else {
-			this.modifyMemberValuePair(pair, inner);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/AnnotationStringArrayExpressionConverter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/AnnotationStringArrayExpressionConverter.java
deleted file mode 100644
index 889b59ea63..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/AnnotationStringArrayExpressionConverter.java
+++ /dev/null
@@ -1,96 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ArrayInitializer;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jpt.core.utility.jdt.ExpressionConverter;
-
-/**
- * Convert an array initializer or single expression to/from an array of
- * strings (e.g. {"text0", "text1"}).
- * E is the type of the expressions to be found either standalone or
- * as elements in the array initializer.
- */
-public class AnnotationStringArrayExpressionConverter
-	extends AbstractExpressionConverter<String[]>
-{
-	private final ExpressionConverter<String> elementConverter;
-	private final StringArrayExpressionConverter arrayConverter;
-
-
-	/**
-	 * The default behavior is to remove the array initializer if it is empty.
-	 */
-	public AnnotationStringArrayExpressionConverter(ExpressionConverter<String> elementConverter) {
-		this(elementConverter, true);
-	}
-
-	public AnnotationStringArrayExpressionConverter(ExpressionConverter<String> elementConverter, boolean removeArrayInitializerWhenEmpty) {
-		super();
-		this.elementConverter = elementConverter;
-		this.arrayConverter = new StringArrayExpressionConverter(elementConverter, removeArrayInitializerWhenEmpty);
-	}
-
-	/**
-	 * if we only have a single string in the array return the single expression,
-	 * without braces, instead of an array initializer
-	 */
-	@Override
-	protected Expression convertObject(String[] strings, AST ast) {
-		return (strings.length == 1) ?
-				this.elementConverter.convert(strings[0], ast)
-			:
-				this.arrayConverter.convertObject(strings, ast);
-	}
-
-	@Override
-	protected String[] convertNull() {
-		return this.arrayConverter.convertNull();
-	}
-
-	/**
-	 * check for a single expression with no surrounding braces, implying a
-	 * single-entry array
-	 */
-	@Override
-	protected String[] convertExpression(Expression expression) {
-		return (expression.getNodeType() == ASTNode.ARRAY_INITIALIZER) ?
-				this.arrayConverter.convertArrayInitializer((ArrayInitializer) expression)
-			:
-				new String[] {this.elementConverter.convert(expression)};
-	}
-
-
-	// ********** factory methods **********
-
-	/**
-	 * Build an expression converter for an annotation element of type String[].
-	 *     @Foo(bar={"text0", "text1"})
-	 * or
-	 *     @Foo(bar="text0")
-	 */
-	public static AnnotationStringArrayExpressionConverter forStrings() {
-		return new AnnotationStringArrayExpressionConverter(StringExpressionConverter.instance());
-	}
-
-	/**
-	 * Build an expression converter for an annotation element of type <enum>[].
-	 *     @Foo(bar={BAZ, BAT})
-	 * or
-	 *     @Foo(bar=BAZ)
-	 */
-	public static AnnotationStringArrayExpressionConverter forNames() {
-		return new AnnotationStringArrayExpressionConverter(NameStringExpressionConverter.instance());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/BooleanExpressionConverter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/BooleanExpressionConverter.java
deleted file mode 100644
index d6fc40d886..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/BooleanExpressionConverter.java
+++ /dev/null
@@ -1,51 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.BooleanLiteral;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jpt.core.utility.jdt.ExpressionConverter;
-
-/**
- * Convert a boolean literal to/from a Boolean
- * (e.g. Boolean.TRUE).
- */
-public final class BooleanExpressionConverter
-	extends AbstractExpressionConverter<Boolean>
-{
-	private static final ExpressionConverter<Boolean> INSTANCE = new BooleanExpressionConverter();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static ExpressionConverter<Boolean> instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private BooleanExpressionConverter() {
-		super();
-	}
-
-	@Override
-	protected BooleanLiteral convertObject(Boolean booleanObject, AST ast) {
-		return ast.newBooleanLiteral(booleanObject.booleanValue());
-	}
-
-	@Override
-	protected Boolean convertExpression(Expression expression) {
-		Object value = expression.resolveConstantExpressionValue();
-		return (value instanceof Boolean) ? ((Boolean) value) : null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/CharacterStringExpressionConverter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/CharacterStringExpressionConverter.java
deleted file mode 100644
index 1da206b188..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/CharacterStringExpressionConverter.java
+++ /dev/null
@@ -1,53 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CharacterLiteral;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jpt.core.utility.jdt.ExpressionConverter;
-
-/**
- * Convert a character literal to/from a string representation of a character
- * (e.g. "A").
- */
-public final class CharacterStringExpressionConverter
-	extends AbstractExpressionConverter<String>
-{
-	private static final ExpressionConverter<String> INSTANCE = new CharacterStringExpressionConverter();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static ExpressionConverter<String> instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private CharacterStringExpressionConverter() {
-		super();
-	}
-	
-	@Override
-	protected CharacterLiteral convertObject(String string, AST ast) {
-		CharacterLiteral characterLiteral = ast.newCharacterLiteral();
-		characterLiteral.setCharValue(string.charAt(0));
-		return characterLiteral;
-	}
-
-	@Override
-	protected String convertExpression(Expression expression) {
-		Object value = expression.resolveConstantExpressionValue();
-		return (value instanceof Character) ? ((Character) value).toString() : null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/CombinationIndexedDeclarationAnnotationAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/CombinationIndexedDeclarationAnnotationAdapter.java
deleted file mode 100644
index 2fbc8a715f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/CombinationIndexedDeclarationAnnotationAdapter.java
+++ /dev/null
@@ -1,493 +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.core.internal.utility.jdt;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.IndexedDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * Manipulate an annotation that either occurs stand-alone, e.g.
- * <pre>
- *     &#64;Inner("zero")
- *     private int id;
- * </pre>
- *     
- * or is embedded in an element array within another annotation, e.g.
- * <pre>
- *     &#64;Outer(foo={&#64;Inner("zero"), &#64;Inner("one"), &#64;Inner("two")})
- *     private int id;
- *     
- *         annotationName = "Inner"
- *         containerAnnotationName = "Outer"
- *         elementName = "foo"
- *         index = 0-2
- * </pre>
- * 
- * This is a useful pattern because a declaration cannot have more
- * than one annotation of the same type, and allowing the stand-alone
- * configuration reduces clutter.
- * <br>
- * NB: This configuration only makes sense for "top-level" annotations, as
- * opposed to "nested" annotations. This is because annotation elements
- * can only be declared with a type of a single annotation and annotations
- * cannot be part of an inheritance hierarchy.
- * For example, the following configurations cannot *both* be supported:
- * <pre>
- *     &#64;Foo(bar=&#64;Outer(...))
- *     private int id;
- * 
- *     &#64;Foo(bar=&#64;Inner(...))  // not allowed
- *     private int id;
- * </pre>
- * 
- * NB: Behavior is undefined when both the stand-alone and the nested
- * configurations annotate the same declaration, e.g.
- * <pre>
- *     // undefined behavior
- *     &#64;Inner("zero")
- *     &#64;Outer(foo={&#64;Inner("zero"), &#64;Inner("one"), &#64;Inner("two")})
- *     private int id;
- * </pre>
- */
-public class CombinationIndexedDeclarationAnnotationAdapter
-	implements IndexedDeclarationAnnotationAdapter
-{
-
-	/**
-	 * this adapter is used when the annotation is "stand-alone":
-	 * <pre>
-	 *     &#64;Inner("zero")
-	 * </pre>
-	 * and is only used when the index is 0 or 1
-	 */
-	private final SimpleDeclarationAnnotationAdapter standAloneAnnotationAdapter;
-
-	/**
-	 * this adapter is used when the annotation is "nested":
-	 * <pre>
-	 *     &#64;Outer(foo={&#64;Inner("zero"), &#64;Inner("one")})
-	 * </pre>
-	 */
-	private final NestedIndexedDeclarationAnnotationAdapter nestedAnnotationAdapter;
-
-	/**
-	 * this adapter is for the "nested" annotation at the zero index;
-	 * and is only used when the index is 1
-	 */
-	private final NestedIndexedDeclarationAnnotationAdapter zeroNestedAnnotationAdapter;
-
-
-	// ********** constructors **********
-
-	/**
-	 * default element name is "value"
-	 * <pre>
-	 *     &#64;Inner("zero")
-	 *     &#64;Outer({&#64;Inner("zero"), &#64;Inner("one")})
-	 * </pre>
-	 */
-	public CombinationIndexedDeclarationAnnotationAdapter(String annotationName, String containerAnnotationName, int index) {
-		this(annotationName, containerAnnotationName, "value", index);
-	}
-
-	public CombinationIndexedDeclarationAnnotationAdapter(String annotationName, String containerAnnotationName, String elementName, int index) {
-		this(new SimpleDeclarationAnnotationAdapter(annotationName), new SimpleDeclarationAnnotationAdapter(containerAnnotationName), elementName, index, annotationName);
-	}
-
-	/**
-	 * default element name is "value"
-	 */
-	public CombinationIndexedDeclarationAnnotationAdapter(
-			SimpleDeclarationAnnotationAdapter standAloneAnnotationAdapter, 
-			SimpleDeclarationAnnotationAdapter containerAnnotationAdapter, 
-			int index, 
-			String nestedAnnotationName
-	) {
-		this(standAloneAnnotationAdapter, containerAnnotationAdapter, "value", index, nestedAnnotationName);
-	}
-
-	public CombinationIndexedDeclarationAnnotationAdapter(
-			SimpleDeclarationAnnotationAdapter standAloneAnnotationAdapter, 
-			SimpleDeclarationAnnotationAdapter containerAnnotationAdapter, 
-			String elementName, 
-			int index, 
-			String nestedAnnotationName
-	) {
-		super();
-		this.standAloneAnnotationAdapter = standAloneAnnotationAdapter;
-		this.nestedAnnotationAdapter = new NestedIndexedDeclarationAnnotationAdapter(containerAnnotationAdapter, elementName, index, nestedAnnotationName);
-		this.zeroNestedAnnotationAdapter = new NestedIndexedDeclarationAnnotationAdapter(containerAnnotationAdapter, elementName, 0, nestedAnnotationName);
-	}
-
-
-	// ********** DeclarationAnnotationAdapter implementation **********
-
-	public Annotation getAnnotation(ModifiedDeclaration declaration) {
-		if (this.getIndex() == 0) {
-			// check for the stand-alone annotation
-			Annotation standAloneAnnotation = this.getStandAloneAnnotation(declaration);
-			if (standAloneAnnotation != null) {
-				return standAloneAnnotation;
-			}
-		}
-		return this.getNestedAnnotation(declaration);
-	}
-
-	/**
-	 * <pre>
-	 * [none] => &#64;Inner
-	 *     or
-	 * &#64;Inner("lorem ipsum") => &#64;Inner
-	 *     or
-	 * &#64;Inner(text="lorem ipsum") => &#64;Inner
-	 *     or
-	 * &#64;Outer(foo={&#64;Inner, &#64;Inner}) => &#64;Outer(foo={&#64;Inner, &#64;Inner, &#64;Inner})
-	 *     or
-	 * &#64;Outer(foo=&#64;Inner) => &#64;Outer(foo={&#64;Inner, &#64;Inner})
-	 *     or
-	 * &#64;Inner => &#64;Outer(foo={&#64;Inner, &#64;Inner})
-	 *     etc.
-	 * </pre>
-	 */
-	public MarkerAnnotation newMarkerAnnotation(ModifiedDeclaration declaration) {
-		return (MarkerAnnotation) this.newAnnotation(MARKER_ANNOTATION_FACTORY, declaration);
-	}
-
-	public SingleMemberAnnotation newSingleMemberAnnotation(ModifiedDeclaration declaration) {
-		return (SingleMemberAnnotation) this.newAnnotation(SINGLE_MEMBER_ANNOTATION_FACTORY, declaration);
-	}
-
-	public NormalAnnotation newNormalAnnotation(ModifiedDeclaration declaration) {
-		return (NormalAnnotation) this.newAnnotation(NORMAL_ANNOTATION_FACTORY, declaration);
-	}
-
-	public void removeAnnotation(ModifiedDeclaration declaration) {
-		if (this.getIndex() == 0) {
-			// check for the stand-alone annotation
-			if (this.standAloneAnnotationIsPresent(declaration)) {
-				this.removeStandAloneAnnotation(declaration);
-				return;
-			}
-		}
-		this.removeNestedAnnotation(declaration);
-		if (this.nestedElementCanBeConvertedToStandAlone(declaration)) {
-			this.convertLastElementAnnotationToStandAloneAnnotation(declaration);
-		}
-	}
-
-	public ASTNode getAstNode(ModifiedDeclaration declaration) {
-		// if the annotation is missing, delegate to the nested annotation adapter
-		Annotation annotation = this.getAnnotation(declaration);
-		return (annotation != null) ? annotation : this.nestedAnnotationAdapter.getAstNode(declaration);
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.getAnnotationName());
-	}
-
-
-	// ********** IndexedDeclarationAnnotationAdapter implementation **********
-
-	public int getIndex() {
-		return this.nestedAnnotationAdapter.getIndex();
-	}
-
-	public void moveAnnotation(int newIndex, ModifiedDeclaration declaration) {
-		int oldIndex = this.getIndex();
-		if (newIndex == oldIndex) {
-			return;
-		}
-
-		Annotation standAloneAnnotation = this.getStandAloneAnnotation(declaration);
-		if (standAloneAnnotation == null) {
-			this.moveNestedAnnotation(newIndex, declaration);
-			if (this.nestedElementCanBeConvertedToStandAlone(declaration)) {
-				this.convertLastElementAnnotationToStandAloneAnnotation(declaration);
-			}
-		} else {
-			if ((oldIndex == 0) && (newIndex == 1)) {
-				// this is one of two situations where we transition from standalone to container
-				this.moveStandAloneAnnotationToContainerAnnotation(standAloneAnnotation, declaration);
-				this.moveNestedAnnotation(newIndex, declaration);
-			} else if (newIndex == 0) {
-				// we are moving a 'null' entry on top of the standalone, so remove it
-				this.removeStandAloneAnnotation(declaration);
-			} else {
-				throw new IllegalStateException("old index = " + oldIndex + "; new index = " + newIndex);
-			}
-		}
-	}
-
-
-	// ********** internal methods **********
-
-	/**
-	 * build the appropriate new annotation,
-	 * which may require moving the 0th annotation from "stand-alone" to "nested"
-	 */
-	private Annotation newAnnotation(AnnotationFactory annotationFactory, ModifiedDeclaration declaration) {
-		if (this.getIndex() ==  0) {
-			return this.newZeroAnnotation(annotationFactory, declaration);
-		}
-		if (this.zeroNestedAnnotationIsPresent(declaration)) {
-			// manipulate the container annotation - ignore the stand-alone annotation(?)
-			// @Outer(foo=@Inner("zero")) => @Outer(foo={@Inner("zero"), @Inner})
-			//     or
-			// @Outer(foo={@Inner("zero"), @Inner("one")}) => @Outer(foo={@Inner("zero"), @Inner})
-			return annotationFactory.newAnnotation(this.nestedAnnotationAdapter, declaration);
-		}
-
-		// this is one of two situations where we transition from standalone to container
-		this.moveStandAloneAnnotationToContainerAnnotation(declaration);
-		// once the stand-alone annotation is moved to index=0, build the new annotation at index=1
-		return annotationFactory.newAnnotation(this.nestedAnnotationAdapter, declaration);
-	}
-
-	/**
-	 * the index is 0 - build the appropriate new annotation,
-	 * which may be either "stand-alone" or "nested"
-	 */
-	private Annotation newZeroAnnotation(AnnotationFactory annotationFactory, ModifiedDeclaration declaration) {
-		if (this.standAloneAnnotationIsPresent(declaration)) {
-			// replace the stand-alone annotation - ignore the container annotation(?)
-			// @Inner(text="lorem ipsum") => @Inner
-			return annotationFactory.newAnnotation(this.standAloneAnnotationAdapter, declaration);
-		}
-		if (this.containerAnnotationIsPresent(declaration)) {
-			// manipulate the container annotation
-			// @Outer(foo=@Inner(text="lorem ipsum")) => @Outer(foo=@Inner)
-			return annotationFactory.newAnnotation(this.nestedAnnotationAdapter, declaration);
-		}
-		// neither annotation is present - add a new stand-alone annotation
-		return annotationFactory.newAnnotation(this.standAloneAnnotationAdapter, declaration);
-	}
-
-	/**
-	 * move the stand-alone annotation to the container annotation at index=0
-	 */
-	private void moveStandAloneAnnotationToContainerAnnotation(ModifiedDeclaration declaration) {
-		Annotation standAloneAnnotation = this.getStandAloneAnnotation(declaration);
-		if (standAloneAnnotation == null) {
-			throw new IllegalStateException("the stand-alone annotation is missing");
-		}
-		this.moveStandAloneAnnotationToContainerAnnotation(standAloneAnnotation, declaration);
-	}
-
-	/**
-	 * move the specified, non-null, stand-alone annotation to
-	 * the container annotation at index=0
-	 */
-	private void moveStandAloneAnnotationToContainerAnnotation(Annotation standAloneAnnotation, ModifiedDeclaration declaration) {
-		if (standAloneAnnotation.isMarkerAnnotation()) {
-			this.zeroNestedAnnotationAdapter.newMarkerAnnotation(declaration);
-		} else if (standAloneAnnotation.isSingleMemberAnnotation()) {
-			Expression vv = ((SingleMemberAnnotation) standAloneAnnotation).getValue();
-			vv = (Expression) ASTNode.copySubtree(vv.getAST(), vv);
-			this.zeroNestedAnnotationAdapter.newSingleMemberAnnotation(declaration).setValue(vv);
-		} else if (standAloneAnnotation.isNormalAnnotation()) {
-			NormalAnnotation newNA = this.zeroNestedAnnotationAdapter.newNormalAnnotation(declaration);
-			List<MemberValuePair> values = this.values(newNA);
-			for (MemberValuePair pair : this.values((NormalAnnotation) standAloneAnnotation)) {
-				values.add((MemberValuePair) ASTNode.copySubtree(pair.getAST(), pair));
-			}
-		} else {
-			throw new IllegalStateException("unknown annotation type: " + standAloneAnnotation);
-		}
-		this.removeStandAloneAnnotation(declaration);
-	}
-
-	/**
-	 * return whether the "nested" annotation container has been reduced to
-	 * a single element (and the array initializer is converted to just
-	 * the single remaining element) and can be further converted to the
-	 * "stand-alone" annotation:
-	 * <pre>
-	 *     &#64;Outer(foo={&#64;Inner("zero"), &#64;Inner("one")}) =>
-	 *     &#64;Outer(foo=&#64;Inner("zero")) =>
-	 *     &#64;Inner("zero")
-	 * </pre>
-	 */
-	private boolean nestedElementCanBeConvertedToStandAlone(ModifiedDeclaration declaration) {
-		Annotation containerAnnotation = this.getContainerAnnotation(declaration);
-		if (containerAnnotation == null) {
-			return false;
-		}
-		if (containerAnnotation.isMarkerAnnotation()) {
-			return false;
-		}
-		if (containerAnnotation.isSingleMemberAnnotation()) {
-			if (this.getElementName().equals("value")) {
-				return (((SingleMemberAnnotation) containerAnnotation).getValue().getNodeType() != ASTNode.ARRAY_INITIALIZER)
-						&& (this.zeroNestedAnnotationAdapter.getAnnotation(declaration) != null);
-			}
-			return false;
-		}
-		if (containerAnnotation.isNormalAnnotation()) {
-			NormalAnnotation na = (NormalAnnotation) containerAnnotation;
-			if (na.values().size() == 0) {
-				return false;  // there are no elements present
-			}
-			if (na.values().size() != 1) {
-				return false;  // there are other elements present - leave them all alone
-			}
-			MemberValuePair pair = (MemberValuePair) na.values().get(0);
-			if (this.getElementName().equals(pair.getName().getFullyQualifiedName())) {
-				return (pair.getValue().getNodeType() != ASTNode.ARRAY_INITIALIZER)
-						&& (this.zeroNestedAnnotationAdapter.getAnnotation(declaration) != null);
-			}
-			return false;
-		}
-		throw new IllegalStateException("unknown annotation type: " + containerAnnotation);
-	}
-
-	/**
-	 * move the annotation in the container annotation at index=0
-	 * to the stand-alone annotation
-	 */
-	private void convertLastElementAnnotationToStandAloneAnnotation(ModifiedDeclaration declaration) {
-		Annotation last = this.zeroNestedAnnotationAdapter.getAnnotation(declaration);
-		if (last == null) {
-			throw new IllegalStateException("the last nested annotation is missing");
-		} else if (last.isMarkerAnnotation()) {
-			this.newStandAloneMarkerAnnotation(declaration);
-		} else if (last.isSingleMemberAnnotation()) {
-			Expression vv = ((SingleMemberAnnotation) last).getValue();
-			vv = (Expression) ASTNode.copySubtree(vv.getAST(), vv);
-			this.newStandAloneSingleMemberAnnotation(declaration).setValue(vv);
-		} else if (last.isNormalAnnotation()) {
-			NormalAnnotation newNA = this.newStandAloneNormalAnnotation(declaration);
-			List<MemberValuePair> values = this.values(newNA);
-			for (MemberValuePair pair : this.values((NormalAnnotation) last)) {
-				values.add((MemberValuePair) ASTNode.copySubtree(pair.getAST(), pair));
-			}
-		} else {
-			throw new IllegalStateException("unknown annotation type: " + last);
-		}
-		this.zeroNestedAnnotationAdapter.removeAnnotation(declaration);
-	}
-
-	private boolean standAloneAnnotationIsPresent(ModifiedDeclaration declaration) {
-		return this.getStandAloneAnnotation(declaration) != null;
-	}
-
-	private Annotation getStandAloneAnnotation(ModifiedDeclaration declaration) {
-		return this.standAloneAnnotationAdapter.getAnnotation(declaration);
-	}
-
-	private MarkerAnnotation newStandAloneMarkerAnnotation(ModifiedDeclaration declaration) {
-		return this.standAloneAnnotationAdapter.newMarkerAnnotation(declaration);
-	}
-
-	private SingleMemberAnnotation newStandAloneSingleMemberAnnotation(ModifiedDeclaration declaration) {
-		return this.standAloneAnnotationAdapter.newSingleMemberAnnotation(declaration);
-	}
-
-	private NormalAnnotation newStandAloneNormalAnnotation(ModifiedDeclaration declaration) {
-		return this.standAloneAnnotationAdapter.newNormalAnnotation(declaration);
-	}
-
-	private void removeStandAloneAnnotation(ModifiedDeclaration declaration) {
-		this.standAloneAnnotationAdapter.removeAnnotation(declaration);
-	}
-
-	private Annotation getNestedAnnotation(ModifiedDeclaration declaration) {
-		return this.nestedAnnotationAdapter.getAnnotation(declaration);
-	}
-
-	private void moveNestedAnnotation(int newIndex, ModifiedDeclaration declaration) {
-		this.nestedAnnotationAdapter.moveAnnotation(newIndex, declaration);
-	}
-
-	private void removeNestedAnnotation(ModifiedDeclaration declaration) {
-		this.nestedAnnotationAdapter.removeAnnotation(declaration);
-	}
-
-	private boolean containerAnnotationIsPresent(ModifiedDeclaration declaration) {
-		return this.getContainerAnnotation(declaration) != null;
-	}
-
-	private Annotation getContainerAnnotation(ModifiedDeclaration declaration) {
-		return this.nestedAnnotationAdapter.getOuterAnnotationAdapter().getAnnotation(declaration);
-	}
-
-	private boolean zeroNestedAnnotationIsPresent(ModifiedDeclaration declaration) {
-		return this.getZeroNestedAnnotation(declaration) != null;
-	}
-
-	private Annotation getZeroNestedAnnotation(ModifiedDeclaration declaration) {
-		return this.zeroNestedAnnotationAdapter.getAnnotation(declaration);
-	}
-
-	private String getAnnotationName() {
-		return this.nestedAnnotationAdapter.getAnnotationName();
-	}
-
-	private String getElementName() {
-		return this.nestedAnnotationAdapter.getElementName();
-	}
-
-	@SuppressWarnings("unchecked")
-	protected List<MemberValuePair> values(NormalAnnotation na) {
-		return na.values();
-	}
-
-
-	// ********** annotation factories **********
-
-	/**
-	 * define interface that allows us to "re-use" the nasty code in
-	 * #newAnnotation(AnnotationFactory, ModifiedDeclaration)
-	 */
-	private interface AnnotationFactory {
-		Annotation newAnnotation(DeclarationAnnotationAdapter adapter, ModifiedDeclaration declaration);
-	}
-
-	private static final AnnotationFactory MARKER_ANNOTATION_FACTORY = new AnnotationFactory() {
-		public Annotation newAnnotation(DeclarationAnnotationAdapter adapter, ModifiedDeclaration declaration) {
-			return adapter.newMarkerAnnotation(declaration);
-		}
-		@Override
-		public String toString() {
-			return "MarkerAnnotationFactory";
-		}
-	};
-
-	private static final AnnotationFactory SINGLE_MEMBER_ANNOTATION_FACTORY = new AnnotationFactory() {
-		public Annotation newAnnotation(DeclarationAnnotationAdapter adapter, ModifiedDeclaration declaration) {
-			return adapter.newSingleMemberAnnotation(declaration);
-		}
-		@Override
-		public String toString() {
-			return "SingleMemberAnnotationFactory";
-		}
-	};
-
-	private static final AnnotationFactory NORMAL_ANNOTATION_FACTORY = new AnnotationFactory() {
-		public Annotation newAnnotation(DeclarationAnnotationAdapter adapter, ModifiedDeclaration declaration) {
-			return adapter.newNormalAnnotation(declaration);
-		}
-		@Override
-		public String toString() {
-			return "NormalAnnotationFactory";
-		}
-	};
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/ConversionDeclarationAnnotationElementAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/ConversionDeclarationAnnotationElementAdapter.java
deleted file mode 100644
index 8a70c2230c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/ConversionDeclarationAnnotationElementAdapter.java
+++ /dev/null
@@ -1,203 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.ExpressionConverter;
-import org.eclipse.jpt.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * Wrap a declaration annotation element adapter that deals with AST
- * expressions, converting them to/from various other objects.
- * T is the type of the object to be passed to and returned by the adapter.
- */
-public class ConversionDeclarationAnnotationElementAdapter<T>
-	implements DeclarationAnnotationElementAdapter<T>
-{
-	/**
-	 * The wrapped adapter that returns and takes AST expressions.
-	 */
-	private final DeclarationAnnotationElementAdapter<Expression> adapter;
-
-	/**
-	 * The converter that converts AST expressions to other objects
-	 * (e.g. Strings).
-	 */
-	private final ExpressionConverter<T> converter;
-
-
-	// ********** constructors **********
-
-	/**
-	 * The default element name is "value"; the default behavior is to
-	 * remove the annotation when the last element is removed.
-	 */
-	public ConversionDeclarationAnnotationElementAdapter(DeclarationAnnotationAdapter annotationAdapter, ExpressionConverter<T> converter) {
-		this(new ExpressionDeclarationAnnotationElementAdapter<Expression>(annotationAdapter), converter);
-	}
-
-	/**
-	 * The default behavior is to remove the annotation when the last
-	 * element is removed.
-	 */
-	public ConversionDeclarationAnnotationElementAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName, ExpressionConverter<T> converter) {
-		this(new ExpressionDeclarationAnnotationElementAdapter<Expression>(annotationAdapter, elementName), converter);
-	}
-
-	public ConversionDeclarationAnnotationElementAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName, boolean removeAnnotationWhenEmpty, ExpressionConverter<T> converter) {
-		this(new ExpressionDeclarationAnnotationElementAdapter<Expression>(annotationAdapter, elementName, removeAnnotationWhenEmpty), converter);
-	}
-
-	public ConversionDeclarationAnnotationElementAdapter(DeclarationAnnotationElementAdapter<Expression> adapter, ExpressionConverter<T> converter) {
-		super();
-		this.adapter = adapter;
-		this.converter = converter;
-	}
-
-
-	// ********** DeclarationAnnotationElementAdapter implementation **********
-
-	public T getValue(ModifiedDeclaration declaration) {
-		Expression expression = this.adapter.getValue(declaration);
-		return this.converter.convert(expression);
-	}
-
-	public void setValue(T value, ModifiedDeclaration declaration) {
-		Expression expression;
-		try {
-			expression = this.converter.convert(value, declaration.getAst());
-		} catch (IllegalArgumentException ex) {
-			// if there is a problem converting the 'value' to an Expression we get this exception
-			return;  // don't set the value if it is "illegal"
-		}
-		this.adapter.setValue(expression, declaration);
-	}
-
-	public Expression getExpression(ModifiedDeclaration declaration) {
-		return this.adapter.getExpression(declaration);
-	}
-
-	public ASTNode getAstNode(ModifiedDeclaration declaration) {
-		return this.adapter.getAstNode(declaration);
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.adapter);
-	}
-
-
-	// ********** factory static methods **********
-
-	/**
-	 * The default element name is "value"; the default behavior is to
-	 * remove the annotation when the last element is removed;
-	 * the default expression converter expects string constant expressions.
-	 */
-	public static ConversionDeclarationAnnotationElementAdapter<String> forStrings(DeclarationAnnotationAdapter annotationAdapter) {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(annotationAdapter, StringExpressionConverter.instance());
-	}
-
-	/**
-	 * The default behavior is to remove the annotation when the last
-	 * element is removed; the default expression converter expects
-	 * string constant expressions.
-	 */
-	public static ConversionDeclarationAnnotationElementAdapter<String> forStrings(DeclarationAnnotationAdapter annotationAdapter, String elementName) {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(annotationAdapter, elementName, StringExpressionConverter.instance());
-	}
-
-	/**
-	 * The default expression converter expects string constant expressions.
-	 */
-	public static ConversionDeclarationAnnotationElementAdapter<String> forStrings(DeclarationAnnotationAdapter annotationAdapter, String elementName, boolean removeAnnotationWhenEmpty) {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(annotationAdapter, elementName, removeAnnotationWhenEmpty, StringExpressionConverter.instance());
-	}
-
-	/**
-	 * The default element name is "value"; the default behavior is to
-	 * remove the annotation when the last element is removed;
-	 * the default expression converter expects number constant expressions.
-	 */
-	public static ConversionDeclarationAnnotationElementAdapter<Integer> forNumbers(DeclarationAnnotationAdapter annotationAdapter) {
-		return new ConversionDeclarationAnnotationElementAdapter<Integer>(annotationAdapter, NumberIntegerExpressionConverter.instance());
-	}
-
-	/**
-	 * The default behavior is to remove the annotation when the last
-	 * element is removed; the default expression converter expects
-	 * number constant expressions.
-	 */
-	public static ConversionDeclarationAnnotationElementAdapter<Integer> forNumbers(DeclarationAnnotationAdapter annotationAdapter, String elementName) {
-		return new ConversionDeclarationAnnotationElementAdapter<Integer>(annotationAdapter, elementName, NumberIntegerExpressionConverter.instance());
-	}
-
-	/**
-	 * The default expression converter expects number constant expressions.
-	 */
-	public static ConversionDeclarationAnnotationElementAdapter<Integer> forNumbers(DeclarationAnnotationAdapter annotationAdapter, String elementName, boolean removeAnnotationWhenEmpty) {
-		return new ConversionDeclarationAnnotationElementAdapter<Integer>(annotationAdapter, elementName, removeAnnotationWhenEmpty, NumberIntegerExpressionConverter.instance());
-	}
-
-	/**
-	 * The default element name is "value"; the default behavior is to
-	 * remove the annotation when the last element is removed;
-	 * the default expression converter expects boolean constant expressions.
-	 */
-	public static ConversionDeclarationAnnotationElementAdapter<Boolean> forBooleans(DeclarationAnnotationAdapter annotationAdapter) {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(annotationAdapter, BooleanExpressionConverter.instance());
-	}
-
-	/**
-	 * The default behavior is to remove the annotation when the last
-	 * element is removed; the default expression converter expects
-	 * boolean constant expressions.
-	 */
-	public static ConversionDeclarationAnnotationElementAdapter<Boolean> forBooleans(DeclarationAnnotationAdapter annotationAdapter, String elementName) {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(annotationAdapter, elementName, BooleanExpressionConverter.instance());
-	}
-
-	/**
-	 * The default expression converter expects boolean constant expressions.
-	 */
-	public static ConversionDeclarationAnnotationElementAdapter<Boolean> forBooleans(DeclarationAnnotationAdapter annotationAdapter, String elementName, boolean removeAnnotationWhenEmpty) {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(annotationAdapter, elementName, removeAnnotationWhenEmpty, BooleanExpressionConverter.instance());
-	}
-
-	/**
-	 * The default element name is "value"; the default behavior is to
-	 * remove the annotation when the last element is removed;
-	 * the default expression converter expects character constant expressions.
-	 */
-	public static ConversionDeclarationAnnotationElementAdapter<String> forCharacters(DeclarationAnnotationAdapter annotationAdapter) {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(annotationAdapter, CharacterStringExpressionConverter.instance());
-	}
-
-	/**
-	 * The default behavior is to remove the annotation when the last
-	 * element is removed; the default expression converter expects
-	 * character constant expressions.
-	 */
-	public static ConversionDeclarationAnnotationElementAdapter<String> forCharacters(DeclarationAnnotationAdapter annotationAdapter, String elementName) {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(annotationAdapter, elementName, CharacterStringExpressionConverter.instance());
-	}
-
-	/**
-	 * The default expression converter expects character constant expressions.
-	 */
-	public static ConversionDeclarationAnnotationElementAdapter<String> forCharacters(DeclarationAnnotationAdapter annotationAdapter, String elementName, boolean removeAnnotationWhenEmpty) {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(annotationAdapter, elementName, removeAnnotationWhenEmpty, CharacterStringExpressionConverter.instance());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/DefaultAnnotationEditFormatter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/DefaultAnnotationEditFormatter.java
deleted file mode 100644
index 0f6cfd917d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/DefaultAnnotationEditFormatter.java
+++ /dev/null
@@ -1,219 +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.core.internal.utility.jdt;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jpt.core.utility.jdt.AnnotationEditFormatter;
-import org.eclipse.text.edits.InsertEdit;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.text.edits.TextEdit;
-
-/**
- * This implementation will clean up some of the nasty Eclipse annotation
- * formatting (or lack thereof); e.g. arrays of annotations.
- */
-public final class DefaultAnnotationEditFormatter
-	implements AnnotationEditFormatter
-{
-	private static final DefaultAnnotationEditFormatter INSTANCE = new DefaultAnnotationEditFormatter();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static DefaultAnnotationEditFormatter instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private DefaultAnnotationEditFormatter() {
-		super();
-	}
-
-	/**
-	 * TODO
-	 */
-	public void format(IDocument doc, TextEdit editTree) throws MalformedTreeException, BadLocationException {
-		TextEdit[] edits = editTree.getChildren();
-		int len = edits.length;
-		if (len == 0) {
-			return;
-		}
-
-		MultiTextEdit extraEdits = new MultiTextEdit();
-		for (int i = 0; i < len; i++) {
-			TextEdit edit1 = edits[i];
-			if ( ! (edit1 instanceof InsertEdit)) {
-				continue;  // if the edit is not an insert, skip to the next edit
-			}
-			InsertEdit insert1 = (InsertEdit) edit1;
-			int j = i + 1;
-			if (j < len) {
-				TextEdit edit2 = edits[j];
-				if (edit2 instanceof InsertEdit) {
-					InsertEdit insert2 = (InsertEdit) edit2;
-					String text1 = insert1.getText();
-					String text2 = insert2.getText();
-					int offset1 = insert1.getOffset();
-					int offset2 = insert2.getOffset();
-					if (this.stringIsAnnotation(text1) && text2.equals(" ")) {
-						// an annotation was inserted before something on the same line;
-						// replace the trailing space with a newline and appropriate indent
-						extraEdits.addChild(new ReplaceEdit(offset2, 1, this.buildCR(doc, offset2)));
-						i++;  // jump the index past 'edit2'
-						continue;  // go to the next edit
-					}
-					int comma1Length = this.commaLength(text1);
-					if ((comma1Length != 0) && this.stringIsAnnotation(text2)) {
-						// an annotation was inserted in an array initializer on the
-						// same line as the previous array element;
-						// replace the preceding space with a newline and appropriate indent
-						extraEdits.addChild(new ReplaceEdit(offset1 + comma1Length, text1.length() - comma1Length, this.buildCR(doc, offset1)));
-						i++;  // jump the index past 'edit2'
-						continue;  // go to the next edit
-					}
-				}
-			}
-			this.formatArrayInitializer(doc, insert1, extraEdits);
-		}
-		extraEdits.apply(doc, TextEdit.NONE);
-	}
-
-	/**
-	 * If the insert edit is inserting an annotation containing an array of annotations as
-	 * its value then format them nicely.
-	 */
-	private void formatArrayInitializer(IDocument doc, InsertEdit insertEdit, MultiTextEdit extraEdits) throws BadLocationException {
-		String s = insertEdit.getText();
-		if ( ! this.stringIsAnnotation(s)) {
-			return;
-		}
-		int len = s.length();
-		int pos = 1;  // skip '@'
-		while (pos < len) {
-			char c = s.charAt(pos);
-			pos++;  // bump to just past first '('
-			if (c == '(') {
-				break;
-			}
-		}
-		if (pos == len) {
-			return;  // reached end of string
-		}
-		while (pos < len) {
-			char c = s.charAt(pos);
-			pos++;  // bump to just past first '{'
-			if (c == '{') {
-				break;
-			}
-			if (c != ' ') {
-				return;
-			}
-		}
-		if (pos == len) {
-			return;  // reached end of string
-		}
-		// now look for '@' not inside parentheses and put in 
-		// line delimeter and indent string before each
-		int offset = insertEdit.getOffset();
-		String indent = null;
-		int parenDepth = 0;
-		while (pos < len) {
-			switch (s.charAt(pos)) {
-				case '(' :
-					parenDepth++;
-					break;
-				case ')' :
-					parenDepth--;
-					break;
-				case '@' :
-					if (parenDepth == 0) {
-						if (indent == null) {
-							indent = this.buildCR(doc, offset, "\t");  // TODO use tab preference?
-						}
-						extraEdits.addChild(new InsertEdit(offset + pos, indent));
-					}
-					break;
-				case '}' :
-					if (parenDepth == 0) {
-						extraEdits.addChild(new InsertEdit(offset + pos, this.buildCR(doc, offset)));
-					}
-					break;
-			}
-			pos++;
-		}
-	}
-
-	/**
-	 * Build a string containing a line delimeter and indenting characters 
-	 * matching the indent level of the line containing the character offset
-	 * (i.e. the new line's indent matches the current line).
-	 */
-	private String buildCR(IDocument doc, int offset) throws BadLocationException {
-		return this.buildCR(doc, offset, "");
-	}
-
-	private String buildCR(IDocument doc, int offset, String suffix) throws BadLocationException {
-		int line = doc.getLineOfOffset(offset);
-		StringBuilder sb = new StringBuilder();
-		sb.append(doc.getLineDelimiter(line));  // use same CR as current line
-
-		int o = doc.getLineOffset(line);  // match the whitespace of the current line
-		char c = doc.getChar(o++);
-		while ((c == ' ') || (c == '\t')) {
-			sb.append(c);
-			c = doc.getChar(o++);
-		}
-		sb.append(suffix);
-		return sb.toString();
-	}
-
-	/**
-	 * Return whether the specified string is an annotation.
-	 */
-	private boolean stringIsAnnotation(String string) {
-		return (string.length() > 1) && string.charAt(0) == '@';
-	}
-
-	/**
-	 * If the specified string is a single comma, possibly surrounded by
-	 * spaces, return the length of the substring containing the
-	 * initial spaces and the comma.
-	 */
-	private int commaLength(String string) {
-		boolean comma = false;
-		int len = string.length();
-		int result = 0;
-		for (int i = 0; i < len; i++) {
-			switch (string.charAt(i)) {
-				case ' ' :
-					if ( ! comma) {
-						result++;  // space preceding comma
-					}
-					break;
-				case ',' :
-					if (comma) {
-						return 0;  // second comma!
-					}
-					comma = true;
-					result++;
-					break;
-				default:
-					return 0;  // non-comma, non-space char
-			}
-		}
-		return result;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/EnumArrayDeclarationAnnotationElementAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/EnumArrayDeclarationAnnotationElementAdapter.java
deleted file mode 100644
index cb39dec2d0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/EnumArrayDeclarationAnnotationElementAdapter.java
+++ /dev/null
@@ -1,163 +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.core.internal.utility.jdt;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ArrayInitializer;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.ExpressionConverter;
-import org.eclipse.jpt.core.utility.jdt.ModifiedDeclaration;
-
-/**
- * Wrap a declaration annotation element adapter and simply
- * add an import for the enums when necessary.
- */
-public class EnumArrayDeclarationAnnotationElementAdapter
-	implements DeclarationAnnotationElementAdapter<String[]>
-{
-	/**
-	 * The wrapped adapter that returns and takes name strings (enums).
-	 */
-	private final ConversionDeclarationAnnotationElementAdapter<String[]> adapter;
-
-	private static final String[] EMPTY_STRING_ARRAY = new String[0];
-
-
-	// ********** constructors **********
-
-	/**
-	 * The default element name is "value"; the default behavior is to
-	 * remove the annotation when the last element is removed.
-	 */
-	public EnumArrayDeclarationAnnotationElementAdapter(DeclarationAnnotationAdapter annotationAdapter) {
-		this(annotationAdapter, "value");
-	}
-
-	/**
-	 * The default behavior is to remove the annotation when the last
-	 * element is removed and remove the array initializer if it is empty.
-	 */
-	public EnumArrayDeclarationAnnotationElementAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName) {
-		this(annotationAdapter, elementName, true);
-	}
-
-	/**
-	 * The default behavior is to remove the array initializer if it is empty.
-	 */
-	public EnumArrayDeclarationAnnotationElementAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName, boolean removeAnnotationWhenEmpty) {
-		this(annotationAdapter, elementName, removeAnnotationWhenEmpty, true);
-	}
-
-	public EnumArrayDeclarationAnnotationElementAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName, boolean removeAnnotationWhenEmpty, boolean removeArrayInitializerWhenEmpty) {
-		this(new ConversionDeclarationAnnotationElementAdapter<String[]>(annotationAdapter, elementName, removeAnnotationWhenEmpty, buildExpressionConverter(removeArrayInitializerWhenEmpty)));
-	}
-
-	private static ExpressionConverter<String[]> buildExpressionConverter(boolean removeArrayInitializerWhenEmpty) {
-		return new AnnotationStringArrayExpressionConverter(NameStringExpressionConverter.instance(), removeArrayInitializerWhenEmpty);
-	}
-
-	protected EnumArrayDeclarationAnnotationElementAdapter(ConversionDeclarationAnnotationElementAdapter<String[]> adapter) {
-		super();
-		this.adapter = adapter;
-	}
-
-
-	// ********** DeclarationAnnotationElementAdapter implementation **********
-
-	public String[] getValue(ModifiedDeclaration declaration) {
-		// ignore the adapter's getValue() - we want the expression
-		return this.resolve(this.adapter.getExpression(declaration), declaration);
-	}
-
-	public void setValue(String[] value, ModifiedDeclaration declaration) {
-		this.adapter.setValue(this.convertToShortNames(value, declaration), declaration);
-	}
-
-	public Expression getExpression(ModifiedDeclaration declaration) {
-		return this.adapter.getExpression(declaration);
-	}
-
-	public ASTNode getAstNode(ModifiedDeclaration declaration) {
-		return this.adapter.getAstNode(declaration);
-	}
-
-
-	// ********** internal methods **********
-
-	/**
-	 * resolve the enums, which can be
-	 *     null
-	 * or
-	 *     {FOO, BAR, BAZ}
-	 * or
-	 *     FOO
-	 */
-	protected String[] resolve(Expression expression, ModifiedDeclaration declaration) {
-		if (expression == null) {
-			return EMPTY_STRING_ARRAY;
-		} else if (expression.getNodeType() == ASTNode.ARRAY_INITIALIZER) {
-			return this.resolveArray((ArrayInitializer) expression, declaration);
-		} else {
-			return this.resolveSingleElement(expression, declaration);
-		}
-	}
-
-	protected String[] resolveArray(ArrayInitializer ai, ModifiedDeclaration declaration) {
-		List<Expression> expressions = this.expressions(ai);
-		int len = expressions.size();
-		String[] enums = new String[len];
-		for (int i = len; i-- > 0; ) {
-			enums[i] = this.resolveEnum(expressions.get(i));
-		}
-		return enums;
-	}
-
-	protected String[] resolveSingleElement(Expression enumExpression, ModifiedDeclaration declaration) {
-		return new String[] {this.resolveEnum(enumExpression)};
-	}
-
-	protected String resolveEnum(Expression expression) {
-		return JDTTools.resolveEnum(expression);
-	}
-
-	@SuppressWarnings("unchecked")
-	private List<Expression> expressions(ArrayInitializer arrayInitializer) {
-		return arrayInitializer.expressions();
-	}
-
-	/**
-	 * convert the fully-qualified enums to static imports and short names;
-	 * NB: the imports are added as a side-effect :-(
-	 */
-	protected String[] convertToShortNames(String[] enums, ModifiedDeclaration declaration) {
-		if (enums == null) {
-			return null;
-		}
-		int len = enums.length;
-		String[] shortNames = new String[len];
-		for (int i = len; i-- > 0; ) {
-			declaration.addStaticImport(enums[i]);  // e.g. "javax.persistence.CascadeType.REFRESH"
-			shortNames[i] = this.shortName(enums[i]);  // e.g. "EAGER"
-		}
-		return shortNames;
-	}
-
-	protected String shortTypeName(String name) {
-		return name.substring(0, name.lastIndexOf('.'));
-	}
-
-	protected String shortName(String name) {
-		return name.substring(name.lastIndexOf('.') + 1);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/EnumDeclarationAnnotationElementAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/EnumDeclarationAnnotationElementAdapter.java
deleted file mode 100644
index aefb96e39e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/EnumDeclarationAnnotationElementAdapter.java
+++ /dev/null
@@ -1,106 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.ModifiedDeclaration;
-
-/**
- * Wrap a declaration annotation element adapter and simply
- * add an import for the enum when necessary.
- */
-public class EnumDeclarationAnnotationElementAdapter
-	implements DeclarationAnnotationElementAdapter<String>
-{
-	/**
-	 * The wrapped adapter that returns and takes name strings (enums).
-	 */
-	private final ConversionDeclarationAnnotationElementAdapter<String> adapter;
-
-
-	// ********** constructors **********
-
-	/**
-	 * The default element name is "value"; the default behavior is to
-	 * remove the annotation when the last element is removed.
-	 */
-	public EnumDeclarationAnnotationElementAdapter(DeclarationAnnotationAdapter annotationAdapter) {
-		this(annotationAdapter, "value");
-	}
-
-	/**
-	 * The default behavior is to remove the annotation when the last
-	 * element is removed.
-	 */
-	public EnumDeclarationAnnotationElementAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName) {
-		this(annotationAdapter, elementName, true);
-	}
-
-	public EnumDeclarationAnnotationElementAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName, boolean removeAnnotationWhenEmpty) {
-		this(new ConversionDeclarationAnnotationElementAdapter<String>(annotationAdapter, elementName, removeAnnotationWhenEmpty, NameStringExpressionConverter.instance()));
-	}
-
-	protected EnumDeclarationAnnotationElementAdapter(ConversionDeclarationAnnotationElementAdapter<String> adapter) {
-		super();
-		this.adapter = adapter;
-	}
-
-
-	// ********** DeclarationAnnotationElementAdapter implementation **********
-
-	public String getValue(ModifiedDeclaration declaration) {
-		return this.resolve(this.adapter.getExpression(declaration));
-	}
-
-	public void setValue(String value, ModifiedDeclaration declaration) {
-		this.adapter.setValue(this.convertToShortName(value, declaration), declaration);
-	}
-
-	public Expression getExpression(ModifiedDeclaration declaration) {
-		return this.adapter.getExpression(declaration);
-	}
-
-	public ASTNode getAstNode(ModifiedDeclaration declaration) {
-		return this.adapter.getAstNode(declaration);
-	}
-
-
-	// ********** internal methods **********
-
-	/**
-	 * resolve the enum
-	 */
-	protected String resolve(Expression expression) {
-		return JDTTools.resolveEnum(expression);
-	}
-
-	/**
-	 * convert the fully-qualified enum to a static import and its short name
-	 */
-	protected String convertToShortName(String string, ModifiedDeclaration declaration) {
-		if (string == null) {
-			return null;
-		}
-		declaration.addStaticImport(string);  // e.g. "javax.persistence.FetchType.EAGER"
-		return this.shortName(string);  // e.g. "EAGER"
-	}
-
-	protected String shortTypeName(String name) {
-		return name.substring(0, name.lastIndexOf('.'));
-	}
-
-	protected String shortName(String name) {
-		return name.substring(name.lastIndexOf('.') + 1);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/ExpressionDeclarationAnnotationElementAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/ExpressionDeclarationAnnotationElementAdapter.java
deleted file mode 100644
index 17fbd32797..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/ExpressionDeclarationAnnotationElementAdapter.java
+++ /dev/null
@@ -1,362 +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.core.internal.utility.jdt;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * Most obvious implementation of the interface.
- * Assume the element's value is an Expression.
- */
-public class ExpressionDeclarationAnnotationElementAdapter<E extends Expression>
-	implements DeclarationAnnotationElementAdapter<E>
-{
-	/**
-	 * Adapter used to manipulate the element's annotation.
-	 */
-	private final DeclarationAnnotationAdapter annotationAdapter;
-
-	/**
-	 * The name of the relevant annotation element.
-	 */
-	private final String elementName;
-
-	/**
-	 * Flag to indicate whether the element's annotation is to be
-	 * completely removed if, when the element itself is removed,
-	 * the annotation has no remaining elements.
-	 */
-	private final boolean removeAnnotationWhenEmpty;
-
-
-	// ********** constructors **********
-
-	/**
-	 * The default element name is "value"; the default behavior is to
-	 * remove the annotation when the last element is removed.
-	 */
-	public ExpressionDeclarationAnnotationElementAdapter(DeclarationAnnotationAdapter annotationAdapter) {
-		this(annotationAdapter, "value");
-	}
-
-	/**
-	 * The default element name is "value".
-	 */
-	public ExpressionDeclarationAnnotationElementAdapter(DeclarationAnnotationAdapter annotationAdapter, boolean removeAnnotationWhenEmpty) {
-		this(annotationAdapter, "value", removeAnnotationWhenEmpty);
-	}
-
-	/**
-	 * The default behavior is to remove the annotation when the last
-	 * element is removed.
-	 */
-	public ExpressionDeclarationAnnotationElementAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName) {
-		this(annotationAdapter, elementName, true);
-	}
-
-	public ExpressionDeclarationAnnotationElementAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName, boolean removeAnnotationWhenEmpty) {
-		super();
-		this.annotationAdapter = annotationAdapter;
-		this.elementName = elementName;
-		this.removeAnnotationWhenEmpty = removeAnnotationWhenEmpty;
-	}
-
-
-	// ********** DeclarationAnnotationElementAdapter implementation **********
-
-	public E getValue(ModifiedDeclaration declaration) {
-		// return the expression unmodified
-		return this.getExpression(declaration);
-	}
-
-	public void setValue(E value, ModifiedDeclaration declaration) {
-		this.setValue(value, this.annotationAdapter.getAnnotation(declaration), declaration);
-	}
-
-	public E getExpression(ModifiedDeclaration declaration) {
-		return this.expression(this.annotationAdapter.getAnnotation(declaration));
-	}
-
-	public ASTNode getAstNode(ModifiedDeclaration declaration) {
-		Expression exp = this.getExpression(declaration);
-		return (exp != null) ? exp : this.annotationAdapter.getAstNode(declaration);
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.elementName);
-	}
-
-
-	// ********** expression **********
-
-	/**
-	 * Return the expression value of the *first* annotation element
-	 * with the adapter's element name.
-	 * Return null if the annotation has no such element.
-	 * (An element name of "value" will return the value of a single
-	 * member annotation.)
-	 */
-	protected E expression(Annotation annotation) {
-		if (annotation == null) {
-			return this.expressionNoAnnotation();
-		}
-		if (annotation.isMarkerAnnotation()) {
-			return this.expressionMarkerAnnotation((MarkerAnnotation) annotation);
-		}
-		if (annotation.isSingleMemberAnnotation()) {
-			return this.expressionSingleMemberAnnotation((SingleMemberAnnotation) annotation);
-		}
-		if (annotation.isNormalAnnotation()) {
-			return this.expressionNormalAnnotation((NormalAnnotation) annotation);
-		}
-		throw new IllegalArgumentException("unknown annotation type: " + annotation);
-	}
-
-	protected E expressionNoAnnotation() {
-		return null;
-	}
-
-	/**
-	 * Return the expression value of the *first* annotation element
-	 * with the adapter's element name.
-	 * Return null if the annotation has no such element.
-	 */
-	protected E expressionMarkerAnnotation(MarkerAnnotation annotation) {
-		return null;
-	}
-
-	/**
-	 * Return the expression value of the *first* annotation element
-	 * with the adapter's element name.
-	 * Return null if the annotation has no such element.
-	 */
-	protected E expressionSingleMemberAnnotation(SingleMemberAnnotation annotation) {
-		return this.downcast(this.elementName.equals("value") ? annotation.getValue() : null);
-	}
-
-	@SuppressWarnings("unchecked")
-	private E downcast(Expression e) {
-		return (E) e;
-	}
-
-	/**
-	 * Return the expression value of the *first* annotation element
-	 * with the adapter's element name.
-	 * Return null if the annotation has no such element.
-	 */
-	protected E expressionNormalAnnotation(NormalAnnotation annotation) {
-		MemberValuePair pair = this.memberValuePair(annotation);
-		return this.downcast((pair == null) ? null : pair.getValue());
-	}
-
-
-	// ********** set value **********
-
-	/**
-	 * set non-null, non-empty value
-	 */
-	protected void setValue(Expression value, Annotation annotation, ModifiedDeclaration declaration) {
-		if (value == null) {
-			this.removeElement(annotation, declaration);
-		}
-		else if (annotation == null) {
-			this.setValueNoAnnotation(value, declaration);
-		}
-		else if (annotation.isMarkerAnnotation()) {
-			this.setValueMarkerAnnotation(value, (MarkerAnnotation) annotation, declaration);
-		}
-		else if (annotation.isSingleMemberAnnotation()) {
-			this.setValueSingleMemberAnnotation(value, (SingleMemberAnnotation) annotation, declaration);
-		}
-		else if (annotation.isNormalAnnotation()) {
-			this.setValueNormalAnnotation(value, (NormalAnnotation) annotation, declaration);
-		}
-		else {
-			throw new IllegalArgumentException("unknown annotation type: " + annotation);
-		}
-	}
-
-	/**
-	 * add non-null, non-empty value
-	 */
-	protected void setValueNoAnnotation(Expression value, ModifiedDeclaration declaration) {
-		if (this.elementName.equals("value")) {
-			// @Foo("xxx")
-			this.annotationAdapter.newSingleMemberAnnotation(declaration).setValue(value);
-		} else {
-			// @Foo(bar="xxx")
-			this.addValue(value, this.annotationAdapter.newNormalAnnotation(declaration));
-		}
-	}
-
-	protected void addValue(Expression value, NormalAnnotation annotation) {
-		this.addValue(value, annotation, this.elementName);
-	}
-
-	protected void addValue(Expression value, NormalAnnotation annotation, String annotationElementName) {
-		AST ast = annotation.getAST();
-		MemberValuePair pair = ast.newMemberValuePair();
-		pair.setName(ast.newSimpleName(annotationElementName));
-		pair.setValue(value);
-		List<MemberValuePair> values = this.values(annotation);
-		values.add(pair);
-	}
-	
-	protected void setValueMarkerAnnotation(Expression value, MarkerAnnotation annotation, ModifiedDeclaration declaration) {
-		// @Foo => @Foo("xxx")
-		//     or
-		// @Foo => @Foo(bar="xxx")
-		this.setValueNoAnnotation(value, declaration);
-	}
-
-	protected void setValueSingleMemberAnnotation(Expression value, SingleMemberAnnotation annotation, ModifiedDeclaration declaration) {
-		if (this.elementName.equals("value")) {
-			// @Foo("yyy") => @Foo("xxx")
-			annotation.setValue(value);
-		} else {
-			// @Foo("yyy") => @Foo(value="yyy", bar="xxx")
-			Expression vv = annotation.getValue();
-			vv = (Expression) ASTNode.copySubtree(vv.getAST(), vv);
-			NormalAnnotation normalAnnotation = this.annotationAdapter.newNormalAnnotation(declaration);
-			this.addValue(vv, normalAnnotation, "value");
-			this.addValue(value, normalAnnotation);
-		}
-	}
-
-	protected void setValueNormalAnnotation(Expression value, NormalAnnotation annotation, ModifiedDeclaration declaration) {
-		MemberValuePair pair = this.memberValuePair(annotation);
-		if (pair == null) {
-			this.addValue(value, annotation);
-		} else {
-			pair.setValue(value);
-		}
-	}
-
-
-	// ********** remove element **********
-
-	protected void removeElement(Annotation annotation, ModifiedDeclaration declaration) {
-		if (annotation == null) {
-			this.removeElementNoAnnotation(declaration);
-		}
-		else if (annotation.isMarkerAnnotation()) {
-			this.removeElementMarkerAnnotation((MarkerAnnotation) annotation, declaration);
-		}
-		else if (annotation.isSingleMemberAnnotation()) {
-			this.removeElementSingleMemberAnnotation((SingleMemberAnnotation) annotation, declaration);
-		}
-		else if (annotation.isNormalAnnotation()) {
-			this.removeElementNormalAnnotation((NormalAnnotation) annotation, declaration);
-		}
-		else {
-			throw new IllegalArgumentException("unknown annotation type: " + annotation);
-		}
-	}
-
-	protected void removeElementNoAnnotation(ModifiedDeclaration declaration) {
-		// the element is already gone (?)
-	}
-
-	protected void removeElementMarkerAnnotation(MarkerAnnotation annotation, ModifiedDeclaration declaration) {
-		// the element is already gone (?)
-	}
-
-	protected void removeElementSingleMemberAnnotation(SingleMemberAnnotation annotation, ModifiedDeclaration declaration) {
-		if (this.elementName.equals("value")) {
-			if (this.removeAnnotationWhenEmpty) {
-				// @Foo("xxx") => 
-				this.annotationAdapter.removeAnnotation(declaration);
-			} else {
-				// @Foo("xxx") => @Foo
-				this.annotationAdapter.newMarkerAnnotation(declaration);
-			}
-		} else {
-			// the [non-'value'] element is already gone (?)
-		}
-	}
-
-	protected void removeElementNormalAnnotation(NormalAnnotation annotation, ModifiedDeclaration declaration) {
-		List<MemberValuePair> values = this.values(annotation);
-		if ((values.size() == 1) && values.get(0).getName().getFullyQualifiedName().equals(this.elementName)) {
-			if (this.removeAnnotationWhenEmpty) {
-				// @Foo(bar="xxx") => 
-				this.annotationAdapter.removeAnnotation(declaration);
-			} else {
-				// @Foo(bar="xxx") => @Foo
-				this.annotationAdapter.newMarkerAnnotation(declaration);
-			}
-		} else {
-			this.removeElement(annotation);
-			if (values.size() == 1) {
-				MemberValuePair pair = values.get(0);
-				if (pair.getName().getFullyQualifiedName().equals("value")) {
-					// @Foo(bar="xxx", value="yyy") => @Foo("yyy")
-					Expression vv = pair.getValue();
-					vv = (Expression) ASTNode.copySubtree(vv.getAST(), vv);
-					this.annotationAdapter.newSingleMemberAnnotation(declaration).setValue(vv);
-				} else {
-					// @Foo(bar="xxx", baz="yyy") => @Foo(baz="yyy")
-				}
-			} else {
-				// @Foo(bar="xxx", baz="yyy", joo="xxx") => @Foo(baz="yyy", joo="xxx")
-			}
-		}
-	}
-
-	/**
-	 * Remove the *first* member value pair from the specified annotation element
-	 * with the adapter's element name.
-	 */
-	protected void removeElement(NormalAnnotation annotation) {
-		for (Iterator<MemberValuePair> stream = this.values(annotation).iterator(); stream.hasNext(); ) {
-			MemberValuePair pair = stream.next();
-			if (pair.getName().getFullyQualifiedName().equals(this.elementName)) {
-				stream.remove();
-			}
-		}
-	}
-
-
-	// ********** convenience methods **********
-
-	/**
-	 * Return the *first* member value pair for the specified annotation element
-	 * with the adapter's element name.
-	 * Return null if the annotation has no such element.
-	 */
-	protected MemberValuePair memberValuePair(NormalAnnotation annotation) {
-		for (MemberValuePair pair : this.values(annotation)) {
-			if (pair.getName().getFullyQualifiedName().equals(this.elementName)) {
-				return pair;
-			}
-		}
-		return null;
-	}
-
-	@SuppressWarnings("unchecked")
-	protected List<MemberValuePair> values(NormalAnnotation na) {
-		return na.values();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/GenericVisitor.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/GenericVisitor.java
deleted file mode 100644
index e3753d1dda..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/GenericVisitor.java
+++ /dev/null
@@ -1,795 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.AnnotationTypeDeclaration;
-import org.eclipse.jdt.core.dom.AnnotationTypeMemberDeclaration;
-import org.eclipse.jdt.core.dom.AnonymousClassDeclaration;
-import org.eclipse.jdt.core.dom.ArrayAccess;
-import org.eclipse.jdt.core.dom.ArrayCreation;
-import org.eclipse.jdt.core.dom.ArrayInitializer;
-import org.eclipse.jdt.core.dom.ArrayType;
-import org.eclipse.jdt.core.dom.AssertStatement;
-import org.eclipse.jdt.core.dom.Assignment;
-import org.eclipse.jdt.core.dom.Block;
-import org.eclipse.jdt.core.dom.BlockComment;
-import org.eclipse.jdt.core.dom.BooleanLiteral;
-import org.eclipse.jdt.core.dom.BreakStatement;
-import org.eclipse.jdt.core.dom.CastExpression;
-import org.eclipse.jdt.core.dom.CatchClause;
-import org.eclipse.jdt.core.dom.CharacterLiteral;
-import org.eclipse.jdt.core.dom.ClassInstanceCreation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.ConditionalExpression;
-import org.eclipse.jdt.core.dom.ConstructorInvocation;
-import org.eclipse.jdt.core.dom.ContinueStatement;
-import org.eclipse.jdt.core.dom.DoStatement;
-import org.eclipse.jdt.core.dom.EmptyStatement;
-import org.eclipse.jdt.core.dom.EnhancedForStatement;
-import org.eclipse.jdt.core.dom.EnumConstantDeclaration;
-import org.eclipse.jdt.core.dom.EnumDeclaration;
-import org.eclipse.jdt.core.dom.ExpressionStatement;
-import org.eclipse.jdt.core.dom.FieldAccess;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.ForStatement;
-import org.eclipse.jdt.core.dom.IfStatement;
-import org.eclipse.jdt.core.dom.ImportDeclaration;
-import org.eclipse.jdt.core.dom.InfixExpression;
-import org.eclipse.jdt.core.dom.Initializer;
-import org.eclipse.jdt.core.dom.InstanceofExpression;
-import org.eclipse.jdt.core.dom.Javadoc;
-import org.eclipse.jdt.core.dom.LabeledStatement;
-import org.eclipse.jdt.core.dom.LineComment;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.MemberRef;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.MethodInvocation;
-import org.eclipse.jdt.core.dom.MethodRef;
-import org.eclipse.jdt.core.dom.MethodRefParameter;
-import org.eclipse.jdt.core.dom.Modifier;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.NullLiteral;
-import org.eclipse.jdt.core.dom.NumberLiteral;
-import org.eclipse.jdt.core.dom.PackageDeclaration;
-import org.eclipse.jdt.core.dom.ParameterizedType;
-import org.eclipse.jdt.core.dom.ParenthesizedExpression;
-import org.eclipse.jdt.core.dom.PostfixExpression;
-import org.eclipse.jdt.core.dom.PrefixExpression;
-import org.eclipse.jdt.core.dom.PrimitiveType;
-import org.eclipse.jdt.core.dom.QualifiedName;
-import org.eclipse.jdt.core.dom.QualifiedType;
-import org.eclipse.jdt.core.dom.ReturnStatement;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.SimpleType;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.SuperConstructorInvocation;
-import org.eclipse.jdt.core.dom.SuperFieldAccess;
-import org.eclipse.jdt.core.dom.SuperMethodInvocation;
-import org.eclipse.jdt.core.dom.SwitchCase;
-import org.eclipse.jdt.core.dom.SwitchStatement;
-import org.eclipse.jdt.core.dom.SynchronizedStatement;
-import org.eclipse.jdt.core.dom.TagElement;
-import org.eclipse.jdt.core.dom.TextElement;
-import org.eclipse.jdt.core.dom.ThisExpression;
-import org.eclipse.jdt.core.dom.ThrowStatement;
-import org.eclipse.jdt.core.dom.TryStatement;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclarationStatement;
-import org.eclipse.jdt.core.dom.TypeLiteral;
-import org.eclipse.jdt.core.dom.TypeParameter;
-import org.eclipse.jdt.core.dom.VariableDeclarationExpression;
-import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
-import org.eclipse.jdt.core.dom.WhileStatement;
-import org.eclipse.jdt.core.dom.WildcardType;
-
-//copied from  org.eclipse.jdt.internal.corext.dom.GenericVisitor
-//deleted code to limit the number of classes I had to copy
-public class GenericVisitor extends ASTVisitor {
-	
-	public GenericVisitor() {
-		super();
-	}
-
-	/**
-	 * @param visitJavadocTags <code>true</code> if doc comment tags are
-	 * to be visited by default, and <code>false</code> otherwise
-	 * @see Javadoc#tags()
-	 * @see #visit(Javadoc)
-	 * @since 3.0
-	 */
-	public GenericVisitor(boolean visitJavadocTags) {
-		super(visitJavadocTags);
-	}
-	
-	//---- Hooks for subclasses -------------------------------------------------
-
-	protected boolean visitNode(ASTNode node) {
-		return true;
-	}
-	
-	protected void endVisitNode(ASTNode node) {
-		// do nothing
-	}
-
-	@Override
-	public boolean visit(AnonymousClassDeclaration node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(ArrayAccess node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(ArrayCreation node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(ArrayInitializer node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(ArrayType node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(AssertStatement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(Assignment node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(Block node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(BooleanLiteral node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(BreakStatement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(CastExpression node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(CatchClause node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(CharacterLiteral node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(ClassInstanceCreation node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(CompilationUnit node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(ConditionalExpression node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(ConstructorInvocation node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(ContinueStatement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(DoStatement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(EmptyStatement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(ExpressionStatement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(FieldAccess node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(FieldDeclaration node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(ForStatement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(IfStatement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(ImportDeclaration node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(InfixExpression node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(InstanceofExpression node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(Initializer node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(Javadoc node) {
-		return (super.visit(node)) ? visitNode(node) : false;
-	}
-	@Override
-	public boolean visit(LabeledStatement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(MethodDeclaration node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(MethodInvocation node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(NullLiteral node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(NumberLiteral node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(PackageDeclaration node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(ParenthesizedExpression node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(PostfixExpression node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(PrefixExpression node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(PrimitiveType node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(QualifiedName node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(ReturnStatement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(SimpleName node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(SimpleType node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(StringLiteral node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(SuperConstructorInvocation node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(SuperFieldAccess node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(SuperMethodInvocation node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(SwitchCase node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(SwitchStatement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(SynchronizedStatement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(ThisExpression node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(ThrowStatement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(TryStatement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(TypeDeclaration node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(TypeDeclarationStatement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(TypeLiteral node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(SingleVariableDeclaration node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(VariableDeclarationExpression node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(VariableDeclarationStatement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(VariableDeclarationFragment node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(WhileStatement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(AnnotationTypeDeclaration node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(AnnotationTypeMemberDeclaration node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(BlockComment node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(EnhancedForStatement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(EnumConstantDeclaration node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(EnumDeclaration node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(LineComment node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(MarkerAnnotation node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(MemberRef node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(MemberValuePair node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(MethodRef node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(MethodRefParameter node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(Modifier node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(NormalAnnotation node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(ParameterizedType node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(QualifiedType node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(SingleMemberAnnotation node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(TagElement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(TextElement node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(TypeParameter node) {
-		return visitNode(node);
-	}
-	@Override
-	public boolean visit(WildcardType node) {
-		return visitNode(node);
-	}
-
-	@Override
-	public void endVisit(AnonymousClassDeclaration node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(ArrayAccess node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(ArrayCreation node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(ArrayInitializer node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(ArrayType node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(AssertStatement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(Assignment node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(Block node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(BooleanLiteral node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(BreakStatement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(CastExpression node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(CatchClause node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(CharacterLiteral node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(ClassInstanceCreation node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(CompilationUnit node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(ConditionalExpression node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(ConstructorInvocation node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(ContinueStatement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(DoStatement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(EmptyStatement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(ExpressionStatement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(FieldAccess node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(FieldDeclaration node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(ForStatement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(IfStatement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(ImportDeclaration node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(InfixExpression node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(InstanceofExpression node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(Initializer node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(Javadoc node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(LabeledStatement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(MethodDeclaration node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(MethodInvocation node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(NullLiteral node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(NumberLiteral node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(PackageDeclaration node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(ParenthesizedExpression node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(PostfixExpression node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(PrefixExpression node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(PrimitiveType node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(QualifiedName node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(ReturnStatement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(SimpleName node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(SimpleType node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(StringLiteral node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(SuperConstructorInvocation node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(SuperFieldAccess node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(SuperMethodInvocation node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(SwitchCase node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(SwitchStatement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(SynchronizedStatement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(ThisExpression node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(ThrowStatement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(TryStatement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(TypeDeclaration node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(TypeDeclarationStatement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(TypeLiteral node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(SingleVariableDeclaration node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(VariableDeclarationExpression node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(VariableDeclarationStatement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(VariableDeclarationFragment node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(WhileStatement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(AnnotationTypeDeclaration node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(AnnotationTypeMemberDeclaration node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(BlockComment node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(EnhancedForStatement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(EnumConstantDeclaration node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(EnumDeclaration node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(LineComment node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(MarkerAnnotation node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(MemberRef node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(MemberValuePair node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(MethodRef node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(MethodRefParameter node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(Modifier node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(NormalAnnotation node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(ParameterizedType node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(QualifiedType node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(SingleMemberAnnotation node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(TagElement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(TextElement node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(TypeParameter node) {
-		endVisitNode(node);
-	}
-	@Override
-	public void endVisit(WildcardType node) {
-		endVisitNode(node);
-	}
-
-}
-
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTAttribute.java
deleted file mode 100644
index 0de59055c8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTAttribute.java
+++ /dev/null
@@ -1,70 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jpt.core.utility.jdt.AnnotationEditFormatter;
-import org.eclipse.jpt.core.utility.jdt.Attribute;
-import org.eclipse.jpt.core.utility.jdt.Type;
-import org.eclipse.jpt.utility.CommandExecutorProvider;
-
-/**
- * Combine behavior common to JDTFieldAttribute and JDTMethodAttribute.
- * Not so sure this is useful....
- */
-public abstract class JDTAttribute
-	extends JDTMember
-	implements Attribute
-{
-
-	// ********** constructors **********
-
-	protected JDTAttribute(
-			Type declaringType,
-			String name,
-			int occurrence,
-			ICompilationUnit compilationUnit,
-			CommandExecutorProvider modifySharedDocumentCommandExecutorProvider) {
-		super(declaringType, name, occurrence, compilationUnit, modifySharedDocumentCommandExecutorProvider);
-	}
-
-	protected JDTAttribute(
-			Type declaringType,
-			String name,
-			int occurrence,
-			ICompilationUnit compilationUnit,
-			CommandExecutorProvider modifySharedDocumentCommandExecutorProvider,
-			AnnotationEditFormatter annotationEditFormatter) {
-		super(declaringType, name, occurrence, compilationUnit, modifySharedDocumentCommandExecutorProvider, annotationEditFormatter);
-	}
-
-
-	// ********** Member/Attribute implementation **********
-
-	public boolean isField() {
-		return false;
-	}
-
-	public boolean isMethod() {
-		return false;
-	}
-
-
-	// ********** internal **********
-
-	protected TypeDeclaration getDeclaringTypeDeclaration(CompilationUnit astRoot) {
-		// assume the declaring type is not an enum or annotation
-		// since they do not have field or method declarations
-		return this.getDeclaringType().getBodyDeclaration(astRoot);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTFieldAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTFieldAttribute.java
deleted file mode 100644
index bdcbec67db..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTFieldAttribute.java
+++ /dev/null
@@ -1,181 +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.core.internal.utility.jdt;
-
-import java.util.List;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.IVariableBinding;
-import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationEditFormatter;
-import org.eclipse.jpt.core.utility.jdt.FieldAttribute;
-import org.eclipse.jpt.core.utility.jdt.Type;
-import org.eclipse.jpt.utility.CommandExecutorProvider;
-
-/**
- * Adapt and extend a JDT field.
- * Attribute based on a Java field, e.g.
- *     private int foo;
- */
-public class JDTFieldAttribute
-	extends JDTAttribute
-	implements FieldAttribute
-{
-
-	// ********** constructors **********
-
-	public JDTFieldAttribute(
-			Type declaringType,
-			String name,
-			int occurrence,
-			ICompilationUnit compilationUnit,
-			CommandExecutorProvider modifySharedDocumentCommandExecutorProvider) {
-		this(declaringType, name, occurrence, compilationUnit, modifySharedDocumentCommandExecutorProvider, DefaultAnnotationEditFormatter.instance());
-	}
-	
-	public JDTFieldAttribute(
-			Type declaringType,
-			String name,
-			int occurrence,
-			ICompilationUnit compilationUnit,
-			CommandExecutorProvider modifySharedDocumentCommandExecutorProvider,
-			AnnotationEditFormatter annotationEditFormatter) {
-		super(declaringType, name, occurrence, compilationUnit, modifySharedDocumentCommandExecutorProvider, annotationEditFormatter);
-	}
-
-	/**
-	 * constructor for testing
-	 */
-	public JDTFieldAttribute(Type declaringType, String name, int occurrence, ICompilationUnit compilationUnit) {
-		this(declaringType, name, occurrence, compilationUnit, CommandExecutorProvider.Default.instance(), DefaultAnnotationEditFormatter.instance());
-	}
-
-
-	// ********** Member/Attribute/FieldAttribute implementation **********
-
-	public IVariableBinding getBinding(CompilationUnit astRoot) {
-		return this.getFragment(astRoot).resolveBinding();
-	}
-
-	public FieldDeclaration getBodyDeclaration(CompilationUnit astRoot) {
-		return this.getSelectedDeclaration(astRoot, FIELD_DECLARATION_SELECTOR);
-	}
-
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return new ASTNodeTextRange(this.getFragment(astRoot).getName());
-	}
-
-	public String getAttributeName() {
-		return this.getName_();
-	}
-
-	public ITypeBinding getTypeBinding(CompilationUnit astRoot) {
-		return this.getBodyDeclaration(astRoot).getType().resolveBinding();
-	}
-
-	@Override
-	public boolean isField() {
-		return true;
-	}
-
-	public boolean isPersistable(CompilationUnit astRoot) {
-		IVariableBinding binding = this.getBinding(astRoot);
-		return (binding == null) ? false : JPTTools.fieldIsPersistable(binding);
-	}
-
-
-	// ********** internal **********
-
-	protected VariableDeclarationFragment getFragment(CompilationUnit astRoot) {
-		return this.getSelectedDeclaration(astRoot, VARIABLE_DECLARATION_FRAGMENT_SELECTOR);
-	}
-
-	/**
-	 * return either a FieldDeclaration or a VariableDeclarationFragment,
-	 * depending on the specified selector;
-	 * 
-	 * handle multiple fields declared in a single statement:
-	 *     private int foo, bar;
-	 */
-	protected <T extends ASTNode> T getSelectedDeclaration(CompilationUnit astRoot, Selector<T> selector) {
-		String name = this.getName_();
-		int occurrence = this.getOccurrence();
-		int count = 0;
-		for (FieldDeclaration fieldDeclaration : this.getDeclaringTypeFieldDeclarations(astRoot)) {
-			for (VariableDeclarationFragment fragment : fragments(fieldDeclaration)) {
-				if (fragment.getName().getFullyQualifiedName().equals(name)) {
-					count++;
-					if (count == occurrence) {
-						return selector.select(fieldDeclaration, fragment);
-					}
-				}
-			}
-		}
-		// return null if the field is no longer in the source code;
-		// this can happen when the context model has not yet
-		// been synchronized with the resource model but is still
-		// asking for an ASTNode (e.g. during a selection event)
-		return null;
-	}
-
-	protected FieldDeclaration[] getDeclaringTypeFieldDeclarations(CompilationUnit astRoot) {
-		return this.getDeclaringTypeDeclaration(astRoot).getFields();
-	}
-
-	// minimize scope of suppressed warnings
-	@SuppressWarnings("unchecked")
-	protected static List<VariableDeclarationFragment> fragments(FieldDeclaration fd) {
-		return fd.fragments();
-	}
-
-
-	// ********** Selector **********
-
-	// I'm not quite sure this interface is worth the resulting obfuscation,
-	// but, then, I kept changing both methods, so...  ~bjv
-	protected interface Selector<T extends ASTNode> {
-		T select(FieldDeclaration fieldDeclaration, VariableDeclarationFragment variableDeclarationFragment);
-		String getDescription();
-	}
-
-	protected static final Selector<FieldDeclaration> FIELD_DECLARATION_SELECTOR =
-		new Selector<FieldDeclaration>() {
-			public FieldDeclaration select(FieldDeclaration fieldDeclaration, VariableDeclarationFragment variableDeclarationFragment) {
-				return fieldDeclaration;
-			}
-			public String getDescription() {
-				return "field declaration";
-			}
-			@Override
-			public String toString() {
-				return "FIELD_DECLARATION_SELECTOR";
-			}
-		};
-
-	protected static final Selector<VariableDeclarationFragment> VARIABLE_DECLARATION_FRAGMENT_SELECTOR =
-		new Selector<VariableDeclarationFragment>() {
-			public VariableDeclarationFragment select(FieldDeclaration fieldDeclaration, VariableDeclarationFragment variableDeclarationFragment) {
-				return variableDeclarationFragment;
-			}
-			public String getDescription() {
-				return "variable declaration fragment";
-			}
-			@Override
-			public String toString() {
-				return "VARIABLE_DECLARATION_FRAGMENT_SELECTOR";
-			}
-		};
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTMember.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTMember.java
deleted file mode 100644
index fec82d670a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTMember.java
+++ /dev/null
@@ -1,236 +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.core.internal.utility.jdt;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.LocationKind;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jpt.core.utility.jdt.AnnotationEditFormatter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.core.utility.jdt.Type;
-import org.eclipse.jpt.utility.Command;
-import org.eclipse.jpt.utility.CommandExecutor;
-import org.eclipse.jpt.utility.CommandExecutorProvider;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.TextEdit;
-
-/**
- * Adapt and extend a JDT member with simplified annotation handling.
- */
-public abstract class JDTMember
-	implements Member
-{
-	/** this will be null for the primary type */
-	private final Type declaringType;
-
-	/** the member's name (duh) */
-	private final String name;
-
-	/**
-	 * members can occur more than once in non-compiling source;
-	 * count starts at 1; the primary type will have occurrence 1
-	 */
-	private final int occurrence;
-
-	/**
-	 * the compilation unit (file) containing the member;
-	 * used for building an AST when we modify the member
-	 */
-	private final ICompilationUnit compilationUnit;
-
-	/**
-	 * this allows clients to provide a way to modify the compilation unit
-	 * (file) when it is open in an editor and should be modified on the UI
-	 * thread
-	 */
-	private final CommandExecutorProvider modifySharedDocumentCommandExecutorProvider;
-
-	/** this will format the member's annotations a bit */
-	private final AnnotationEditFormatter annotationEditFormatter;
-
-
-	// ********** constructors **********
-	
-	protected JDTMember(
-			Type declaringType,
-			String name,
-			int occurrence,
-			ICompilationUnit compilationUnit,
-			CommandExecutorProvider modifySharedDocumentCommandExecutorProvider) {
-		this(declaringType, name, occurrence, compilationUnit, modifySharedDocumentCommandExecutorProvider, DefaultAnnotationEditFormatter.instance());
-	}
-
-	protected JDTMember(
-			Type declaringType,
-			String name,
-			int occurrence,
-			ICompilationUnit compilationUnit,
-			CommandExecutorProvider modifySharedDocumentCommandExecutorProvider,
-			AnnotationEditFormatter annotationEditFormatter) {
-		super();
-		this.declaringType = declaringType;
-		this.name = name;
-		this.occurrence = occurrence;
-		this.compilationUnit = compilationUnit;
-		this.modifySharedDocumentCommandExecutorProvider = modifySharedDocumentCommandExecutorProvider;
-		this.annotationEditFormatter = annotationEditFormatter;
-	}
-
-
-	// ********** Member implementation **********
-
-	public ModifiedDeclaration getModifiedDeclaration(CompilationUnit astRoot) {
-		return new JDTModifiedDeclaration(this.getBodyDeclaration(astRoot));
-	}
-
-	public ModifiedDeclaration getModifiedDeclaration() {
-		return this.getModifiedDeclaration(this.buildASTRoot());
-	}
-
-	public boolean matches(String memberName, int occur) {
-		return memberName.equals(this.name) && (occur == this.occurrence);
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.name);
-	}
-
-
-	// ********** internal **********
-
-	protected String getName_() {
-		return this.name;
-	}
-
-	protected int getOccurrence() {
-		return this.occurrence;
-	}
-
-	/**
-	 * this will return null for a top-level type
-	 */
-	protected Type getDeclaringType() {
-		return this.declaringType;
-	}
-
-
-	// ********** editing **********
-
-	/**
-	 * Edit the member with the specified editor.
-	 * The editor will be invoked once the member's compilation unit
-	 * is in an editable state.
-	 */
-	public void edit(Editor editor) {
-		try {
-			this.edit_(editor);
-		} catch (JavaModelException ex) {
-			throw new RuntimeException(ex);
-		} catch (BadLocationException ex) {
-			throw new RuntimeException(ex);
-		}
-	}
-
-	/**
-	 * NB: Be careful changing this method.
-	 * Things to look out for:
-	 *     - when editing via the JavaEditor there is no need to create a working copy
-	 *     - when editing headlessly, a "working copy" must be created
-	 *        (at least as far as I can tell  ~kfm)
-	 *     - when editing via a plain text editor, make a working copy or else things are screwed
-	 *        up the second time you edit through the XmlPersistence XmlProperties View
-	 */
-	protected void edit_(Editor editor) throws JavaModelException, BadLocationException {
-		if ( ! this.compilationUnit.isWorkingCopy()) {
-			this.compilationUnit.becomeWorkingCopy(null);
-		}
-
-		ITextFileBuffer buffer = FileBuffers.getTextFileBufferManager().getTextFileBuffer(this.compilationUnit.getResource().getFullPath(), LocationKind.NORMALIZE);
-		boolean sharedDocument = (buffer != null);  // documents are typically shared when they are already open in an editor
-		IDocument doc = sharedDocument ?
-				buffer.getDocument()
-			:
-				new Document(this.compilationUnit.getBuffer().getContents());
-
-		CompilationUnit astRoot = this.buildASTRoot();
-		astRoot.recordModifications();
-
-		editor.edit(this.getModifiedDeclaration(astRoot));
-
-		TextEdit edits = astRoot.rewrite(doc, this.compilationUnit.getJavaProject().getOptions(true));
-		if (sharedDocument) {
-			this.getModifySharedDocumentCommandExecutor().execute(new ModifySharedDocumentCommand(edits, doc));
-		} else {
-			this.applyEdits(edits, doc);
-		}
-
-		if ( ! sharedDocument) {
-			this.compilationUnit.getBuffer().setContents(doc.get());
-			this.compilationUnit.commitWorkingCopy(true, null);  // true="force"
-			this.compilationUnit.discardWorkingCopy();
-		}
-	}
-
-	/**
-	 * apply the specified edits to the specified document,
-	 * reformatting the document if necessary
-	 */
-	protected void applyEdits(TextEdit edits, IDocument doc) throws MalformedTreeException, BadLocationException {
-		edits.apply(doc, TextEdit.UPDATE_REGIONS);
-		this.annotationEditFormatter.format(doc, edits);
-	}
-
-	protected CompilationUnit buildASTRoot() {
-		return JDTTools.buildASTRoot(this.compilationUnit);
-	}
-
-	protected CommandExecutor getModifySharedDocumentCommandExecutor() {
-		return this.modifySharedDocumentCommandExecutorProvider.getCommandExecutor();
-	}
-
-
-	// ********** modify shared document command class **********
-
-	/**
-	 * simple command that calls back to the member to apply the edits
-	 * in the same way as if the document were not shared
-	 */
-	protected class ModifySharedDocumentCommand implements Command {
-		private final TextEdit edits;
-		private final IDocument doc;
-
-		protected ModifySharedDocumentCommand(TextEdit edits, IDocument doc) {
-			super();
-			this.edits = edits;
-			this.doc = doc;
-		}
-
-		public void execute() {
-			try {
-				JDTMember.this.applyEdits(this.edits, this.doc);
-			} catch (MalformedTreeException ex) {
-				throw new RuntimeException(ex);
-			} catch (BadLocationException ex) {
-				throw new RuntimeException(ex);
-			}
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTMethodAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTMethodAttribute.java
deleted file mode 100644
index d0844d6606..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTMethodAttribute.java
+++ /dev/null
@@ -1,188 +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.core.internal.utility.jdt;
-
-import java.beans.Introspector;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IMethodBinding;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationEditFormatter;
-import org.eclipse.jpt.core.utility.jdt.MethodAttribute;
-import org.eclipse.jpt.core.utility.jdt.Type;
-import org.eclipse.jpt.utility.CommandExecutorProvider;
-import org.eclipse.jpt.utility.JavaType;
-import org.eclipse.jpt.utility.MethodSignature;
-import org.eclipse.jpt.utility.internal.SimpleMethodSignature;
-
-/**
- * Adapt and extend a JDT method.
- * Attribute based on a Java property, e.g.
- *     private int getFoo() {
- *         return foo;
- *     }
- *     private void setFoo(int foo) {
- *         this.foo = foo;
- *     }
- */
-public class JDTMethodAttribute
-	extends JDTAttribute
-	implements MethodAttribute
-{
-	/** we need the parameter types to build the method signature */
-	private final JavaType[] parameterTypes;
-
-
-	// ********** constructors **********
-
-	public static JDTMethodAttribute newInstance(
-			Type declaringType,
-			MethodSignature signature,
-			int occurrence,
-			ICompilationUnit compilationUnit,
-			CommandExecutorProvider modifySharedDocumentCommandExecutorProvider) {
-		return newInstance(declaringType, signature, occurrence, compilationUnit, modifySharedDocumentCommandExecutorProvider, DefaultAnnotationEditFormatter.instance());
-	}
-
-	public static JDTMethodAttribute newInstance(
-			Type declaringType,
-			MethodSignature signature,
-			int occurrence,
-			ICompilationUnit compilationUnit,
-			CommandExecutorProvider modifySharedDocumentCommandExecutorProvider,
-			AnnotationEditFormatter annotationEditFormatter) {
-		return new JDTMethodAttribute(declaringType, signature, occurrence, compilationUnit, modifySharedDocumentCommandExecutorProvider, annotationEditFormatter);
-	}
-
-	public JDTMethodAttribute(
-			Type declaringType,
-			MethodSignature methodSignature,
-			int occurrence,
-			ICompilationUnit compilationUnit,
-			CommandExecutorProvider modifySharedDocumentCommandExecutorProvider) {
-		this(declaringType, methodSignature, occurrence, compilationUnit, modifySharedDocumentCommandExecutorProvider, DefaultAnnotationEditFormatter.instance());
-	}
-
-	public JDTMethodAttribute(
-			Type declaringType,
-			MethodSignature methodSignature,
-			int occurrence,
-			ICompilationUnit compilationUnit,
-			CommandExecutorProvider modifySharedDocumentCommandExecutorProvider,
-			AnnotationEditFormatter annotationEditFormatter) {
-		super(declaringType, methodSignature.getName(), occurrence, compilationUnit, modifySharedDocumentCommandExecutorProvider, annotationEditFormatter);
-		this.parameterTypes = methodSignature.getParameterTypes();
-	}
-
-	/**
-	 * constructor for testing
-	 */
-	public JDTMethodAttribute(Type declaringType, String name, String[] parameterTypeNames, int occurrence, ICompilationUnit compilationUnit) {
-		this(declaringType, new SimpleMethodSignature(name, parameterTypeNames), occurrence, compilationUnit, CommandExecutorProvider.Default.instance(), DefaultAnnotationEditFormatter.instance());
-	}
-
-
-	// ********** Member/Attribute/MethodAttribute implementation **********
-
-	public IMethodBinding getBinding(CompilationUnit astRoot) {
-		return this.getBodyDeclaration(astRoot).resolveBinding();
-	}
-
-	public MethodDeclaration getBodyDeclaration(CompilationUnit astRoot) {
-		int count = 0;
-		for (MethodDeclaration methodDeclaration : this.getDeclaringTypeMethodDeclarations(astRoot)) {
-			if (this.matches(methodDeclaration)) {
-				count++;
-				if (count == this.getOccurrence()) {
-					return methodDeclaration;
-				}
-			}
-		}
-		// return null if the method is no longer in the source code;
-		// this can happen when the context model has not yet
-		// been synchronized with the resource model but is still
-		// asking for an ASTNode (e.g. during a selection event)
-		return null;
-	}
-
-	public boolean matches(MethodSignature signature, int occurrence) {
-		return this.matches(signature) && (occurrence == this.getOccurrence());
-	}
-
-	protected boolean matches(MethodSignature signature) {
-		return signature.getName().equals(this.getName_())
-					&& Arrays.equals(this.parameterTypes, signature.getParameterTypes());
-	}
-
-	protected boolean matches(MethodDeclaration methodDeclaration) {
-		return this.matches(JDTTools.buildMethodSignature(methodDeclaration));
-	}
-
-	// minimize scope of suppressed warnings
-	@SuppressWarnings("unchecked")
-	protected static List<SingleVariableDeclaration> parameters(MethodDeclaration methodDeclaration) {
-		return methodDeclaration.parameters();
-	}
-
-	@Override
-	public boolean matches(String memberName, int occurrence) {
-		throw new UnsupportedOperationException("Use #matches(org.eclipse.jdt.core.dom.MethodDeclaration, int).");
-	}
-
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return new ASTNodeTextRange(this.getBodyDeclaration(astRoot).getName());
-	}
-
-	/**
-	 * return "foo" for a method named "getFoo" or "isFoo"
-	 */
-	public String getAttributeName() {
-		String name = this.getName_();
-		int beginIndex = 0;
-		if (name.startsWith("get")) {
-			beginIndex = 3;
-		} else if (name.startsWith("is")) {
-			beginIndex = 2;
-		}
-		return Introspector.decapitalize(name.substring(beginIndex));
-	}
-
-	public ITypeBinding getTypeBinding(CompilationUnit astRoot) {
-		IMethodBinding methodBinding = getBodyDeclaration(astRoot).resolveBinding();
-		if (methodBinding != null) {
-			return methodBinding.getReturnType();
-		}
-		return null;
-	}
-
-	@Override
-	public boolean isMethod() {
-		return true;
-	}
-
-	public boolean isPersistable(CompilationUnit astRoot) {
-		IMethodBinding binding = this.getBinding(astRoot);
-		return (binding == null) ? false : JPTTools.methodIsPersistablePropertyGetter(binding);
-	}
-
-
-	// ********** internal **********
-
-	protected MethodDeclaration[] getDeclaringTypeMethodDeclarations(CompilationUnit astRoot) {
-		return this.getDeclaringTypeDeclaration(astRoot).getMethods();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTModifiedDeclaration.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTModifiedDeclaration.java
deleted file mode 100644
index 266fa7c8a0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTModifiedDeclaration.java
+++ /dev/null
@@ -1,416 +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.core.internal.utility.jdt;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.ImportDeclaration;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.VariableDeclarationExpression;
-import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
-import org.eclipse.jpt.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
-
-/**
- * 
- */
-public class JDTModifiedDeclaration
-	implements ModifiedDeclaration
-{
-	private final Adapter adapter;
-
-
-	// ********** constructors **********
-
-	public JDTModifiedDeclaration(Adapter adapter) {
-		super();
-		this.adapter = adapter;
-	}
-
-	public JDTModifiedDeclaration(BodyDeclaration declaration) {
-		this(new BodyDeclarationAdapter(declaration));
-	}
-
-	public JDTModifiedDeclaration(SingleVariableDeclaration declaration) {
-		this(new SingleVariableDeclarationAdapter(declaration));
-	}
-
-	public JDTModifiedDeclaration(VariableDeclarationExpression declaration) {
-		this(new VariableDeclarationExpressionAdapter(declaration));
-	}
-
-	public JDTModifiedDeclaration(VariableDeclarationStatement declaration) {
-		this(new VariableDeclarationStatementAdapter(declaration));
-	}
-
-
-	// ********** public methods **********
-
-	public ASTNode getDeclaration() {
-		return this.adapter.declaration();
-	}
-
-	/**
-	 * Return the declaration's list of modifiers.
-	 * Element type: org.eclipse.jdt.core.dom.IExtendedModifier
-	 */
-	public List<IExtendedModifier> modifiers() {
-		return this.adapter.modifiers();
-	}
-
-	public AST getAst() {
-		return this.getDeclaration().getAST();
-	}
-
-	public CompilationUnit getCompilationUnit() {
-		return (CompilationUnit) this.getDeclaration().getRoot();
-	}
-
-	public ICompilationUnit getICompilationUnit() {
-		return (ICompilationUnit) this.getCompilationUnit().getJavaElement();
-	}
-
-	/**
-	 * Return the declaration's annotations.
-	 */
-	public Iterator<Annotation> annotations() {
-		return new FilteringIterator<IExtendedModifier, Annotation>(this.modifiers().iterator()) {
-			@Override
-			protected boolean accept(IExtendedModifier next) {
-				return next.isAnnotation();
-			}
-		};
-	}
-
-	public Annotation getAnnotationNamed(String annotationName) {
-		for (Iterator<Annotation> stream = this.annotations(); stream.hasNext(); ) {
-			Annotation annotation = stream.next();
-			if (this.annotationIsNamed(annotation, annotationName)) {
-				return annotation;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Return whether the declaration has an annotation with the specified name.
-	 */
-	public boolean containsAnnotationNamed(String annotationName) {
-		return this.getAnnotationNamed(annotationName) != null;
-	}
-
-	/**
-	 * Add the specified annotation to the declaration.
-	 * By convention annotations precede the "standard" (JLS2) modifiers;
-	 * though, technically, they can be interspersed.
-	 */
-	public void addAnnotation(Annotation annotation) {
-		List<IExtendedModifier> modifiers = this.modifiers();
-		for (ListIterator<IExtendedModifier> stream = modifiers.listIterator(); stream.hasNext(); ) {
-			if (stream.next().isModifier()) {
-				stream.previous();  // put the annotation *before* the first "standard" (JLS2) modifier
-				stream.add(annotation);
-				return;
-			}
-		}
-		modifiers.add(annotation);  // just tack it on to the end
-	}
-
-	public void removeAnnotationNamed(String annotationName) {
-		for (Iterator<IExtendedModifier> stream = this.modifiers().iterator(); stream.hasNext(); ) {
-			IExtendedModifier modifier = stream.next();
-			if (modifier.isAnnotation()) {
-				if (this.annotationIsNamed((Annotation) modifier, annotationName)) {
-					stream.remove();
-					break;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Remove the specified annotation from the declaration.
-	 */
-	public void removeAnnotation(Annotation annotation) {
-		if ( ! this.modifiers().remove(annotation)) {
-			throw new IllegalArgumentException("invalid annotation: " + annotation);
-		}
-	}
-
-	/**
-	 * Replace the specified old annotation with the specified new annotation.
-	 */
-	public void replaceAnnotation(Annotation oldAnnotation, Annotation newAnnotation) {
-		for (ListIterator<IExtendedModifier> stream = this.modifiers().listIterator(); stream.hasNext(); ) {
-			if (stream.next().equals(oldAnnotation)) {
-				stream.set(newAnnotation);
-				return;
-			}
-		}
-		throw new IllegalArgumentException("invalid old annotation: " + oldAnnotation);
-	}
-
-	public void replaceAnnotationNamed(String oldAnnotationName, Annotation newAnnotation) {
-		List<IExtendedModifier> modifiers = this.modifiers();
-		for (ListIterator<IExtendedModifier> stream = modifiers.listIterator(); stream.hasNext(); ) {
-			IExtendedModifier modifier = stream.next();
-			if (modifier.isAnnotation()) {
-				if (this.annotationIsNamed((Annotation) modifier, oldAnnotationName)) {
-					stream.set(newAnnotation);
-					return;
-				}
-			}
-		}
-		this.addAnnotation(newAnnotation);
-	}
-
-	public void addImport(String importName) {
-		this.addImport(importName, false);
-	}
-
-	public void addStaticImport(String importName) {
-		this.addImport(importName, true);
-	}
-
-	public void addImport(String importName, boolean static_) {
-		if (importName.indexOf('.') != -1) {
-			this.addImportTo(this.getCompilationUnit(), importName, static_);
-		}
-	}
-
-	public String getImportFor(String shortName) {
-		return this.getImportFor(shortName, false);
-	}
-
-	public String getStaticImportFor(String shortName) {
-		return this.getImportFor(shortName, true);
-	}
-
-	// TODO handle wildcards
-	public String getImportFor(String shortName, boolean static_) {
-		if (shortName.indexOf('.') != -1) {
-			return shortName;
-		}
-		List<ImportDeclaration> imports = this.imports(this.getCompilationUnit());
-		for (ImportDeclaration importDeclaration : imports) {
-			if (this.importIsFor(importDeclaration, shortName, static_)) {
-				return importDeclaration.getName().getFullyQualifiedName();
-			}
-		}
-		return null;
-	}
-
-	protected boolean importIsFor(ImportDeclaration importDeclaration, String shortName, boolean static_) {
-		if (importDeclaration.isStatic() != static_) {
-			return false;
-		}
-		String importDeclarationName = importDeclaration.getName().getFullyQualifiedName();
-		return importDeclarationName.endsWith(shortName);
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.adapter.toString());
-	}
-
-
-	// ********** internal methods **********
-
-	public boolean annotationIsNamed(Annotation annotation, String name) {
-		String qualifiedName = this.qualifiedName(annotation);
-		return (qualifiedName != null) && qualifiedName.equals(name);
-	}
-
-	// TODO
-	private String qualifiedName(Annotation annotation) {
-		ITypeBinding typeBinding = annotation.resolveTypeBinding();
-		if (typeBinding != null) {
-			String resolvedName = typeBinding.getQualifiedName();
-			if (resolvedName != null) {
-				return resolvedName;
-			}
-		}
-		// hack(?): check for a matching import because when moving a stand-alone
-		// annotation to its container in CombinationIndexedDeclarationAnnotationAdapter
-		// the container's import is added but then it won't "resolve" upon
-		// subsequent lookups... :-(
-		return this.getImportFor(annotation.getTypeName().getFullyQualifiedName());  // look for a matching import
-
-		// OLD METHOD SOURCE:
-//		String name = annotation.getTypeName().getFullyQualifiedName();
-//		if (name.indexOf('.') != -1) {
-//			return name;  // name is already qualified
-//		}
-//		String resolvedName = JDTTools.resolve(name, this.type());
-//		// hack(?): check for a matching import because when moving a stand-alone
-//		// annotation to its container in CombinationIndexedDeclarationAnnotationAdapter
-//		// the container's import is added but then it won't "resolve" upon
-//		// subsequent lookups... :-(
-//		return this.importFor(name);  // look for a matching import
-	}
-
-	/**
-	 * Return whether the specified import was added without a collision.
-	 */
-	// TODO handle collisions (e.g. java.util.Date vs. java.sql.Date)
-	protected void addImportTo(CompilationUnit astRoot, String importName, boolean static_) {
-		List<ImportDeclaration> imports = this.imports(astRoot);
-		if (this.importsInclude(imports, importName, static_)) {
-			return;
-		}
-		AST ast = astRoot.getAST();
-		ImportDeclaration import_ = ast.newImportDeclaration();
-		import_.setName(ast.newName(importName));
-		import_.setStatic(static_);
-		imports.add(import_);
-	}
-
-	@SuppressWarnings("unchecked")
-	protected List<ImportDeclaration> imports(CompilationUnit astRoot) {
-		return astRoot.imports();
-	}
-
-	protected boolean importsInclude(List<ImportDeclaration> imports, String importName, boolean static_) {
-		for (ImportDeclaration importDeclaration : imports) {
-			if (this.importIncludes(importDeclaration, importName, static_)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	protected boolean importIncludes(ImportDeclaration importDeclaration, String importName, boolean static_) {
-		if (importDeclaration.isStatic() != static_) {
-			return false;
-		}
-		String importDeclarationName = importDeclaration.getName().getFullyQualifiedName();
-		if (importName.equals(importDeclarationName)) {
-			return true;
-		}
-		if (importDeclaration.isOnDemand()
-				&& this.onDemandNameFor(importName).equals(importDeclarationName)) {
-			return true;
-		}
-		return false;
-	}
-
-	protected String onDemandNameFor(String importName) {
-		int lastPeriod = importName.lastIndexOf('.');
-		return (lastPeriod == -1) ? "" : importName.substring(0, lastPeriod);
-	}
-	
-
-	// ********** declaration adapter interface and implementations **********
-
-	/**
-	 * Define common protocol among the various "declarations".
-	 */
-	public interface Adapter {
-
-		/**
-		 * Return the adapted "declaration".
-		 */
-		ASTNode declaration();
-
-		/**
-		 * Return the "declaration"'s list of modifiers.
-		 * Element type: org.eclipse.jdt.core.dom.IExtendedModifier
-		 */
-		List<IExtendedModifier> modifiers();
-
-	}
-
-	public static class BodyDeclarationAdapter implements Adapter {
-		private final BodyDeclaration declaration;
-		public BodyDeclarationAdapter(BodyDeclaration declaration) {
-			super();
-			this.declaration = declaration;
-		}
-		public ASTNode declaration() {
-			return this.declaration;
-		}
-		@SuppressWarnings("unchecked")
-		public List<IExtendedModifier> modifiers() {
-			return this.declaration.modifiers();
-		}
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this, this.declaration.toString());
-		}
-	}
-
-	public static class SingleVariableDeclarationAdapter implements Adapter {
-		private final SingleVariableDeclaration declaration;
-		public SingleVariableDeclarationAdapter(SingleVariableDeclaration declaration) {
-			super();
-			this.declaration = declaration;
-		}
-		public ASTNode declaration() {
-			return this.declaration;
-		}
-		@SuppressWarnings("unchecked")
-		public List<IExtendedModifier> modifiers() {
-			return this.declaration.modifiers();
-		}
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this, this.declaration.toString());
-		}
-	}
-
-	public static class VariableDeclarationExpressionAdapter implements Adapter {
-		private final VariableDeclarationExpression declaration;
-		public VariableDeclarationExpressionAdapter(VariableDeclarationExpression declaration) {
-			super();
-			this.declaration = declaration;
-		}
-		public ASTNode declaration() {
-			return this.declaration;
-		}
-		@SuppressWarnings("unchecked")
-		public List<IExtendedModifier> modifiers() {
-			return this.declaration.modifiers();
-		}
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this, this.declaration.toString());
-		}
-	}
-
-	public static class VariableDeclarationStatementAdapter implements Adapter {
-		private final VariableDeclarationStatement declaration;
-		public VariableDeclarationStatementAdapter(VariableDeclarationStatement declaration) {
-			super();
-			this.declaration = declaration;
-		}
-		public ASTNode declaration() {
-			return this.declaration;
-		}
-		@SuppressWarnings("unchecked")
-		public List<IExtendedModifier> modifiers() {
-			return this.declaration.modifiers();
-		}
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this, this.declaration.toString());
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTTools.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTTools.java
deleted file mode 100644
index 2050011ede..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTTools.java
+++ /dev/null
@@ -1,119 +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.core.internal.utility.jdt;
-
-import java.util.List;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.IAnnotationBinding;
-import org.eclipse.jdt.core.dom.IBinding;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.IVariableBinding;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TypeLiteral;
-import org.eclipse.jpt.utility.JavaType;
-import org.eclipse.jpt.utility.MethodSignature;
-import org.eclipse.jpt.utility.internal.SimpleJavaType;
-import org.eclipse.jpt.utility.internal.SimpleMethodSignature;
-
-public class JDTTools {
-
-	/**
-	 * Build an AST for the specified compilation unit with its bindings
-	 * resolved (and the resultant performance hit).
-	 */
-	public static CompilationUnit buildASTRoot(ICompilationUnit compilationUnit) {
-		ASTParser parser = ASTParser.newParser(AST.JLS3);
-		parser.setSource(compilationUnit);
-		parser.setResolveBindings(true);
-		parser.setBindingsRecovery(true);  // see bugs 196200, 222735
-		return (CompilationUnit) parser.createAST(null);
-	}
-
-	public static String resolveEnum(Expression expression) {
-		if (expression == null) {
-			return null;
-		}
-		switch (expression.getNodeType()) {
-			case ASTNode.QUALIFIED_NAME:
-			case ASTNode.SIMPLE_NAME:
-				return resolveEnum((Name) expression);
-			default:
-				return null;
-		}
-	}
-
-	public static String resolveEnum(Name enumExpression) {
-		IBinding binding = enumExpression.resolveBinding();
-		if (binding == null) {
-			return null;  // TODO figure why this is null sometimes
-		}
-		if (binding.getKind() != IBinding.VARIABLE) {
-			return null;
-		}
-		IVariableBinding variableBinding = (IVariableBinding) binding;
-		return variableBinding.getType().getQualifiedName() + "." + variableBinding.getName();
-	}
-	
-	public static String resolveAnnotation(Annotation node) {
-		IAnnotationBinding annotationBinding = node.resolveAnnotationBinding();
-		if (annotationBinding == null) {
-			return null;
-		}
-		ITypeBinding annotationTypeBinding = annotationBinding.getAnnotationType();
-		if (annotationTypeBinding == null) {
-			return null;
-		}
-		return annotationTypeBinding.getQualifiedName();
-	}
-	
-	public static String resolveFullyQualifiedName(Expression expression) {
-		if (expression.getNodeType() == ASTNode.TYPE_LITERAL) {
-			ITypeBinding resolvedTypeBinding = ((TypeLiteral) expression).getType().resolveBinding();
-			if (resolvedTypeBinding != null) {
-				return resolvedTypeBinding.getQualifiedName();
-			}
-		}
-		return null;
-	}
-
-	public static MethodSignature buildMethodSignature(MethodDeclaration methodDeclaration) {
-		return new SimpleMethodSignature(
-				methodDeclaration.getName().getFullyQualifiedName(),
-				buildParameterTypes(methodDeclaration)
-			);
-	}
-
-	public static JavaType[] buildParameterTypes(MethodDeclaration methodDeclaration) {
-		List<SingleVariableDeclaration> parameters = parameters(methodDeclaration);
-		int len = parameters.size();
-		JavaType[] parameterTypes = new JavaType[len];
-		for (int i = 0; i < len; i++) {
-			ITypeBinding type = parameters.get(i).getType().resolveBinding();
-			parameterTypes[i] = new SimpleJavaType(type.getQualifiedName(), type.getDimensions());
-		}
-		return parameterTypes;
-	}
-
-	// minimize scope of suppressed warnings
-	@SuppressWarnings("unchecked")
-	private static List<SingleVariableDeclaration> parameters(MethodDeclaration methodDeclaration) {
-		return methodDeclaration.parameters();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTType.java
deleted file mode 100644
index 22ca6c302b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JDTType.java
+++ /dev/null
@@ -1,175 +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.core.internal.utility.jdt;
-
-import java.util.List;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.core.utility.jdt.AnnotationEditFormatter;
-import org.eclipse.jpt.core.utility.jdt.Type;
-import org.eclipse.jpt.utility.CommandExecutorProvider;
-
-/**
- * Adapt and extend a JDT type.
- */
-public class JDTType
-	extends JDTMember
-	implements Type
-{
-
-	/**
-	 * constructor for the compilation unit's primary type
-	 */
-	public JDTType(
-			TypeDeclaration typeDeclaration,  // exclude annotations and enums
-			ICompilationUnit compilationUnit,
-			CommandExecutorProvider modifySharedDocumentCommandExecutorProvider) {
-		this(typeDeclaration, compilationUnit, modifySharedDocumentCommandExecutorProvider, DefaultAnnotationEditFormatter.instance());
-	}
-
-	/**
-	 * constructor for the compilation unit's primary type
-	 */
-	public JDTType(
-			TypeDeclaration typeDeclaration,  // exclude annotations and enums
-			ICompilationUnit compilationUnit,
-			CommandExecutorProvider modifySharedDocumentCommandExecutorProvider,
-			AnnotationEditFormatter annotationEditFormatter) {
-		this(null, typeDeclaration, 1, compilationUnit, modifySharedDocumentCommandExecutorProvider, annotationEditFormatter);
-	}
-
-	/**
-	 * constructor for nested types
-	 */
-	public JDTType(
-			Type declaringType,
-			TypeDeclaration typeDeclaration,  // exclude annotations and enums
-			int occurrence,
-			ICompilationUnit compilationUnit,
-			CommandExecutorProvider modifySharedDocumentCommandExecutorProvider) {
-		this(declaringType, typeDeclaration, occurrence, compilationUnit, modifySharedDocumentCommandExecutorProvider, DefaultAnnotationEditFormatter.instance());
-	}
-
-	/**
-	 * constructor for nested types
-	 */
-	public JDTType(
-			Type declaringType,
-			TypeDeclaration typeDeclaration,  // exclude annotations and enums
-			int occurrence,
-			ICompilationUnit compilationUnit,
-			CommandExecutorProvider modifySharedDocumentCommandExecutorProvider,
-			AnnotationEditFormatter annotationEditFormatter) {
-		super(declaringType, typeDeclaration.getName().getFullyQualifiedName(), occurrence, compilationUnit, modifySharedDocumentCommandExecutorProvider, annotationEditFormatter);
-	}
-
-	/**
-	 * constructor for testing
-	 */
-	public JDTType(Type declaringType, String name, int occurrence, ICompilationUnit compilationUnit) {
-		super(declaringType, name, occurrence, compilationUnit, CommandExecutorProvider.Default.instance(), DefaultAnnotationEditFormatter.instance());
-	}
-
-
-	// ********** Member/Type implementation **********
-
-	public ITypeBinding getBinding(CompilationUnit astRoot) {
-		return this.getBodyDeclaration(astRoot).resolveBinding();
-	}
-
-	/**
-	 * find the type's body declaration in the specified AST
-	 */
-	public TypeDeclaration getBodyDeclaration(CompilationUnit astRoot) {
-		Type declaringType = this.getDeclaringType();
-		return (declaringType == null) ?
-				this.getTopLevelTypeDeclaration(astRoot)
-			:
-				this.getNestedTypeDeclaration(declaringType.getBodyDeclaration(astRoot));
-	}
-
-	public boolean isPersistable(CompilationUnit astRoot) {
-		ITypeBinding binding = this.getBinding(astRoot);
-		return (binding == null) ? false : JPTTools.typeIsPersistable(binding);
-	}
-
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return new ASTNodeTextRange(this.getBodyDeclaration(astRoot).getName());
-	}
-
-	public TypeDeclaration[] getTypes(CompilationUnit astRoot) {
-		return this.getBodyDeclaration(astRoot).getTypes();
-	}
-
-	public FieldDeclaration[] getFields(CompilationUnit astRoot) {
-		return this.getBodyDeclaration(astRoot).getFields();
-	}
-
-	public MethodDeclaration[] getMethods(CompilationUnit astRoot) {
-		return this.getBodyDeclaration(astRoot).getMethods();
-	}
-
-
-	// ********** internal **********
-
-	/**
-	 * return the first top-level type in the specified AST with a matching name
-	 */
-	protected TypeDeclaration getTopLevelTypeDeclaration(CompilationUnit astRoot) {
-		return this.getTypeDeclaration(types(astRoot));
-	}
-
-	protected TypeDeclaration getTypeDeclaration(List<TypeDeclaration> typeDeclarations) {
-		return this.getTypeDeclaration(typeDeclarations.toArray(new TypeDeclaration[typeDeclarations.size()]));
-	}
-
-	/**
-	 * return the nested type with a matching name and occurrence
-	 */
-	protected TypeDeclaration getNestedTypeDeclaration(TypeDeclaration declaringTypeDeclaration) {
-		return this.getTypeDeclaration(declaringTypeDeclaration.getTypes());
-	}
-
-	/**
-	 * return the type declaration corresponding to the type from the specified
-	 * set of type declarations (match name and occurrence)
-	 */
-	protected TypeDeclaration getTypeDeclaration(TypeDeclaration[] typeDeclarations) {
-		String name = this.getName_();
-		int occurrence = this.getOccurrence();
-		int count = 0;
-		for (TypeDeclaration typeDeclaration : typeDeclarations) {
-			if (typeDeclaration.getName().getFullyQualifiedName().equals(name)) {
-				count++;
-				if (count == occurrence) {
-					return typeDeclaration;
-				}
-			}
-		}
-		// return null if the type is no longer in the source code;
-		// this can happen when the context model has not yet
-		// been synchronized with the resource model but is still
-		// asking for an ASTNode (e.g. during a selection event)
-		return null;
-	}
-
-	// minimize scope of suppressed warnings
-	@SuppressWarnings("unchecked")
-	protected static List<TypeDeclaration> types(CompilationUnit astRoot) {
-		return astRoot.types();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JPTTools.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JPTTools.java
deleted file mode 100644
index dcaed04e05..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/JPTTools.java
+++ /dev/null
@@ -1,182 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.IMethodBinding;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.IVariableBinding;
-import org.eclipse.jdt.core.dom.Modifier;
-
-public class JPTTools {
-
-	/**
-	 * Return whether the specified field may be "persisted".
-	 * According to the spec, "All non-transient instance variables that are not 
-	 * annotated with the Transient annotation are persistent."
-	 */
-	public static boolean fieldIsPersistable(IVariableBinding field) {
-		int modifiers = field.getModifiers();
-		if (Modifier.isStatic(modifiers)) {
-			return false;
-		}
-		if (Modifier.isTransient(modifiers)) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Return whether the specified method is a "getter" method that
-	 * represents a property that may be "persisted".
-	 */
-	public static boolean methodIsPersistablePropertyGetter(IMethodBinding methodBinding) {
-		if (methodHasBadModifiers(methodBinding)) {
-			return false;
-		}
-
-		ITypeBinding returnType = methodBinding.getReturnType();
-		if (returnType == null) {
-			return false;
-		}
-		String returnTypeName = returnType.getQualifiedName();
-		if (returnTypeName.equals("void")) {
-			return false;
-		}
-		if (methodBinding.getParameterTypes().length != 0) {
-			return false;
-		}
-
-		String methodName = methodBinding.getName();
-		int beginIndex = 0;
-		boolean booleanGetter = false;
-		if (methodName.startsWith("is")) {
-			if (returnTypeName.equals("boolean")) {
-				beginIndex = 2;
-			} else {
-				return false;
-			}
-		} else {
-			if (methodName.startsWith("get")) {
-				beginIndex = 3;
-				if (returnTypeName.equals("boolean")) {
-					booleanGetter = true;
-				}
-			} else {
-				return false;
-			}
-		}
-
-		String capitalizedAttributeName = methodName.substring(beginIndex);
-		// if the type has both methods:
-		//     boolean isProperty()
-		//     boolean getProperty()
-		// then #isProperty() takes precedence and we ignore #getProperty()
-		// (see the JavaBeans spec 1.01)
-		if (booleanGetter) {
-			IMethodBinding isMethod = methodBindingNoParameters(methodBinding.getDeclaringClass(), "is" + capitalizedAttributeName);
-			if (isMethod == null) {
-				return false;
-			}
-			if (isMethod.getReturnType().getName().equals("boolean")) {
-				return false;
-			}
-		}
-		IMethodBinding setMethod = methodBindingOneParameter(methodBinding.getDeclaringClass(), "set" + capitalizedAttributeName, returnTypeName);
-		if (setMethod == null) {
-			return false;
-		}
-		if (methodHasBadModifiers(setMethod)) {
-			return false;
-		}
-		if ( ! setMethod.getReturnType().getName().equals("void")) {
-			return false;
-		}
-		return true;
-	}
-	
-	private static IMethodBinding methodBindingNoParameters(ITypeBinding typeBinding, String methodName) {
-		for (IMethodBinding method : typeBinding.getDeclaredMethods()) {
-			if (method.getName().equals(methodName)) {
-				if (method.getParameterTypes().length == 0) {
-					return method;
-				}
-			}
-		}
-		return null;
-	}
-	
-	private static IMethodBinding methodBindingOneParameter(ITypeBinding typeBinding, String methodName, String parameterTypeName) {
-		for (IMethodBinding method : typeBinding.getDeclaredMethods()) {
-			if (method.getName().equals(methodName)) {
-				if (method.getParameterTypes().length == 1) {
-					if (method.getParameterTypes()[0].getQualifiedName().equals(parameterTypeName)) {
-						return method;
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Return whether the specified method's modifiers prevent it
-	 * from being a getter or setter for a "persistent" property.
-	 */
-	private static boolean methodHasBadModifiers(IMethodBinding methodBinding) {
-		if (methodBinding.isConstructor()) {
-			return true;
-		}
-		int modifiers = methodBinding.getModifiers();
-		if (Modifier.isStatic(modifiers)) {
-			return true;
-		}
-		if (Modifier.isFinal(modifiers)) {
-			return true;
-		}
-		if ( ! (Modifier.isPublic(modifiers) || Modifier.isProtected(modifiers))) {
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Return whether the type may be "persisted", ie marked as Entity, MappedSuperclass, Embeddable
-	 */
-	//TODO should persistability be dependent on having a no-arg constructor or should that just be validation?
-	//seems like final, or a member type being static could be dealt with through validation instead of filtering them out.
-	public static boolean typeIsPersistable(ITypeBinding typeBinding) {
-		if (typeBinding.isInterface()) {
-			return false;
-		}
-		if (typeBinding.isAnnotation()) {
-			return false;
-		}
-		if (typeBinding.isEnum()) {
-			return false;
-		}
-		if (typeBinding.isLocal()) {
-			return false;
-		}
-		if (typeBinding.isAnonymous()) {
-			return false;
-		}
-		int modifiers = typeBinding.getModifiers();
-		if (Modifier.isFinal(modifiers)) {
-			return false;
-		}
-		if (typeBinding.isMember()) {
-			if (!Modifier.isStatic(modifiers)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/MemberAnnotationAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/MemberAnnotationAdapter.java
deleted file mode 100644
index 5b92fa57d8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/MemberAnnotationAdapter.java
+++ /dev/null
@@ -1,27 +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.core.internal.utility.jdt;
-
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-
-/**
- * Adapt a member and a declaration annotation adapter.
- */
-public class MemberAnnotationAdapter extends AbstractAnnotationAdapter {
-
-
-	// ********** constructor **********
-
-	public MemberAnnotationAdapter(Member member, DeclarationAnnotationAdapter daa) {
-		super(member, daa);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/MemberAnnotationElementAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/MemberAnnotationElementAdapter.java
deleted file mode 100644
index 89f854f2e5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/MemberAnnotationElementAdapter.java
+++ /dev/null
@@ -1,99 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.utility.internal.StringTools;
-
- /**
- * Adapt a member and a declaration annotation element adapter.
- */
-public class MemberAnnotationElementAdapter<T>
-	implements AnnotationElementAdapter<T>
-{
-	private final Member member;
-	private final DeclarationAnnotationElementAdapter<T> daea;
-
-
-	// ********** constructor **********
-
-	public MemberAnnotationElementAdapter(Member member, DeclarationAnnotationElementAdapter<T> daea) {
-		super();
-		this.member = member;
-		this.daea = daea;
-	}
-
-
-	// ********** AnnotationElementAdapter implementation **********
-
-	public T getValue() {
-		return this.daea.getValue(this.member.getModifiedDeclaration());
-	}
-
-	public T getValue(CompilationUnit astRoot) {
-		return this.daea.getValue(this.member.getModifiedDeclaration(astRoot));
-	}
-
-	public void setValue(T value) {
-		this.edit(this.buildSetValueEditor(value));
-	}
-
-	public Expression getExpression(CompilationUnit astRoot) {
-		return this.daea.getExpression(this.member.getModifiedDeclaration(astRoot));
-	}
-
-	public ASTNode getAstNode(CompilationUnit astRoot) {
-		return this.daea.getAstNode(this.member.getModifiedDeclaration(astRoot));
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.daea);
-	}
-
-
-	// ********** internal methods **********
-
-	protected void edit(Member.Editor editor) {
-		this.member.edit(editor);
-	}
-
-	protected Member.Editor buildSetValueEditor(T value) {
-		return new SetValueEditor<T>(value, this.daea);
-	}
-
-
-	// ********** member classes **********
-
-	protected static class SetValueEditor<T> implements Member.Editor {
-		private final DeclarationAnnotationElementAdapter<T> daea;
-		private final T value;
-
-		SetValueEditor(T value, DeclarationAnnotationElementAdapter<T> daea) {
-			super();
-			this.value = value;
-			this.daea = daea;
-		}
-		public void edit(ModifiedDeclaration declaration) {
-			this.daea.setValue(this.value, declaration);
-		}
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/MemberIndexedAnnotationAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/MemberIndexedAnnotationAdapter.java
deleted file mode 100644
index aceeb48616..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/MemberIndexedAnnotationAdapter.java
+++ /dev/null
@@ -1,74 +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.core.internal.utility.jdt;
-
-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.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * Adapt a member and an indexed declaration annotation adapter.
- */
-public class MemberIndexedAnnotationAdapter
-	extends AbstractAnnotationAdapter
-	implements IndexedAnnotationAdapter
-{
-	private final IndexedDeclarationAnnotationAdapter idaa;
-
-
-	// ********** constructor **********
-
-	public MemberIndexedAnnotationAdapter(Member member, IndexedDeclarationAnnotationAdapter idaa) {
-		super(member, idaa);
-		this.idaa = idaa;
-	}
-
-
-	// ********** IndexedAnnotationAdapter implementation **********
-
-	public int getIndex() {
-		return this.idaa.getIndex();
-	}
-
-	public void moveAnnotation(int newIndex) {
-		this.edit(this.buildMoveAnnotationEditor(newIndex));
-	}
-
-
-	// ********** factory methods **********
-
-	protected Member.Editor buildMoveAnnotationEditor(int newIndex) {
-		return new MoveAnnotationEditor(this.idaa, newIndex);
-	}
-
-
-	// ********** member classes **********
-
-	protected static class MoveAnnotationEditor implements Member.Editor {
-		private final IndexedDeclarationAnnotationAdapter idaa;
-		private int index;
-
-		MoveAnnotationEditor(IndexedDeclarationAnnotationAdapter idaa, int index) {
-			super();
-			this.idaa = idaa;
-			this.index = index;
-		}
-		public void edit(ModifiedDeclaration declaration) {
-			this.idaa.moveAnnotation(this.index, declaration);
-		}
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this);
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NameStringExpressionConverter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NameStringExpressionConverter.java
deleted file mode 100644
index 56fd65a386..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NameStringExpressionConverter.java
+++ /dev/null
@@ -1,57 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jpt.core.utility.jdt.ExpressionConverter;
-
-/**
- * Convert a name to/from a string representation of a name/identifier
- * (e.g. "com.xxx.Foo.VALUE1" or "value").
- */
-public final class NameStringExpressionConverter
-	extends AbstractExpressionConverter<String>
-{
-	private static final ExpressionConverter<String> INSTANCE = new NameStringExpressionConverter();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static ExpressionConverter<String> instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private NameStringExpressionConverter() {
-		super();
-	}
-
-	@Override
-	protected Name convertObject(String string, AST ast) {
-		return ast.newName(string);
-	}
-
-	@Override
-	protected String convertExpression(Expression expression) {
-		switch (expression.getNodeType()) {
-			case ASTNode.QUALIFIED_NAME:
-			case ASTNode.SIMPLE_NAME:
-				return ((Name) expression).getFullyQualifiedName();
-			default:
-				return null;
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NestedDeclarationAnnotationAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NestedDeclarationAnnotationAdapter.java
deleted file mode 100644
index 2b991a7c2e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NestedDeclarationAnnotationAdapter.java
+++ /dev/null
@@ -1,95 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.ModifiedDeclaration;
-
-/**
- * Manipulate an annotation that is embedded as an element within
- * another annotation, e.g.
- * <pre>
- *     &#64;Outer(foo=&#64;Inner)
- *     private int id;
- *         outerAnnotationAdapter = AnnotationAdapter<&#64;Outer>
- *         elementName = "foo"
- *         annotationName = "Inner"
- * </pre>
- */
-public class NestedDeclarationAnnotationAdapter extends AbstractNestedDeclarationAnnotationAdapter {
-
-
-	// ********** constructors **********
-
-	/**
-	 * default element name is "value";
-	 * default behavior is to remove the outer annotation when it is empty
-	 */
-	public NestedDeclarationAnnotationAdapter(DeclarationAnnotationAdapter outerAnnotationAdapter, String annotationName) {
-		super(outerAnnotationAdapter, annotationName);
-	}
-
-	/**
-	 * default behavior is to remove the outer annotation when it is empty
-	 */
-	public NestedDeclarationAnnotationAdapter(DeclarationAnnotationAdapter outerAnnotationAdapter, String elementName, String annotationName) {
-		super(outerAnnotationAdapter, elementName, annotationName);
-	}
-
-	public NestedDeclarationAnnotationAdapter(DeclarationAnnotationAdapter outerAnnotationAdapter, String elementName, String annotationName, boolean removeOuterAnnotationWhenEmpty) {
-		super(outerAnnotationAdapter, elementName, annotationName, removeOuterAnnotationWhenEmpty);
-	}
-
-
-	// ********** AbstractNestedDeclarationAnnotationAdapter implementation **********
-
-	@Override
-	protected Annotation getAnnotation(Expression value) {
-		return this.annotationValue(value);
-	}
-
-	@Override
-	protected Expression buildNewInnerExpression(Annotation inner) {
-		return inner;
-	}
-
-	/**
-	 * the annotation is the expression itself, so the annotation cannot be
-	 * "removed" from itself - return 'false'
-	 */
-	@Override
-	protected boolean removeAnnotation(ModifiedDeclaration declaration, Annotation outer, Expression value) {
-		return false;
-	}
-
-	/**
-	 * <pre>
-	 * &#64;Outer("lorem ipsum") => &#64;Outer(&#64;Inner)
-	 * </pre>
-	 */
-	@Override
-	protected void modifyAnnotationValue(SingleMemberAnnotation outer, Annotation inner) {
-		// replace(?) the current element value
-		outer.setValue(inner);
-	}
-
-	/**
-	 * Simply set the pair's value.
-	 */
-	@Override
-	protected void modifyMemberValuePair(MemberValuePair pair, Annotation inner) {
-		pair.setValue(inner);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NestedIndexedDeclarationAnnotationAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NestedIndexedDeclarationAnnotationAdapter.java
deleted file mode 100644
index 7e03591179..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NestedIndexedDeclarationAnnotationAdapter.java
+++ /dev/null
@@ -1,334 +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.core.internal.utility.jdt;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.ArrayInitializer;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.IndexedDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.ModifiedDeclaration;
-
-/**
- * Manipulate an annotation that is embedded in an element array within
- * another annotation, e.g.
- * <pre>
- *     &#64;Outer(foo={&#64;Inner("zero"), &#64;Inner("one"), &#64;Inner("two")})
- *     private int id;
- *         outerAnnotationAdapter = AnnotationAdapter<&#64;Outer>
- *         elementName = "foo"
- *         index = 0-2
- *         annotationName = "Inner"
- * </pre>
- */
-public class NestedIndexedDeclarationAnnotationAdapter
-	extends AbstractNestedDeclarationAnnotationAdapter
-	implements IndexedDeclarationAnnotationAdapter
-{
-	private int index;
-
-
-	// ********** constructors **********
-
-	/**
-	 * default element name is "value";
-	 * default behavior is to remove the outer annotation when it is empty
-	 */
-	public NestedIndexedDeclarationAnnotationAdapter(DeclarationAnnotationAdapter annotationAdapter, int index, String annotationName) {
-		super(annotationAdapter, annotationName);
-		this.index = index;
-	}
-
-	/**
-	 * default behavior is to remove the outer annotation when it is empty
-	 */
-	public NestedIndexedDeclarationAnnotationAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName, int index, String annotationName) {
-		super(annotationAdapter, elementName, annotationName);
-		this.index = index;
-	}
-
-	public NestedIndexedDeclarationAnnotationAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName, int index, String annotationName, boolean removeOuterAnnotationWhenEmpty) {
-		super(annotationAdapter, elementName, annotationName, removeOuterAnnotationWhenEmpty);
-		this.index = index;
-	}
-
-
-	// ********** AbstractNestedDeclarationAnnotationAdapter implementation **********
-
-	@Override
-	protected Annotation getAnnotation(Expression value) {
-		if (value.getNodeType() == ASTNode.ARRAY_INITIALIZER) {
-			return this.annotation((ArrayInitializer) value);
-		}
-		return (this.index == 0) ? this.annotationValue(value) : null;
-	}
-
-	@Override
-	protected Expression buildNewInnerExpression(Annotation inner) {
-		return (this.index == 0) ? inner : (Expression) this.buildNewInnerArrayInitializer(inner);
-	}
-
-	@Override
-	protected boolean removeAnnotation(ModifiedDeclaration declaration, Annotation outer, Expression value) {
-		if (value.getNodeType() == ASTNode.ARRAY_INITIALIZER) {
-			this.removeAnnotation(declaration, outer, (ArrayInitializer) value);
-			return true;
-		}
-		// if our index is greater than zero, but we don't have an array,
-		// then the annotation must already be gone
-		return (this.index != 0);
-	}
-
-	/**
-	 * <pre>
-	 * &#64;Outer({&#64;Inner(0), &#64;Inner(1)}) => &#64;Outer({&#64;Inner(0), &#64;Inner(1), &#64;Inner(2)})
-	 *     or
-	 * &#64;Outer("lorem ipsum") => &#64;Outer(&#64;Inner(0))
-	 *     or
-	 * &#64;Outer(&#64;Inner(0)) => &#64;Outer({&#64;Inner(0), &#64;Inner(1)})
-	 * </pre>
-	 */
-	@Override
-	protected void modifyAnnotationValue(SingleMemberAnnotation outer, Annotation inner) {
-		this.modifyExpression(outer, SINGLE_MEMBER_ANNOTATION_EXPRESSION_PROVIDER, inner);
-	}
-
-	/**
-	 * <pre>
-	 * &#64;Outer(text="lorem ipsum") => &#64;Outer(text="lorem ipsum", foo=&#64;Inner(0))
-	 *     or
-	 * &#64;Outer(foo={&#64;Inner(0), &#64;Inner(1)}) => &#64;Outer(foo={&#64;Inner(0), &#64;Inner(1), &#64;Inner(2)})
-	 *     or
-	 * &#64;Outer(foo="lorem ipsum") => &#64;Outer(foo=&#64;Inner(0))
-	 *     or
-	 * &#64;Outer(foo=&#64;NotInner) => &#64;Outer(foo=&#64;Inner(0))
-	 *     or
-	 * &#64;Outer(foo=&#64;Inner(0)) => &#64;Outer(foo={&#64;Inner(0), &#64;Inner(1)})
-	 * </pre>
-	 */
-	@Override
-	protected void modifyMemberValuePair(MemberValuePair pair, Annotation inner) {
-		this.modifyExpression(pair, MEMBER_VALUE_PAIR_EXPRESSION_PROVIDER, inner);
-	}
-
-
-	// ********** IndexedDeclarationAnnotationAdapter implementation **********
-
-	public int getIndex() {
-		return this.index;
-	}
-
-	/**
-	 * Move the annotation to the specified index, leaving its original
-	 * position cleared out.
-	 */
-	public void moveAnnotation(int newIndex, ModifiedDeclaration declaration) {
-		int oldIndex = this.index;
-		if (newIndex == oldIndex) {
-			return;
-		}
-
-		Annotation original = this.getAnnotation(declaration);
-		if (original == null) {
-			this.index = newIndex;
-			this.removeAnnotation(declaration);  // clear out the new location (?)
-		} else {
-			Annotation copy = (Annotation) ASTNode.copySubtree(original.getAST(), original);
-			this.index = newIndex;
-			this.addAnnotation(declaration, copy);  // install the copy in the new location
-			this.index = oldIndex;
-			this.removeAnnotation(declaration);  // go back and clear out the original location (AFTER the move)
-			this.index = newIndex;
-		}
-	}
-
-
-	// ********** internal methods **********
-
-	/**
-	 * Return the adapter's annotation from the specified array initializer.
-	 */
-	private Annotation annotation(ArrayInitializer value) {
-		List<Expression> expressions = this.expressions(value);
-		return (this.index >= expressions.size()) ? null : this.annotationValue(expressions.get(this.index));
-	}
-
-	/**
-	 * Build a new array initializer to hold the specified annotation,
-	 * padding it with 'null' literals as necessary
-	 */
-	private ArrayInitializer buildNewInnerArrayInitializer(Annotation inner) {
-		ArrayInitializer ai = inner.getAST().newArrayInitializer();
-		this.addInnerToExpressions(inner, this.expressions(ai));
-		return ai;
-	}
-
-	/**
-	 * Add the specified annotation to the specified array initializer,
-	 * padding it with 'null' literals as necessary
-	 */
-	private void addInnerToExpressions(Annotation inner, List<Expression> expressions) {
-		if (expressions.size() > this.index) {
-			throw new IllegalStateException("expressions size is greater than index - size: " + expressions.size() + " - index: " + this.index);
-		}
-		while (expressions.size() < this.index) {
-			expressions.add(inner.getAST().newNullLiteral());
-		}
-		expressions.add(inner);
-	}
-
-	/**
-	 * Remove the adapter's annotation from the specified array initializer.
-	 */
-	private void removeAnnotation(ModifiedDeclaration declaration, Annotation outer, ArrayInitializer value) {
-		List<Expression> expressions = this.expressions(value);
-		if (this.index >= expressions.size()) {
-			return;  // avoid IndexOutOfBoundsException(?)
-		}
-		Annotation inner = this.annotationValue(expressions.get(this.index));
-		if (inner == null) {
-			return;
-		}
-		if ( ! this.nameMatches(declaration, inner)) {
-			return;
-		}
-		if (this.index == (expressions.size() - 1)) {
-			expressions.remove(this.index);
-		} else {
-			expressions.set(this.index, value.getAST().newNullLiteral());
-		}
-		this.trimExpressions(declaration, outer, expressions);
-	}
-
-	/**
-	 * Strip all the null literals off the end of the specified list of expressions
-	 * and normalize the specified outer annotation.
-	 */
-	private void trimExpressions(ModifiedDeclaration declaration, Annotation outer, List<Expression> expressions) {
-		// start at the end of the list
-		for (int i = expressions.size(); i-- > 0; ) {
-			if (expressions.get(i).getNodeType() == ASTNode.NULL_LITERAL) {
-				expressions.remove(i);
-			} else {
-				break;  // stop with the first non-null literal encountered
-			}
-		}
-		switch (expressions.size()) {
-			case 0:
-				this.removeElementAndNormalize(declaration, outer);
-				break;
-			case 1:
-				this.convertArrayToLastRemainingExpression(outer, expressions.get(0));
-				break;
-			default:
-				break;
-		}
-	}
-
-	/**
-	 * When there is only a single element in an array initializer, convert the
-	 * expression to be just the single element; e.g.
-	 * <pre>
-	 *     &#64;Foo(xxx={"abc"}) => &#64;Foo(xxx="abc")
-	 * or
-	 *     &#64;Foo({"abc"}) => &#64;Foo("abc")
-	 * </pre>
-	 */
-	private void convertArrayToLastRemainingExpression(Annotation outer, Expression lastValue) {
-		lastValue = (Expression) ASTNode.copySubtree(lastValue.getAST(), lastValue);
-		if (outer.isNormalAnnotation()) {
-			this.memberValuePair((NormalAnnotation) outer).setValue(lastValue);
-		} else if (outer.isSingleMemberAnnotation()) {
-			((SingleMemberAnnotation) outer).setValue(lastValue);
-		} else {
-			throw new IllegalArgumentException("unexpected annotation type: " + outer);
-		}
-	}
-
-	/**
-	 * Manipulate the specified expression appropriately.
-	 * If it is an array initializer, add the specified annotation to it.
-	 * If it is not, replace the expression or convert it into an array
-	 * initializer.
-	 */
-	private void modifyExpression(ASTNode node, ExpressionProvider expProvider, Annotation inner) {
-		Expression value = expProvider.getExpression(node);
-		if (value.getNodeType() == ASTNode.ARRAY_INITIALIZER) {
-			// ignore the other entries in the array initializer(?) - they may not be matching Annotations...
-			List<Expression> expressions = this.expressions((ArrayInitializer) value);
-			if (this.index >= expressions.size()) {
-				this.addInnerToExpressions(inner, expressions);
-			} else {
-				expressions.set(this.index, inner);
-			}
-		} else {
-			if (this.index == 0) {
-				// replace whatever was there before
-				expProvider.setExpression(node, inner);
-			} else {
-				// convert to an array
-				ArrayInitializer ai = inner.getAST().newArrayInitializer();
-				List<Expression> expressions = this.expressions(ai);
-				expressions.add((Expression) ASTNode.copySubtree(value.getAST(), value));
-				this.addInnerToExpressions(inner, expressions);
-				expProvider.setExpression(node, ai);
-			}
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	protected List<Expression> expressions(ArrayInitializer ai) {
-		return ai.expressions();
-	}
-
-
-	// ********** expression providers **********
-
-	/**
-	 * define interface that allows us to "re-use" the code in
-	 * #modifyExpression(ASTNode, ExpressionProvider, Annotation)
-	 */
-	private interface ExpressionProvider {
-		Expression getExpression(ASTNode node);
-		void setExpression(ASTNode node, Expression expression);
-	}
-
-	private static final ExpressionProvider MEMBER_VALUE_PAIR_EXPRESSION_PROVIDER = new ExpressionProvider() {
-		public Expression getExpression(ASTNode node) {
-			return ((MemberValuePair) node).getValue();
-		}
-		public void setExpression(ASTNode node, Expression expression) {
-			((MemberValuePair) node).setValue(expression);
-		}
-		@Override
-		public String toString() {
-			return "MemberValuePairExpressionProvider";
-		}
-	};
-
-	private static final ExpressionProvider SINGLE_MEMBER_ANNOTATION_EXPRESSION_PROVIDER = new ExpressionProvider() {
-		public Expression getExpression(ASTNode node) {
-			return ((SingleMemberAnnotation) node).getValue();
-		}
-		public void setExpression(ASTNode node, Expression expression) {
-			((SingleMemberAnnotation) node).setValue(expression);
-		}
-		@Override
-		public String toString() {
-			return "SingleMemberAnnotationExpressionProvider";
-		}
-	};
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NullAnnotationEditFormatter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NullAnnotationEditFormatter.java
deleted file mode 100644
index 3c632f36c3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NullAnnotationEditFormatter.java
+++ /dev/null
@@ -1,42 +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.core.internal.utility.jdt;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jpt.core.utility.jdt.AnnotationEditFormatter;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.TextEdit;
-
-public final class NullAnnotationEditFormatter
-	implements AnnotationEditFormatter
-{
-
-	private static final NullAnnotationEditFormatter INSTANCE = new NullAnnotationEditFormatter();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationEditFormatter instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private NullAnnotationEditFormatter() {
-		super();
-	}
-
-	public void format(IDocument doc, TextEdit editTree) throws MalformedTreeException, BadLocationException {
-		// no formatting
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NullDeclarationAnnotationAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NullDeclarationAnnotationAdapter.java
deleted file mode 100644
index 17ad84b331..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NullDeclarationAnnotationAdapter.java
+++ /dev/null
@@ -1,82 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jpt.core.utility.jdt.IndexedDeclarationAnnotationAdapter;
-import org.eclipse.jpt.core.utility.jdt.ModifiedDeclaration;
-
-/**
- * Behaviorless implementation.
- */
-public final class NullDeclarationAnnotationAdapter
-	implements IndexedDeclarationAnnotationAdapter
-{
-
-	// singleton
-	private static final NullDeclarationAnnotationAdapter INSTANCE = new NullDeclarationAnnotationAdapter();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static IndexedDeclarationAnnotationAdapter instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure non-instantiability.
-	 */
-	private NullDeclarationAnnotationAdapter() {
-		super();
-	}
-
-
-	// ********** DeclarationAnnotationAdapter implementation **********
-
-	public Annotation getAnnotation(ModifiedDeclaration declaration) {
-		return null;
-	}
-
-	public MarkerAnnotation newMarkerAnnotation(ModifiedDeclaration declaration) {
-		return null;
-	}
-
-	public SingleMemberAnnotation newSingleMemberAnnotation(ModifiedDeclaration declaration) {
-		return null;
-	}
-
-	public NormalAnnotation newNormalAnnotation(ModifiedDeclaration declaration) {
-		return null;
-	}
-
-	public void removeAnnotation(ModifiedDeclaration declaration) {
-		// do nothing
-	}
-
-	public ASTNode getAstNode(ModifiedDeclaration declaration) {
-		return declaration.getDeclaration();
-	}
-
-
-	// ********** IndexedDeclarationAnnotationAdapter implementation **********
-
-	public int getIndex() {
-		return -1;
-	}
-
-	public void moveAnnotation(int newIndex, ModifiedDeclaration declaration) {
-		// do nothing
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NullDeclarationAnnotationElementAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NullDeclarationAnnotationElementAdapter.java
deleted file mode 100644
index c53a69546a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NullDeclarationAnnotationElementAdapter.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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.ModifiedDeclaration;
-
-/**
- * Behaviorless implementation.
- */
-public class NullDeclarationAnnotationElementAdapter<T>
-	implements DeclarationAnnotationElementAdapter<T>
-{
-
-	// singleton
-	@SuppressWarnings("unchecked")
-	private static final DeclarationAnnotationElementAdapter INSTANCE
-			= new NullDeclarationAnnotationElementAdapter();
-
-	/**
-	 * Return the singleton.
-	 */
-	@SuppressWarnings("unchecked")
-	public static <S> DeclarationAnnotationElementAdapter<S> instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private NullDeclarationAnnotationElementAdapter() {
-		super();
-	}
-
-	public T getValue(ModifiedDeclaration declaration) {
-		return null;
-	}
-
-	public void setValue(T value, ModifiedDeclaration declaration) {
-		// do nothing
-	}
-
-	public ASTNode getAstNode(ModifiedDeclaration declaration) {
-		return declaration.getDeclaration();
-	}
-
-	public Expression getExpression(ModifiedDeclaration declaration) {
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NullExpressionConverter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NullExpressionConverter.java
deleted file mode 100644
index 803b983910..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NullExpressionConverter.java
+++ /dev/null
@@ -1,54 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jpt.core.utility.jdt.ExpressionConverter;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * No conversion.
- */
-public final class NullExpressionConverter
-	implements ExpressionConverter<Expression>
-{
-
-	// singleton
-	private static final ExpressionConverter<Expression> INSTANCE = new NullExpressionConverter();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static ExpressionConverter<Expression> instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private NullExpressionConverter() {
-		super();
-	}
-
-	public Expression convert(Expression expression, AST ast) {
-		return expression;
-	}
-
-	public Expression convert(Expression expression) {
-		return expression;
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NumberIntegerExpressionConverter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NumberIntegerExpressionConverter.java
deleted file mode 100644
index 526e1fe4aa..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/NumberIntegerExpressionConverter.java
+++ /dev/null
@@ -1,51 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.NumberLiteral;
-import org.eclipse.jpt.core.utility.jdt.ExpressionConverter;
-
-/**
- * Convert a number literal to/from an Integer
- * (e.g. 5).
- */
-public final class NumberIntegerExpressionConverter
-	extends AbstractExpressionConverter<Integer>
-{
-	private static final ExpressionConverter<Integer> INSTANCE = new NumberIntegerExpressionConverter();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static ExpressionConverter<Integer> instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private NumberIntegerExpressionConverter() {
-		super();
-	}
-	
-	@Override
-	protected NumberLiteral convertObject(Integer integer, AST ast) {
-		return ast.newNumberLiteral(integer.toString());
-	}
-
-	@Override
-	protected Integer convertExpression(Expression expression) {
-		Object value = expression.resolveConstantExpressionValue();
-		return (value instanceof Integer) ? ((Integer) value) : null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/PrimitiveTypeStringExpressionConverter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/PrimitiveTypeStringExpressionConverter.java
deleted file mode 100644
index 3f9990680f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/PrimitiveTypeStringExpressionConverter.java
+++ /dev/null
@@ -1,61 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.PrimitiveType;
-import org.eclipse.jdt.core.dom.TypeLiteral;
-import org.eclipse.jpt.core.utility.jdt.ExpressionConverter;
-
-/**
- * Convert a type literal to/from a string representation of a primitive type
- * (e.g. "int").
- */
-public final class PrimitiveTypeStringExpressionConverter
-	extends AbstractExpressionConverter<String>
-{
-	private static final ExpressionConverter<String> INSTANCE = new PrimitiveTypeStringExpressionConverter();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static ExpressionConverter<String> instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private PrimitiveTypeStringExpressionConverter() {
-		super();
-	}
-
-	@Override
-	protected TypeLiteral convertObject(String string, AST ast) {
-		org.eclipse.jdt.core.dom.Type type = ast.newPrimitiveType(PrimitiveType.toCode(string));
-		TypeLiteral typeLiteral = ast.newTypeLiteral();
-		typeLiteral.setType(type);
-		return typeLiteral;
-	}
-
-	@Override
-	protected String convertExpression(Expression expression) {
-		if (expression.getNodeType() == ASTNode.TYPE_LITERAL) {
-			org.eclipse.jdt.core.dom.Type type = ((TypeLiteral) expression).getType();
-			if (type.getNodeType() == ASTNode.PRIMITIVE_TYPE) {
-				return ((PrimitiveType) type).getPrimitiveTypeCode().toString();
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/ShortCircuitAnnotationElementAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/ShortCircuitAnnotationElementAdapter.java
deleted file mode 100644
index 968658eea3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/ShortCircuitAnnotationElementAdapter.java
+++ /dev/null
@@ -1,104 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * Wrap another annotation element adapter and short-circuit the
- * #setValue method if the value has not changed.
- */
-public class ShortCircuitAnnotationElementAdapter<T>
-	implements AnnotationElementAdapter<T>
-{
-	/** the wrapped adapter */
-	private final AnnotationElementAdapter<T> adapter;
-
-
-	// ********** constructor **********
-
-	public ShortCircuitAnnotationElementAdapter(Member member, DeclarationAnnotationElementAdapter<T> daea) {
-		this(new MemberAnnotationElementAdapter<T>(member, daea));
-	}
-
-	public ShortCircuitAnnotationElementAdapter(AnnotationElementAdapter<T> adapter) {
-		super();
-		this.adapter = adapter;
-	}
-
-
-	// ********** AnnotationElementAdapter implementation **********
-
-	public T getValue() {
-		return this.adapter.getValue();
-	}
-
-	public T getValue(CompilationUnit astRoot) {
-		return this.adapter.getValue(astRoot);
-	}
-
-	public void setValue(T value) {
-		this.setValue(this.adapter.getValue(), value);
-	}
-
-	public Expression getExpression(CompilationUnit astRoot) {
-		return this.adapter.getExpression(astRoot);
-	}
-
-	public ASTNode getAstNode(CompilationUnit astRoot) {
-		return this.adapter.getAstNode(astRoot);
-	}
-
-	@Override
-	public String toString() {
-		return StringTools.buildToStringFor(this, this.adapter);
-	}
-
-
-	// ********** internal methods **********
-
-	/**
-	 * set the adapter's value to the specified new value if it
-	 * is different from the specified old value
-	 */
-	protected void setValue(T oldValue, T newValue) {
-		if (oldValue == null) {
-			if (newValue == null) {  // null => null
-				// do nothing
-			} else {  // null => object
-				this.adapter.setValue(newValue);
-			}
-		} else {
-			if (newValue == null) {  // object => null
-				this.adapter.setValue(newValue);
-			} else {  // object => object
-				if (this.valuesAreEqual(oldValue, newValue)) {
-					// do nothing
-				} else {
-					this.adapter.setValue(newValue);
-				}
-			}
-		}
-	}
-
-	/**
-	 * both values are non-null when this method is called
-	 */
-	protected boolean valuesAreEqual(T oldValue, T newValue) {
-		return newValue.equals(oldValue);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/ShortCircuitArrayAnnotationElementAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/ShortCircuitArrayAnnotationElementAdapter.java
deleted file mode 100644
index 1f6cc3881f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/ShortCircuitArrayAnnotationElementAdapter.java
+++ /dev/null
@@ -1,44 +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.core.internal.utility.jdt;
-
-import java.util.Arrays;
-
-import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.core.utility.jdt.Member;
-
-/**
- * Wrap another annotation element adapter and short-circuit the
- * #setValue method if the value has not changed. Overrides #valuesAreEqual()
- * to check equality on arrays
- */
-public class ShortCircuitArrayAnnotationElementAdapter<T>
-	extends ShortCircuitAnnotationElementAdapter<T[]>
-{
-	// ********** constructor **********
-
-	public ShortCircuitArrayAnnotationElementAdapter(Member member, DeclarationAnnotationElementAdapter<T[]> daea) {
-		super(member, daea);
-	}
-
-	public ShortCircuitArrayAnnotationElementAdapter(AnnotationElementAdapter<T[]> adapter) {
-		super(adapter);
-	}
-
-
-	// ********** AnnotationElementAdapter implementation **********
-
-	@Override
-	protected boolean valuesAreEqual(T[] oldValue, T[] newValue) {
-		return Arrays.equals(newValue, oldValue);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/SimpleDeclarationAnnotationAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/SimpleDeclarationAnnotationAdapter.java
deleted file mode 100644
index 16a657437b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/SimpleDeclarationAnnotationAdapter.java
+++ /dev/null
@@ -1,62 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jpt.core.utility.jdt.ModifiedDeclaration;
-
-/**
- * Manipulate an annotation with a specific name, e.g.
- * <pre>
- *     &#64;Foo
- *     private int id;
- * </pre>
- * 
- * NB:
- * If the declaration contains more than one annotation with the same
- * name, the adapter will correspond to the first annotation with the specified
- * name. (Also note that the compiler will not allow a declaration to be
- * modified by multiple annotations with the same name, i.e. of the same type;
- * so if there *are* multiple annotations of the same type, there are bigger
- * problems to worry about than which annotation the adapter manipulates.)
- */
-public class SimpleDeclarationAnnotationAdapter extends AbstractDeclarationAnnotationAdapter {
-
-
-	// ********** constructors **********
-
-	public SimpleDeclarationAnnotationAdapter(String annotationName) {
-		super(annotationName);
-	}
-
-
-	// ********** DeclarationAnnotationAdapter implementation **********
-
-	public Annotation getAnnotation(ModifiedDeclaration declaration) {
-		return declaration.getAnnotationNamed(this.getAnnotationName());
-	}
-
-	public void removeAnnotation(ModifiedDeclaration declaration) {
-		declaration.removeAnnotationNamed(this.getAnnotationName());
-	}
-
-	@Override
-	protected void addAnnotation(ModifiedDeclaration declaration, Annotation annotation) {
-		declaration.replaceAnnotationNamed(this.getAnnotationName(), annotation);
-	}
-
-	public ASTNode getAstNode(ModifiedDeclaration declaration) {
-		// if the annotation is missing, return the declaration
-		Annotation annotation = this.getAnnotation(declaration);
-		return (annotation != null) ? annotation : declaration.getDeclaration();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/SimpleTypeStringExpressionConverter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/SimpleTypeStringExpressionConverter.java
deleted file mode 100644
index f622562554..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/SimpleTypeStringExpressionConverter.java
+++ /dev/null
@@ -1,63 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.SimpleType;
-import org.eclipse.jdt.core.dom.TypeLiteral;
-import org.eclipse.jpt.core.utility.jdt.ExpressionConverter;
-
-/**
- * Convert a type literal to/from a string representation of a simple type
- * (e.g. "java.lang.Object").
- */
-public final class SimpleTypeStringExpressionConverter
-	extends AbstractExpressionConverter<String>
-{
-	private static final ExpressionConverter<String> INSTANCE = new SimpleTypeStringExpressionConverter();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static ExpressionConverter<String> instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private SimpleTypeStringExpressionConverter() {
-		super();
-	}
-
-	@Override
-	protected TypeLiteral convertObject(String string, AST ast) {
-		Name name = ast.newName(string);
-		org.eclipse.jdt.core.dom.Type type = ast.newSimpleType(name);
-		TypeLiteral typeLiteral = ast.newTypeLiteral();
-		typeLiteral.setType(type);
-		return typeLiteral;
-	}
-
-	@Override
-	protected String convertExpression(Expression expression) {
-		if (expression.getNodeType() == ASTNode.TYPE_LITERAL) {
-			org.eclipse.jdt.core.dom.Type type = ((TypeLiteral) expression).getType();
-			if (type.getNodeType() == ASTNode.SIMPLE_TYPE) {
-				return ((SimpleType) type).getName().getFullyQualifiedName();
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/StringArrayExpressionConverter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/StringArrayExpressionConverter.java
deleted file mode 100644
index 35751f6e52..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/StringArrayExpressionConverter.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.core.internal.utility.jdt;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ArrayInitializer;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jpt.core.utility.jdt.ExpressionConverter;
-
-/**
- * Convert an array initializer to/from an array of strings (e.g. {"text0", "text1"}).
- * 
- * Do NOT use this class for converting array initializers in annotation elements.
- * Java5 has a bit of syntactic sugar that allows a single-element array
- * initializer to not have curly braces. This converter will return null if it encounters
- * anything other than an array initializer.
- * 
- * Invalid entries in the array initializer will result in null elements in the
- * resulting string array. This allows clients to manipulate elements at
- * the appropriate index.
- */
-public class StringArrayExpressionConverter
-	extends AbstractExpressionConverter<String[]>
-{
-	private final ExpressionConverter<String> elementConverter;
-	private final boolean removeArrayInitializerWhenEmpty;
-
-	private static final String[] EMPTY_STRING_ARRAY = new String[0];
-
-
-	/**
-	 * The default behavior is to remove the array initializer if it is empty.
-	 */
-	public StringArrayExpressionConverter(ExpressionConverter<String> elementConverter) {
-		this(elementConverter, true);
-	}
-
-	public StringArrayExpressionConverter(ExpressionConverter<String> elementConverter, boolean removeArrayInitializerWhenEmpty) {
-		super();
-		this.elementConverter = elementConverter;
-		this.removeArrayInitializerWhenEmpty = removeArrayInitializerWhenEmpty;
-	}
-
-	@Override
-	/*
-	 * this method is 'public' so it can be called by
-	 * AnnotationStringArrayExpressionConverter
-	 */
-	public ArrayInitializer convertObject(String[] strings, AST ast) {
-		if ((strings.length == 0) && this.removeArrayInitializerWhenEmpty) {
-			return null;
-		}
-		ArrayInitializer arrayInitializer = ast.newArrayInitializer();
-		List<Expression> expressions = this.expressions(arrayInitializer);
-		for (String string : strings) {
-			expressions.add(this.elementConverter.convert(string, ast));
-		}
-		return arrayInitializer;
-	}
-
-	@SuppressWarnings("unchecked")
-	private List<Expression> expressions(ArrayInitializer arrayInitializer) {
-		return arrayInitializer.expressions();
-	}
-
-	/*
-	 * this method is 'public' so it can be called by
-	 * AnnotationStringArrayExpressionConverter
-	 */
-	@Override
-	public String[] convertNull() {
-		return EMPTY_STRING_ARRAY;
-	}
-
-	@Override
-	protected String[] convertExpression(Expression expression) {
-		return (expression.getNodeType() == ASTNode.ARRAY_INITIALIZER) ?
-				this.convertArrayInitializer((ArrayInitializer) expression)
-			:
-				EMPTY_STRING_ARRAY;
-	}
-
-	/*
-	 * this method is 'public' so it can be called by
-	 * AnnotationStringArrayExpressionConverter
-	 */
-	public String[] convertArrayInitializer(ArrayInitializer arrayInitializer) {
-		List<Expression> expressions = this.downcastExpressions(arrayInitializer);
-		int len = expressions.size();
-		String[] strings = new String[len];
-		for (int i = len; i-- > 0; ) {
-			strings[i] = this.elementConverter.convert(expressions.get(i));
-		}
-		return strings;
-	}
-
-	@SuppressWarnings("unchecked")
-	private List<Expression> downcastExpressions(ArrayInitializer arrayInitializer) {
-		return arrayInitializer.expressions();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/StringExpressionConverter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/StringExpressionConverter.java
deleted file mode 100644
index b5fee1e52d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/utility/jdt/StringExpressionConverter.java
+++ /dev/null
@@ -1,52 +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.core.internal.utility.jdt;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jpt.core.utility.jdt.ExpressionConverter;
-
-/**
- * Convert a string literal to/from a string (e.g. "text").
- */
-public final class StringExpressionConverter
-	extends AbstractExpressionConverter<String>
-{
-	private static final ExpressionConverter<String> INSTANCE = new StringExpressionConverter();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static ExpressionConverter<String> instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private StringExpressionConverter() {
-		super();
-	}
-
-	@Override
-	protected StringLiteral convertObject(String string, AST ast) {
-		StringLiteral stringLiteral = ast.newStringLiteral();
-		stringLiteral.setLiteralValue(string);
-		return stringLiteral;
-	}
-
-	@Override
-	protected String convertExpression(Expression expression) {
-		Object value = expression.resolveConstantExpressionValue();
-		return (value instanceof String) ? (String) value : null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/DefaultJpaValidationMessages.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/DefaultJpaValidationMessages.java
deleted file mode 100644
index 7c614af0c7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/DefaultJpaValidationMessages.java
+++ /dev/null
@@ -1,62 +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.core.internal.validation;
-
-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 DefaultJpaValidationMessages
-	implements JpaValidationMessages
-{	
-	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 Message(BUNDLE, 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("The textRange is null for messageId: " + messageId));
-		}
-		else {
-			message.setLineNo(textRange.getLineNumber());
-			message.setOffset(textRange.getOffset());
-			message.setLength(textRange.getLength());
-		}
-		return message;
-	}
-	
-	
-	private DefaultJpaValidationMessages() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaHelper.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaHelper.java
deleted file mode 100644
index 7789238c30..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaHelper.java
+++ /dev/null
@@ -1,32 +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.core.internal.validation;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jpt.core.JpaNode;
-
-public class JpaHelper extends org.eclipse.wst.validation.internal.operations.WorkbenchContext {
-
-	@Override
-	public IResource getResource(Object obj) {
-		return ((JpaNode) obj).getResource();
-	}
-
-	/*
-	 * This is used when no line number is set.  We generally use line numbers.
-	 * Therefore, when this is called, we will use the default location, i.e.
-	 * null.
-	 */
-	@Override
-	public String getLocation(Object object) {
-		return null;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaValidationMessages.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaValidationMessages.java
deleted file mode 100644
index baf203b64d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaValidationMessages.java
+++ /dev/null
@@ -1,137 +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.core.internal.validation;
-
-public interface JpaValidationMessages
-{
-	public static final String BUNDLE = "jpa_validation";
-	
-	
-	public static final String PROJECT_NO_CONNECTION = "PROJECT_NO_CONNECTION";
-	
-	public static final String PROJECT_INVALID_CONNECTION = "PROJECT_INVALID_CONNECTION";
-	
-	public static final String PROJECT_INACTIVE_CONNECTION = "PROJECT_INACTIVE_CONNECTION";
-	
-	public static final String PROJECT_NO_PERSISTENCE_XML = "PROJECT_NO_PERSISTENCE_XML";
-	
-	public static final String PROJECT_MULTIPLE_PERSISTENCE_XML = "PROJECT_MULTIPLE_PERSISTENCE_XML";
-	
-	public static final String PERSISTENCE_XML_INVALID_CONTENT = "PERSISTENCE_XML_INVALID_CONTENT";
-	
-	public static final String PERSISTENCE_NO_PERSISTENCE_UNIT = "PERSISTENCE_NO_PERSISTENCE_UNIT";
-
-	public static final String PERSISTENCE_MULTIPLE_PERSISTENCE_UNITS = "PERSISTENCE_MULTIPLE_PERSISTENCE_UNITS";
-
-	public static final String PERSISTENCE_UNIT_UNSPECIFIED_MAPPING_FILE = "PERSISTENCE_UNIT_UNSPECIFIED_MAPPING_FILE";
-	
-	public static final String PERSISTENCE_UNIT_NONEXISTENT_MAPPING_FILE = "PERSISTENCE_UNIT_NONEXISTENT_MAPPING_FILE";
-
-	public static final String PERSISTENCE_UNIT_INVALID_MAPPING_FILE = "PERSISTENCE_UNIT_INVALID_MAPPING_FILE";
-	
-	public static final String PERSISTENCE_UNIT_DUPLICATE_MAPPING_FILE = "PERSISTENCE_UNIT_DUPLICATE_MAPPING_FILE";
-	
-	public static final String PERSISTENCE_UNIT_UNSPECIFIED_CLASS = "PERSISTENCE_UNIT_UNSPECIFIED_CLASS";
-	
-	public static final String PERSISTENCE_UNIT_NONEXISTENT_CLASS = "PERSISTENCE_UNIT_NONEXISTENT_CLASS";
-	
-	public static final String PERSISTENCE_UNIT_INVALID_CLASS = "PERSISTENCE_UNIT_INVALID_CLASS";
-	
-	public static final String PERSISTENCE_UNIT_DUPLICATE_CLASS = "PERSISTENCE_UNIT_DUPLICATE_CLASS";
-	
-	public static final String PERSISTENCE_UNIT_REDUNDANT_CLASS = "PERSISTENCE_UNIT_REDUNDANT_CLASS";
-	
-	public static final String GENERATOR_DUPLICATE_NAME = "GENERATOR_DUPLICATE_NAME";
-	
-	public static final String QUERY_DUPLICATE_NAME = "QUERY_DUPLICATE_NAME";
-	
-	public static final String ENTITY_MAPPINGS_MULTIPLE_METADATA = "ENTITY_MAPPINGS_MULTIPLE_METADATA";
-	
-	public static final String PERSISTENT_TYPE_UNSPECIFIED_CONTEXT = "PERSISTENT_TYPE_UNSPECIFIED_CONTEXT";
-	
-	public static final String PERSISTENT_TYPE_UNSPECIFIED_CLASS = "PERSISTENT_TYPE_UNSPECIFIED_CLASS";
-	
-	public static final String PERSISTENT_TYPE_UNRESOLVED_CLASS = "PERSISTENT_TYPE_UNRESOLVED_CLASS";
-	
-	public static final String ENTITY_NO_ID = "ENTITY_NO_ID";
-	
-	public static final String PERSISTENT_ATTRIBUTE_UNSPECIFIED_NAME = "PERSISTENT_ATTRIBUTE_UNSPECIFIED_NAME";
-	
-	public static final String PERSISTENT_ATTRIBUTE_UNRESOLVED_NAME = "PERSISTENT_ATTRIBUTE_UNRESOLVED_NAME";
-	
-	public static final String PERSISTENT_ATTRIBUTE_FINAL_FIELD = "PERSISTENT_ATTRIBUTE_FINAL_FIELD";
-	
-	public static final String PERSISTENT_ATTRIBUTE_PUBLIC_FIELD = "PERSISTENT_ATTRIBUTE_PUBLIC_FIELD";
-	
-	public static final String PERSISTENT_ATTRIBUTE_INVALID_MAPPING = "PERSISTENT_ATTRIBUTE_INVALID_MAPPING";
-	
-	public static final String MAPPING_UNRESOLVED_MAPPED_BY = "MAPPING_UNRESOLVED_MAPPED_BY";
-	
-	public static final String MAPPING_INVALID_MAPPED_BY = "MAPPING_INVALID_MAPPED_BY";
-	
-	public static final String MAPPING_MAPPED_BY_WITH_JOIN_TABLE = "MAPPING_MAPPED_BY_WITH_JOIN_TABLE";
-	
-	public static final String MAPPING_MAPPED_BY_ON_BOTH_SIDES = "MAPPING_MAPPED_BY_ON_BOTH_SIDES";
-	
-	public static final String ID_MAPPING_UNRESOLVED_GENERATOR_NAME = "ID_MAPPING_UNRESOLVED_GENERATOR_NAME";
-	
-	public static final String TABLE_UNRESOLVED_SCHEMA = "TABLE_UNRESOLVED_SCHEMA";
-	
-	public static final String TABLE_UNRESOLVED_NAME = "TABLE_UNRESOLVED_NAME";
-	
-	public static final String SECONDARY_TABLE_UNRESOLVED_SCHEMA = "SECONDARY_TABLE_UNRESOLVED_SCHEMA";
-	
-	public static final String SECONDARY_TABLE_UNRESOLVED_NAME = "SECONDARY_TABLE_UNRESOLVED_NAME";
-
-	public static final String JOIN_TABLE_UNRESOLVED_SCHEMA = "JOIN_TABLE_UNRESOLVED_SCHEMA";
-	
-	public static final String VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_SCHEMA = "VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_SCHEMA";
-	
-	public static final String JOIN_TABLE_UNRESOLVED_NAME = "JOIN_TABLE_UNRESOLVED_NAME";
-	
-	public static final String VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_NAME = "VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_NAME";
-	
-	public static final String COLUMN_UNRESOLVED_TABLE = "COLUMN_UNRESOLVED_TABLE";
-	
-	public static final String VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_TABLE = "VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_TABLE";
-	
-	public static final String VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_TABLE = "VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_TABLE";
-	
-	public static final String COLUMN_UNRESOLVED_NAME = "COLUMN_UNRESOLVED_NAME";
-	
-	public static final String VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_NAME = "VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_NAME";
-	
-	public static final String VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_NAME = "VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_NAME";
-	
-	public static final String JOIN_COLUMN_UNRESOLVED_TABLE = "JOIN_COLUMN_UNRESOLVED_TABLE";
-	
-	public static final String VIRTUAL_ATTRIBUTE_JOIN_COLUMN_UNRESOLVED_TABLE = "VIRTUAL_ATTRIBUTE_JOIN_COLUMN_UNRESOLVED_TABLE";
-	
-	public static final String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_UNRESOLVED_TABLE = "VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_UNRESOLVED_TABLE";
-	
-	public static final String JOIN_COLUMN_UNRESOLVED_NAME = "JOIN_COLUMN_UNRESOLVED_NAME";
-	
-	public static final String VIRTUAL_ATTRIBUTE_JOIN_COLUMN_UNRESOLVED_NAME = "VIRTUAL_ATTRIBUTE_JOIN_COLUMN_UNRESOLVED_NAME";
-	
-	public static final String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_UNRESOLVED_NAME = "VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_UNRESOLVED_NAME";
-	
-	public static final String JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME = "JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME";
-	
-	public static final String VIRTUAL_ATTRIBUTE_JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME = "VIRTUAL_ATTRIBUTE_JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME";
-
-	public static final String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME = "VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME";
-	
-	public static final String GENERATED_VALUE_UNRESOLVED_GENERATOR = "GENERATED_VALUE_UNRESOLVED_GENERATOR";
-	
-	public static final String PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_NAME = "PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_NAME";
-	
-	public static final String PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_REFERENCED_COLUMN_NAME = "PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_REFERENCED_COLUMN_NAME";
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaValidator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaValidator.java
deleted file mode 100644
index 508c1d2615..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaValidator.java
+++ /dev/null
@@ -1,154 +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.core.internal.validation;
-
-import java.util.Iterator;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jpt.core.JpaModel;
-import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
-import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IProjectValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-/**
- * This class is referenced in the JPA extension for the
- * WTP validator extension point.
- */
-public class JpaValidator implements IValidatorJob {
-
-
-	// ********** IValidator implementation **********
-
-	public void validate(IValidationContext context, IReporter reporter) throws ValidationException {
-		reporter.removeAllMessages(this);
-
-		for (Iterator<IMessage> stream = this.validationMessages(context); stream.hasNext(); ) {
-			reporter.addMessage(this, stream.next());
-		}
-	}
-
-	private Iterator<IMessage> validationMessages(IValidationContext context) {
-		IProject project = ((IProjectValidationContext) context).getProject();
-		return JptCorePlugin.getJpaProject(project).validationMessages();
-	}
-
-	public void cleanup(IReporter reporter) {
-		// nothing to do
-	}
-
-
-	// ********** IValidatorJob implementation **********
-
-	public ISchedulingRule getSchedulingRule(IValidationContext context) {
-		// don't know what to return here.  my guess is that we want to return
-		// the resource that is possibly being changed during our validation,
-		// and since many resources in the project may be changed during this
-		// validation, returning the project makes the most sense.
-		return ((IWorkbenchContext) context).getProject();
-	}
-
-	public IStatus validateInJob(IValidationContext context, IReporter reporter) throws ValidationException {
-		if (reporter.isCancelled()) {
-			return Status.CANCEL_STATUS;
-		}
-		this.validate(context, reporter);
-		return OK_STATUS;
-	}
-
-
-	// ********** marker clean-up **********
-
-	private static final CollectionChangeListener JPA_MODEL_LISTENER = new LocalCollectionChangeListener();
-
-	static {
-		JptCorePlugin.getJpaModel().addCollectionChangeListener(JpaModel.JPA_PROJECTS_COLLECTION, JPA_MODEL_LISTENER);
-	}
-
-	/**
-	 * When a JPA project is removed this listener will schedule a job to
-	 * remove all the markers associated with the JPA project.
-	 */
-	private static class LocalCollectionChangeListener implements CollectionChangeListener {
-
-		LocalCollectionChangeListener() {
-			super();
-		}
-
-		public void itemsAdded(CollectionChangeEvent event) {
-			// ignore
-		}
-
-		/**
-		 * For now, we expect JPA projects to be removed one at a time.
-		 */
-		public void itemsRemoved(CollectionChangeEvent event) {
-			@SuppressWarnings("unchecked")
-			Iterator<JpaProject> items = (Iterator<JpaProject>) event.items();
-			Job j = new DeleteMarkersJob(items.next());
-			j.schedule();
-			if (items.hasNext()) {
-				throw new UnsupportedOperationException("unexpected event");
-			}
-		}
-
-		public void collectionCleared(CollectionChangeEvent event) {
-			throw new UnsupportedOperationException("unexpected event");
-		}
-
-		public void collectionChanged(CollectionChangeEvent event) {
-			throw new UnsupportedOperationException("unexpected event");
-		}
-
-	}
-
-	/**
-	 * Delete all the markers associated with the specified JPA project.
-	 */
-	private static class DeleteMarkersJob extends Job {
-		private final JpaProject jpaProject;
-
-		DeleteMarkersJob(JpaProject jpaProject) {
-			super("Delete Markers");
-			this.jpaProject = jpaProject;
-		}
-
-		@Override
-		protected IStatus run(IProgressMonitor monitor) {
-			IProject project = this.jpaProject.getProject();
-			if (project.isOpen()) {//no need to remove markers if project has been closed
-				try {
-					IMarker[] markers = project.findMarkers(JptCorePlugin.VALIDATION_MARKER_ID, true, IResource.DEPTH_INFINITE);
-					ResourcesPlugin.getWorkspace().deleteMarkers(markers);
-				} catch (CoreException ex) {
-					JptCorePlugin.log(ex);  // not much else we can do
-				}
-			}
-			return Status.OK_STATUS;
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/AbstractJpaEObject.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/AbstractJpaEObject.java
deleted file mode 100644
index 0336a88400..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/AbstractJpaEObject.java
+++ /dev/null
@@ -1,255 +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.core.resource.common;
-
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Set;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jpt.core.utility.AbstractTextRange;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.internal.ClassTools;
-import org.eclipse.wst.common.internal.emf.resource.EMF2DOMAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Node;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml EObject</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.core.resource.common.CommonPackage#getXmlEObject()
- * @model kind="class" abstract="true"
- * @generated
- */
-public abstract class AbstractJpaEObject extends EObjectImpl implements JpaEObject
-{
-	protected IDOMNode node;
-	
-	/**
-	 * Sets of "insignificant" feature ids, keyed by class.
-	 * This is built up lazily, as the objects are modified.
-	 */
-	private static final Map<Class<? extends AbstractJpaEObject>, Set<Integer>> insignificantFeatureIdSets = new Hashtable<Class<? extends AbstractJpaEObject>, Set<Integer>>();
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AbstractJpaEObject() {
-		super();
-	}
-	
-	
-	// **************** IJpaEObject implementation *****************************
-		
-	public IResource getPlatformResource() {
-		return getResource().getFile();
-	}
-	
-	public JpaXmlResource getResource() {
-		return (JpaXmlResource) eResource();
-	}
-	
-	/*
-	 * Must be overridden by actual root object to return itself
-	 */
-	public JpaEObject getRoot() {
-		return ((JpaEObject) eContainer()).getRoot();
-		
-	}
-	
-	
-	// **************** change notification ************************************
-	
-	/**
-	 * override to prevent notification when the object's state is unchanged
-	 */
-	@Override
-	public void eNotify(Notification notification) {
-		if (!notification.isTouch()) {
-			super.eNotify(notification);
-			this.featureChanged(notification.getFeatureID(this.getClass()));
-		}
-	}
-	
-	protected void featureChanged(int featureId) {
-		if (this.featureIsSignificant(featureId)) { 
-			getResource().resourceChanged();
-		}
-	}
-	
-	protected boolean featureIsSignificant(int featureId) {
-		return ! this.featureIsInsignificant(featureId);
-	}
-	
-	protected boolean featureIsInsignificant(int featureId) {
-		return this.insignificantFeatureIds().contains(new Integer(featureId));
-	}
-	
-	/**
-	 * Return a set of the object's "insignificant" feature ids.
-	 * These are the EMF features that will not be used to determine if all
-	 * the features are unset.  We use this to determine when to remove 
-	 * an element from the xml.
-	 * 
-	 * If you need instance-based calculation of your xml "insignificant" aspects,
-	 * override this method. If class-based calculation is sufficient,
-	 * override #addInsignificantXmlFeatureIdsTo(Set).
-	 * 
-	 * @see isAllFeaturesUnset()
-	 */
-	protected Set<Integer> insignificantFeatureIds() {
-		synchronized (insignificantFeatureIdSets) {
-			Set<Integer> insignificantXmlFeatureIds = insignificantFeatureIdSets.get(this.getClass());
-			if (insignificantXmlFeatureIds == null) {
-				insignificantXmlFeatureIds = new HashSet<Integer>();
-				this.addInsignificantXmlFeatureIdsTo(insignificantXmlFeatureIds);
-				insignificantFeatureIdSets.put(this.getClass(), insignificantXmlFeatureIds);
-			}
-			return insignificantXmlFeatureIds;
-		}
-	}
-	
-	/**
-	 * Add the object's "insignificant" feature ids to the specified set.
-	 * These are the EMF features that, when they change, will NOT cause the
-	 * object (or its containing tree) to be resynched, i.e. defaults calculated.
-	 * If class-based calculation of your "insignificant" features is sufficient,
-	 * override this method. If you need instance-based calculation,
-	 * override #insignificantXmlFeatureIds().
-	 */
-	protected void addInsignificantXmlFeatureIdsTo(Set<Integer> insignificantXmlFeatureIds) {
-	// when you override this method, don't forget to include:
-	//	super.addInsignificantXmlFeatureIdsTo(insignificantXmlFeatureIds);
-	}
-	
-	
-	// *************************************************************************
-	
-	public boolean isAllFeaturesUnset() {
-		for (EStructuralFeature feature : eClass().getEAllStructuralFeatures()) {
-			if (eIsSet(feature)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	@Override
-	public EList<Adapter> eAdapters() {
-		if (this.eAdapters == null) {
-			this.eAdapters = new XmlEAdapterList<Adapter>(this);
-		}
-		return this.eAdapters;
-	}
-
-	public IDOMNode getNode() {
-		return this.node;
-	}
-
-
-	protected class XmlEAdapterList<E extends Object & Adapter> extends EAdapterList<E>
-	{
-		public XmlEAdapterList(Notifier notifier) {
-			super(notifier);
-		}
-
-		@Override
-		protected void didAdd(int index, E newObject) {
-			super.didAdd(index, newObject);
-			try {
-				node = (IDOMNode) ClassTools.executeMethod(newObject, "getNode");
-			}
-			catch (RuntimeException re) {
-				// nothing to do
-			}
-		}
-
-		@Override
-		protected void didRemove(int index, E oldObject) {
-			super.didRemove(index, oldObject);
-			if ((oldObject instanceof EMF2DOMAdapter) && (((EMF2DOMAdapter) oldObject).getNode() == AbstractJpaEObject.this.node)) {
-				AbstractJpaEObject.this.node = null;
-			}
-		}
-	}
-	
-	public TextRange getValidationTextRange() {
-		return getFullTextRange();
-	}
-	
-	public TextRange getSelectionTextRange() {
-		return getFullTextRange();
-	}
-	
-	public TextRange getFullTextRange() {
-		return buildTextRange(this.node);
-	}
-	
-	protected TextRange buildTextRange(IDOMNode domNode) {
-		if (domNode == null) {
-			return null;
-		}
-		return new DOMNodeTextRange(domNode);
-	}
-	
-	public boolean containsOffset(int textOffset) {
-		if (node == null) {
-			return false;
-		}
-		return node.contains(textOffset);
-	}
-	
-	/**
-	 * Adapt an IDOMNode to the TextRange interface.
-	 */
-	private static class DOMNodeTextRange extends AbstractTextRange
-	{
-		private final IDOMNode node;
-
-		DOMNodeTextRange(IDOMNode node) {
-			super();
-			this.node = node;
-		}
-
-		public int getOffset() {
-			return this.node.getStartOffset();
-		}
-
-		public int getLength() {
-			if (this.node.getNodeType() == Node.ELEMENT_NODE) {
-				return ((IDOMElement) this.node).getStartEndOffset() - this.node.getStartOffset();
-			}
-			return this.node.getLength();
-		}
-
-		public int getLineNumber() {
-			return this.node.getStructuredDocument().getLineOfOffset(getOffset()) + 1;
-		}
-
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaArtifactEdit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaArtifactEdit.java
deleted file mode 100644
index f021d99116..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaArtifactEdit.java
+++ /dev/null
@@ -1,44 +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.core.resource.common;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JpaArtifactEdit extends ArtifactEdit
-{
-	public JpaArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) 
-			throws IllegalArgumentException {
-		super(aProject, toAccessAsReadOnly);
-	}
-	
-	
-	/**
-	 * @return a resource for the given file
-	 */
-	public abstract JpaXmlResource getResource(IFile file);
-	
-	/**
-	 * @param deployURI - this must be in a deployment relevant form 
-	 * 	(e.g "META-INF/persistence.xml" instead of "src/META-INF/persistence.xml")
-	 * @return a resource for the given deployment file URI
-	 */
-	public abstract JpaXmlResource getResource(String deployURI);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaEObject.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaEObject.java
deleted file mode 100644
index b65523dc82..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaEObject.java
+++ /dev/null
@@ -1,61 +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.core.resource.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-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.
- */
-public interface JpaEObject extends EObject
-{
-	/**
-	 * Return the resource that most directly contains this object
-	 */
-	IResource getPlatformResource();
-	
-	/**
-	 * Return the JpaXmlResource containing this object.
-	 */
-	JpaXmlResource getResource();
-	
-	/**
-	 * Return the root object of the model
-	 */
-	JpaEObject getRoot();
-	
-	/**
-	 * Return true if this object's text representation contains the text offset
-	 */
-	boolean containsOffset(int textOffset);
-	
-	/**
-	 * Return the text range to be used for validation.  This is the source
-	 * range that will be highlighted for a validation error.
-	 */
-	TextRange getValidationTextRange();
-	
-	/**
-	 * Return the text range to be used for selection.  This is the source
-	 * range that will be highlighted when selecting in the structure view.
-	 */
-	TextRange getSelectionTextRange();
-	
-	
-	boolean isAllFeaturesUnset();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaXmlResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaXmlResource.java
deleted file mode 100644
index cfee949099..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaXmlResource.java
+++ /dev/null
@@ -1,163 +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.core.resource.common;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-import org.eclipse.jpt.core.ResourceModelListener;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceImpl;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JpaXmlResource extends TranslatorResourceImpl
-{
-	protected JpaXmlResourceModel resourceModel;
-	
-	protected final Collection<ResourceModelListener> resourceModelListeners;
-	
-	
-	protected JpaXmlResource(Renderer aRenderer) {
-		super(aRenderer);
-		this.resourceModelListeners = new ArrayList<ResourceModelListener>();
-	}
-	
-	protected JpaXmlResource(URI uri, Renderer aRenderer) {
-		super(uri, aRenderer);
-		this.resourceModelListeners = new ArrayList<ResourceModelListener>();
-	}
-	
-	/**
-	 * override to prevent notification when the object's state is unchanged
-	 */
-	@Override
-	public void eNotify(Notification notification) {
-		if (!notification.isTouch() && isLoaded()) {
-			super.eNotify(notification);
-			resourceChanged();
-		}
-	}
-
-	/**
-	 * @see TranslatorResourceImpl#getDefaultPublicId() 
-	 */
-	@Override
-	protected String getDefaultPublicId() {
-		return null;
-		// only applicable for DTD-based files
-	}
-	
-	/**
-	 * @see TranslatorResourceImpl#getDefaultSystemId() 
-	 */
-	@Override
-	protected String getDefaultSystemId() {
-		return null;
-		// only applicable for DTD-based files
-	}
-	
-	/**
-	 * @see TranslatorResourceImpl#getDefaultVersionId() 
-	 */
-	@Override
-	protected int getDefaultVersionID() {
-		return 10;
-		// this seems to be the default version of the spec for this doc
-		// and the id 10 maps to the version 1.0
-	}
-	
-	/**
-	 * @see TranslatorResource#getDoctype() 
-	 */
-	public String getDoctype() {
-		return null;
-		// only applicable for DTD-based files
-	}
-	
-	public IFile getFile() {
-		IFile file = null;
-		file = getFile(getURI());
-		if (file == null) {
-			if (getResourceSet() != null) {
-				URIConverter converter = getResourceSet().getURIConverter();
-				URI convertedUri = converter.normalize(getURI());
-				if (! getURI().equals(convertedUri)) {
-					file = getFile(convertedUri);
-				}
-			}
-		}
-		return file;
-	}
-	
-	/**
-	 * Return the IFile for the <code>uri</code> within the Workspace. This URI is assumed to be
-	 * absolute in the following format: platform:/resource/....
-	 */
-	private IFile getFile(URI uri) {
-		if (WorkbenchResourceHelperBase.isPlatformResourceURI(uri)) {
-			String fileString = URI.decode(uri.path());
-			fileString = fileString.substring(JEMUtilPlugin.PLATFORM_RESOURCE.length() + 1);
-			return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fileString));
-		}
-		return null;
-	}
-	
-	public boolean exists() {
-		return getFile().exists();
-	}
-	
-	public abstract void javaElementChanged(ElementChangedEvent event);
-	
-	public abstract void updateFromResource();
-	
-	public JpaXmlResourceModel getResourceModel() {
-		return this.resourceModel;
-	}
-	
-	public void setResourceModel(JpaXmlResourceModel resourceModel) {
-		this.resourceModel = resourceModel;
-	}
-	
-	public void resourceChanged() {
-		for (ResourceModelListener listener : this.resourceModelListeners) {
-			listener.resourceModelChanged();
-		}
-	}
-	
-	public void addResourceModelChangeListener(ResourceModelListener listener) {
-		if (listener == null) {
-			throw new IllegalArgumentException("Listener cannot be null");
-		}
-		this.resourceModelListeners.add(listener);
-	}
-	
-	public void removeResourceModelChangeListener(ResourceModelListener listener) {
-		if (!this.resourceModelListeners.contains(listener)) {
-			throw new IllegalArgumentException("Listener " + listener + " was never added");		
-		}
-		this.resourceModelListeners.add(listener);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaXmlResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaXmlResourceModel.java
deleted file mode 100644
index 42fabbd300..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaXmlResourceModel.java
+++ /dev/null
@@ -1,118 +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.core.resource.common;
-
-import java.io.IOException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.ResourceModelListener;
-import org.eclipse.jpt.core.internal.AbstractResourceModel;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JpaXmlResourceModel extends AbstractResourceModel
-{
-	protected JpaArtifactEdit artifactEdit;
-	
-	protected JpaXmlResource resource;
-	
-	
-	protected JpaXmlResourceModel(IFile file) {
-		super(file);
-		this.artifactEdit = buildArtifactEdit(file.getProject());
-		this.resource = this.artifactEdit.getResource(file);
-		this.resource.setResourceModel(this);
-		this.artifactEdit.addListener(buildReloadListener(this.resource));
-	}
-	
-	
-	protected abstract JpaArtifactEdit buildArtifactEdit(IProject project);
-	
-	private EditModelListener buildReloadListener(JpaXmlResource resource) {
-		return new ReloadListener(resource);
-	}
-	
-	public JpaXmlResource getResource() {
-		return this.resource;
-	}
-	
-	public void javaElementChanged(ElementChangedEvent event) {
-		this.resource.javaElementChanged(event);
-	}
-
-	public void updateFromResource() {
-		this.resource.updateFromResource();
-	}
-	
-	public void addResourceModelChangeListener(ResourceModelListener listener) {
-		this.resource.addResourceModelChangeListener(listener);
-	}
-	
-	public void removeResourceModelChangeListener(ResourceModelListener listener) {
-		this.resource.removeResourceModelChangeListener(listener);
-	}
-	
-	@Override
-	public void dispose() {
-		super.dispose();
-		this.artifactEdit.dispose();
-	}
-	
-	public void resolveTypes() {
-		//nothing to do here, JavaResourceModel needs this
-	}
-	
-	private class ReloadListener implements EditModelListener
-	{
-		final JpaXmlResource resource;
-		
-		
-		ReloadListener(JpaXmlResource resource) {
-			super();
-			this.resource = resource;
-		}
-		
-		
-		public void editModelChanged(EditModelEvent anEvent) {
-			switch (anEvent.getEventCode()) {
-				case EditModelEvent.UNLOADED_RESOURCE :
-					if (anEvent.getChangedResources().contains(resource)
-							&& ! resource.isLoaded()) {
-						try {
-							resource.load(resource.getResourceSet().getLoadOptions());
-						}
-						catch (IOException ioe) {
-							JptCorePlugin.log(ioe);
-						}
-					}
-					break;
-				case EditModelEvent.REMOVED_RESOURCE :
-					if (anEvent.getChangedResources().contains(resource)) {
-						anEvent.getEditModel().removeListener(this);
-					}
-					break;
-//				case EditModelEvent.SAVE :
-//				case EditModelEvent.PRE_DISPOSE :				
-			}
-			
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AccessType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AccessType.java
deleted file mode 100644
index b37146038a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AccessType.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.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.
- */
-public enum AccessType {
-
-	PROPERTY,
-	FIELD;
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Annotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Annotation.java
deleted file mode 100644
index 7e115e6bac..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Annotation.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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 Annotation extends JavaResourceNode
-{	
-	/**
-	 * Return the fully qualified annotation name.
-	 * @see JPA
-	 */
-	String getAnnotationName();
-	
-	org.eclipse.jdt.core.dom.Annotation getJdtAnnotation(CompilationUnit astRoot);
-	
-	/**
-	 * Removing the underyling Java annotation
-	 */
-	void removeAnnotation();
-
-	/**
-	 * Create and add Java annotation
-	 */
-	void newAnnotation();
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AnnotationDefinition.java
deleted file mode 100644
index 27ab383aa2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AnnotationDefinition.java
+++ /dev/null
@@ -1,42 +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.core.resource.java;
-
-import org.eclipse.jpt.core.utility.jdt.Member;
-
-/**
- * Used for building new Annotations. 
- * These should be used to define non-mapping annotations.  If you
- * want to provide new AnnotationDefinitions you will need
- * to create a new JpaPlatform by extending GenericJpaPlatform.
- * 
- * @see MappingAnnotation
- * @see org.eclipse.jpt.core.internal.platform.GenericJpaPlatform
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 AnnotationDefinition
-{
-	/**
-	 * Return the fully qualified annotation name
-	 */
-	String getAnnotationName();
-	
-	/**
-	 * Build and return an Annotation given the Member
-	 */
-	Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member);
-	
-	Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AssociationOverrideAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AssociationOverrideAnnotation.java
deleted file mode 100644
index ac978cd63c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AssociationOverrideAnnotation.java
+++ /dev/null
@@ -1,47 +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.core.resource.java;
-
-import java.util.ListIterator;
-
-/**
- * Corresponds to the javax.persistence.AssociationOverride 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.
- */
-public interface AssociationOverrideAnnotation extends OverrideAnnotation
-{
-	String ANNOTATION_NAME = JPA.ASSOCIATION_OVERRIDE;
-
-	
-	/**
-	 * Corresponds to the joinColumns element of the AssociationOverride annotation.
-	 * Returns an empty iterator if the joinColumns element does not exist in java.
-	 */
-	ListIterator<JoinColumnAnnotation> joinColumns();
-	
-	JoinColumnAnnotation joinColumnAt(int index);
-	
-	int indexOfJoinColumn(JoinColumnAnnotation joinColumn);
-	
-	int joinColumnsSize();
-
-	JoinColumnAnnotation addJoinColumn(int index);
-	
-	void removeJoinColumn(int index);
-	
-	void moveJoinColumn(int targetIndex, int sourceIndex);
-	
-		String JOIN_COLUMNS_LIST = "joinColumnsList";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AssociationOverridesAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AssociationOverridesAnnotation.java
deleted file mode 100644
index 654987c5aa..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AssociationOverridesAnnotation.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.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.
- */
-public interface AssociationOverridesAnnotation extends ContainerAnnotation<NestableAssociationOverride>
-{
-	String ANNOTATION_NAME = JPA.ASSOCIATION_OVERRIDES;
-
-	String ASSOCIATION_OVERRIDES_LIST = "associationOveridesList";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AttributeOverrideAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AttributeOverrideAnnotation.java
deleted file mode 100644
index c9eaa5bd35..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AttributeOverrideAnnotation.java
+++ /dev/null
@@ -1,45 +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.core.resource.java;
-
-/**
- * Corresponds to the javax.persistence.AttributeOverride 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.
- */
-public interface AttributeOverrideAnnotation extends OverrideAnnotation
-{
-	String ANNOTATION_NAME = JPA.ATTRIBUTE_OVERRIDE;
-		
-	/**
-	 * Corresponds to the column element of the AttributeOverride annotation.
-	 * Returns null if the column element does not exist in java.
-	 */
-	ColumnAnnotation getColumn();
-	
-	/**
-	 * Add the column element to the AttributeOverride annotation.
-	 */
-	ColumnAnnotation addColumn();
-	
-	/**
-	 * Remove the column element from the AttributeOverride annotation.
-	 */
-	void removeColumn();
-	
-	ColumnAnnotation getNonNullColumn();
-	
-	String COLUMN_PROPERTY = "columnProperty";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AttributeOverridesAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AttributeOverridesAnnotation.java
deleted file mode 100644
index a5903652cd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AttributeOverridesAnnotation.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.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.
- */
-public interface AttributeOverridesAnnotation extends ContainerAnnotation<NestableAttributeOverride>
-{
-	String ANNOTATION_NAME = JPA.ATTRIBUTE_OVERRIDES;
-
-	String ATTRIBUTE_OVERRIDES_LIST = "attributeOverridesList";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/BaseColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/BaseColumnAnnotation.java
deleted file mode 100644
index fc4466bac8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/BaseColumnAnnotation.java
+++ /dev/null
@@ -1,129 +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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.
- */
-public interface BaseColumnAnnotation extends NamedColumnAnnotation
-{
-
-	/**
-	 * Corresponds to the unique element of the *Column annotation.
-	 * Returns null if the unique valuePair does not exist in the annotation
-	 */
-	Boolean getUnique();
-	
-	/**
-	 * Corresponds to the unique element of the *Column annotation.
-	 * Set to null to remove the unique valuePair from the annotation
-	 */
-	void setUnique(Boolean unique);	
-		String UNIQUE_PROPERTY = "uniqueProperty";
-	
-	/**
-	 * Corresponds to the nullable element of the *Column annotation.
-	 * Returns null if the nullable valuePair does not exist in the annotation
-	 */
-	Boolean getNullable();
-	
-	/**
-	 * Corresponds to the nullable element of the *Column annotation.
-	 * Set to null to remove the nullable valuePair from the annotation
-	 */
-	void setNullable(Boolean nullable);
-		String NULLABLE_PROPERTY = "nullableProperty";
-	
-	/**
-	 * Corresponds to the insertable element of the *Column annotation.
-	 * Returns null if the insertable valuePair does not exist in the annotation
-	 */
-	Boolean getInsertable();
-	
-	/**
-	 * Corresponds to the insertable element of the *Column annotation.
-	 * Set to null to remove the insertable valuePair from the annotation
-	 */
-	void setInsertable(Boolean insertable);
-		String INSERTABLE_PROPERTY = "insertableProperty";
-	
-	/**
-	 * Corresponds to the updatable element of the *Column annotation.
-	 * Returns null if the updatable valuePair does not exist in the annotation
-	 */
-	Boolean getUpdatable();
-	
-	/**
-	 * Corresponds to the updatable element of the *Column annotation.
-	 * Set to null to remove the updatable valuePair from the annotation
-	 */
-	void setUpdatable(Boolean updatable);
-		String UPDATABLE_PROPERTY = "updatableProperty";
-	
-	/**
-	 * Corresponds to the table element of the *Column annotation.
-	 * Returns null if the table valuePair does not exist in the annotation
-	 */
-	String getTable();
-	
-	/**
-	 * Corresponds to the table element of the *Column annotation.
-	 * Set to null to remove the table valuePair from the annotation
-	 */
-	void setTable(String table);
-		String TABLE_PROPERTY = "tableProperty";
-
-	
-	/**
-	 * Return the {@link TextRange} for the unique element. If the unique element
-	 * does not exist return the {@link TextRange} for the *Column annotation.
-	 */
-	TextRange getUniqueTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the nullable element. If the nullable element
-	 * does not exist return the {@link TextRange} for the *Column annotation.
-	 */
-	TextRange getNullableTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the insertable element. If the insertable element
-	 * does not exist return the {@link TextRange} for the *Column annotation.
-	 */
-	TextRange getInsertableTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the updatable element. If the updatable element
-	 * does not exist return the {@link TextRange} for the *Column annotation.
-	 */
-	TextRange getUpdatableTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the table element. If the table element
-	 * does not exist return the {@link TextRange} for the *Column annotation.
-	 */
-	TextRange getTableTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return whether the specified postition touches the table element.
-	 * Return false if the table element does not exist.
-	 */
-	boolean tableTouches(int pos, CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/BasicAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/BasicAnnotation.java
deleted file mode 100644
index f8529b481d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/BasicAnnotation.java
+++ /dev/null
@@ -1,67 +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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.
- */
-public interface BasicAnnotation extends JavaResourceNode
-{
-	
-	String ANNOTATION_NAME = JPA.BASIC;
-	
-	/**
-	 * Corresponds to the fetch element of the Basic annotation.
-	 * Returns null if the fetch element does not exist in java.
-	 */
-	FetchType getFetch();
-	
-	/**
-	 * Corresponds to the fetch element of the Basic annotation.
-	 * Set to null to remove the fetch element.
-	 */
-	void setFetch(FetchType fetch);
-		String FETCH_PROPERTY = "fetchProperty";
-		
-	/**
-	 * Corresponds to the optional element of the Basic annotation.
-	 * Returns null if the optional element does not exist in java.
-	 */
-	Boolean getOptional();
-	
-	/**
-	 * Corresponds to the optional element of the Basic annotation.
-	 * Set to null to remove the optional element.
-	 */
-	void setOptional(Boolean optional);
-		String OPTIONAL_PROPERTY = "optionalProperty";
-	
-	/**
-	 * Return the {@link TextRange} for the fetch element.  If the fetch element 
-	 * does not exist return the {@link TextRange} for the Basic 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 Basic annotation.
-	 */
-	TextRange getOptionalTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/CascadeType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/CascadeType.java
deleted file mode 100644
index a54aa2393d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/CascadeType.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.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.
- */
-public enum CascadeType {
-	
-	ALL(JPA.CASCADE_TYPE__ALL),
-	PERSIST(JPA.CASCADE_TYPE__PERSIST),
-	MERGE(JPA.CASCADE_TYPE__MERGE),
-	REMOVE(JPA.CASCADE_TYPE__REMOVE),
-	REFRESH(JPA.CASCADE_TYPE__REFRESH);
-	
-	private String javaAnnotationValue;
-	
-	CascadeType(String javaAnnotationValue) {
-		this.javaAnnotationValue = javaAnnotationValue;
-	}
-	
-	public String getJavaAnnotationValue() {
-		return this.javaAnnotationValue;
-	}
-	
-	public static CascadeType[] fromJavaAnnotationValue(String[] javaAnnotationValues) {
-		if (javaAnnotationValues == null) {
-			return new CascadeType[0];
-		}
-		CascadeType[] cascadeTypes = new CascadeType[javaAnnotationValues.length];
-		for (int i = 0; i < javaAnnotationValues.length; i++) {
-			String javaAnnotationValue = javaAnnotationValues[i];
-			if (javaAnnotationValue != null) {
-				cascadeTypes[i] = cascadeType(javaAnnotationValue);
-			}
-		}
-		return cascadeTypes;
-	}
-
-	private static CascadeType cascadeType(String javaAnnotationValue) {
-		if (javaAnnotationValue.equals(ALL.getJavaAnnotationValue())) {
-			return ALL;
-		}
-		else if (javaAnnotationValue.equals(PERSIST.getJavaAnnotationValue())) {
-			return PERSIST;
-		}
-		else if (javaAnnotationValue.equals(MERGE.getJavaAnnotationValue())) {
-			return MERGE;
-		}
-		else if (javaAnnotationValue.equals(REMOVE.getJavaAnnotationValue())) {
-			return REMOVE;
-		}
-		else if (javaAnnotationValue.equals(REFRESH.getJavaAnnotationValue())) {
-			return REFRESH;
-		}
-		throw new IllegalArgumentException("Unknown cascade type: " + javaAnnotationValue);
-	}
-	
-	public static String[] toJavaAnnotationValue(CascadeType[] cascadeTypes) {
-		String[] javaAnnotationValues = new String[cascadeTypes.length];
-		for (int i = 0; i < cascadeTypes.length; i++) {
-			CascadeType cascadeType = cascadeTypes[i];
-			javaAnnotationValues[i] = cascadeType.javaAnnotationValue;
-		}
-		return javaAnnotationValues;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ColumnAnnotation.java
deleted file mode 100644
index dc17be4c81..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ColumnAnnotation.java
+++ /dev/null
@@ -1,85 +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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.
- */
-public interface ColumnAnnotation extends BaseColumnAnnotation
-{
-	String ANNOTATION_NAME = JPA.COLUMN;
-
-	/**
-	 * Corresponds to the length element of the javax.persistence.Column annotation.
-	 * Returns null if the length valuePair does not exist in the annotation
-	 */
-	Integer getLength();
-	
-	/**
-	 * Corresponds to the length element of the javax.persistence.Column annotation.
-	 * Set to null to remove the length valuePair from the annotation
-	 */
-	void setLength(Integer length);
-		String LENGTH_PROPERTY = "lengthProperty";
-	
-	/**
-	 * Corresponds to the precision element of the javax.persistence.Column annotation.
-	 * Returns null if the precision valuePair does not exist in the annotation
-	 */
-	Integer getPrecision();
-	
-	/**
-	 * Corresponds to the precision element of the javax.persistence.Column annotation.
-	 * Set to null to remove the precision valuePair from the annotation
-	 */
-	void setPrecision(Integer precision);
-		String PRECISION_PROPERTY = "precisionProperty";
-	
-	/**
-	 * Corresponds to the scale element of the javax.persistence.Column annotation.
-	 * Returns null if the scale valuePair does not exist in the annotation
-	 */
-	Integer getScale();
-	
-	/**
-	 * Corresponds to the scale element of the javax.persistence.Column annotation.
-	 * Set to null to remove the scale valuePair from the annotation
-	 */
-	void setScale(Integer scale);
-		String SCALE_PROPERTY = "scaleProperty";
-
-	/**
-	 * Return the {@link TextRange} for the length element. If length element
-	 * does not exist return the {@link TextRange} for the Column annotation.
-	 */
-	TextRange getLengthTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the precision element. If precision element
-	 * does not exist return the {@link TextRange} for the Column annotation.
-	 */
-	TextRange getPrecisionTextRange(CompilationUnit astRoot);
-	
-	/**
-	 * Return the {@link TextRange} for the scale element. If scale element
-	 * does not exist return the {@link TextRange} for the Column annotation.
-	 */
-	TextRange getScaleTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ContainerAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ContainerAnnotation.java
deleted file mode 100644
index 7791efae3b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ContainerAnnotation.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.core.resource.java;
-
-import java.util.ListIterator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 ContainerAnnotation<T extends NestableAnnotation> extends Annotation
-{
-	/**
-	 * Return the fully qualified nestable annotation name.  
-	 */
-	String getNestableAnnotationName();
-
-	/**
-	 * Return the element name of the nestable annotation when
-	 * it is nested withing the container annotatio as a member value pai  
-	 */
-	String getElementName();
-
-	ListIterator<T> nestedAnnotations();
-	
-	int nestedAnnotationsSize();
-
-	T nestedAnnotationAt(int index);
-	
-	T nestedAnnotationFor(org.eclipse.jdt.core.dom.Annotation jdtAnnotation);
-	
-	int indexOf(T nestedAnnotation);
-		
-	T add(int index);
-	
-	/**
-	 * Add directly to the List without firing change notification.
-	 */
-	T addInternal(int index);
-	
-	void remove(T nestedAnnotation);
-	
-	void remove(int index);
-	
-	/**
-	 * Move in the List without firing change notification.
-	 */
-	void moveInternal(int targetIndex, int sourceIndex);
-	
-	void move(int targetIndex, int sourceIndex);
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/DiscriminatorColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/DiscriminatorColumnAnnotation.java
deleted file mode 100644
index d86abfbeaf..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/DiscriminatorColumnAnnotation.java
+++ /dev/null
@@ -1,51 +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.core.resource.java;
-
-/**
- * Corresponds to the javax.persistence.DiscriminatorColumn 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.
- */
-public interface DiscriminatorColumnAnnotation extends NamedColumnAnnotation
-{
-	String ANNOTATION_NAME = JPA.DISCRIMINATOR_COLUMN;
-
-	/**
-	 * Corresponds to the discriminatorType element of the javax.persistence.DiscriminatorColumn annotation.
-	 * Returns null if the discriminatorType valuePair does not exist in the annotation
-	 */
-	DiscriminatorType getDiscriminatorType();
-	
-	/**
-	 * Corresponds to the discriminatorType element of the javax.persistence.OrderBy annotation.
-	 * Set the discriminatorType to null to remove the discriminatorType valuePair
-	 */
-	void setDiscriminatorType(DiscriminatorType discriminatorType);
-		String DISCRIMINATOR_TYPE_PROPERTY = "discriminatorTypeProperty";
-	
-	/**
-	 * Corresponds to the length element of the javax.persistence.DiscriminatorColumn annotation.
-	 * Returns null if the length valuePair does not exist in the annotation
-	 */
-	Integer getLength();
-	
-	/**
-	 * Corresponds to the length element of the javax.persistence.OrderBy annotation.
-	 * Set the length to null to remove the length valuePair
-	 */
-	void setLength(Integer length);
-		String LENGTH_PROPERTY = "lengthProperty";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/DiscriminatorType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/DiscriminatorType.java
deleted file mode 100644
index be55e5b96a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/DiscriminatorType.java
+++ /dev/null
@@ -1,59 +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.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.
- */
-public enum DiscriminatorType {
-	
-	STRING,
-	CHAR,
-	INTEGER;
-	
-	
-	public static DiscriminatorType fromJavaAnnotationValue(Object javaAnnotationValue) {
-		if (javaAnnotationValue == null) {
-			return null;
-		}
-		if (javaAnnotationValue.equals(JPA.DISCRIMINATOR_TYPE__STRING)) {
-			return STRING;
-		}
-		if (javaAnnotationValue.equals(JPA.DISCRIMINATOR_TYPE__CHAR)) {
-			return CHAR;
-		}
-		if (javaAnnotationValue.equals(JPA.DISCRIMINATOR_TYPE__INTEGER)) {
-			return INTEGER;
-		}
-		return null;
-	}
-
-	public static String toJavaAnnotationValue(DiscriminatorType discriminatorType) {
-		if (discriminatorType == null) {
-			return null;
-		}
-		switch (discriminatorType) {
-			case STRING :
-				return JPA.DISCRIMINATOR_TYPE__STRING;
-			case CHAR :
-				return JPA.DISCRIMINATOR_TYPE__CHAR;
-			case INTEGER :
-				return JPA.DISCRIMINATOR_TYPE__INTEGER;
-			default :
-				throw new IllegalArgumentException("unknown discriminator type: " + discriminatorType);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/DiscriminatorValueAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/DiscriminatorValueAnnotation.java
deleted file mode 100644
index 2258f6a3a7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/DiscriminatorValueAnnotation.java
+++ /dev/null
@@ -1,47 +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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Corresponds to the javax.persistence.OrderBy 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.
- */
-public interface DiscriminatorValueAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = JPA.DISCRIMINATOR_VALUE;
-
-	/**
-	 * Corresponds to the value element of the javax.persistence.OrderBy annotation.
-	 * Returns null if the value valuePair does not exist in the annotation
-	 */
-	String getValue();
-	
-	/**
-	 * Corresponds to the value element of the javax.persistence.OrderBy annotation.
-	 * Setting the value to null will not remove the OrderBy annotation
-	 */
-	void setValue(String value);
-		String VALUE_PROPERTY = "valueProperty";
-
-	/**
-	 * Return the {@link TextRange} for the value element. If value element
-	 * does not exist return the {@link TextRange} for the DisriminatorValue annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EmbeddableAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EmbeddableAnnotation.java
deleted file mode 100644
index 188e3d381f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EmbeddableAnnotation.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.core.resource.java;
-
-/**
- * Corresponds to the javax.persistence.Embeddable 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.
- */
-public interface EmbeddableAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = JPA.EMBEDDABLE;
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EmbeddedAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EmbeddedAnnotation.java
deleted file mode 100644
index 766834a20d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EmbeddedAnnotation.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.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.
- */
-public interface EmbeddedAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = JPA.EMBEDDED;
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EmbeddedIdAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EmbeddedIdAnnotation.java
deleted file mode 100644
index d7eca844c9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EmbeddedIdAnnotation.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.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.
- */
-public interface EmbeddedIdAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = JPA.EMBEDDED_ID;
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EntityAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EntityAnnotation.java
deleted file mode 100644
index f4cebb309d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EntityAnnotation.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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Corresponds to the javax.persistence.Entity 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.
- */
-public interface EntityAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = JPA.ENTITY;
-
-	/**
-	 * Corresponds to the name element of the Entity annotation.
-	 * Returns null if the name element does not exist in java.
-	 */
-	String getName();
-	
-	/**
-	 * Corresponds to the name element of the Entity annotation.
-	 * Set to null to remove the name element.
-	 */
-	void setName(String name);
-	
-	String NAME_PROPERTY = "nameProperty";
-	
-	/**
-	 * Return the {@link TextRange} for the name element.  If the name element 
-	 * does not exist return the {@link TextRange} for the Entity annotation.
-	 */
-	TextRange getNameTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EnumType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EnumType.java
deleted file mode 100644
index f309e5f50e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EnumType.java
+++ /dev/null
@@ -1,53 +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.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.
- */
-public enum EnumType {
-	
-	ORDINAL,
-	STRING;
-	
-	
-	public static EnumType fromJavaAnnotationValue(Object javaAnnotationValue) {
-		if (javaAnnotationValue == null) {
-			return null;
-		}
-		if (javaAnnotationValue.equals(JPA.ENUM_TYPE__ORDINAL)) {
-			return ORDINAL;
-		}
-		if (javaAnnotationValue.equals(JPA.ENUM_TYPE__STRING)) {
-			return STRING;
-		}
-		return null;
-	}
-
-	public static String toJavaAnnotationValue(EnumType enumType) {
-		if (enumType == null) {
-			return null;
-		}
-		switch (enumType) {
-			case ORDINAL :
-				return JPA.ENUM_TYPE__ORDINAL;
-			case STRING :
-				return JPA.ENUM_TYPE__STRING;
-			default :
-				throw new IllegalArgumentException("unknown enum type: " + enumType);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EnumeratedAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EnumeratedAnnotation.java
deleted file mode 100644
index d83ddf2749..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EnumeratedAnnotation.java
+++ /dev/null
@@ -1,47 +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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Corresponds to the javax.persistence.Enumerated 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.
- */
-public interface EnumeratedAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = JPA.ENUMERATED;
-
-	/**
-	 * Corresponds to the value element of the Enumerated annotation.
-	 * Returns null if the value element does not exist in java.
-	 */
-	EnumType getValue();
-	
-	/**
-	 * Corresponds to the value element of the Enumerated annotation.
-	 * Set to null to remove the value element.
-	 */
-	void setValue(EnumType value);
-		String VALUE_PROPERTY = "valueProperty";
-		
-	/**
-	 * Return the {@link TextRange} for the value element.  If the value element 
-	 * does not exist return the {@link TextRange} for the Enumerated annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/FetchType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/FetchType.java
deleted file mode 100644
index ca4f7e1b25..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/FetchType.java
+++ /dev/null
@@ -1,53 +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.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.
- */
-public enum FetchType {
-	
-	EAGER,
-	LAZY;
-	
-	
-	public static FetchType fromJavaAnnotationValue(Object javaAnnotationValue) {
-		if (javaAnnotationValue == null) {
-			return null;
-		}
-		if (javaAnnotationValue.equals(JPA.FETCH_TYPE__EAGER)) {
-			return EAGER;
-		}
-		if (javaAnnotationValue.equals(JPA.FETCH_TYPE__LAZY)) {
-			return LAZY;
-		}
-		return null;
-	}
-
-	public static String toJavaAnnotationValue(FetchType fetchType) {
-		if (fetchType == null) {
-			return null;
-		}
-		switch (fetchType) {
-			case EAGER :
-				return JPA.FETCH_TYPE__EAGER;
-			case LAZY :
-				return JPA.FETCH_TYPE__LAZY;
-			default :
-				throw new IllegalArgumentException("unknown fetch type: " + fetchType);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/GeneratedValueAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/GeneratedValueAnnotation.java
deleted file mode 100644
index ad93fe6472..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/GeneratedValueAnnotation.java
+++ /dev/null
@@ -1,67 +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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Corresponds to the javax.persistence.GeneratedValue 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.
- */
-public interface GeneratedValueAnnotation extends JavaResourceNode
-{	
-	String ANNOTATION_NAME = JPA.GENERATED_VALUE;
-
-	/**
-	 * Corresponds to the strategy element of the GeneratedValue annotation.
-	 * Returns null if the strategy element does not exist in java.
-	 */
-	GenerationType getStrategy();
-	
-	/**
-	 * Corresponds to the strategy element of the GeneratedValue annotation.
-	 * Set to null to remove the strategy element.
-	 */
-	void setStrategy(GenerationType strategy);
-		String STRATEGY_PROPERTY = "strategyProperty";
-		
-	/**
-	 * Corresponds to the generator element of the GeneratedValue annotation.
-	 * Returns null if the generator element does not exist in java.
-	 */
-	String getGenerator();
-	
-	/**
-	 * Corresponds to the generator element of the GeneratedValue annotation.
-	 * Set to null to remove the generator element.
-	 */
-	void setGenerator(String generator);
-		String GENERATOR_PROPERTY = "generatorProperty";
-	
-	
-	/**
-	 * Return the {@link TextRange} for the generator element.  If the generator element 
-	 * does not exist return the {@link TextRange} for the GeneratedValue annotation.
-	 */
-	TextRange getGeneratorTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the strategy element.  If the strategy element 
-	 * does not exist return the {@link TextRange} for the GeneratedValue annotation.
-	 */
-	TextRange getStrategyTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/GenerationType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/GenerationType.java
deleted file mode 100644
index 6557614932..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/GenerationType.java
+++ /dev/null
@@ -1,65 +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.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.
- */
-public enum GenerationType {
-	
-	TABLE,
-	SEQUENCE,
-	IDENTITY,
-	AUTO;
-	
-	
-	public static GenerationType fromJavaAnnotationValue(Object javaAnnotationValue) {
-		if (javaAnnotationValue == null) {
-			return null;
-		}
-		if (javaAnnotationValue.equals(JPA.GENERATION_TYPE__TABLE)) {
-			return TABLE;
-		}
-		if (javaAnnotationValue.equals(JPA.GENERATION_TYPE__SEQUENCE)) {
-			return SEQUENCE;
-		}
-		if (javaAnnotationValue.equals(JPA.GENERATION_TYPE__IDENTITY)) {
-			return IDENTITY;
-		}
-		if (javaAnnotationValue.equals(JPA.GENERATION_TYPE__AUTO)) {
-			return AUTO;
-		}
-		return null;
-	}
-
-	public static String toJavaAnnotationValue(GenerationType generationType) {
-		if (generationType == null) {
-			return null;
-		}
-		switch (generationType) {
-			case TABLE :
-				return JPA.GENERATION_TYPE__TABLE;
-			case SEQUENCE :
-				return JPA.GENERATION_TYPE__SEQUENCE;
-			case IDENTITY :
-				return JPA.GENERATION_TYPE__IDENTITY;
-			case AUTO :
-				return JPA.GENERATION_TYPE__AUTO;
-			default :
-				throw new IllegalArgumentException("unknown generation type: " + generationType);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/GeneratorAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/GeneratorAnnotation.java
deleted file mode 100644
index 4d8e925036..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/GeneratorAnnotation.java
+++ /dev/null
@@ -1,90 +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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.
- */
-public interface GeneratorAnnotation extends JavaResourceNode
-{
-	/**
-	 * Corresponds to the name element of the TableGenerator or SequenceGenerator annotation.
-	 * Returns null if the name element does not exist in java.  If no other memberValuePairs exist
-	 * the *Generator annotation will be removed as well.
-	 */
-	String getName();
-	
-	/**
-	 * Corresponds to the name element of the TableGenerator or SequenceGenerator annotation.
-	 * Set to null to remove the name element.  If no other memberValuePairs exist
-	 * the *Generator annotation will be removed as well.
-	 */
-	void setName(String name);
-		String NAME_PROPERTY = "nameProperty";
-	
-	/**
-	 * Corresponds to the initialValue element of the TableGenerator or SequenceGenerator annotation.
-	 * Returns null if the initialValue element does not exist in java.  If no other memberValuePairs exist
-	 * the *Generator annotation will be removed as well.
-	 */
-	Integer getInitialValue();
-	
-	/**
-	 * Corresponds to the initialValue element of the TableGenerator or SequenceGenerator annotation.
-	 * Set to null to remove the initialValue element.  If no other memberValuePairs exist
-	 * the *Generator annotation will be removed as well.
-	 */
-	void setInitialValue(Integer initialValue);
-		String INITIAL_VALUE_PROPERTY = "initialValueProperty";
-		
-	/**
-	 * Corresponds to the allocationSize element of the TableGenerator or SequenceGenerator annotation.
-	 * Returns null if the allocationSize element does not exist in java.  If no other memberValuePairs exist
-	 * the *Generator annotation will be removed as well.
-	 */
-	Integer getAllocationSize();
-	
-	/**
-	 * Corresponds to the allocationSize element of the TableGenerator or SequenceGenerator annotation.
-	 * Set to null to remove the allocationSize element.  If no other memberValuePairs exist
-	 * the *Generator annotation will be removed as well.
-	 */
-	void setAllocationSize(Integer allocationSize);
-		String ALLOCATION_SIZE_PROPERTY = "allocationSizeProperty";
-	
-	/**
-	 * Return the {@link TextRange} for the name element.  If the name element 
-	 * does not exist return the {@link TextRange} for the *Generator annotation.
-	 */
-	TextRange getNameTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the initialValue element.  If the initialValue element 
-	 * does not exist return the {@link TextRange} for the *Generator annotation.
-	 */
-	TextRange getInitialValueTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the allocationSize element.  If the allocationSize element 
-	 * does not exist return the {@link TextRange} for the *Generator annotation.
-	 */
-	TextRange getAllocationSizeTextRange(CompilationUnit astRoot);
-
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/IdAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/IdAnnotation.java
deleted file mode 100644
index ade5e76a84..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/IdAnnotation.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.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.
- */
-public interface IdAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = JPA.ID;
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/IdClassAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/IdClassAnnotation.java
deleted file mode 100644
index 283aefe3cd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/IdClassAnnotation.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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * This interface corresponds to the javax.persistence.IdClass 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.
- */
-public interface IdClassAnnotation extends JavaResourceNode
-{
-	final String ANNOTATION_NAME = JPA.ID_CLASS;
-
-	/**
-	 * Corresponds to the value element of the IdClass annotation.
-	 * Returns null if the value element does not exist in java.
-	 * Returns the portion of the value preceding the .class.
-	 * <p>
-	 *     &#64;IdClass(value=Employee.class)
-	 * </p>
-	 * will return "Employee"
-	 **/
-	String getValue();	
-	
-	/**
-	 * Corresponds to the value element of the IdClass annotation.
-	 * Set to null to remove the value element.  This will also remove the IdClass 
-	 * annotation itself.
-	 */
-	void setValue(String value);
-		String VALUE_PROPERTY = "valueProperty";
-		
-	/**
-	 * Returns the qualified value name as it is resolved in the AST
-	 * <p>
-	 *     &#64;IdClass(Employee.class)
-	 * </p>
-	 * will return "model.Employee" if there is an import for model.Employee
-	 * @return
-	 */
-	String getFullyQualifiedClass();
-		String FULLY_QUALIFIED_CLASS_PROPERTY = "fullyQualifiedClassProperty";
-
-	/**
-	 * Return the {@link TextRange} for the value element.  If the value element 
-	 * does not exist return the {@link TextRange} for the IdClass annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/InheritanceAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/InheritanceAnnotation.java
deleted file mode 100644
index 89435d2c5b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/InheritanceAnnotation.java
+++ /dev/null
@@ -1,39 +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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Corresponds to the javax.persistence.Inheritance 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.
- */
-public interface InheritanceAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = JPA.INHERITANCE;
-
-	InheritanceType getStrategy();
-	
-	void setStrategy(InheritanceType strategy);
-		String STRATEGY_PROPERTY = "strategyProperty";
-		
-	/**
-	 * Return the {@link TextRange} for the strategy element.  If the strategy element 
-	 * does not exist return the {@link TextRange} for the Inheritance annotation.
-	 */
-	TextRange getStrategyTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/InheritanceType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/InheritanceType.java
deleted file mode 100644
index b25eaa40ee..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/InheritanceType.java
+++ /dev/null
@@ -1,59 +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.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.
- */
-public enum InheritanceType {
-	
-	SINGLE_TABLE,
-	JOINED,
-	TABLE_PER_CLASS;
-	
-	
-	public static InheritanceType fromJavaAnnotationValue(Object javaAnnotationValue) {
-		if (javaAnnotationValue == null) {
-			return null;
-		}
-		if (javaAnnotationValue.equals(JPA.INHERITANCE_TYPE__SINGLE_TABLE)) {
-			return SINGLE_TABLE;
-		}
-		if (javaAnnotationValue.equals(JPA.INHERITANCE_TYPE__JOINED)) {
-			return JOINED;
-		}
-		if (javaAnnotationValue.equals(JPA.INHERITANCE_TYPE__TABLE_PER_CLASS)) {
-			return TABLE_PER_CLASS;
-		}
-		return null;
-	}
-
-	public static String toJavaAnnotationValue(InheritanceType inheritanceType) {
-		if (inheritanceType == null) {
-			return null;
-		}
-		switch (inheritanceType) {
-			case SINGLE_TABLE :
-				return JPA.INHERITANCE_TYPE__SINGLE_TABLE;
-			case JOINED :
-				return JPA.INHERITANCE_TYPE__JOINED;
-			case TABLE_PER_CLASS :
-				return JPA.INHERITANCE_TYPE__TABLE_PER_CLASS;
-			default :
-				throw new IllegalArgumentException("unknown inheritance type: " + inheritanceType);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JPA.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JPA.java
deleted file mode 100644
index 71cdfda387..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JPA.java
+++ /dev/null
@@ -1,300 +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.core.resource.java;
-
-
-/**
- * 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.
- */
-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.core/src/org/eclipse/jpt/core/resource/java/JavaResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourceModel.java
deleted file mode 100644
index 22bc7d0427..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourceModel.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.core.resource.java;
-
-import org.eclipse.jpt.core.ResourceModel;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaResourceModel extends ResourceModel {
-
-	JpaCompilationUnit getJpaCompilationUnit();
-
-	void resourceChanged();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourceNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourceNode.java
deleted file mode 100644
index 9574f0874e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourceNode.java
+++ /dev/null
@@ -1,37 +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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.model.Model;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- */
-public interface JavaResourceNode extends Model {
-
-	void initialize(CompilationUnit astRoot);
-
-	JavaResourceModel getResourceModel();
-
-	JpaCompilationUnit getJpaCompilationUnit();
-
-	void updateFromJava(CompilationUnit astRoot);
-
-	TextRange getTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourcePersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourcePersistentAttribute.java
deleted file mode 100644
index d3561d793c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourcePersistentAttribute.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.core.resource.java;
-
-import org.eclipse.jpt.core.utility.jdt.Member;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- */
-//TODO how do we handle:
-//  @Basic
-//  private String foo, bar;
-public interface JavaResourcePersistentAttribute extends JavaResourcePersistentMember
-{
-	String getName();
-	
-	Member getMember();
-	
-	boolean isForField();
-	
-	boolean isForProperty();
-	
-	boolean typeIsBasic();
-		String TYPE_IS_BASIC_PROPERTY = "typeIsBasicProperty";
-	
-	boolean isFinal();
-		String FINAL_PROPERTY = "finalProperty";
-	
-	boolean isPublic();
-		String PUBLIC_PROPERTY = "publicProperty";
-	
-	/**
-	 * Return true if the attribute type is a container:
-	 * java.util.Collection
-	 * java.util.Set
-	 * java.util.List
-	 * java.util.Map
-	 * @return
-	 */
-	boolean typeIsContainer();
-		String TYPE_IS_CONTAINER_PROPERTY = "typeIsContainerProperty";
-
-	/**
-	 * Returns the resolved qualfied type name for the attribute
-	 */
-	String getQualifiedTypeName();
-		String QUALIFIED_TYPE_NAME_PROPERTY = "qualfiedTypeNameProperty";
-	
-	/**
-	 * Returns the resolved qualfied type name for the attribute
-	 * if it as valid as a target entity type.  i.e. not an array.
-	 * see typeIsContainer() to be used with this
-	 */
-	String getQualifiedReferenceEntityTypeName();
-		String QUALIFIED_REFERENCE_ENTITY_TYPE_NAME_PROPERTY = "qualfiedReferenceEntityTypeNameProperty";
-
-	/**
-	 * Returns the fully qualified type parameter for use as a target entity
-	 */
-	String getQualifiedReferenceEntityElementTypeName();
-		String QUALIFIED_REFERENCE_ENTITY_ELEMENT_TYPE_NAME_PROPERTY = "qualfiedReferenceEntityElementTypeNameProperty";
-		
-	/**
-	 * Return true if this attribute has any mapping or non-mapping annotations
-	 * (of course only persistence related annotations)
-	 */
-	boolean hasAnyAnnotation();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourcePersistentMember.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourcePersistentMember.java
deleted file mode 100644
index 234cbd259b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourcePersistentMember.java
+++ /dev/null
@@ -1,169 +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.core.resource.java;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.utility.MethodSignature;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaResourcePersistentMember extends JavaResourceNode
-{
-
-	/**
-	 * Return all <code>JavaResource</code>s that correspond to type
-	 * mapping annotations specified in the source code.  In JPA these could be 
-	 * Entity, MappedSuperclass, Embeddable.
-	 * <p>Does not return duplicate annotations as this error is handled by the java compiler.
-	 */
-	<T extends JavaResourceNode> Iterator<T> mappingAnnotations();
-		String MAPPING_ANNOTATIONS_COLLECTION = "mappingAnnotations";
-	
-	int mappingAnnotationsSize();
-	/**
-	 * Return the <code>JavaResource</code> specified on this JavaPersistentResource
-	 * In the case of multiples the first one will be returned as defined by the order of
-	 * {@link org.eclipse.jpt.core.internal.platform.GenericJpaPlatform#typeMappingAnnotationDefinitions()} or 
-	 * {@link org.eclipse.jpt.core.internal.platform.GenericJpaPlatform#attributeMappingAnnotationDefinitions()}
-	 */
-	JavaResourceNode getMappingAnnotation();
-
-	/**
-	 * Returns the <code>JavaResource</code> with this fully qualifed annotation name. 
-	 * In JPA the valid annotations are "javax.persistence.Embedddable", "javax.persistence.Entity", 
-	 * and "javax.persistence.MappedSuperclass"
-	 * Return the first if there are duplicates in the source code
-	 * @param annotationName - fully qualified annotation name
-	 */
-	//TODO not sure we need this API, first 2 seem sufficient
-	JavaResourceNode getMappingAnnotation(String annotationName);
-
-	/**
-	 * Use this to change the type mapping annotation.  This will only remove
-	 * other mapping annotations in case there were multiple before.  It
-	 * will not remove any non-mapping annotations
-	 * @param annotationName - fully qualified annotation name
-	 */
-	void setMappingAnnotation(String annotationName);
-
-	/**
-	 * Return all <code>JavaResource</code>s that correspond to annotations in the source code.
-	 * Does not return duplicate annotations as this error is handled by the java compiler.
-	 * No <code>MappingAnnotation</code>s should be included.
-	 * @see #mappingAnnotations()
-	 */
-	<T extends JavaResourceNode> Iterator<T>  annotations();
-	
-		String ANNOTATIONS_COLLECTION = "annotations";
-
-	int annotationsSize();
-
-	//TODO tie the singular and plural annotations together somehow in the resource model so we can give
-	//a validation error for the case of both being specified
-	/**
-	 * Given a nestable and container annotation name return the specified <code>JavaResource</code>s.
-	 * If both the nestable and container annotations are specified on the Type, then only
-	 * return the nestable annotations specified within the container annotation. This is
-	 * only going to return JavaResources that match the nestableAnnotationName
-	 */
-	<T extends JavaResourceNode> ListIterator<T> annotations(String nestableAnnotationName, String containerAnnotationName);
-	
-	
-	/**
-	 * Returns the <code>JavaResource</code> with this fully qualifed annotation name. 
-	 * Return the first if there are duplicates in the source code.
-	 */
-	JavaResourceNode getAnnotation(String annotationName);
-	
-	/**
-	 * Returns the <code>JavaResource</code> with this fully qualifed annotation name. 
-	 * Return the first if there are duplicates in the source code.  Will not return null,
-	 * but a null Object instead if no annotation with this name exists in the java source.
-	 */
-	JavaResourceNode getNonNullAnnotation(String annotationName);
-
-	/**
-	 * Return a null implementation of <code>JavaResourceNode</code> with this fully qualifed annotation name.
-	 * The corresponding AnnotationDefinition needs to implement buildNullAnnotation()
-	 * {@link AnnotationDefinition#buildNullAnnotation(JavaResourcePersistentMember, org.eclipse.jpt.core.internal.jdtutility.Member)}
-	 */
-	JavaResourceNode getNullMappingAnnotation(String annotationName);
-
-	/**
-	 * Add an annotation for the given fully qualified annotation name
-	 */
-	JavaResourceNode addAnnotation(String annotationName);
-	
-	void removeAnnotation(String annotationName);
-
-	/**
-	 * Add a new NestableAnnotation named nestableAnnotationName.  Create a new container annotation
-	 * if necessary and add the nestable annotation to it.  If both nestable and container already
-	 * exist then add to the container annotation leaving the existing nestable annotaion alone.
-	 * If only nestable exists, then create the new container annotation and move the nestable to it
-	 * also adding the new one.  If neither exists, create a new nestable annotation.
-	 * @return the new JavaResource with the name nestableAnnotationName
-	 */
-	JavaResourceNode addAnnotation(int index, String nestableAnnotationName, String containerAnnotationName);
-	
-	void removeAnnotation(int index, String nestableAnnotationName, String containerAnnotationName);
-	
-	/**
-	 * Move nestableAnnotation found in the containerAnnotation from the specified source 
-	 * index to the specified target index.    
-	 */
-	void move(int targetIndex, int sourceIndex, String containerAnnotationName);
-	
-	/**
-	 * Return whether the underlying JDT member is persistable according to the JPA spec
-	 */
-	boolean isPersistable();
-		String PERSISTABLE_PROPERTY = "persistable";
-		
-	/**
-	 * Return whether the underlying JDT member is currently annotated as being persistent
-	 * (equivalent to "is mapped")
-	 */
-	boolean isPersisted();
-
-	/**
-	 * Return whether the Java resource persistent member is for the specified
-	 * member.
-	 */
-	boolean isFor(String memberName, int occurrence);
-
-	/**
-	 * Return whether the Java resource persistent member is for the specified
-	 * method.
-	 */
-	boolean isFor(MethodSignature methodSignature, int occurrence);
-
-	/**
-	 * return the text range for the name of the persistent resource
-	 */
-	TextRange getNameTextRange(CompilationUnit astRoot);
-	
-	/**
-	 * Resolve type information that could be dependent on other files being added/removed
-	 */
-	void resolveTypes(CompilationUnit astRoot);
-
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourcePersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourcePersistentType.java
deleted file mode 100644
index f71a3f3849..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourcePersistentType.java
+++ /dev/null
@@ -1,85 +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.core.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jpt.core.utility.jdt.Member;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JavaResourcePersistentType extends JavaResourcePersistentMember
-{	
-	/**
-	 * Return only the immediately nested persistable nestedTypes
-	 */
-	Iterator<JavaResourcePersistentType> nestedTypes();
-		String NESTED_TYPES_COLLECTION = "nestedTypes";
-
-	/**
-	 * Return only the persistable attributes, those that respond true to
-	 * {@link JavaResourcePersistentAttribute#isPersistable()}
-	 * This returns fields and properties
-	 */
-	Iterator<JavaResourcePersistentAttribute> attributes();
-		String ATTRIBUTES_COLLECTION = "attributes";
-	
-	/**
-	 * Return only the persistable fields, those that respond true to
-	 * {@link JavaResourcePersistentAttribute#isPersistable()}
-	 * This returns filters out all properties and only returns fields
-	 */
-	Iterator<JavaResourcePersistentAttribute> fields();
-
-	/**
-	 * Return only the persistable fields, those that respond true to
-	 * {@link JavaResourcePersistentAttribute#isPersistable()}
-	 * This returns filters out all fields and only returns properties
-	 */
-	Iterator<JavaResourcePersistentAttribute> properties();
-	
-	// TODO rename to getJavaResourcePersistentType(String)
-	JavaResourcePersistentType getJavaPersistentTypeResource(String fullyQualifiedTypeName);
-
-	/**
-	 * Return the fully qualified type name
-	 */
-	String getQualifiedName();
-		String QUALIFIED_NAME_PROPERTY = "qualifiedName";
-
-	/**
-	 * Return the fully unqualified type name
-	 */
-	String getName();
-		String NAME_PROPERTY = "name";
-
-	String getSuperClassQualifiedName();
-		String SUPER_CLASS_QUALIFIED_NAME_PROPERTY = "superClassQualifiedName";
-	
-	AccessType getAccess();
-		String ACCESS_PROPERTY = "access";
-		
-	boolean isAbstract();
-		String ABSTRACT_PROPERTY = "abstract";	
-		
-	Member getMember();
-	
-	/**
-	 * Return whether any attributes in this persistentType have
-	 * JPA annotations on them.
-	 */
-	boolean hasAnyAttributeAnnotations();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinColumnAnnotation.java
deleted file mode 100644
index f15a54f458..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinColumnAnnotation.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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.
- */
-public interface JoinColumnAnnotation extends BaseColumnAnnotation
-{
-	String ANNOTATION_NAME = JPA.JOIN_COLUMN;
-
-	/**
-	 * Corresponds to the referencedColumnName element of the javax.persistence.JoinColumn annotation.
-	 * Returns null if the referencedColumnName valuePair does not exist in the annotation
-	 */
-	String getReferencedColumnName();
-	
-	/**
-	 * Corresponds to the referencedColumnName element of the javax.persistence.JoinColumn annotation.
-	 * Set to null to remove the referencedColumnName valuePait from the Annotation
-	 */
-	void setReferencedColumnName(String referencedColumnName);
-		String REFERENCED_COLUMN_NAME_PROPERTY = "referencedColumnNameProperty";
-	
-	/**
-	 * Return the {@link TextRange} for the referencedColumnName element. If the 
-	 * referencedColumnName element does not exist return the {@link TextRange} 
-	 * for the JoinColumn annotation.
-	 */
-	TextRange getReferencedColumnNameTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return whether the specified postition touches the  referencedColumnName element.
-	 * Return false if the  referencedColumnName element does not exist.
-	 */
-	boolean referencedColumnNameTouches(int pos, CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinColumnsAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinColumnsAnnotation.java
deleted file mode 100644
index 8be6bced7a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinColumnsAnnotation.java
+++ /dev/null
@@ -1,27 +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.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.
- */
-public interface JoinColumnsAnnotation extends ContainerAnnotation<NestableJoinColumn>
-{
-	String ANNOTATION_NAME = JPA.JOIN_COLUMNS;
-	
-	String JOIN_COLUMNS_LIST = "joinColumnsList";
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinTableAnnotation.java
deleted file mode 100644
index 38d8df3505..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinTableAnnotation.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.core.resource.java;
-
-import java.util.ListIterator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JoinTableAnnotation extends TableAnnotation
-{
-	String ANNOTATION_NAME = JPA.JOIN_TABLE;
-
-	ListIterator<JoinColumnAnnotation> joinColumns();
-	
-	JoinColumnAnnotation joinColumnAt(int index);
-	
-	int indexOfJoinColumn(JoinColumnAnnotation joinColumn);
-	
-	int joinColumnsSize();
-
-	JoinColumnAnnotation addJoinColumn(int index);
-	
-	void removeJoinColumn(int index);
-	
-	void moveJoinColumn(int targetIndex, int sourceIndex);
-		String JOIN_COLUMNS_LIST = "joinColumnsList";
-	
-	ListIterator<JoinColumnAnnotation> inverseJoinColumns();
-	
-	JoinColumnAnnotation inverseJoinColumnAt(int index);
-	
-	int indexOfInverseJoinColumn(JoinColumnAnnotation joinColumn);
-	
-	int inverseJoinColumnsSize();
-
-	JoinColumnAnnotation addInverseJoinColumn(int index);
-	
-	void removeInverseJoinColumn(int index);
-	
-	void moveInverseJoinColumn(int targetIndex, int sourceIndex);
-		String INVERSE_JOIN_COLUMNS_LIST = "inverseJoinColumnsList";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JpaCompilationUnit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JpaCompilationUnit.java
deleted file mode 100644
index d6e88f793e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JpaCompilationUnit.java
+++ /dev/null
@@ -1,51 +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.core.resource.java;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.core.JpaAnnotationProvider;
-import org.eclipse.jpt.core.utility.jdt.AnnotationEditFormatter;
-import org.eclipse.jpt.utility.CommandExecutorProvider;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 JpaCompilationUnit extends JavaResourceNode {
-
-	ICompilationUnit getCompilationUnit();
-
-	JavaResourcePersistentType getPersistentType();
-		String PERSISTENT_TYPE_PROPERTY = "persistentType";
-
-	// TODO rename getJavaResourcePersistentType(String)
-	JavaResourcePersistentType getJavaPersistentTypeResource(String typeName);
-
-	JpaAnnotationProvider getAnnotationProvider();
-
-	CommandExecutorProvider getModifySharedDocumentCommandExecutorProvider();
-	
-	AnnotationEditFormatter getAnnotationEditFormatter();
-
-	void resourceChanged();
-	
-	/**
-	 * Resolve type information that could be dependent on other files being added/removed
-	 */
-	void resolveTypes();
-
-	void updateFromJava();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/LobAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/LobAnnotation.java
deleted file mode 100644
index 9caedd50f8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/LobAnnotation.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.core.resource.java;
-
-/**
- * Corresponds to the javax.persistence.Lob 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.
- */
-public interface LobAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = JPA.LOB;
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ManyToManyAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ManyToManyAnnotation.java
deleted file mode 100644
index 6e5b86205f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ManyToManyAnnotation.java
+++ /dev/null
@@ -1,53 +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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.
- */
-public interface ManyToManyAnnotation extends RelationshipMappingAnnotation
-{
-	String ANNOTATION_NAME = JPA.MANY_TO_MANY;
-
-	/**
-	 * Corresponds to the mappedBy element of the ManyToMany annotation. 
-	 * Returns null if the mappedBy element does not exist in java.
-	 */
-	String getMappedBy();
-	
-	/**
-	 * Corresponds to the mappedBy element of the ManyToMany annotation. 
-	 * Set to null to remove the mappedBy element.
-	 */
-	void setMappedBy(String mappedBy);
-		String MAPPED_BY_PROPERTY = "mappedByProperty";
-		
-	/**
-	 * Return the {@link TextRange} for the mappedBy element.  If the mappedBy element 
-	 * does not exist return the {@link TextRange} for the ManyToMany annotation.
-	 */
-	TextRange getMappedByTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return whether the specified postition touches the mappedBy element.
-	 * Return false if the mappedBy element does not exist.
-	 */
-	boolean mappedByTouches(int pos, CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ManyToOneAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ManyToOneAnnotation.java
deleted file mode 100644
index 4f0d6893e3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ManyToOneAnnotation.java
+++ /dev/null
@@ -1,47 +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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.
- */
-public interface ManyToOneAnnotation extends RelationshipMappingAnnotation
-{
-	String ANNOTATION_NAME = JPA.MANY_TO_ONE;
-	
-	/**
-	 * Corresponds to the optional element of the ManyToOne annotation.
-	 * Returns null if the optional element does not exist in java.
-	 */
-	Boolean getOptional();
-	
-	/**
-	 * Corresponds to the optional element of the ManyToOne annotation.
-	 * Set to null to remove the optional element.
-	 */
-	void setOptional(Boolean optional);
-		String OPTIONAL_PROPERTY = "optionalProperty";
-
-	/**
-	 * Return the {@link TextRange} for the optional element.  If the optional element 
-	 * does not exist return the {@link TextRange} for the ManyToOne annotation.
-	 */
-	TextRange getOptionalTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/MapKeyAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/MapKeyAnnotation.java
deleted file mode 100644
index 0402d37c40..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/MapKeyAnnotation.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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Corresponds to the javax.persistence.MapKey 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.
- */
-public interface MapKeyAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = JPA.MAP_KEY;
-
-	String getName();	
-	void setName(String name);
-		String NAME_PROPERTY = "nameProperty";
-		
-	/**
-	 * Return the {@link TextRange} for the name element.  If the name element 
-	 * does not exist return the {@link TextRange} for the MapKey annotation.
-	 */
-	TextRange getNameTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return whether the specified postition touches the name element.
-	 * Return false if the name element does not exist.
-	 */
-	public boolean nameTouches(int pos, CompilationUnit astRoot);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/MappedSuperclassAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/MappedSuperclassAnnotation.java
deleted file mode 100644
index 2d1acafaeb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/MappedSuperclassAnnotation.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.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.
- */
-public interface MappedSuperclassAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = JPA.MAPPED_SUPERCLASS;
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedColumnAnnotation.java
deleted file mode 100644
index ae9d56c765..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedColumnAnnotation.java
+++ /dev/null
@@ -1,70 +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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.
- */
-public interface NamedColumnAnnotation extends JavaResourceNode
-{
-	/**
-	 * Corresponds to the name element of the *Column annotation.
-	 * Returns null if the name valuePair does not exist in the annotation
-	 */
-	String getName();
-	
-	/**
-	 * Corresponds to the name element of the *Column annotation.
-	 * Set to null to remove the name valuePair from the annotation
-	 */
-	void setName(String name);
-		String NAME_PROPERTY = "nameProperty";
-		
-	/**
-	 * Corresponds to the columnDefinition element of the *Column annotation.
-	 * Returns null if the columnDefinition valuePair does not exist in the annotation
-	 */
-	String getColumnDefinition();
-	
-	/**
-	 * Corresponds to the columnDefinition element of the *Column annotation.
-	 * Set to null to remove the columnDefinition valuePair from the annotation
-	 */
-	void setColumnDefinition(String columnDefinition);
-		String COLUMN_DEFINITION_PROPERTY = "columnDefinitionPropety";
-
-	/**
-	 * Return the {@link TextRange} for the name element. If the name element
-	 * does not exist return the {@link TextRange} for the *Column annotation.
-	 */
-	TextRange getNameTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the columnDefinition element. If the columnDefinition 
-	 * element does not exist return the {@link TextRange} for the *Column annotation.
-	 */
-	TextRange getColumnDefinitionTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return whether the specified postition touches the name element.
-	 * Return false if the name element does not exist.
-	 */
-	boolean nameTouches(int pos, CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedNativeQueriesAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedNativeQueriesAnnotation.java
deleted file mode 100644
index 32916ba956..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedNativeQueriesAnnotation.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.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.
- */
-public interface NamedNativeQueriesAnnotation extends ContainerAnnotation<NestableNamedNativeQuery>
-{
-	String ANNOTATION_NAME = JPA.NAMED_NATIVE_QUERIES;
-
-	String NAMED_NATIVE_QUERIES_LIST = "namedNativeQueriesList";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedNativeQueryAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedNativeQueryAnnotation.java
deleted file mode 100644
index 295bd9480d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedNativeQueryAnnotation.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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-/**
- * Corresponds to the javax.persistence.NamedNativeQuery 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.
- */
-public interface NamedNativeQueryAnnotation extends QueryAnnotation
-{
-	String ANNOTATION_NAME = JPA.NAMED_NATIVE_QUERY;
-
-	/**
-	 * Corresponds to the resultClass element of the NamedNativeQuery annotation.
-	 * Returns null if the resultClass element does not exist in java.
-	 */
-	String getResultClass();
-	
-	/**
-	 * Corresponds to the resultClass element of the NamedNativeQuery annotation.
-	 * Set to null to remove the resultClass element.
-	 */
-	void setResultClass(String resultClass);
-		String RESULT_CLASS_PROPERTY = "resultClassProperty";
-	
-	/**
-	 * Corresponds to the resultSetMapping element of the NamedNativeQuery annotation.
-	 * Returns null if the resultSetMapping element does not exist in java.
-	 */
-	String getResultSetMapping();
-
-	/**
-	 * Corresponds to the resultSetMapping element of the NamedNativeQuery annotation.
-	 * Set to null to remove the resultSetMapping element.
-	 */
-	void setResultSetMapping(String resultSetMapping);
-		String RESULT_SET_MAPPING_PROPERTY = "resultSetMappingProperty";
-	
-	String getFullyQualifiedResultClass();
-	String FULLY_QUALIFIED_RESULT_CLASS_PROPERTY = "fullyQualifiedResultClassProperty";
-	
-	/**
-	 * Return the {@link TextRange} for the resultClass element. If resultClass element
-	 * does not exist return the {@link TextRange} for the NamedNativeQuery annotation.
-	 */
-	TextRange getResultClassTextRange(CompilationUnit astRoot);
-
-	
-	/**
-	 * Return the {@link TextRange} for the resultSetMapping element. If resultSetMapping element
-	 * does not exist return the {@link TextRange} for the NamedNativeQuery annotation.
-	 */
-	TextRange getResultSetMappingTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedQueriesAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedQueriesAnnotation.java
deleted file mode 100644
index c3ddcb2000..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedQueriesAnnotation.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.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.
- */
-public interface NamedQueriesAnnotation extends ContainerAnnotation<NestableNamedQuery>
-{
-	String ANNOTATION_NAME = JPA.NAMED_QUERIES;
-
-	String NAMED_QUERIES_LIST = "namedQueriesList";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedQueryAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedQueryAnnotation.java
deleted file mode 100644
index 6da7aabe69..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedQueryAnnotation.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.core.resource.java;
-
-/**
- * Corresponds to the javax.persistence.NamedQuery 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.
- */
-public interface NamedQueryAnnotation extends QueryAnnotation
-{
-	String ANNOTATION_NAME = JPA.NAMED_QUERY;
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableAnnotation.java
deleted file mode 100644
index 49502da0d9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableAnnotation.java
+++ /dev/null
@@ -1,33 +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.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.
- */
-public interface NestableAnnotation extends Annotation
-{
-	//currently using this when the NestableAnnotation is moved from
-	//standalone to nested or from nested to standalone.
-	//not the greatest since you have to make sure to call all setter methods
-	void initializeFrom(NestableAnnotation oldAnnotation);
-	
-	/**
-	 * Should only be called when the NestableAnnotation is actually nested
-	 * @param newIndex
-	 */
-	void moveAnnotation(int newIndex);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableAssociationOverride.java
deleted file mode 100644
index c6c51173b6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableAssociationOverride.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.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.
- */
-public interface NestableAssociationOverride
-	extends AssociationOverrideAnnotation, NestableAnnotation
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableAttributeOverride.java
deleted file mode 100644
index e36c20e35c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableAttributeOverride.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.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.
- */
-public interface NestableAttributeOverride
-	extends AttributeOverrideAnnotation, NestableAnnotation
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableJoinColumn.java
deleted file mode 100644
index e3dd4c60d3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableJoinColumn.java
+++ /dev/null
@@ -1,24 +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.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.
- */
-public interface NestableJoinColumn extends JoinColumnAnnotation, NestableAnnotation
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableNamedNativeQuery.java
deleted file mode 100644
index fcd8d07cf9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableNamedNativeQuery.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.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.
- */
-public interface NestableNamedNativeQuery
-	extends NamedNativeQueryAnnotation, NestableAnnotation
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableNamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableNamedQuery.java
deleted file mode 100644
index 1754fe5248..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableNamedQuery.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.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.
- */
-public interface NestableNamedQuery
-	extends NamedQueryAnnotation, NestableAnnotation
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestablePrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestablePrimaryKeyJoinColumn.java
deleted file mode 100644
index eddbe970d2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestablePrimaryKeyJoinColumn.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.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.
- */
-public interface NestablePrimaryKeyJoinColumn
-	extends PrimaryKeyJoinColumnAnnotation, NestableAnnotation
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableQueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableQueryHint.java
deleted file mode 100644
index c5f2735638..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableQueryHint.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.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.
- */
-public interface NestableQueryHint
-	extends QueryHintAnnotation, NestableAnnotation
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableSecondaryTable.java
deleted file mode 100644
index 633653c430..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableSecondaryTable.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.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.
- */
-public interface NestableSecondaryTable
-	extends SecondaryTableAnnotation, NestableAnnotation
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableUniqueConstraint.java
deleted file mode 100644
index 3beccbc357..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableUniqueConstraint.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.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.
- */
-public interface NestableUniqueConstraint
-	extends UniqueConstraintAnnotation, NestableAnnotation
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OneToManyAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OneToManyAnnotation.java
deleted file mode 100644
index 3cdea3b24f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OneToManyAnnotation.java
+++ /dev/null
@@ -1,52 +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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.
- */
-public interface OneToManyAnnotation extends RelationshipMappingAnnotation
-{
-	String ANNOTATION_NAME = JPA.ONE_TO_MANY;
-
-	/**
-	 * Corresponds to the mappedBy element of the OneToMany annotation. 
-	 * Returns null if the mappedBy element does not exist in java.
-	 */
-	String getMappedBy();
-	
-	/**
-	 * Corresponds to the mappedBy element of the OneToMany annotation. 
-	 * Set to null to remove the mappedBy element.
-	 */
-	void setMappedBy(String mappedBy);
-		String MAPPED_BY_PROPERTY = "mappedByProperty";
-	
-	/**
-	 * Return the {@link TextRange} for the mappedBy element.  If the mappedBy element 
-	 * does not exist return the {@link TextRange} for the OneToMany annotation.
-	 */
-	TextRange getMappedByTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return whether the specified postition touches the mappedBy element.
-	 * Return false if the mappedBy element does not exist.
-	 */
-	boolean mappedByTouches(int pos, CompilationUnit astRoot);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OneToOneAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OneToOneAnnotation.java
deleted file mode 100644
index aef332057c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OneToOneAnnotation.java
+++ /dev/null
@@ -1,72 +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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.
- */
-public interface OneToOneAnnotation extends RelationshipMappingAnnotation
-{
-	String ANNOTATION_NAME = JPA.ONE_TO_ONE;
-
-	/**
-	 * Corresponds to the optional element of the OneToOne annotation.
-	 * Returns null if the optional element does not exist in java.
-	 */
-	Boolean getOptional();
-	
-	/**
-	 * Corresponds to the optional element of the OneToOne annotation.
-	 * Set to null to remove the optional element.
-	 */
-	void setOptional(Boolean optional);
-		String OPTIONAL_PROPERTY = "optionalProperty";
-	
-	/**
-	 * Corresponds to the mappedBy element of the OneToOne annotation. 
-	 * Returns null if the mappedBy element does not exist in java.
-	 */
-	String getMappedBy();
-	
-	/**
-	 * Corresponds to the mappedBy element of the OneToOne annotation. 
-	 * Set to null to remove the mappedBy element.
-	 */
-	void setMappedBy(String mappedBy);
-		String MAPPED_BY_PROPERTY = "mappedByProperty";
-	
-	/**
-	 * Return the {@link TextRange} for the mappedBy element.  If the mappedBy element 
-	 * does not exist return the {@link TextRange} for the OneToOne annotation.
-	 */
-	TextRange getMappedByTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the optional element.  If the optional element 
-	 * does not exist return the {@link TextRange} for the OneToOne annotation.
-	 */
-	TextRange getOptionalTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return whether the specified postition touches the mappedBy element.
-	 * Return false if the mappedBy element does not exist.
-	 */
-	boolean mappedByTouches(int pos, CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OrderByAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OrderByAnnotation.java
deleted file mode 100644
index d72ad6e065..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OrderByAnnotation.java
+++ /dev/null
@@ -1,47 +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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Corresponds to the javax.persistence.OrderBy 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.
- */
-public interface OrderByAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = JPA.ORDER_BY;
-
-	/**
-	 * Corresponds to the value element of the javax.persistence.OrderBy annotation.
-	 * Returns null if the value valuePair does not exist in the annotation
-	 */
-	String getValue();
-	
-	/**
-	 * Corresponds to the value element of the javax.persistence.OrderBy annotation.
-	 * Setting the value to null will not remove the OrderBy annotation
-	 */
-	void setValue(String value);
-		String VALUE_PROPERTY = "valueProperty";
-		
-	/**
-	 * Return the {@link TextRange} for the value element.  If the value element 
-	 * does not exist return the {@link TextRange} for the OrderBy annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OverrideAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OverrideAnnotation.java
deleted file mode 100644
index eb95480972..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OverrideAnnotation.java
+++ /dev/null
@@ -1,52 +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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Corresponds to the javax.persistence.AttributeOverride 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.
- */
-public interface OverrideAnnotation extends JavaResourceNode
-{
-
-	/**
-	 * Corresponds to the name element of the AttributeOverride annotation.
-	 * Returns null if the name element does not exist in java.
-	 */
-	String getName();
-	
-	/**
-	 * Corresponds to the name element of the AttributeOverride annotation.
-	 * Set to null to remove the name element.
-	 */
-	void setName(String name);
-		String NAME_PROPERTY = "nameProperty";
-
-	/**
-	 * Return the {@link TextRange} for the name element. If name element
-	 * does not exist return the {@link TextRange} for the AttributeOverride annotation.
-	 */
-	TextRange getNameTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return whether the specified postition touches the table element.
-	 * Return false if the table element does not exist.
-	 */
-	boolean nameTouches(int pos, CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/PrimaryKeyJoinColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/PrimaryKeyJoinColumnAnnotation.java
deleted file mode 100644
index 02a74a1251..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/PrimaryKeyJoinColumnAnnotation.java
+++ /dev/null
@@ -1,45 +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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.
- */
-public interface PrimaryKeyJoinColumnAnnotation extends NamedColumnAnnotation
-{
-	String ANNOTATION_NAME = JPA.PRIMARY_KEY_JOIN_COLUMN;
-
-	String getReferencedColumnName();
-	
-	void setReferencedColumnName(String referencedColumnName);
-		String REFERENCED_COLUMN_NAME_PROPERTY = "referencedColumnNameProperty";
-
-	/**
-	 * Return whether the specified postition touches the referencedColumnName element.
-	 * Return false if the referencedColumnName element does not exist.
-	 */
-	boolean referencedColumnNameTouches(int pos, CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the referencedColumnName element. If the referencedColumnName 
-	 * element does not exist return the {@link TextRange} for the PrimaryKeyJoinColumn annotation.
-	 */
-	TextRange getReferencedColumnNameTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/PrimaryKeyJoinColumns.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/PrimaryKeyJoinColumns.java
deleted file mode 100644
index 69eb380186..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/PrimaryKeyJoinColumns.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.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.
- */
-public interface PrimaryKeyJoinColumns extends ContainerAnnotation<NestablePrimaryKeyJoinColumn>
-{
-	String ANNOTATION_NAME = JPA.PRIMARY_KEY_JOIN_COLUMNS;
-
-	String PK_JOIN_COLUMNS_LIST = "pkJoinColumnsList";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/QueryAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/QueryAnnotation.java
deleted file mode 100644
index 3a4defbdc0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/QueryAnnotation.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.core.resource.java;
-
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.
- */
-public interface QueryAnnotation extends JavaResourceNode
-{
-	String getName();	
-	void setName(String name);
-		String NAME_PROPERTY = "nameProperty";
-	
-	String getQuery();	
-	void setQuery(String query);
-		String QUERY_PROPERTY = "queryProperty";
-	
-	ListIterator<QueryHintAnnotation> hints();
-	
-	QueryHintAnnotation hintAt(int index);
-	
-	int indexOfHint(QueryHintAnnotation hint);
-	
-	int hintsSize();
-
-	QueryHintAnnotation addHint(int index);
-	
-	void removeHint(int index);
-	
-	void moveHint(int targetIndex, int sourceIndex);
-		String HINTS_LIST = "hintsList";
-
-	/**
-	 * Return the {@link TextRange} for the name element. If name element
-	 * does not exist return the {@link TextRange} for the *Query annotation.
-	 */
-	TextRange getNameTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the query element. If query element
-	 * does not exist return the {@link TextRange} for the *Query annotation.
-	 */
-	TextRange getQueryTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/QueryHintAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/QueryHintAnnotation.java
deleted file mode 100644
index e948cf1b70..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/QueryHintAnnotation.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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Corresponds to the javax.persistence.QueryHint 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.
- */
-public interface QueryHintAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = JPA.QUERY_HINT;
-
-	/**
-	 * Corresponds to the name element of the QueryHint annotation.
-	 * Returns null if the name valuePair does not exist in the annotation
-	 */
-	String getName();
-	
-	/**
-	 * Corresponds to the name element of the QueryHint annotation.
-	 * Setting to null will remove the name valuePair
-	 */
-	void setName(String name);
-		String NAME_PROPERTY = "nameProperty";
-		
-	/**
-	 * Corresponds to the value element of the QueryHint annotation.
-	 * Returns null if the value valuePair does not exist in the annotation
-	 */
-	String getValue();
-	
-	/**
-	 * Corresponds to the value element of the QueryHint annotation.
-	 * Setting to null will remove the value valuePair
-	 */
-	void setValue(String value);
-		String VALUE_PROPERTY = "valueProperty";
-
-	/**
-	 * Return the {@link TextRange} for the name element.  If the name element 
-	 * does not exist return the {@link TextRange} for the QueryHint annotation.
-	 */
-	TextRange getNameTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the value element.  If the value element 
-	 * does not exist return the {@link TextRange} for the QueryHint annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/RelationshipMappingAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/RelationshipMappingAnnotation.java
deleted file mode 100644
index 54b3aeeda8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/RelationshipMappingAnnotation.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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.
- */
-public interface RelationshipMappingAnnotation extends JavaResourceNode
-{
-	/**
-	 * Corresponds to the targetEntity element of the relationship 
-	 * annotations (ManyToMany, OneToMany, ManyToOne, OneToOne).
-	 * Returns null if the targetEntity element does not exist in java.
-	 * Returns the portion of the targetEntity preceding the .class.
-	 * <p>
-	 *     &#64;ManyToMany(targetEntity=Employee.class)
-	 * </p>
-	 * will return "Employee"
-	 **/
-	String getTargetEntity();	
-	
-	/**
-	 * Corresponds to the targetEntity of the relationship 
-	 * annotations (ManyToMany, OneToMany, ManyToOne, OneToOne).
-	 * Set to null to remove the targetEntity element.
-	 */
-	void setTargetEntity(String targetEntity);
-		String TARGET_ENTITY_PROPERTY = "targetEntityProperty";
-	
-	/**
-	 * Returns the qualified targetEntity name as it is resolved in the AST
-	 * <p>
-	 *     &#64;ManyToMany(targetEntity=Employee.class)
-	 * </p>
-	 * will return "model.Employee" if there is an import for model.Employee
-	 * @return
-	 */
-	String getFullyQualifiedTargetEntity();
-		String FULLY_QUALFIEID_TARGET_ENTITY_PROPERTY = "fullyQualifiedTargetEntityProperty";
-	
-	/**
-	 * Corresponds to the fetch element of the relationship 
-	 * annotations (ManyToMany, OneToMany, ManyToOne, OneToOne).
-	 * Returns null if the fetch element does not exist in java.
-	 */
-	FetchType getFetch();
-	
-	/**
-	 * Corresponds to the fetch element of the relationship 
-	 * annotations (ManyToMany, OneToMany, ManyToOne, OneToOne).
-	 * Set to null to remove the fetch element.
-	 */
-	void setFetch(FetchType fetch);
-		String FETCH_PROPERTY = "fetchProperty";
-	
-	boolean isCascadeAll();	
-	void setCascadeAll(boolean all);
-		String CASCADE_ALL_PROPERTY = "cascadeAllProperty";
-	
-	boolean isCascadeMerge();	
-	void setCascadeMerge(boolean merge);
-	String CASCADE_MERGE_PROPERTY = "cascadeMergeProperty";
-
-	boolean isCascadePersist();	
-	void setCascadePersist(boolean persist);
-		String CASCADE_PERSIST_PROPERTY = "cascadePersistProperty";
-
-	boolean isCascadeRefresh();	
-	void setCascadeRefresh(boolean refresh);
-		String CASCADE_REFRESH_PROPERTY = "cascadeRefreshProperty";
-
-	boolean isCascadeRemove();	
-	void setCascadeRemove(boolean remove);
-		String CASCADE_REMOVE_PROPERTY = "cascadeRemoveProperty";
-
-	
-	/**
-	 * Return the {@link TextRange} for the targetEntity element.  If the targetEntity element 
-	 * does not exist return the {@link TextRange} for the mapping annotation.
-	 */
-	TextRange getTargetEntityTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the fetch element.  If the fetch element 
-	 * does not exist return the {@link TextRange} for the mapping annotation.
-	 */
-	TextRange getFetchTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the cascade element.  If the cascade element 
-	 * does not exist return the {@link TextRange} for the mapping annotation.
-	 */
-	TextRange getCascadeTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/SecondaryTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/SecondaryTableAnnotation.java
deleted file mode 100644
index 99ff95b8ae..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/SecondaryTableAnnotation.java
+++ /dev/null
@@ -1,42 +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.core.resource.java;
-
-import java.util.ListIterator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 SecondaryTableAnnotation extends TableAnnotation
-{
-	String ANNOTATION_NAME = JPA.SECONDARY_TABLE;
-
-	ListIterator<PrimaryKeyJoinColumnAnnotation> pkJoinColumns();
-	
-	PrimaryKeyJoinColumnAnnotation pkJoinColumnAt(int index);
-	
-	int indexOfPkJoinColumn(PrimaryKeyJoinColumnAnnotation pkJoinColumn);
-	
-	int pkJoinColumnsSize();
-
-	PrimaryKeyJoinColumnAnnotation addPkJoinColumn(int index);
-	
-	void removePkJoinColumn(int index);
-	
-	void movePkJoinColumn(int targetIndex, int sourceIndex);
-
-	String PK_JOIN_COLUMNS_LIST = "pkJoinColumnsList";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/SecondaryTablesAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/SecondaryTablesAnnotation.java
deleted file mode 100644
index 39f9c12f0d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/SecondaryTablesAnnotation.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.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.
- */
-public interface SecondaryTablesAnnotation extends ContainerAnnotation<NestableSecondaryTable>
-{
-	String ANNOTATION_NAME = JPA.SECONDARY_TABLES;
-
-	String SECONDARY_TABLES_LIST = "secondaryTablesList";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/SequenceGeneratorAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/SequenceGeneratorAnnotation.java
deleted file mode 100644
index bac630c4f1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/SequenceGeneratorAnnotation.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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Corresponds to the javax.persistence.SequenceGenerator 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.
- */
-public interface SequenceGeneratorAnnotation extends GeneratorAnnotation
-{
-	String ANNOTATION_NAME = JPA.SEQUENCE_GENERATOR;
-
-	/**
-	 * Corresponds to the sequenceName element of the SequenceGenerator annotation.
-	 * Returns null if the sequenceName element does not exist in java.  If no other memberValuePairs exist
-	 * the SequenceGenerator annotation will be removed as well.
-	 */
-	String getSequenceName();
-	
-	/**
-	 * Corresponds to the sequenceName element of the SequenceGenerator annotation.
-	 * Set to null to remove the sequenceName element.  If no other memberValuePairs exist
-	 * the SequenceGenerator annotation will be removed as well.
-	 */
-	void setSequenceName(String sequenceName);
-		String SEQUENCE_NAME_PROPERTY = "sequenceNameProperty";
-		
-	/**
-	 * Return the {@link TextRange} for the sequenceName element.  If the sequenceName element 
-	 * does not exist return the {@link TextRange} for the SequenceGenerator annotation.
-	 */
-	TextRange getSequenceNameTextRange(CompilationUnit astRoot);
-
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TableAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TableAnnotation.java
deleted file mode 100644
index 9871e8bd2d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TableAnnotation.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.core.resource.java;
-
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-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.
- */
-public interface TableAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = JPA.TABLE;
-
-	String getName();
-	void setName(String name);
-		String NAME_PROPERTY = "nameProperty";
-		
-	String getCatalog();
-	void setCatalog(String catalog);
-		String CATALOG_PROPERTY = "catalogProperty";
-
-	String getSchema();
-	void setSchema(String schema);
-		String SCHEMA_PROPERTY = "schemaProperty";
-	
-	ListIterator<UniqueConstraintAnnotation> uniqueConstraints();
-	
-	UniqueConstraintAnnotation uniqueConstraintAt(int index);
-	
-	int indexOfUniqueConstraint(UniqueConstraintAnnotation uniqueConstraint);
-	
-	int uniqueConstraintsSize();
-
-	UniqueConstraintAnnotation addUniqueConstraint(int index);
-	
-	void removeUniqueConstraint(int index);
-	
-	void moveUniqueConstraint(int targetIndex, int sourceIndex);
-		String UNIQUE_CONSTRAINTS_LIST = "uniqueConstraintsList";
-
-	/**
-	 * Return the {@link TextRange} for the name element.  If the name element 
-	 * does not exist return the {@link TextRange} for the *Table annotation.
-	 */
-	TextRange getNameTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the catalog element.  If the catalog element 
-	 * does not exist return the {@link TextRange} for the *Table annotation.
-	 */
-	TextRange getCatalogTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the schema element.  If the schema element 
-	 * does not exist return the {@link TextRange} for the *Table annotation.
-	 */
-	TextRange getSchemaTextRange(CompilationUnit astRoot);
-	
-	/**
-	 * Return whether the specified postition touches the name element.
-	 * Return false if the name element does not exist.
-	 */
-	boolean nameTouches(int pos, CompilationUnit astRoot);
-	
-	/**
-	 * Return whether the specified postition touches the schema element.
-	 * Return false if the name element does not exist.
-	 */
-	boolean schemaTouches(int pos, CompilationUnit astRoot);
-	
-	/**
-	 * Return whether the specified postition touches the catalog element.
-	 * Return false if the name element does not exist.
-	 */
-	boolean catalogTouches(int pos, CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TableGeneratorAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TableGeneratorAnnotation.java
deleted file mode 100644
index 8758d07fb2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TableGeneratorAnnotation.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.core.resource.java;
-
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Corresponds to the javax.persistence.TableGenerator 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.
- */
-public interface TableGeneratorAnnotation extends GeneratorAnnotation
-{
-	
-	String ANNOTATION_NAME = JPA.TABLE_GENERATOR;
-
-	/**
-	 * Corresponds to the table element of the TableGenerator annotation.
-	 * Returns null if the table element does not exist in java.  If no other memberValuePairs exist
-	 * the TableGenerator annotation will be removed as well.
-	 */
-	String getTable();
-	
-	/**
-	 * Corresponds to the table element of the TableGenerator annotation.
-	 * Set to null to remove the table element.  If no other memberValuePairs exist
-	 * the TableGenerator annotation will be removed as well.
-	 */
-	void setTable(String table);
-		String TABLE_PROPERTY = "tableProperty";
-		
-	/**
-	 * Corresponds to the catalog element of the TableGenerator annotation.
-	 * Returns null if the catalog element does not exist in java.  If no other memberValuePairs exist
-	 * the TableGenerator annotation will be removed as well.
-	 */
-	String getCatalog();
-	
-	/**
-	 * Corresponds to the catalog element of the TableGenerator annotation.
-	 * Set to null to remove the catalog element.  If no other memberValuePairs exist
-	 * the TableGenerator annotation will be removed as well.
-	 */
-	void setCatalog(String catalog);
-		String CATALOG_PROPERTY = "catalogProperty";
-	
-	/**
-	 * Corresponds to the schema element of the TableGenerator annotation.
-	 * Returns null if the schema element does not exist in java.  If no other memberValuePairs exist
-	 * the TableGenerator annotation will be removed as well.
-	 */
-	String getSchema();
-	
-	/**
-	 * Corresponds to the schema element of the TableGenerator annotation.
-	 * Set to null to remove the schema element.  If no other memberValuePairs exist
-	 * the TableGenerator annotation will be removed as well.
-	 */
-	void setSchema(String schema);
-		String SCHEMA_PROPERTY = "schemaProperty";
-	
-	/**
-	 * Corresponds to the pkColumnName element of the TableGenerator annotation.
-	 * Returns null if the pkColumnName element does not exist in java.  If no other memberValuePairs exist
-	 * the TableGenerator annotation will be removed as well.
-	 */
-	String getPkColumnName();
-	
-	/**
-	 * Corresponds to the pkColumnName element of the TableGenerator annotation.
-	 * Set to null to remove the pkColumnName element.  If no other memberValuePairs exist
-	 * the TableGenerator annotation will be removed as well.
-	 */
-	void setPkColumnName(String pkColumnName);
-		String PK_COLUMN_NAME_PROPERTY = "pkColumnNameProperty";
-	
-	/**
-	 * Corresponds to the valueColumnName element of the TableGenerator annotation.
-	 * Returns null if the valueColumnName element does not exist in java.  If no other memberValuePairs exist
-	 * the TableGenerator annotation will be removed as well.
-	 */
-	String getValueColumnName();
-	
-	/**
-	 * Corresponds to the valueColumnName element of the TableGenerator annotation.
-	 * Set to null to remove the valueColumnName element.  If no other memberValuePairs exist
-	 * the TableGenerator annotation will be removed as well.
-	 */
-	void setValueColumnName(String valueColumnName);
-		String VALUE_COLUMN_NAME_PROPERTY = "valueColumnNameProperty";
-	
-	/**
-	 * Corresponds to the pkColumnValue element of the TableGenerator annotation.
-	 * Returns null if the pkColumnValue element does not exist in java.  If no other memberValuePairs exist
-	 * the TableGenerator annotation will be removed as well.
-	 */
-	String getPkColumnValue();
-	
-	/**
-	 * Corresponds to the pkColumnValue element of the TableGenerator annotation.
-	 * Set to null to remove the pkColumnValue element.  If no other memberValuePairs exist
-	 * the TableGenerator annotation will be removed as well.
-	 */
-	void setPkColumnValue(String pkColumnValue);
-		String PK_COLUMN_VALUE_PROPERTY = "pkColumnValueProperty";
-	
-	ListIterator<UniqueConstraintAnnotation> uniqueConstraints();
-	
-	UniqueConstraintAnnotation uniqueConstraintAt(int index);
-	
-	int indexOfUniqueConstraint(UniqueConstraintAnnotation uniqueConstraint);
-	
-	int uniqueConstraintsSize();
-
-	UniqueConstraintAnnotation addUniqueConstraint(int index);
-	
-	void removeUniqueConstraint(int index);
-	
-	void moveUniqueConstraint(int targetIndex, int sourceIndex);
-		String UNIQUE_CONSTRAINTS_LIST = "uniqueConstraintsList";
-
-	/**
-	 * Return the {@link TextRange} for the table element.  If the table element 
-	 * does not exist return the {@link TextRange} for the TableGenerator annotation.
-	 */
-	TextRange getTableTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the catalog element.  If the catalog element 
-	 * does not exist return the {@link TextRange} for the TableGenerator annotation.
-	 */
-	TextRange getCatalogTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the schema element.  If the schema element 
-	 * does not exist return the {@link TextRange} for the TableGenerator annotation.
-	 */
-	TextRange getSchemaTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the pkColumnName element.  If the pkColumnName element 
-	 * does not exist return the {@link TextRange} for the TableGenerator annotation.
-	 */
-	TextRange getPkColumnNameTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the valueColumnName element.  If the valueColumnName element 
-	 * does not exist return the {@link TextRange} for the TableGenerator annotation.
-	 */
-	TextRange getValueColumnNameTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the {@link TextRange} for the pkColumnValue element.  If the pkColumnValue element 
-	 * does not exist return the {@link TextRange} for the TableGenerator annotation.
-	 */
-	TextRange getPkColumnValueTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TemporalAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TemporalAnnotation.java
deleted file mode 100644
index 3f9edbb174..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TemporalAnnotation.java
+++ /dev/null
@@ -1,47 +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.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Corresponds to the javax.persistence.Temporal 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.
- */
-public interface TemporalAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = JPA.TEMPORAL;
-
-	/**
-	 * Corresponds to the value element of the Temporal annotation.
-	 * Returns null if the value element does not exist in java.
-	 */
-	TemporalType getValue();
-	
-	/**
-	 * Corresponds to the value element of the Temporal annotation.
-	 * Set to null to remove the value element.
-	 */
-	void setValue(TemporalType value);
-		String VALUE_PROPERTY = "valueProperty";
-	
-	/**
-	 * Return the {@link TextRange} for the value element.  If the value element 
-	 * does not exist return the {@link TextRange} for the Temporal annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TemporalType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TemporalType.java
deleted file mode 100644
index d658f4389c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TemporalType.java
+++ /dev/null
@@ -1,59 +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.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.
- */
-public enum TemporalType {
-	
-	DATE,
-	TIME,
-	TIMESTAMP;
-	
-	
-	public static TemporalType fromJavaAnnotationValue(Object javaAnnotationValue) {
-		if (javaAnnotationValue == null) {
-			return null;
-		}
-		if (javaAnnotationValue.equals(JPA.TEMPORAL_TYPE__DATE)) {
-			return DATE;
-		}
-		if (javaAnnotationValue.equals(JPA.TEMPORAL_TYPE__TIME)) {
-			return TIME;
-		}
-		if (javaAnnotationValue.equals(JPA.TEMPORAL_TYPE__TIMESTAMP)) {
-			return TIMESTAMP;
-		}
-		return null;
-	}
-
-	public static String toJavaAnnotationValue(TemporalType temporalType) {
-		if (temporalType == null) {
-			return null;
-		}
-		switch (temporalType) {
-			case DATE :
-				return JPA.TEMPORAL_TYPE__DATE;
-			case TIME :
-				return JPA.TEMPORAL_TYPE__TIME;
-			case TIMESTAMP :
-				return JPA.TEMPORAL_TYPE__TIMESTAMP;
-			default :
-				throw new IllegalArgumentException("unknown temporal type: " + temporalType);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TransientAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TransientAnnotation.java
deleted file mode 100644
index 5b83a4a4df..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TransientAnnotation.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.core.resource.java;
-
-/**
- * Corresponds to the javax.persistence.Transient 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.
- */
-public interface TransientAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = JPA.TRANSIENT;
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/UniqueConstraintAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/UniqueConstraintAnnotation.java
deleted file mode 100644
index 44629289ff..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/UniqueConstraintAnnotation.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.core.resource.java;
-
-import java.util.ListIterator;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-/**
- * Corresponds to the javax.persistence.UniqueConstraint 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.
- */
-public interface UniqueConstraintAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = JPA.UNIQUE_CONSTRAINT;
-
-	ListIterator<String> columnNames();
-
-	int columnNamesSize();
-	
-	void addColumnName(String columnName);
-
-	void addColumnName(int index, String columnName);
-	
-	void removeColumnName(String columnName);
-	
-	void removeColumnName(int index);
-	
-	void moveColumnName(int targetIndex, int sourceIndex);
-		String COLUMN_NAMES_LIST = "columnNamesList";
-		
-	/**
-	 * Return whether the specified postition touches the columnNames element.
-	 * Return false if the columnNames element does not exist.
-	 */
-	boolean columnNamesTouches(int pos, CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/VersionAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/VersionAnnotation.java
deleted file mode 100644
index 03583a5cf3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/VersionAnnotation.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.core.resource.java;
-
-/**
- * Corresponds to the javax.persistence.Version 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.
- */
-public interface VersionAnnotation extends JavaResourceNode
-{
-	String ANNOTATION_NAME = JPA.VERSION;
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlAbstractColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlAbstractColumn.java
deleted file mode 100644
index 334faf53a7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlAbstractColumn.java
+++ /dev/null
@@ -1,518 +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.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.internal.utility.emf.DOMUtilities;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Xml Abstract Column</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.core.resource.orm.OrmPackage#getAbstractXmlAbstractColumn()
- * @model kind="class" abstract="true"
- * @generated
- */
-public abstract class AbstractXmlAbstractColumn extends AbstractXmlNamedColumn implements XmlAbstractColumn
-{
-	/**
-	 * The default value of the '{@link #getInsertable() <em>Insertable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInsertable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean INSERTABLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getInsertable() <em>Insertable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInsertable()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean insertable = INSERTABLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getNullable() <em>Nullable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNullable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean NULLABLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getNullable() <em>Nullable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNullable()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean nullable = NULLABLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTable() <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TABLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTable() <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected String table = TABLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getUnique() <em>Unique</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUnique()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean UNIQUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUnique() <em>Unique</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUnique()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean unique = UNIQUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getUpdatable() <em>Updatable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUpdatable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean UPDATABLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUpdatable() <em>Updatable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUpdatable()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean updatable = UPDATABLE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AbstractXmlAbstractColumn()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.ABSTRACT_XML_ABSTRACT_COLUMN;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Insertable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Insertable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Insertable</em>' attribute.
-	 * @see #setInsertable(Boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAbstractColumn_Insertable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getInsertable()
-	{
-		return insertable;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlAbstractColumn#getInsertable <em>Insertable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Insertable</em>' attribute.
-	 * @see #getInsertable()
-	 * @generated
-	 */
-	public void setInsertable(Boolean newInsertable)
-	{
-		Boolean oldInsertable = insertable;
-		insertable = newInsertable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__INSERTABLE, oldInsertable, insertable));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Nullable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Nullable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Nullable</em>' attribute.
-	 * @see #setNullable(Boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAbstractColumn_Nullable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getNullable()
-	{
-		return nullable;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlAbstractColumn#getNullable <em>Nullable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Nullable</em>' attribute.
-	 * @see #getNullable()
-	 * @generated
-	 */
-	public void setNullable(Boolean newNullable)
-	{
-		Boolean oldNullable = nullable;
-		nullable = newNullable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__NULLABLE, oldNullable, nullable));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Table</em>' attribute.
-	 * @see #setTable(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAbstractColumn_Table()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getTable()
-	{
-		return table;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlAbstractColumn#getTable <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Table</em>' attribute.
-	 * @see #getTable()
-	 * @generated
-	 */
-	public void setTable(String newTable)
-	{
-		String oldTable = table;
-		table = newTable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__TABLE, oldTable, table));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Unique</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Unique</em>' attribute.
-	 * @see #setUnique(Boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAbstractColumn_Unique()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getUnique()
-	{
-		return unique;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlAbstractColumn#getUnique <em>Unique</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Unique</em>' attribute.
-	 * @see #getUnique()
-	 * @generated
-	 */
-	public void setUnique(Boolean newUnique)
-	{
-		Boolean oldUnique = unique;
-		unique = newUnique;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__UNIQUE, oldUnique, unique));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Updatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Updatable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Updatable</em>' attribute.
-	 * @see #setUpdatable(Boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAbstractColumn_Updatable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getUpdatable()
-	{
-		return updatable;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlAbstractColumn#getUpdatable <em>Updatable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Updatable</em>' attribute.
-	 * @see #getUpdatable()
-	 * @generated
-	 */
-	public void setUpdatable(Boolean newUpdatable)
-	{
-		Boolean oldUpdatable = updatable;
-		updatable = newUpdatable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__UPDATABLE, oldUpdatable, updatable));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__INSERTABLE:
-				return getInsertable();
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__NULLABLE:
-				return getNullable();
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__TABLE:
-				return getTable();
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__UNIQUE:
-				return getUnique();
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__UPDATABLE:
-				return getUpdatable();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__INSERTABLE:
-				setInsertable((Boolean)newValue);
-				return;
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__NULLABLE:
-				setNullable((Boolean)newValue);
-				return;
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__TABLE:
-				setTable((String)newValue);
-				return;
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__UNIQUE:
-				setUnique((Boolean)newValue);
-				return;
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__UPDATABLE:
-				setUpdatable((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__INSERTABLE:
-				setInsertable(INSERTABLE_EDEFAULT);
-				return;
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__NULLABLE:
-				setNullable(NULLABLE_EDEFAULT);
-				return;
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__TABLE:
-				setTable(TABLE_EDEFAULT);
-				return;
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__UNIQUE:
-				setUnique(UNIQUE_EDEFAULT);
-				return;
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__UPDATABLE:
-				setUpdatable(UPDATABLE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__INSERTABLE:
-				return INSERTABLE_EDEFAULT == null ? insertable != null : !INSERTABLE_EDEFAULT.equals(insertable);
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__NULLABLE:
-				return NULLABLE_EDEFAULT == null ? nullable != null : !NULLABLE_EDEFAULT.equals(nullable);
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__TABLE:
-				return TABLE_EDEFAULT == null ? table != null : !TABLE_EDEFAULT.equals(table);
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__UNIQUE:
-				return UNIQUE_EDEFAULT == null ? unique != null : !UNIQUE_EDEFAULT.equals(unique);
-			case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__UPDATABLE:
-				return UPDATABLE_EDEFAULT == null ? updatable != null : !UPDATABLE_EDEFAULT.equals(updatable);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAbstractColumn.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__INSERTABLE: return OrmPackage.XML_ABSTRACT_COLUMN__INSERTABLE;
-				case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__NULLABLE: return OrmPackage.XML_ABSTRACT_COLUMN__NULLABLE;
-				case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__TABLE: return OrmPackage.XML_ABSTRACT_COLUMN__TABLE;
-				case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__UNIQUE: return OrmPackage.XML_ABSTRACT_COLUMN__UNIQUE;
-				case OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__UPDATABLE: return OrmPackage.XML_ABSTRACT_COLUMN__UPDATABLE;
-				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 == XmlAbstractColumn.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_ABSTRACT_COLUMN__INSERTABLE: return OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__INSERTABLE;
-				case OrmPackage.XML_ABSTRACT_COLUMN__NULLABLE: return OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__NULLABLE;
-				case OrmPackage.XML_ABSTRACT_COLUMN__TABLE: return OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__TABLE;
-				case OrmPackage.XML_ABSTRACT_COLUMN__UNIQUE: return OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__UNIQUE;
-				case OrmPackage.XML_ABSTRACT_COLUMN__UPDATABLE: return OrmPackage.ABSTRACT_XML_ABSTRACT_COLUMN__UPDATABLE;
-				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(" (insertable: ");
-		result.append(insertable);
-		result.append(", nullable: ");
-		result.append(nullable);
-		result.append(", table: ");
-		result.append(table);
-		result.append(", unique: ");
-		result.append(unique);
-		result.append(", updatable: ");
-		result.append(updatable);
-		result.append(')');
-		return result.toString();
-	}
-
-	public TextRange getTableTextRange() {
-		IDOMNode tableNode = (IDOMNode) DOMUtilities.childAttributeNode(this.node, OrmXmlMapper.TABLE);
-		return (tableNode == null) ? getValidationTextRange() : buildTextRange(tableNode);
-	}
-} // AbstractXmlAbstractColumn
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlAttributeMapping.java
deleted file mode 100644
index 61efb9f072..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlAttributeMapping.java
+++ /dev/null
@@ -1,203 +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.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.internal.utility.emf.DOMUtilities;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Xml Attribute Mapping</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractXmlAttributeMapping()
- * @model kind="class" abstract="true"
- * @generated
- */
-public abstract class AbstractXmlAttributeMapping extends AbstractJpaEObject implements XmlAttributeMapping
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AbstractXmlAttributeMapping()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.ABSTRACT_XML_ATTRIBUTE_MAPPING;
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlAttributeMapping_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlAttributeMapping#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, OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getNameTextRange() {
-		IDOMNode nameNode = (IDOMNode) DOMUtilities.childAttributeNode(this.node, OrmXmlMapper.NAME);
-		return (nameNode != null) ? this.buildTextRange(nameNode) : this.getValidationTextRange();
-	}
-
-} // AbstractXmlAttributeMapping
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlBaseTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlBaseTable.java
deleted file mode 100644
index c778d23fd9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlBaseTable.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.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.internal.resource.orm.translators.OrmXmlMapper;
-import org.eclipse.jpt.core.internal.utility.emf.DOMUtilities;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Xml Base Table</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractXmlBaseTable()
- * @model kind="class" abstract="true"
- * @generated
- */
-public abstract class AbstractXmlBaseTable extends AbstractJpaEObject implements XmlBaseTable
-{
-	/**
-	 * 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 #getCatalog() <em>Catalog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCatalog()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CATALOG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCatalog() <em>Catalog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCatalog()
-	 * @generated
-	 * @ordered
-	 */
-	protected String catalog = CATALOG_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSchema() <em>Schema</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSchema()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SCHEMA_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSchema() <em>Schema</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSchema()
-	 * @generated
-	 * @ordered
-	 */
-	protected String schema = SCHEMA_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getUniqueConstraints() <em>Unique Constraints</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUniqueConstraints()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlUniqueConstraint> uniqueConstraints;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AbstractXmlBaseTable()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.ABSTRACT_XML_BASE_TABLE;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBaseTable_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.core.resource.orm.AbstractXmlBaseTable#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, OrmPackage.ABSTRACT_XML_BASE_TABLE__NAME, oldName, name));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Catalog</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Catalog</em>' attribute.
-	 * @see #setCatalog(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBaseTable_Catalog()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getCatalog()
-	{
-		return catalog;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlBaseTable#getCatalog <em>Catalog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Catalog</em>' attribute.
-	 * @see #getCatalog()
-	 * @generated
-	 */
-	public void setCatalog(String newCatalog)
-	{
-		String oldCatalog = catalog;
-		catalog = newCatalog;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_BASE_TABLE__CATALOG, oldCatalog, catalog));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Schema</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Schema</em>' attribute.
-	 * @see #setSchema(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBaseTable_Schema()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getSchema()
-	{
-		return schema;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlBaseTable#getSchema <em>Schema</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Schema</em>' attribute.
-	 * @see #getSchema()
-	 * @generated
-	 */
-	public void setSchema(String newSchema)
-	{
-		String oldSchema = schema;
-		schema = newSchema;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_BASE_TABLE__SCHEMA, oldSchema, schema));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Unique Constraints</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Unique Constraints</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>Unique Constraints</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBaseTable_UniqueConstraints()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlUniqueConstraint> getUniqueConstraints()
-	{
-		if (uniqueConstraints == null)
-		{
-			uniqueConstraints = new EObjectContainmentEList<XmlUniqueConstraint>(XmlUniqueConstraint.class, this, OrmPackage.ABSTRACT_XML_BASE_TABLE__UNIQUE_CONSTRAINTS);
-		}
-		return uniqueConstraints;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_BASE_TABLE__UNIQUE_CONSTRAINTS:
-				return ((InternalEList<?>)getUniqueConstraints()).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 OrmPackage.ABSTRACT_XML_BASE_TABLE__NAME:
-				return getName();
-			case OrmPackage.ABSTRACT_XML_BASE_TABLE__CATALOG:
-				return getCatalog();
-			case OrmPackage.ABSTRACT_XML_BASE_TABLE__SCHEMA:
-				return getSchema();
-			case OrmPackage.ABSTRACT_XML_BASE_TABLE__UNIQUE_CONSTRAINTS:
-				return getUniqueConstraints();
-		}
-		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 OrmPackage.ABSTRACT_XML_BASE_TABLE__NAME:
-				setName((String)newValue);
-				return;
-			case OrmPackage.ABSTRACT_XML_BASE_TABLE__CATALOG:
-				setCatalog((String)newValue);
-				return;
-			case OrmPackage.ABSTRACT_XML_BASE_TABLE__SCHEMA:
-				setSchema((String)newValue);
-				return;
-			case OrmPackage.ABSTRACT_XML_BASE_TABLE__UNIQUE_CONSTRAINTS:
-				getUniqueConstraints().clear();
-				getUniqueConstraints().addAll((Collection<? extends XmlUniqueConstraint>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_BASE_TABLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case OrmPackage.ABSTRACT_XML_BASE_TABLE__CATALOG:
-				setCatalog(CATALOG_EDEFAULT);
-				return;
-			case OrmPackage.ABSTRACT_XML_BASE_TABLE__SCHEMA:
-				setSchema(SCHEMA_EDEFAULT);
-				return;
-			case OrmPackage.ABSTRACT_XML_BASE_TABLE__UNIQUE_CONSTRAINTS:
-				getUniqueConstraints().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_BASE_TABLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case OrmPackage.ABSTRACT_XML_BASE_TABLE__CATALOG:
-				return CATALOG_EDEFAULT == null ? catalog != null : !CATALOG_EDEFAULT.equals(catalog);
-			case OrmPackage.ABSTRACT_XML_BASE_TABLE__SCHEMA:
-				return SCHEMA_EDEFAULT == null ? schema != null : !SCHEMA_EDEFAULT.equals(schema);
-			case OrmPackage.ABSTRACT_XML_BASE_TABLE__UNIQUE_CONSTRAINTS:
-				return uniqueConstraints != null && !uniqueConstraints.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(", catalog: ");
-		result.append(catalog);
-		result.append(", schema: ");
-		result.append(schema);
-		result.append(')');
-		return result.toString();
-	}
-
-
-	public TextRange getNameTextRange() {
-		IDOMNode nameNode = (IDOMNode) DOMUtilities.childAttributeNode(this.node, OrmXmlMapper.NAME);
-		return (nameNode == null) ? getValidationTextRange() : buildTextRange(nameNode);
-	}
-	
-	public TextRange getCatalogTextRange() {
-		IDOMNode catalogNode = (IDOMNode) DOMUtilities.childAttributeNode(this.node, OrmXmlMapper.CATALOG);
-		return (catalogNode == null) ? getValidationTextRange() : buildTextRange(catalogNode);
-	}
-	
-	public TextRange getSchemaTextRange() {
-		IDOMNode schemaNode = (IDOMNode) DOMUtilities.childAttributeNode(this.node, OrmXmlMapper.SCHEMA);
-		return (schemaNode == null) ? getValidationTextRange() : buildTextRange(schemaNode);
-	}
-
-} // AbstractXmlBaseTable
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlNamedColumn.java
deleted file mode 100644
index 041e8c2b34..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlNamedColumn.java
+++ /dev/null
@@ -1,273 +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.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.internal.utility.emf.DOMUtilities;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Xml Named Column</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.core.resource.orm.OrmPackage#getAbstractXmlNamedColumn()
- * @model kind="class" abstract="true"
- * @generated
- */
-public abstract class AbstractXmlNamedColumn extends AbstractJpaEObject implements XmlNamedColumn
-{
-	/**
-	 * The default value of the '{@link #getColumnDefinition() <em>Column Definition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getColumnDefinition()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COLUMN_DEFINITION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getColumnDefinition() <em>Column Definition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getColumnDefinition()
-	 * @generated
-	 * @ordered
-	 */
-	protected String columnDefinition = COLUMN_DEFINITION_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;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AbstractXmlNamedColumn()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.ABSTRACT_XML_NAMED_COLUMN;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Column Definition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Column Definition</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Column Definition</em>' attribute.
-	 * @see #setColumnDefinition(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlNamedColumn_ColumnDefinition()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getColumnDefinition()
-	{
-		return columnDefinition;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlNamedColumn#getColumnDefinition <em>Column Definition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Column Definition</em>' attribute.
-	 * @see #getColumnDefinition()
-	 * @generated
-	 */
-	public void setColumnDefinition(String newColumnDefinition)
-	{
-		String oldColumnDefinition = columnDefinition;
-		columnDefinition = newColumnDefinition;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_NAMED_COLUMN__COLUMN_DEFINITION, oldColumnDefinition, columnDefinition));
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlNamedColumn_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.core.resource.orm.AbstractXmlNamedColumn#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, OrmPackage.ABSTRACT_XML_NAMED_COLUMN__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_NAMED_COLUMN__COLUMN_DEFINITION:
-				return getColumnDefinition();
-			case OrmPackage.ABSTRACT_XML_NAMED_COLUMN__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_NAMED_COLUMN__COLUMN_DEFINITION:
-				setColumnDefinition((String)newValue);
-				return;
-			case OrmPackage.ABSTRACT_XML_NAMED_COLUMN__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_NAMED_COLUMN__COLUMN_DEFINITION:
-				setColumnDefinition(COLUMN_DEFINITION_EDEFAULT);
-				return;
-			case OrmPackage.ABSTRACT_XML_NAMED_COLUMN__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_NAMED_COLUMN__COLUMN_DEFINITION:
-				return COLUMN_DEFINITION_EDEFAULT == null ? columnDefinition != null : !COLUMN_DEFINITION_EDEFAULT.equals(columnDefinition);
-			case OrmPackage.ABSTRACT_XML_NAMED_COLUMN__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (columnDefinition: ");
-		result.append(columnDefinition);
-		result.append(", name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getNameTextRange() {
-		IDOMNode nameNode = (IDOMNode) DOMUtilities.childAttributeNode(this.node, OrmXmlMapper.NAME);
-		return (nameNode == null) ? getValidationTextRange() : buildTextRange(nameNode);
-	}
-
-} // AbstractXmlNamedColumn
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlTypeMapping.java
deleted file mode 100644
index ac633e92d2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlTypeMapping.java
+++ /dev/null
@@ -1,526 +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.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.internal.resource.orm.translators.OrmXmlMapper;
-import org.eclipse.jpt.core.internal.utility.emf.DOMUtilities;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Type Mapping</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#getClassName <em>Class Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#getAccess <em>Access</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#getMetadataComplete <em>Metadata Complete</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#getAttributes <em>Attributes</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractXmlTypeMapping()
- * @model kind="class" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public abstract class AbstractXmlTypeMapping extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * 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;
-
-	/**
-	 * 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 default value of the '{@link #getMetadataComplete() <em>Metadata Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMetadataComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean METADATA_COMPLETE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMetadataComplete() <em>Metadata Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMetadataComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean metadataComplete = METADATA_COMPLETE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributes()
-	 * @generated
-	 * @ordered
-	 */
-	protected Attributes attributes;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AbstractXmlTypeMapping()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.ABSTRACT_XML_TYPE_MAPPING;
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getAbstractXmlTypeMapping_ClassName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getClassName()
-	{
-		return className;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#getClassName <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class Name</em>' attribute.
-	 * @see #getClassName()
-	 * @generated
-	 */
-	public void setClassName(String newClassName)
-	{
-		String oldClassName = className;
-		className = newClassName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME, oldClassName, className));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access</b></em>' attribute.
-	 * 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.core.resource.orm.OrmPackage#getAbstractXmlTypeMapping_Access()
-	 * @model default="PROPERTY"
-	 * @generated
-	 */
-	public AccessType getAccess()
-	{
-		return access;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#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, OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ACCESS, oldAccess, access));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Metadata Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Metadata Complete</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Metadata Complete</em>' attribute.
-	 * @see #setMetadataComplete(Boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractXmlTypeMapping_MetadataComplete()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getMetadataComplete()
-	{
-		return metadataComplete;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#getMetadataComplete <em>Metadata Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Metadata Complete</em>' attribute.
-	 * @see #getMetadataComplete()
-	 * @generated
-	 */
-	public void setMetadataComplete(Boolean newMetadataComplete)
-	{
-		Boolean oldMetadataComplete = metadataComplete;
-		metadataComplete = newMetadataComplete;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE, oldMetadataComplete, metadataComplete));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractXmlTypeMapping_Description()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getDescription()
-	{
-		return description;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	public void setDescription(String newDescription)
-	{
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Attributes</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attributes</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Attributes</em>' containment reference.
-	 * @see #setAttributes(Attributes)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractXmlTypeMapping_Attributes()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public Attributes getAttributes()
-	{
-		return attributes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAttributes(Attributes newAttributes, NotificationChain msgs)
-	{
-		Attributes oldAttributes = attributes;
-		attributes = newAttributes;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES, oldAttributes, newAttributes);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#getAttributes <em>Attributes</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attributes</em>' containment reference.
-	 * @see #getAttributes()
-	 * @generated
-	 */
-	public void setAttributes(Attributes newAttributes)
-	{
-		if (newAttributes != attributes)
-		{
-			NotificationChain msgs = null;
-			if (attributes != null)
-				msgs = ((InternalEObject)attributes).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES, null, msgs);
-			if (newAttributes != null)
-				msgs = ((InternalEObject)newAttributes).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES, null, msgs);
-			msgs = basicSetAttributes(newAttributes, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES, newAttributes, newAttributes));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES:
-				return basicSetAttributes(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 OrmPackage.ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME:
-				return getClassName();
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ACCESS:
-				return getAccess();
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE:
-				return getMetadataComplete();
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION:
-				return getDescription();
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES:
-				return getAttributes();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME:
-				setClassName((String)newValue);
-				return;
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ACCESS:
-				setAccess((AccessType)newValue);
-				return;
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE:
-				setMetadataComplete((Boolean)newValue);
-				return;
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES:
-				setAttributes((Attributes)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME:
-				setClassName(CLASS_NAME_EDEFAULT);
-				return;
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ACCESS:
-				setAccess(ACCESS_EDEFAULT);
-				return;
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE:
-				setMetadataComplete(METADATA_COMPLETE_EDEFAULT);
-				return;
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES:
-				setAttributes((Attributes)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME:
-				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ACCESS:
-				return access != ACCESS_EDEFAULT;
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE:
-				return METADATA_COMPLETE_EDEFAULT == null ? metadataComplete != null : !METADATA_COMPLETE_EDEFAULT.equals(metadataComplete);
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES:
-				return attributes != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (className: ");
-		result.append(className);
-		result.append(", access: ");
-		result.append(access);
-		result.append(", metadataComplete: ");
-		result.append(metadataComplete);
-		result.append(", description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-	
-
-	public TextRange getClassTextRange() {
-		IDOMNode classNode = (IDOMNode) DOMUtilities.childAttributeNode(node, OrmXmlMapper.CLASS);
-		if (classNode != null) {
-			return buildTextRange(classNode);
-		}
-		return getValidationTextRange();
-	}
-
-	public TextRange getAttributesTextRange() {
-		IDOMNode attributesNode = (IDOMNode) DOMUtilities.getNodeChild(node, OrmXmlMapper.ATTRIBUTES);
-		if (attributesNode != null) {
-			return buildTextRange(attributesNode);
-		}
-		return getValidationTextRange();
-	}
-
-} // TypeMapping
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AccessType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AccessType.java
deleted file mode 100644
index aae4803e05..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AccessType.java
+++ /dev/null
@@ -1,235 +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.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>Access 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.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAccessType()
- * @model
- * @generated
- */
-public enum AccessType implements Enumerator
-{
-	/**
-	 * The '<em><b>PROPERTY</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PROPERTY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	PROPERTY(0, "PROPERTY", "PROPERTY"),
-
-	/**
-	 * The '<em><b>FIELD</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FIELD_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	FIELD(1, "FIELD", "FIELD");
-
-	/**
-	 * The '<em><b>PROPERTY</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>PROPERTY</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #PROPERTY
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PROPERTY_VALUE = 0;
-
-	/**
-	 * The '<em><b>FIELD</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>FIELD</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FIELD
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FIELD_VALUE = 1;
-
-	/**
-	 * An array of all the '<em><b>Access Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final AccessType[] VALUES_ARRAY =
-		new AccessType[]
-		{
-			PROPERTY,
-			FIELD,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Access Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<AccessType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Access Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AccessType get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			AccessType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Access Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AccessType getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			AccessType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Access Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AccessType get(int value)
-	{
-		switch (value)
-		{
-			case PROPERTY_VALUE: return PROPERTY;
-			case FIELD_VALUE: return FIELD;
-		}
-		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 AccessType(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;
-	}
-	
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/Attributes.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/Attributes.java
deleted file mode 100644
index a3845c7342..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/Attributes.java
+++ /dev/null
@@ -1,608 +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.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;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- 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.core.resource.orm.Attributes#getIds <em>Ids</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getEmbeddedIds <em>Embedded Ids</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getBasics <em>Basics</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getVersions <em>Versions</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getManyToOnes <em>Many To Ones</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getOneToManys <em>One To Manys</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getOneToOnes <em>One To Ones</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getManyToManys <em>Many To Manys</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getEmbeddeds <em>Embeddeds</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getTransients <em>Transients</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class Attributes extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The cached value of the '{@link #getIds() <em>Ids</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIds()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlId> ids;
-
-	/**
-	 * The cached value of the '{@link #getEmbeddedIds() <em>Embedded Ids</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEmbeddedIds()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlEmbeddedId> embeddedIds;
-
-	/**
-	 * The cached value of the '{@link #getBasics() <em>Basics</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBasics()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlBasic> basics;
-
-	/**
-	 * The cached value of the '{@link #getVersions() <em>Versions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlVersion> versions;
-
-	/**
-	 * The cached value of the '{@link #getManyToOnes() <em>Many To Ones</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getManyToOnes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlManyToOne> manyToOnes;
-
-	/**
-	 * The cached value of the '{@link #getOneToManys() <em>One To Manys</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOneToManys()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlOneToMany> oneToManys;
-
-	/**
-	 * The cached value of the '{@link #getOneToOnes() <em>One To Ones</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOneToOnes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlOneToOne> oneToOnes;
-
-	/**
-	 * The cached value of the '{@link #getManyToManys() <em>Many To Manys</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getManyToManys()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlManyToMany> manyToManys;
-
-	/**
-	 * The cached value of the '{@link #getEmbeddeds() <em>Embeddeds</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEmbeddeds()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlEmbedded> embeddeds;
-
-	/**
-	 * The cached value of the '{@link #getTransients() <em>Transients</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransients()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlTransient> transients;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Attributes()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.ATTRIBUTES;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Ids</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlId}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ids</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>Ids</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_Ids()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlId> getIds()
-	{
-		if (ids == null)
-		{
-			ids = new EObjectContainmentEList<XmlId>(XmlId.class, this, OrmPackage.ATTRIBUTES__IDS);
-		}
-		return ids;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Embedded Ids</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlEmbeddedId}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Embedded Ids</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>Embedded Ids</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_EmbeddedIds()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlEmbeddedId> getEmbeddedIds()
-	{
-		if (embeddedIds == null)
-		{
-			embeddedIds = new EObjectContainmentEList<XmlEmbeddedId>(XmlEmbeddedId.class, this, OrmPackage.ATTRIBUTES__EMBEDDED_IDS);
-		}
-		return embeddedIds;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Basics</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlBasic}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Basics</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>Basics</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_Basics()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlBasic> getBasics()
-	{
-		if (basics == null)
-		{
-			basics = new EObjectContainmentEList<XmlBasic>(XmlBasic.class, this, OrmPackage.ATTRIBUTES__BASICS);
-		}
-		return basics;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Versions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlVersion}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Versions</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>Versions</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_Versions()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlVersion> getVersions()
-	{
-		if (versions == null)
-		{
-			versions = new EObjectContainmentEList<XmlVersion>(XmlVersion.class, this, OrmPackage.ATTRIBUTES__VERSIONS);
-		}
-		return versions;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Many To Ones</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlManyToOne}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Many 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>Many To Ones</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_ManyToOnes()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlManyToOne> getManyToOnes()
-	{
-		if (manyToOnes == null)
-		{
-			manyToOnes = new EObjectContainmentEList<XmlManyToOne>(XmlManyToOne.class, this, OrmPackage.ATTRIBUTES__MANY_TO_ONES);
-		}
-		return manyToOnes;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>One To Manys</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlOneToMany}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>One To Manys</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>One To Manys</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_OneToManys()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlOneToMany> getOneToManys()
-	{
-		if (oneToManys == null)
-		{
-			oneToManys = new EObjectContainmentEList<XmlOneToMany>(XmlOneToMany.class, this, OrmPackage.ATTRIBUTES__ONE_TO_MANYS);
-		}
-		return oneToManys;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>One To Ones</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlOneToOne}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>One To Ones</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_OneToOnes()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlOneToOne> getOneToOnes()
-	{
-		if (oneToOnes == null)
-		{
-			oneToOnes = new EObjectContainmentEList<XmlOneToOne>(XmlOneToOne.class, this, OrmPackage.ATTRIBUTES__ONE_TO_ONES);
-		}
-		return oneToOnes;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Many To Manys</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlManyToMany}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Many To Manys</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>Many To Manys</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_ManyToManys()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlManyToMany> getManyToManys()
-	{
-		if (manyToManys == null)
-		{
-			manyToManys = new EObjectContainmentEList<XmlManyToMany>(XmlManyToMany.class, this, OrmPackage.ATTRIBUTES__MANY_TO_MANYS);
-		}
-		return manyToManys;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Embeddeds</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlEmbedded}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Embeddeds</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>Embeddeds</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_Embeddeds()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlEmbedded> getEmbeddeds()
-	{
-		if (embeddeds == null)
-		{
-			embeddeds = new EObjectContainmentEList<XmlEmbedded>(XmlEmbedded.class, this, OrmPackage.ATTRIBUTES__EMBEDDEDS);
-		}
-		return embeddeds;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Transients</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlTransient}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Transients</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>Transients</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_Transients()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlTransient> getTransients()
-	{
-		if (transients == null)
-		{
-			transients = new EObjectContainmentEList<XmlTransient>(XmlTransient.class, this, OrmPackage.ATTRIBUTES__TRANSIENTS);
-		}
-		return transients;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ATTRIBUTES__IDS:
-				return ((InternalEList<?>)getIds()).basicRemove(otherEnd, msgs);
-			case OrmPackage.ATTRIBUTES__EMBEDDED_IDS:
-				return ((InternalEList<?>)getEmbeddedIds()).basicRemove(otherEnd, msgs);
-			case OrmPackage.ATTRIBUTES__BASICS:
-				return ((InternalEList<?>)getBasics()).basicRemove(otherEnd, msgs);
-			case OrmPackage.ATTRIBUTES__VERSIONS:
-				return ((InternalEList<?>)getVersions()).basicRemove(otherEnd, msgs);
-			case OrmPackage.ATTRIBUTES__MANY_TO_ONES:
-				return ((InternalEList<?>)getManyToOnes()).basicRemove(otherEnd, msgs);
-			case OrmPackage.ATTRIBUTES__ONE_TO_MANYS:
-				return ((InternalEList<?>)getOneToManys()).basicRemove(otherEnd, msgs);
-			case OrmPackage.ATTRIBUTES__ONE_TO_ONES:
-				return ((InternalEList<?>)getOneToOnes()).basicRemove(otherEnd, msgs);
-			case OrmPackage.ATTRIBUTES__MANY_TO_MANYS:
-				return ((InternalEList<?>)getManyToManys()).basicRemove(otherEnd, msgs);
-			case OrmPackage.ATTRIBUTES__EMBEDDEDS:
-				return ((InternalEList<?>)getEmbeddeds()).basicRemove(otherEnd, msgs);
-			case OrmPackage.ATTRIBUTES__TRANSIENTS:
-				return ((InternalEList<?>)getTransients()).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 OrmPackage.ATTRIBUTES__IDS:
-				return getIds();
-			case OrmPackage.ATTRIBUTES__EMBEDDED_IDS:
-				return getEmbeddedIds();
-			case OrmPackage.ATTRIBUTES__BASICS:
-				return getBasics();
-			case OrmPackage.ATTRIBUTES__VERSIONS:
-				return getVersions();
-			case OrmPackage.ATTRIBUTES__MANY_TO_ONES:
-				return getManyToOnes();
-			case OrmPackage.ATTRIBUTES__ONE_TO_MANYS:
-				return getOneToManys();
-			case OrmPackage.ATTRIBUTES__ONE_TO_ONES:
-				return getOneToOnes();
-			case OrmPackage.ATTRIBUTES__MANY_TO_MANYS:
-				return getManyToManys();
-			case OrmPackage.ATTRIBUTES__EMBEDDEDS:
-				return getEmbeddeds();
-			case OrmPackage.ATTRIBUTES__TRANSIENTS:
-				return getTransients();
-		}
-		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 OrmPackage.ATTRIBUTES__IDS:
-				getIds().clear();
-				getIds().addAll((Collection<? extends XmlId>)newValue);
-				return;
-			case OrmPackage.ATTRIBUTES__EMBEDDED_IDS:
-				getEmbeddedIds().clear();
-				getEmbeddedIds().addAll((Collection<? extends XmlEmbeddedId>)newValue);
-				return;
-			case OrmPackage.ATTRIBUTES__BASICS:
-				getBasics().clear();
-				getBasics().addAll((Collection<? extends XmlBasic>)newValue);
-				return;
-			case OrmPackage.ATTRIBUTES__VERSIONS:
-				getVersions().clear();
-				getVersions().addAll((Collection<? extends XmlVersion>)newValue);
-				return;
-			case OrmPackage.ATTRIBUTES__MANY_TO_ONES:
-				getManyToOnes().clear();
-				getManyToOnes().addAll((Collection<? extends XmlManyToOne>)newValue);
-				return;
-			case OrmPackage.ATTRIBUTES__ONE_TO_MANYS:
-				getOneToManys().clear();
-				getOneToManys().addAll((Collection<? extends XmlOneToMany>)newValue);
-				return;
-			case OrmPackage.ATTRIBUTES__ONE_TO_ONES:
-				getOneToOnes().clear();
-				getOneToOnes().addAll((Collection<? extends XmlOneToOne>)newValue);
-				return;
-			case OrmPackage.ATTRIBUTES__MANY_TO_MANYS:
-				getManyToManys().clear();
-				getManyToManys().addAll((Collection<? extends XmlManyToMany>)newValue);
-				return;
-			case OrmPackage.ATTRIBUTES__EMBEDDEDS:
-				getEmbeddeds().clear();
-				getEmbeddeds().addAll((Collection<? extends XmlEmbedded>)newValue);
-				return;
-			case OrmPackage.ATTRIBUTES__TRANSIENTS:
-				getTransients().clear();
-				getTransients().addAll((Collection<? extends XmlTransient>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ATTRIBUTES__IDS:
-				getIds().clear();
-				return;
-			case OrmPackage.ATTRIBUTES__EMBEDDED_IDS:
-				getEmbeddedIds().clear();
-				return;
-			case OrmPackage.ATTRIBUTES__BASICS:
-				getBasics().clear();
-				return;
-			case OrmPackage.ATTRIBUTES__VERSIONS:
-				getVersions().clear();
-				return;
-			case OrmPackage.ATTRIBUTES__MANY_TO_ONES:
-				getManyToOnes().clear();
-				return;
-			case OrmPackage.ATTRIBUTES__ONE_TO_MANYS:
-				getOneToManys().clear();
-				return;
-			case OrmPackage.ATTRIBUTES__ONE_TO_ONES:
-				getOneToOnes().clear();
-				return;
-			case OrmPackage.ATTRIBUTES__MANY_TO_MANYS:
-				getManyToManys().clear();
-				return;
-			case OrmPackage.ATTRIBUTES__EMBEDDEDS:
-				getEmbeddeds().clear();
-				return;
-			case OrmPackage.ATTRIBUTES__TRANSIENTS:
-				getTransients().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ATTRIBUTES__IDS:
-				return ids != null && !ids.isEmpty();
-			case OrmPackage.ATTRIBUTES__EMBEDDED_IDS:
-				return embeddedIds != null && !embeddedIds.isEmpty();
-			case OrmPackage.ATTRIBUTES__BASICS:
-				return basics != null && !basics.isEmpty();
-			case OrmPackage.ATTRIBUTES__VERSIONS:
-				return versions != null && !versions.isEmpty();
-			case OrmPackage.ATTRIBUTES__MANY_TO_ONES:
-				return manyToOnes != null && !manyToOnes.isEmpty();
-			case OrmPackage.ATTRIBUTES__ONE_TO_MANYS:
-				return oneToManys != null && !oneToManys.isEmpty();
-			case OrmPackage.ATTRIBUTES__ONE_TO_ONES:
-				return oneToOnes != null && !oneToOnes.isEmpty();
-			case OrmPackage.ATTRIBUTES__MANY_TO_MANYS:
-				return manyToManys != null && !manyToManys.isEmpty();
-			case OrmPackage.ATTRIBUTES__EMBEDDEDS:
-				return embeddeds != null && !embeddeds.isEmpty();
-			case OrmPackage.ATTRIBUTES__TRANSIENTS:
-				return transients != null && !transients.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} // Attributes
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/BaseXmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/BaseXmlEmbedded.java
deleted file mode 100644
index f8beba9e1f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/BaseXmlEmbedded.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.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Base Xml Embedded</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.core.resource.orm.BaseXmlEmbedded#getAttributeOverrides <em>Attribute Overrides</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBaseXmlEmbedded()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface BaseXmlEmbedded extends XmlAttributeMapping
-{
-	/**
-	 * Returns the value of the '<em><b>Attribute Overrides</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute Overrides</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Attribute Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBaseXmlEmbedded_AttributeOverrides()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlAttributeOverride> getAttributeOverrides();
-
-} // BaseXmlEmbedded
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/CascadeType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/CascadeType.java
deleted file mode 100644
index 3de53f776c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/CascadeType.java
+++ /dev/null
@@ -1,173 +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.core.resource.orm;
-
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Cascade Type</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeAll <em>Cascade All</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadePersist <em>Cascade Persist</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeMerge <em>Cascade Merge</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeRemove <em>Cascade Remove</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeRefresh <em>Cascade Refresh</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface CascadeType extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Cascade All</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade All</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade All</em>' attribute.
-	 * @see #setCascadeAll(boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadeAll()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	boolean isCascadeAll();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeAll <em>Cascade All</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade All</em>' attribute.
-	 * @see #isCascadeAll()
-	 * @generated
-	 */
-	void setCascadeAll(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Cascade Persist</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade Persist</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 Persist</em>' attribute.
-	 * @see #setCascadePersist(boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadePersist()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	boolean isCascadePersist();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadePersist <em>Cascade Persist</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade Persist</em>' attribute.
-	 * @see #isCascadePersist()
-	 * @generated
-	 */
-	void setCascadePersist(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Cascade Merge</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade Merge</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 Merge</em>' attribute.
-	 * @see #setCascadeMerge(boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadeMerge()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	boolean isCascadeMerge();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeMerge <em>Cascade Merge</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade Merge</em>' attribute.
-	 * @see #isCascadeMerge()
-	 * @generated
-	 */
-	void setCascadeMerge(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Cascade Remove</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade Remove</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 Remove</em>' attribute.
-	 * @see #setCascadeRemove(boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadeRemove()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	boolean isCascadeRemove();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeRemove <em>Cascade Remove</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade Remove</em>' attribute.
-	 * @see #isCascadeRemove()
-	 * @generated
-	 */
-	void setCascadeRemove(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Cascade Refresh</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade 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>Cascade Refresh</em>' attribute.
-	 * @see #setCascadeRefresh(boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadeRefresh()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	boolean isCascadeRefresh();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeRefresh <em>Cascade Refresh</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade Refresh</em>' attribute.
-	 * @see #isCascadeRefresh()
-	 * @generated
-	 */
-	void setCascadeRefresh(boolean value);
-
-} // CascadeType
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/CascadeTypeImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/CascadeTypeImpl.java
deleted file mode 100644
index e016287be0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/CascadeTypeImpl.java
+++ /dev/null
@@ -1,462 +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.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.common.AbstractJpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Cascade Type</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeTypeImpl()
- * @model kind="class"
- * @generated
- */
-public class CascadeTypeImpl extends AbstractJpaEObject implements CascadeType
-{
-	/**
-	 * The default value of the '{@link #isCascadeAll() <em>Cascade All</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCascadeAll()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean CASCADE_ALL_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isCascadeAll() <em>Cascade All</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCascadeAll()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean cascadeAll = CASCADE_ALL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isCascadePersist() <em>Cascade Persist</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCascadePersist()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean CASCADE_PERSIST_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isCascadePersist() <em>Cascade Persist</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCascadePersist()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean cascadePersist = CASCADE_PERSIST_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isCascadeMerge() <em>Cascade Merge</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCascadeMerge()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean CASCADE_MERGE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isCascadeMerge() <em>Cascade Merge</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCascadeMerge()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean cascadeMerge = CASCADE_MERGE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isCascadeRemove() <em>Cascade Remove</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCascadeRemove()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean CASCADE_REMOVE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isCascadeRemove() <em>Cascade Remove</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCascadeRemove()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean cascadeRemove = CASCADE_REMOVE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isCascadeRefresh() <em>Cascade Refresh</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCascadeRefresh()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean CASCADE_REFRESH_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isCascadeRefresh() <em>Cascade Refresh</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCascadeRefresh()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean cascadeRefresh = CASCADE_REFRESH_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CascadeTypeImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.CASCADE_TYPE_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cascade All</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade All</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade All</em>' attribute.
-	 * @see #setCascadeAll(boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadeAll()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isCascadeAll()
-	{
-		return cascadeAll;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeTypeImpl#isCascadeAll <em>Cascade All</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade All</em>' attribute.
-	 * @see #isCascadeAll()
-	 * @generated
-	 */
-	public void setCascadeAll(boolean newCascadeAll)
-	{
-		boolean oldCascadeAll = cascadeAll;
-		cascadeAll = newCascadeAll;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.CASCADE_TYPE_IMPL__CASCADE_ALL, oldCascadeAll, cascadeAll));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cascade Persist</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade Persist</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 Persist</em>' attribute.
-	 * @see #setCascadePersist(boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadePersist()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isCascadePersist()
-	{
-		return cascadePersist;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeTypeImpl#isCascadePersist <em>Cascade Persist</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade Persist</em>' attribute.
-	 * @see #isCascadePersist()
-	 * @generated
-	 */
-	public void setCascadePersist(boolean newCascadePersist)
-	{
-		boolean oldCascadePersist = cascadePersist;
-		cascadePersist = newCascadePersist;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.CASCADE_TYPE_IMPL__CASCADE_PERSIST, oldCascadePersist, cascadePersist));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cascade Merge</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade Merge</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 Merge</em>' attribute.
-	 * @see #setCascadeMerge(boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadeMerge()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isCascadeMerge()
-	{
-		return cascadeMerge;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeTypeImpl#isCascadeMerge <em>Cascade Merge</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade Merge</em>' attribute.
-	 * @see #isCascadeMerge()
-	 * @generated
-	 */
-	public void setCascadeMerge(boolean newCascadeMerge)
-	{
-		boolean oldCascadeMerge = cascadeMerge;
-		cascadeMerge = newCascadeMerge;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.CASCADE_TYPE_IMPL__CASCADE_MERGE, oldCascadeMerge, cascadeMerge));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cascade Remove</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade Remove</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 Remove</em>' attribute.
-	 * @see #setCascadeRemove(boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadeRemove()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isCascadeRemove()
-	{
-		return cascadeRemove;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeTypeImpl#isCascadeRemove <em>Cascade Remove</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade Remove</em>' attribute.
-	 * @see #isCascadeRemove()
-	 * @generated
-	 */
-	public void setCascadeRemove(boolean newCascadeRemove)
-	{
-		boolean oldCascadeRemove = cascadeRemove;
-		cascadeRemove = newCascadeRemove;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.CASCADE_TYPE_IMPL__CASCADE_REMOVE, oldCascadeRemove, cascadeRemove));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cascade Refresh</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade 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>Cascade Refresh</em>' attribute.
-	 * @see #setCascadeRefresh(boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadeRefresh()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isCascadeRefresh()
-	{
-		return cascadeRefresh;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeTypeImpl#isCascadeRefresh <em>Cascade Refresh</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade Refresh</em>' attribute.
-	 * @see #isCascadeRefresh()
-	 * @generated
-	 */
-	public void setCascadeRefresh(boolean newCascadeRefresh)
-	{
-		boolean oldCascadeRefresh = cascadeRefresh;
-		cascadeRefresh = newCascadeRefresh;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.CASCADE_TYPE_IMPL__CASCADE_REFRESH, oldCascadeRefresh, cascadeRefresh));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_ALL:
-				return isCascadeAll() ? Boolean.TRUE : Boolean.FALSE;
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_PERSIST:
-				return isCascadePersist() ? Boolean.TRUE : Boolean.FALSE;
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_MERGE:
-				return isCascadeMerge() ? Boolean.TRUE : Boolean.FALSE;
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_REMOVE:
-				return isCascadeRemove() ? Boolean.TRUE : Boolean.FALSE;
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_REFRESH:
-				return isCascadeRefresh() ? 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 OrmPackage.CASCADE_TYPE_IMPL__CASCADE_ALL:
-				setCascadeAll(((Boolean)newValue).booleanValue());
-				return;
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_PERSIST:
-				setCascadePersist(((Boolean)newValue).booleanValue());
-				return;
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_MERGE:
-				setCascadeMerge(((Boolean)newValue).booleanValue());
-				return;
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_REMOVE:
-				setCascadeRemove(((Boolean)newValue).booleanValue());
-				return;
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_REFRESH:
-				setCascadeRefresh(((Boolean)newValue).booleanValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_ALL:
-				setCascadeAll(CASCADE_ALL_EDEFAULT);
-				return;
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_PERSIST:
-				setCascadePersist(CASCADE_PERSIST_EDEFAULT);
-				return;
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_MERGE:
-				setCascadeMerge(CASCADE_MERGE_EDEFAULT);
-				return;
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_REMOVE:
-				setCascadeRemove(CASCADE_REMOVE_EDEFAULT);
-				return;
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_REFRESH:
-				setCascadeRefresh(CASCADE_REFRESH_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_ALL:
-				return cascadeAll != CASCADE_ALL_EDEFAULT;
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_PERSIST:
-				return cascadePersist != CASCADE_PERSIST_EDEFAULT;
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_MERGE:
-				return cascadeMerge != CASCADE_MERGE_EDEFAULT;
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_REMOVE:
-				return cascadeRemove != CASCADE_REMOVE_EDEFAULT;
-			case OrmPackage.CASCADE_TYPE_IMPL__CASCADE_REFRESH:
-				return cascadeRefresh != CASCADE_REFRESH_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(" (cascadeAll: ");
-		result.append(cascadeAll);
-		result.append(", cascadePersist: ");
-		result.append(cascadePersist);
-		result.append(", cascadeMerge: ");
-		result.append(cascadeMerge);
-		result.append(", cascadeRemove: ");
-		result.append(cascadeRemove);
-		result.append(", cascadeRefresh: ");
-		result.append(cascadeRefresh);
-		result.append(')');
-		return result.toString();
-	}
-
-} // CascadeType
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/ColumnMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/ColumnMapping.java
deleted file mode 100644
index 814febfcf4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/ColumnMapping.java
+++ /dev/null
@@ -1,65 +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.core.resource.orm;
-
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Column Mapping</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.ColumnMapping#getColumn <em>Column</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnMapping()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface ColumnMapping extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Column</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Column</em>' containment reference.
-	 * @see #setColumn(XmlColumn)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnMapping_Column()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlColumn getColumn();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ColumnMapping#getColumn <em>Column</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Column</em>' containment reference.
-	 * @see #getColumn()
-	 * @generated
-	 */
-	void setColumn(XmlColumn value);
-
-} // ColumnMapping
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/ColumnResult.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/ColumnResult.java
deleted file mode 100644
index 3650410064..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/ColumnResult.java
+++ /dev/null
@@ -1,202 +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.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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Column Result</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.core.resource.orm.ColumnResult#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnResult()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class ColumnResult extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ColumnResult()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.COLUMN_RESULT;
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getColumnResult_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ColumnResult#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, OrmPackage.COLUMN_RESULT__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.COLUMN_RESULT__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.COLUMN_RESULT__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.COLUMN_RESULT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.COLUMN_RESULT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} // ColumnResult
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/DiscriminatorType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/DiscriminatorType.java
deleted file mode 100644
index ce4a9a30b4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/DiscriminatorType.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.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>Discriminator 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.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorType()
- * @model
- * @generated
- */
-public enum DiscriminatorType implements Enumerator
-{
-	/**
-	 * The '<em><b>STRING</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #STRING_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	STRING(0, "STRING", "STRING"),
-
-	/**
-	 * The '<em><b>CHAR</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CHAR_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	CHAR(1, "CHAR", "CHAR"),
-
-	/**
-	 * The '<em><b>INTEGER</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #INTEGER_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	INTEGER(2, "INTEGER", "INTEGER");
-
-	/**
-	 * The '<em><b>STRING</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>STRING</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #STRING
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int STRING_VALUE = 0;
-
-	/**
-	 * The '<em><b>CHAR</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CHAR</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CHAR
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CHAR_VALUE = 1;
-
-	/**
-	 * The '<em><b>INTEGER</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>INTEGER</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INTEGER
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INTEGER_VALUE = 2;
-
-	/**
-	 * An array of all the '<em><b>Discriminator Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final DiscriminatorType[] VALUES_ARRAY =
-		new DiscriminatorType[]
-		{
-			STRING,
-			CHAR,
-			INTEGER,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Discriminator Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<DiscriminatorType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Discriminator Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static DiscriminatorType get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			DiscriminatorType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Discriminator Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static DiscriminatorType getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			DiscriminatorType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Discriminator Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static DiscriminatorType get(int value)
-	{
-		switch (value)
-		{
-			case STRING_VALUE: return STRING;
-			case CHAR_VALUE: return CHAR;
-			case INTEGER_VALUE: return INTEGER;
-		}
-		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 DiscriminatorType(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;
-	}
-	
-} //DiscriminatorType
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EntityListener.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EntityListener.java
deleted file mode 100644
index b1c58f2959..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EntityListener.java
+++ /dev/null
@@ -1,799 +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.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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Entity Listener</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.core.resource.orm.EntityListener#getClassName <em>Class Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPrePersist <em>Pre Persist</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostPersist <em>Post Persist</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPreRemove <em>Pre Remove</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostRemove <em>Post Remove</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPreUpdate <em>Pre Update</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostUpdate <em>Post Update</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostLoad <em>Post Load</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class EntityListener extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CLASS_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String className = CLASS_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPrePersist() <em>Pre Persist</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrePersist()
-	 * @generated
-	 * @ordered
-	 */
-	protected PrePersist prePersist;
-
-	/**
-	 * The cached value of the '{@link #getPostPersist() <em>Post Persist</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostPersist()
-	 * @generated
-	 * @ordered
-	 */
-	protected PostPersist postPersist;
-
-	/**
-	 * The cached value of the '{@link #getPreRemove() <em>Pre Remove</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPreRemove()
-	 * @generated
-	 * @ordered
-	 */
-	protected PreRemove preRemove;
-
-	/**
-	 * The cached value of the '{@link #getPostRemove() <em>Post Remove</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostRemove()
-	 * @generated
-	 * @ordered
-	 */
-	protected PostRemove postRemove;
-
-	/**
-	 * The cached value of the '{@link #getPreUpdate() <em>Pre Update</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPreUpdate()
-	 * @generated
-	 * @ordered
-	 */
-	protected PreUpdate preUpdate;
-
-	/**
-	 * The cached value of the '{@link #getPostUpdate() <em>Post Update</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostUpdate()
-	 * @generated
-	 * @ordered
-	 */
-	protected PostUpdate postUpdate;
-
-	/**
-	 * The cached value of the '{@link #getPostLoad() <em>Post Load</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostLoad()
-	 * @generated
-	 * @ordered
-	 */
-	protected PostLoad postLoad;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EntityListener()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.ENTITY_LISTENER;
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getEntityListener_ClassName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getClassName()
-	{
-		return className;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getClassName <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class Name</em>' attribute.
-	 * @see #getClassName()
-	 * @generated
-	 */
-	public void setClassName(String newClassName)
-	{
-		String oldClassName = className;
-		className = newClassName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ENTITY_LISTENER__CLASS_NAME, oldClassName, className));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pre Persist</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pre Persist</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pre Persist</em>' containment reference.
-	 * @see #setPrePersist(PrePersist)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener_PrePersist()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PrePersist getPrePersist()
-	{
-		return prePersist;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPrePersist(PrePersist newPrePersist, NotificationChain msgs)
-	{
-		PrePersist oldPrePersist = prePersist;
-		prePersist = newPrePersist;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.ENTITY_LISTENER__PRE_PERSIST, oldPrePersist, newPrePersist);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPrePersist <em>Pre Persist</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pre Persist</em>' containment reference.
-	 * @see #getPrePersist()
-	 * @generated
-	 */
-	public void setPrePersist(PrePersist newPrePersist)
-	{
-		if (newPrePersist != prePersist)
-		{
-			NotificationChain msgs = null;
-			if (prePersist != null)
-				msgs = ((InternalEObject)prePersist).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.ENTITY_LISTENER__PRE_PERSIST, null, msgs);
-			if (newPrePersist != null)
-				msgs = ((InternalEObject)newPrePersist).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.ENTITY_LISTENER__PRE_PERSIST, null, msgs);
-			msgs = basicSetPrePersist(newPrePersist, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ENTITY_LISTENER__PRE_PERSIST, newPrePersist, newPrePersist));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Post Persist</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Persist</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Persist</em>' containment reference.
-	 * @see #setPostPersist(PostPersist)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener_PostPersist()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PostPersist getPostPersist()
-	{
-		return postPersist;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPostPersist(PostPersist newPostPersist, NotificationChain msgs)
-	{
-		PostPersist oldPostPersist = postPersist;
-		postPersist = newPostPersist;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.ENTITY_LISTENER__POST_PERSIST, oldPostPersist, newPostPersist);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostPersist <em>Post Persist</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Post Persist</em>' containment reference.
-	 * @see #getPostPersist()
-	 * @generated
-	 */
-	public void setPostPersist(PostPersist newPostPersist)
-	{
-		if (newPostPersist != postPersist)
-		{
-			NotificationChain msgs = null;
-			if (postPersist != null)
-				msgs = ((InternalEObject)postPersist).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.ENTITY_LISTENER__POST_PERSIST, null, msgs);
-			if (newPostPersist != null)
-				msgs = ((InternalEObject)newPostPersist).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.ENTITY_LISTENER__POST_PERSIST, null, msgs);
-			msgs = basicSetPostPersist(newPostPersist, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ENTITY_LISTENER__POST_PERSIST, newPostPersist, newPostPersist));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pre Remove</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pre Remove</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pre Remove</em>' containment reference.
-	 * @see #setPreRemove(PreRemove)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener_PreRemove()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PreRemove getPreRemove()
-	{
-		return preRemove;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPreRemove(PreRemove newPreRemove, NotificationChain msgs)
-	{
-		PreRemove oldPreRemove = preRemove;
-		preRemove = newPreRemove;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.ENTITY_LISTENER__PRE_REMOVE, oldPreRemove, newPreRemove);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPreRemove <em>Pre Remove</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pre Remove</em>' containment reference.
-	 * @see #getPreRemove()
-	 * @generated
-	 */
-	public void setPreRemove(PreRemove newPreRemove)
-	{
-		if (newPreRemove != preRemove)
-		{
-			NotificationChain msgs = null;
-			if (preRemove != null)
-				msgs = ((InternalEObject)preRemove).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.ENTITY_LISTENER__PRE_REMOVE, null, msgs);
-			if (newPreRemove != null)
-				msgs = ((InternalEObject)newPreRemove).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.ENTITY_LISTENER__PRE_REMOVE, null, msgs);
-			msgs = basicSetPreRemove(newPreRemove, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ENTITY_LISTENER__PRE_REMOVE, newPreRemove, newPreRemove));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Post Remove</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Remove</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Remove</em>' containment reference.
-	 * @see #setPostRemove(PostRemove)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener_PostRemove()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PostRemove getPostRemove()
-	{
-		return postRemove;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPostRemove(PostRemove newPostRemove, NotificationChain msgs)
-	{
-		PostRemove oldPostRemove = postRemove;
-		postRemove = newPostRemove;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.ENTITY_LISTENER__POST_REMOVE, oldPostRemove, newPostRemove);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostRemove <em>Post Remove</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Post Remove</em>' containment reference.
-	 * @see #getPostRemove()
-	 * @generated
-	 */
-	public void setPostRemove(PostRemove newPostRemove)
-	{
-		if (newPostRemove != postRemove)
-		{
-			NotificationChain msgs = null;
-			if (postRemove != null)
-				msgs = ((InternalEObject)postRemove).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.ENTITY_LISTENER__POST_REMOVE, null, msgs);
-			if (newPostRemove != null)
-				msgs = ((InternalEObject)newPostRemove).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.ENTITY_LISTENER__POST_REMOVE, null, msgs);
-			msgs = basicSetPostRemove(newPostRemove, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ENTITY_LISTENER__POST_REMOVE, newPostRemove, newPostRemove));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pre Update</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pre Update</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pre Update</em>' containment reference.
-	 * @see #setPreUpdate(PreUpdate)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener_PreUpdate()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PreUpdate getPreUpdate()
-	{
-		return preUpdate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPreUpdate(PreUpdate newPreUpdate, NotificationChain msgs)
-	{
-		PreUpdate oldPreUpdate = preUpdate;
-		preUpdate = newPreUpdate;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.ENTITY_LISTENER__PRE_UPDATE, oldPreUpdate, newPreUpdate);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPreUpdate <em>Pre Update</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pre Update</em>' containment reference.
-	 * @see #getPreUpdate()
-	 * @generated
-	 */
-	public void setPreUpdate(PreUpdate newPreUpdate)
-	{
-		if (newPreUpdate != preUpdate)
-		{
-			NotificationChain msgs = null;
-			if (preUpdate != null)
-				msgs = ((InternalEObject)preUpdate).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.ENTITY_LISTENER__PRE_UPDATE, null, msgs);
-			if (newPreUpdate != null)
-				msgs = ((InternalEObject)newPreUpdate).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.ENTITY_LISTENER__PRE_UPDATE, null, msgs);
-			msgs = basicSetPreUpdate(newPreUpdate, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ENTITY_LISTENER__PRE_UPDATE, newPreUpdate, newPreUpdate));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Post Update</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Update</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Update</em>' containment reference.
-	 * @see #setPostUpdate(PostUpdate)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener_PostUpdate()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PostUpdate getPostUpdate()
-	{
-		return postUpdate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPostUpdate(PostUpdate newPostUpdate, NotificationChain msgs)
-	{
-		PostUpdate oldPostUpdate = postUpdate;
-		postUpdate = newPostUpdate;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.ENTITY_LISTENER__POST_UPDATE, oldPostUpdate, newPostUpdate);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostUpdate <em>Post Update</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Post Update</em>' containment reference.
-	 * @see #getPostUpdate()
-	 * @generated
-	 */
-	public void setPostUpdate(PostUpdate newPostUpdate)
-	{
-		if (newPostUpdate != postUpdate)
-		{
-			NotificationChain msgs = null;
-			if (postUpdate != null)
-				msgs = ((InternalEObject)postUpdate).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.ENTITY_LISTENER__POST_UPDATE, null, msgs);
-			if (newPostUpdate != null)
-				msgs = ((InternalEObject)newPostUpdate).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.ENTITY_LISTENER__POST_UPDATE, null, msgs);
-			msgs = basicSetPostUpdate(newPostUpdate, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ENTITY_LISTENER__POST_UPDATE, newPostUpdate, newPostUpdate));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Post Load</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Load</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Load</em>' containment reference.
-	 * @see #setPostLoad(PostLoad)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener_PostLoad()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PostLoad getPostLoad()
-	{
-		return postLoad;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPostLoad(PostLoad newPostLoad, NotificationChain msgs)
-	{
-		PostLoad oldPostLoad = postLoad;
-		postLoad = newPostLoad;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.ENTITY_LISTENER__POST_LOAD, oldPostLoad, newPostLoad);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostLoad <em>Post Load</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Post Load</em>' containment reference.
-	 * @see #getPostLoad()
-	 * @generated
-	 */
-	public void setPostLoad(PostLoad newPostLoad)
-	{
-		if (newPostLoad != postLoad)
-		{
-			NotificationChain msgs = null;
-			if (postLoad != null)
-				msgs = ((InternalEObject)postLoad).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.ENTITY_LISTENER__POST_LOAD, null, msgs);
-			if (newPostLoad != null)
-				msgs = ((InternalEObject)newPostLoad).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.ENTITY_LISTENER__POST_LOAD, null, msgs);
-			msgs = basicSetPostLoad(newPostLoad, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ENTITY_LISTENER__POST_LOAD, newPostLoad, newPostLoad));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ENTITY_LISTENER__PRE_PERSIST:
-				return basicSetPrePersist(null, msgs);
-			case OrmPackage.ENTITY_LISTENER__POST_PERSIST:
-				return basicSetPostPersist(null, msgs);
-			case OrmPackage.ENTITY_LISTENER__PRE_REMOVE:
-				return basicSetPreRemove(null, msgs);
-			case OrmPackage.ENTITY_LISTENER__POST_REMOVE:
-				return basicSetPostRemove(null, msgs);
-			case OrmPackage.ENTITY_LISTENER__PRE_UPDATE:
-				return basicSetPreUpdate(null, msgs);
-			case OrmPackage.ENTITY_LISTENER__POST_UPDATE:
-				return basicSetPostUpdate(null, msgs);
-			case OrmPackage.ENTITY_LISTENER__POST_LOAD:
-				return basicSetPostLoad(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 OrmPackage.ENTITY_LISTENER__CLASS_NAME:
-				return getClassName();
-			case OrmPackage.ENTITY_LISTENER__PRE_PERSIST:
-				return getPrePersist();
-			case OrmPackage.ENTITY_LISTENER__POST_PERSIST:
-				return getPostPersist();
-			case OrmPackage.ENTITY_LISTENER__PRE_REMOVE:
-				return getPreRemove();
-			case OrmPackage.ENTITY_LISTENER__POST_REMOVE:
-				return getPostRemove();
-			case OrmPackage.ENTITY_LISTENER__PRE_UPDATE:
-				return getPreUpdate();
-			case OrmPackage.ENTITY_LISTENER__POST_UPDATE:
-				return getPostUpdate();
-			case OrmPackage.ENTITY_LISTENER__POST_LOAD:
-				return getPostLoad();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ENTITY_LISTENER__CLASS_NAME:
-				setClassName((String)newValue);
-				return;
-			case OrmPackage.ENTITY_LISTENER__PRE_PERSIST:
-				setPrePersist((PrePersist)newValue);
-				return;
-			case OrmPackage.ENTITY_LISTENER__POST_PERSIST:
-				setPostPersist((PostPersist)newValue);
-				return;
-			case OrmPackage.ENTITY_LISTENER__PRE_REMOVE:
-				setPreRemove((PreRemove)newValue);
-				return;
-			case OrmPackage.ENTITY_LISTENER__POST_REMOVE:
-				setPostRemove((PostRemove)newValue);
-				return;
-			case OrmPackage.ENTITY_LISTENER__PRE_UPDATE:
-				setPreUpdate((PreUpdate)newValue);
-				return;
-			case OrmPackage.ENTITY_LISTENER__POST_UPDATE:
-				setPostUpdate((PostUpdate)newValue);
-				return;
-			case OrmPackage.ENTITY_LISTENER__POST_LOAD:
-				setPostLoad((PostLoad)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ENTITY_LISTENER__CLASS_NAME:
-				setClassName(CLASS_NAME_EDEFAULT);
-				return;
-			case OrmPackage.ENTITY_LISTENER__PRE_PERSIST:
-				setPrePersist((PrePersist)null);
-				return;
-			case OrmPackage.ENTITY_LISTENER__POST_PERSIST:
-				setPostPersist((PostPersist)null);
-				return;
-			case OrmPackage.ENTITY_LISTENER__PRE_REMOVE:
-				setPreRemove((PreRemove)null);
-				return;
-			case OrmPackage.ENTITY_LISTENER__POST_REMOVE:
-				setPostRemove((PostRemove)null);
-				return;
-			case OrmPackage.ENTITY_LISTENER__PRE_UPDATE:
-				setPreUpdate((PreUpdate)null);
-				return;
-			case OrmPackage.ENTITY_LISTENER__POST_UPDATE:
-				setPostUpdate((PostUpdate)null);
-				return;
-			case OrmPackage.ENTITY_LISTENER__POST_LOAD:
-				setPostLoad((PostLoad)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ENTITY_LISTENER__CLASS_NAME:
-				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
-			case OrmPackage.ENTITY_LISTENER__PRE_PERSIST:
-				return prePersist != null;
-			case OrmPackage.ENTITY_LISTENER__POST_PERSIST:
-				return postPersist != null;
-			case OrmPackage.ENTITY_LISTENER__PRE_REMOVE:
-				return preRemove != null;
-			case OrmPackage.ENTITY_LISTENER__POST_REMOVE:
-				return postRemove != null;
-			case OrmPackage.ENTITY_LISTENER__PRE_UPDATE:
-				return preUpdate != null;
-			case OrmPackage.ENTITY_LISTENER__POST_UPDATE:
-				return postUpdate != null;
-			case OrmPackage.ENTITY_LISTENER__POST_LOAD:
-				return postLoad != 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(" (className: ");
-		result.append(className);
-		result.append(')');
-		return result.toString();
-	}
-
-} // EntityListener
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EntityListeners.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EntityListeners.java
deleted file mode 100644
index 5fd96f844a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EntityListeners.java
+++ /dev/null
@@ -1,185 +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.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;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Entity Listeners</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.core.resource.orm.EntityListeners#getEntityListeners <em>Entity Listeners</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListeners()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class EntityListeners extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The cached value of the '{@link #getEntityListeners() <em>Entity Listeners</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEntityListeners()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<EntityListener> entityListeners;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EntityListeners()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.ENTITY_LISTENERS;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Entity Listeners</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.EntityListener}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Entity Listeners</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>Entity Listeners</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListeners_EntityListeners()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<EntityListener> getEntityListeners()
-	{
-		if (entityListeners == null)
-		{
-			entityListeners = new EObjectContainmentEList<EntityListener>(EntityListener.class, this, OrmPackage.ENTITY_LISTENERS__ENTITY_LISTENERS);
-		}
-		return entityListeners;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ENTITY_LISTENERS__ENTITY_LISTENERS:
-				return ((InternalEList<?>)getEntityListeners()).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 OrmPackage.ENTITY_LISTENERS__ENTITY_LISTENERS:
-				return getEntityListeners();
-		}
-		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 OrmPackage.ENTITY_LISTENERS__ENTITY_LISTENERS:
-				getEntityListeners().clear();
-				getEntityListeners().addAll((Collection<? extends EntityListener>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ENTITY_LISTENERS__ENTITY_LISTENERS:
-				getEntityListeners().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ENTITY_LISTENERS__ENTITY_LISTENERS:
-				return entityListeners != null && !entityListeners.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} // EntityListeners
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EntityResult.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EntityResult.java
deleted file mode 100644
index 8f7e2cb8d0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EntityResult.java
+++ /dev/null
@@ -1,338 +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.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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Entity Result</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.core.resource.orm.EntityResult#getDiscriminatorColumn <em>Discriminator Column</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.EntityResult#getEntityClass <em>Entity Class</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.EntityResult#getFieldResults <em>Field Results</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityResult()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class EntityResult extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The default value of the '{@link #getDiscriminatorColumn() <em>Discriminator Column</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDiscriminatorColumn()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISCRIMINATOR_COLUMN_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDiscriminatorColumn() <em>Discriminator Column</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDiscriminatorColumn()
-	 * @generated
-	 * @ordered
-	 */
-	protected String discriminatorColumn = DISCRIMINATOR_COLUMN_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEntityClass() <em>Entity Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEntityClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ENTITY_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEntityClass() <em>Entity Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEntityClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String entityClass = ENTITY_CLASS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getFieldResults() <em>Field Results</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFieldResults()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<FieldResult> fieldResults;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EntityResult()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.ENTITY_RESULT;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Discriminator Column</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Discriminator Column</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Discriminator Column</em>' attribute.
-	 * @see #setDiscriminatorColumn(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityResult_DiscriminatorColumn()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getDiscriminatorColumn()
-	{
-		return discriminatorColumn;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityResult#getDiscriminatorColumn <em>Discriminator Column</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Discriminator Column</em>' attribute.
-	 * @see #getDiscriminatorColumn()
-	 * @generated
-	 */
-	public void setDiscriminatorColumn(String newDiscriminatorColumn)
-	{
-		String oldDiscriminatorColumn = discriminatorColumn;
-		discriminatorColumn = newDiscriminatorColumn;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ENTITY_RESULT__DISCRIMINATOR_COLUMN, oldDiscriminatorColumn, discriminatorColumn));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Entity Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Entity 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>Entity Class</em>' attribute.
-	 * @see #setEntityClass(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityResult_EntityClass()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getEntityClass()
-	{
-		return entityClass;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityResult#getEntityClass <em>Entity Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Entity Class</em>' attribute.
-	 * @see #getEntityClass()
-	 * @generated
-	 */
-	public void setEntityClass(String newEntityClass)
-	{
-		String oldEntityClass = entityClass;
-		entityClass = newEntityClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ENTITY_RESULT__ENTITY_CLASS, oldEntityClass, entityClass));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Field Results</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.FieldResult}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Field Results</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>Field Results</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityResult_FieldResults()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<FieldResult> getFieldResults()
-	{
-		if (fieldResults == null)
-		{
-			fieldResults = new EObjectContainmentEList<FieldResult>(FieldResult.class, this, OrmPackage.ENTITY_RESULT__FIELD_RESULTS);
-		}
-		return fieldResults;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ENTITY_RESULT__FIELD_RESULTS:
-				return ((InternalEList<?>)getFieldResults()).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 OrmPackage.ENTITY_RESULT__DISCRIMINATOR_COLUMN:
-				return getDiscriminatorColumn();
-			case OrmPackage.ENTITY_RESULT__ENTITY_CLASS:
-				return getEntityClass();
-			case OrmPackage.ENTITY_RESULT__FIELD_RESULTS:
-				return getFieldResults();
-		}
-		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 OrmPackage.ENTITY_RESULT__DISCRIMINATOR_COLUMN:
-				setDiscriminatorColumn((String)newValue);
-				return;
-			case OrmPackage.ENTITY_RESULT__ENTITY_CLASS:
-				setEntityClass((String)newValue);
-				return;
-			case OrmPackage.ENTITY_RESULT__FIELD_RESULTS:
-				getFieldResults().clear();
-				getFieldResults().addAll((Collection<? extends FieldResult>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ENTITY_RESULT__DISCRIMINATOR_COLUMN:
-				setDiscriminatorColumn(DISCRIMINATOR_COLUMN_EDEFAULT);
-				return;
-			case OrmPackage.ENTITY_RESULT__ENTITY_CLASS:
-				setEntityClass(ENTITY_CLASS_EDEFAULT);
-				return;
-			case OrmPackage.ENTITY_RESULT__FIELD_RESULTS:
-				getFieldResults().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.ENTITY_RESULT__DISCRIMINATOR_COLUMN:
-				return DISCRIMINATOR_COLUMN_EDEFAULT == null ? discriminatorColumn != null : !DISCRIMINATOR_COLUMN_EDEFAULT.equals(discriminatorColumn);
-			case OrmPackage.ENTITY_RESULT__ENTITY_CLASS:
-				return ENTITY_CLASS_EDEFAULT == null ? entityClass != null : !ENTITY_CLASS_EDEFAULT.equals(entityClass);
-			case OrmPackage.ENTITY_RESULT__FIELD_RESULTS:
-				return fieldResults != null && !fieldResults.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(" (discriminatorColumn: ");
-		result.append(discriminatorColumn);
-		result.append(", entityClass: ");
-		result.append(entityClass);
-		result.append(')');
-		return result.toString();
-	}
-
-} // EntityResult
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EnumType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EnumType.java
deleted file mode 100644
index 411b2ff4c6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EnumType.java
+++ /dev/null
@@ -1,235 +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.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>Enum 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.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEnumType()
- * @model
- * @generated
- */
-public enum EnumType implements Enumerator
-{
-	/**
-	 * The '<em><b>ORDINAL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ORDINAL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ORDINAL(0, "ORDINAL", "ORDINAL"),
-
-	/**
-	 * The '<em><b>STRING</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #STRING_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	STRING(1, "STRING", "STRING");
-
-	/**
-	 * The '<em><b>ORDINAL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ORDINAL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ORDINAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ORDINAL_VALUE = 0;
-
-	/**
-	 * The '<em><b>STRING</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>STRING</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #STRING
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int STRING_VALUE = 1;
-
-	/**
-	 * An array of all the '<em><b>Enum Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final EnumType[] VALUES_ARRAY =
-		new EnumType[]
-		{
-			ORDINAL,
-			STRING,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Enum Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<EnumType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Enum Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EnumType get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			EnumType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Enum Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EnumType getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			EnumType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Enum Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EnumType get(int value)
-	{
-		switch (value)
-		{
-			case ORDINAL_VALUE: return ORDINAL;
-			case STRING_VALUE: return STRING;
-		}
-		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 EnumType(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;
-	}
-	
-} //EnumType
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EventMethod.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EventMethod.java
deleted file mode 100644
index 5c664a8aff..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EventMethod.java
+++ /dev/null
@@ -1,202 +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.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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Event Method</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.core.resource.orm.EventMethod#getMethodName <em>Method Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEventMethod()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class EventMethod extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The default value of the '{@link #getMethodName() <em>Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String METHOD_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMethodName() <em>Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String methodName = METHOD_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EventMethod()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.EVENT_METHOD;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Name</em>' attribute.
-	 * @see #setMethodName(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEventMethod_MethodName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getMethodName()
-	{
-		return methodName;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EventMethod#getMethodName <em>Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method Name</em>' attribute.
-	 * @see #getMethodName()
-	 * @generated
-	 */
-	public void setMethodName(String newMethodName)
-	{
-		String oldMethodName = methodName;
-		methodName = newMethodName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.EVENT_METHOD__METHOD_NAME, oldMethodName, methodName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.EVENT_METHOD__METHOD_NAME:
-				return getMethodName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.EVENT_METHOD__METHOD_NAME:
-				setMethodName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.EVENT_METHOD__METHOD_NAME:
-				setMethodName(METHOD_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.EVENT_METHOD__METHOD_NAME:
-				return METHOD_NAME_EDEFAULT == null ? methodName != null : !METHOD_NAME_EDEFAULT.equals(methodName);
-		}
-		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(" (methodName: ");
-		result.append(methodName);
-		result.append(')');
-		return result.toString();
-	}
-
-} // EventMethod
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/FetchType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/FetchType.java
deleted file mode 100644
index 54a7e7dccd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/FetchType.java
+++ /dev/null
@@ -1,235 +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.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>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.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getFetchType()
- * @model
- * @generated
- */
-public enum FetchType implements Enumerator
-{
-	/**
-	 * The '<em><b>LAZY</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LAZY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	LAZY(0, "LAZY", "LAZY"),
-
-	/**
-	 * The '<em><b>EAGER</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #EAGER_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	EAGER(1, "EAGER", "EAGER");
-
-	/**
-	 * The '<em><b>LAZY</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>LAZY</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LAZY
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LAZY_VALUE = 0;
-
-	/**
-	 * The '<em><b>EAGER</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>EAGER</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EAGER
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EAGER_VALUE = 1;
-
-	/**
-	 * An array of all the '<em><b>Fetch Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final FetchType[] VALUES_ARRAY =
-		new FetchType[]
-		{
-			LAZY,
-			EAGER,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Fetch Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<FetchType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Fetch Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static FetchType get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			FetchType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Fetch Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static FetchType getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			FetchType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Fetch Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static FetchType get(int value)
-	{
-		switch (value)
-		{
-			case LAZY_VALUE: return LAZY;
-			case EAGER_VALUE: return EAGER;
-		}
-		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 FetchType(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;
-	}
-	
-} //FetchType
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/FieldResult.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/FieldResult.java
deleted file mode 100644
index 9cca71e590..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/FieldResult.java
+++ /dev/null
@@ -1,270 +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.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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Field Result</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.core.resource.orm.FieldResult#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.FieldResult#getColumn <em>Column</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getFieldResult()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class FieldResult 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 #getColumn() <em>Column</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getColumn()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COLUMN_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getColumn() <em>Column</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getColumn()
-	 * @generated
-	 * @ordered
-	 */
-	protected String column = COLUMN_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FieldResult()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.FIELD_RESULT;
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getFieldResult_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.FieldResult#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, OrmPackage.FIELD_RESULT__NAME, oldName, name));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Column</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Column</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Column</em>' attribute.
-	 * @see #setColumn(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getFieldResult_Column()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getColumn()
-	{
-		return column;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.FieldResult#getColumn <em>Column</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Column</em>' attribute.
-	 * @see #getColumn()
-	 * @generated
-	 */
-	public void setColumn(String newColumn)
-	{
-		String oldColumn = column;
-		column = newColumn;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.FIELD_RESULT__COLUMN, oldColumn, column));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.FIELD_RESULT__NAME:
-				return getName();
-			case OrmPackage.FIELD_RESULT__COLUMN:
-				return getColumn();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.FIELD_RESULT__NAME:
-				setName((String)newValue);
-				return;
-			case OrmPackage.FIELD_RESULT__COLUMN:
-				setColumn((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.FIELD_RESULT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case OrmPackage.FIELD_RESULT__COLUMN:
-				setColumn(COLUMN_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.FIELD_RESULT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case OrmPackage.FIELD_RESULT__COLUMN:
-				return COLUMN_EDEFAULT == null ? column != null : !COLUMN_EDEFAULT.equals(column);
-		}
-		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(", column: ");
-		result.append(column);
-		result.append(')');
-		return result.toString();
-	}
-
-} // FieldResult
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/GenerationType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/GenerationType.java
deleted file mode 100644
index 64941d6e89..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/GenerationType.java
+++ /dev/null
@@ -1,289 +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.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>Generation 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.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerationType()
- * @model
- * @generated
- */
-public enum GenerationType implements Enumerator
-{
-	/**
-	 * The '<em><b>TABLE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #TABLE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	TABLE(0, "TABLE", "TABLE"),
-
-	/**
-	 * The '<em><b>SEQUENCE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SEQUENCE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SEQUENCE(1, "SEQUENCE", "SEQUENCE"),
-
-	/**
-	 * The '<em><b>IDENTITY</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IDENTITY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	IDENTITY(2, "IDENTITY", "IDENTITY"),
-
-	/**
-	 * 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>TABLE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>TABLE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TABLE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TABLE_VALUE = 0;
-
-	/**
-	 * The '<em><b>SEQUENCE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>SEQUENCE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SEQUENCE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SEQUENCE_VALUE = 1;
-
-	/**
-	 * The '<em><b>IDENTITY</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>IDENTITY</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #IDENTITY
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IDENTITY_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>Generation Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final GenerationType[] VALUES_ARRAY =
-		new GenerationType[]
-		{
-			TABLE,
-			SEQUENCE,
-			IDENTITY,
-			AUTO,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Generation Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<GenerationType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Generation Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static GenerationType get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			GenerationType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Generation Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static GenerationType getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			GenerationType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Generation Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static GenerationType get(int value)
-	{
-		switch (value)
-		{
-			case TABLE_VALUE: return TABLE;
-			case SEQUENCE_VALUE: return SEQUENCE;
-			case IDENTITY_VALUE: return IDENTITY;
-			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 GenerationType(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;
-	}
-	
-} //GenerationType
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/Inheritance.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/Inheritance.java
deleted file mode 100644
index a57e43cbfb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/Inheritance.java
+++ /dev/null
@@ -1,202 +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.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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Inheritance</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.core.resource.orm.Inheritance#getStrategy <em>Strategy</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getInheritance()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class Inheritance 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 InheritanceType STRATEGY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStrategy() <em>Strategy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStrategy()
-	 * @generated
-	 * @ordered
-	 */
-	protected InheritanceType strategy = STRATEGY_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Inheritance()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.INHERITANCE;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Strategy</b></em>' attribute.
-	 * The default value is <code>"SINGLE_TABLE"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.InheritanceType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Strategy</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Strategy</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.InheritanceType
-	 * @see #setStrategy(InheritanceType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getInheritance_Strategy()
-	 * @model default="SINGLE_TABLE"
-	 * @generated
-	 */
-	public InheritanceType getStrategy()
-	{
-		return strategy;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.Inheritance#getStrategy <em>Strategy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Strategy</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.InheritanceType
-	 * @see #getStrategy()
-	 * @generated
-	 */
-	public void setStrategy(InheritanceType newStrategy)
-	{
-		InheritanceType oldStrategy = strategy;
-		strategy = newStrategy == null ? STRATEGY_EDEFAULT : newStrategy;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.INHERITANCE__STRATEGY, oldStrategy, strategy));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.INHERITANCE__STRATEGY:
-				return getStrategy();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.INHERITANCE__STRATEGY:
-				setStrategy((InheritanceType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.INHERITANCE__STRATEGY:
-				setStrategy(STRATEGY_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.INHERITANCE__STRATEGY:
-				return strategy != STRATEGY_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(" (strategy: ");
-		result.append(strategy);
-		result.append(')');
-		return result.toString();
-	}
-
-} // Inheritance
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/InheritanceType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/InheritanceType.java
deleted file mode 100644
index 4d4f250d22..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/InheritanceType.java
+++ /dev/null
@@ -1,260 +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.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>Inheritance 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.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getInheritanceType()
- * @model
- * @generated
- */
-public enum InheritanceType implements Enumerator
-{
-	/**
-	 * The '<em><b>SINGLE TABLE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SINGLE_TABLE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SINGLE_TABLE(0, "SINGLE_TABLE", "SINGLE_TABLE"), /**
-	 * The '<em><b>JOINED</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #JOINED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	JOINED(1, "JOINED", "JOINED"),
-
-	/**
-	 * The '<em><b>TABLE PER CLASS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #TABLE_PER_CLASS_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	TABLE_PER_CLASS(2, "TABLE_PER_CLASS", "TABLE_PER_CLASS");
-
-	/**
-	 * The '<em><b>SINGLE TABLE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>SINGLE TABLE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SINGLE_TABLE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SINGLE_TABLE_VALUE = 0;
-
-	/**
-	 * The '<em><b>JOINED</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>JOINED</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JOINED
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int JOINED_VALUE = 1;
-
-	/**
-	 * The '<em><b>TABLE PER CLASS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>TABLE PER CLASS</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TABLE_PER_CLASS
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TABLE_PER_CLASS_VALUE = 2;
-
-	/**
-	 * An array of all the '<em><b>Inheritance Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final InheritanceType[] VALUES_ARRAY =
-		new InheritanceType[]
-		{
-			SINGLE_TABLE,
-			JOINED,
-			TABLE_PER_CLASS,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Inheritance Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<InheritanceType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Inheritance Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static InheritanceType get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			InheritanceType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Inheritance Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static InheritanceType getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			InheritanceType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Inheritance Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static InheritanceType get(int value)
-	{
-		switch (value)
-		{
-			case SINGLE_TABLE_VALUE: return SINGLE_TABLE;
-			case JOINED_VALUE: return JOINED;
-			case TABLE_PER_CLASS_VALUE: return TABLE_PER_CLASS;
-		}
-		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 InheritanceType(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;
-	}
-	
-} //InheritanceType
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/Lob.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/Lob.java
deleted file mode 100644
index 2426020bef..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/Lob.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.core.resource.orm;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Lob</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.core.resource.orm.OrmPackage#getLob()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class Lob extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Lob()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.LOB;
-	}
-
-} // Lob
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/MapKey.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/MapKey.java
deleted file mode 100644
index 8c45c94d91..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/MapKey.java
+++ /dev/null
@@ -1,65 +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.core.resource.orm;
-
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Map Key</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.core.resource.orm.MapKey#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMapKey()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface MapKey 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.core.resource.orm.OrmPackage#getMapKey_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.MapKey#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);
-
-} // MapKey
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/MapKeyImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/MapKeyImpl.java
deleted file mode 100644
index 824ab2a552..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/MapKeyImpl.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.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.common.AbstractJpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Map Key</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.core.resource.orm.OrmPackage#getMapKeyImpl()
- * @model kind="class"
- * @generated
- */
-public class MapKeyImpl extends AbstractJpaEObject implements MapKey
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MapKeyImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.MAP_KEY_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.core.resource.orm.OrmPackage#getMapKey_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.core.resource.orm.MapKeyImpl#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, OrmPackage.MAP_KEY_IMPL__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.MAP_KEY_IMPL__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.MAP_KEY_IMPL__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.MAP_KEY_IMPL__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.MAP_KEY_IMPL__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} // MapKey
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmArtifactEdit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmArtifactEdit.java
deleted file mode 100644
index f0564917f0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmArtifactEdit.java
+++ /dev/null
@@ -1,101 +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.core.resource.orm;
-
-import java.io.IOException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.resource.common.JpaArtifactEdit;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmArtifactEdit extends JpaArtifactEdit
-{
-	/**
-	 * @param aProject
-	 * @return an orm artifact for the project aProject.
-	 * Opened only for read access (no write)
-	 */
-	public static OrmArtifactEdit getArtifactEditForRead(IProject aProject) {
-		OrmArtifactEdit artifactEdit = null;
-		try {
-			artifactEdit = new OrmArtifactEdit(aProject, true);
-		} 
-		catch (IllegalArgumentException iae) {
-            // suppress illegal argument exception
-            JptCorePlugin.log(iae);
-		}
-		return artifactEdit;
-	}
-	
-    /**
-	 * @param aProject
-	 * @return an orm artifact for the project aProject.
-     * Opened for both write and read access
-     */	
-	public static OrmArtifactEdit getArtifactEditForWrite(IProject aProject) {
-		OrmArtifactEdit artifactEdit = null;
-		try {
-			artifactEdit = new OrmArtifactEdit(aProject, false);
-		} 
-		catch (IllegalArgumentException iae) {
-            // suppress illegal argument exception
-            JptCorePlugin.log(iae);
-		}
-		return artifactEdit;
-	}
-	
-    
-	public OrmArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) 
-			throws IllegalArgumentException {
-		super(aProject, toAccessAsReadOnly);
-	}
-	
-	
-	@Override
-	public OrmResource getResource(IFile file) {
-		// This *seems* to do the same basic thing as below, but circumvents the
-		// URI munging that ArtifactEditModel does (see bug 209093)
-		try {
-			OrmResource resource = 
-					(OrmResource) getArtifactEditModel().createResource(URI.createPlatformResourceURI(file.getFullPath().toString()));
-			if (! resource.isLoaded()) {
-				resource.load(getArtifactEditModel().getResourceSet().getLoadOptions());
-			}
-			return resource;
-		}
-		catch (ClassCastException cce) {
-			return null;
-		}
-		catch (IOException ioe) {
-			JptCorePlugin.log(ioe);
-			return null;
-		}
-	}
-	
-	@Override
-	public OrmResource getResource(String fileURI) {
-		try {
-			return (OrmResource) getArtifactEditModel().getResource(URI.createURI(fileURI));
-		}
-		catch (ClassCastException cce) {
-			return null;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmFactory.java
deleted file mode 100644
index a23597aba0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmFactory.java
+++ /dev/null
@@ -1,1047 +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.core.resource.orm;
-
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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.core.resource.orm.OrmPackage
- * @generated
- */
-public class OrmFactory extends EFactoryImpl
-{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final OrmFactory eINSTANCE = init();
-
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static OrmFactory init()
-	{
-		try
-		{
-			OrmFactory theOrmFactory = (OrmFactory)EPackage.Registry.INSTANCE.getEFactory("jpt.orm.xmi"); 
-			if (theOrmFactory != null)
-			{
-				return theOrmFactory;
-			}
-		}
-		catch (Exception exception)
-		{
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new OrmFactory();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OrmFactory()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass)
-	{
-		switch (eClass.getClassifierID())
-		{
-			case OrmPackage.XML_ENTITY_MAPPINGS: return (EObject)createXmlEntityMappings();
-			case OrmPackage.XML_PERSISTENCE_UNIT_METADATA: return (EObject)createXmlPersistenceUnitMetadata();
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS: return (EObject)createXmlPersistenceUnitDefaults();
-			case OrmPackage.XML_MAPPED_SUPERCLASS: return (EObject)createXmlMappedSuperclass();
-			case OrmPackage.XML_ENTITY: return (EObject)createXmlEntity();
-			case OrmPackage.XML_EMBEDDABLE: return (EObject)createXmlEmbeddable();
-			case OrmPackage.ATTRIBUTES: return (EObject)createAttributes();
-			case OrmPackage.XML_ID_IMPL: return (EObject)createXmlIdImpl();
-			case OrmPackage.XML_EMBEDDED_ID_IMPL: return (EObject)createXmlEmbeddedIdImpl();
-			case OrmPackage.XML_EMBEDDED_IMPL: return (EObject)createXmlEmbeddedImpl();
-			case OrmPackage.XML_BASIC_IMPL: return (EObject)createXmlBasicImpl();
-			case OrmPackage.XML_VERSION_IMPL: return (EObject)createXmlVersionImpl();
-			case OrmPackage.XML_MANY_TO_ONE_IMPL: return (EObject)createXmlManyToOneImpl();
-			case OrmPackage.XML_ONE_TO_MANY_IMPL: return (EObject)createXmlOneToManyImpl();
-			case OrmPackage.XML_ONE_TO_ONE_IMPL: return (EObject)createXmlOneToOneImpl();
-			case OrmPackage.XML_MANY_TO_MANY_IMPL: return (EObject)createXmlManyToManyImpl();
-			case OrmPackage.XML_TRANSIENT_IMPL: return (EObject)createXmlTransientImpl();
-			case OrmPackage.XML_ASSOCIATION_OVERRIDE_IMPL: return (EObject)createXmlAssociationOverrideImpl();
-			case OrmPackage.XML_ATTRIBUTE_OVERRIDE_IMPL: return (EObject)createXmlAttributeOverrideImpl();
-			case OrmPackage.CASCADE_TYPE_IMPL: return (EObject)createCascadeTypeImpl();
-			case OrmPackage.XML_COLUMN_IMPL: return (EObject)createXmlColumnImpl();
-			case OrmPackage.COLUMN_RESULT: return (EObject)createColumnResult();
-			case OrmPackage.XML_DISCRIMINATOR_COLUMN: return (EObject)createXmlDiscriminatorColumn();
-			case OrmPackage.ENTITY_LISTENERS: return (EObject)createEntityListeners();
-			case OrmPackage.ENTITY_LISTENER: return (EObject)createEntityListener();
-			case OrmPackage.ENTITY_RESULT: return (EObject)createEntityResult();
-			case OrmPackage.EVENT_METHOD: return (EObject)createEventMethod();
-			case OrmPackage.FIELD_RESULT: return (EObject)createFieldResult();
-			case OrmPackage.XML_GENERATED_VALUE_IMPL: return (EObject)createXmlGeneratedValueImpl();
-			case OrmPackage.XML_ID_CLASS: return (EObject)createXmlIdClass();
-			case OrmPackage.INHERITANCE: return (EObject)createInheritance();
-			case OrmPackage.XML_JOIN_COLUMN_IMPL: return (EObject)createXmlJoinColumnImpl();
-			case OrmPackage.XML_JOIN_TABLE_IMPL: return (EObject)createXmlJoinTableImpl();
-			case OrmPackage.LOB: return (EObject)createLob();
-			case OrmPackage.MAP_KEY_IMPL: return (EObject)createMapKeyImpl();
-			case OrmPackage.XML_NAMED_NATIVE_QUERY: return (EObject)createXmlNamedNativeQuery();
-			case OrmPackage.XML_NAMED_QUERY: return (EObject)createXmlNamedQuery();
-			case OrmPackage.POST_LOAD: return (EObject)createPostLoad();
-			case OrmPackage.POST_PERSIST: return (EObject)createPostPersist();
-			case OrmPackage.POST_REMOVE: return (EObject)createPostRemove();
-			case OrmPackage.POST_UPDATE: return (EObject)createPostUpdate();
-			case OrmPackage.PRE_PERSIST: return (EObject)createPrePersist();
-			case OrmPackage.PRE_REMOVE: return (EObject)createPreRemove();
-			case OrmPackage.PRE_UPDATE: return (EObject)createPreUpdate();
-			case OrmPackage.XML_PRIMARY_KEY_JOIN_COLUMN_IMPL: return (EObject)createXmlPrimaryKeyJoinColumnImpl();
-			case OrmPackage.XML_QUERY_HINT: return (EObject)createXmlQueryHint();
-			case OrmPackage.XML_TABLE: return (EObject)createXmlTable();
-			case OrmPackage.XML_SECONDARY_TABLE_IMPL: return (EObject)createXmlSecondaryTableImpl();
-			case OrmPackage.XML_SEQUENCE_GENERATOR_IMPL: return (EObject)createXmlSequenceGeneratorImpl();
-			case OrmPackage.SQL_RESULT_SET_MAPPING: return (EObject)createSqlResultSetMapping();
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL: return (EObject)createXmlTableGeneratorImpl();
-			case OrmPackage.XML_UNIQUE_CONSTRAINT_IMPL: return (EObject)createXmlUniqueConstraintImpl();
-			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 OrmPackage.ACCESS_TYPE:
-				return createAccessTypeFromString(eDataType, initialValue);
-			case OrmPackage.DISCRIMINATOR_TYPE:
-				return createDiscriminatorTypeFromString(eDataType, initialValue);
-			case OrmPackage.ENUM_TYPE:
-				return createEnumTypeFromString(eDataType, initialValue);
-			case OrmPackage.FETCH_TYPE:
-				return createFetchTypeFromString(eDataType, initialValue);
-			case OrmPackage.GENERATION_TYPE:
-				return createGenerationTypeFromString(eDataType, initialValue);
-			case OrmPackage.INHERITANCE_TYPE:
-				return createInheritanceTypeFromString(eDataType, initialValue);
-			case OrmPackage.TEMPORAL_TYPE:
-				return createTemporalTypeFromString(eDataType, initialValue);
-			case OrmPackage.DISCRIMINATOR_VALUE:
-				return createDiscriminatorValueFromString(eDataType, initialValue);
-			case OrmPackage.ENUMERATED:
-				return createEnumeratedFromString(eDataType, initialValue);
-			case OrmPackage.ORDER_BY:
-				return createOrderByFromString(eDataType, initialValue);
-			case OrmPackage.VERSION_TYPE:
-				return createVersionTypeFromString(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 OrmPackage.ACCESS_TYPE:
-				return convertAccessTypeToString(eDataType, instanceValue);
-			case OrmPackage.DISCRIMINATOR_TYPE:
-				return convertDiscriminatorTypeToString(eDataType, instanceValue);
-			case OrmPackage.ENUM_TYPE:
-				return convertEnumTypeToString(eDataType, instanceValue);
-			case OrmPackage.FETCH_TYPE:
-				return convertFetchTypeToString(eDataType, instanceValue);
-			case OrmPackage.GENERATION_TYPE:
-				return convertGenerationTypeToString(eDataType, instanceValue);
-			case OrmPackage.INHERITANCE_TYPE:
-				return convertInheritanceTypeToString(eDataType, instanceValue);
-			case OrmPackage.TEMPORAL_TYPE:
-				return convertTemporalTypeToString(eDataType, instanceValue);
-			case OrmPackage.DISCRIMINATOR_VALUE:
-				return convertDiscriminatorValueToString(eDataType, instanceValue);
-			case OrmPackage.ENUMERATED:
-				return convertEnumeratedToString(eDataType, instanceValue);
-			case OrmPackage.ORDER_BY:
-				return convertOrderByToString(eDataType, instanceValue);
-			case OrmPackage.VERSION_TYPE:
-				return convertVersionTypeToString(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 XmlPersistenceUnitDefaults createXmlPersistenceUnitDefaults()
-	{
-		XmlPersistenceUnitDefaults xmlPersistenceUnitDefaults = new XmlPersistenceUnitDefaults();
-		return xmlPersistenceUnitDefaults;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlMappedSuperclass createXmlMappedSuperclass()
-	{
-		XmlMappedSuperclass xmlMappedSuperclass = new XmlMappedSuperclass();
-		return xmlMappedSuperclass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlEntity createXmlEntity()
-	{
-		XmlEntity xmlEntity = new XmlEntity();
-		return xmlEntity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlEmbeddable createXmlEmbeddable()
-	{
-		XmlEmbeddable xmlEmbeddable = new XmlEmbeddable();
-		return xmlEmbeddable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Attributes createAttributes()
-	{
-		Attributes attributes = new Attributes();
-		return attributes;
-	}
-
-	/**
-	 * <!-- 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 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 XmlManyToOneImpl createXmlManyToOneImpl()
-	{
-		XmlManyToOneImpl xmlManyToOneImpl = new XmlManyToOneImpl();
-		return xmlManyToOneImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlOneToManyImpl createXmlOneToManyImpl()
-	{
-		XmlOneToManyImpl xmlOneToManyImpl = new XmlOneToManyImpl();
-		return xmlOneToManyImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlOneToOneImpl createXmlOneToOneImpl()
-	{
-		XmlOneToOneImpl xmlOneToOneImpl = new XmlOneToOneImpl();
-		return xmlOneToOneImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlManyToManyImpl createXmlManyToManyImpl()
-	{
-		XmlManyToManyImpl xmlManyToManyImpl = new XmlManyToManyImpl();
-		return xmlManyToManyImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlEmbeddedImpl createXmlEmbeddedImpl()
-	{
-		XmlEmbeddedImpl xmlEmbeddedImpl = new XmlEmbeddedImpl();
-		return xmlEmbeddedImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlTransientImpl createXmlTransientImpl()
-	{
-		XmlTransientImpl xmlTransientImpl = new XmlTransientImpl();
-		return xmlTransientImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlAssociationOverrideImpl createXmlAssociationOverrideImpl()
-	{
-		XmlAssociationOverrideImpl xmlAssociationOverrideImpl = new XmlAssociationOverrideImpl();
-		return xmlAssociationOverrideImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlAttributeOverrideImpl createXmlAttributeOverrideImpl()
-	{
-		XmlAttributeOverrideImpl xmlAttributeOverrideImpl = new XmlAttributeOverrideImpl();
-		return xmlAttributeOverrideImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CascadeTypeImpl createCascadeTypeImpl()
-	{
-		CascadeTypeImpl cascadeTypeImpl = new CascadeTypeImpl();
-		return cascadeTypeImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlColumnImpl createXmlColumnImpl()
-	{
-		XmlColumnImpl xmlColumnImpl = new XmlColumnImpl();
-		return xmlColumnImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ColumnResult createColumnResult()
-	{
-		ColumnResult columnResult = new ColumnResult();
-		return columnResult;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlDiscriminatorColumn createXmlDiscriminatorColumn()
-	{
-		XmlDiscriminatorColumn xmlDiscriminatorColumn = new XmlDiscriminatorColumn();
-		return xmlDiscriminatorColumn;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EntityListeners createEntityListeners()
-	{
-		EntityListeners entityListeners = new EntityListeners();
-		return entityListeners;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EntityListener createEntityListener()
-	{
-		EntityListener entityListener = new EntityListener();
-		return entityListener;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EntityResult createEntityResult()
-	{
-		EntityResult entityResult = new EntityResult();
-		return entityResult;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FieldResult createFieldResult()
-	{
-		FieldResult fieldResult = new FieldResult();
-		return fieldResult;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlGeneratedValueImpl createXmlGeneratedValueImpl()
-	{
-		XmlGeneratedValueImpl xmlGeneratedValueImpl = new XmlGeneratedValueImpl();
-		return xmlGeneratedValueImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlIdClass createXmlIdClass()
-	{
-		XmlIdClass xmlIdClass = new XmlIdClass();
-		return xmlIdClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Inheritance createInheritance()
-	{
-		Inheritance inheritance = new Inheritance();
-		return inheritance;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlJoinColumnImpl createXmlJoinColumnImpl()
-	{
-		XmlJoinColumnImpl xmlJoinColumnImpl = new XmlJoinColumnImpl();
-		return xmlJoinColumnImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlJoinTableImpl createXmlJoinTableImpl()
-	{
-		XmlJoinTableImpl xmlJoinTableImpl = new XmlJoinTableImpl();
-		return xmlJoinTableImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Lob createLob()
-	{
-		Lob lob = new Lob();
-		return lob;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MapKeyImpl createMapKeyImpl()
-	{
-		MapKeyImpl mapKeyImpl = new MapKeyImpl();
-		return mapKeyImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlNamedNativeQuery createXmlNamedNativeQuery()
-	{
-		XmlNamedNativeQuery xmlNamedNativeQuery = new XmlNamedNativeQuery();
-		return xmlNamedNativeQuery;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlNamedQuery createXmlNamedQuery()
-	{
-		XmlNamedQuery xmlNamedQuery = new XmlNamedQuery();
-		return xmlNamedQuery;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EventMethod createEventMethod()
-	{
-		EventMethod eventMethod = new EventMethod();
-		return eventMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PostLoad createPostLoad()
-	{
-		PostLoad postLoad = new PostLoad();
-		return postLoad;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PostPersist createPostPersist()
-	{
-		PostPersist postPersist = new PostPersist();
-		return postPersist;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PostRemove createPostRemove()
-	{
-		PostRemove postRemove = new PostRemove();
-		return postRemove;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PostUpdate createPostUpdate()
-	{
-		PostUpdate postUpdate = new PostUpdate();
-		return postUpdate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PrePersist createPrePersist()
-	{
-		PrePersist prePersist = new PrePersist();
-		return prePersist;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PreRemove createPreRemove()
-	{
-		PreRemove preRemove = new PreRemove();
-		return preRemove;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PreUpdate createPreUpdate()
-	{
-		PreUpdate preUpdate = new PreUpdate();
-		return preUpdate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlPrimaryKeyJoinColumnImpl createXmlPrimaryKeyJoinColumnImpl()
-	{
-		XmlPrimaryKeyJoinColumnImpl xmlPrimaryKeyJoinColumnImpl = new XmlPrimaryKeyJoinColumnImpl();
-		return xmlPrimaryKeyJoinColumnImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlQueryHint createXmlQueryHint()
-	{
-		XmlQueryHint xmlQueryHint = new XmlQueryHint();
-		return xmlQueryHint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlTable createXmlTable()
-	{
-		XmlTable xmlTable = new XmlTable();
-		return xmlTable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlSecondaryTableImpl createXmlSecondaryTableImpl()
-	{
-		XmlSecondaryTableImpl xmlSecondaryTableImpl = new XmlSecondaryTableImpl();
-		return xmlSecondaryTableImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlSequenceGeneratorImpl createXmlSequenceGeneratorImpl()
-	{
-		XmlSequenceGeneratorImpl xmlSequenceGeneratorImpl = new XmlSequenceGeneratorImpl();
-		return xmlSequenceGeneratorImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SqlResultSetMapping createSqlResultSetMapping()
-	{
-		SqlResultSetMapping sqlResultSetMapping = new SqlResultSetMapping();
-		return sqlResultSetMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlTableGeneratorImpl createXmlTableGeneratorImpl()
-	{
-		XmlTableGeneratorImpl xmlTableGeneratorImpl = new XmlTableGeneratorImpl();
-		return xmlTableGeneratorImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlUniqueConstraintImpl createXmlUniqueConstraintImpl()
-	{
-		XmlUniqueConstraintImpl xmlUniqueConstraintImpl = new XmlUniqueConstraintImpl();
-		return xmlUniqueConstraintImpl;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AccessType createAccessTypeFromString(EDataType eDataType, String initialValue)
-	{
-		AccessType result = AccessType.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 convertAccessTypeToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DiscriminatorType createDiscriminatorTypeFromString(EDataType eDataType, String initialValue)
-	{
-		DiscriminatorType result = DiscriminatorType.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 convertDiscriminatorTypeToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EnumType createEnumTypeFromString(EDataType eDataType, String initialValue)
-	{
-		EnumType result = EnumType.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 convertEnumTypeToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FetchType createFetchTypeFromString(EDataType eDataType, String initialValue)
-	{
-		FetchType result = FetchType.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 convertFetchTypeToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GenerationType createGenerationTypeFromString(EDataType eDataType, String initialValue)
-	{
-		GenerationType result = GenerationType.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 convertGenerationTypeToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InheritanceType createInheritanceTypeFromString(EDataType eDataType, String initialValue)
-	{
-		InheritanceType result = InheritanceType.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 convertInheritanceTypeToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TemporalType createTemporalTypeFromString(EDataType eDataType, String initialValue)
-	{
-		TemporalType result = TemporalType.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 convertTemporalTypeToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createDiscriminatorValueFromString(EDataType eDataType, String initialValue)
-	{
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDiscriminatorValueToString(EDataType eDataType, Object instanceValue)
-	{
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Enumerator createEnumeratedFromString(EDataType eDataType, String initialValue)
-	{
-		return (Enumerator)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertEnumeratedToString(EDataType eDataType, Object instanceValue)
-	{
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createOrderByFromString(EDataType eDataType, String initialValue)
-	{
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertOrderByToString(EDataType eDataType, Object instanceValue)
-	{
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createVersionTypeFromString(EDataType eDataType, String initialValue)
-	{
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertVersionTypeToString(EDataType eDataType, Object instanceValue)
-	{
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OrmPackage getOrmPackage()
-	{
-		return (OrmPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static OrmPackage getPackage()
-	{
-		return OrmPackage.eINSTANCE;
-	}
-
-} //OrmFactory
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java
deleted file mode 100644
index b0d5c74a39..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java
+++ /dev/null
@@ -1,13784 +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.core.resource.orm;
-
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.jpt.core.resource.persistence.PersistencePackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.OrmFactory
- * @model kind="package"
- * @generated
- */
-public class OrmPackage 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.orm.xmi";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNS_PREFIX = "org.eclipse.jpt.core.resource.orm";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final OrmPackage eINSTANCE = org.eclipse.jpt.core.resource.orm.OrmPackage.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntityMappings
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#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 = 0;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__DESCRIPTION = 1;
-
-	/**
-	 * 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 = 2;
-
-	/**
-	 * 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 = 3;
-
-	/**
-	 * 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 = 4;
-
-	/**
-	 * 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 = 5;
-
-	/**
-	 * 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 = 6;
-
-	/**
-	 * 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 = 7;
-
-	/**
-	 * 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 = 8;
-
-	/**
-	 * 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 = 9;
-
-	/**
-	 * 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 = 10;
-
-	/**
-	 * 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 = 11;
-
-	/**
-	 * 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 = 12;
-
-	/**
-	 * 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 = 13;
-
-	/**
-	 * 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 = 14;
-
-	/**
-	 * 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 = 15;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPersistenceUnitMetadata()
-	 * @generated
-	 */
-	public static final int XML_PERSISTENCE_UNIT_METADATA = 1;
-
-	/**
-	 * The feature id for the '<em><b>Xml Mapping Metadata Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_METADATA__XML_MAPPING_METADATA_COMPLETE = 0;
-
-	/**
-	 * 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 = 1;
-
-	/**
-	 * 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 = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPersistenceUnitDefaults()
-	 * @generated
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS__SCHEMA = 0;
-
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS__CATALOG = 1;
-
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Cascade Persist</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS__CASCADE_PERSIST = 3;
-
-	/**
-	 * The feature id for the '<em><b>Entity Listeners</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS__ENTITY_LISTENERS = 4;
-
-	/**
-	 * The number of structural features of the '<em>Xml Persistence Unit Defaults</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS_FEATURE_COUNT = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping <em>Abstract Xml Type Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractXmlTypeMapping()
-	 * @generated
-	 */
-	public static final int ABSTRACT_XML_TYPE_MAPPING = 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 ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_TYPE_MAPPING__ACCESS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION = 3;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES = 4;
-
-	/**
-	 * The number of structural features of the '<em>Abstract Xml Type Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public static final int XML_MAPPED_SUPERCLASS = 4;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING__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 = ABSTRACT_XML_TYPE_MAPPING__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 = ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__DESCRIPTION = ABSTRACT_XML_TYPE_MAPPING__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 = ABSTRACT_XML_TYPE_MAPPING__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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 3;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 4;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 5;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 6;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 7;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 8;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 9;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 10;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 11;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity <em>Xml Entity</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity()
-	 * @generated
-	 */
-	public static final int XML_ENTITY = 5;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING__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 = ABSTRACT_XML_TYPE_MAPPING__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 = ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__DESCRIPTION = ABSTRACT_XML_TYPE_MAPPING__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 = ABSTRACT_XML_TYPE_MAPPING__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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 3;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 4;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 5;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 6;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 7;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 8;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 9;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 10;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 11;
-
-	/**
-	 * The feature id for the '<em><b>Sql Result Set Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__SQL_RESULT_SET_MAPPINGS = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 12;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 13;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 14;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 15;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 16;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 17;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 18;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 19;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 20;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 21;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 22;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 23;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 24;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 25;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEmbeddable
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEmbeddable()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDABLE = 6;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING__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 = ABSTRACT_XML_TYPE_MAPPING__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 = ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__DESCRIPTION = ABSTRACT_XML_TYPE_MAPPING__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 = ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES;
-
-	/**
-	 * 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 = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.Attributes <em>Attributes</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.Attributes
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes()
-	 * @generated
-	 */
-	public static final int ATTRIBUTES = 7;
-
-	/**
-	 * 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 = 0;
-
-	/**
-	 * 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 = 1;
-
-	/**
-	 * 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 = 2;
-
-	/**
-	 * 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 = 3;
-
-	/**
-	 * 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 = 4;
-
-	/**
-	 * 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 = 5;
-
-	/**
-	 * 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 = 6;
-
-	/**
-	 * 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 = 7;
-
-	/**
-	 * 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 = 8;
-
-	/**
-	 * 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 = 9;
-
-	/**
-	 * 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 = 10;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAttributeMapping
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAttributeMapping()
-	 * @generated
-	 */
-	public static final int XML_ATTRIBUTE_MAPPING = 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_ATTRIBUTE_MAPPING__NAME = 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 = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlAttributeMapping <em>Abstract Xml Attribute Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlAttributeMapping
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractXmlAttributeMapping()
-	 * @generated
-	 */
-	public static final int ABSTRACT_XML_ATTRIBUTE_MAPPING = 9;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_ATTRIBUTE_MAPPING__NAME = XML_ATTRIBUTE_MAPPING__NAME;
-
-	/**
-	 * The number of structural features of the '<em>Abstract Xml Attribute Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping <em>Xml Null Attribute Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlNullAttributeMapping()
-	 * @generated
-	 */
-	public static final int XML_NULL_ATTRIBUTE_MAPPING = 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_NULL_ATTRIBUTE_MAPPING__NAME = XML_ATTRIBUTE_MAPPING__NAME;
-
-	/**
-	 * The number of structural features of the '<em>Xml Null Attribute Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NULL_ATTRIBUTE_MAPPING_FEATURE_COUNT = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.ColumnMapping <em>Column Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.ColumnMapping
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnMapping()
-	 * @generated
-	 */
-	public static final int COLUMN_MAPPING = 11;
-
-	/**
-	 * The feature id for the '<em><b>Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int COLUMN_MAPPING__COLUMN = 0;
-
-	/**
-	 * The number of structural features of the '<em>Column Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int COLUMN_MAPPING_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping <em>Xml Relationship Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping()
-	 * @generated
-	 */
-	public static final int XML_RELATIONSHIP_MAPPING = 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_RELATIONSHIP_MAPPING__NAME = XML_ATTRIBUTE_MAPPING__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_RELATIONSHIP_MAPPING__TARGET_ENTITY = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Fetch</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_RELATIONSHIP_MAPPING__FETCH = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * 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_RELATIONSHIP_MAPPING__JOIN_TABLE = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * 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_RELATIONSHIP_MAPPING__CASCADE = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Xml Relationship Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_RELATIONSHIP_MAPPING_FEATURE_COUNT = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping <em>Xml Multi Relationship Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMultiRelationshipMapping()
-	 * @generated
-	 */
-	public static final int XML_MULTI_RELATIONSHIP_MAPPING = 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_MULTI_RELATIONSHIP_MAPPING__NAME = XML_RELATIONSHIP_MAPPING__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_MULTI_RELATIONSHIP_MAPPING__TARGET_ENTITY = XML_RELATIONSHIP_MAPPING__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_MULTI_RELATIONSHIP_MAPPING__FETCH = XML_RELATIONSHIP_MAPPING__FETCH;
-
-	/**
-	 * 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_MULTI_RELATIONSHIP_MAPPING__JOIN_TABLE = XML_RELATIONSHIP_MAPPING__JOIN_TABLE;
-
-	/**
-	 * 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_MULTI_RELATIONSHIP_MAPPING__CASCADE = XML_RELATIONSHIP_MAPPING__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_MULTI_RELATIONSHIP_MAPPING__MAPPED_BY = XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * 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_MULTI_RELATIONSHIP_MAPPING__ORDER_BY = XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * 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_MULTI_RELATIONSHIP_MAPPING__MAP_KEY = XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Xml Multi Relationship Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT = XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping <em>Xml Single Relationship Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSingleRelationshipMapping()
-	 * @generated
-	 */
-	public static final int XML_SINGLE_RELATIONSHIP_MAPPING = 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_SINGLE_RELATIONSHIP_MAPPING__NAME = XML_RELATIONSHIP_MAPPING__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_SINGLE_RELATIONSHIP_MAPPING__TARGET_ENTITY = XML_RELATIONSHIP_MAPPING__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_SINGLE_RELATIONSHIP_MAPPING__FETCH = XML_RELATIONSHIP_MAPPING__FETCH;
-
-	/**
-	 * 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_SINGLE_RELATIONSHIP_MAPPING__JOIN_TABLE = XML_RELATIONSHIP_MAPPING__JOIN_TABLE;
-
-	/**
-	 * 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_SINGLE_RELATIONSHIP_MAPPING__CASCADE = XML_RELATIONSHIP_MAPPING__CASCADE;
-
-	/**
-	 * The feature id for the '<em><b>Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SINGLE_RELATIONSHIP_MAPPING__OPTIONAL = XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * 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_SINGLE_RELATIONSHIP_MAPPING__JOIN_COLUMNS = XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Single Relationship Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SINGLE_RELATIONSHIP_MAPPING_FEATURE_COUNT = XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlId <em>Xml Id</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlId
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlId()
-	 * @generated
-	 */
-	public static final int XML_ID = 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_ID__NAME = XML_ATTRIBUTE_MAPPING__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 = XML_ATTRIBUTE_MAPPING_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_ID__GENERATED_VALUE = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * 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 = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Table Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__TABLE_GENERATOR = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
-
-	/**
-	 * 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 = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
-
-	/**
-	 * 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 = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlIdImpl <em>Xml Id Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlIdImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlIdImpl()
-	 * @generated
-	 */
-	public static final int XML_ID_IMPL = 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_ID_IMPL__NAME = ABSTRACT_XML_ATTRIBUTE_MAPPING__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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_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_ID_IMPL__GENERATED_VALUE = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Table Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID_IMPL__TABLE_GENERATOR = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.BaseXmlEmbedded <em>Base Xml Embedded</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.BaseXmlEmbedded
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBaseXmlEmbedded()
-	 * @generated
-	 */
-	public static final int BASE_XML_EMBEDDED = 17;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int BASE_XML_EMBEDDED__NAME = XML_ATTRIBUTE_MAPPING__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 BASE_XML_EMBEDDED__ATTRIBUTE_OVERRIDES = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Base Xml Embedded</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int BASE_XML_EMBEDDED_FEATURE_COUNT = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEmbeddedId
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEmbeddedId()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDED_ID = 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_EMBEDDED_ID__NAME = XML_ATTRIBUTE_MAPPING__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 = XML_ATTRIBUTE_MAPPING_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 = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddedIdImpl <em>Xml Embedded Id Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEmbeddedIdImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEmbeddedIdImpl()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDED_ID_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_EMBEDDED_ID_IMPL__NAME = ABSTRACT_XML_ATTRIBUTE_MAPPING__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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlBasic <em>Xml Basic</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlBasic
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBasic()
-	 * @generated
-	 */
-	public static final int XML_BASIC = 22;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlBasicImpl <em>Xml Basic Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlBasicImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBasicImpl()
-	 * @generated
-	 */
-	public static final int XML_BASIC_IMPL = 23;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlVersion <em>Xml Version</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlVersion
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlVersion()
-	 * @generated
-	 */
-	public static final int XML_VERSION = 24;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlVersionImpl <em>Xml Version Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlVersionImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlVersionImpl()
-	 * @generated
-	 */
-	public static final int XML_VERSION_IMPL = 25;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlManyToOne
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlManyToOne()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_ONE = 26;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToOneImpl <em>Xml Many To One Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlManyToOneImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlManyToOneImpl()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_ONE_IMPL = 27;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlOneToMany
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToMany()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_MANY = 28;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToManyImpl <em>Xml One To Many Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlOneToManyImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToManyImpl()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_MANY_IMPL = 29;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlOneToOne
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToOne()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_ONE = 30;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOneImpl <em>Xml One To One Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlOneToOneImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToOneImpl()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_ONE_IMPL = 31;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlManyToMany
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlManyToMany()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_MANY = 32;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToManyImpl <em>Xml Many To Many Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlManyToManyImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlManyToManyImpl()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_MANY_IMPL = 33;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEmbedded
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEmbedded()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDED = 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_EMBEDDED__NAME = BASE_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 = BASE_XML_EMBEDDED__ATTRIBUTE_OVERRIDES;
-
-	/**
-	 * 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 = BASE_XML_EMBEDDED_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddedImpl <em>Xml Embedded Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEmbeddedImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEmbeddedImpl()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDED_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_EMBEDDED_IMPL__NAME = ABSTRACT_XML_ATTRIBUTE_MAPPING__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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_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_BASIC__NAME = XML_ATTRIBUTE_MAPPING__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 = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__OPTIONAL = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * 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 = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
-
-	/**
-	 * 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 = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
-
-	/**
-	 * 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 = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
-
-	/**
-	 * 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 = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_IMPL__NAME = ABSTRACT_XML_ATTRIBUTE_MAPPING__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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_IMPL__OPTIONAL = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__NAME = XML_ATTRIBUTE_MAPPING__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 = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Temporal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__TEMPORAL = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * 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 = 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_VERSION_IMPL__NAME = ABSTRACT_XML_ATTRIBUTE_MAPPING__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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Temporal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION_IMPL__TEMPORAL = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * 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 = 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_MANY_TO_ONE__NAME = XML_SINGLE_RELATIONSHIP_MAPPING__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 = XML_SINGLE_RELATIONSHIP_MAPPING__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 = XML_SINGLE_RELATIONSHIP_MAPPING__FETCH;
-
-	/**
-	 * 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 = XML_SINGLE_RELATIONSHIP_MAPPING__JOIN_TABLE;
-
-	/**
-	 * 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 = XML_SINGLE_RELATIONSHIP_MAPPING__CASCADE;
-
-	/**
-	 * 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 = XML_SINGLE_RELATIONSHIP_MAPPING__OPTIONAL;
-
-	/**
-	 * 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 = XML_SINGLE_RELATIONSHIP_MAPPING__JOIN_COLUMNS;
-
-	/**
-	 * 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 = XML_SINGLE_RELATIONSHIP_MAPPING_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_MANY_TO_ONE_IMPL__NAME = ABSTRACT_XML_ATTRIBUTE_MAPPING__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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__NAME = XML_MULTI_RELATIONSHIP_MAPPING__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 = XML_MULTI_RELATIONSHIP_MAPPING__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 = XML_MULTI_RELATIONSHIP_MAPPING__FETCH;
-
-	/**
-	 * 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 = XML_MULTI_RELATIONSHIP_MAPPING__JOIN_TABLE;
-
-	/**
-	 * 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 = XML_MULTI_RELATIONSHIP_MAPPING__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 = XML_MULTI_RELATIONSHIP_MAPPING__MAPPED_BY;
-
-	/**
-	 * 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 = XML_MULTI_RELATIONSHIP_MAPPING__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 = XML_MULTI_RELATIONSHIP_MAPPING__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 = XML_MULTI_RELATIONSHIP_MAPPING_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 = XML_MULTI_RELATIONSHIP_MAPPING_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_MANY_IMPL__NAME = ABSTRACT_XML_ATTRIBUTE_MAPPING__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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Mapped By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_IMPL__MAPPED_BY = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 6;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 7;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_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_ONE_TO_ONE__NAME = XML_SINGLE_RELATIONSHIP_MAPPING__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 = XML_SINGLE_RELATIONSHIP_MAPPING__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 = XML_SINGLE_RELATIONSHIP_MAPPING__FETCH;
-
-	/**
-	 * 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 = XML_SINGLE_RELATIONSHIP_MAPPING__JOIN_TABLE;
-
-	/**
-	 * 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 = XML_SINGLE_RELATIONSHIP_MAPPING__CASCADE;
-
-	/**
-	 * 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 = XML_SINGLE_RELATIONSHIP_MAPPING__OPTIONAL;
-
-	/**
-	 * 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 = XML_SINGLE_RELATIONSHIP_MAPPING__JOIN_COLUMNS;
-
-	/**
-	 * 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 = XML_SINGLE_RELATIONSHIP_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = XML_SINGLE_RELATIONSHIP_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * 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 = XML_SINGLE_RELATIONSHIP_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_ONE_TO_ONE_IMPL__NAME = ABSTRACT_XML_ATTRIBUTE_MAPPING__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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 6;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 7;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_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_MANY_TO_MANY__NAME = XML_MULTI_RELATIONSHIP_MAPPING__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 = XML_MULTI_RELATIONSHIP_MAPPING__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 = XML_MULTI_RELATIONSHIP_MAPPING__FETCH;
-
-	/**
-	 * 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 = XML_MULTI_RELATIONSHIP_MAPPING__JOIN_TABLE;
-
-	/**
-	 * 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 = XML_MULTI_RELATIONSHIP_MAPPING__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 = XML_MULTI_RELATIONSHIP_MAPPING__MAPPED_BY;
-
-	/**
-	 * 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 = XML_MULTI_RELATIONSHIP_MAPPING__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 = XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY;
-
-	/**
-	 * 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 = XML_MULTI_RELATIONSHIP_MAPPING_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_MANY_TO_MANY_IMPL__NAME = ABSTRACT_XML_ATTRIBUTE_MAPPING__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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Mapped By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_IMPL__MAPPED_BY = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 6;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlTransient <em>Xml Transient</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlTransient
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTransient()
-	 * @generated
-	 */
-	public static final int XML_TRANSIENT = 34;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TRANSIENT__NAME = XML_ATTRIBUTE_MAPPING__NAME;
-
-	/**
-	 * 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 = XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlTransientImpl <em>Xml Transient Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlTransientImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTransientImpl()
-	 * @generated
-	 */
-	public static final int XML_TRANSIENT_IMPL = 35;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING__NAME;
-
-	/**
-	 * 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 = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride <em>Xml Association Override</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAssociationOverride
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAssociationOverride()
-	 * @generated
-	 */
-	public static final int XML_ASSOCIATION_OVERRIDE = 36;
-
-	/**
-	 * 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_ASSOCIATION_OVERRIDE__JOIN_COLUMNS = 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_ASSOCIATION_OVERRIDE__NAME = 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Association Override</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ASSOCIATION_OVERRIDE_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideImpl <em>Xml Association Override Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAssociationOverrideImpl()
-	 * @generated
-	 */
-	public static final int XML_ASSOCIATION_OVERRIDE_IMPL = 37;
-
-	/**
-	 * 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_ASSOCIATION_OVERRIDE_IMPL__JOIN_COLUMNS = XML_ASSOCIATION_OVERRIDE__JOIN_COLUMNS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ASSOCIATION_OVERRIDE_IMPL__NAME = XML_ASSOCIATION_OVERRIDE__NAME;
-
-	/**
-	 * The number of structural features of the '<em>Xml Association Override Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ASSOCIATION_OVERRIDE_IMPL_FEATURE_COUNT = XML_ASSOCIATION_OVERRIDE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride <em>Xml Attribute Override</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAttributeOverride
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAttributeOverride()
-	 * @generated
-	 */
-	public static final int XML_ATTRIBUTE_OVERRIDE = 38;
-
-	/**
-	 * 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_ATTRIBUTE_OVERRIDE__COLUMN = 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_ATTRIBUTE_OVERRIDE__NAME = 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Attribute Override</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ATTRIBUTE_OVERRIDE_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverrideImpl <em>Xml Attribute Override Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAttributeOverrideImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAttributeOverrideImpl()
-	 * @generated
-	 */
-	public static final int XML_ATTRIBUTE_OVERRIDE_IMPL = 39;
-
-	/**
-	 * 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_ATTRIBUTE_OVERRIDE_IMPL__COLUMN = XML_ATTRIBUTE_OVERRIDE__COLUMN;
-
-	/**
-	 * 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_OVERRIDE_IMPL__NAME = XML_ATTRIBUTE_OVERRIDE__NAME;
-
-	/**
-	 * The number of structural features of the '<em>Xml Attribute Override Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ATTRIBUTE_OVERRIDE_IMPL_FEATURE_COUNT = XML_ATTRIBUTE_OVERRIDE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.CascadeType <em>Cascade Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.CascadeType
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType()
-	 * @generated
-	 */
-	public static final int CASCADE_TYPE = 40;
-
-	/**
-	 * The feature id for the '<em><b>Cascade All</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CASCADE_TYPE__CASCADE_ALL = 0;
-
-	/**
-	 * The feature id for the '<em><b>Cascade Persist</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CASCADE_TYPE__CASCADE_PERSIST = 1;
-
-	/**
-	 * The feature id for the '<em><b>Cascade Merge</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CASCADE_TYPE__CASCADE_MERGE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Cascade Remove</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CASCADE_TYPE__CASCADE_REMOVE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Cascade Refresh</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CASCADE_TYPE__CASCADE_REFRESH = 4;
-
-	/**
-	 * The number of structural features of the '<em>Cascade Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CASCADE_TYPE_FEATURE_COUNT = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.CascadeTypeImpl <em>Cascade Type Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.CascadeTypeImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeTypeImpl()
-	 * @generated
-	 */
-	public static final int CASCADE_TYPE_IMPL = 41;
-
-	/**
-	 * The feature id for the '<em><b>Cascade All</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CASCADE_TYPE_IMPL__CASCADE_ALL = CASCADE_TYPE__CASCADE_ALL;
-
-	/**
-	 * The feature id for the '<em><b>Cascade Persist</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CASCADE_TYPE_IMPL__CASCADE_PERSIST = CASCADE_TYPE__CASCADE_PERSIST;
-
-	/**
-	 * The feature id for the '<em><b>Cascade Merge</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CASCADE_TYPE_IMPL__CASCADE_MERGE = CASCADE_TYPE__CASCADE_MERGE;
-
-	/**
-	 * The feature id for the '<em><b>Cascade Remove</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CASCADE_TYPE_IMPL__CASCADE_REMOVE = CASCADE_TYPE__CASCADE_REMOVE;
-
-	/**
-	 * The feature id for the '<em><b>Cascade Refresh</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CASCADE_TYPE_IMPL__CASCADE_REFRESH = CASCADE_TYPE__CASCADE_REFRESH;
-
-	/**
-	 * The number of structural features of the '<em>Cascade Type Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CASCADE_TYPE_IMPL_FEATURE_COUNT = CASCADE_TYPE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedColumn <em>Xml Named Column</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlNamedColumn
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlNamedColumn()
-	 * @generated
-	 */
-	public static final int XML_NAMED_COLUMN = 42;
-
-	/**
-	 * The feature id for the '<em><b>Column Definition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_COLUMN__COLUMN_DEFINITION = 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_COLUMN__NAME = 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Named Column</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_COLUMN_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlNamedColumn <em>Abstract Xml Named Column</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlNamedColumn
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractXmlNamedColumn()
-	 * @generated
-	 */
-	public static final int ABSTRACT_XML_NAMED_COLUMN = 43;
-
-	/**
-	 * The feature id for the '<em><b>Column Definition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_NAMED_COLUMN__COLUMN_DEFINITION = XML_NAMED_COLUMN__COLUMN_DEFINITION;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_NAMED_COLUMN__NAME = XML_NAMED_COLUMN__NAME;
-
-	/**
-	 * The number of structural features of the '<em>Abstract Xml Named Column</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_NAMED_COLUMN_FEATURE_COUNT = XML_NAMED_COLUMN_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn <em>Xml Abstract Column</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAbstractColumn
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAbstractColumn()
-	 * @generated
-	 */
-	public static final int XML_ABSTRACT_COLUMN = 44;
-
-	/**
-	 * The feature id for the '<em><b>Column Definition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ABSTRACT_COLUMN__COLUMN_DEFINITION = XML_NAMED_COLUMN__COLUMN_DEFINITION;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ABSTRACT_COLUMN__NAME = XML_NAMED_COLUMN__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Insertable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ABSTRACT_COLUMN__INSERTABLE = XML_NAMED_COLUMN_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Nullable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ABSTRACT_COLUMN__NULLABLE = XML_NAMED_COLUMN_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ABSTRACT_COLUMN__TABLE = XML_NAMED_COLUMN_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ABSTRACT_COLUMN__UNIQUE = XML_NAMED_COLUMN_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Updatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ABSTRACT_COLUMN__UPDATABLE = XML_NAMED_COLUMN_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Xml Abstract Column</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ABSTRACT_COLUMN_FEATURE_COUNT = XML_NAMED_COLUMN_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlAbstractColumn <em>Abstract Xml Abstract Column</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlAbstractColumn
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractXmlAbstractColumn()
-	 * @generated
-	 */
-	public static final int ABSTRACT_XML_ABSTRACT_COLUMN = 45;
-
-	/**
-	 * The feature id for the '<em><b>Column Definition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_ABSTRACT_COLUMN__COLUMN_DEFINITION = ABSTRACT_XML_NAMED_COLUMN__COLUMN_DEFINITION;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_ABSTRACT_COLUMN__NAME = ABSTRACT_XML_NAMED_COLUMN__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Insertable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_ABSTRACT_COLUMN__INSERTABLE = ABSTRACT_XML_NAMED_COLUMN_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Nullable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_ABSTRACT_COLUMN__NULLABLE = ABSTRACT_XML_NAMED_COLUMN_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_ABSTRACT_COLUMN__TABLE = ABSTRACT_XML_NAMED_COLUMN_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_ABSTRACT_COLUMN__UNIQUE = ABSTRACT_XML_NAMED_COLUMN_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Updatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_ABSTRACT_COLUMN__UPDATABLE = ABSTRACT_XML_NAMED_COLUMN_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Abstract Xml Abstract Column</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_ABSTRACT_COLUMN_FEATURE_COUNT = ABSTRACT_XML_NAMED_COLUMN_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlColumn <em>Xml Column</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlColumn
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlColumn()
-	 * @generated
-	 */
-	public static final int XML_COLUMN = 46;
-
-	/**
-	 * The feature id for the '<em><b>Column Definition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN__COLUMN_DEFINITION = XML_ABSTRACT_COLUMN__COLUMN_DEFINITION;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN__NAME = XML_ABSTRACT_COLUMN__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Insertable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN__INSERTABLE = XML_ABSTRACT_COLUMN__INSERTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Nullable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN__NULLABLE = XML_ABSTRACT_COLUMN__NULLABLE;
-
-	/**
-	 * The feature id for the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN__TABLE = XML_ABSTRACT_COLUMN__TABLE;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN__UNIQUE = XML_ABSTRACT_COLUMN__UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Updatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN__UPDATABLE = XML_ABSTRACT_COLUMN__UPDATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Length</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN__LENGTH = XML_ABSTRACT_COLUMN_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Precision</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN__PRECISION = XML_ABSTRACT_COLUMN_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Scale</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN__SCALE = XML_ABSTRACT_COLUMN_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Xml Column</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN_FEATURE_COUNT = XML_ABSTRACT_COLUMN_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlColumnImpl <em>Xml Column Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlColumnImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlColumnImpl()
-	 * @generated
-	 */
-	public static final int XML_COLUMN_IMPL = 47;
-
-	/**
-	 * The feature id for the '<em><b>Column Definition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN_IMPL__COLUMN_DEFINITION = ABSTRACT_XML_ABSTRACT_COLUMN__COLUMN_DEFINITION;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN_IMPL__NAME = ABSTRACT_XML_ABSTRACT_COLUMN__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Insertable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN_IMPL__INSERTABLE = ABSTRACT_XML_ABSTRACT_COLUMN__INSERTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Nullable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN_IMPL__NULLABLE = ABSTRACT_XML_ABSTRACT_COLUMN__NULLABLE;
-
-	/**
-	 * The feature id for the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN_IMPL__TABLE = ABSTRACT_XML_ABSTRACT_COLUMN__TABLE;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN_IMPL__UNIQUE = ABSTRACT_XML_ABSTRACT_COLUMN__UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Updatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN_IMPL__UPDATABLE = ABSTRACT_XML_ABSTRACT_COLUMN__UPDATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Length</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN_IMPL__LENGTH = ABSTRACT_XML_ABSTRACT_COLUMN_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Precision</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN_IMPL__PRECISION = ABSTRACT_XML_ABSTRACT_COLUMN_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Scale</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN_IMPL__SCALE = ABSTRACT_XML_ABSTRACT_COLUMN_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Xml Column Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLUMN_IMPL_FEATURE_COUNT = ABSTRACT_XML_ABSTRACT_COLUMN_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.ColumnResult <em>Column Result</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.ColumnResult
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnResult()
-	 * @generated
-	 */
-	public static final int COLUMN_RESULT = 48;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int COLUMN_RESULT__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Column Result</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int COLUMN_RESULT_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn <em>Xml Discriminator Column</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlDiscriminatorColumn()
-	 * @generated
-	 */
-	public static final int XML_DISCRIMINATOR_COLUMN = 49;
-
-	/**
-	 * The feature id for the '<em><b>Column Definition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_DISCRIMINATOR_COLUMN__COLUMN_DEFINITION = ABSTRACT_XML_NAMED_COLUMN__COLUMN_DEFINITION;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_DISCRIMINATOR_COLUMN__NAME = ABSTRACT_XML_NAMED_COLUMN__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Discriminator Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_DISCRIMINATOR_COLUMN__DISCRIMINATOR_TYPE = ABSTRACT_XML_NAMED_COLUMN_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Length</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_DISCRIMINATOR_COLUMN__LENGTH = ABSTRACT_XML_NAMED_COLUMN_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Discriminator Column</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_DISCRIMINATOR_COLUMN_FEATURE_COUNT = ABSTRACT_XML_NAMED_COLUMN_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.EntityListeners <em>Entity Listeners</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.EntityListeners
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListeners()
-	 * @generated
-	 */
-	public static final int ENTITY_LISTENERS = 50;
-
-	/**
-	 * The feature id for the '<em><b>Entity Listeners</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ENTITY_LISTENERS__ENTITY_LISTENERS = 0;
-
-	/**
-	 * The number of structural features of the '<em>Entity Listeners</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ENTITY_LISTENERS_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.EntityListener <em>Entity Listener</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.EntityListener
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener()
-	 * @generated
-	 */
-	public static final int ENTITY_LISTENER = 51;
-
-	/**
-	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ENTITY_LISTENER__CLASS_NAME = 0;
-
-	/**
-	 * 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 ENTITY_LISTENER__PRE_PERSIST = 1;
-
-	/**
-	 * 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 ENTITY_LISTENER__POST_PERSIST = 2;
-
-	/**
-	 * 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 ENTITY_LISTENER__PRE_REMOVE = 3;
-
-	/**
-	 * 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 ENTITY_LISTENER__POST_REMOVE = 4;
-
-	/**
-	 * 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 ENTITY_LISTENER__PRE_UPDATE = 5;
-
-	/**
-	 * 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 ENTITY_LISTENER__POST_UPDATE = 6;
-
-	/**
-	 * 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 ENTITY_LISTENER__POST_LOAD = 7;
-
-	/**
-	 * The number of structural features of the '<em>Entity Listener</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ENTITY_LISTENER_FEATURE_COUNT = 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.EntityResult <em>Entity Result</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.EntityResult
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityResult()
-	 * @generated
-	 */
-	public static final int ENTITY_RESULT = 52;
-
-	/**
-	 * The feature id for the '<em><b>Discriminator Column</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ENTITY_RESULT__DISCRIMINATOR_COLUMN = 0;
-
-	/**
-	 * The feature id for the '<em><b>Entity Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ENTITY_RESULT__ENTITY_CLASS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Field Results</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ENTITY_RESULT__FIELD_RESULTS = 2;
-
-	/**
-	 * The number of structural features of the '<em>Entity Result</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ENTITY_RESULT_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.FieldResult <em>Field Result</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.FieldResult
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getFieldResult()
-	 * @generated
-	 */
-	public static final int FIELD_RESULT = 54;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.Inheritance <em>Inheritance</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.Inheritance
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getInheritance()
-	 * @generated
-	 */
-	public static final int INHERITANCE = 58;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.Lob <em>Lob</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.Lob
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getLob()
-	 * @generated
-	 */
-	public static final int LOB = 63;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.MapKey <em>Map Key</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.MapKey
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMapKey()
-	 * @generated
-	 */
-	public static final int MAP_KEY = 64;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.EventMethod <em>Event Method</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.EventMethod
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEventMethod()
-	 * @generated
-	 */
-	public static final int EVENT_METHOD = 53;
-
-	/**
-	 * The feature id for the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EVENT_METHOD__METHOD_NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Event Method</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EVENT_METHOD_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 FIELD_RESULT__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Column</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FIELD_RESULT__COLUMN = 1;
-
-	/**
-	 * The number of structural features of the '<em>Field Result</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FIELD_RESULT_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValue <em>Xml Generated Value</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlGeneratedValue
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGeneratedValue()
-	 * @generated
-	 */
-	public static final int XML_GENERATED_VALUE = 55;
-
-	/**
-	 * The feature id for the '<em><b>Generator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_GENERATED_VALUE__GENERATOR = 0;
-
-	/**
-	 * The feature id for the '<em><b>Strategy</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_GENERATED_VALUE__STRATEGY = 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Generated Value</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_GENERATED_VALUE_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValueImpl <em>Xml Generated Value Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlGeneratedValueImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGeneratedValueImpl()
-	 * @generated
-	 */
-	public static final int XML_GENERATED_VALUE_IMPL = 56;
-
-	/**
-	 * The feature id for the '<em><b>Generator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_GENERATED_VALUE_IMPL__GENERATOR = XML_GENERATED_VALUE__GENERATOR;
-
-	/**
-	 * The feature id for the '<em><b>Strategy</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_GENERATED_VALUE_IMPL__STRATEGY = XML_GENERATED_VALUE__STRATEGY;
-
-	/**
-	 * The number of structural features of the '<em>Xml Generated Value Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_GENERATED_VALUE_IMPL_FEATURE_COUNT = XML_GENERATED_VALUE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlIdClass <em>Xml Id Class</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlIdClass
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlIdClass()
-	 * @generated
-	 */
-	public static final int XML_ID_CLASS = 57;
-
-	/**
-	 * 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_ID_CLASS__CLASS_NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Id Class</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID_CLASS_FEATURE_COUNT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Strategy</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INHERITANCE__STRATEGY = 0;
-
-	/**
-	 * The number of structural features of the '<em>Inheritance</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INHERITANCE_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn <em>Xml Join Column</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlJoinColumn
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinColumn()
-	 * @generated
-	 */
-	public static final int XML_JOIN_COLUMN = 59;
-
-	/**
-	 * The feature id for the '<em><b>Column Definition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_COLUMN__COLUMN_DEFINITION = XML_ABSTRACT_COLUMN__COLUMN_DEFINITION;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_COLUMN__NAME = XML_ABSTRACT_COLUMN__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Insertable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_COLUMN__INSERTABLE = XML_ABSTRACT_COLUMN__INSERTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Nullable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_COLUMN__NULLABLE = XML_ABSTRACT_COLUMN__NULLABLE;
-
-	/**
-	 * The feature id for the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_COLUMN__TABLE = XML_ABSTRACT_COLUMN__TABLE;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_COLUMN__UNIQUE = XML_ABSTRACT_COLUMN__UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Updatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_COLUMN__UPDATABLE = XML_ABSTRACT_COLUMN__UPDATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Referenced Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_COLUMN__REFERENCED_COLUMN_NAME = XML_ABSTRACT_COLUMN_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Join Column</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_COLUMN_FEATURE_COUNT = XML_ABSTRACT_COLUMN_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlJoinColumnImpl <em>Xml Join Column Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlJoinColumnImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinColumnImpl()
-	 * @generated
-	 */
-	public static final int XML_JOIN_COLUMN_IMPL = 60;
-
-	/**
-	 * The feature id for the '<em><b>Column Definition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_COLUMN_IMPL__COLUMN_DEFINITION = ABSTRACT_XML_ABSTRACT_COLUMN__COLUMN_DEFINITION;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_COLUMN_IMPL__NAME = ABSTRACT_XML_ABSTRACT_COLUMN__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Insertable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_COLUMN_IMPL__INSERTABLE = ABSTRACT_XML_ABSTRACT_COLUMN__INSERTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Nullable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_COLUMN_IMPL__NULLABLE = ABSTRACT_XML_ABSTRACT_COLUMN__NULLABLE;
-
-	/**
-	 * The feature id for the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_COLUMN_IMPL__TABLE = ABSTRACT_XML_ABSTRACT_COLUMN__TABLE;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_COLUMN_IMPL__UNIQUE = ABSTRACT_XML_ABSTRACT_COLUMN__UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Updatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_COLUMN_IMPL__UPDATABLE = ABSTRACT_XML_ABSTRACT_COLUMN__UPDATABLE;
-
-	/**
-	 * The feature id for the '<em><b>Referenced Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_COLUMN_IMPL__REFERENCED_COLUMN_NAME = ABSTRACT_XML_ABSTRACT_COLUMN_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Join Column Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_COLUMN_IMPL_FEATURE_COUNT = ABSTRACT_XML_ABSTRACT_COLUMN_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlBaseTable <em>Xml Base Table</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlBaseTable
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBaseTable()
-	 * @generated
-	 */
-	public static final int XML_BASE_TABLE = 80;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASE_TABLE__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASE_TABLE__CATALOG = 1;
-
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASE_TABLE__SCHEMA = 2;
-
-	/**
-	 * The feature id for the '<em><b>Unique Constraints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASE_TABLE__UNIQUE_CONSTRAINTS = 3;
-
-	/**
-	 * The number of structural features of the '<em>Xml Base Table</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASE_TABLE_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlJoinTable <em>Xml Join Table</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlJoinTable
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinTable()
-	 * @generated
-	 */
-	public static final int XML_JOIN_TABLE = 61;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE__NAME = XML_BASE_TABLE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE__CATALOG = XML_BASE_TABLE__CATALOG;
-
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE__SCHEMA = XML_BASE_TABLE__SCHEMA;
-
-	/**
-	 * The feature id for the '<em><b>Unique Constraints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE__UNIQUE_CONSTRAINTS = XML_BASE_TABLE__UNIQUE_CONSTRAINTS;
-
-	/**
-	 * The feature id for the '<em><b>Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE__JOIN_COLUMNS = XML_BASE_TABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Inverse Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE__INVERSE_JOIN_COLUMNS = XML_BASE_TABLE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Join Table</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE_FEATURE_COUNT = XML_BASE_TABLE_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlBaseTable <em>Abstract Xml Base Table</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlBaseTable
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractXmlBaseTable()
-	 * @generated
-	 */
-	public static final int ABSTRACT_XML_BASE_TABLE = 79;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_BASE_TABLE__NAME = XML_BASE_TABLE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_BASE_TABLE__CATALOG = XML_BASE_TABLE__CATALOG;
-
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_BASE_TABLE__SCHEMA = XML_BASE_TABLE__SCHEMA;
-
-	/**
-	 * The feature id for the '<em><b>Unique Constraints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_BASE_TABLE__UNIQUE_CONSTRAINTS = XML_BASE_TABLE__UNIQUE_CONSTRAINTS;
-
-	/**
-	 * The number of structural features of the '<em>Abstract Xml Base Table</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ABSTRACT_XML_BASE_TABLE_FEATURE_COUNT = XML_BASE_TABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlJoinTableImpl <em>Xml Join Table Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlJoinTableImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinTableImpl()
-	 * @generated
-	 */
-	public static final int XML_JOIN_TABLE_IMPL = 62;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE_IMPL__NAME = ABSTRACT_XML_BASE_TABLE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE_IMPL__CATALOG = ABSTRACT_XML_BASE_TABLE__CATALOG;
-
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE_IMPL__SCHEMA = ABSTRACT_XML_BASE_TABLE__SCHEMA;
-
-	/**
-	 * The feature id for the '<em><b>Unique Constraints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE_IMPL__UNIQUE_CONSTRAINTS = ABSTRACT_XML_BASE_TABLE__UNIQUE_CONSTRAINTS;
-
-	/**
-	 * The feature id for the '<em><b>Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE_IMPL__JOIN_COLUMNS = ABSTRACT_XML_BASE_TABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Inverse Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE_IMPL__INVERSE_JOIN_COLUMNS = ABSTRACT_XML_BASE_TABLE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Join Table Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE_IMPL_FEATURE_COUNT = ABSTRACT_XML_BASE_TABLE_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Lob</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LOB_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 MAP_KEY__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Map Key</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MAP_KEY_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.MapKeyImpl <em>Map Key Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.MapKeyImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMapKeyImpl()
-	 * @generated
-	 */
-	public static final int MAP_KEY_IMPL = 65;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MAP_KEY_IMPL__NAME = MAP_KEY__NAME;
-
-	/**
-	 * The number of structural features of the '<em>Map Key Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MAP_KEY_IMPL_FEATURE_COUNT = MAP_KEY_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlQuery <em>Xml Query</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlQuery
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlQuery()
-	 * @generated
-	 */
-	public static final int XML_QUERY = 66;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Query</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY__QUERY = 1;
-
-	/**
-	 * 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_QUERY__HINTS = 2;
-
-	/**
-	 * The number of structural features of the '<em>Xml Query</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery <em>Xml Named Native Query</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlNamedNativeQuery()
-	 * @generated
-	 */
-	public static final int XML_NAMED_NATIVE_QUERY = 67;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_NATIVE_QUERY__NAME = XML_QUERY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Query</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_NATIVE_QUERY__QUERY = XML_QUERY__QUERY;
-
-	/**
-	 * 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_NATIVE_QUERY__HINTS = XML_QUERY__HINTS;
-
-	/**
-	 * 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_NATIVE_QUERY__RESULT_CLASS = XML_QUERY_FEATURE_COUNT + 0;
-
-	/**
-	 * 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_NATIVE_QUERY__RESULT_SET_MAPPING = XML_QUERY_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Named Native Query</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_NATIVE_QUERY_FEATURE_COUNT = XML_QUERY_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedQuery <em>Xml Named Query</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlNamedQuery
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlNamedQuery()
-	 * @generated
-	 */
-	public static final int XML_NAMED_QUERY = 68;
-
-	/**
-	 * 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_QUERY__NAME = XML_QUERY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Query</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_QUERY__QUERY = XML_QUERY__QUERY;
-
-	/**
-	 * 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_QUERY__HINTS = XML_QUERY__HINTS;
-
-	/**
-	 * The number of structural features of the '<em>Xml Named Query</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_QUERY_FEATURE_COUNT = XML_QUERY_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PostLoad <em>Post Load</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.PostLoad
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostLoad()
-	 * @generated
-	 */
-	public static final int POST_LOAD = 69;
-
-	/**
-	 * The feature id for the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int POST_LOAD__METHOD_NAME = EVENT_METHOD__METHOD_NAME;
-
-	/**
-	 * The number of structural features of the '<em>Post Load</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int POST_LOAD_FEATURE_COUNT = EVENT_METHOD_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PostPersist <em>Post Persist</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.PostPersist
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostPersist()
-	 * @generated
-	 */
-	public static final int POST_PERSIST = 70;
-
-	/**
-	 * The feature id for the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int POST_PERSIST__METHOD_NAME = EVENT_METHOD__METHOD_NAME;
-
-	/**
-	 * The number of structural features of the '<em>Post Persist</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int POST_PERSIST_FEATURE_COUNT = EVENT_METHOD_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PostRemove <em>Post Remove</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.PostRemove
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostRemove()
-	 * @generated
-	 */
-	public static final int POST_REMOVE = 71;
-
-	/**
-	 * The feature id for the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int POST_REMOVE__METHOD_NAME = EVENT_METHOD__METHOD_NAME;
-
-	/**
-	 * The number of structural features of the '<em>Post Remove</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int POST_REMOVE_FEATURE_COUNT = EVENT_METHOD_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PostUpdate <em>Post Update</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.PostUpdate
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostUpdate()
-	 * @generated
-	 */
-	public static final int POST_UPDATE = 72;
-
-	/**
-	 * The feature id for the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int POST_UPDATE__METHOD_NAME = EVENT_METHOD__METHOD_NAME;
-
-	/**
-	 * The number of structural features of the '<em>Post Update</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int POST_UPDATE_FEATURE_COUNT = EVENT_METHOD_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PrePersist <em>Pre Persist</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.PrePersist
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPrePersist()
-	 * @generated
-	 */
-	public static final int PRE_PERSIST = 73;
-
-	/**
-	 * The feature id for the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PRE_PERSIST__METHOD_NAME = EVENT_METHOD__METHOD_NAME;
-
-	/**
-	 * The number of structural features of the '<em>Pre Persist</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PRE_PERSIST_FEATURE_COUNT = EVENT_METHOD_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PreRemove <em>Pre Remove</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.PreRemove
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPreRemove()
-	 * @generated
-	 */
-	public static final int PRE_REMOVE = 74;
-
-	/**
-	 * The feature id for the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PRE_REMOVE__METHOD_NAME = EVENT_METHOD__METHOD_NAME;
-
-	/**
-	 * The number of structural features of the '<em>Pre Remove</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PRE_REMOVE_FEATURE_COUNT = EVENT_METHOD_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PreUpdate <em>Pre Update</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.PreUpdate
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPreUpdate()
-	 * @generated
-	 */
-	public static final int PRE_UPDATE = 75;
-
-	/**
-	 * The feature id for the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PRE_UPDATE__METHOD_NAME = EVENT_METHOD__METHOD_NAME;
-
-	/**
-	 * The number of structural features of the '<em>Pre Update</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PRE_UPDATE_FEATURE_COUNT = EVENT_METHOD_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn <em>Xml Primary Key Join Column</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPrimaryKeyJoinColumn()
-	 * @generated
-	 */
-	public static final int XML_PRIMARY_KEY_JOIN_COLUMN = 76;
-
-	/**
-	 * The feature id for the '<em><b>Column Definition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIMARY_KEY_JOIN_COLUMN__COLUMN_DEFINITION = XML_NAMED_COLUMN__COLUMN_DEFINITION;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIMARY_KEY_JOIN_COLUMN__NAME = XML_NAMED_COLUMN__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Referenced Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIMARY_KEY_JOIN_COLUMN__REFERENCED_COLUMN_NAME = XML_NAMED_COLUMN_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Primary Key Join Column</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIMARY_KEY_JOIN_COLUMN_FEATURE_COUNT = XML_NAMED_COLUMN_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumnImpl <em>Xml Primary Key Join Column Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumnImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPrimaryKeyJoinColumnImpl()
-	 * @generated
-	 */
-	public static final int XML_PRIMARY_KEY_JOIN_COLUMN_IMPL = 77;
-
-	/**
-	 * The feature id for the '<em><b>Column Definition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIMARY_KEY_JOIN_COLUMN_IMPL__COLUMN_DEFINITION = ABSTRACT_XML_NAMED_COLUMN__COLUMN_DEFINITION;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIMARY_KEY_JOIN_COLUMN_IMPL__NAME = ABSTRACT_XML_NAMED_COLUMN__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Referenced Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIMARY_KEY_JOIN_COLUMN_IMPL__REFERENCED_COLUMN_NAME = ABSTRACT_XML_NAMED_COLUMN_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Primary Key Join Column Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIMARY_KEY_JOIN_COLUMN_IMPL_FEATURE_COUNT = ABSTRACT_XML_NAMED_COLUMN_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint <em>Xml Query Hint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlQueryHint
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlQueryHint()
-	 * @generated
-	 */
-	public static final int XML_QUERY_HINT = 78;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_HINT__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_QUERY_HINT__VALUE = 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Query Hint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_HINT_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlTable <em>Xml Table</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlTable
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTable()
-	 * @generated
-	 */
-	public static final int XML_TABLE = 81;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE__NAME = ABSTRACT_XML_BASE_TABLE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE__CATALOG = ABSTRACT_XML_BASE_TABLE__CATALOG;
-
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE__SCHEMA = ABSTRACT_XML_BASE_TABLE__SCHEMA;
-
-	/**
-	 * The feature id for the '<em><b>Unique Constraints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE__UNIQUE_CONSTRAINTS = ABSTRACT_XML_BASE_TABLE__UNIQUE_CONSTRAINTS;
-
-	/**
-	 * The number of structural features of the '<em>Xml Table</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_FEATURE_COUNT = ABSTRACT_XML_BASE_TABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTable <em>Xml Secondary Table</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlSecondaryTable
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSecondaryTable()
-	 * @generated
-	 */
-	public static final int XML_SECONDARY_TABLE = 82;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE__NAME = XML_BASE_TABLE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE__CATALOG = XML_BASE_TABLE__CATALOG;
-
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE__SCHEMA = XML_BASE_TABLE__SCHEMA;
-
-	/**
-	 * The feature id for the '<em><b>Unique Constraints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE__UNIQUE_CONSTRAINTS = XML_BASE_TABLE__UNIQUE_CONSTRAINTS;
-
-	/**
-	 * The feature id for the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS = XML_BASE_TABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Secondary Table</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE_FEATURE_COUNT = XML_BASE_TABLE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTableImpl <em>Xml Secondary Table Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlSecondaryTableImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSecondaryTableImpl()
-	 * @generated
-	 */
-	public static final int XML_SECONDARY_TABLE_IMPL = 83;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE_IMPL__NAME = ABSTRACT_XML_BASE_TABLE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE_IMPL__CATALOG = ABSTRACT_XML_BASE_TABLE__CATALOG;
-
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE_IMPL__SCHEMA = ABSTRACT_XML_BASE_TABLE__SCHEMA;
-
-	/**
-	 * The feature id for the '<em><b>Unique Constraints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE_IMPL__UNIQUE_CONSTRAINTS = ABSTRACT_XML_BASE_TABLE__UNIQUE_CONSTRAINTS;
-
-	/**
-	 * The feature id for the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE_IMPL__PRIMARY_KEY_JOIN_COLUMNS = ABSTRACT_XML_BASE_TABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Secondary Table Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE_IMPL_FEATURE_COUNT = ABSTRACT_XML_BASE_TABLE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlGenerator <em>Xml Generator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlGenerator
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGenerator()
-	 * @generated
-	 */
-	public static final int XML_GENERATOR = 84;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_GENERATOR__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Initial Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_GENERATOR__INITIAL_VALUE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Allocation Size</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_GENERATOR__ALLOCATION_SIZE = 2;
-
-	/**
-	 * The number of structural features of the '<em>Xml Generator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_GENERATOR_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator <em>Xml Sequence Generator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSequenceGenerator()
-	 * @generated
-	 */
-	public static final int XML_SEQUENCE_GENERATOR = 85;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SEQUENCE_GENERATOR__NAME = XML_GENERATOR__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Initial Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SEQUENCE_GENERATOR__INITIAL_VALUE = XML_GENERATOR__INITIAL_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Allocation Size</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SEQUENCE_GENERATOR__ALLOCATION_SIZE = XML_GENERATOR__ALLOCATION_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Sequence Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SEQUENCE_GENERATOR__SEQUENCE_NAME = XML_GENERATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Sequence Generator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SEQUENCE_GENERATOR_FEATURE_COUNT = XML_GENERATOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGeneratorImpl <em>Xml Sequence Generator Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlSequenceGeneratorImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSequenceGeneratorImpl()
-	 * @generated
-	 */
-	public static final int XML_SEQUENCE_GENERATOR_IMPL = 86;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SEQUENCE_GENERATOR_IMPL__NAME = XML_SEQUENCE_GENERATOR__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Initial Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SEQUENCE_GENERATOR_IMPL__INITIAL_VALUE = XML_SEQUENCE_GENERATOR__INITIAL_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Allocation Size</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SEQUENCE_GENERATOR_IMPL__ALLOCATION_SIZE = XML_SEQUENCE_GENERATOR__ALLOCATION_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Sequence Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SEQUENCE_GENERATOR_IMPL__SEQUENCE_NAME = XML_SEQUENCE_GENERATOR__SEQUENCE_NAME;
-
-	/**
-	 * The number of structural features of the '<em>Xml Sequence Generator Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SEQUENCE_GENERATOR_IMPL_FEATURE_COUNT = XML_SEQUENCE_GENERATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.SqlResultSetMapping
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSqlResultSetMapping()
-	 * @generated
-	 */
-	public static final int SQL_RESULT_SET_MAPPING = 87;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SQL_RESULT_SET_MAPPING__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Entity Results</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SQL_RESULT_SET_MAPPING__ENTITY_RESULTS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Column Results</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SQL_RESULT_SET_MAPPING__COLUMN_RESULTS = 2;
-
-	/**
-	 * The number of structural features of the '<em>Sql Result Set Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SQL_RESULT_SET_MAPPING_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator <em>Xml Table Generator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator()
-	 * @generated
-	 */
-	public static final int XML_TABLE_GENERATOR = 88;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__NAME = XML_GENERATOR__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Initial Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__INITIAL_VALUE = XML_GENERATOR__INITIAL_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Allocation Size</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__ALLOCATION_SIZE = XML_GENERATOR__ALLOCATION_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__TABLE = XML_GENERATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__CATALOG = XML_GENERATOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__SCHEMA = XML_GENERATOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Pk Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__PK_COLUMN_NAME = XML_GENERATOR_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Value Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__VALUE_COLUMN_NAME = XML_GENERATOR_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Pk Column Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__PK_COLUMN_VALUE = XML_GENERATOR_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Unique Constraints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__UNIQUE_CONSTRAINTS = XML_GENERATOR_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>Xml Table Generator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR_FEATURE_COUNT = XML_GENERATOR_FEATURE_COUNT + 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGeneratorImpl <em>Xml Table Generator Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlTableGeneratorImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGeneratorImpl()
-	 * @generated
-	 */
-	public static final int XML_TABLE_GENERATOR_IMPL = 89;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR_IMPL__NAME = XML_TABLE_GENERATOR__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Initial Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR_IMPL__INITIAL_VALUE = XML_TABLE_GENERATOR__INITIAL_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Allocation Size</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR_IMPL__ALLOCATION_SIZE = XML_TABLE_GENERATOR__ALLOCATION_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR_IMPL__TABLE = XML_TABLE_GENERATOR__TABLE;
-
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR_IMPL__CATALOG = XML_TABLE_GENERATOR__CATALOG;
-
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR_IMPL__SCHEMA = XML_TABLE_GENERATOR__SCHEMA;
-
-	/**
-	 * The feature id for the '<em><b>Pk Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR_IMPL__PK_COLUMN_NAME = XML_TABLE_GENERATOR__PK_COLUMN_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Value Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR_IMPL__VALUE_COLUMN_NAME = XML_TABLE_GENERATOR__VALUE_COLUMN_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Pk Column Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR_IMPL__PK_COLUMN_VALUE = XML_TABLE_GENERATOR__PK_COLUMN_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Unique Constraints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR_IMPL__UNIQUE_CONSTRAINTS = XML_TABLE_GENERATOR__UNIQUE_CONSTRAINTS;
-
-	/**
-	 * The number of structural features of the '<em>Xml Table Generator Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR_IMPL_FEATURE_COUNT = XML_TABLE_GENERATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint <em>Xml Unique Constraint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlUniqueConstraint()
-	 * @generated
-	 */
-	public static final int XML_UNIQUE_CONSTRAINT = 90;
-
-	/**
-	 * The feature id for the '<em><b>Column Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_UNIQUE_CONSTRAINT__COLUMN_NAMES = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Unique Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_UNIQUE_CONSTRAINT_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlUniqueConstraintImpl <em>Xml Unique Constraint Impl</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.XmlUniqueConstraintImpl
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlUniqueConstraintImpl()
-	 * @generated
-	 */
-	public static final int XML_UNIQUE_CONSTRAINT_IMPL = 91;
-
-	/**
-	 * The feature id for the '<em><b>Column Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_UNIQUE_CONSTRAINT_IMPL__COLUMN_NAMES = XML_UNIQUE_CONSTRAINT__COLUMN_NAMES;
-
-	/**
-	 * The number of structural features of the '<em>Xml Unique Constraint Impl</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_UNIQUE_CONSTRAINT_IMPL_FEATURE_COUNT = XML_UNIQUE_CONSTRAINT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.AccessType <em>Access Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAccessType()
-	 * @generated
-	 */
-	public static final int ACCESS_TYPE = 92;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.DiscriminatorType <em>Discriminator Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.DiscriminatorType
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorType()
-	 * @generated
-	 */
-	public static final int DISCRIMINATOR_TYPE = 93;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.EnumType <em>Enum Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.EnumType
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEnumType()
-	 * @generated
-	 */
-	public static final int ENUM_TYPE = 94;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.FetchType <em>Fetch Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.FetchType
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getFetchType()
-	 * @generated
-	 */
-	public static final int FETCH_TYPE = 95;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.GenerationType <em>Generation Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.GenerationType
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerationType()
-	 * @generated
-	 */
-	public static final int GENERATION_TYPE = 96;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.InheritanceType <em>Inheritance Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.InheritanceType
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getInheritanceType()
-	 * @generated
-	 */
-	public static final int INHERITANCE_TYPE = 97;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.TemporalType <em>Temporal Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.orm.TemporalType
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTemporalType()
-	 * @generated
-	 */
-	public static final int TEMPORAL_TYPE = 98;
-
-	/**
-	 * The meta object id for the '<em>Discriminator Value</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorValue()
-	 * @generated
-	 */
-	public static final int DISCRIMINATOR_VALUE = 99;
-
-	/**
-	 * The meta object id for the '<em>Enumerated</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.common.util.Enumerator
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEnumerated()
-	 * @generated
-	 */
-	public static final int ENUMERATED = 100;
-
-	/**
-	 * The meta object id for the '<em>Order By</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOrderBy()
-	 * @generated
-	 */
-	public static final int ORDER_BY = 101;
-
-	/**
-	 * The meta object id for the '<em>Version Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getVersionType()
-	 * @generated
-	 */
-	public static final int VERSION_TYPE = 102;
-
-	/**
-	 * <!-- 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 xmlPersistenceUnitDefaultsEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass abstractXmlTypeMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlMappedSuperclassEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEntityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbeddableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass attributesEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlAttributeMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass abstractXmlAttributeMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlNullAttributeMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass columnMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlRelationshipMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlMultiRelationshipMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlSingleRelationshipMappingEClass = 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 baseXmlEmbeddedEClass = 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 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 xmlManyToOneEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlManyToOneImplEClass = 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 xmlOneToOneEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOneToOneImplEClass = 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 xmlEmbeddedEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbeddedImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTransientEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTransientImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlAssociationOverrideEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlAssociationOverrideImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlAttributeOverrideEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlAttributeOverrideImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass cascadeTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass cascadeTypeImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlNamedColumnEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass abstractXmlNamedColumnEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlAbstractColumnEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass abstractXmlAbstractColumnEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlColumnEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlColumnImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass columnResultEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlDiscriminatorColumnEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass entityListenersEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass entityListenerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass entityResultEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass fieldResultEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlGeneratedValueEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlGeneratedValueImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlIdClassEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass inheritanceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlJoinColumnEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlJoinColumnImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlJoinTableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlJoinTableImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass lobEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass mapKeyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass mapKeyImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlQueryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlNamedNativeQueryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlNamedQueryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass eventMethodEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass postLoadEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass postPersistEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass postRemoveEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass postUpdateEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass prePersistEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass preRemoveEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass preUpdateEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPrimaryKeyJoinColumnEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPrimaryKeyJoinColumnImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlQueryHintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass abstractXmlBaseTableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBaseTableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlSecondaryTableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlSecondaryTableImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlGeneratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlSequenceGeneratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlSequenceGeneratorImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass sqlResultSetMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTableGeneratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTableGeneratorImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlUniqueConstraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlUniqueConstraintImplEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum accessTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum discriminatorTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum enumTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum fetchTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum generationTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum inheritanceTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum temporalTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType discriminatorValueEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType enumeratedEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType orderByEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType versionTypeEDataType = 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.core.resource.orm.OrmPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private OrmPackage()
-	{
-		super(eNS_URI, OrmFactory.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 OrmPackage init()
-	{
-		if (isInited) return (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
-
-		// Obtain or create and register package
-		OrmPackage theOrmPackage = (OrmPackage)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof OrmPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new OrmPackage());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		XMLTypePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		PersistencePackage thePersistencePackage = (PersistencePackage)(EPackage.Registry.INSTANCE.getEPackage(PersistencePackage.eNS_URI) instanceof PersistencePackage ? EPackage.Registry.INSTANCE.getEPackage(PersistencePackage.eNS_URI) : PersistencePackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theOrmPackage.createPackageContents();
-		thePersistencePackage.createPackageContents();
-
-		// Initialize created meta-data
-		theOrmPackage.initializePackageContents();
-		thePersistencePackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theOrmPackage.freeze();
-
-		return theOrmPackage;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlEntityMappings
-	 * @generated
-	 */
-	public EClass getXmlEntityMappings()
-	{
-		return xmlEntityMappingsEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getVersion <em>Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getVersion()
-	 * @see #getXmlEntityMappings()
-	 * @generated
-	 */
-	public EAttribute getXmlEntityMappings_Version()
-	{
-		return (EAttribute)xmlEntityMappingsEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getDescription()
-	 * @see #getXmlEntityMappings()
-	 * @generated
-	 */
-	public EAttribute getXmlEntityMappings_Description()
-	{
-		return (EAttribute)xmlEntityMappingsEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getPersistenceUnitMetadata <em>Persistence Unit Metadata</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Persistence Unit Metadata</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getPersistenceUnitMetadata()
-	 * @see #getXmlEntityMappings()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_PersistenceUnitMetadata()
-	{
-		return (EReference)xmlEntityMappingsEClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getPackage <em>Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Package</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getPackage()
-	 * @see #getXmlEntityMappings()
-	 * @generated
-	 */
-	public EAttribute getXmlEntityMappings_Package()
-	{
-		return (EAttribute)xmlEntityMappingsEClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getSchema <em>Schema</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Schema</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getSchema()
-	 * @see #getXmlEntityMappings()
-	 * @generated
-	 */
-	public EAttribute getXmlEntityMappings_Schema()
-	{
-		return (EAttribute)xmlEntityMappingsEClass.getEStructuralFeatures().get(4);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getCatalog <em>Catalog</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Catalog</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getCatalog()
-	 * @see #getXmlEntityMappings()
-	 * @generated
-	 */
-	public EAttribute getXmlEntityMappings_Catalog()
-	{
-		return (EAttribute)xmlEntityMappingsEClass.getEStructuralFeatures().get(5);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getAccess <em>Access</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Access</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getAccess()
-	 * @see #getXmlEntityMappings()
-	 * @generated
-	 */
-	public EAttribute getXmlEntityMappings_Access()
-	{
-		return (EAttribute)xmlEntityMappingsEClass.getEStructuralFeatures().get(6);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getSequenceGenerators <em>Sequence Generators</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Sequence Generators</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getSequenceGenerators()
-	 * @see #getXmlEntityMappings()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_SequenceGenerators()
-	{
-		return (EReference)xmlEntityMappingsEClass.getEStructuralFeatures().get(7);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getTableGenerators <em>Table Generators</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Table Generators</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getTableGenerators()
-	 * @see #getXmlEntityMappings()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_TableGenerators()
-	{
-		return (EReference)xmlEntityMappingsEClass.getEStructuralFeatures().get(8);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getNamedQueries <em>Named Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Named Queries</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getNamedQueries()
-	 * @see #getXmlEntityMappings()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_NamedQueries()
-	{
-		return (EReference)xmlEntityMappingsEClass.getEStructuralFeatures().get(9);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getNamedNativeQueries <em>Named Native Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Named Native Queries</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getNamedNativeQueries()
-	 * @see #getXmlEntityMappings()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_NamedNativeQueries()
-	{
-		return (EReference)xmlEntityMappingsEClass.getEStructuralFeatures().get(10);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getSqlResultSetMappings <em>Sql Result Set Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Sql Result Set Mappings</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getSqlResultSetMappings()
-	 * @see #getXmlEntityMappings()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_SqlResultSetMappings()
-	{
-		return (EReference)xmlEntityMappingsEClass.getEStructuralFeatures().get(11);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getMappedSuperclasses <em>Mapped Superclasses</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Mapped Superclasses</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getMappedSuperclasses()
-	 * @see #getXmlEntityMappings()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_MappedSuperclasses()
-	{
-		return (EReference)xmlEntityMappingsEClass.getEStructuralFeatures().get(12);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getEntities <em>Entities</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Entities</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getEntities()
-	 * @see #getXmlEntityMappings()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_Entities()
-	{
-		return (EReference)xmlEntityMappingsEClass.getEStructuralFeatures().get(13);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getEmbeddables <em>Embeddables</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Embeddables</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getEmbeddables()
-	 * @see #getXmlEntityMappings()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_Embeddables()
-	{
-		return (EReference)xmlEntityMappingsEClass.getEStructuralFeatures().get(14);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlPersistenceUnitMetadata
-	 * @generated
-	 */
-	public EClass getXmlPersistenceUnitMetadata()
-	{
-		return xmlPersistenceUnitMetadataEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata#isXmlMappingMetadataComplete <em>Xml Mapping Metadata Complete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Xml Mapping Metadata Complete</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata#isXmlMappingMetadataComplete()
-	 * @see #getXmlPersistenceUnitMetadata()
-	 * @generated
-	 */
-	public EAttribute getXmlPersistenceUnitMetadata_XmlMappingMetadataComplete()
-	{
-		return (EAttribute)xmlPersistenceUnitMetadataEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata#getPersistenceUnitDefaults <em>Persistence Unit Defaults</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Persistence Unit Defaults</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata#getPersistenceUnitDefaults()
-	 * @see #getXmlPersistenceUnitMetadata()
-	 * @generated
-	 */
-	public EReference getXmlPersistenceUnitMetadata_PersistenceUnitDefaults()
-	{
-		return (EReference)xmlPersistenceUnitMetadataEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Persistence Unit Defaults</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults
-	 * @generated
-	 */
-	public EClass getXmlPersistenceUnitDefaults()
-	{
-		return xmlPersistenceUnitDefaultsEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#getSchema <em>Schema</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Schema</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#getSchema()
-	 * @see #getXmlPersistenceUnitDefaults()
-	 * @generated
-	 */
-	public EAttribute getXmlPersistenceUnitDefaults_Schema()
-	{
-		return (EAttribute)xmlPersistenceUnitDefaultsEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#getCatalog <em>Catalog</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Catalog</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#getCatalog()
-	 * @see #getXmlPersistenceUnitDefaults()
-	 * @generated
-	 */
-	public EAttribute getXmlPersistenceUnitDefaults_Catalog()
-	{
-		return (EAttribute)xmlPersistenceUnitDefaultsEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#getAccess <em>Access</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Access</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#getAccess()
-	 * @see #getXmlPersistenceUnitDefaults()
-	 * @generated
-	 */
-	public EAttribute getXmlPersistenceUnitDefaults_Access()
-	{
-		return (EAttribute)xmlPersistenceUnitDefaultsEClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#isCascadePersist <em>Cascade Persist</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cascade Persist</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#isCascadePersist()
-	 * @see #getXmlPersistenceUnitDefaults()
-	 * @generated
-	 */
-	public EAttribute getXmlPersistenceUnitDefaults_CascadePersist()
-	{
-		return (EAttribute)xmlPersistenceUnitDefaultsEClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#getEntityListeners <em>Entity Listeners</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Entity Listeners</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#getEntityListeners()
-	 * @see #getXmlPersistenceUnitDefaults()
-	 * @generated
-	 */
-	public EReference getXmlPersistenceUnitDefaults_EntityListeners()
-	{
-		return (EReference)xmlPersistenceUnitDefaultsEClass.getEStructuralFeatures().get(4);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping <em>Abstract Xml Type Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Abstract Xml Type Mapping</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping
-	 * @generated
-	 */
-	public EClass getAbstractXmlTypeMapping()
-	{
-		return abstractXmlTypeMappingEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#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.core.resource.orm.AbstractXmlTypeMapping#getClassName()
-	 * @see #getAbstractXmlTypeMapping()
-	 * @generated
-	 */
-	public EAttribute getAbstractXmlTypeMapping_ClassName()
-	{
-		return (EAttribute)abstractXmlTypeMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#getAccess <em>Access</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Access</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#getAccess()
-	 * @see #getAbstractXmlTypeMapping()
-	 * @generated
-	 */
-	public EAttribute getAbstractXmlTypeMapping_Access()
-	{
-		return (EAttribute)abstractXmlTypeMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#getMetadataComplete <em>Metadata Complete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Metadata Complete</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#getMetadataComplete()
-	 * @see #getAbstractXmlTypeMapping()
-	 * @generated
-	 */
-	public EAttribute getAbstractXmlTypeMapping_MetadataComplete()
-	{
-		return (EAttribute)abstractXmlTypeMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#getDescription()
-	 * @see #getAbstractXmlTypeMapping()
-	 * @generated
-	 */
-	public EAttribute getAbstractXmlTypeMapping_Description()
-	{
-		return (EAttribute)abstractXmlTypeMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#getAttributes <em>Attributes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Attributes</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping#getAttributes()
-	 * @see #getAbstractXmlTypeMapping()
-	 * @generated
-	 */
-	public EReference getAbstractXmlTypeMapping_Attributes()
-	{
-		return (EReference)abstractXmlTypeMappingEClass.getEStructuralFeatures().get(4);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlMappedSuperclass
-	 * @generated
-	 */
-	public EClass getXmlMappedSuperclass()
-	{
-		return xmlMappedSuperclassEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getIdClass <em>Id Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Id Class</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getIdClass()
-	 * @see #getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_IdClass()
-	{
-		return (EReference)xmlMappedSuperclassEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#isExcludeDefaultListeners <em>Exclude Default Listeners</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Exclude Default Listeners</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#isExcludeDefaultListeners()
-	 * @see #getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public EAttribute getXmlMappedSuperclass_ExcludeDefaultListeners()
-	{
-		return (EAttribute)xmlMappedSuperclassEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#isExcludeSuperclassListeners <em>Exclude Superclass Listeners</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Exclude Superclass Listeners</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#isExcludeSuperclassListeners()
-	 * @see #getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public EAttribute getXmlMappedSuperclass_ExcludeSuperclassListeners()
-	{
-		return (EAttribute)xmlMappedSuperclassEClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getEntityListeners <em>Entity Listeners</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Entity Listeners</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getEntityListeners()
-	 * @see #getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_EntityListeners()
-	{
-		return (EReference)xmlMappedSuperclassEClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPrePersist <em>Pre Persist</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Pre Persist</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPrePersist()
-	 * @see #getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_PrePersist()
-	{
-		return (EReference)xmlMappedSuperclassEClass.getEStructuralFeatures().get(4);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostPersist <em>Post Persist</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Post Persist</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostPersist()
-	 * @see #getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_PostPersist()
-	{
-		return (EReference)xmlMappedSuperclassEClass.getEStructuralFeatures().get(5);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPreRemove <em>Pre Remove</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Pre Remove</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPreRemove()
-	 * @see #getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_PreRemove()
-	{
-		return (EReference)xmlMappedSuperclassEClass.getEStructuralFeatures().get(6);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostRemove <em>Post Remove</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Post Remove</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostRemove()
-	 * @see #getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_PostRemove()
-	{
-		return (EReference)xmlMappedSuperclassEClass.getEStructuralFeatures().get(7);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPreUpdate <em>Pre Update</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Pre Update</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPreUpdate()
-	 * @see #getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_PreUpdate()
-	{
-		return (EReference)xmlMappedSuperclassEClass.getEStructuralFeatures().get(8);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostUpdate <em>Post Update</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Post Update</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostUpdate()
-	 * @see #getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_PostUpdate()
-	{
-		return (EReference)xmlMappedSuperclassEClass.getEStructuralFeatures().get(9);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostLoad <em>Post Load</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Post Load</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostLoad()
-	 * @see #getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_PostLoad()
-	{
-		return (EReference)xmlMappedSuperclassEClass.getEStructuralFeatures().get(10);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlEntity
-	 * @generated
-	 */
-	public EClass getXmlEntity()
-	{
-		return xmlEntityEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getName()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EAttribute getXmlEntity_Name()
-	{
-		return (EAttribute)xmlEntityEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getTable <em>Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Table</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getTable()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_Table()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getSecondaryTables <em>Secondary Tables</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Secondary Tables</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getSecondaryTables()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_SecondaryTables()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Primary Key Join Columns</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getPrimaryKeyJoinColumns()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_PrimaryKeyJoinColumns()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getIdClass <em>Id Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Id Class</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getIdClass()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_IdClass()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(4);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getInheritance <em>Inheritance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Inheritance</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getInheritance()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_Inheritance()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(5);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getDiscriminatorValue <em>Discriminator Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Discriminator Value</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getDiscriminatorValue()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EAttribute getXmlEntity_DiscriminatorValue()
-	{
-		return (EAttribute)xmlEntityEClass.getEStructuralFeatures().get(6);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getDiscriminatorColumn <em>Discriminator Column</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Discriminator Column</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getDiscriminatorColumn()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_DiscriminatorColumn()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(7);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#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.core.resource.orm.XmlEntity#getSequenceGenerator()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_SequenceGenerator()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(8);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#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.core.resource.orm.XmlEntity#getTableGenerator()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_TableGenerator()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(9);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getNamedQueries <em>Named Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Named Queries</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getNamedQueries()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_NamedQueries()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(10);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getNamedNativeQueries <em>Named Native Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Named Native Queries</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getNamedNativeQueries()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_NamedNativeQueries()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(11);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getSqlResultSetMappings <em>Sql Result Set Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Sql Result Set Mappings</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getSqlResultSetMappings()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_SqlResultSetMappings()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(12);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#isExcludeDefaultListeners <em>Exclude Default Listeners</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Exclude Default Listeners</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#isExcludeDefaultListeners()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EAttribute getXmlEntity_ExcludeDefaultListeners()
-	{
-		return (EAttribute)xmlEntityEClass.getEStructuralFeatures().get(13);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#isExcludeSuperclassListeners <em>Exclude Superclass Listeners</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Exclude Superclass Listeners</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#isExcludeSuperclassListeners()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EAttribute getXmlEntity_ExcludeSuperclassListeners()
-	{
-		return (EAttribute)xmlEntityEClass.getEStructuralFeatures().get(14);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getEntityListeners <em>Entity Listeners</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Entity Listeners</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getEntityListeners()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_EntityListeners()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(15);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPrePersist <em>Pre Persist</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Pre Persist</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getPrePersist()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_PrePersist()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(16);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostPersist <em>Post Persist</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Post Persist</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getPostPersist()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_PostPersist()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(17);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPreRemove <em>Pre Remove</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Pre Remove</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getPreRemove()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_PreRemove()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(18);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostRemove <em>Post Remove</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Post Remove</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getPostRemove()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_PostRemove()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(19);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPreUpdate <em>Pre Update</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Pre Update</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getPreUpdate()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_PreUpdate()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(20);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostUpdate <em>Post Update</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Post Update</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getPostUpdate()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_PostUpdate()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(21);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostLoad <em>Post Load</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Post Load</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getPostLoad()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_PostLoad()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(22);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getAttributeOverrides <em>Attribute Overrides</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Attribute Overrides</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getAttributeOverrides()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_AttributeOverrides()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(23);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getAssociationOverrides <em>Association Overrides</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Association Overrides</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getAssociationOverrides()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_AssociationOverrides()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(24);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlEmbeddable
-	 * @generated
-	 */
-	public EClass getXmlEmbeddable()
-	{
-		return xmlEmbeddableEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.Attributes
-	 * @generated
-	 */
-	public EClass getAttributes()
-	{
-		return attributesEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getIds <em>Ids</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ids</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.Attributes#getIds()
-	 * @see #getAttributes()
-	 * @generated
-	 */
-	public EReference getAttributes_Ids()
-	{
-		return (EReference)attributesEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getEmbeddedIds <em>Embedded Ids</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Embedded Ids</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.Attributes#getEmbeddedIds()
-	 * @see #getAttributes()
-	 * @generated
-	 */
-	public EReference getAttributes_EmbeddedIds()
-	{
-		return (EReference)attributesEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getBasics <em>Basics</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Basics</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.Attributes#getBasics()
-	 * @see #getAttributes()
-	 * @generated
-	 */
-	public EReference getAttributes_Basics()
-	{
-		return (EReference)attributesEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getVersions <em>Versions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Versions</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.Attributes#getVersions()
-	 * @see #getAttributes()
-	 * @generated
-	 */
-	public EReference getAttributes_Versions()
-	{
-		return (EReference)attributesEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getManyToOnes <em>Many To Ones</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Many To Ones</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.Attributes#getManyToOnes()
-	 * @see #getAttributes()
-	 * @generated
-	 */
-	public EReference getAttributes_ManyToOnes()
-	{
-		return (EReference)attributesEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getOneToManys <em>One To Manys</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>One To Manys</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.Attributes#getOneToManys()
-	 * @see #getAttributes()
-	 * @generated
-	 */
-	public EReference getAttributes_OneToManys()
-	{
-		return (EReference)attributesEClass.getEStructuralFeatures().get(5);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getOneToOnes <em>One To Ones</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>One To Ones</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.Attributes#getOneToOnes()
-	 * @see #getAttributes()
-	 * @generated
-	 */
-	public EReference getAttributes_OneToOnes()
-	{
-		return (EReference)attributesEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getManyToManys <em>Many To Manys</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Many To Manys</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.Attributes#getManyToManys()
-	 * @see #getAttributes()
-	 * @generated
-	 */
-	public EReference getAttributes_ManyToManys()
-	{
-		return (EReference)attributesEClass.getEStructuralFeatures().get(7);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getEmbeddeds <em>Embeddeds</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Embeddeds</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.Attributes#getEmbeddeds()
-	 * @see #getAttributes()
-	 * @generated
-	 */
-	public EReference getAttributes_Embeddeds()
-	{
-		return (EReference)attributesEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getTransients <em>Transients</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Transients</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.Attributes#getTransients()
-	 * @see #getAttributes()
-	 * @generated
-	 */
-	public EReference getAttributes_Transients()
-	{
-		return (EReference)attributesEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlAttributeMapping
-	 * @generated
-	 */
-	public EClass getXmlAttributeMapping()
-	{
-		return xmlAttributeMappingEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeMapping#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAttributeMapping#getName()
-	 * @see #getXmlAttributeMapping()
-	 * @generated
-	 */
-	public EAttribute getXmlAttributeMapping_Name()
-	{
-		return (EAttribute)xmlAttributeMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlAttributeMapping <em>Abstract Xml Attribute Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Abstract Xml Attribute Mapping</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlAttributeMapping
-	 * @generated
-	 */
-	public EClass getAbstractXmlAttributeMapping()
-	{
-		return abstractXmlAttributeMappingEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping <em>Xml Null Attribute Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Null Attribute Mapping</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping
-	 * @generated
-	 */
-	public EClass getXmlNullAttributeMapping()
-	{
-		return xmlNullAttributeMappingEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.ColumnMapping <em>Column Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Column Mapping</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.ColumnMapping
-	 * @generated
-	 */
-	public EClass getColumnMapping()
-	{
-		return columnMappingEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.ColumnMapping#getColumn <em>Column</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Column</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.ColumnMapping#getColumn()
-	 * @see #getColumnMapping()
-	 * @generated
-	 */
-	public EReference getColumnMapping_Column()
-	{
-		return (EReference)columnMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping <em>Xml Relationship Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Relationship Mapping</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping
-	 * @generated
-	 */
-	public EClass getXmlRelationshipMapping()
-	{
-		return xmlRelationshipMappingEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getTargetEntity <em>Target Entity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Target Entity</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getTargetEntity()
-	 * @see #getXmlRelationshipMapping()
-	 * @generated
-	 */
-	public EAttribute getXmlRelationshipMapping_TargetEntity()
-	{
-		return (EAttribute)xmlRelationshipMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getFetch <em>Fetch</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Fetch</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getFetch()
-	 * @see #getXmlRelationshipMapping()
-	 * @generated
-	 */
-	public EAttribute getXmlRelationshipMapping_Fetch()
-	{
-		return (EAttribute)xmlRelationshipMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getJoinTable <em>Join Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Join Table</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getJoinTable()
-	 * @see #getXmlRelationshipMapping()
-	 * @generated
-	 */
-	public EReference getXmlRelationshipMapping_JoinTable()
-	{
-		return (EReference)xmlRelationshipMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getCascade <em>Cascade</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Cascade</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getCascade()
-	 * @see #getXmlRelationshipMapping()
-	 * @generated
-	 */
-	public EReference getXmlRelationshipMapping_Cascade()
-	{
-		return (EReference)xmlRelationshipMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping <em>Xml Multi Relationship Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Multi Relationship Mapping</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping
-	 * @generated
-	 */
-	public EClass getXmlMultiRelationshipMapping()
-	{
-		return xmlMultiRelationshipMappingEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getMappedBy <em>Mapped By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mapped By</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getMappedBy()
-	 * @see #getXmlMultiRelationshipMapping()
-	 * @generated
-	 */
-	public EAttribute getXmlMultiRelationshipMapping_MappedBy()
-	{
-		return (EAttribute)xmlMultiRelationshipMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getOrderBy <em>Order By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Order By</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getOrderBy()
-	 * @see #getXmlMultiRelationshipMapping()
-	 * @generated
-	 */
-	public EAttribute getXmlMultiRelationshipMapping_OrderBy()
-	{
-		return (EAttribute)xmlMultiRelationshipMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getMapKey <em>Map Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Map Key</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getMapKey()
-	 * @see #getXmlMultiRelationshipMapping()
-	 * @generated
-	 */
-	public EReference getXmlMultiRelationshipMapping_MapKey()
-	{
-		return (EReference)xmlMultiRelationshipMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping <em>Xml Single Relationship Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Single Relationship Mapping</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping
-	 * @generated
-	 */
-	public EClass getXmlSingleRelationshipMapping()
-	{
-		return xmlSingleRelationshipMappingEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping#getOptional <em>Optional</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Optional</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping#getOptional()
-	 * @see #getXmlSingleRelationshipMapping()
-	 * @generated
-	 */
-	public EAttribute getXmlSingleRelationshipMapping_Optional()
-	{
-		return (EAttribute)xmlSingleRelationshipMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping#getJoinColumns <em>Join Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Join Columns</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping#getJoinColumns()
-	 * @see #getXmlSingleRelationshipMapping()
-	 * @generated
-	 */
-	public EReference getXmlSingleRelationshipMapping_JoinColumns()
-	{
-		return (EReference)xmlSingleRelationshipMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlId
-	 * @generated
-	 */
-	public EClass getXmlId()
-	{
-		return xmlIdEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlId#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.core.resource.orm.XmlId#getGeneratedValue()
-	 * @see #getXmlId()
-	 * @generated
-	 */
-	public EReference getXmlId_GeneratedValue()
-	{
-		return (EReference)xmlIdEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlId#getTemporal <em>Temporal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Temporal</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlId#getTemporal()
-	 * @see #getXmlId()
-	 * @generated
-	 */
-	public EAttribute getXmlId_Temporal()
-	{
-		return (EAttribute)xmlIdEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlId#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.core.resource.orm.XmlId#getTableGenerator()
-	 * @see #getXmlId()
-	 * @generated
-	 */
-	public EReference getXmlId_TableGenerator()
-	{
-		return (EReference)xmlIdEClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlId#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.core.resource.orm.XmlId#getSequenceGenerator()
-	 * @see #getXmlId()
-	 * @generated
-	 */
-	public EReference getXmlId_SequenceGenerator()
-	{
-		return (EReference)xmlIdEClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlIdImpl
-	 * @generated
-	 */
-	public EClass getXmlIdImpl()
-	{
-		return xmlIdImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.BaseXmlEmbedded <em>Base Xml Embedded</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Base Xml Embedded</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.BaseXmlEmbedded
-	 * @generated
-	 */
-	public EClass getBaseXmlEmbedded()
-	{
-		return baseXmlEmbeddedEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.BaseXmlEmbedded#getAttributeOverrides <em>Attribute Overrides</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Attribute Overrides</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.BaseXmlEmbedded#getAttributeOverrides()
-	 * @see #getBaseXmlEmbedded()
-	 * @generated
-	 */
-	public EReference getBaseXmlEmbedded_AttributeOverrides()
-	{
-		return (EReference)baseXmlEmbeddedEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlEmbeddedId
-	 * @generated
-	 */
-	public EClass getXmlEmbeddedId()
-	{
-		return xmlEmbeddedIdEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlEmbeddedIdImpl
-	 * @generated
-	 */
-	public EClass getXmlEmbeddedIdImpl()
-	{
-		return xmlEmbeddedIdImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlBasic
-	 * @generated
-	 */
-	public EClass getXmlBasic()
-	{
-		return xmlBasicEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getFetch <em>Fetch</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Fetch</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlBasic#getFetch()
-	 * @see #getXmlBasic()
-	 * @generated
-	 */
-	public EAttribute getXmlBasic_Fetch()
-	{
-		return (EAttribute)xmlBasicEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getOptional <em>Optional</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Optional</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlBasic#getOptional()
-	 * @see #getXmlBasic()
-	 * @generated
-	 */
-	public EAttribute getXmlBasic_Optional()
-	{
-		return (EAttribute)xmlBasicEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#isLob <em>Lob</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Lob</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlBasic#isLob()
-	 * @see #getXmlBasic()
-	 * @generated
-	 */
-	public EAttribute getXmlBasic_Lob()
-	{
-		return (EAttribute)xmlBasicEClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getTemporal <em>Temporal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Temporal</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlBasic#getTemporal()
-	 * @see #getXmlBasic()
-	 * @generated
-	 */
-	public EAttribute getXmlBasic_Temporal()
-	{
-		return (EAttribute)xmlBasicEClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getEnumerated <em>Enumerated</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Enumerated</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlBasic#getEnumerated()
-	 * @see #getXmlBasic()
-	 * @generated
-	 */
-	public EAttribute getXmlBasic_Enumerated()
-	{
-		return (EAttribute)xmlBasicEClass.getEStructuralFeatures().get(4);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlBasicImpl
-	 * @generated
-	 */
-	public EClass getXmlBasicImpl()
-	{
-		return xmlBasicImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlVersion
-	 * @generated
-	 */
-	public EClass getXmlVersion()
-	{
-		return xmlVersionEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlVersion#getTemporal <em>Temporal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Temporal</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlVersion#getTemporal()
-	 * @see #getXmlVersion()
-	 * @generated
-	 */
-	public EAttribute getXmlVersion_Temporal()
-	{
-		return (EAttribute)xmlVersionEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlVersionImpl
-	 * @generated
-	 */
-	public EClass getXmlVersionImpl()
-	{
-		return xmlVersionImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlManyToOne
-	 * @generated
-	 */
-	public EClass getXmlManyToOne()
-	{
-		return xmlManyToOneEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlManyToOneImpl
-	 * @generated
-	 */
-	public EClass getXmlManyToOneImpl()
-	{
-		return xmlManyToOneImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlOneToMany
-	 * @generated
-	 */
-	public EClass getXmlOneToMany()
-	{
-		return xmlOneToManyEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlOneToMany#getJoinColumns <em>Join Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Join Columns</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlOneToMany#getJoinColumns()
-	 * @see #getXmlOneToMany()
-	 * @generated
-	 */
-	public EReference getXmlOneToMany_JoinColumns()
-	{
-		return (EReference)xmlOneToManyEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlOneToManyImpl
-	 * @generated
-	 */
-	public EClass getXmlOneToManyImpl()
-	{
-		return xmlOneToManyImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlOneToOne
-	 * @generated
-	 */
-	public EClass getXmlOneToOne()
-	{
-		return xmlOneToOneEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOne#getMappedBy <em>Mapped By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mapped By</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlOneToOne#getMappedBy()
-	 * @see #getXmlOneToOne()
-	 * @generated
-	 */
-	public EAttribute getXmlOneToOne_MappedBy()
-	{
-		return (EAttribute)xmlOneToOneEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOne#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Primary Key Join Columns</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlOneToOne#getPrimaryKeyJoinColumns()
-	 * @see #getXmlOneToOne()
-	 * @generated
-	 */
-	public EReference getXmlOneToOne_PrimaryKeyJoinColumns()
-	{
-		return (EReference)xmlOneToOneEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlOneToOneImpl
-	 * @generated
-	 */
-	public EClass getXmlOneToOneImpl()
-	{
-		return xmlOneToOneImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlManyToMany
-	 * @generated
-	 */
-	public EClass getXmlManyToMany()
-	{
-		return xmlManyToManyEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlManyToManyImpl
-	 * @generated
-	 */
-	public EClass getXmlManyToManyImpl()
-	{
-		return xmlManyToManyImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlEmbedded
-	 * @generated
-	 */
-	public EClass getXmlEmbedded()
-	{
-		return xmlEmbeddedEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlEmbeddedImpl
-	 * @generated
-	 */
-	public EClass getXmlEmbeddedImpl()
-	{
-		return xmlEmbeddedImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlTransient
-	 * @generated
-	 */
-	public EClass getXmlTransient()
-	{
-		return xmlTransientEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.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.core.resource.orm.XmlTransientImpl
-	 * @generated
-	 */
-	public EClass getXmlTransientImpl()
-	{
-		return xmlTransientImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride <em>Xml Association Override</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Association Override</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAssociationOverride
-	 * @generated
-	 */
-	public EClass getXmlAssociationOverride()
-	{
-		return xmlAssociationOverrideEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride#getJoinColumns <em>Join Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Join Columns</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAssociationOverride#getJoinColumns()
-	 * @see #getXmlAssociationOverride()
-	 * @generated
-	 */
-	public EReference getXmlAssociationOverride_JoinColumns()
-	{
-		return (EReference)xmlAssociationOverrideEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAssociationOverride#getName()
-	 * @see #getXmlAssociationOverride()
-	 * @generated
-	 */
-	public EAttribute getXmlAssociationOverride_Name()
-	{
-		return (EAttribute)xmlAssociationOverrideEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideImpl <em>Xml Association Override Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Association Override Impl</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideImpl
-	 * @generated
-	 */
-	public EClass getXmlAssociationOverrideImpl()
-	{
-		return xmlAssociationOverrideImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride <em>Xml Attribute Override</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Attribute Override</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAttributeOverride
-	 * @generated
-	 */
-	public EClass getXmlAttributeOverride()
-	{
-		return xmlAttributeOverrideEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride#getColumn <em>Column</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Column</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAttributeOverride#getColumn()
-	 * @see #getXmlAttributeOverride()
-	 * @generated
-	 */
-	public EReference getXmlAttributeOverride_Column()
-	{
-		return (EReference)xmlAttributeOverrideEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAttributeOverride#getName()
-	 * @see #getXmlAttributeOverride()
-	 * @generated
-	 */
-	public EAttribute getXmlAttributeOverride_Name()
-	{
-		return (EAttribute)xmlAttributeOverrideEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverrideImpl <em>Xml Attribute Override Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Attribute Override Impl</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAttributeOverrideImpl
-	 * @generated
-	 */
-	public EClass getXmlAttributeOverrideImpl()
-	{
-		return xmlAttributeOverrideImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.CascadeType <em>Cascade Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Cascade Type</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.CascadeType
-	 * @generated
-	 */
-	public EClass getCascadeType()
-	{
-		return cascadeTypeEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeAll <em>Cascade All</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cascade All</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeAll()
-	 * @see #getCascadeType()
-	 * @generated
-	 */
-	public EAttribute getCascadeType_CascadeAll()
-	{
-		return (EAttribute)cascadeTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadePersist <em>Cascade Persist</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cascade Persist</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.CascadeType#isCascadePersist()
-	 * @see #getCascadeType()
-	 * @generated
-	 */
-	public EAttribute getCascadeType_CascadePersist()
-	{
-		return (EAttribute)cascadeTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeMerge <em>Cascade Merge</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cascade Merge</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeMerge()
-	 * @see #getCascadeType()
-	 * @generated
-	 */
-	public EAttribute getCascadeType_CascadeMerge()
-	{
-		return (EAttribute)cascadeTypeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeRemove <em>Cascade Remove</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cascade Remove</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeRemove()
-	 * @see #getCascadeType()
-	 * @generated
-	 */
-	public EAttribute getCascadeType_CascadeRemove()
-	{
-		return (EAttribute)cascadeTypeEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeRefresh <em>Cascade Refresh</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cascade Refresh</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeRefresh()
-	 * @see #getCascadeType()
-	 * @generated
-	 */
-	public EAttribute getCascadeType_CascadeRefresh()
-	{
-		return (EAttribute)cascadeTypeEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.CascadeTypeImpl <em>Cascade Type Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Cascade Type Impl</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.CascadeTypeImpl
-	 * @generated
-	 */
-	public EClass getCascadeTypeImpl()
-	{
-		return cascadeTypeImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlNamedColumn <em>Xml Named Column</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Named Column</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlNamedColumn
-	 * @generated
-	 */
-	public EClass getXmlNamedColumn()
-	{
-		return xmlNamedColumnEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlNamedColumn#getColumnDefinition <em>Column Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Column Definition</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlNamedColumn#getColumnDefinition()
-	 * @see #getXmlNamedColumn()
-	 * @generated
-	 */
-	public EAttribute getXmlNamedColumn_ColumnDefinition()
-	{
-		return (EAttribute)xmlNamedColumnEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlNamedColumn#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlNamedColumn#getName()
-	 * @see #getXmlNamedColumn()
-	 * @generated
-	 */
-	public EAttribute getXmlNamedColumn_Name()
-	{
-		return (EAttribute)xmlNamedColumnEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlNamedColumn <em>Abstract Xml Named Column</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Abstract Xml Named Column</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlNamedColumn
-	 * @generated
-	 */
-	public EClass getAbstractXmlNamedColumn()
-	{
-		return abstractXmlNamedColumnEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn <em>Xml Abstract Column</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Abstract Column</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAbstractColumn
-	 * @generated
-	 */
-	public EClass getXmlAbstractColumn()
-	{
-		return xmlAbstractColumnEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getInsertable <em>Insertable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Insertable</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getInsertable()
-	 * @see #getXmlAbstractColumn()
-	 * @generated
-	 */
-	public EAttribute getXmlAbstractColumn_Insertable()
-	{
-		return (EAttribute)xmlAbstractColumnEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getNullable <em>Nullable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Nullable</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getNullable()
-	 * @see #getXmlAbstractColumn()
-	 * @generated
-	 */
-	public EAttribute getXmlAbstractColumn_Nullable()
-	{
-		return (EAttribute)xmlAbstractColumnEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getTable <em>Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Table</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getTable()
-	 * @see #getXmlAbstractColumn()
-	 * @generated
-	 */
-	public EAttribute getXmlAbstractColumn_Table()
-	{
-		return (EAttribute)xmlAbstractColumnEClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getUnique <em>Unique</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Unique</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getUnique()
-	 * @see #getXmlAbstractColumn()
-	 * @generated
-	 */
-	public EAttribute getXmlAbstractColumn_Unique()
-	{
-		return (EAttribute)xmlAbstractColumnEClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getUpdatable <em>Updatable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Updatable</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getUpdatable()
-	 * @see #getXmlAbstractColumn()
-	 * @generated
-	 */
-	public EAttribute getXmlAbstractColumn_Updatable()
-	{
-		return (EAttribute)xmlAbstractColumnEClass.getEStructuralFeatures().get(4);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlAbstractColumn <em>Abstract Xml Abstract Column</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Abstract Xml Abstract Column</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlAbstractColumn
-	 * @generated
-	 */
-	public EClass getAbstractXmlAbstractColumn()
-	{
-		return abstractXmlAbstractColumnEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlColumn <em>Xml Column</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Column</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlColumn
-	 * @generated
-	 */
-	public EClass getXmlColumn()
-	{
-		return xmlColumnEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlColumn#getLength <em>Length</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Length</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlColumn#getLength()
-	 * @see #getXmlColumn()
-	 * @generated
-	 */
-	public EAttribute getXmlColumn_Length()
-	{
-		return (EAttribute)xmlColumnEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlColumn#getPrecision <em>Precision</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Precision</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlColumn#getPrecision()
-	 * @see #getXmlColumn()
-	 * @generated
-	 */
-	public EAttribute getXmlColumn_Precision()
-	{
-		return (EAttribute)xmlColumnEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlColumn#getScale <em>Scale</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Scale</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlColumn#getScale()
-	 * @see #getXmlColumn()
-	 * @generated
-	 */
-	public EAttribute getXmlColumn_Scale()
-	{
-		return (EAttribute)xmlColumnEClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlColumnImpl <em>Xml Column Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Column Impl</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlColumnImpl
-	 * @generated
-	 */
-	public EClass getXmlColumnImpl()
-	{
-		return xmlColumnImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.ColumnResult <em>Column Result</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Column Result</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.ColumnResult
-	 * @generated
-	 */
-	public EClass getColumnResult()
-	{
-		return columnResultEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.ColumnResult#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.ColumnResult#getName()
-	 * @see #getColumnResult()
-	 * @generated
-	 */
-	public EAttribute getColumnResult_Name()
-	{
-		return (EAttribute)columnResultEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn <em>Xml Discriminator Column</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Discriminator Column</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn
-	 * @generated
-	 */
-	public EClass getXmlDiscriminatorColumn()
-	{
-		return xmlDiscriminatorColumnEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn#getDiscriminatorType <em>Discriminator Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Discriminator Type</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn#getDiscriminatorType()
-	 * @see #getXmlDiscriminatorColumn()
-	 * @generated
-	 */
-	public EAttribute getXmlDiscriminatorColumn_DiscriminatorType()
-	{
-		return (EAttribute)xmlDiscriminatorColumnEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn#getLength <em>Length</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Length</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn#getLength()
-	 * @see #getXmlDiscriminatorColumn()
-	 * @generated
-	 */
-	public EAttribute getXmlDiscriminatorColumn_Length()
-	{
-		return (EAttribute)xmlDiscriminatorColumnEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.EntityListeners <em>Entity Listeners</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Entity Listeners</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.EntityListeners
-	 * @generated
-	 */
-	public EClass getEntityListeners()
-	{
-		return entityListenersEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.EntityListeners#getEntityListeners <em>Entity Listeners</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Entity Listeners</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.EntityListeners#getEntityListeners()
-	 * @see #getEntityListeners()
-	 * @generated
-	 */
-	public EReference getEntityListeners_EntityListeners()
-	{
-		return (EReference)entityListenersEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.EntityListener <em>Entity Listener</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Entity Listener</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.EntityListener
-	 * @generated
-	 */
-	public EClass getEntityListener()
-	{
-		return entityListenerEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.EntityListener#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.core.resource.orm.EntityListener#getClassName()
-	 * @see #getEntityListener()
-	 * @generated
-	 */
-	public EAttribute getEntityListener_ClassName()
-	{
-		return (EAttribute)entityListenerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPrePersist <em>Pre Persist</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Pre Persist</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.EntityListener#getPrePersist()
-	 * @see #getEntityListener()
-	 * @generated
-	 */
-	public EReference getEntityListener_PrePersist()
-	{
-		return (EReference)entityListenerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostPersist <em>Post Persist</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Post Persist</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.EntityListener#getPostPersist()
-	 * @see #getEntityListener()
-	 * @generated
-	 */
-	public EReference getEntityListener_PostPersist()
-	{
-		return (EReference)entityListenerEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPreRemove <em>Pre Remove</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Pre Remove</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.EntityListener#getPreRemove()
-	 * @see #getEntityListener()
-	 * @generated
-	 */
-	public EReference getEntityListener_PreRemove()
-	{
-		return (EReference)entityListenerEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostRemove <em>Post Remove</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Post Remove</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.EntityListener#getPostRemove()
-	 * @see #getEntityListener()
-	 * @generated
-	 */
-	public EReference getEntityListener_PostRemove()
-	{
-		return (EReference)entityListenerEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPreUpdate <em>Pre Update</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Pre Update</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.EntityListener#getPreUpdate()
-	 * @see #getEntityListener()
-	 * @generated
-	 */
-	public EReference getEntityListener_PreUpdate()
-	{
-		return (EReference)entityListenerEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostUpdate <em>Post Update</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Post Update</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.EntityListener#getPostUpdate()
-	 * @see #getEntityListener()
-	 * @generated
-	 */
-	public EReference getEntityListener_PostUpdate()
-	{
-		return (EReference)entityListenerEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostLoad <em>Post Load</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Post Load</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.EntityListener#getPostLoad()
-	 * @see #getEntityListener()
-	 * @generated
-	 */
-	public EReference getEntityListener_PostLoad()
-	{
-		return (EReference)entityListenerEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.EntityResult <em>Entity Result</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Entity Result</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.EntityResult
-	 * @generated
-	 */
-	public EClass getEntityResult()
-	{
-		return entityResultEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.EntityResult#getDiscriminatorColumn <em>Discriminator Column</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Discriminator Column</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.EntityResult#getDiscriminatorColumn()
-	 * @see #getEntityResult()
-	 * @generated
-	 */
-	public EAttribute getEntityResult_DiscriminatorColumn()
-	{
-		return (EAttribute)entityResultEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.EntityResult#getEntityClass <em>Entity Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Entity Class</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.EntityResult#getEntityClass()
-	 * @see #getEntityResult()
-	 * @generated
-	 */
-	public EAttribute getEntityResult_EntityClass()
-	{
-		return (EAttribute)entityResultEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.EntityResult#getFieldResults <em>Field Results</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Field Results</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.EntityResult#getFieldResults()
-	 * @see #getEntityResult()
-	 * @generated
-	 */
-	public EReference getEntityResult_FieldResults()
-	{
-		return (EReference)entityResultEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.FieldResult <em>Field Result</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Field Result</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.FieldResult
-	 * @generated
-	 */
-	public EClass getFieldResult()
-	{
-		return fieldResultEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.FieldResult#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.FieldResult#getName()
-	 * @see #getFieldResult()
-	 * @generated
-	 */
-	public EAttribute getFieldResult_Name()
-	{
-		return (EAttribute)fieldResultEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.FieldResult#getColumn <em>Column</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Column</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.FieldResult#getColumn()
-	 * @see #getFieldResult()
-	 * @generated
-	 */
-	public EAttribute getFieldResult_Column()
-	{
-		return (EAttribute)fieldResultEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValue <em>Xml Generated Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Generated Value</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlGeneratedValue
-	 * @generated
-	 */
-	public EClass getXmlGeneratedValue()
-	{
-		return xmlGeneratedValueEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValue#getGenerator <em>Generator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Generator</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlGeneratedValue#getGenerator()
-	 * @see #getXmlGeneratedValue()
-	 * @generated
-	 */
-	public EAttribute getXmlGeneratedValue_Generator()
-	{
-		return (EAttribute)xmlGeneratedValueEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValue#getStrategy <em>Strategy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Strategy</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlGeneratedValue#getStrategy()
-	 * @see #getXmlGeneratedValue()
-	 * @generated
-	 */
-	public EAttribute getXmlGeneratedValue_Strategy()
-	{
-		return (EAttribute)xmlGeneratedValueEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValueImpl <em>Xml Generated Value Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Generated Value Impl</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlGeneratedValueImpl
-	 * @generated
-	 */
-	public EClass getXmlGeneratedValueImpl()
-	{
-		return xmlGeneratedValueImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlIdClass <em>Xml Id Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Id Class</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlIdClass
-	 * @generated
-	 */
-	public EClass getXmlIdClass()
-	{
-		return xmlIdClassEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlIdClass#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.core.resource.orm.XmlIdClass#getClassName()
-	 * @see #getXmlIdClass()
-	 * @generated
-	 */
-	public EAttribute getXmlIdClass_ClassName()
-	{
-		return (EAttribute)xmlIdClassEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.Inheritance <em>Inheritance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Inheritance</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.Inheritance
-	 * @generated
-	 */
-	public EClass getInheritance()
-	{
-		return inheritanceEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.Inheritance#getStrategy <em>Strategy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Strategy</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.Inheritance#getStrategy()
-	 * @see #getInheritance()
-	 * @generated
-	 */
-	public EAttribute getInheritance_Strategy()
-	{
-		return (EAttribute)inheritanceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn <em>Xml Join Column</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Join Column</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlJoinColumn
-	 * @generated
-	 */
-	public EClass getXmlJoinColumn()
-	{
-		return xmlJoinColumnEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn#getReferencedColumnName <em>Referenced Column Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Referenced Column Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlJoinColumn#getReferencedColumnName()
-	 * @see #getXmlJoinColumn()
-	 * @generated
-	 */
-	public EAttribute getXmlJoinColumn_ReferencedColumnName()
-	{
-		return (EAttribute)xmlJoinColumnEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlJoinColumnImpl <em>Xml Join Column Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Join Column Impl</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlJoinColumnImpl
-	 * @generated
-	 */
-	public EClass getXmlJoinColumnImpl()
-	{
-		return xmlJoinColumnImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlJoinTable <em>Xml Join Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Join Table</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlJoinTable
-	 * @generated
-	 */
-	public EClass getXmlJoinTable()
-	{
-		return xmlJoinTableEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlJoinTable#getJoinColumns <em>Join Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Join Columns</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlJoinTable#getJoinColumns()
-	 * @see #getXmlJoinTable()
-	 * @generated
-	 */
-	public EReference getXmlJoinTable_JoinColumns()
-	{
-		return (EReference)xmlJoinTableEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlJoinTable#getInverseJoinColumns <em>Inverse Join Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Inverse Join Columns</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlJoinTable#getInverseJoinColumns()
-	 * @see #getXmlJoinTable()
-	 * @generated
-	 */
-	public EReference getXmlJoinTable_InverseJoinColumns()
-	{
-		return (EReference)xmlJoinTableEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlJoinTableImpl <em>Xml Join Table Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Join Table Impl</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlJoinTableImpl
-	 * @generated
-	 */
-	public EClass getXmlJoinTableImpl()
-	{
-		return xmlJoinTableImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.Lob <em>Lob</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Lob</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.Lob
-	 * @generated
-	 */
-	public EClass getLob()
-	{
-		return lobEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.MapKey <em>Map Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Map Key</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.MapKey
-	 * @generated
-	 */
-	public EClass getMapKey()
-	{
-		return mapKeyEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.MapKey#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.MapKey#getName()
-	 * @see #getMapKey()
-	 * @generated
-	 */
-	public EAttribute getMapKey_Name()
-	{
-		return (EAttribute)mapKeyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.MapKeyImpl <em>Map Key Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Map Key Impl</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.MapKeyImpl
-	 * @generated
-	 */
-	public EClass getMapKeyImpl()
-	{
-		return mapKeyImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlQuery <em>Xml Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Query</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlQuery
-	 * @generated
-	 */
-	public EClass getXmlQuery()
-	{
-		return xmlQueryEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlQuery#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlQuery#getName()
-	 * @see #getXmlQuery()
-	 * @generated
-	 */
-	public EAttribute getXmlQuery_Name()
-	{
-		return (EAttribute)xmlQueryEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlQuery#getQuery <em>Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Query</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlQuery#getQuery()
-	 * @see #getXmlQuery()
-	 * @generated
-	 */
-	public EAttribute getXmlQuery_Query()
-	{
-		return (EAttribute)xmlQueryEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlQuery#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.core.resource.orm.XmlQuery#getHints()
-	 * @see #getXmlQuery()
-	 * @generated
-	 */
-	public EReference getXmlQuery_Hints()
-	{
-		return (EReference)xmlQueryEClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery <em>Xml Named Native Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Named Native Query</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery
-	 * @generated
-	 */
-	public EClass getXmlNamedNativeQuery()
-	{
-		return xmlNamedNativeQueryEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery#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.core.resource.orm.XmlNamedNativeQuery#getResultClass()
-	 * @see #getXmlNamedNativeQuery()
-	 * @generated
-	 */
-	public EAttribute getXmlNamedNativeQuery_ResultClass()
-	{
-		return (EAttribute)xmlNamedNativeQueryEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery#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.core.resource.orm.XmlNamedNativeQuery#getResultSetMapping()
-	 * @see #getXmlNamedNativeQuery()
-	 * @generated
-	 */
-	public EAttribute getXmlNamedNativeQuery_ResultSetMapping()
-	{
-		return (EAttribute)xmlNamedNativeQueryEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlNamedQuery <em>Xml Named Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Named Query</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlNamedQuery
-	 * @generated
-	 */
-	public EClass getXmlNamedQuery()
-	{
-		return xmlNamedQueryEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.EventMethod <em>Event Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Event Method</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.EventMethod
-	 * @generated
-	 */
-	public EClass getEventMethod()
-	{
-		return eventMethodEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.EventMethod#getMethodName <em>Method Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Method Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.EventMethod#getMethodName()
-	 * @see #getEventMethod()
-	 * @generated
-	 */
-	public EAttribute getEventMethod_MethodName()
-	{
-		return (EAttribute)eventMethodEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.PostLoad <em>Post Load</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Post Load</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.PostLoad
-	 * @generated
-	 */
-	public EClass getPostLoad()
-	{
-		return postLoadEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.PostPersist <em>Post Persist</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Post Persist</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.PostPersist
-	 * @generated
-	 */
-	public EClass getPostPersist()
-	{
-		return postPersistEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.PostRemove <em>Post Remove</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Post Remove</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.PostRemove
-	 * @generated
-	 */
-	public EClass getPostRemove()
-	{
-		return postRemoveEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.PostUpdate <em>Post Update</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Post Update</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.PostUpdate
-	 * @generated
-	 */
-	public EClass getPostUpdate()
-	{
-		return postUpdateEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.PrePersist <em>Pre Persist</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Pre Persist</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.PrePersist
-	 * @generated
-	 */
-	public EClass getPrePersist()
-	{
-		return prePersistEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.PreRemove <em>Pre Remove</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Pre Remove</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.PreRemove
-	 * @generated
-	 */
-	public EClass getPreRemove()
-	{
-		return preRemoveEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.PreUpdate <em>Pre Update</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Pre Update</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.PreUpdate
-	 * @generated
-	 */
-	public EClass getPreUpdate()
-	{
-		return preUpdateEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn <em>Xml Primary Key Join Column</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Primary Key Join Column</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn
-	 * @generated
-	 */
-	public EClass getXmlPrimaryKeyJoinColumn()
-	{
-		return xmlPrimaryKeyJoinColumnEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn#getReferencedColumnName <em>Referenced Column Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Referenced Column Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn#getReferencedColumnName()
-	 * @see #getXmlPrimaryKeyJoinColumn()
-	 * @generated
-	 */
-	public EAttribute getXmlPrimaryKeyJoinColumn_ReferencedColumnName()
-	{
-		return (EAttribute)xmlPrimaryKeyJoinColumnEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumnImpl <em>Xml Primary Key Join Column Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Primary Key Join Column Impl</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumnImpl
-	 * @generated
-	 */
-	public EClass getXmlPrimaryKeyJoinColumnImpl()
-	{
-		return xmlPrimaryKeyJoinColumnImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint <em>Xml Query Hint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Query Hint</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlQueryHint
-	 * @generated
-	 */
-	public EClass getXmlQueryHint()
-	{
-		return xmlQueryHintEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlQueryHint#getName()
-	 * @see #getXmlQueryHint()
-	 * @generated
-	 */
-	public EAttribute getXmlQueryHint_Name()
-	{
-		return (EAttribute)xmlQueryHintEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlQueryHint#getValue()
-	 * @see #getXmlQueryHint()
-	 * @generated
-	 */
-	public EAttribute getXmlQueryHint_Value()
-	{
-		return (EAttribute)xmlQueryHintEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlBaseTable <em>Abstract Xml Base Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Abstract Xml Base Table</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlBaseTable
-	 * @generated
-	 */
-	public EClass getAbstractXmlBaseTable()
-	{
-		return abstractXmlBaseTableEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlBaseTable <em>Xml Base Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Base Table</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlBaseTable
-	 * @generated
-	 */
-	public EClass getXmlBaseTable()
-	{
-		return xmlBaseTableEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlBaseTable#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlBaseTable#getName()
-	 * @see #getXmlBaseTable()
-	 * @generated
-	 */
-	public EAttribute getXmlBaseTable_Name()
-	{
-		return (EAttribute)xmlBaseTableEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlBaseTable#getCatalog <em>Catalog</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Catalog</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlBaseTable#getCatalog()
-	 * @see #getXmlBaseTable()
-	 * @generated
-	 */
-	public EAttribute getXmlBaseTable_Catalog()
-	{
-		return (EAttribute)xmlBaseTableEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlBaseTable#getSchema <em>Schema</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Schema</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlBaseTable#getSchema()
-	 * @see #getXmlBaseTable()
-	 * @generated
-	 */
-	public EAttribute getXmlBaseTable_Schema()
-	{
-		return (EAttribute)xmlBaseTableEClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlBaseTable#getUniqueConstraints <em>Unique Constraints</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Unique Constraints</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlBaseTable#getUniqueConstraints()
-	 * @see #getXmlBaseTable()
-	 * @generated
-	 */
-	public EReference getXmlBaseTable_UniqueConstraints()
-	{
-		return (EReference)xmlBaseTableEClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlTable <em>Xml Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Table</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlTable
-	 * @generated
-	 */
-	public EClass getXmlTable()
-	{
-		return xmlTableEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTable <em>Xml Secondary Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Secondary Table</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlSecondaryTable
-	 * @generated
-	 */
-	public EClass getXmlSecondaryTable()
-	{
-		return xmlSecondaryTableEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTable#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Primary Key Join Columns</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlSecondaryTable#getPrimaryKeyJoinColumns()
-	 * @see #getXmlSecondaryTable()
-	 * @generated
-	 */
-	public EReference getXmlSecondaryTable_PrimaryKeyJoinColumns()
-	{
-		return (EReference)xmlSecondaryTableEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTableImpl <em>Xml Secondary Table Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Secondary Table Impl</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlSecondaryTableImpl
-	 * @generated
-	 */
-	public EClass getXmlSecondaryTableImpl()
-	{
-		return xmlSecondaryTableImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlGenerator <em>Xml Generator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Generator</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlGenerator
-	 * @generated
-	 */
-	public EClass getXmlGenerator()
-	{
-		return xmlGeneratorEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlGenerator#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlGenerator#getName()
-	 * @see #getXmlGenerator()
-	 * @generated
-	 */
-	public EAttribute getXmlGenerator_Name()
-	{
-		return (EAttribute)xmlGeneratorEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlGenerator#getInitialValue <em>Initial Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Initial Value</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlGenerator#getInitialValue()
-	 * @see #getXmlGenerator()
-	 * @generated
-	 */
-	public EAttribute getXmlGenerator_InitialValue()
-	{
-		return (EAttribute)xmlGeneratorEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlGenerator#getAllocationSize <em>Allocation Size</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Allocation Size</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlGenerator#getAllocationSize()
-	 * @see #getXmlGenerator()
-	 * @generated
-	 */
-	public EAttribute getXmlGenerator_AllocationSize()
-	{
-		return (EAttribute)xmlGeneratorEClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator <em>Xml Sequence Generator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Sequence Generator</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator
-	 * @generated
-	 */
-	public EClass getXmlSequenceGenerator()
-	{
-		return xmlSequenceGeneratorEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator#getSequenceName <em>Sequence Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Sequence Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator#getSequenceName()
-	 * @see #getXmlSequenceGenerator()
-	 * @generated
-	 */
-	public EAttribute getXmlSequenceGenerator_SequenceName()
-	{
-		return (EAttribute)xmlSequenceGeneratorEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGeneratorImpl <em>Xml Sequence Generator Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Sequence Generator Impl</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlSequenceGeneratorImpl
-	 * @generated
-	 */
-	public EClass getXmlSequenceGeneratorImpl()
-	{
-		return xmlSequenceGeneratorImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Sql Result Set Mapping</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.SqlResultSetMapping
-	 * @generated
-	 */
-	public EClass getSqlResultSetMapping()
-	{
-		return sqlResultSetMappingEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getName()
-	 * @see #getSqlResultSetMapping()
-	 * @generated
-	 */
-	public EAttribute getSqlResultSetMapping_Name()
-	{
-		return (EAttribute)sqlResultSetMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getEntityResults <em>Entity Results</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Entity Results</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getEntityResults()
-	 * @see #getSqlResultSetMapping()
-	 * @generated
-	 */
-	public EReference getSqlResultSetMapping_EntityResults()
-	{
-		return (EReference)sqlResultSetMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getColumnResults <em>Column Results</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Column Results</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getColumnResults()
-	 * @see #getSqlResultSetMapping()
-	 * @generated
-	 */
-	public EReference getSqlResultSetMapping_ColumnResults()
-	{
-		return (EReference)sqlResultSetMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator <em>Xml Table Generator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Table Generator</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator
-	 * @generated
-	 */
-	public EClass getXmlTableGenerator()
-	{
-		return xmlTableGeneratorEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getTable <em>Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Table</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getTable()
-	 * @see #getXmlTableGenerator()
-	 * @generated
-	 */
-	public EAttribute getXmlTableGenerator_Table()
-	{
-		return (EAttribute)xmlTableGeneratorEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getCatalog <em>Catalog</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Catalog</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getCatalog()
-	 * @see #getXmlTableGenerator()
-	 * @generated
-	 */
-	public EAttribute getXmlTableGenerator_Catalog()
-	{
-		return (EAttribute)xmlTableGeneratorEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getSchema <em>Schema</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Schema</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getSchema()
-	 * @see #getXmlTableGenerator()
-	 * @generated
-	 */
-	public EAttribute getXmlTableGenerator_Schema()
-	{
-		return (EAttribute)xmlTableGeneratorEClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getPkColumnName <em>Pk Column Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Pk Column Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getPkColumnName()
-	 * @see #getXmlTableGenerator()
-	 * @generated
-	 */
-	public EAttribute getXmlTableGenerator_PkColumnName()
-	{
-		return (EAttribute)xmlTableGeneratorEClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getValueColumnName <em>Value Column Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value Column Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getValueColumnName()
-	 * @see #getXmlTableGenerator()
-	 * @generated
-	 */
-	public EAttribute getXmlTableGenerator_ValueColumnName()
-	{
-		return (EAttribute)xmlTableGeneratorEClass.getEStructuralFeatures().get(4);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getPkColumnValue <em>Pk Column Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Pk Column Value</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getPkColumnValue()
-	 * @see #getXmlTableGenerator()
-	 * @generated
-	 */
-	public EAttribute getXmlTableGenerator_PkColumnValue()
-	{
-		return (EAttribute)xmlTableGeneratorEClass.getEStructuralFeatures().get(5);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getUniqueConstraints <em>Unique Constraints</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Unique Constraints</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getUniqueConstraints()
-	 * @see #getXmlTableGenerator()
-	 * @generated
-	 */
-	public EReference getXmlTableGenerator_UniqueConstraints()
-	{
-		return (EReference)xmlTableGeneratorEClass.getEStructuralFeatures().get(6);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlTableGeneratorImpl <em>Xml Table Generator Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Table Generator Impl</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlTableGeneratorImpl
-	 * @generated
-	 */
-	public EClass getXmlTableGeneratorImpl()
-	{
-		return xmlTableGeneratorImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint <em>Xml Unique Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Unique Constraint</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint
-	 * @generated
-	 */
-	public EClass getXmlUniqueConstraint()
-	{
-		return xmlUniqueConstraintEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint#getColumnNames <em>Column Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Column Names</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint#getColumnNames()
-	 * @see #getXmlUniqueConstraint()
-	 * @generated
-	 */
-	public EAttribute getXmlUniqueConstraint_ColumnNames()
-	{
-		return (EAttribute)xmlUniqueConstraintEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlUniqueConstraintImpl <em>Xml Unique Constraint Impl</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Unique Constraint Impl</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.XmlUniqueConstraintImpl
-	 * @generated
-	 */
-	public EClass getXmlUniqueConstraintImpl()
-	{
-		return xmlUniqueConstraintImplEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.core.resource.orm.AccessType <em>Access Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Access Type</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.AccessType
-	 * @generated
-	 */
-	public EEnum getAccessType()
-	{
-		return accessTypeEEnum;
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.core.resource.orm.DiscriminatorType <em>Discriminator Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Discriminator Type</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.DiscriminatorType
-	 * @generated
-	 */
-	public EEnum getDiscriminatorType()
-	{
-		return discriminatorTypeEEnum;
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.core.resource.orm.EnumType <em>Enum Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Enum Type</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.EnumType
-	 * @generated
-	 */
-	public EEnum getEnumType()
-	{
-		return enumTypeEEnum;
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.core.resource.orm.FetchType <em>Fetch Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Fetch Type</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.FetchType
-	 * @generated
-	 */
-	public EEnum getFetchType()
-	{
-		return fetchTypeEEnum;
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.core.resource.orm.GenerationType <em>Generation Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Generation Type</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.GenerationType
-	 * @generated
-	 */
-	public EEnum getGenerationType()
-	{
-		return generationTypeEEnum;
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.core.resource.orm.InheritanceType <em>Inheritance Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Inheritance Type</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.InheritanceType
-	 * @generated
-	 */
-	public EEnum getInheritanceType()
-	{
-		return inheritanceTypeEEnum;
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.core.resource.orm.TemporalType <em>Temporal Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Temporal Type</em>'.
-	 * @see org.eclipse.jpt.core.resource.orm.TemporalType
-	 * @generated
-	 */
-	public EEnum getTemporalType()
-	{
-		return temporalTypeEEnum;
-	}
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Discriminator Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Discriminator Value</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 * @generated
-	 */
-	public EDataType getDiscriminatorValue()
-	{
-		return discriminatorValueEDataType;
-	}
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.emf.common.util.Enumerator <em>Enumerated</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Enumerated</em>'.
-	 * @see org.eclipse.emf.common.util.Enumerator
-	 * @model instanceClass="org.eclipse.emf.common.util.Enumerator"
-	 * @generated
-	 */
-	public EDataType getEnumerated()
-	{
-		return enumeratedEDataType;
-	}
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Order By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Order By</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 * @generated
-	 */
-	public EDataType getOrderBy()
-	{
-		return orderByEDataType;
-	}
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Version Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Version Type</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 * @generated
-	 */
-	public EDataType getVersionType()
-	{
-		return versionTypeEDataType;
-	}
-
-	/**
-	 * 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 OrmFactory getOrmFactory()
-	{
-		return (OrmFactory)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);
-		createEAttribute(xmlEntityMappingsEClass, XML_ENTITY_MAPPINGS__VERSION);
-		createEAttribute(xmlEntityMappingsEClass, XML_ENTITY_MAPPINGS__DESCRIPTION);
-		createEReference(xmlEntityMappingsEClass, XML_ENTITY_MAPPINGS__PERSISTENCE_UNIT_METADATA);
-		createEAttribute(xmlEntityMappingsEClass, XML_ENTITY_MAPPINGS__PACKAGE);
-		createEAttribute(xmlEntityMappingsEClass, XML_ENTITY_MAPPINGS__SCHEMA);
-		createEAttribute(xmlEntityMappingsEClass, XML_ENTITY_MAPPINGS__CATALOG);
-		createEAttribute(xmlEntityMappingsEClass, XML_ENTITY_MAPPINGS__ACCESS);
-		createEReference(xmlEntityMappingsEClass, XML_ENTITY_MAPPINGS__SEQUENCE_GENERATORS);
-		createEReference(xmlEntityMappingsEClass, XML_ENTITY_MAPPINGS__TABLE_GENERATORS);
-		createEReference(xmlEntityMappingsEClass, XML_ENTITY_MAPPINGS__NAMED_QUERIES);
-		createEReference(xmlEntityMappingsEClass, XML_ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES);
-		createEReference(xmlEntityMappingsEClass, XML_ENTITY_MAPPINGS__SQL_RESULT_SET_MAPPINGS);
-		createEReference(xmlEntityMappingsEClass, XML_ENTITY_MAPPINGS__MAPPED_SUPERCLASSES);
-		createEReference(xmlEntityMappingsEClass, XML_ENTITY_MAPPINGS__ENTITIES);
-		createEReference(xmlEntityMappingsEClass, XML_ENTITY_MAPPINGS__EMBEDDABLES);
-
-		xmlPersistenceUnitMetadataEClass = createEClass(XML_PERSISTENCE_UNIT_METADATA);
-		createEAttribute(xmlPersistenceUnitMetadataEClass, XML_PERSISTENCE_UNIT_METADATA__XML_MAPPING_METADATA_COMPLETE);
-		createEReference(xmlPersistenceUnitMetadataEClass, XML_PERSISTENCE_UNIT_METADATA__PERSISTENCE_UNIT_DEFAULTS);
-
-		xmlPersistenceUnitDefaultsEClass = createEClass(XML_PERSISTENCE_UNIT_DEFAULTS);
-		createEAttribute(xmlPersistenceUnitDefaultsEClass, XML_PERSISTENCE_UNIT_DEFAULTS__SCHEMA);
-		createEAttribute(xmlPersistenceUnitDefaultsEClass, XML_PERSISTENCE_UNIT_DEFAULTS__CATALOG);
-		createEAttribute(xmlPersistenceUnitDefaultsEClass, XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS);
-		createEAttribute(xmlPersistenceUnitDefaultsEClass, XML_PERSISTENCE_UNIT_DEFAULTS__CASCADE_PERSIST);
-		createEReference(xmlPersistenceUnitDefaultsEClass, XML_PERSISTENCE_UNIT_DEFAULTS__ENTITY_LISTENERS);
-
-		abstractXmlTypeMappingEClass = createEClass(ABSTRACT_XML_TYPE_MAPPING);
-		createEAttribute(abstractXmlTypeMappingEClass, ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME);
-		createEAttribute(abstractXmlTypeMappingEClass, ABSTRACT_XML_TYPE_MAPPING__ACCESS);
-		createEAttribute(abstractXmlTypeMappingEClass, ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE);
-		createEAttribute(abstractXmlTypeMappingEClass, ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION);
-		createEReference(abstractXmlTypeMappingEClass, ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES);
-
-		xmlMappedSuperclassEClass = createEClass(XML_MAPPED_SUPERCLASS);
-		createEReference(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__ID_CLASS);
-		createEAttribute(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_LISTENERS);
-		createEAttribute(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__EXCLUDE_SUPERCLASS_LISTENERS);
-		createEReference(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__ENTITY_LISTENERS);
-		createEReference(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__PRE_PERSIST);
-		createEReference(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__POST_PERSIST);
-		createEReference(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__PRE_REMOVE);
-		createEReference(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__POST_REMOVE);
-		createEReference(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__PRE_UPDATE);
-		createEReference(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__POST_UPDATE);
-		createEReference(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__POST_LOAD);
-
-		xmlEntityEClass = createEClass(XML_ENTITY);
-		createEAttribute(xmlEntityEClass, XML_ENTITY__NAME);
-		createEReference(xmlEntityEClass, XML_ENTITY__TABLE);
-		createEReference(xmlEntityEClass, XML_ENTITY__SECONDARY_TABLES);
-		createEReference(xmlEntityEClass, XML_ENTITY__PRIMARY_KEY_JOIN_COLUMNS);
-		createEReference(xmlEntityEClass, XML_ENTITY__ID_CLASS);
-		createEReference(xmlEntityEClass, XML_ENTITY__INHERITANCE);
-		createEAttribute(xmlEntityEClass, XML_ENTITY__DISCRIMINATOR_VALUE);
-		createEReference(xmlEntityEClass, XML_ENTITY__DISCRIMINATOR_COLUMN);
-		createEReference(xmlEntityEClass, XML_ENTITY__SEQUENCE_GENERATOR);
-		createEReference(xmlEntityEClass, XML_ENTITY__TABLE_GENERATOR);
-		createEReference(xmlEntityEClass, XML_ENTITY__NAMED_QUERIES);
-		createEReference(xmlEntityEClass, XML_ENTITY__NAMED_NATIVE_QUERIES);
-		createEReference(xmlEntityEClass, XML_ENTITY__SQL_RESULT_SET_MAPPINGS);
-		createEAttribute(xmlEntityEClass, XML_ENTITY__EXCLUDE_DEFAULT_LISTENERS);
-		createEAttribute(xmlEntityEClass, XML_ENTITY__EXCLUDE_SUPERCLASS_LISTENERS);
-		createEReference(xmlEntityEClass, XML_ENTITY__ENTITY_LISTENERS);
-		createEReference(xmlEntityEClass, XML_ENTITY__PRE_PERSIST);
-		createEReference(xmlEntityEClass, XML_ENTITY__POST_PERSIST);
-		createEReference(xmlEntityEClass, XML_ENTITY__PRE_REMOVE);
-		createEReference(xmlEntityEClass, XML_ENTITY__POST_REMOVE);
-		createEReference(xmlEntityEClass, XML_ENTITY__PRE_UPDATE);
-		createEReference(xmlEntityEClass, XML_ENTITY__POST_UPDATE);
-		createEReference(xmlEntityEClass, XML_ENTITY__POST_LOAD);
-		createEReference(xmlEntityEClass, XML_ENTITY__ATTRIBUTE_OVERRIDES);
-		createEReference(xmlEntityEClass, XML_ENTITY__ASSOCIATION_OVERRIDES);
-
-		xmlEmbeddableEClass = createEClass(XML_EMBEDDABLE);
-
-		attributesEClass = createEClass(ATTRIBUTES);
-		createEReference(attributesEClass, ATTRIBUTES__IDS);
-		createEReference(attributesEClass, ATTRIBUTES__EMBEDDED_IDS);
-		createEReference(attributesEClass, ATTRIBUTES__BASICS);
-		createEReference(attributesEClass, ATTRIBUTES__VERSIONS);
-		createEReference(attributesEClass, ATTRIBUTES__MANY_TO_ONES);
-		createEReference(attributesEClass, ATTRIBUTES__ONE_TO_MANYS);
-		createEReference(attributesEClass, ATTRIBUTES__ONE_TO_ONES);
-		createEReference(attributesEClass, ATTRIBUTES__MANY_TO_MANYS);
-		createEReference(attributesEClass, ATTRIBUTES__EMBEDDEDS);
-		createEReference(attributesEClass, ATTRIBUTES__TRANSIENTS);
-
-		xmlAttributeMappingEClass = createEClass(XML_ATTRIBUTE_MAPPING);
-		createEAttribute(xmlAttributeMappingEClass, XML_ATTRIBUTE_MAPPING__NAME);
-
-		abstractXmlAttributeMappingEClass = createEClass(ABSTRACT_XML_ATTRIBUTE_MAPPING);
-
-		xmlNullAttributeMappingEClass = createEClass(XML_NULL_ATTRIBUTE_MAPPING);
-
-		columnMappingEClass = createEClass(COLUMN_MAPPING);
-		createEReference(columnMappingEClass, COLUMN_MAPPING__COLUMN);
-
-		xmlRelationshipMappingEClass = createEClass(XML_RELATIONSHIP_MAPPING);
-		createEAttribute(xmlRelationshipMappingEClass, XML_RELATIONSHIP_MAPPING__TARGET_ENTITY);
-		createEAttribute(xmlRelationshipMappingEClass, XML_RELATIONSHIP_MAPPING__FETCH);
-		createEReference(xmlRelationshipMappingEClass, XML_RELATIONSHIP_MAPPING__JOIN_TABLE);
-		createEReference(xmlRelationshipMappingEClass, XML_RELATIONSHIP_MAPPING__CASCADE);
-
-		xmlMultiRelationshipMappingEClass = createEClass(XML_MULTI_RELATIONSHIP_MAPPING);
-		createEAttribute(xmlMultiRelationshipMappingEClass, XML_MULTI_RELATIONSHIP_MAPPING__MAPPED_BY);
-		createEAttribute(xmlMultiRelationshipMappingEClass, XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY);
-		createEReference(xmlMultiRelationshipMappingEClass, XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY);
-
-		xmlSingleRelationshipMappingEClass = createEClass(XML_SINGLE_RELATIONSHIP_MAPPING);
-		createEAttribute(xmlSingleRelationshipMappingEClass, XML_SINGLE_RELATIONSHIP_MAPPING__OPTIONAL);
-		createEReference(xmlSingleRelationshipMappingEClass, XML_SINGLE_RELATIONSHIP_MAPPING__JOIN_COLUMNS);
-
-		xmlIdEClass = createEClass(XML_ID);
-		createEReference(xmlIdEClass, XML_ID__GENERATED_VALUE);
-		createEAttribute(xmlIdEClass, XML_ID__TEMPORAL);
-		createEReference(xmlIdEClass, XML_ID__TABLE_GENERATOR);
-		createEReference(xmlIdEClass, XML_ID__SEQUENCE_GENERATOR);
-
-		xmlIdImplEClass = createEClass(XML_ID_IMPL);
-
-		baseXmlEmbeddedEClass = createEClass(BASE_XML_EMBEDDED);
-		createEReference(baseXmlEmbeddedEClass, BASE_XML_EMBEDDED__ATTRIBUTE_OVERRIDES);
-
-		xmlEmbeddedIdEClass = createEClass(XML_EMBEDDED_ID);
-
-		xmlEmbeddedIdImplEClass = createEClass(XML_EMBEDDED_ID_IMPL);
-
-		xmlEmbeddedEClass = createEClass(XML_EMBEDDED);
-
-		xmlEmbeddedImplEClass = createEClass(XML_EMBEDDED_IMPL);
-
-		xmlBasicEClass = createEClass(XML_BASIC);
-		createEAttribute(xmlBasicEClass, XML_BASIC__FETCH);
-		createEAttribute(xmlBasicEClass, XML_BASIC__OPTIONAL);
-		createEAttribute(xmlBasicEClass, XML_BASIC__LOB);
-		createEAttribute(xmlBasicEClass, XML_BASIC__TEMPORAL);
-		createEAttribute(xmlBasicEClass, XML_BASIC__ENUMERATED);
-
-		xmlBasicImplEClass = createEClass(XML_BASIC_IMPL);
-
-		xmlVersionEClass = createEClass(XML_VERSION);
-		createEAttribute(xmlVersionEClass, XML_VERSION__TEMPORAL);
-
-		xmlVersionImplEClass = createEClass(XML_VERSION_IMPL);
-
-		xmlManyToOneEClass = createEClass(XML_MANY_TO_ONE);
-
-		xmlManyToOneImplEClass = createEClass(XML_MANY_TO_ONE_IMPL);
-
-		xmlOneToManyEClass = createEClass(XML_ONE_TO_MANY);
-		createEReference(xmlOneToManyEClass, XML_ONE_TO_MANY__JOIN_COLUMNS);
-
-		xmlOneToManyImplEClass = createEClass(XML_ONE_TO_MANY_IMPL);
-
-		xmlOneToOneEClass = createEClass(XML_ONE_TO_ONE);
-		createEAttribute(xmlOneToOneEClass, XML_ONE_TO_ONE__MAPPED_BY);
-		createEReference(xmlOneToOneEClass, XML_ONE_TO_ONE__PRIMARY_KEY_JOIN_COLUMNS);
-
-		xmlOneToOneImplEClass = createEClass(XML_ONE_TO_ONE_IMPL);
-
-		xmlManyToManyEClass = createEClass(XML_MANY_TO_MANY);
-
-		xmlManyToManyImplEClass = createEClass(XML_MANY_TO_MANY_IMPL);
-
-		xmlTransientEClass = createEClass(XML_TRANSIENT);
-
-		xmlTransientImplEClass = createEClass(XML_TRANSIENT_IMPL);
-
-		xmlAssociationOverrideEClass = createEClass(XML_ASSOCIATION_OVERRIDE);
-		createEReference(xmlAssociationOverrideEClass, XML_ASSOCIATION_OVERRIDE__JOIN_COLUMNS);
-		createEAttribute(xmlAssociationOverrideEClass, XML_ASSOCIATION_OVERRIDE__NAME);
-
-		xmlAssociationOverrideImplEClass = createEClass(XML_ASSOCIATION_OVERRIDE_IMPL);
-
-		xmlAttributeOverrideEClass = createEClass(XML_ATTRIBUTE_OVERRIDE);
-		createEReference(xmlAttributeOverrideEClass, XML_ATTRIBUTE_OVERRIDE__COLUMN);
-		createEAttribute(xmlAttributeOverrideEClass, XML_ATTRIBUTE_OVERRIDE__NAME);
-
-		xmlAttributeOverrideImplEClass = createEClass(XML_ATTRIBUTE_OVERRIDE_IMPL);
-
-		cascadeTypeEClass = createEClass(CASCADE_TYPE);
-		createEAttribute(cascadeTypeEClass, CASCADE_TYPE__CASCADE_ALL);
-		createEAttribute(cascadeTypeEClass, CASCADE_TYPE__CASCADE_PERSIST);
-		createEAttribute(cascadeTypeEClass, CASCADE_TYPE__CASCADE_MERGE);
-		createEAttribute(cascadeTypeEClass, CASCADE_TYPE__CASCADE_REMOVE);
-		createEAttribute(cascadeTypeEClass, CASCADE_TYPE__CASCADE_REFRESH);
-
-		cascadeTypeImplEClass = createEClass(CASCADE_TYPE_IMPL);
-
-		xmlNamedColumnEClass = createEClass(XML_NAMED_COLUMN);
-		createEAttribute(xmlNamedColumnEClass, XML_NAMED_COLUMN__COLUMN_DEFINITION);
-		createEAttribute(xmlNamedColumnEClass, XML_NAMED_COLUMN__NAME);
-
-		abstractXmlNamedColumnEClass = createEClass(ABSTRACT_XML_NAMED_COLUMN);
-
-		xmlAbstractColumnEClass = createEClass(XML_ABSTRACT_COLUMN);
-		createEAttribute(xmlAbstractColumnEClass, XML_ABSTRACT_COLUMN__INSERTABLE);
-		createEAttribute(xmlAbstractColumnEClass, XML_ABSTRACT_COLUMN__NULLABLE);
-		createEAttribute(xmlAbstractColumnEClass, XML_ABSTRACT_COLUMN__TABLE);
-		createEAttribute(xmlAbstractColumnEClass, XML_ABSTRACT_COLUMN__UNIQUE);
-		createEAttribute(xmlAbstractColumnEClass, XML_ABSTRACT_COLUMN__UPDATABLE);
-
-		abstractXmlAbstractColumnEClass = createEClass(ABSTRACT_XML_ABSTRACT_COLUMN);
-
-		xmlColumnEClass = createEClass(XML_COLUMN);
-		createEAttribute(xmlColumnEClass, XML_COLUMN__LENGTH);
-		createEAttribute(xmlColumnEClass, XML_COLUMN__PRECISION);
-		createEAttribute(xmlColumnEClass, XML_COLUMN__SCALE);
-
-		xmlColumnImplEClass = createEClass(XML_COLUMN_IMPL);
-
-		columnResultEClass = createEClass(COLUMN_RESULT);
-		createEAttribute(columnResultEClass, COLUMN_RESULT__NAME);
-
-		xmlDiscriminatorColumnEClass = createEClass(XML_DISCRIMINATOR_COLUMN);
-		createEAttribute(xmlDiscriminatorColumnEClass, XML_DISCRIMINATOR_COLUMN__DISCRIMINATOR_TYPE);
-		createEAttribute(xmlDiscriminatorColumnEClass, XML_DISCRIMINATOR_COLUMN__LENGTH);
-
-		entityListenersEClass = createEClass(ENTITY_LISTENERS);
-		createEReference(entityListenersEClass, ENTITY_LISTENERS__ENTITY_LISTENERS);
-
-		entityListenerEClass = createEClass(ENTITY_LISTENER);
-		createEAttribute(entityListenerEClass, ENTITY_LISTENER__CLASS_NAME);
-		createEReference(entityListenerEClass, ENTITY_LISTENER__PRE_PERSIST);
-		createEReference(entityListenerEClass, ENTITY_LISTENER__POST_PERSIST);
-		createEReference(entityListenerEClass, ENTITY_LISTENER__PRE_REMOVE);
-		createEReference(entityListenerEClass, ENTITY_LISTENER__POST_REMOVE);
-		createEReference(entityListenerEClass, ENTITY_LISTENER__PRE_UPDATE);
-		createEReference(entityListenerEClass, ENTITY_LISTENER__POST_UPDATE);
-		createEReference(entityListenerEClass, ENTITY_LISTENER__POST_LOAD);
-
-		entityResultEClass = createEClass(ENTITY_RESULT);
-		createEAttribute(entityResultEClass, ENTITY_RESULT__DISCRIMINATOR_COLUMN);
-		createEAttribute(entityResultEClass, ENTITY_RESULT__ENTITY_CLASS);
-		createEReference(entityResultEClass, ENTITY_RESULT__FIELD_RESULTS);
-
-		eventMethodEClass = createEClass(EVENT_METHOD);
-		createEAttribute(eventMethodEClass, EVENT_METHOD__METHOD_NAME);
-
-		fieldResultEClass = createEClass(FIELD_RESULT);
-		createEAttribute(fieldResultEClass, FIELD_RESULT__NAME);
-		createEAttribute(fieldResultEClass, FIELD_RESULT__COLUMN);
-
-		xmlGeneratedValueEClass = createEClass(XML_GENERATED_VALUE);
-		createEAttribute(xmlGeneratedValueEClass, XML_GENERATED_VALUE__GENERATOR);
-		createEAttribute(xmlGeneratedValueEClass, XML_GENERATED_VALUE__STRATEGY);
-
-		xmlGeneratedValueImplEClass = createEClass(XML_GENERATED_VALUE_IMPL);
-
-		xmlIdClassEClass = createEClass(XML_ID_CLASS);
-		createEAttribute(xmlIdClassEClass, XML_ID_CLASS__CLASS_NAME);
-
-		inheritanceEClass = createEClass(INHERITANCE);
-		createEAttribute(inheritanceEClass, INHERITANCE__STRATEGY);
-
-		xmlJoinColumnEClass = createEClass(XML_JOIN_COLUMN);
-		createEAttribute(xmlJoinColumnEClass, XML_JOIN_COLUMN__REFERENCED_COLUMN_NAME);
-
-		xmlJoinColumnImplEClass = createEClass(XML_JOIN_COLUMN_IMPL);
-
-		xmlJoinTableEClass = createEClass(XML_JOIN_TABLE);
-		createEReference(xmlJoinTableEClass, XML_JOIN_TABLE__JOIN_COLUMNS);
-		createEReference(xmlJoinTableEClass, XML_JOIN_TABLE__INVERSE_JOIN_COLUMNS);
-
-		xmlJoinTableImplEClass = createEClass(XML_JOIN_TABLE_IMPL);
-
-		lobEClass = createEClass(LOB);
-
-		mapKeyEClass = createEClass(MAP_KEY);
-		createEAttribute(mapKeyEClass, MAP_KEY__NAME);
-
-		mapKeyImplEClass = createEClass(MAP_KEY_IMPL);
-
-		xmlQueryEClass = createEClass(XML_QUERY);
-		createEAttribute(xmlQueryEClass, XML_QUERY__NAME);
-		createEAttribute(xmlQueryEClass, XML_QUERY__QUERY);
-		createEReference(xmlQueryEClass, XML_QUERY__HINTS);
-
-		xmlNamedNativeQueryEClass = createEClass(XML_NAMED_NATIVE_QUERY);
-		createEAttribute(xmlNamedNativeQueryEClass, XML_NAMED_NATIVE_QUERY__RESULT_CLASS);
-		createEAttribute(xmlNamedNativeQueryEClass, XML_NAMED_NATIVE_QUERY__RESULT_SET_MAPPING);
-
-		xmlNamedQueryEClass = createEClass(XML_NAMED_QUERY);
-
-		postLoadEClass = createEClass(POST_LOAD);
-
-		postPersistEClass = createEClass(POST_PERSIST);
-
-		postRemoveEClass = createEClass(POST_REMOVE);
-
-		postUpdateEClass = createEClass(POST_UPDATE);
-
-		prePersistEClass = createEClass(PRE_PERSIST);
-
-		preRemoveEClass = createEClass(PRE_REMOVE);
-
-		preUpdateEClass = createEClass(PRE_UPDATE);
-
-		xmlPrimaryKeyJoinColumnEClass = createEClass(XML_PRIMARY_KEY_JOIN_COLUMN);
-		createEAttribute(xmlPrimaryKeyJoinColumnEClass, XML_PRIMARY_KEY_JOIN_COLUMN__REFERENCED_COLUMN_NAME);
-
-		xmlPrimaryKeyJoinColumnImplEClass = createEClass(XML_PRIMARY_KEY_JOIN_COLUMN_IMPL);
-
-		xmlQueryHintEClass = createEClass(XML_QUERY_HINT);
-		createEAttribute(xmlQueryHintEClass, XML_QUERY_HINT__NAME);
-		createEAttribute(xmlQueryHintEClass, XML_QUERY_HINT__VALUE);
-
-		abstractXmlBaseTableEClass = createEClass(ABSTRACT_XML_BASE_TABLE);
-
-		xmlBaseTableEClass = createEClass(XML_BASE_TABLE);
-		createEAttribute(xmlBaseTableEClass, XML_BASE_TABLE__NAME);
-		createEAttribute(xmlBaseTableEClass, XML_BASE_TABLE__CATALOG);
-		createEAttribute(xmlBaseTableEClass, XML_BASE_TABLE__SCHEMA);
-		createEReference(xmlBaseTableEClass, XML_BASE_TABLE__UNIQUE_CONSTRAINTS);
-
-		xmlTableEClass = createEClass(XML_TABLE);
-
-		xmlSecondaryTableEClass = createEClass(XML_SECONDARY_TABLE);
-		createEReference(xmlSecondaryTableEClass, XML_SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS);
-
-		xmlSecondaryTableImplEClass = createEClass(XML_SECONDARY_TABLE_IMPL);
-
-		xmlGeneratorEClass = createEClass(XML_GENERATOR);
-		createEAttribute(xmlGeneratorEClass, XML_GENERATOR__NAME);
-		createEAttribute(xmlGeneratorEClass, XML_GENERATOR__INITIAL_VALUE);
-		createEAttribute(xmlGeneratorEClass, XML_GENERATOR__ALLOCATION_SIZE);
-
-		xmlSequenceGeneratorEClass = createEClass(XML_SEQUENCE_GENERATOR);
-		createEAttribute(xmlSequenceGeneratorEClass, XML_SEQUENCE_GENERATOR__SEQUENCE_NAME);
-
-		xmlSequenceGeneratorImplEClass = createEClass(XML_SEQUENCE_GENERATOR_IMPL);
-
-		sqlResultSetMappingEClass = createEClass(SQL_RESULT_SET_MAPPING);
-		createEAttribute(sqlResultSetMappingEClass, SQL_RESULT_SET_MAPPING__NAME);
-		createEReference(sqlResultSetMappingEClass, SQL_RESULT_SET_MAPPING__ENTITY_RESULTS);
-		createEReference(sqlResultSetMappingEClass, SQL_RESULT_SET_MAPPING__COLUMN_RESULTS);
-
-		xmlTableGeneratorEClass = createEClass(XML_TABLE_GENERATOR);
-		createEAttribute(xmlTableGeneratorEClass, XML_TABLE_GENERATOR__TABLE);
-		createEAttribute(xmlTableGeneratorEClass, XML_TABLE_GENERATOR__CATALOG);
-		createEAttribute(xmlTableGeneratorEClass, XML_TABLE_GENERATOR__SCHEMA);
-		createEAttribute(xmlTableGeneratorEClass, XML_TABLE_GENERATOR__PK_COLUMN_NAME);
-		createEAttribute(xmlTableGeneratorEClass, XML_TABLE_GENERATOR__VALUE_COLUMN_NAME);
-		createEAttribute(xmlTableGeneratorEClass, XML_TABLE_GENERATOR__PK_COLUMN_VALUE);
-		createEReference(xmlTableGeneratorEClass, XML_TABLE_GENERATOR__UNIQUE_CONSTRAINTS);
-
-		xmlTableGeneratorImplEClass = createEClass(XML_TABLE_GENERATOR_IMPL);
-
-		xmlUniqueConstraintEClass = createEClass(XML_UNIQUE_CONSTRAINT);
-		createEAttribute(xmlUniqueConstraintEClass, XML_UNIQUE_CONSTRAINT__COLUMN_NAMES);
-
-		xmlUniqueConstraintImplEClass = createEClass(XML_UNIQUE_CONSTRAINT_IMPL);
-
-		// Create enums
-		accessTypeEEnum = createEEnum(ACCESS_TYPE);
-		discriminatorTypeEEnum = createEEnum(DISCRIMINATOR_TYPE);
-		enumTypeEEnum = createEEnum(ENUM_TYPE);
-		fetchTypeEEnum = createEEnum(FETCH_TYPE);
-		generationTypeEEnum = createEEnum(GENERATION_TYPE);
-		inheritanceTypeEEnum = createEEnum(INHERITANCE_TYPE);
-		temporalTypeEEnum = createEEnum(TEMPORAL_TYPE);
-
-		// Create data types
-		discriminatorValueEDataType = createEDataType(DISCRIMINATOR_VALUE);
-		enumeratedEDataType = createEDataType(ENUMERATED);
-		orderByEDataType = createEDataType(ORDER_BY);
-		versionTypeEDataType = createEDataType(VERSION_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);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		xmlMappedSuperclassEClass.getESuperTypes().add(this.getAbstractXmlTypeMapping());
-		xmlEntityEClass.getESuperTypes().add(this.getAbstractXmlTypeMapping());
-		xmlEmbeddableEClass.getESuperTypes().add(this.getAbstractXmlTypeMapping());
-		abstractXmlAttributeMappingEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlNullAttributeMappingEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlRelationshipMappingEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlMultiRelationshipMappingEClass.getESuperTypes().add(this.getXmlRelationshipMapping());
-		xmlSingleRelationshipMappingEClass.getESuperTypes().add(this.getXmlRelationshipMapping());
-		xmlIdEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlIdEClass.getESuperTypes().add(this.getColumnMapping());
-		xmlIdImplEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
-		xmlIdImplEClass.getESuperTypes().add(this.getXmlId());
-		baseXmlEmbeddedEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlEmbeddedIdEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlEmbeddedIdEClass.getESuperTypes().add(this.getBaseXmlEmbedded());
-		xmlEmbeddedIdImplEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
-		xmlEmbeddedIdImplEClass.getESuperTypes().add(this.getXmlEmbeddedId());
-		xmlEmbeddedEClass.getESuperTypes().add(this.getBaseXmlEmbedded());
-		xmlEmbeddedImplEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
-		xmlEmbeddedImplEClass.getESuperTypes().add(this.getXmlEmbedded());
-		xmlBasicEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlBasicEClass.getESuperTypes().add(this.getColumnMapping());
-		xmlBasicImplEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
-		xmlBasicImplEClass.getESuperTypes().add(this.getXmlBasic());
-		xmlVersionEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlVersionEClass.getESuperTypes().add(this.getColumnMapping());
-		xmlVersionImplEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
-		xmlVersionImplEClass.getESuperTypes().add(this.getXmlVersion());
-		xmlManyToOneEClass.getESuperTypes().add(this.getXmlSingleRelationshipMapping());
-		xmlManyToOneImplEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
-		xmlManyToOneImplEClass.getESuperTypes().add(this.getXmlManyToOne());
-		xmlOneToManyEClass.getESuperTypes().add(this.getXmlMultiRelationshipMapping());
-		xmlOneToManyImplEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
-		xmlOneToManyImplEClass.getESuperTypes().add(this.getXmlOneToMany());
-		xmlOneToOneEClass.getESuperTypes().add(this.getXmlSingleRelationshipMapping());
-		xmlOneToOneImplEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
-		xmlOneToOneImplEClass.getESuperTypes().add(this.getXmlOneToOne());
-		xmlManyToManyEClass.getESuperTypes().add(this.getXmlMultiRelationshipMapping());
-		xmlManyToManyImplEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
-		xmlManyToManyImplEClass.getESuperTypes().add(this.getXmlManyToMany());
-		xmlTransientEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlTransientImplEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
-		xmlTransientImplEClass.getESuperTypes().add(this.getXmlTransient());
-		xmlAssociationOverrideImplEClass.getESuperTypes().add(this.getXmlAssociationOverride());
-		xmlAttributeOverrideImplEClass.getESuperTypes().add(this.getXmlAttributeOverride());
-		cascadeTypeImplEClass.getESuperTypes().add(this.getCascadeType());
-		abstractXmlNamedColumnEClass.getESuperTypes().add(this.getXmlNamedColumn());
-		xmlAbstractColumnEClass.getESuperTypes().add(this.getXmlNamedColumn());
-		abstractXmlAbstractColumnEClass.getESuperTypes().add(this.getAbstractXmlNamedColumn());
-		abstractXmlAbstractColumnEClass.getESuperTypes().add(this.getXmlAbstractColumn());
-		xmlColumnEClass.getESuperTypes().add(this.getXmlAbstractColumn());
-		xmlColumnImplEClass.getESuperTypes().add(this.getAbstractXmlAbstractColumn());
-		xmlColumnImplEClass.getESuperTypes().add(this.getXmlColumn());
-		xmlDiscriminatorColumnEClass.getESuperTypes().add(this.getAbstractXmlNamedColumn());
-		xmlGeneratedValueImplEClass.getESuperTypes().add(this.getXmlGeneratedValue());
-		xmlJoinColumnEClass.getESuperTypes().add(this.getXmlAbstractColumn());
-		xmlJoinColumnImplEClass.getESuperTypes().add(this.getAbstractXmlAbstractColumn());
-		xmlJoinColumnImplEClass.getESuperTypes().add(this.getXmlJoinColumn());
-		xmlJoinTableEClass.getESuperTypes().add(this.getXmlBaseTable());
-		xmlJoinTableImplEClass.getESuperTypes().add(this.getAbstractXmlBaseTable());
-		xmlJoinTableImplEClass.getESuperTypes().add(this.getXmlJoinTable());
-		mapKeyImplEClass.getESuperTypes().add(this.getMapKey());
-		xmlNamedNativeQueryEClass.getESuperTypes().add(this.getXmlQuery());
-		xmlNamedQueryEClass.getESuperTypes().add(this.getXmlQuery());
-		postLoadEClass.getESuperTypes().add(this.getEventMethod());
-		postPersistEClass.getESuperTypes().add(this.getEventMethod());
-		postRemoveEClass.getESuperTypes().add(this.getEventMethod());
-		postUpdateEClass.getESuperTypes().add(this.getEventMethod());
-		prePersistEClass.getESuperTypes().add(this.getEventMethod());
-		preRemoveEClass.getESuperTypes().add(this.getEventMethod());
-		preUpdateEClass.getESuperTypes().add(this.getEventMethod());
-		xmlPrimaryKeyJoinColumnEClass.getESuperTypes().add(this.getXmlNamedColumn());
-		xmlPrimaryKeyJoinColumnImplEClass.getESuperTypes().add(this.getAbstractXmlNamedColumn());
-		xmlPrimaryKeyJoinColumnImplEClass.getESuperTypes().add(this.getXmlPrimaryKeyJoinColumn());
-		abstractXmlBaseTableEClass.getESuperTypes().add(this.getXmlBaseTable());
-		xmlTableEClass.getESuperTypes().add(this.getAbstractXmlBaseTable());
-		xmlSecondaryTableEClass.getESuperTypes().add(this.getXmlBaseTable());
-		xmlSecondaryTableImplEClass.getESuperTypes().add(this.getAbstractXmlBaseTable());
-		xmlSecondaryTableImplEClass.getESuperTypes().add(this.getXmlSecondaryTable());
-		xmlSequenceGeneratorEClass.getESuperTypes().add(this.getXmlGenerator());
-		xmlSequenceGeneratorImplEClass.getESuperTypes().add(this.getXmlSequenceGenerator());
-		xmlTableGeneratorEClass.getESuperTypes().add(this.getXmlGenerator());
-		xmlTableGeneratorImplEClass.getESuperTypes().add(this.getXmlTableGenerator());
-		xmlUniqueConstraintImplEClass.getESuperTypes().add(this.getXmlUniqueConstraint());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(xmlEntityMappingsEClass, XmlEntityMappings.class, "XmlEntityMappings", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlEntityMappings_Version(), this.getVersionType(), "version", "1.0", 1, 1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlEntityMappings_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_PersistenceUnitMetadata(), this.getXmlPersistenceUnitMetadata(), null, "persistenceUnitMetadata", null, 0, 1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlEntityMappings_Package(), theXMLTypePackage.getString(), "package", null, 0, 1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlEntityMappings_Schema(), theXMLTypePackage.getString(), "schema", null, 0, 1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlEntityMappings_Catalog(), theXMLTypePackage.getString(), "catalog", null, 0, 1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlEntityMappings_Access(), this.getAccessType(), "access", "PROPERTY", 0, 1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_SequenceGenerators(), this.getXmlSequenceGenerator(), null, "sequenceGenerators", null, 0, -1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_TableGenerators(), this.getXmlTableGenerator(), null, "tableGenerators", null, 0, -1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_NamedQueries(), this.getXmlNamedQuery(), null, "namedQueries", null, 0, -1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_NamedNativeQueries(), this.getXmlNamedNativeQuery(), null, "namedNativeQueries", null, 0, -1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_SqlResultSetMappings(), this.getSqlResultSetMapping(), null, "sqlResultSetMappings", null, 0, -1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_MappedSuperclasses(), this.getXmlMappedSuperclass(), null, "mappedSuperclasses", null, 0, -1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_Entities(), this.getXmlEntity(), null, "entities", null, 0, -1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_Embeddables(), this.getXmlEmbeddable(), null, "embeddables", 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_XmlMappingMetadataComplete(), theXMLTypePackage.getBoolean(), "xmlMappingMetadataComplete", null, 0, 1, XmlPersistenceUnitMetadata.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlPersistenceUnitMetadata_PersistenceUnitDefaults(), this.getXmlPersistenceUnitDefaults(), null, "persistenceUnitDefaults", null, 0, 1, XmlPersistenceUnitMetadata.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlPersistenceUnitDefaultsEClass, XmlPersistenceUnitDefaults.class, "XmlPersistenceUnitDefaults", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlPersistenceUnitDefaults_Schema(), theXMLTypePackage.getString(), "schema", null, 0, 1, XmlPersistenceUnitDefaults.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlPersistenceUnitDefaults_Catalog(), theXMLTypePackage.getString(), "catalog", null, 0, 1, XmlPersistenceUnitDefaults.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlPersistenceUnitDefaults_Access(), this.getAccessType(), "access", "PROPERTY", 0, 1, XmlPersistenceUnitDefaults.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlPersistenceUnitDefaults_CascadePersist(), theXMLTypePackage.getBoolean(), "cascadePersist", null, 0, 1, XmlPersistenceUnitDefaults.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlPersistenceUnitDefaults_EntityListeners(), this.getEntityListeners(), null, "entityListeners", null, 0, 1, XmlPersistenceUnitDefaults.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(abstractXmlTypeMappingEClass, AbstractXmlTypeMapping.class, "AbstractXmlTypeMapping", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAbstractXmlTypeMapping_ClassName(), theXMLTypePackage.getString(), "className", null, 1, 1, AbstractXmlTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAbstractXmlTypeMapping_Access(), this.getAccessType(), "access", "PROPERTY", 0, 1, AbstractXmlTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAbstractXmlTypeMapping_MetadataComplete(), theXMLTypePackage.getBooleanObject(), "metadataComplete", null, 0, 1, AbstractXmlTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAbstractXmlTypeMapping_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, AbstractXmlTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAbstractXmlTypeMapping_Attributes(), this.getAttributes(), null, "attributes", null, 0, 1, AbstractXmlTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlMappedSuperclassEClass, XmlMappedSuperclass.class, "XmlMappedSuperclass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlMappedSuperclass_IdClass(), this.getXmlIdClass(), null, "idClass", 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_ExcludeDefaultListeners(), theXMLTypePackage.getBoolean(), "excludeDefaultListeners", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlMappedSuperclass_ExcludeSuperclassListeners(), theXMLTypePackage.getBoolean(), "excludeSuperclassListeners", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlMappedSuperclass_EntityListeners(), this.getEntityListeners(), null, "entityListeners", 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_PrePersist(), this.getPrePersist(), null, "prePersist", 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_PostPersist(), this.getPostPersist(), null, "postPersist", 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_PreRemove(), this.getPreRemove(), null, "preRemove", 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_PostRemove(), this.getPostRemove(), null, "postRemove", 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_PreUpdate(), this.getPreUpdate(), null, "preUpdate", 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_PostUpdate(), this.getPostUpdate(), null, "postUpdate", 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_PostLoad(), this.getPostLoad(), null, "postLoad", null, 0, 1, XmlMappedSuperclass.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);
-		initEAttribute(getXmlEntity_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntity_Table(), this.getXmlTable(), null, "table", 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_SecondaryTables(), this.getXmlSecondaryTable(), null, "secondaryTables", 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_PrimaryKeyJoinColumns(), this.getXmlPrimaryKeyJoinColumn(), null, "primaryKeyJoinColumns", 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_IdClass(), this.getXmlIdClass(), null, "idClass", 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_Inheritance(), this.getInheritance(), null, "inheritance", 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_DiscriminatorValue(), this.getDiscriminatorValue(), "discriminatorValue", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntity_DiscriminatorColumn(), this.getXmlDiscriminatorColumn(), null, "discriminatorColumn", 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_SequenceGenerator(), this.getXmlSequenceGenerator(), null, "sequenceGenerator", 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_TableGenerator(), this.getXmlTableGenerator(), null, "tableGenerator", 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_NamedQueries(), this.getXmlNamedQuery(), null, "namedQueries", 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_NamedNativeQueries(), this.getXmlNamedNativeQuery(), null, "namedNativeQueries", 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_SqlResultSetMappings(), this.getSqlResultSetMapping(), null, "sqlResultSetMappings", 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_ExcludeDefaultListeners(), theXMLTypePackage.getBoolean(), "excludeDefaultListeners", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlEntity_ExcludeSuperclassListeners(), theXMLTypePackage.getBoolean(), "excludeSuperclassListeners", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntity_EntityListeners(), this.getEntityListeners(), null, "entityListeners", 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_PrePersist(), this.getPrePersist(), null, "prePersist", 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_PostPersist(), this.getPostPersist(), null, "postPersist", 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_PreRemove(), this.getPreRemove(), null, "preRemove", 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_PostRemove(), this.getPostRemove(), null, "postRemove", 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_PreUpdate(), this.getPreUpdate(), null, "preUpdate", 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_PostUpdate(), this.getPostUpdate(), null, "postUpdate", 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_PostLoad(), this.getPostLoad(), null, "postLoad", 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_AttributeOverrides(), this.getXmlAttributeOverride(), null, "attributeOverrides", 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_AssociationOverrides(), this.getXmlAssociationOverride(), null, "associationOverrides", null, 0, -1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlEmbeddableEClass, XmlEmbeddable.class, "XmlEmbeddable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(attributesEClass, Attributes.class, "Attributes", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getAttributes_Ids(), this.getXmlId(), null, "ids", 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_EmbeddedIds(), this.getXmlEmbeddedId(), null, "embeddedIds", 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_Basics(), this.getXmlBasic(), null, "basics", 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_Versions(), this.getXmlVersion(), null, "versions", 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_ManyToOnes(), this.getXmlManyToOne(), null, "manyToOnes", 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_OneToManys(), this.getXmlOneToMany(), null, "oneToManys", 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_OneToOnes(), this.getXmlOneToOne(), null, "oneToOnes", 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_ManyToManys(), this.getXmlManyToMany(), null, "manyToManys", 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_Embeddeds(), this.getXmlEmbedded(), null, "embeddeds", 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_Transients(), this.getXmlTransient(), null, "transients", null, 0, -1, Attributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlAttributeMappingEClass, XmlAttributeMapping.class, "XmlAttributeMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlAttributeMapping_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlAttributeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(abstractXmlAttributeMappingEClass, AbstractXmlAttributeMapping.class, "AbstractXmlAttributeMapping", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlNullAttributeMappingEClass, XmlNullAttributeMapping.class, "XmlNullAttributeMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(columnMappingEClass, ColumnMapping.class, "ColumnMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getColumnMapping_Column(), this.getXmlColumn(), null, "column", null, 0, 1, ColumnMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlRelationshipMappingEClass, XmlRelationshipMapping.class, "XmlRelationshipMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlRelationshipMapping_TargetEntity(), theXMLTypePackage.getString(), "targetEntity", null, 0, 1, XmlRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlRelationshipMapping_Fetch(), this.getFetchType(), "fetch", "LAZY", 0, 1, XmlRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlRelationshipMapping_JoinTable(), this.getXmlJoinTable(), null, "joinTable", null, 0, 1, XmlRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlRelationshipMapping_Cascade(), this.getCascadeType(), null, "cascade", null, 0, 1, XmlRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlMultiRelationshipMappingEClass, XmlMultiRelationshipMapping.class, "XmlMultiRelationshipMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlMultiRelationshipMapping_MappedBy(), theXMLTypePackage.getString(), "mappedBy", null, 0, 1, XmlMultiRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlMultiRelationshipMapping_OrderBy(), this.getOrderBy(), "orderBy", null, 0, 1, XmlMultiRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlMultiRelationshipMapping_MapKey(), this.getMapKey(), null, "mapKey", null, 0, 1, XmlMultiRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlSingleRelationshipMappingEClass, XmlSingleRelationshipMapping.class, "XmlSingleRelationshipMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlSingleRelationshipMapping_Optional(), theXMLTypePackage.getBooleanObject(), "optional", null, 0, 1, XmlSingleRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlSingleRelationshipMapping_JoinColumns(), this.getXmlJoinColumn(), null, "joinColumns", null, 0, -1, XmlSingleRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlIdEClass, XmlId.class, "XmlId", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlId_GeneratedValue(), this.getXmlGeneratedValue(), null, "generatedValue", null, 0, 1, XmlId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlId_Temporal(), this.getTemporalType(), "temporal", null, 0, 1, XmlId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlId_TableGenerator(), this.getXmlTableGenerator(), null, "tableGenerator", null, 0, 1, XmlId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlId_SequenceGenerator(), this.getXmlSequenceGenerator(), null, "sequenceGenerator", 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(baseXmlEmbeddedEClass, BaseXmlEmbedded.class, "BaseXmlEmbedded", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getBaseXmlEmbedded_AttributeOverrides(), this.getXmlAttributeOverride(), null, "attributeOverrides", null, 0, -1, BaseXmlEmbedded.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		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);
-		initEAttribute(getXmlBasic_Fetch(), this.getFetchType(), "fetch", "LAZY", 0, 1, XmlBasic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlBasic_Optional(), theXMLTypePackage.getBooleanObject(), "optional", null, 0, 1, XmlBasic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlBasic_Lob(), theXMLTypePackage.getBoolean(), "lob", null, 0, 1, XmlBasic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlBasic_Temporal(), this.getTemporalType(), "temporal", null, 0, 1, XmlBasic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlBasic_Enumerated(), this.getEnumType(), "enumerated", null, 0, 1, XmlBasic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, 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);
-		initEAttribute(getXmlVersion_Temporal(), this.getTemporalType(), "temporal", null, 0, 1, XmlVersion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlVersionImplEClass, XmlVersionImpl.class, "XmlVersionImpl", !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(xmlOneToManyEClass, XmlOneToMany.class, "XmlOneToMany", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlOneToMany_JoinColumns(), this.getXmlJoinColumn(), null, "joinColumns", 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(xmlOneToOneEClass, XmlOneToOne.class, "XmlOneToOne", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlOneToOne_MappedBy(), theXMLTypePackage.getString(), "mappedBy", null, 0, 1, XmlOneToOne.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlOneToOne_PrimaryKeyJoinColumns(), this.getXmlPrimaryKeyJoinColumn(), null, "primaryKeyJoinColumns", 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(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(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);
-
-		initEClass(xmlAssociationOverrideEClass, XmlAssociationOverride.class, "XmlAssociationOverride", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlAssociationOverride_JoinColumns(), this.getXmlJoinColumn(), null, "joinColumns", null, 1, -1, XmlAssociationOverride.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlAssociationOverride_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlAssociationOverride.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlAssociationOverrideImplEClass, XmlAssociationOverrideImpl.class, "XmlAssociationOverrideImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlAttributeOverrideEClass, XmlAttributeOverride.class, "XmlAttributeOverride", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlAttributeOverride_Column(), this.getXmlColumn(), null, "column", null, 1, 1, XmlAttributeOverride.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlAttributeOverride_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlAttributeOverride.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlAttributeOverrideImplEClass, XmlAttributeOverrideImpl.class, "XmlAttributeOverrideImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(cascadeTypeEClass, CascadeType.class, "CascadeType", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCascadeType_CascadeAll(), theXMLTypePackage.getBoolean(), "cascadeAll", null, 0, 1, CascadeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCascadeType_CascadePersist(), theXMLTypePackage.getBoolean(), "cascadePersist", null, 0, 1, CascadeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCascadeType_CascadeMerge(), theXMLTypePackage.getBoolean(), "cascadeMerge", null, 0, 1, CascadeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCascadeType_CascadeRemove(), theXMLTypePackage.getBoolean(), "cascadeRemove", null, 0, 1, CascadeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCascadeType_CascadeRefresh(), theXMLTypePackage.getBoolean(), "cascadeRefresh", null, 0, 1, CascadeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(cascadeTypeImplEClass, CascadeTypeImpl.class, "CascadeTypeImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlNamedColumnEClass, XmlNamedColumn.class, "XmlNamedColumn", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlNamedColumn_ColumnDefinition(), theXMLTypePackage.getString(), "columnDefinition", null, 0, 1, XmlNamedColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlNamedColumn_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlNamedColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(abstractXmlNamedColumnEClass, AbstractXmlNamedColumn.class, "AbstractXmlNamedColumn", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlAbstractColumnEClass, XmlAbstractColumn.class, "XmlAbstractColumn", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlAbstractColumn_Insertable(), theXMLTypePackage.getBooleanObject(), "insertable", null, 0, 1, XmlAbstractColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlAbstractColumn_Nullable(), theXMLTypePackage.getBooleanObject(), "nullable", null, 0, 1, XmlAbstractColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlAbstractColumn_Table(), theXMLTypePackage.getString(), "table", null, 0, 1, XmlAbstractColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlAbstractColumn_Unique(), theXMLTypePackage.getBooleanObject(), "unique", null, 0, 1, XmlAbstractColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlAbstractColumn_Updatable(), theXMLTypePackage.getBooleanObject(), "updatable", null, 0, 1, XmlAbstractColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(abstractXmlAbstractColumnEClass, AbstractXmlAbstractColumn.class, "AbstractXmlAbstractColumn", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlColumnEClass, XmlColumn.class, "XmlColumn", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlColumn_Length(), theXMLTypePackage.getIntObject(), "length", null, 0, 1, XmlColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlColumn_Precision(), theXMLTypePackage.getIntObject(), "precision", null, 0, 1, XmlColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlColumn_Scale(), theXMLTypePackage.getIntObject(), "scale", null, 0, 1, XmlColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlColumnImplEClass, XmlColumnImpl.class, "XmlColumnImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(columnResultEClass, ColumnResult.class, "ColumnResult", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getColumnResult_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, ColumnResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlDiscriminatorColumnEClass, XmlDiscriminatorColumn.class, "XmlDiscriminatorColumn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlDiscriminatorColumn_DiscriminatorType(), this.getDiscriminatorType(), "discriminatorType", "STRING", 0, 1, XmlDiscriminatorColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlDiscriminatorColumn_Length(), theXMLTypePackage.getIntObject(), "length", null, 0, 1, XmlDiscriminatorColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(entityListenersEClass, EntityListeners.class, "EntityListeners", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getEntityListeners_EntityListeners(), this.getEntityListener(), null, "entityListeners", null, 0, -1, EntityListeners.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(entityListenerEClass, EntityListener.class, "EntityListener", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEntityListener_ClassName(), theXMLTypePackage.getString(), "className", null, 1, 1, EntityListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEntityListener_PrePersist(), this.getPrePersist(), null, "prePersist", null, 0, 1, EntityListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEntityListener_PostPersist(), this.getPostPersist(), null, "postPersist", null, 0, 1, EntityListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEntityListener_PreRemove(), this.getPreRemove(), null, "preRemove", null, 0, 1, EntityListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEntityListener_PostRemove(), this.getPostRemove(), null, "postRemove", null, 0, 1, EntityListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEntityListener_PreUpdate(), this.getPreUpdate(), null, "preUpdate", null, 0, 1, EntityListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEntityListener_PostUpdate(), this.getPostUpdate(), null, "postUpdate", null, 0, 1, EntityListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEntityListener_PostLoad(), this.getPostLoad(), null, "postLoad", null, 0, 1, EntityListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(entityResultEClass, EntityResult.class, "EntityResult", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEntityResult_DiscriminatorColumn(), theXMLTypePackage.getString(), "discriminatorColumn", null, 0, 1, EntityResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEntityResult_EntityClass(), theXMLTypePackage.getString(), "entityClass", null, 1, 1, EntityResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEntityResult_FieldResults(), this.getFieldResult(), null, "fieldResults", null, 0, -1, EntityResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(eventMethodEClass, EventMethod.class, "EventMethod", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEventMethod_MethodName(), theXMLTypePackage.getString(), "methodName", null, 1, 1, EventMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(fieldResultEClass, FieldResult.class, "FieldResult", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFieldResult_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, FieldResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFieldResult_Column(), theXMLTypePackage.getString(), "column", null, 1, 1, FieldResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlGeneratedValueEClass, XmlGeneratedValue.class, "XmlGeneratedValue", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlGeneratedValue_Generator(), theXMLTypePackage.getString(), "generator", null, 0, 1, XmlGeneratedValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlGeneratedValue_Strategy(), this.getGenerationType(), "strategy", "TABLE", 0, 1, XmlGeneratedValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlGeneratedValueImplEClass, XmlGeneratedValueImpl.class, "XmlGeneratedValueImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlIdClassEClass, XmlIdClass.class, "XmlIdClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlIdClass_ClassName(), theXMLTypePackage.getString(), "className", null, 1, 1, XmlIdClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(inheritanceEClass, Inheritance.class, "Inheritance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getInheritance_Strategy(), this.getInheritanceType(), "strategy", "SINGLE_TABLE", 0, 1, Inheritance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlJoinColumnEClass, XmlJoinColumn.class, "XmlJoinColumn", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlJoinColumn_ReferencedColumnName(), theXMLTypePackage.getString(), "referencedColumnName", null, 0, 1, XmlJoinColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlJoinColumnImplEClass, XmlJoinColumnImpl.class, "XmlJoinColumnImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlJoinTableEClass, XmlJoinTable.class, "XmlJoinTable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlJoinTable_JoinColumns(), this.getXmlJoinColumn(), null, "joinColumns", null, 0, -1, XmlJoinTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlJoinTable_InverseJoinColumns(), this.getXmlJoinColumn(), null, "inverseJoinColumns", null, 0, -1, XmlJoinTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlJoinTableImplEClass, XmlJoinTableImpl.class, "XmlJoinTableImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(lobEClass, Lob.class, "Lob", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(mapKeyEClass, MapKey.class, "MapKey", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMapKey_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, MapKey.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(mapKeyImplEClass, MapKeyImpl.class, "MapKeyImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlQueryEClass, XmlQuery.class, "XmlQuery", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlQuery_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlQuery_Query(), theXMLTypePackage.getString(), "query", null, 1, 1, XmlQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlQuery_Hints(), this.getXmlQueryHint(), null, "hints", null, 0, -1, XmlQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlNamedNativeQueryEClass, XmlNamedNativeQuery.class, "XmlNamedNativeQuery", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlNamedNativeQuery_ResultClass(), theXMLTypePackage.getString(), "resultClass", null, 0, 1, XmlNamedNativeQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlNamedNativeQuery_ResultSetMapping(), theXMLTypePackage.getString(), "resultSetMapping", null, 0, 1, XmlNamedNativeQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlNamedQueryEClass, XmlNamedQuery.class, "XmlNamedQuery", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(postLoadEClass, PostLoad.class, "PostLoad", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(postPersistEClass, PostPersist.class, "PostPersist", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(postRemoveEClass, PostRemove.class, "PostRemove", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(postUpdateEClass, PostUpdate.class, "PostUpdate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(prePersistEClass, PrePersist.class, "PrePersist", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(preRemoveEClass, PreRemove.class, "PreRemove", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(preUpdateEClass, PreUpdate.class, "PreUpdate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlPrimaryKeyJoinColumnEClass, XmlPrimaryKeyJoinColumn.class, "XmlPrimaryKeyJoinColumn", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlPrimaryKeyJoinColumn_ReferencedColumnName(), theXMLTypePackage.getString(), "referencedColumnName", null, 0, 1, XmlPrimaryKeyJoinColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlPrimaryKeyJoinColumnImplEClass, XmlPrimaryKeyJoinColumnImpl.class, "XmlPrimaryKeyJoinColumnImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlQueryHintEClass, XmlQueryHint.class, "XmlQueryHint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlQueryHint_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlQueryHint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlQueryHint_Value(), theXMLTypePackage.getString(), "value", null, 1, 1, XmlQueryHint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(abstractXmlBaseTableEClass, AbstractXmlBaseTable.class, "AbstractXmlBaseTable", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlBaseTableEClass, XmlBaseTable.class, "XmlBaseTable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlBaseTable_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlBaseTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlBaseTable_Catalog(), theXMLTypePackage.getString(), "catalog", null, 0, 1, XmlBaseTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlBaseTable_Schema(), theXMLTypePackage.getString(), "schema", null, 0, 1, XmlBaseTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlBaseTable_UniqueConstraints(), this.getXmlUniqueConstraint(), null, "uniqueConstraints", null, 0, -1, XmlBaseTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlTableEClass, XmlTable.class, "XmlTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlSecondaryTableEClass, XmlSecondaryTable.class, "XmlSecondaryTable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlSecondaryTable_PrimaryKeyJoinColumns(), this.getXmlPrimaryKeyJoinColumn(), null, "primaryKeyJoinColumns", null, 0, -1, XmlSecondaryTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlSecondaryTableImplEClass, XmlSecondaryTableImpl.class, "XmlSecondaryTableImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlGeneratorEClass, XmlGenerator.class, "XmlGenerator", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlGenerator_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlGenerator_InitialValue(), theXMLTypePackage.getIntObject(), "initialValue", null, 0, 1, XmlGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlGenerator_AllocationSize(), theXMLTypePackage.getIntObject(), "allocationSize", null, 0, 1, XmlGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlSequenceGeneratorEClass, XmlSequenceGenerator.class, "XmlSequenceGenerator", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlSequenceGenerator_SequenceName(), theXMLTypePackage.getString(), "sequenceName", null, 0, 1, XmlSequenceGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlSequenceGeneratorImplEClass, XmlSequenceGeneratorImpl.class, "XmlSequenceGeneratorImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(sqlResultSetMappingEClass, SqlResultSetMapping.class, "SqlResultSetMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSqlResultSetMapping_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, SqlResultSetMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSqlResultSetMapping_EntityResults(), this.getEntityResult(), null, "entityResults", null, 0, -1, SqlResultSetMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSqlResultSetMapping_ColumnResults(), this.getColumnResult(), null, "columnResults", null, 0, -1, SqlResultSetMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlTableGeneratorEClass, XmlTableGenerator.class, "XmlTableGenerator", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlTableGenerator_Table(), theXMLTypePackage.getString(), "table", null, 0, 1, XmlTableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlTableGenerator_Catalog(), theXMLTypePackage.getString(), "catalog", null, 0, 1, XmlTableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlTableGenerator_Schema(), theXMLTypePackage.getString(), "schema", null, 0, 1, XmlTableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlTableGenerator_PkColumnName(), theXMLTypePackage.getString(), "pkColumnName", null, 0, 1, XmlTableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlTableGenerator_ValueColumnName(), theXMLTypePackage.getString(), "valueColumnName", null, 0, 1, XmlTableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlTableGenerator_PkColumnValue(), theXMLTypePackage.getString(), "pkColumnValue", null, 0, 1, XmlTableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlTableGenerator_UniqueConstraints(), this.getXmlUniqueConstraint(), null, "uniqueConstraints", null, 0, -1, XmlTableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlTableGeneratorImplEClass, XmlTableGeneratorImpl.class, "XmlTableGeneratorImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlUniqueConstraintEClass, XmlUniqueConstraint.class, "XmlUniqueConstraint", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlUniqueConstraint_ColumnNames(), theXMLTypePackage.getString(), "columnNames", null, 1, -1, XmlUniqueConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlUniqueConstraintImplEClass, XmlUniqueConstraintImpl.class, "XmlUniqueConstraintImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Initialize enums and add enum literals
-		initEEnum(accessTypeEEnum, AccessType.class, "AccessType");
-		addEEnumLiteral(accessTypeEEnum, AccessType.PROPERTY);
-		addEEnumLiteral(accessTypeEEnum, AccessType.FIELD);
-
-		initEEnum(discriminatorTypeEEnum, DiscriminatorType.class, "DiscriminatorType");
-		addEEnumLiteral(discriminatorTypeEEnum, DiscriminatorType.STRING);
-		addEEnumLiteral(discriminatorTypeEEnum, DiscriminatorType.CHAR);
-		addEEnumLiteral(discriminatorTypeEEnum, DiscriminatorType.INTEGER);
-
-		initEEnum(enumTypeEEnum, EnumType.class, "EnumType");
-		addEEnumLiteral(enumTypeEEnum, EnumType.ORDINAL);
-		addEEnumLiteral(enumTypeEEnum, EnumType.STRING);
-
-		initEEnum(fetchTypeEEnum, FetchType.class, "FetchType");
-		addEEnumLiteral(fetchTypeEEnum, FetchType.LAZY);
-		addEEnumLiteral(fetchTypeEEnum, FetchType.EAGER);
-
-		initEEnum(generationTypeEEnum, GenerationType.class, "GenerationType");
-		addEEnumLiteral(generationTypeEEnum, GenerationType.TABLE);
-		addEEnumLiteral(generationTypeEEnum, GenerationType.SEQUENCE);
-		addEEnumLiteral(generationTypeEEnum, GenerationType.IDENTITY);
-		addEEnumLiteral(generationTypeEEnum, GenerationType.AUTO);
-
-		initEEnum(inheritanceTypeEEnum, InheritanceType.class, "InheritanceType");
-		addEEnumLiteral(inheritanceTypeEEnum, InheritanceType.SINGLE_TABLE);
-		addEEnumLiteral(inheritanceTypeEEnum, InheritanceType.JOINED);
-		addEEnumLiteral(inheritanceTypeEEnum, InheritanceType.TABLE_PER_CLASS);
-
-		initEEnum(temporalTypeEEnum, TemporalType.class, "TemporalType");
-		addEEnumLiteral(temporalTypeEEnum, TemporalType.DATE);
-		addEEnumLiteral(temporalTypeEEnum, TemporalType.TIME);
-		addEEnumLiteral(temporalTypeEEnum, TemporalType.TIMESTAMP);
-
-		// Initialize data types
-		initEDataType(discriminatorValueEDataType, String.class, "DiscriminatorValue", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(enumeratedEDataType, Enumerator.class, "Enumerated", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(orderByEDataType, String.class, "OrderBy", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(versionTypeEDataType, String.class, "VersionType", IS_SERIALIZABLE, !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.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlEntityMappings
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntityMappings()
-		 * @generated
-		 */
-		public static final EClass XML_ENTITY_MAPPINGS = eINSTANCE.getXmlEntityMappings();
-
-		/**
-		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ENTITY_MAPPINGS__VERSION = eINSTANCE.getXmlEntityMappings_Version();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ENTITY_MAPPINGS__DESCRIPTION = eINSTANCE.getXmlEntityMappings_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Unit Metadata</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS__PERSISTENCE_UNIT_METADATA = eINSTANCE.getXmlEntityMappings_PersistenceUnitMetadata();
-
-		/**
-		 * The meta object literal for the '<em><b>Package</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ENTITY_MAPPINGS__PACKAGE = eINSTANCE.getXmlEntityMappings_Package();
-
-		/**
-		 * The meta object literal for the '<em><b>Schema</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ENTITY_MAPPINGS__SCHEMA = eINSTANCE.getXmlEntityMappings_Schema();
-
-		/**
-		 * The meta object literal for the '<em><b>Catalog</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ENTITY_MAPPINGS__CATALOG = eINSTANCE.getXmlEntityMappings_Catalog();
-
-		/**
-		 * 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_ENTITY_MAPPINGS__ACCESS = eINSTANCE.getXmlEntityMappings_Access();
-
-		/**
-		 * The meta object literal for the '<em><b>Sequence Generators</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS__SEQUENCE_GENERATORS = eINSTANCE.getXmlEntityMappings_SequenceGenerators();
-
-		/**
-		 * The meta object literal for the '<em><b>Table Generators</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS__TABLE_GENERATORS = eINSTANCE.getXmlEntityMappings_TableGenerators();
-
-		/**
-		 * The meta object literal for the '<em><b>Named Queries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS__NAMED_QUERIES = eINSTANCE.getXmlEntityMappings_NamedQueries();
-
-		/**
-		 * The meta object literal for the '<em><b>Named Native Queries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES = eINSTANCE.getXmlEntityMappings_NamedNativeQueries();
-
-		/**
-		 * The meta object literal for the '<em><b>Sql Result Set Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS__SQL_RESULT_SET_MAPPINGS = eINSTANCE.getXmlEntityMappings_SqlResultSetMappings();
-
-		/**
-		 * The meta object literal for the '<em><b>Mapped Superclasses</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS__MAPPED_SUPERCLASSES = eINSTANCE.getXmlEntityMappings_MappedSuperclasses();
-
-		/**
-		 * The meta object literal for the '<em><b>Entities</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS__ENTITIES = eINSTANCE.getXmlEntityMappings_Entities();
-
-		/**
-		 * The meta object literal for the '<em><b>Embeddables</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS__EMBEDDABLES = eINSTANCE.getXmlEntityMappings_Embeddables();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPersistenceUnitMetadata()
-		 * @generated
-		 */
-		public static final EClass XML_PERSISTENCE_UNIT_METADATA = eINSTANCE.getXmlPersistenceUnitMetadata();
-
-		/**
-		 * The meta object literal for the '<em><b>Xml Mapping Metadata Complete</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PERSISTENCE_UNIT_METADATA__XML_MAPPING_METADATA_COMPLETE = eINSTANCE.getXmlPersistenceUnitMetadata_XmlMappingMetadataComplete();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Unit Defaults</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_PERSISTENCE_UNIT_METADATA__PERSISTENCE_UNIT_DEFAULTS = eINSTANCE.getXmlPersistenceUnitMetadata_PersistenceUnitDefaults();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPersistenceUnitDefaults()
-		 * @generated
-		 */
-		public static final EClass XML_PERSISTENCE_UNIT_DEFAULTS = eINSTANCE.getXmlPersistenceUnitDefaults();
-
-		/**
-		 * The meta object literal for the '<em><b>Schema</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PERSISTENCE_UNIT_DEFAULTS__SCHEMA = eINSTANCE.getXmlPersistenceUnitDefaults_Schema();
-
-		/**
-		 * The meta object literal for the '<em><b>Catalog</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PERSISTENCE_UNIT_DEFAULTS__CATALOG = eINSTANCE.getXmlPersistenceUnitDefaults_Catalog();
-
-		/**
-		 * 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_PERSISTENCE_UNIT_DEFAULTS__ACCESS = eINSTANCE.getXmlPersistenceUnitDefaults_Access();
-
-		/**
-		 * The meta object literal for the '<em><b>Cascade Persist</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PERSISTENCE_UNIT_DEFAULTS__CASCADE_PERSIST = eINSTANCE.getXmlPersistenceUnitDefaults_CascadePersist();
-
-		/**
-		 * The meta object literal for the '<em><b>Entity Listeners</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_PERSISTENCE_UNIT_DEFAULTS__ENTITY_LISTENERS = eINSTANCE.getXmlPersistenceUnitDefaults_EntityListeners();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping <em>Abstract Xml Type Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractXmlTypeMapping()
-		 * @generated
-		 */
-		public static final EClass ABSTRACT_XML_TYPE_MAPPING = eINSTANCE.getAbstractXmlTypeMapping();
-
-		/**
-		 * 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 ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME = eINSTANCE.getAbstractXmlTypeMapping_ClassName();
-
-		/**
-		 * The meta object literal for the '<em><b>Access</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute ABSTRACT_XML_TYPE_MAPPING__ACCESS = eINSTANCE.getAbstractXmlTypeMapping_Access();
-
-		/**
-		 * The meta object literal for the '<em><b>Metadata Complete</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE = eINSTANCE.getAbstractXmlTypeMapping_MetadataComplete();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION = eINSTANCE.getAbstractXmlTypeMapping_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Attributes</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES = eINSTANCE.getAbstractXmlTypeMapping_Attributes();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMappedSuperclass()
-		 * @generated
-		 */
-		public static final EClass XML_MAPPED_SUPERCLASS = eINSTANCE.getXmlMappedSuperclass();
-
-		/**
-		 * The meta object literal for the '<em><b>Id Class</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS__ID_CLASS = eINSTANCE.getXmlMappedSuperclass_IdClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Exclude Default Listeners</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_LISTENERS = eINSTANCE.getXmlMappedSuperclass_ExcludeDefaultListeners();
-
-		/**
-		 * The meta object literal for the '<em><b>Exclude Superclass Listeners</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_MAPPED_SUPERCLASS__EXCLUDE_SUPERCLASS_LISTENERS = eINSTANCE.getXmlMappedSuperclass_ExcludeSuperclassListeners();
-
-		/**
-		 * The meta object literal for the '<em><b>Entity Listeners</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS__ENTITY_LISTENERS = eINSTANCE.getXmlMappedSuperclass_EntityListeners();
-
-		/**
-		 * The meta object literal for the '<em><b>Pre Persist</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS__PRE_PERSIST = eINSTANCE.getXmlMappedSuperclass_PrePersist();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Persist</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS__POST_PERSIST = eINSTANCE.getXmlMappedSuperclass_PostPersist();
-
-		/**
-		 * The meta object literal for the '<em><b>Pre Remove</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS__PRE_REMOVE = eINSTANCE.getXmlMappedSuperclass_PreRemove();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Remove</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS__POST_REMOVE = eINSTANCE.getXmlMappedSuperclass_PostRemove();
-
-		/**
-		 * The meta object literal for the '<em><b>Pre Update</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS__PRE_UPDATE = eINSTANCE.getXmlMappedSuperclass_PreUpdate();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Update</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS__POST_UPDATE = eINSTANCE.getXmlMappedSuperclass_PostUpdate();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Load</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS__POST_LOAD = eINSTANCE.getXmlMappedSuperclass_PostLoad();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity <em>Xml Entity</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlEntity
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity()
-		 * @generated
-		 */
-		public static final EClass XML_ENTITY = eINSTANCE.getXmlEntity();
-
-		/**
-		 * 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_ENTITY__NAME = eINSTANCE.getXmlEntity_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Table</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__TABLE = eINSTANCE.getXmlEntity_Table();
-
-		/**
-		 * The meta object literal for the '<em><b>Secondary Tables</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__SECONDARY_TABLES = eINSTANCE.getXmlEntity_SecondaryTables();
-
-		/**
-		 * The meta object literal for the '<em><b>Primary Key Join Columns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__PRIMARY_KEY_JOIN_COLUMNS = eINSTANCE.getXmlEntity_PrimaryKeyJoinColumns();
-
-		/**
-		 * The meta object literal for the '<em><b>Id Class</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__ID_CLASS = eINSTANCE.getXmlEntity_IdClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Inheritance</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__INHERITANCE = eINSTANCE.getXmlEntity_Inheritance();
-
-		/**
-		 * The meta object literal for the '<em><b>Discriminator Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ENTITY__DISCRIMINATOR_VALUE = eINSTANCE.getXmlEntity_DiscriminatorValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Discriminator Column</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__DISCRIMINATOR_COLUMN = eINSTANCE.getXmlEntity_DiscriminatorColumn();
-
-		/**
-		 * 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_ENTITY__SEQUENCE_GENERATOR = eINSTANCE.getXmlEntity_SequenceGenerator();
-
-		/**
-		 * 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_ENTITY__TABLE_GENERATOR = eINSTANCE.getXmlEntity_TableGenerator();
-
-		/**
-		 * The meta object literal for the '<em><b>Named Queries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__NAMED_QUERIES = eINSTANCE.getXmlEntity_NamedQueries();
-
-		/**
-		 * The meta object literal for the '<em><b>Named Native Queries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__NAMED_NATIVE_QUERIES = eINSTANCE.getXmlEntity_NamedNativeQueries();
-
-		/**
-		 * The meta object literal for the '<em><b>Sql Result Set Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__SQL_RESULT_SET_MAPPINGS = eINSTANCE.getXmlEntity_SqlResultSetMappings();
-
-		/**
-		 * The meta object literal for the '<em><b>Exclude Default Listeners</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ENTITY__EXCLUDE_DEFAULT_LISTENERS = eINSTANCE.getXmlEntity_ExcludeDefaultListeners();
-
-		/**
-		 * The meta object literal for the '<em><b>Exclude Superclass Listeners</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ENTITY__EXCLUDE_SUPERCLASS_LISTENERS = eINSTANCE.getXmlEntity_ExcludeSuperclassListeners();
-
-		/**
-		 * The meta object literal for the '<em><b>Entity Listeners</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__ENTITY_LISTENERS = eINSTANCE.getXmlEntity_EntityListeners();
-
-		/**
-		 * The meta object literal for the '<em><b>Pre Persist</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__PRE_PERSIST = eINSTANCE.getXmlEntity_PrePersist();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Persist</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__POST_PERSIST = eINSTANCE.getXmlEntity_PostPersist();
-
-		/**
-		 * The meta object literal for the '<em><b>Pre Remove</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__PRE_REMOVE = eINSTANCE.getXmlEntity_PreRemove();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Remove</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__POST_REMOVE = eINSTANCE.getXmlEntity_PostRemove();
-
-		/**
-		 * The meta object literal for the '<em><b>Pre Update</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__PRE_UPDATE = eINSTANCE.getXmlEntity_PreUpdate();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Update</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__POST_UPDATE = eINSTANCE.getXmlEntity_PostUpdate();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Load</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__POST_LOAD = eINSTANCE.getXmlEntity_PostLoad();
-
-		/**
-		 * The meta object literal for the '<em><b>Attribute Overrides</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__ATTRIBUTE_OVERRIDES = eINSTANCE.getXmlEntity_AttributeOverrides();
-
-		/**
-		 * The meta object literal for the '<em><b>Association Overrides</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__ASSOCIATION_OVERRIDES = eINSTANCE.getXmlEntity_AssociationOverrides();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlEmbeddable
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEmbeddable()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDABLE = eINSTANCE.getXmlEmbeddable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.Attributes <em>Attributes</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.Attributes
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes()
-		 * @generated
-		 */
-		public static final EClass ATTRIBUTES = eINSTANCE.getAttributes();
-
-		/**
-		 * The meta object literal for the '<em><b>Ids</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ATTRIBUTES__IDS = eINSTANCE.getAttributes_Ids();
-
-		/**
-		 * The meta object literal for the '<em><b>Embedded Ids</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ATTRIBUTES__EMBEDDED_IDS = eINSTANCE.getAttributes_EmbeddedIds();
-
-		/**
-		 * The meta object literal for the '<em><b>Basics</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ATTRIBUTES__BASICS = eINSTANCE.getAttributes_Basics();
-
-		/**
-		 * The meta object literal for the '<em><b>Versions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ATTRIBUTES__VERSIONS = eINSTANCE.getAttributes_Versions();
-
-		/**
-		 * The meta object literal for the '<em><b>Many To Ones</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ATTRIBUTES__MANY_TO_ONES = eINSTANCE.getAttributes_ManyToOnes();
-
-		/**
-		 * The meta object literal for the '<em><b>One To Manys</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ATTRIBUTES__ONE_TO_MANYS = eINSTANCE.getAttributes_OneToManys();
-
-		/**
-		 * The meta object literal for the '<em><b>One To Ones</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ATTRIBUTES__ONE_TO_ONES = eINSTANCE.getAttributes_OneToOnes();
-
-		/**
-		 * The meta object literal for the '<em><b>Many To Manys</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ATTRIBUTES__MANY_TO_MANYS = eINSTANCE.getAttributes_ManyToManys();
-
-		/**
-		 * The meta object literal for the '<em><b>Embeddeds</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ATTRIBUTES__EMBEDDEDS = eINSTANCE.getAttributes_Embeddeds();
-
-		/**
-		 * The meta object literal for the '<em><b>Transients</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ATTRIBUTES__TRANSIENTS = eINSTANCE.getAttributes_Transients();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlAttributeMapping
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAttributeMapping()
-		 * @generated
-		 */
-		public static final EClass XML_ATTRIBUTE_MAPPING = eINSTANCE.getXmlAttributeMapping();
-
-		/**
-		 * 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_ATTRIBUTE_MAPPING__NAME = eINSTANCE.getXmlAttributeMapping_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlAttributeMapping <em>Abstract Xml Attribute Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlAttributeMapping
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractXmlAttributeMapping()
-		 * @generated
-		 */
-		public static final EClass ABSTRACT_XML_ATTRIBUTE_MAPPING = eINSTANCE.getAbstractXmlAttributeMapping();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping <em>Xml Null Attribute Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlNullAttributeMapping()
-		 * @generated
-		 */
-		public static final EClass XML_NULL_ATTRIBUTE_MAPPING = eINSTANCE.getXmlNullAttributeMapping();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.ColumnMapping <em>Column Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.ColumnMapping
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnMapping()
-		 * @generated
-		 */
-		public static final EClass COLUMN_MAPPING = eINSTANCE.getColumnMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Column</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference COLUMN_MAPPING__COLUMN = eINSTANCE.getColumnMapping_Column();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping <em>Xml Relationship Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping()
-		 * @generated
-		 */
-		public static final EClass XML_RELATIONSHIP_MAPPING = eINSTANCE.getXmlRelationshipMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Target Entity</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_RELATIONSHIP_MAPPING__TARGET_ENTITY = eINSTANCE.getXmlRelationshipMapping_TargetEntity();
-
-		/**
-		 * The meta object literal for the '<em><b>Fetch</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_RELATIONSHIP_MAPPING__FETCH = eINSTANCE.getXmlRelationshipMapping_Fetch();
-
-		/**
-		 * The meta object literal for the '<em><b>Join Table</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_RELATIONSHIP_MAPPING__JOIN_TABLE = eINSTANCE.getXmlRelationshipMapping_JoinTable();
-
-		/**
-		 * The meta object literal for the '<em><b>Cascade</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_RELATIONSHIP_MAPPING__CASCADE = eINSTANCE.getXmlRelationshipMapping_Cascade();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping <em>Xml Multi Relationship Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMultiRelationshipMapping()
-		 * @generated
-		 */
-		public static final EClass XML_MULTI_RELATIONSHIP_MAPPING = eINSTANCE.getXmlMultiRelationshipMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Mapped By</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_MULTI_RELATIONSHIP_MAPPING__MAPPED_BY = eINSTANCE.getXmlMultiRelationshipMapping_MappedBy();
-
-		/**
-		 * The meta object literal for the '<em><b>Order By</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY = eINSTANCE.getXmlMultiRelationshipMapping_OrderBy();
-
-		/**
-		 * The meta object literal for the '<em><b>Map Key</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY = eINSTANCE.getXmlMultiRelationshipMapping_MapKey();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping <em>Xml Single Relationship Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSingleRelationshipMapping()
-		 * @generated
-		 */
-		public static final EClass XML_SINGLE_RELATIONSHIP_MAPPING = eINSTANCE.getXmlSingleRelationshipMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Optional</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_SINGLE_RELATIONSHIP_MAPPING__OPTIONAL = eINSTANCE.getXmlSingleRelationshipMapping_Optional();
-
-		/**
-		 * The meta object literal for the '<em><b>Join Columns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_SINGLE_RELATIONSHIP_MAPPING__JOIN_COLUMNS = eINSTANCE.getXmlSingleRelationshipMapping_JoinColumns();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlId <em>Xml Id</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlId
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlId()
-		 * @generated
-		 */
-		public static final EClass XML_ID = eINSTANCE.getXmlId();
-
-		/**
-		 * 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_ID__GENERATED_VALUE = eINSTANCE.getXmlId_GeneratedValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Temporal</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ID__TEMPORAL = eINSTANCE.getXmlId_Temporal();
-
-		/**
-		 * 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_ID__TABLE_GENERATOR = eINSTANCE.getXmlId_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_ID__SEQUENCE_GENERATOR = eINSTANCE.getXmlId_SequenceGenerator();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlIdImpl <em>Xml Id Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlIdImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlIdImpl()
-		 * @generated
-		 */
-		public static final EClass XML_ID_IMPL = eINSTANCE.getXmlIdImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.BaseXmlEmbedded <em>Base Xml Embedded</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.BaseXmlEmbedded
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBaseXmlEmbedded()
-		 * @generated
-		 */
-		public static final EClass BASE_XML_EMBEDDED = eINSTANCE.getBaseXmlEmbedded();
-
-		/**
-		 * The meta object literal for the '<em><b>Attribute Overrides</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference BASE_XML_EMBEDDED__ATTRIBUTE_OVERRIDES = eINSTANCE.getBaseXmlEmbedded_AttributeOverrides();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlEmbeddedId
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEmbeddedId()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDED_ID = eINSTANCE.getXmlEmbeddedId();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddedIdImpl <em>Xml Embedded Id Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlEmbeddedIdImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEmbeddedIdImpl()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDED_ID_IMPL = eINSTANCE.getXmlEmbeddedIdImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlBasic <em>Xml Basic</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlBasic
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBasic()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC = eINSTANCE.getXmlBasic();
-
-		/**
-		 * The meta object literal for the '<em><b>Fetch</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_BASIC__FETCH = eINSTANCE.getXmlBasic_Fetch();
-
-		/**
-		 * The meta object literal for the '<em><b>Optional</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_BASIC__OPTIONAL = eINSTANCE.getXmlBasic_Optional();
-
-		/**
-		 * The meta object literal for the '<em><b>Lob</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_BASIC__LOB = eINSTANCE.getXmlBasic_Lob();
-
-		/**
-		 * The meta object literal for the '<em><b>Temporal</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_BASIC__TEMPORAL = eINSTANCE.getXmlBasic_Temporal();
-
-		/**
-		 * The meta object literal for the '<em><b>Enumerated</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_BASIC__ENUMERATED = eINSTANCE.getXmlBasic_Enumerated();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlBasicImpl <em>Xml Basic Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlBasicImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBasicImpl()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_IMPL = eINSTANCE.getXmlBasicImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlVersion <em>Xml Version</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlVersion
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlVersion()
-		 * @generated
-		 */
-		public static final EClass XML_VERSION = eINSTANCE.getXmlVersion();
-
-		/**
-		 * The meta object literal for the '<em><b>Temporal</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_VERSION__TEMPORAL = eINSTANCE.getXmlVersion_Temporal();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlVersionImpl <em>Xml Version Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlVersionImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlVersionImpl()
-		 * @generated
-		 */
-		public static final EClass XML_VERSION_IMPL = eINSTANCE.getXmlVersionImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlManyToOne
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlManyToOne()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_ONE = eINSTANCE.getXmlManyToOne();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToOneImpl <em>Xml Many To One Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlManyToOneImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlManyToOneImpl()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_ONE_IMPL = eINSTANCE.getXmlManyToOneImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlOneToMany
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToMany()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_MANY = eINSTANCE.getXmlOneToMany();
-
-		/**
-		 * The meta object literal for the '<em><b>Join Columns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ONE_TO_MANY__JOIN_COLUMNS = eINSTANCE.getXmlOneToMany_JoinColumns();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToManyImpl <em>Xml One To Many Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlOneToManyImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToManyImpl()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_MANY_IMPL = eINSTANCE.getXmlOneToManyImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlOneToOne
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToOne()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_ONE = eINSTANCE.getXmlOneToOne();
-
-		/**
-		 * The meta object literal for the '<em><b>Mapped By</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ONE_TO_ONE__MAPPED_BY = eINSTANCE.getXmlOneToOne_MappedBy();
-
-		/**
-		 * The meta object literal for the '<em><b>Primary Key Join Columns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ONE_TO_ONE__PRIMARY_KEY_JOIN_COLUMNS = eINSTANCE.getXmlOneToOne_PrimaryKeyJoinColumns();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOneImpl <em>Xml One To One Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlOneToOneImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToOneImpl()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_ONE_IMPL = eINSTANCE.getXmlOneToOneImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlManyToMany
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlManyToMany()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_MANY = eINSTANCE.getXmlManyToMany();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToManyImpl <em>Xml Many To Many Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlManyToManyImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlManyToManyImpl()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_MANY_IMPL = eINSTANCE.getXmlManyToManyImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlEmbedded
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEmbedded()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDED = eINSTANCE.getXmlEmbedded();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddedImpl <em>Xml Embedded Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlEmbeddedImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEmbeddedImpl()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDED_IMPL = eINSTANCE.getXmlEmbeddedImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlTransient <em>Xml Transient</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlTransient
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTransient()
-		 * @generated
-		 */
-		public static final EClass XML_TRANSIENT = eINSTANCE.getXmlTransient();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlTransientImpl <em>Xml Transient Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlTransientImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTransientImpl()
-		 * @generated
-		 */
-		public static final EClass XML_TRANSIENT_IMPL = eINSTANCE.getXmlTransientImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride <em>Xml Association Override</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlAssociationOverride
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAssociationOverride()
-		 * @generated
-		 */
-		public static final EClass XML_ASSOCIATION_OVERRIDE = eINSTANCE.getXmlAssociationOverride();
-
-		/**
-		 * The meta object literal for the '<em><b>Join Columns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ASSOCIATION_OVERRIDE__JOIN_COLUMNS = eINSTANCE.getXmlAssociationOverride_JoinColumns();
-
-		/**
-		 * 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_ASSOCIATION_OVERRIDE__NAME = eINSTANCE.getXmlAssociationOverride_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideImpl <em>Xml Association Override Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAssociationOverrideImpl()
-		 * @generated
-		 */
-		public static final EClass XML_ASSOCIATION_OVERRIDE_IMPL = eINSTANCE.getXmlAssociationOverrideImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride <em>Xml Attribute Override</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlAttributeOverride
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAttributeOverride()
-		 * @generated
-		 */
-		public static final EClass XML_ATTRIBUTE_OVERRIDE = eINSTANCE.getXmlAttributeOverride();
-
-		/**
-		 * The meta object literal for the '<em><b>Column</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ATTRIBUTE_OVERRIDE__COLUMN = eINSTANCE.getXmlAttributeOverride_Column();
-
-		/**
-		 * 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_ATTRIBUTE_OVERRIDE__NAME = eINSTANCE.getXmlAttributeOverride_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverrideImpl <em>Xml Attribute Override Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlAttributeOverrideImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAttributeOverrideImpl()
-		 * @generated
-		 */
-		public static final EClass XML_ATTRIBUTE_OVERRIDE_IMPL = eINSTANCE.getXmlAttributeOverrideImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.CascadeType <em>Cascade Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.CascadeType
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType()
-		 * @generated
-		 */
-		public static final EClass CASCADE_TYPE = eINSTANCE.getCascadeType();
-
-		/**
-		 * The meta object literal for the '<em><b>Cascade All</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute CASCADE_TYPE__CASCADE_ALL = eINSTANCE.getCascadeType_CascadeAll();
-
-		/**
-		 * The meta object literal for the '<em><b>Cascade Persist</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute CASCADE_TYPE__CASCADE_PERSIST = eINSTANCE.getCascadeType_CascadePersist();
-
-		/**
-		 * The meta object literal for the '<em><b>Cascade Merge</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute CASCADE_TYPE__CASCADE_MERGE = eINSTANCE.getCascadeType_CascadeMerge();
-
-		/**
-		 * The meta object literal for the '<em><b>Cascade Remove</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute CASCADE_TYPE__CASCADE_REMOVE = eINSTANCE.getCascadeType_CascadeRemove();
-
-		/**
-		 * The meta object literal for the '<em><b>Cascade Refresh</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute CASCADE_TYPE__CASCADE_REFRESH = eINSTANCE.getCascadeType_CascadeRefresh();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.CascadeTypeImpl <em>Cascade Type Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.CascadeTypeImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeTypeImpl()
-		 * @generated
-		 */
-		public static final EClass CASCADE_TYPE_IMPL = eINSTANCE.getCascadeTypeImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedColumn <em>Xml Named Column</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlNamedColumn
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlNamedColumn()
-		 * @generated
-		 */
-		public static final EClass XML_NAMED_COLUMN = eINSTANCE.getXmlNamedColumn();
-
-		/**
-		 * The meta object literal for the '<em><b>Column Definition</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_NAMED_COLUMN__COLUMN_DEFINITION = eINSTANCE.getXmlNamedColumn_ColumnDefinition();
-
-		/**
-		 * 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_COLUMN__NAME = eINSTANCE.getXmlNamedColumn_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlNamedColumn <em>Abstract Xml Named Column</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlNamedColumn
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractXmlNamedColumn()
-		 * @generated
-		 */
-		public static final EClass ABSTRACT_XML_NAMED_COLUMN = eINSTANCE.getAbstractXmlNamedColumn();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn <em>Xml Abstract Column</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlAbstractColumn
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAbstractColumn()
-		 * @generated
-		 */
-		public static final EClass XML_ABSTRACT_COLUMN = eINSTANCE.getXmlAbstractColumn();
-
-		/**
-		 * The meta object literal for the '<em><b>Insertable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ABSTRACT_COLUMN__INSERTABLE = eINSTANCE.getXmlAbstractColumn_Insertable();
-
-		/**
-		 * The meta object literal for the '<em><b>Nullable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ABSTRACT_COLUMN__NULLABLE = eINSTANCE.getXmlAbstractColumn_Nullable();
-
-		/**
-		 * The meta object literal for the '<em><b>Table</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ABSTRACT_COLUMN__TABLE = eINSTANCE.getXmlAbstractColumn_Table();
-
-		/**
-		 * The meta object literal for the '<em><b>Unique</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ABSTRACT_COLUMN__UNIQUE = eINSTANCE.getXmlAbstractColumn_Unique();
-
-		/**
-		 * The meta object literal for the '<em><b>Updatable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ABSTRACT_COLUMN__UPDATABLE = eINSTANCE.getXmlAbstractColumn_Updatable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlAbstractColumn <em>Abstract Xml Abstract Column</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlAbstractColumn
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractXmlAbstractColumn()
-		 * @generated
-		 */
-		public static final EClass ABSTRACT_XML_ABSTRACT_COLUMN = eINSTANCE.getAbstractXmlAbstractColumn();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlColumn <em>Xml Column</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlColumn
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlColumn()
-		 * @generated
-		 */
-		public static final EClass XML_COLUMN = eINSTANCE.getXmlColumn();
-
-		/**
-		 * The meta object literal for the '<em><b>Length</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_COLUMN__LENGTH = eINSTANCE.getXmlColumn_Length();
-
-		/**
-		 * The meta object literal for the '<em><b>Precision</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_COLUMN__PRECISION = eINSTANCE.getXmlColumn_Precision();
-
-		/**
-		 * The meta object literal for the '<em><b>Scale</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_COLUMN__SCALE = eINSTANCE.getXmlColumn_Scale();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlColumnImpl <em>Xml Column Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlColumnImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlColumnImpl()
-		 * @generated
-		 */
-		public static final EClass XML_COLUMN_IMPL = eINSTANCE.getXmlColumnImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.ColumnResult <em>Column Result</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.ColumnResult
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnResult()
-		 * @generated
-		 */
-		public static final EClass COLUMN_RESULT = eINSTANCE.getColumnResult();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute COLUMN_RESULT__NAME = eINSTANCE.getColumnResult_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn <em>Xml Discriminator Column</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlDiscriminatorColumn()
-		 * @generated
-		 */
-		public static final EClass XML_DISCRIMINATOR_COLUMN = eINSTANCE.getXmlDiscriminatorColumn();
-
-		/**
-		 * The meta object literal for the '<em><b>Discriminator Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_DISCRIMINATOR_COLUMN__DISCRIMINATOR_TYPE = eINSTANCE.getXmlDiscriminatorColumn_DiscriminatorType();
-
-		/**
-		 * The meta object literal for the '<em><b>Length</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_DISCRIMINATOR_COLUMN__LENGTH = eINSTANCE.getXmlDiscriminatorColumn_Length();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.EntityListeners <em>Entity Listeners</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.EntityListeners
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListeners()
-		 * @generated
-		 */
-		public static final EClass ENTITY_LISTENERS = eINSTANCE.getEntityListeners();
-
-		/**
-		 * The meta object literal for the '<em><b>Entity Listeners</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ENTITY_LISTENERS__ENTITY_LISTENERS = eINSTANCE.getEntityListeners_EntityListeners();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.EntityListener <em>Entity Listener</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.EntityListener
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener()
-		 * @generated
-		 */
-		public static final EClass ENTITY_LISTENER = eINSTANCE.getEntityListener();
-
-		/**
-		 * 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 ENTITY_LISTENER__CLASS_NAME = eINSTANCE.getEntityListener_ClassName();
-
-		/**
-		 * The meta object literal for the '<em><b>Pre Persist</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ENTITY_LISTENER__PRE_PERSIST = eINSTANCE.getEntityListener_PrePersist();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Persist</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ENTITY_LISTENER__POST_PERSIST = eINSTANCE.getEntityListener_PostPersist();
-
-		/**
-		 * The meta object literal for the '<em><b>Pre Remove</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ENTITY_LISTENER__PRE_REMOVE = eINSTANCE.getEntityListener_PreRemove();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Remove</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ENTITY_LISTENER__POST_REMOVE = eINSTANCE.getEntityListener_PostRemove();
-
-		/**
-		 * The meta object literal for the '<em><b>Pre Update</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ENTITY_LISTENER__PRE_UPDATE = eINSTANCE.getEntityListener_PreUpdate();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Update</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ENTITY_LISTENER__POST_UPDATE = eINSTANCE.getEntityListener_PostUpdate();
-
-		/**
-		 * The meta object literal for the '<em><b>Post Load</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ENTITY_LISTENER__POST_LOAD = eINSTANCE.getEntityListener_PostLoad();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.EntityResult <em>Entity Result</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.EntityResult
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityResult()
-		 * @generated
-		 */
-		public static final EClass ENTITY_RESULT = eINSTANCE.getEntityResult();
-
-		/**
-		 * The meta object literal for the '<em><b>Discriminator Column</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute ENTITY_RESULT__DISCRIMINATOR_COLUMN = eINSTANCE.getEntityResult_DiscriminatorColumn();
-
-		/**
-		 * The meta object literal for the '<em><b>Entity Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute ENTITY_RESULT__ENTITY_CLASS = eINSTANCE.getEntityResult_EntityClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Field Results</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ENTITY_RESULT__FIELD_RESULTS = eINSTANCE.getEntityResult_FieldResults();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.FieldResult <em>Field Result</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.FieldResult
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getFieldResult()
-		 * @generated
-		 */
-		public static final EClass FIELD_RESULT = eINSTANCE.getFieldResult();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute FIELD_RESULT__NAME = eINSTANCE.getFieldResult_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Column</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute FIELD_RESULT__COLUMN = eINSTANCE.getFieldResult_Column();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValue <em>Xml Generated Value</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlGeneratedValue
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGeneratedValue()
-		 * @generated
-		 */
-		public static final EClass XML_GENERATED_VALUE = eINSTANCE.getXmlGeneratedValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Generator</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_GENERATED_VALUE__GENERATOR = eINSTANCE.getXmlGeneratedValue_Generator();
-
-		/**
-		 * The meta object literal for the '<em><b>Strategy</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_GENERATED_VALUE__STRATEGY = eINSTANCE.getXmlGeneratedValue_Strategy();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValueImpl <em>Xml Generated Value Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlGeneratedValueImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGeneratedValueImpl()
-		 * @generated
-		 */
-		public static final EClass XML_GENERATED_VALUE_IMPL = eINSTANCE.getXmlGeneratedValueImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlIdClass <em>Xml Id Class</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlIdClass
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlIdClass()
-		 * @generated
-		 */
-		public static final EClass XML_ID_CLASS = eINSTANCE.getXmlIdClass();
-
-		/**
-		 * 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_ID_CLASS__CLASS_NAME = eINSTANCE.getXmlIdClass_ClassName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.Inheritance <em>Inheritance</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.Inheritance
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getInheritance()
-		 * @generated
-		 */
-		public static final EClass INHERITANCE = eINSTANCE.getInheritance();
-
-		/**
-		 * The meta object literal for the '<em><b>Strategy</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute INHERITANCE__STRATEGY = eINSTANCE.getInheritance_Strategy();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn <em>Xml Join Column</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlJoinColumn
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinColumn()
-		 * @generated
-		 */
-		public static final EClass XML_JOIN_COLUMN = eINSTANCE.getXmlJoinColumn();
-
-		/**
-		 * The meta object literal for the '<em><b>Referenced Column Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_JOIN_COLUMN__REFERENCED_COLUMN_NAME = eINSTANCE.getXmlJoinColumn_ReferencedColumnName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlJoinColumnImpl <em>Xml Join Column Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlJoinColumnImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinColumnImpl()
-		 * @generated
-		 */
-		public static final EClass XML_JOIN_COLUMN_IMPL = eINSTANCE.getXmlJoinColumnImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlJoinTable <em>Xml Join Table</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlJoinTable
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinTable()
-		 * @generated
-		 */
-		public static final EClass XML_JOIN_TABLE = eINSTANCE.getXmlJoinTable();
-
-		/**
-		 * The meta object literal for the '<em><b>Join Columns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_JOIN_TABLE__JOIN_COLUMNS = eINSTANCE.getXmlJoinTable_JoinColumns();
-
-		/**
-		 * The meta object literal for the '<em><b>Inverse Join Columns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_JOIN_TABLE__INVERSE_JOIN_COLUMNS = eINSTANCE.getXmlJoinTable_InverseJoinColumns();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlJoinTableImpl <em>Xml Join Table Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlJoinTableImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinTableImpl()
-		 * @generated
-		 */
-		public static final EClass XML_JOIN_TABLE_IMPL = eINSTANCE.getXmlJoinTableImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.Lob <em>Lob</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.Lob
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getLob()
-		 * @generated
-		 */
-		public static final EClass LOB = eINSTANCE.getLob();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.MapKey <em>Map Key</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.MapKey
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMapKey()
-		 * @generated
-		 */
-		public static final EClass MAP_KEY = eINSTANCE.getMapKey();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute MAP_KEY__NAME = eINSTANCE.getMapKey_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.MapKeyImpl <em>Map Key Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.MapKeyImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMapKeyImpl()
-		 * @generated
-		 */
-		public static final EClass MAP_KEY_IMPL = eINSTANCE.getMapKeyImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlQuery <em>Xml Query</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlQuery
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlQuery()
-		 * @generated
-		 */
-		public static final EClass XML_QUERY = eINSTANCE.getXmlQuery();
-
-		/**
-		 * 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_QUERY__NAME = eINSTANCE.getXmlQuery_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Query</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_QUERY__QUERY = eINSTANCE.getXmlQuery_Query();
-
-		/**
-		 * 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_QUERY__HINTS = eINSTANCE.getXmlQuery_Hints();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery <em>Xml Named Native Query</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlNamedNativeQuery()
-		 * @generated
-		 */
-		public static final EClass XML_NAMED_NATIVE_QUERY = eINSTANCE.getXmlNamedNativeQuery();
-
-		/**
-		 * 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_NATIVE_QUERY__RESULT_CLASS = eINSTANCE.getXmlNamedNativeQuery_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_NATIVE_QUERY__RESULT_SET_MAPPING = eINSTANCE.getXmlNamedNativeQuery_ResultSetMapping();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedQuery <em>Xml Named Query</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlNamedQuery
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlNamedQuery()
-		 * @generated
-		 */
-		public static final EClass XML_NAMED_QUERY = eINSTANCE.getXmlNamedQuery();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.EventMethod <em>Event Method</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.EventMethod
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEventMethod()
-		 * @generated
-		 */
-		public static final EClass EVENT_METHOD = eINSTANCE.getEventMethod();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute EVENT_METHOD__METHOD_NAME = eINSTANCE.getEventMethod_MethodName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.PostLoad <em>Post Load</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.PostLoad
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostLoad()
-		 * @generated
-		 */
-		public static final EClass POST_LOAD = eINSTANCE.getPostLoad();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.PostPersist <em>Post Persist</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.PostPersist
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostPersist()
-		 * @generated
-		 */
-		public static final EClass POST_PERSIST = eINSTANCE.getPostPersist();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.PostRemove <em>Post Remove</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.PostRemove
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostRemove()
-		 * @generated
-		 */
-		public static final EClass POST_REMOVE = eINSTANCE.getPostRemove();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.PostUpdate <em>Post Update</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.PostUpdate
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostUpdate()
-		 * @generated
-		 */
-		public static final EClass POST_UPDATE = eINSTANCE.getPostUpdate();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.PrePersist <em>Pre Persist</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.PrePersist
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPrePersist()
-		 * @generated
-		 */
-		public static final EClass PRE_PERSIST = eINSTANCE.getPrePersist();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.PreRemove <em>Pre Remove</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.PreRemove
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPreRemove()
-		 * @generated
-		 */
-		public static final EClass PRE_REMOVE = eINSTANCE.getPreRemove();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.PreUpdate <em>Pre Update</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.PreUpdate
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPreUpdate()
-		 * @generated
-		 */
-		public static final EClass PRE_UPDATE = eINSTANCE.getPreUpdate();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn <em>Xml Primary Key Join Column</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPrimaryKeyJoinColumn()
-		 * @generated
-		 */
-		public static final EClass XML_PRIMARY_KEY_JOIN_COLUMN = eINSTANCE.getXmlPrimaryKeyJoinColumn();
-
-		/**
-		 * The meta object literal for the '<em><b>Referenced Column Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PRIMARY_KEY_JOIN_COLUMN__REFERENCED_COLUMN_NAME = eINSTANCE.getXmlPrimaryKeyJoinColumn_ReferencedColumnName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumnImpl <em>Xml Primary Key Join Column Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumnImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPrimaryKeyJoinColumnImpl()
-		 * @generated
-		 */
-		public static final EClass XML_PRIMARY_KEY_JOIN_COLUMN_IMPL = eINSTANCE.getXmlPrimaryKeyJoinColumnImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint <em>Xml Query Hint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlQueryHint
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlQueryHint()
-		 * @generated
-		 */
-		public static final EClass XML_QUERY_HINT = eINSTANCE.getXmlQueryHint();
-
-		/**
-		 * 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_QUERY_HINT__NAME = eINSTANCE.getXmlQueryHint_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_QUERY_HINT__VALUE = eINSTANCE.getXmlQueryHint_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlBaseTable <em>Abstract Xml Base Table</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.AbstractXmlBaseTable
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractXmlBaseTable()
-		 * @generated
-		 */
-		public static final EClass ABSTRACT_XML_BASE_TABLE = eINSTANCE.getAbstractXmlBaseTable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlBaseTable <em>Xml Base Table</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlBaseTable
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBaseTable()
-		 * @generated
-		 */
-		public static final EClass XML_BASE_TABLE = eINSTANCE.getXmlBaseTable();
-
-		/**
-		 * 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_BASE_TABLE__NAME = eINSTANCE.getXmlBaseTable_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Catalog</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_BASE_TABLE__CATALOG = eINSTANCE.getXmlBaseTable_Catalog();
-
-		/**
-		 * The meta object literal for the '<em><b>Schema</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_BASE_TABLE__SCHEMA = eINSTANCE.getXmlBaseTable_Schema();
-
-		/**
-		 * The meta object literal for the '<em><b>Unique Constraints</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_BASE_TABLE__UNIQUE_CONSTRAINTS = eINSTANCE.getXmlBaseTable_UniqueConstraints();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlTable <em>Xml Table</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlTable
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTable()
-		 * @generated
-		 */
-		public static final EClass XML_TABLE = eINSTANCE.getXmlTable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTable <em>Xml Secondary Table</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlSecondaryTable
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSecondaryTable()
-		 * @generated
-		 */
-		public static final EClass XML_SECONDARY_TABLE = eINSTANCE.getXmlSecondaryTable();
-
-		/**
-		 * The meta object literal for the '<em><b>Primary Key Join Columns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS = eINSTANCE.getXmlSecondaryTable_PrimaryKeyJoinColumns();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTableImpl <em>Xml Secondary Table Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlSecondaryTableImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSecondaryTableImpl()
-		 * @generated
-		 */
-		public static final EClass XML_SECONDARY_TABLE_IMPL = eINSTANCE.getXmlSecondaryTableImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlGenerator <em>Xml Generator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlGenerator
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGenerator()
-		 * @generated
-		 */
-		public static final EClass XML_GENERATOR = eINSTANCE.getXmlGenerator();
-
-		/**
-		 * 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_GENERATOR__NAME = eINSTANCE.getXmlGenerator_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Initial Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_GENERATOR__INITIAL_VALUE = eINSTANCE.getXmlGenerator_InitialValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Allocation Size</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_GENERATOR__ALLOCATION_SIZE = eINSTANCE.getXmlGenerator_AllocationSize();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator <em>Xml Sequence Generator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSequenceGenerator()
-		 * @generated
-		 */
-		public static final EClass XML_SEQUENCE_GENERATOR = eINSTANCE.getXmlSequenceGenerator();
-
-		/**
-		 * The meta object literal for the '<em><b>Sequence Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_SEQUENCE_GENERATOR__SEQUENCE_NAME = eINSTANCE.getXmlSequenceGenerator_SequenceName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGeneratorImpl <em>Xml Sequence Generator Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlSequenceGeneratorImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSequenceGeneratorImpl()
-		 * @generated
-		 */
-		public static final EClass XML_SEQUENCE_GENERATOR_IMPL = eINSTANCE.getXmlSequenceGeneratorImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.SqlResultSetMapping
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSqlResultSetMapping()
-		 * @generated
-		 */
-		public static final EClass SQL_RESULT_SET_MAPPING = eINSTANCE.getSqlResultSetMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute SQL_RESULT_SET_MAPPING__NAME = eINSTANCE.getSqlResultSetMapping_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Entity Results</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference SQL_RESULT_SET_MAPPING__ENTITY_RESULTS = eINSTANCE.getSqlResultSetMapping_EntityResults();
-
-		/**
-		 * The meta object literal for the '<em><b>Column Results</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference SQL_RESULT_SET_MAPPING__COLUMN_RESULTS = eINSTANCE.getSqlResultSetMapping_ColumnResults();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator <em>Xml Table Generator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator()
-		 * @generated
-		 */
-		public static final EClass XML_TABLE_GENERATOR = eINSTANCE.getXmlTableGenerator();
-
-		/**
-		 * The meta object literal for the '<em><b>Table</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TABLE_GENERATOR__TABLE = eINSTANCE.getXmlTableGenerator_Table();
-
-		/**
-		 * The meta object literal for the '<em><b>Catalog</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TABLE_GENERATOR__CATALOG = eINSTANCE.getXmlTableGenerator_Catalog();
-
-		/**
-		 * The meta object literal for the '<em><b>Schema</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TABLE_GENERATOR__SCHEMA = eINSTANCE.getXmlTableGenerator_Schema();
-
-		/**
-		 * The meta object literal for the '<em><b>Pk Column Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TABLE_GENERATOR__PK_COLUMN_NAME = eINSTANCE.getXmlTableGenerator_PkColumnName();
-
-		/**
-		 * The meta object literal for the '<em><b>Value Column Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TABLE_GENERATOR__VALUE_COLUMN_NAME = eINSTANCE.getXmlTableGenerator_ValueColumnName();
-
-		/**
-		 * The meta object literal for the '<em><b>Pk Column Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TABLE_GENERATOR__PK_COLUMN_VALUE = eINSTANCE.getXmlTableGenerator_PkColumnValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Unique Constraints</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_TABLE_GENERATOR__UNIQUE_CONSTRAINTS = eINSTANCE.getXmlTableGenerator_UniqueConstraints();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGeneratorImpl <em>Xml Table Generator Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlTableGeneratorImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGeneratorImpl()
-		 * @generated
-		 */
-		public static final EClass XML_TABLE_GENERATOR_IMPL = eINSTANCE.getXmlTableGeneratorImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint <em>Xml Unique Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlUniqueConstraint()
-		 * @generated
-		 */
-		public static final EClass XML_UNIQUE_CONSTRAINT = eINSTANCE.getXmlUniqueConstraint();
-
-		/**
-		 * The meta object literal for the '<em><b>Column Names</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_UNIQUE_CONSTRAINT__COLUMN_NAMES = eINSTANCE.getXmlUniqueConstraint_ColumnNames();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlUniqueConstraintImpl <em>Xml Unique Constraint Impl</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.XmlUniqueConstraintImpl
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlUniqueConstraintImpl()
-		 * @generated
-		 */
-		public static final EClass XML_UNIQUE_CONSTRAINT_IMPL = eINSTANCE.getXmlUniqueConstraintImpl();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.AccessType <em>Access Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.AccessType
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAccessType()
-		 * @generated
-		 */
-		public static final EEnum ACCESS_TYPE = eINSTANCE.getAccessType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.DiscriminatorType <em>Discriminator Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.DiscriminatorType
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorType()
-		 * @generated
-		 */
-		public static final EEnum DISCRIMINATOR_TYPE = eINSTANCE.getDiscriminatorType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.EnumType <em>Enum Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.EnumType
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEnumType()
-		 * @generated
-		 */
-		public static final EEnum ENUM_TYPE = eINSTANCE.getEnumType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.FetchType <em>Fetch Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.FetchType
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getFetchType()
-		 * @generated
-		 */
-		public static final EEnum FETCH_TYPE = eINSTANCE.getFetchType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.GenerationType <em>Generation Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.GenerationType
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerationType()
-		 * @generated
-		 */
-		public static final EEnum GENERATION_TYPE = eINSTANCE.getGenerationType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.InheritanceType <em>Inheritance Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.InheritanceType
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getInheritanceType()
-		 * @generated
-		 */
-		public static final EEnum INHERITANCE_TYPE = eINSTANCE.getInheritanceType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.TemporalType <em>Temporal Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.orm.TemporalType
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTemporalType()
-		 * @generated
-		 */
-		public static final EEnum TEMPORAL_TYPE = eINSTANCE.getTemporalType();
-
-		/**
-		 * The meta object literal for the '<em>Discriminator Value</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorValue()
-		 * @generated
-		 */
-		public static final EDataType DISCRIMINATOR_VALUE = eINSTANCE.getDiscriminatorValue();
-
-		/**
-		 * The meta object literal for the '<em>Enumerated</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.common.util.Enumerator
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEnumerated()
-		 * @generated
-		 */
-		public static final EDataType ENUMERATED = eINSTANCE.getEnumerated();
-
-		/**
-		 * The meta object literal for the '<em>Order By</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOrderBy()
-		 * @generated
-		 */
-		public static final EDataType ORDER_BY = eINSTANCE.getOrderBy();
-
-		/**
-		 * The meta object literal for the '<em>Version Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getVersionType()
-		 * @generated
-		 */
-		public static final EDataType VERSION_TYPE = eINSTANCE.getVersionType();
-
-	}
-
-} //OrmPackage
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResource.java
deleted file mode 100644
index af0199ce33..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResource.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.core.resource.orm;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jpt.core.internal.resource.orm.translators.EntityMappingsTranslator;
-import org.eclipse.jpt.core.resource.common.JpaXmlResource;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmResource extends JpaXmlResource 
-{
-	public OrmResource(Renderer aRenderer) {
-		super(aRenderer);
-	}
-
-	public OrmResource(URI uri, Renderer aRenderer) {
-		super(uri, aRenderer);
-	}
-	
-	public Translator getRootTranslator() {
-		return EntityMappingsTranslator.INSTANCE;
-	}
-	
-	@Override
-	public void javaElementChanged(ElementChangedEvent event) {
-		// TODO
-	}
-	
-	@Override
-	public void updateFromResource() {
-		// TODO
-	}
-	
-	public XmlEntityMappings getEntityMappings() {
-		return (XmlEntityMappings) getRootObject();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResourceFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResourceFactory.java
deleted file mode 100644
index 5f7e951c9f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResourceFactory.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.core.resource.orm;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceFactory;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- */
-public class OrmResourceFactory extends TranslatorResourceFactory
-{
-	public OrmResourceFactory() {
-		this(RendererFactory.getDefaultRendererFactory());
-	}
-	
-	public OrmResourceFactory(RendererFactory aRendererFactory) {
-		super(aRendererFactory);
-	}
-	
-	public OrmResourceFactory(RendererFactory aRendererFactory, boolean listeningForUpdates) {
-		super(aRendererFactory, listeningForUpdates);
-	}
-	
-	
-	/**
-	 * @see TranslatorResourceFactory#createResource(URI, Renderer)
-	 */
-	@Override
-	protected TranslatorResource createResource(URI uri, Renderer renderer) {
-		return new OrmResource(uri, renderer);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResourceModel.java
deleted file mode 100644
index 6f2c9ff02a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResourceModel.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.core.resource.orm;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jpt.core.ResourceModel;
-import org.eclipse.jpt.core.resource.common.JpaXmlResourceModel;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 OrmResourceModel extends JpaXmlResourceModel
-{
-	public OrmResourceModel(IFile file) {
-		super(file);
-	}
-	
-	
-	/**
-	 * @see ResourceModel#getResourceType()
-	 */
-	public String getResourceType() {
-		return ResourceModel.ORM_RESOURCE_TYPE;
-	}
-	
-	@Override
-	protected OrmArtifactEdit buildArtifactEdit(IProject project) {
-		return OrmArtifactEdit.getArtifactEditForRead(project);
-	}
-	
-	@Override
-	public OrmResource getResource() {
-		return (OrmResource) super.getResource();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostLoad.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostLoad.java
deleted file mode 100644
index 98419a3518..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostLoad.java
+++ /dev/null
@@ -1,53 +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.core.resource.orm;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Post Load</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.core.resource.orm.OrmPackage#getPostLoad()
- * @model kind="class"
- * @generated
- */
-public class PostLoad extends EventMethod
-{
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PostLoad()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.POST_LOAD;
-	}
-
-} // PostLoad
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostPersist.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostPersist.java
deleted file mode 100644
index 55ac8f00bc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostPersist.java
+++ /dev/null
@@ -1,53 +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.core.resource.orm;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Post Persist</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.core.resource.orm.OrmPackage#getPostPersist()
- * @model kind="class"
- * @generated
- */
-public class PostPersist extends EventMethod
-{
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PostPersist()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.POST_PERSIST;
-	}
-
-} // PostPersist
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostRemove.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostRemove.java
deleted file mode 100644
index d9a68a060d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostRemove.java
+++ /dev/null
@@ -1,53 +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.core.resource.orm;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Post Remove</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.core.resource.orm.OrmPackage#getPostRemove()
- * @model kind="class"
- * @generated
- */
-public class PostRemove extends EventMethod
-{
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PostRemove()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.POST_REMOVE;
-	}
-
-} // PostRemove
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostUpdate.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostUpdate.java
deleted file mode 100644
index cbd617e8cc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostUpdate.java
+++ /dev/null
@@ -1,53 +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.core.resource.orm;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Post Update</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.core.resource.orm.OrmPackage#getPostUpdate()
- * @model kind="class"
- * @generated
- */
-public class PostUpdate extends EventMethod
-{
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PostUpdate()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.POST_UPDATE;
-	}
-
-} // PostUpdate
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PrePersist.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PrePersist.java
deleted file mode 100644
index 461caecf78..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PrePersist.java
+++ /dev/null
@@ -1,53 +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.core.resource.orm;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Pre Persist</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.core.resource.orm.OrmPackage#getPrePersist()
- * @model kind="class"
- * @generated
- */
-public class PrePersist extends EventMethod
-{
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PrePersist()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.PRE_PERSIST;
-	}
-
-} // PrePersist
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PreRemove.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PreRemove.java
deleted file mode 100644
index 810358352b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PreRemove.java
+++ /dev/null
@@ -1,53 +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.core.resource.orm;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Pre Remove</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.core.resource.orm.OrmPackage#getPreRemove()
- * @model kind="class"
- * @generated
- */
-public class PreRemove extends EventMethod
-{
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PreRemove()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.PRE_REMOVE;
-	}
-
-} // PreRemove
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PreUpdate.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PreUpdate.java
deleted file mode 100644
index 01cdff5a0d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PreUpdate.java
+++ /dev/null
@@ -1,53 +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.core.resource.orm;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Pre Update</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.core.resource.orm.OrmPackage#getPreUpdate()
- * @model kind="class"
- * @generated
- */
-public class PreUpdate extends EventMethod
-{
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PreUpdate()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.PRE_UPDATE;
-	}
-
-} // PreUpdate
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/SqlResultSetMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/SqlResultSetMapping.java
deleted file mode 100644
index 33bc163750..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/SqlResultSetMapping.java
+++ /dev/null
@@ -1,317 +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.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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Sql Result Set Mapping</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getEntityResults <em>Entity Results</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getColumnResults <em>Column Results</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSqlResultSetMapping()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class SqlResultSetMapping 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 cached value of the '{@link #getEntityResults() <em>Entity Results</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEntityResults()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<EntityResult> entityResults;
-
-	/**
-	 * The cached value of the '{@link #getColumnResults() <em>Column Results</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getColumnResults()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<ColumnResult> columnResults;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SqlResultSetMapping()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.SQL_RESULT_SET_MAPPING;
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getSqlResultSetMapping_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#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, OrmPackage.SQL_RESULT_SET_MAPPING__NAME, oldName, name));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Entity Results</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.EntityResult}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Entity Results</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>Entity Results</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSqlResultSetMapping_EntityResults()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<EntityResult> getEntityResults()
-	{
-		if (entityResults == null)
-		{
-			entityResults = new EObjectContainmentEList<EntityResult>(EntityResult.class, this, OrmPackage.SQL_RESULT_SET_MAPPING__ENTITY_RESULTS);
-		}
-		return entityResults;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Column Results</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.ColumnResult}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Column Results</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>Column Results</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSqlResultSetMapping_ColumnResults()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<ColumnResult> getColumnResults()
-	{
-		if (columnResults == null)
-		{
-			columnResults = new EObjectContainmentEList<ColumnResult>(ColumnResult.class, this, OrmPackage.SQL_RESULT_SET_MAPPING__COLUMN_RESULTS);
-		}
-		return columnResults;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.SQL_RESULT_SET_MAPPING__ENTITY_RESULTS:
-				return ((InternalEList<?>)getEntityResults()).basicRemove(otherEnd, msgs);
-			case OrmPackage.SQL_RESULT_SET_MAPPING__COLUMN_RESULTS:
-				return ((InternalEList<?>)getColumnResults()).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 OrmPackage.SQL_RESULT_SET_MAPPING__NAME:
-				return getName();
-			case OrmPackage.SQL_RESULT_SET_MAPPING__ENTITY_RESULTS:
-				return getEntityResults();
-			case OrmPackage.SQL_RESULT_SET_MAPPING__COLUMN_RESULTS:
-				return getColumnResults();
-		}
-		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 OrmPackage.SQL_RESULT_SET_MAPPING__NAME:
-				setName((String)newValue);
-				return;
-			case OrmPackage.SQL_RESULT_SET_MAPPING__ENTITY_RESULTS:
-				getEntityResults().clear();
-				getEntityResults().addAll((Collection<? extends EntityResult>)newValue);
-				return;
-			case OrmPackage.SQL_RESULT_SET_MAPPING__COLUMN_RESULTS:
-				getColumnResults().clear();
-				getColumnResults().addAll((Collection<? extends ColumnResult>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.SQL_RESULT_SET_MAPPING__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case OrmPackage.SQL_RESULT_SET_MAPPING__ENTITY_RESULTS:
-				getEntityResults().clear();
-				return;
-			case OrmPackage.SQL_RESULT_SET_MAPPING__COLUMN_RESULTS:
-				getColumnResults().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.SQL_RESULT_SET_MAPPING__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case OrmPackage.SQL_RESULT_SET_MAPPING__ENTITY_RESULTS:
-				return entityResults != null && !entityResults.isEmpty();
-			case OrmPackage.SQL_RESULT_SET_MAPPING__COLUMN_RESULTS:
-				return columnResults != null && !columnResults.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} // SqlResultSetMapping
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/TemporalType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/TemporalType.java
deleted file mode 100644
index 7b9b8dd6d0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/TemporalType.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.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>Temporal 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.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTemporalType()
- * @model
- * @generated
- */
-public enum TemporalType implements Enumerator
-{
-	/**
-	 * The '<em><b>DATE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DATE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	DATE(0, "DATE", "DATE"),
-
-	/**
-	 * The '<em><b>TIME</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #TIME_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	TIME(1, "TIME", "TIME"),
-
-	/**
-	 * The '<em><b>TIMESTAMP</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #TIMESTAMP_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	TIMESTAMP(2, "TIMESTAMP", "TIMESTAMP");
-
-	/**
-	 * The '<em><b>DATE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>DATE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DATE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DATE_VALUE = 0;
-
-	/**
-	 * The '<em><b>TIME</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>TIME</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TIME
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TIME_VALUE = 1;
-
-	/**
-	 * The '<em><b>TIMESTAMP</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>TIMESTAMP</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TIMESTAMP
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TIMESTAMP_VALUE = 2;
-
-	/**
-	 * An array of all the '<em><b>Temporal Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final TemporalType[] VALUES_ARRAY =
-		new TemporalType[]
-		{
-			DATE,
-			TIME,
-			TIMESTAMP,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Temporal Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<TemporalType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Temporal Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TemporalType get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			TemporalType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Temporal Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TemporalType getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			TemporalType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Temporal Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TemporalType get(int value)
-	{
-		switch (value)
-		{
-			case DATE_VALUE: return DATE;
-			case TIME_VALUE: return TIME;
-			case TIMESTAMP_VALUE: return TIMESTAMP;
-		}
-		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 TemporalType(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;
-	}
-	
-} //TemporalType
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAbstractColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAbstractColumn.java
deleted file mode 100644
index c4b269ea22..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAbstractColumn.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.core.resource.orm;
-
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Column</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.core.resource.orm.XmlAbstractColumn#getInsertable <em>Insertable</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getNullable <em>Nullable</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getUnique <em>Unique</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getUpdatable <em>Updatable</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAbstractColumn()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlAbstractColumn extends XmlNamedColumn
-{
-	/**
-	 * Returns the value of the '<em><b>Insertable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Insertable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Insertable</em>' attribute.
-	 * @see #setInsertable(Boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAbstractColumn_Insertable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getInsertable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getInsertable <em>Insertable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Insertable</em>' attribute.
-	 * @see #getInsertable()
-	 * @generated
-	 */
-	void setInsertable(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Nullable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Nullable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Nullable</em>' attribute.
-	 * @see #setNullable(Boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAbstractColumn_Nullable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getNullable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getNullable <em>Nullable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Nullable</em>' attribute.
-	 * @see #getNullable()
-	 * @generated
-	 */
-	void setNullable(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Table</em>' attribute.
-	 * @see #setTable(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAbstractColumn_Table()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getTable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getTable <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Table</em>' attribute.
-	 * @see #getTable()
-	 * @generated
-	 */
-	void setTable(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Unique</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Unique</em>' attribute.
-	 * @see #setUnique(Boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAbstractColumn_Unique()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getUnique();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getUnique <em>Unique</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Unique</em>' attribute.
-	 * @see #getUnique()
-	 * @generated
-	 */
-	void setUnique(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Updatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Updatable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Updatable</em>' attribute.
-	 * @see #setUpdatable(Boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAbstractColumn_Updatable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getUpdatable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getUpdatable <em>Updatable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Updatable</em>' attribute.
-	 * @see #getUpdatable()
-	 * @generated
-	 */
-	void setUpdatable(Boolean value);
-	
-	/**
-	 * Return the {@link TextRange} for the table attibute.  If the table attibute 
-	 * does not exist return the {@link TextRange} for the *table element.
-	 */
-	TextRange getTableTextRange();
-
-} // AbstractColumn
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAssociationOverride.java
deleted file mode 100644
index b82e5566de..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAssociationOverride.java
+++ /dev/null
@@ -1,83 +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.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Association Override</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.core.resource.orm.XmlAssociationOverride#getJoinColumns <em>Join Columns</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAssociationOverride()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlAssociationOverride extends JpaEObject
-{
-
-	/**
-	 * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join 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>Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAssociationOverride_JoinColumns()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	EList<XmlJoinColumn> getJoinColumns();
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlAssociationOverride_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride#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);
-} // AssociationOverride
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAssociationOverrideImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAssociationOverrideImpl.java
deleted file mode 100644
index f73d00cc8b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAssociationOverrideImpl.java
+++ /dev/null
@@ -1,267 +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.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.common.AbstractJpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Association Override 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.core.resource.orm.OrmPackage#getXmlAssociationOverrideImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlAssociationOverrideImpl extends AbstractJpaEObject implements XmlAssociationOverride
-{
-	/**
-	 * The cached value of the '{@link #getJoinColumns() <em>Join Columns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJoinColumns()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlJoinColumn> joinColumns;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlAssociationOverrideImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_ASSOCIATION_OVERRIDE_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join 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>Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAssociationOverride_JoinColumns()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	public EList<XmlJoinColumn> getJoinColumns()
-	{
-		if (joinColumns == null)
-		{
-			joinColumns = new EObjectContainmentEList<XmlJoinColumn>(XmlJoinColumn.class, this, OrmPackage.XML_ASSOCIATION_OVERRIDE_IMPL__JOIN_COLUMNS);
-		}
-		return joinColumns;
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlAssociationOverride_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideImpl#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, OrmPackage.XML_ASSOCIATION_OVERRIDE_IMPL__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ASSOCIATION_OVERRIDE_IMPL__JOIN_COLUMNS:
-				return ((InternalEList<?>)getJoinColumns()).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 OrmPackage.XML_ASSOCIATION_OVERRIDE_IMPL__JOIN_COLUMNS:
-				return getJoinColumns();
-			case OrmPackage.XML_ASSOCIATION_OVERRIDE_IMPL__NAME:
-				return getName();
-		}
-		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 OrmPackage.XML_ASSOCIATION_OVERRIDE_IMPL__JOIN_COLUMNS:
-				getJoinColumns().clear();
-				getJoinColumns().addAll((Collection<? extends XmlJoinColumn>)newValue);
-				return;
-			case OrmPackage.XML_ASSOCIATION_OVERRIDE_IMPL__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ASSOCIATION_OVERRIDE_IMPL__JOIN_COLUMNS:
-				getJoinColumns().clear();
-				return;
-			case OrmPackage.XML_ASSOCIATION_OVERRIDE_IMPL__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ASSOCIATION_OVERRIDE_IMPL__JOIN_COLUMNS:
-				return joinColumns != null && !joinColumns.isEmpty();
-			case OrmPackage.XML_ASSOCIATION_OVERRIDE_IMPL__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlAssociationOverrideImpl
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAttributeMapping.java
deleted file mode 100644
index 735f4b18cf..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAttributeMapping.java
+++ /dev/null
@@ -1,68 +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.core.resource.orm;
-
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Mapping</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlAttributeMapping#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAttributeMapping()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlAttributeMapping 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.core.resource.orm.OrmPackage#getXmlAttributeMapping_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeMapping#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);
-
-	TextRange getNameTextRange();
-	
-} // AttributeMapping
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAttributeOverride.java
deleted file mode 100644
index de3a886f30..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAttributeOverride.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.core.resource.orm;
-
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Override</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.core.resource.orm.XmlAttributeOverride#getColumn <em>Column</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAttributeOverride()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlAttributeOverride extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Column</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Column</em>' containment reference.
-	 * @see #setColumn(XmlColumn)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAttributeOverride_Column()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	XmlColumn getColumn();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride#getColumn <em>Column</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Column</em>' containment reference.
-	 * @see #getColumn()
-	 * @generated
-	 */
-	void setColumn(XmlColumn value);
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlAttributeOverride_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride#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);
-
-} // AttributeOverride
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAttributeOverrideImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAttributeOverrideImpl.java
deleted file mode 100644
index 38a8354284..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAttributeOverrideImpl.java
+++ /dev/null
@@ -1,292 +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.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.common.AbstractJpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Override</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.core.resource.orm.OrmPackage#getXmlAttributeOverrideImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlAttributeOverrideImpl extends AbstractJpaEObject implements XmlAttributeOverride
-{
-	/**
-	 * The cached value of the '{@link #getColumn() <em>Column</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getColumn()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlColumn column;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlAttributeOverrideImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_ATTRIBUTE_OVERRIDE_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Column</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Column</em>' containment reference.
-	 * @see #setColumn(XmlColumn)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlAttributeOverride_Column()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	public XmlColumn getColumn()
-	{
-		return column;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetColumn(XmlColumn newColumn, NotificationChain msgs)
-	{
-		XmlColumn oldColumn = column;
-		column = newColumn;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ATTRIBUTE_OVERRIDE_IMPL__COLUMN, oldColumn, newColumn);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverrideImpl#getColumn <em>Column</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Column</em>' containment reference.
-	 * @see #getColumn()
-	 * @generated
-	 */
-	public void setColumn(XmlColumn newColumn)
-	{
-		if (newColumn != column)
-		{
-			NotificationChain msgs = null;
-			if (column != null)
-				msgs = ((InternalEObject)column).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ATTRIBUTE_OVERRIDE_IMPL__COLUMN, null, msgs);
-			if (newColumn != null)
-				msgs = ((InternalEObject)newColumn).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ATTRIBUTE_OVERRIDE_IMPL__COLUMN, null, msgs);
-			msgs = basicSetColumn(newColumn, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ATTRIBUTE_OVERRIDE_IMPL__COLUMN, newColumn, newColumn));
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlAttributeOverride_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverrideImpl#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, OrmPackage.XML_ATTRIBUTE_OVERRIDE_IMPL__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ATTRIBUTE_OVERRIDE_IMPL__COLUMN:
-				return basicSetColumn(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 OrmPackage.XML_ATTRIBUTE_OVERRIDE_IMPL__COLUMN:
-				return getColumn();
-			case OrmPackage.XML_ATTRIBUTE_OVERRIDE_IMPL__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ATTRIBUTE_OVERRIDE_IMPL__COLUMN:
-				setColumn((XmlColumn)newValue);
-				return;
-			case OrmPackage.XML_ATTRIBUTE_OVERRIDE_IMPL__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ATTRIBUTE_OVERRIDE_IMPL__COLUMN:
-				setColumn((XmlColumn)null);
-				return;
-			case OrmPackage.XML_ATTRIBUTE_OVERRIDE_IMPL__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ATTRIBUTE_OVERRIDE_IMPL__COLUMN:
-				return column != null;
-			case OrmPackage.XML_ATTRIBUTE_OVERRIDE_IMPL__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} // AttributeOverride
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlBaseTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlBaseTable.java
deleted file mode 100644
index 8db7a67dab..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlBaseTable.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.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Base Table</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlBaseTable#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlBaseTable#getCatalog <em>Catalog</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlBaseTable#getSchema <em>Schema</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlBaseTable#getUniqueConstraints <em>Unique Constraints</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBaseTable()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlBaseTable 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.core.resource.orm.OrmPackage#getXmlBaseTable_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBaseTable#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Catalog</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Catalog</em>' attribute.
-	 * @see #setCatalog(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBaseTable_Catalog()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getCatalog();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBaseTable#getCatalog <em>Catalog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Catalog</em>' attribute.
-	 * @see #getCatalog()
-	 * @generated
-	 */
-	void setCatalog(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Schema</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Schema</em>' attribute.
-	 * @see #setSchema(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBaseTable_Schema()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getSchema();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBaseTable#getSchema <em>Schema</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Schema</em>' attribute.
-	 * @see #getSchema()
-	 * @generated
-	 */
-	void setSchema(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Unique Constraints</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Unique Constraints</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>Unique Constraints</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBaseTable_UniqueConstraints()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlUniqueConstraint> getUniqueConstraints();
-
-	/**
-	 * Return the {@link TextRange} for the name attibute.  If the name attibute 
-	 * does not exist return the {@link TextRange} for the *table element.
-	 */
-	TextRange getNameTextRange();
-	
-	/**
-	 * Return the {@link TextRange} for the schema attibute.  If the schema attibute 
-	 * does not exist return the {@link TextRange} for the *table element.
-	 */
-	TextRange getSchemaTextRange();
-	
-	/**
-	 * Return the {@link TextRange} for the catalog attibute.  If the catalog attibute 
-	 * does not exist return the {@link TextRange} for the *table element.
-	 */
-	TextRange getCatalogTextRange();
-} // XmlBaseTable
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlBasic.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlBasic.java
deleted file mode 100644
index 65138e3be7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlBasic.java
+++ /dev/null
@@ -1,181 +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.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>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.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getFetch <em>Fetch</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getOptional <em>Optional</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlBasic#isLob <em>Lob</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getTemporal <em>Temporal</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getEnumerated <em>Enumerated</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBasic()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlBasic extends XmlAttributeMapping, ColumnMapping
-{
-	/**
-	 * Returns the value of the '<em><b>Fetch</b></em>' attribute.
-	 * The default value is <code>"LAZY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.FetchType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.FetchType
-	 * @see #setFetch(FetchType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBasic_Fetch()
-	 * @model default="LAZY"
-	 * @generated
-	 */
-	FetchType getFetch();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getFetch <em>Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.FetchType
-	 * @see #getFetch()
-	 * @generated
-	 */
-	void setFetch(FetchType value);
-
-	/**
-	 * Returns the value of the '<em><b>Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Optional</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Optional</em>' attribute.
-	 * @see #setOptional(Boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBasic_Optional()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getOptional();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getOptional <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Optional</em>' attribute.
-	 * @see #getOptional()
-	 * @generated
-	 */
-	void setOptional(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Lob</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Lob</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Lob</em>' attribute.
-	 * @see #setLob(boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBasic_Lob()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	boolean isLob();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#isLob <em>Lob</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lob</em>' attribute.
-	 * @see #isLob()
-	 * @generated
-	 */
-	void setLob(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Temporal</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.TemporalType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Temporal</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Temporal</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.TemporalType
-	 * @see #setTemporal(TemporalType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBasic_Temporal()
-	 * @model
-	 * @generated
-	 */
-	TemporalType getTemporal();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getTemporal <em>Temporal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Temporal</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.TemporalType
-	 * @see #getTemporal()
-	 * @generated
-	 */
-	void setTemporal(TemporalType value);
-
-	/**
-	 * Returns the value of the '<em><b>Enumerated</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.EnumType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Enumerated</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Enumerated</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.EnumType
-	 * @see #setEnumerated(EnumType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBasic_Enumerated()
-	 * @model
-	 * @generated
-	 */
-	EnumType getEnumerated();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getEnumerated <em>Enumerated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Enumerated</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.EnumType
-	 * @see #getEnumerated()
-	 * @generated
-	 */
-	void setEnumerated(EnumType value);
-
-} // Basic
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlBasicImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlBasicImpl.java
deleted file mode 100644
index 2d45014b20..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlBasicImpl.java
+++ /dev/null
@@ -1,619 +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.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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Basic 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.core.resource.orm.OrmPackage#getXmlBasicImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlBasicImpl extends AbstractXmlAttributeMapping implements XmlBasic
-{
-	/**
-	 * The cached value of the '{@link #getColumn() <em>Column</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getColumn()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlColumn column;
-
-	/**
-	 * 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 FetchType FETCH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFetch() <em>Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFetch()
-	 * @generated
-	 * @ordered
-	 */
-	protected FetchType fetch = FETCH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOptional() <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOptional()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean OPTIONAL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOptional() <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOptional()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean optional = OPTIONAL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isLob() <em>Lob</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isLob()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean LOB_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isLob() <em>Lob</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isLob()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean lob = LOB_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 TemporalType TEMPORAL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTemporal() <em>Temporal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTemporal()
-	 * @generated
-	 * @ordered
-	 */
-	protected TemporalType temporal = TEMPORAL_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 EnumType ENUMERATED_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEnumerated() <em>Enumerated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnumerated()
-	 * @generated
-	 * @ordered
-	 */
-	protected EnumType enumerated = ENUMERATED_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlBasicImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_BASIC_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Column</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Column</em>' containment reference.
-	 * @see #setColumn(XmlColumn)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnMapping_Column()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlColumn getColumn()
-	{
-		return column;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetColumn(XmlColumn newColumn, NotificationChain msgs)
-	{
-		XmlColumn oldColumn = column;
-		column = newColumn;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_BASIC_IMPL__COLUMN, oldColumn, newColumn);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBasicImpl#getColumn <em>Column</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Column</em>' containment reference.
-	 * @see #getColumn()
-	 * @generated
-	 */
-	public void setColumn(XmlColumn newColumn)
-	{
-		if (newColumn != column)
-		{
-			NotificationChain msgs = null;
-			if (column != null)
-				msgs = ((InternalEObject)column).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_BASIC_IMPL__COLUMN, null, msgs);
-			if (newColumn != null)
-				msgs = ((InternalEObject)newColumn).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_BASIC_IMPL__COLUMN, null, msgs);
-			msgs = basicSetColumn(newColumn, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_BASIC_IMPL__COLUMN, newColumn, newColumn));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Fetch</b></em>' attribute.
-	 * The default value is <code>"LAZY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.FetchType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.FetchType
-	 * @see #setFetch(FetchType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBasic_Fetch()
-	 * @model default="LAZY"
-	 * @generated
-	 */
-	public FetchType getFetch()
-	{
-		return fetch;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBasicImpl#getFetch <em>Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.FetchType
-	 * @see #getFetch()
-	 * @generated
-	 */
-	public void setFetch(FetchType newFetch)
-	{
-		FetchType oldFetch = fetch;
-		fetch = newFetch == null ? FETCH_EDEFAULT : newFetch;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_BASIC_IMPL__FETCH, oldFetch, fetch));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Optional</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Optional</em>' attribute.
-	 * @see #setOptional(Boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBasic_Optional()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getOptional()
-	{
-		return optional;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBasicImpl#getOptional <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Optional</em>' attribute.
-	 * @see #getOptional()
-	 * @generated
-	 */
-	public void setOptional(Boolean newOptional)
-	{
-		Boolean oldOptional = optional;
-		optional = newOptional;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_BASIC_IMPL__OPTIONAL, oldOptional, optional));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Lob</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Lob</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Lob</em>' attribute.
-	 * @see #setLob(boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBasic_Lob()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isLob()
-	{
-		return lob;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBasicImpl#isLob <em>Lob</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lob</em>' attribute.
-	 * @see #isLob()
-	 * @generated
-	 */
-	public void setLob(boolean newLob)
-	{
-		boolean oldLob = lob;
-		lob = newLob;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_BASIC_IMPL__LOB, oldLob, lob));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Temporal</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.TemporalType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Temporal</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Temporal</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.TemporalType
-	 * @see #setTemporal(TemporalType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBasic_Temporal()
-	 * @model
-	 * @generated
-	 */
-	public TemporalType getTemporal()
-	{
-		return temporal;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBasicImpl#getTemporal <em>Temporal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Temporal</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.TemporalType
-	 * @see #getTemporal()
-	 * @generated
-	 */
-	public void setTemporal(TemporalType newTemporal)
-	{
-		TemporalType oldTemporal = temporal;
-		temporal = newTemporal == null ? TEMPORAL_EDEFAULT : newTemporal;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_BASIC_IMPL__TEMPORAL, oldTemporal, temporal));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Enumerated</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.EnumType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Enumerated</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Enumerated</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.EnumType
-	 * @see #setEnumerated(EnumType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlBasic_Enumerated()
-	 * @model
-	 * @generated
-	 */
-	public EnumType getEnumerated()
-	{
-		return enumerated;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBasicImpl#getEnumerated <em>Enumerated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Enumerated</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.EnumType
-	 * @see #getEnumerated()
-	 * @generated
-	 */
-	public void setEnumerated(EnumType newEnumerated)
-	{
-		EnumType oldEnumerated = enumerated;
-		enumerated = newEnumerated == null ? ENUMERATED_EDEFAULT : newEnumerated;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_BASIC_IMPL__ENUMERATED, oldEnumerated, enumerated));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_BASIC_IMPL__COLUMN:
-				return basicSetColumn(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 OrmPackage.XML_BASIC_IMPL__COLUMN:
-				return getColumn();
-			case OrmPackage.XML_BASIC_IMPL__FETCH:
-				return getFetch();
-			case OrmPackage.XML_BASIC_IMPL__OPTIONAL:
-				return getOptional();
-			case OrmPackage.XML_BASIC_IMPL__LOB:
-				return isLob() ? Boolean.TRUE : Boolean.FALSE;
-			case OrmPackage.XML_BASIC_IMPL__TEMPORAL:
-				return getTemporal();
-			case OrmPackage.XML_BASIC_IMPL__ENUMERATED:
-				return getEnumerated();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_BASIC_IMPL__COLUMN:
-				setColumn((XmlColumn)newValue);
-				return;
-			case OrmPackage.XML_BASIC_IMPL__FETCH:
-				setFetch((FetchType)newValue);
-				return;
-			case OrmPackage.XML_BASIC_IMPL__OPTIONAL:
-				setOptional((Boolean)newValue);
-				return;
-			case OrmPackage.XML_BASIC_IMPL__LOB:
-				setLob(((Boolean)newValue).booleanValue());
-				return;
-			case OrmPackage.XML_BASIC_IMPL__TEMPORAL:
-				setTemporal((TemporalType)newValue);
-				return;
-			case OrmPackage.XML_BASIC_IMPL__ENUMERATED:
-				setEnumerated((EnumType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_BASIC_IMPL__COLUMN:
-				setColumn((XmlColumn)null);
-				return;
-			case OrmPackage.XML_BASIC_IMPL__FETCH:
-				setFetch(FETCH_EDEFAULT);
-				return;
-			case OrmPackage.XML_BASIC_IMPL__OPTIONAL:
-				setOptional(OPTIONAL_EDEFAULT);
-				return;
-			case OrmPackage.XML_BASIC_IMPL__LOB:
-				setLob(LOB_EDEFAULT);
-				return;
-			case OrmPackage.XML_BASIC_IMPL__TEMPORAL:
-				setTemporal(TEMPORAL_EDEFAULT);
-				return;
-			case OrmPackage.XML_BASIC_IMPL__ENUMERATED:
-				setEnumerated(ENUMERATED_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_BASIC_IMPL__COLUMN:
-				return column != null;
-			case OrmPackage.XML_BASIC_IMPL__FETCH:
-				return fetch != FETCH_EDEFAULT;
-			case OrmPackage.XML_BASIC_IMPL__OPTIONAL:
-				return OPTIONAL_EDEFAULT == null ? optional != null : !OPTIONAL_EDEFAULT.equals(optional);
-			case OrmPackage.XML_BASIC_IMPL__LOB:
-				return lob != LOB_EDEFAULT;
-			case OrmPackage.XML_BASIC_IMPL__TEMPORAL:
-				return temporal != TEMPORAL_EDEFAULT;
-			case OrmPackage.XML_BASIC_IMPL__ENUMERATED:
-				return enumerated != ENUMERATED_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == ColumnMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_BASIC_IMPL__COLUMN: return OrmPackage.COLUMN_MAPPING__COLUMN;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasic.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_BASIC_IMPL__FETCH: return OrmPackage.XML_BASIC__FETCH;
-				case OrmPackage.XML_BASIC_IMPL__OPTIONAL: return OrmPackage.XML_BASIC__OPTIONAL;
-				case OrmPackage.XML_BASIC_IMPL__LOB: return OrmPackage.XML_BASIC__LOB;
-				case OrmPackage.XML_BASIC_IMPL__TEMPORAL: return OrmPackage.XML_BASIC__TEMPORAL;
-				case OrmPackage.XML_BASIC_IMPL__ENUMERATED: return OrmPackage.XML_BASIC__ENUMERATED;
-				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 == ColumnMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.COLUMN_MAPPING__COLUMN: return OrmPackage.XML_BASIC_IMPL__COLUMN;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasic.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_BASIC__FETCH: return OrmPackage.XML_BASIC_IMPL__FETCH;
-				case OrmPackage.XML_BASIC__OPTIONAL: return OrmPackage.XML_BASIC_IMPL__OPTIONAL;
-				case OrmPackage.XML_BASIC__LOB: return OrmPackage.XML_BASIC_IMPL__LOB;
-				case OrmPackage.XML_BASIC__TEMPORAL: return OrmPackage.XML_BASIC_IMPL__TEMPORAL;
-				case OrmPackage.XML_BASIC__ENUMERATED: return OrmPackage.XML_BASIC_IMPL__ENUMERATED;
-				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(" (fetch: ");
-		result.append(fetch);
-		result.append(", optional: ");
-		result.append(optional);
-		result.append(", lob: ");
-		result.append(lob);
-		result.append(", temporal: ");
-		result.append(temporal);
-		result.append(", enumerated: ");
-		result.append(enumerated);
-		result.append(')');
-		return result.toString();
-	}
-
-} // BasicImpl
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlColumn.java
deleted file mode 100644
index 282f383c48..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlColumn.java
+++ /dev/null
@@ -1,117 +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.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Column</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.core.resource.orm.XmlColumn#getLength <em>Length</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlColumn#getPrecision <em>Precision</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlColumn#getScale <em>Scale</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlColumn()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlColumn extends XmlAbstractColumn
-{
-	/**
-	 * Returns the value of the '<em><b>Length</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Length</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Length</em>' attribute.
-	 * @see #setLength(Integer)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlColumn_Length()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	Integer getLength();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlColumn#getLength <em>Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Length</em>' attribute.
-	 * @see #getLength()
-	 * @generated
-	 */
-	void setLength(Integer value);
-
-	/**
-	 * Returns the value of the '<em><b>Precision</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Precision</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Precision</em>' attribute.
-	 * @see #setPrecision(Integer)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlColumn_Precision()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	Integer getPrecision();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlColumn#getPrecision <em>Precision</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Precision</em>' attribute.
-	 * @see #getPrecision()
-	 * @generated
-	 */
-	void setPrecision(Integer value);
-
-	/**
-	 * Returns the value of the '<em><b>Scale</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Scale</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Scale</em>' attribute.
-	 * @see #setScale(Integer)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlColumn_Scale()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	Integer getScale();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlColumn#getScale <em>Scale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Scale</em>' attribute.
-	 * @see #getScale()
-	 * @generated
-	 */
-	void setScale(Integer value);
-
-} // Column
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlColumnImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlColumnImpl.java
deleted file mode 100644
index ad096bf380..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlColumnImpl.java
+++ /dev/null
@@ -1,369 +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.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>Column 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.core.resource.orm.OrmPackage#getXmlColumnImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlColumnImpl extends AbstractXmlAbstractColumn implements XmlColumn
-{
-	/**
-	 * The default value of the '{@link #getLength() <em>Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLength()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Integer LENGTH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLength() <em>Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLength()
-	 * @generated
-	 * @ordered
-	 */
-	protected Integer length = LENGTH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPrecision() <em>Precision</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrecision()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Integer PRECISION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPrecision() <em>Precision</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrecision()
-	 * @generated
-	 * @ordered
-	 */
-	protected Integer precision = PRECISION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getScale() <em>Scale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getScale()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Integer SCALE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getScale() <em>Scale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getScale()
-	 * @generated
-	 * @ordered
-	 */
-	protected Integer scale = SCALE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlColumnImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_COLUMN_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Length</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Length</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Length</em>' attribute.
-	 * @see #setLength(Integer)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlColumn_Length()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	public Integer getLength()
-	{
-		return length;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlColumnImpl#getLength <em>Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Length</em>' attribute.
-	 * @see #getLength()
-	 * @generated
-	 */
-	public void setLength(Integer newLength)
-	{
-		Integer oldLength = length;
-		length = newLength;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_COLUMN_IMPL__LENGTH, oldLength, length));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Precision</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Precision</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Precision</em>' attribute.
-	 * @see #setPrecision(Integer)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlColumn_Precision()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	public Integer getPrecision()
-	{
-		return precision;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlColumnImpl#getPrecision <em>Precision</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Precision</em>' attribute.
-	 * @see #getPrecision()
-	 * @generated
-	 */
-	public void setPrecision(Integer newPrecision)
-	{
-		Integer oldPrecision = precision;
-		precision = newPrecision;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_COLUMN_IMPL__PRECISION, oldPrecision, precision));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Scale</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Scale</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Scale</em>' attribute.
-	 * @see #setScale(Integer)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlColumn_Scale()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	public Integer getScale()
-	{
-		return scale;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlColumnImpl#getScale <em>Scale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Scale</em>' attribute.
-	 * @see #getScale()
-	 * @generated
-	 */
-	public void setScale(Integer newScale)
-	{
-		Integer oldScale = scale;
-		scale = newScale;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_COLUMN_IMPL__SCALE, oldScale, scale));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_COLUMN_IMPL__LENGTH:
-				return getLength();
-			case OrmPackage.XML_COLUMN_IMPL__PRECISION:
-				return getPrecision();
-			case OrmPackage.XML_COLUMN_IMPL__SCALE:
-				return getScale();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_COLUMN_IMPL__LENGTH:
-				setLength((Integer)newValue);
-				return;
-			case OrmPackage.XML_COLUMN_IMPL__PRECISION:
-				setPrecision((Integer)newValue);
-				return;
-			case OrmPackage.XML_COLUMN_IMPL__SCALE:
-				setScale((Integer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_COLUMN_IMPL__LENGTH:
-				setLength(LENGTH_EDEFAULT);
-				return;
-			case OrmPackage.XML_COLUMN_IMPL__PRECISION:
-				setPrecision(PRECISION_EDEFAULT);
-				return;
-			case OrmPackage.XML_COLUMN_IMPL__SCALE:
-				setScale(SCALE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_COLUMN_IMPL__LENGTH:
-				return LENGTH_EDEFAULT == null ? length != null : !LENGTH_EDEFAULT.equals(length);
-			case OrmPackage.XML_COLUMN_IMPL__PRECISION:
-				return PRECISION_EDEFAULT == null ? precision != null : !PRECISION_EDEFAULT.equals(precision);
-			case OrmPackage.XML_COLUMN_IMPL__SCALE:
-				return SCALE_EDEFAULT == null ? scale != null : !SCALE_EDEFAULT.equals(scale);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlColumn.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_COLUMN_IMPL__LENGTH: return OrmPackage.XML_COLUMN__LENGTH;
-				case OrmPackage.XML_COLUMN_IMPL__PRECISION: return OrmPackage.XML_COLUMN__PRECISION;
-				case OrmPackage.XML_COLUMN_IMPL__SCALE: return OrmPackage.XML_COLUMN__SCALE;
-				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 == XmlColumn.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_COLUMN__LENGTH: return OrmPackage.XML_COLUMN_IMPL__LENGTH;
-				case OrmPackage.XML_COLUMN__PRECISION: return OrmPackage.XML_COLUMN_IMPL__PRECISION;
-				case OrmPackage.XML_COLUMN__SCALE: return OrmPackage.XML_COLUMN_IMPL__SCALE;
-				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(" (length: ");
-		result.append(length);
-		result.append(", precision: ");
-		result.append(precision);
-		result.append(", scale: ");
-		result.append(scale);
-		result.append(')');
-		return result.toString();
-	}
-
-} // ColumnImpl
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlDiscriminatorColumn.java
deleted file mode 100644
index 3f4cd01ea6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlDiscriminatorColumn.java
+++ /dev/null
@@ -1,267 +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.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>Discriminator Column</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.core.resource.orm.XmlDiscriminatorColumn#getDiscriminatorType <em>Discriminator Type</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn#getLength <em>Length</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlDiscriminatorColumn()
- * @model kind="class"
- * @generated
- */
-public class XmlDiscriminatorColumn extends AbstractXmlNamedColumn
-{
-	/**
-	 * 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 DiscriminatorType DISCRIMINATOR_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDiscriminatorType() <em>Discriminator Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDiscriminatorType()
-	 * @generated
-	 * @ordered
-	 */
-	protected DiscriminatorType discriminatorType = DISCRIMINATOR_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLength() <em>Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLength()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Integer LENGTH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLength() <em>Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLength()
-	 * @generated
-	 * @ordered
-	 */
-	protected Integer length = LENGTH_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlDiscriminatorColumn()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_DISCRIMINATOR_COLUMN;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Discriminator Type</b></em>' attribute.
-	 * The default value is <code>"STRING"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.DiscriminatorType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Discriminator 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>Discriminator Type</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.DiscriminatorType
-	 * @see #setDiscriminatorType(DiscriminatorType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlDiscriminatorColumn_DiscriminatorType()
-	 * @model default="STRING"
-	 * @generated
-	 */
-	public DiscriminatorType getDiscriminatorType()
-	{
-		return discriminatorType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn#getDiscriminatorType <em>Discriminator Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Discriminator Type</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.DiscriminatorType
-	 * @see #getDiscriminatorType()
-	 * @generated
-	 */
-	public void setDiscriminatorType(DiscriminatorType newDiscriminatorType)
-	{
-		DiscriminatorType oldDiscriminatorType = discriminatorType;
-		discriminatorType = newDiscriminatorType == null ? DISCRIMINATOR_TYPE_EDEFAULT : newDiscriminatorType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_DISCRIMINATOR_COLUMN__DISCRIMINATOR_TYPE, oldDiscriminatorType, discriminatorType));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Length</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Length</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Length</em>' attribute.
-	 * @see #setLength(Integer)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlDiscriminatorColumn_Length()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	public Integer getLength()
-	{
-		return length;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn#getLength <em>Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Length</em>' attribute.
-	 * @see #getLength()
-	 * @generated
-	 */
-	public void setLength(Integer newLength)
-	{
-		Integer oldLength = length;
-		length = newLength;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_DISCRIMINATOR_COLUMN__LENGTH, oldLength, length));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_DISCRIMINATOR_COLUMN__DISCRIMINATOR_TYPE:
-				return getDiscriminatorType();
-			case OrmPackage.XML_DISCRIMINATOR_COLUMN__LENGTH:
-				return getLength();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_DISCRIMINATOR_COLUMN__DISCRIMINATOR_TYPE:
-				setDiscriminatorType((DiscriminatorType)newValue);
-				return;
-			case OrmPackage.XML_DISCRIMINATOR_COLUMN__LENGTH:
-				setLength((Integer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_DISCRIMINATOR_COLUMN__DISCRIMINATOR_TYPE:
-				setDiscriminatorType(DISCRIMINATOR_TYPE_EDEFAULT);
-				return;
-			case OrmPackage.XML_DISCRIMINATOR_COLUMN__LENGTH:
-				setLength(LENGTH_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_DISCRIMINATOR_COLUMN__DISCRIMINATOR_TYPE:
-				return discriminatorType != DISCRIMINATOR_TYPE_EDEFAULT;
-			case OrmPackage.XML_DISCRIMINATOR_COLUMN__LENGTH:
-				return LENGTH_EDEFAULT == null ? length != null : !LENGTH_EDEFAULT.equals(length);
-		}
-		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(" (discriminatorType: ");
-		result.append(discriminatorType);
-		result.append(", length: ");
-		result.append(length);
-		result.append(')');
-		return result.toString();
-	}
-
-} // DiscriminatorColumn
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbeddable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbeddable.java
deleted file mode 100644
index 6fc3e212ef..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbeddable.java
+++ /dev/null
@@ -1,63 +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.core.resource.orm;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>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.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEmbeddable()
- * @model kind="class"
- * @generated
- */
-public class XmlEmbeddable extends AbstractXmlTypeMapping
-{
-	/**
-	 * 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;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlEmbeddable()
-	{
-		super();
-	}
-	
-	public XmlEntityMappings getEntityMappings() {
-		return (XmlEntityMappings) eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_EMBEDDABLE;
-	}
-
-} // Embeddable
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbedded.java
deleted file mode 100644
index fe1584ca2f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbedded.java
+++ /dev/null
@@ -1,32 +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.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Embedded</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.core.resource.orm.OrmPackage#getXmlEmbedded()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlEmbedded extends BaseXmlEmbedded
-{
-
-} // Embedded
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbeddedId.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbeddedId.java
deleted file mode 100644
index 45f6723c36..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbeddedId.java
+++ /dev/null
@@ -1,32 +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.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Embedded 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.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEmbeddedId()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlEmbeddedId extends XmlAttributeMapping, BaseXmlEmbedded
-{
-
-} // EmbeddedId
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbeddedIdImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbeddedIdImpl.java
deleted file mode 100644
index dd66ac341b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbeddedIdImpl.java
+++ /dev/null
@@ -1,228 +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.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>Embedded 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.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEmbeddedIdImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlEmbeddedIdImpl extends AbstractXmlAttributeMapping implements XmlEmbeddedId
-{
-	/**
-	 * The cached value of the '{@link #getAttributeOverrides() <em>Attribute Overrides</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeOverrides()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlAttributeOverride> attributeOverrides;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlEmbeddedIdImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_EMBEDDED_ID_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Overrides</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute Overrides</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Attribute Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBaseXmlEmbedded_AttributeOverrides()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlAttributeOverride> getAttributeOverrides()
-	{
-		if (attributeOverrides == null)
-		{
-			attributeOverrides = new EObjectContainmentEList<XmlAttributeOverride>(XmlAttributeOverride.class, this, OrmPackage.XML_EMBEDDED_ID_IMPL__ATTRIBUTE_OVERRIDES);
-		}
-		return attributeOverrides;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_EMBEDDED_ID_IMPL__ATTRIBUTE_OVERRIDES:
-				return ((InternalEList<?>)getAttributeOverrides()).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 OrmPackage.XML_EMBEDDED_ID_IMPL__ATTRIBUTE_OVERRIDES:
-				return getAttributeOverrides();
-		}
-		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 OrmPackage.XML_EMBEDDED_ID_IMPL__ATTRIBUTE_OVERRIDES:
-				getAttributeOverrides().clear();
-				getAttributeOverrides().addAll((Collection<? extends XmlAttributeOverride>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_EMBEDDED_ID_IMPL__ATTRIBUTE_OVERRIDES:
-				getAttributeOverrides().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_EMBEDDED_ID_IMPL__ATTRIBUTE_OVERRIDES:
-				return attributeOverrides != null && !attributeOverrides.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == BaseXmlEmbedded.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_EMBEDDED_ID_IMPL__ATTRIBUTE_OVERRIDES: return OrmPackage.BASE_XML_EMBEDDED__ATTRIBUTE_OVERRIDES;
-				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 == BaseXmlEmbedded.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.BASE_XML_EMBEDDED__ATTRIBUTE_OVERRIDES: return OrmPackage.XML_EMBEDDED_ID_IMPL__ATTRIBUTE_OVERRIDES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEmbeddedId.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-} // EmbeddedId
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbeddedImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbeddedImpl.java
deleted file mode 100644
index c504fd9fdf..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbeddedImpl.java
+++ /dev/null
@@ -1,228 +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.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>Embedded</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.core.resource.orm.OrmPackage#getXmlEmbeddedImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlEmbeddedImpl extends AbstractXmlAttributeMapping implements XmlEmbedded
-{
-	/**
-	 * The cached value of the '{@link #getAttributeOverrides() <em>Attribute Overrides</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeOverrides()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlAttributeOverride> attributeOverrides;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlEmbeddedImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_EMBEDDED_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Overrides</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute Overrides</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Attribute Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBaseXmlEmbedded_AttributeOverrides()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlAttributeOverride> getAttributeOverrides()
-	{
-		if (attributeOverrides == null)
-		{
-			attributeOverrides = new EObjectContainmentEList<XmlAttributeOverride>(XmlAttributeOverride.class, this, OrmPackage.XML_EMBEDDED_IMPL__ATTRIBUTE_OVERRIDES);
-		}
-		return attributeOverrides;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_EMBEDDED_IMPL__ATTRIBUTE_OVERRIDES:
-				return ((InternalEList<?>)getAttributeOverrides()).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 OrmPackage.XML_EMBEDDED_IMPL__ATTRIBUTE_OVERRIDES:
-				return getAttributeOverrides();
-		}
-		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 OrmPackage.XML_EMBEDDED_IMPL__ATTRIBUTE_OVERRIDES:
-				getAttributeOverrides().clear();
-				getAttributeOverrides().addAll((Collection<? extends XmlAttributeOverride>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_EMBEDDED_IMPL__ATTRIBUTE_OVERRIDES:
-				getAttributeOverrides().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_EMBEDDED_IMPL__ATTRIBUTE_OVERRIDES:
-				return attributeOverrides != null && !attributeOverrides.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == BaseXmlEmbedded.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_EMBEDDED_IMPL__ATTRIBUTE_OVERRIDES: return OrmPackage.BASE_XML_EMBEDDED__ATTRIBUTE_OVERRIDES;
-				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 == BaseXmlEmbedded.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.BASE_XML_EMBEDDED__ATTRIBUTE_OVERRIDES: return OrmPackage.XML_EMBEDDED_IMPL__ATTRIBUTE_OVERRIDES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEmbedded.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-} // Embedded
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java
deleted file mode 100644
index 6018cb23f3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java
+++ /dev/null
@@ -1,1925 +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.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>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.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getSecondaryTables <em>Secondary Tables</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getIdClass <em>Id Class</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getInheritance <em>Inheritance</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getDiscriminatorValue <em>Discriminator Value</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getDiscriminatorColumn <em>Discriminator Column</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getSequenceGenerator <em>Sequence Generator</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getTableGenerator <em>Table Generator</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getNamedQueries <em>Named Queries</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getNamedNativeQueries <em>Named Native Queries</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getSqlResultSetMappings <em>Sql Result Set Mappings</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#isExcludeDefaultListeners <em>Exclude Default Listeners</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#isExcludeSuperclassListeners <em>Exclude Superclass Listeners</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getEntityListeners <em>Entity Listeners</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPrePersist <em>Pre Persist</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostPersist <em>Post Persist</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPreRemove <em>Pre Remove</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostRemove <em>Post Remove</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPreUpdate <em>Pre Update</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostUpdate <em>Post Update</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostLoad <em>Post Load</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getAttributeOverrides <em>Attribute Overrides</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getAssociationOverrides <em>Association Overrides</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity()
- * @model kind="class"
- * @generated
- */
-public class XmlEntity extends AbstractXmlTypeMapping
-{
-	/**
-	 * 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 default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getTable() <em>Table</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlTable table;
-
-	/**
-	 * The cached value of the '{@link #getSecondaryTables() <em>Secondary Tables</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSecondaryTables()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlSecondaryTable> secondaryTables;
-
-	/**
-	 * The cached value of the '{@link #getPrimaryKeyJoinColumns() <em>Primary Key Join Columns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrimaryKeyJoinColumns()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlPrimaryKeyJoinColumn> primaryKeyJoinColumns;
-
-	/**
-	 * The cached value of the '{@link #getIdClass() <em>Id Class</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIdClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlIdClass idClass;
-
-	/**
-	 * The cached value of the '{@link #getInheritance() <em>Inheritance</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInheritance()
-	 * @generated
-	 * @ordered
-	 */
-	protected Inheritance inheritance;
-
-	/**
-	 * The default value of the '{@link #getDiscriminatorValue() <em>Discriminator Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDiscriminatorValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISCRIMINATOR_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDiscriminatorValue() <em>Discriminator Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDiscriminatorValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String discriminatorValue = DISCRIMINATOR_VALUE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getDiscriminatorColumn() <em>Discriminator Column</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDiscriminatorColumn()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlDiscriminatorColumn discriminatorColumn;
-
-	/**
-	 * The cached value of the '{@link #getSequenceGenerator() <em>Sequence Generator</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSequenceGenerator()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlSequenceGenerator sequenceGenerator;
-
-	/**
-	 * The cached value of the '{@link #getTableGenerator() <em>Table Generator</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTableGenerator()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlTableGenerator tableGenerator;
-
-	/**
-	 * The cached value of the '{@link #getNamedQueries() <em>Named Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamedQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlNamedQuery> namedQueries;
-
-	/**
-	 * The cached value of the '{@link #getNamedNativeQueries() <em>Named Native Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamedNativeQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlNamedNativeQuery> namedNativeQueries;
-
-	/**
-	 * The cached value of the '{@link #getSqlResultSetMappings() <em>Sql Result Set Mappings</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSqlResultSetMappings()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<SqlResultSetMapping> sqlResultSetMappings;
-
-	/**
-	 * The default value of the '{@link #isExcludeDefaultListeners() <em>Exclude Default Listeners</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExcludeDefaultListeners()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EXCLUDE_DEFAULT_LISTENERS_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isExcludeDefaultListeners() <em>Exclude Default Listeners</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExcludeDefaultListeners()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean excludeDefaultListeners = EXCLUDE_DEFAULT_LISTENERS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isExcludeSuperclassListeners() <em>Exclude Superclass Listeners</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExcludeSuperclassListeners()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EXCLUDE_SUPERCLASS_LISTENERS_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isExcludeSuperclassListeners() <em>Exclude Superclass Listeners</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExcludeSuperclassListeners()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean excludeSuperclassListeners = EXCLUDE_SUPERCLASS_LISTENERS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getEntityListeners() <em>Entity Listeners</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEntityListeners()
-	 * @generated
-	 * @ordered
-	 */
-	protected EntityListeners entityListeners;
-
-	/**
-	 * The cached value of the '{@link #getPrePersist() <em>Pre Persist</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrePersist()
-	 * @generated
-	 * @ordered
-	 */
-	protected PrePersist prePersist;
-
-	/**
-	 * The cached value of the '{@link #getPostPersist() <em>Post Persist</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostPersist()
-	 * @generated
-	 * @ordered
-	 */
-	protected PostPersist postPersist;
-
-	/**
-	 * The cached value of the '{@link #getPreRemove() <em>Pre Remove</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPreRemove()
-	 * @generated
-	 * @ordered
-	 */
-	protected PreRemove preRemove;
-
-	/**
-	 * The cached value of the '{@link #getPostRemove() <em>Post Remove</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostRemove()
-	 * @generated
-	 * @ordered
-	 */
-	protected PostRemove postRemove;
-
-	/**
-	 * The cached value of the '{@link #getPreUpdate() <em>Pre Update</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPreUpdate()
-	 * @generated
-	 * @ordered
-	 */
-	protected PreUpdate preUpdate;
-
-	/**
-	 * The cached value of the '{@link #getPostUpdate() <em>Post Update</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostUpdate()
-	 * @generated
-	 * @ordered
-	 */
-	protected PostUpdate postUpdate;
-
-	/**
-	 * The cached value of the '{@link #getPostLoad() <em>Post Load</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostLoad()
-	 * @generated
-	 * @ordered
-	 */
-	protected PostLoad postLoad;
-
-	/**
-	 * The cached value of the '{@link #getAttributeOverrides() <em>Attribute Overrides</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeOverrides()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlAttributeOverride> attributeOverrides;
-
-	/**
-	 * The cached value of the '{@link #getAssociationOverrides() <em>Association Overrides</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAssociationOverrides()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlAssociationOverride> associationOverrides;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlEntity()
-	{
-		super();
-	}
-
-	public XmlEntityMappings entityMappings() {
-		return (XmlEntityMappings) eContainer();
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_ENTITY;
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlEntity_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.core.resource.orm.XmlEntity#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, OrmPackage.XML_ENTITY__NAME, oldName, name));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Table</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table</em>' 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</em>' containment reference.
-	 * @see #setTable(XmlTable)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_Table()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlTable getTable()
-	{
-		return table;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTable(XmlTable newTable, NotificationChain msgs)
-	{
-		XmlTable oldTable = table;
-		table = newTable;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__TABLE, oldTable, newTable);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getTable <em>Table</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Table</em>' containment reference.
-	 * @see #getTable()
-	 * @generated
-	 */
-	public void setTable(XmlTable newTable)
-	{
-		if (newTable != table)
-		{
-			NotificationChain msgs = null;
-			if (table != null)
-				msgs = ((InternalEObject)table).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__TABLE, null, msgs);
-			if (newTable != null)
-				msgs = ((InternalEObject)newTable).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__TABLE, null, msgs);
-			msgs = basicSetTable(newTable, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__TABLE, newTable, newTable));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Secondary Tables</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTable}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Secondary Tables</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Secondary Tables</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_SecondaryTables()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlSecondaryTable> getSecondaryTables()
-	{
-		if (secondaryTables == null)
-		{
-			secondaryTables = new EObjectContainmentEList<XmlSecondaryTable>(XmlSecondaryTable.class, this, OrmPackage.XML_ENTITY__SECONDARY_TABLES);
-		}
-		return secondaryTables;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Primary Key Join 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>Primary Key Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_PrimaryKeyJoinColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlPrimaryKeyJoinColumn> getPrimaryKeyJoinColumns()
-	{
-		if (primaryKeyJoinColumns == null)
-		{
-			primaryKeyJoinColumns = new EObjectContainmentEList<XmlPrimaryKeyJoinColumn>(XmlPrimaryKeyJoinColumn.class, this, OrmPackage.XML_ENTITY__PRIMARY_KEY_JOIN_COLUMNS);
-		}
-		return primaryKeyJoinColumns;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Id Class</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id Class</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id Class</em>' containment reference.
-	 * @see #setIdClass(XmlIdClass)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_IdClass()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlIdClass getIdClass()
-	{
-		return idClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetIdClass(XmlIdClass newIdClass, NotificationChain msgs)
-	{
-		XmlIdClass oldIdClass = idClass;
-		idClass = newIdClass;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__ID_CLASS, oldIdClass, newIdClass);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getIdClass <em>Id Class</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id Class</em>' containment reference.
-	 * @see #getIdClass()
-	 * @generated
-	 */
-	public void setIdClass(XmlIdClass newIdClass)
-	{
-		if (newIdClass != idClass)
-		{
-			NotificationChain msgs = null;
-			if (idClass != null)
-				msgs = ((InternalEObject)idClass).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__ID_CLASS, null, msgs);
-			if (newIdClass != null)
-				msgs = ((InternalEObject)newIdClass).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__ID_CLASS, null, msgs);
-			msgs = basicSetIdClass(newIdClass, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__ID_CLASS, newIdClass, newIdClass));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Inheritance</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Inheritance</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Inheritance</em>' containment reference.
-	 * @see #setInheritance(Inheritance)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_Inheritance()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public Inheritance getInheritance()
-	{
-		return inheritance;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetInheritance(Inheritance newInheritance, NotificationChain msgs)
-	{
-		Inheritance oldInheritance = inheritance;
-		inheritance = newInheritance;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__INHERITANCE, oldInheritance, newInheritance);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getInheritance <em>Inheritance</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Inheritance</em>' containment reference.
-	 * @see #getInheritance()
-	 * @generated
-	 */
-	public void setInheritance(Inheritance newInheritance)
-	{
-		if (newInheritance != inheritance)
-		{
-			NotificationChain msgs = null;
-			if (inheritance != null)
-				msgs = ((InternalEObject)inheritance).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__INHERITANCE, null, msgs);
-			if (newInheritance != null)
-				msgs = ((InternalEObject)newInheritance).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__INHERITANCE, null, msgs);
-			msgs = basicSetInheritance(newInheritance, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__INHERITANCE, newInheritance, newInheritance));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Discriminator Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Discriminator Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Discriminator Value</em>' attribute.
-	 * @see #setDiscriminatorValue(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_DiscriminatorValue()
-	 * @model dataType="org.eclipse.jpt.core.resource.orm.DiscriminatorValue"
-	 * @generated
-	 */
-	public String getDiscriminatorValue()
-	{
-		return discriminatorValue;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getDiscriminatorValue <em>Discriminator Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Discriminator Value</em>' attribute.
-	 * @see #getDiscriminatorValue()
-	 * @generated
-	 */
-	public void setDiscriminatorValue(String newDiscriminatorValue)
-	{
-		String oldDiscriminatorValue = discriminatorValue;
-		discriminatorValue = newDiscriminatorValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__DISCRIMINATOR_VALUE, oldDiscriminatorValue, discriminatorValue));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Discriminator Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Discriminator Column</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Discriminator Column</em>' containment reference.
-	 * @see #setDiscriminatorColumn(XmlDiscriminatorColumn)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_DiscriminatorColumn()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlDiscriminatorColumn getDiscriminatorColumn()
-	{
-		return discriminatorColumn;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetDiscriminatorColumn(XmlDiscriminatorColumn newDiscriminatorColumn, NotificationChain msgs)
-	{
-		XmlDiscriminatorColumn oldDiscriminatorColumn = discriminatorColumn;
-		discriminatorColumn = newDiscriminatorColumn;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__DISCRIMINATOR_COLUMN, oldDiscriminatorColumn, newDiscriminatorColumn);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getDiscriminatorColumn <em>Discriminator Column</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Discriminator Column</em>' containment reference.
-	 * @see #getDiscriminatorColumn()
-	 * @generated
-	 */
-	public void setDiscriminatorColumn(XmlDiscriminatorColumn newDiscriminatorColumn)
-	{
-		if (newDiscriminatorColumn != discriminatorColumn)
-		{
-			NotificationChain msgs = null;
-			if (discriminatorColumn != null)
-				msgs = ((InternalEObject)discriminatorColumn).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__DISCRIMINATOR_COLUMN, null, msgs);
-			if (newDiscriminatorColumn != null)
-				msgs = ((InternalEObject)newDiscriminatorColumn).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__DISCRIMINATOR_COLUMN, null, msgs);
-			msgs = basicSetDiscriminatorColumn(newDiscriminatorColumn, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__DISCRIMINATOR_COLUMN, newDiscriminatorColumn, newDiscriminatorColumn));
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlEntity_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, OrmPackage.XML_ENTITY__SEQUENCE_GENERATOR, oldSequenceGenerator, newSequenceGenerator);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#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 - OrmPackage.XML_ENTITY__SEQUENCE_GENERATOR, null, msgs);
-			if (newSequenceGenerator != null)
-				msgs = ((InternalEObject)newSequenceGenerator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__SEQUENCE_GENERATOR, null, msgs);
-			msgs = basicSetSequenceGenerator(newSequenceGenerator, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__SEQUENCE_GENERATOR, newSequenceGenerator, newSequenceGenerator));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Table Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table Generator</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Table Generator</em>' containment reference.
-	 * @see #setTableGenerator(XmlTableGenerator)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_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, OrmPackage.XML_ENTITY__TABLE_GENERATOR, oldTableGenerator, newTableGenerator);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#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 - OrmPackage.XML_ENTITY__TABLE_GENERATOR, null, msgs);
-			if (newTableGenerator != null)
-				msgs = ((InternalEObject)newTableGenerator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__TABLE_GENERATOR, null, msgs);
-			msgs = basicSetTableGenerator(newTableGenerator, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__TABLE_GENERATOR, newTableGenerator, newTableGenerator));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Named Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlNamedQuery}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_NamedQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlNamedQuery> getNamedQueries()
-	{
-		if (namedQueries == null)
-		{
-			namedQueries = new EObjectContainmentEList<XmlNamedQuery>(XmlNamedQuery.class, this, OrmPackage.XML_ENTITY__NAMED_QUERIES);
-		}
-		return namedQueries;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Named Native Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Native Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Native Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_NamedNativeQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlNamedNativeQuery> getNamedNativeQueries()
-	{
-		if (namedNativeQueries == null)
-		{
-			namedNativeQueries = new EObjectContainmentEList<XmlNamedNativeQuery>(XmlNamedNativeQuery.class, this, OrmPackage.XML_ENTITY__NAMED_NATIVE_QUERIES);
-		}
-		return namedNativeQueries;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Sql Result Set Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sql Result Set Mappings</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sql Result Set Mappings</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_SqlResultSetMappings()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<SqlResultSetMapping> getSqlResultSetMappings()
-	{
-		if (sqlResultSetMappings == null)
-		{
-			sqlResultSetMappings = new EObjectContainmentEList<SqlResultSetMapping>(SqlResultSetMapping.class, this, OrmPackage.XML_ENTITY__SQL_RESULT_SET_MAPPINGS);
-		}
-		return sqlResultSetMappings;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Exclude Default Listeners</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Exclude Default Listeners</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 Listeners</em>' attribute.
-	 * @see #setExcludeDefaultListeners(boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_ExcludeDefaultListeners()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isExcludeDefaultListeners()
-	{
-		return excludeDefaultListeners;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#isExcludeDefaultListeners <em>Exclude Default Listeners</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Exclude Default Listeners</em>' attribute.
-	 * @see #isExcludeDefaultListeners()
-	 * @generated
-	 */
-	public void setExcludeDefaultListeners(boolean newExcludeDefaultListeners)
-	{
-		boolean oldExcludeDefaultListeners = excludeDefaultListeners;
-		excludeDefaultListeners = newExcludeDefaultListeners;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__EXCLUDE_DEFAULT_LISTENERS, oldExcludeDefaultListeners, excludeDefaultListeners));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Exclude Superclass Listeners</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Exclude Superclass Listeners</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 Superclass Listeners</em>' attribute.
-	 * @see #setExcludeSuperclassListeners(boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_ExcludeSuperclassListeners()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isExcludeSuperclassListeners()
-	{
-		return excludeSuperclassListeners;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#isExcludeSuperclassListeners <em>Exclude Superclass Listeners</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Exclude Superclass Listeners</em>' attribute.
-	 * @see #isExcludeSuperclassListeners()
-	 * @generated
-	 */
-	public void setExcludeSuperclassListeners(boolean newExcludeSuperclassListeners)
-	{
-		boolean oldExcludeSuperclassListeners = excludeSuperclassListeners;
-		excludeSuperclassListeners = newExcludeSuperclassListeners;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__EXCLUDE_SUPERCLASS_LISTENERS, oldExcludeSuperclassListeners, excludeSuperclassListeners));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Entity Listeners</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Entity Listeners</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Entity Listeners</em>' containment reference.
-	 * @see #setEntityListeners(EntityListeners)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_EntityListeners()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EntityListeners getEntityListeners()
-	{
-		return entityListeners;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetEntityListeners(EntityListeners newEntityListeners, NotificationChain msgs)
-	{
-		EntityListeners oldEntityListeners = entityListeners;
-		entityListeners = newEntityListeners;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__ENTITY_LISTENERS, oldEntityListeners, newEntityListeners);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getEntityListeners <em>Entity Listeners</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Entity Listeners</em>' containment reference.
-	 * @see #getEntityListeners()
-	 * @generated
-	 */
-	public void setEntityListeners(EntityListeners newEntityListeners)
-	{
-		if (newEntityListeners != entityListeners)
-		{
-			NotificationChain msgs = null;
-			if (entityListeners != null)
-				msgs = ((InternalEObject)entityListeners).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__ENTITY_LISTENERS, null, msgs);
-			if (newEntityListeners != null)
-				msgs = ((InternalEObject)newEntityListeners).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__ENTITY_LISTENERS, null, msgs);
-			msgs = basicSetEntityListeners(newEntityListeners, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__ENTITY_LISTENERS, newEntityListeners, newEntityListeners));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pre Persist</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pre Persist</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pre Persist</em>' containment reference.
-	 * @see #setPrePersist(PrePersist)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_PrePersist()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PrePersist getPrePersist()
-	{
-		return prePersist;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPrePersist(PrePersist newPrePersist, NotificationChain msgs)
-	{
-		PrePersist oldPrePersist = prePersist;
-		prePersist = newPrePersist;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__PRE_PERSIST, oldPrePersist, newPrePersist);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPrePersist <em>Pre Persist</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pre Persist</em>' containment reference.
-	 * @see #getPrePersist()
-	 * @generated
-	 */
-	public void setPrePersist(PrePersist newPrePersist)
-	{
-		if (newPrePersist != prePersist)
-		{
-			NotificationChain msgs = null;
-			if (prePersist != null)
-				msgs = ((InternalEObject)prePersist).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__PRE_PERSIST, null, msgs);
-			if (newPrePersist != null)
-				msgs = ((InternalEObject)newPrePersist).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__PRE_PERSIST, null, msgs);
-			msgs = basicSetPrePersist(newPrePersist, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__PRE_PERSIST, newPrePersist, newPrePersist));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Post Persist</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Persist</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Persist</em>' containment reference.
-	 * @see #setPostPersist(PostPersist)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_PostPersist()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PostPersist getPostPersist()
-	{
-		return postPersist;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPostPersist(PostPersist newPostPersist, NotificationChain msgs)
-	{
-		PostPersist oldPostPersist = postPersist;
-		postPersist = newPostPersist;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__POST_PERSIST, oldPostPersist, newPostPersist);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostPersist <em>Post Persist</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Post Persist</em>' containment reference.
-	 * @see #getPostPersist()
-	 * @generated
-	 */
-	public void setPostPersist(PostPersist newPostPersist)
-	{
-		if (newPostPersist != postPersist)
-		{
-			NotificationChain msgs = null;
-			if (postPersist != null)
-				msgs = ((InternalEObject)postPersist).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__POST_PERSIST, null, msgs);
-			if (newPostPersist != null)
-				msgs = ((InternalEObject)newPostPersist).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__POST_PERSIST, null, msgs);
-			msgs = basicSetPostPersist(newPostPersist, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__POST_PERSIST, newPostPersist, newPostPersist));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pre Remove</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pre Remove</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pre Remove</em>' containment reference.
-	 * @see #setPreRemove(PreRemove)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_PreRemove()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PreRemove getPreRemove()
-	{
-		return preRemove;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPreRemove(PreRemove newPreRemove, NotificationChain msgs)
-	{
-		PreRemove oldPreRemove = preRemove;
-		preRemove = newPreRemove;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__PRE_REMOVE, oldPreRemove, newPreRemove);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPreRemove <em>Pre Remove</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pre Remove</em>' containment reference.
-	 * @see #getPreRemove()
-	 * @generated
-	 */
-	public void setPreRemove(PreRemove newPreRemove)
-	{
-		if (newPreRemove != preRemove)
-		{
-			NotificationChain msgs = null;
-			if (preRemove != null)
-				msgs = ((InternalEObject)preRemove).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__PRE_REMOVE, null, msgs);
-			if (newPreRemove != null)
-				msgs = ((InternalEObject)newPreRemove).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__PRE_REMOVE, null, msgs);
-			msgs = basicSetPreRemove(newPreRemove, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__PRE_REMOVE, newPreRemove, newPreRemove));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Post Remove</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Remove</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Remove</em>' containment reference.
-	 * @see #setPostRemove(PostRemove)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_PostRemove()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PostRemove getPostRemove()
-	{
-		return postRemove;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPostRemove(PostRemove newPostRemove, NotificationChain msgs)
-	{
-		PostRemove oldPostRemove = postRemove;
-		postRemove = newPostRemove;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__POST_REMOVE, oldPostRemove, newPostRemove);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostRemove <em>Post Remove</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Post Remove</em>' containment reference.
-	 * @see #getPostRemove()
-	 * @generated
-	 */
-	public void setPostRemove(PostRemove newPostRemove)
-	{
-		if (newPostRemove != postRemove)
-		{
-			NotificationChain msgs = null;
-			if (postRemove != null)
-				msgs = ((InternalEObject)postRemove).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__POST_REMOVE, null, msgs);
-			if (newPostRemove != null)
-				msgs = ((InternalEObject)newPostRemove).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__POST_REMOVE, null, msgs);
-			msgs = basicSetPostRemove(newPostRemove, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__POST_REMOVE, newPostRemove, newPostRemove));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pre Update</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pre Update</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pre Update</em>' containment reference.
-	 * @see #setPreUpdate(PreUpdate)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_PreUpdate()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PreUpdate getPreUpdate()
-	{
-		return preUpdate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPreUpdate(PreUpdate newPreUpdate, NotificationChain msgs)
-	{
-		PreUpdate oldPreUpdate = preUpdate;
-		preUpdate = newPreUpdate;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__PRE_UPDATE, oldPreUpdate, newPreUpdate);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPreUpdate <em>Pre Update</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pre Update</em>' containment reference.
-	 * @see #getPreUpdate()
-	 * @generated
-	 */
-	public void setPreUpdate(PreUpdate newPreUpdate)
-	{
-		if (newPreUpdate != preUpdate)
-		{
-			NotificationChain msgs = null;
-			if (preUpdate != null)
-				msgs = ((InternalEObject)preUpdate).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__PRE_UPDATE, null, msgs);
-			if (newPreUpdate != null)
-				msgs = ((InternalEObject)newPreUpdate).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__PRE_UPDATE, null, msgs);
-			msgs = basicSetPreUpdate(newPreUpdate, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__PRE_UPDATE, newPreUpdate, newPreUpdate));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Post Update</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Update</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Update</em>' containment reference.
-	 * @see #setPostUpdate(PostUpdate)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_PostUpdate()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PostUpdate getPostUpdate()
-	{
-		return postUpdate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPostUpdate(PostUpdate newPostUpdate, NotificationChain msgs)
-	{
-		PostUpdate oldPostUpdate = postUpdate;
-		postUpdate = newPostUpdate;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__POST_UPDATE, oldPostUpdate, newPostUpdate);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostUpdate <em>Post Update</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Post Update</em>' containment reference.
-	 * @see #getPostUpdate()
-	 * @generated
-	 */
-	public void setPostUpdate(PostUpdate newPostUpdate)
-	{
-		if (newPostUpdate != postUpdate)
-		{
-			NotificationChain msgs = null;
-			if (postUpdate != null)
-				msgs = ((InternalEObject)postUpdate).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__POST_UPDATE, null, msgs);
-			if (newPostUpdate != null)
-				msgs = ((InternalEObject)newPostUpdate).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__POST_UPDATE, null, msgs);
-			msgs = basicSetPostUpdate(newPostUpdate, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__POST_UPDATE, newPostUpdate, newPostUpdate));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Post Load</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Load</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Load</em>' containment reference.
-	 * @see #setPostLoad(PostLoad)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_PostLoad()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PostLoad getPostLoad()
-	{
-		return postLoad;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPostLoad(PostLoad newPostLoad, NotificationChain msgs)
-	{
-		PostLoad oldPostLoad = postLoad;
-		postLoad = newPostLoad;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__POST_LOAD, oldPostLoad, newPostLoad);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostLoad <em>Post Load</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Post Load</em>' containment reference.
-	 * @see #getPostLoad()
-	 * @generated
-	 */
-	public void setPostLoad(PostLoad newPostLoad)
-	{
-		if (newPostLoad != postLoad)
-		{
-			NotificationChain msgs = null;
-			if (postLoad != null)
-				msgs = ((InternalEObject)postLoad).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__POST_LOAD, null, msgs);
-			if (newPostLoad != null)
-				msgs = ((InternalEObject)newPostLoad).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__POST_LOAD, null, msgs);
-			msgs = basicSetPostLoad(newPostLoad, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__POST_LOAD, newPostLoad, newPostLoad));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Overrides</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute Overrides</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Attribute Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_AttributeOverrides()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlAttributeOverride> getAttributeOverrides()
-	{
-		if (attributeOverrides == null)
-		{
-			attributeOverrides = new EObjectContainmentEList<XmlAttributeOverride>(XmlAttributeOverride.class, this, OrmPackage.XML_ENTITY__ATTRIBUTE_OVERRIDES);
-		}
-		return attributeOverrides;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Association Overrides</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Association Overrides</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Association Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_AssociationOverrides()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlAssociationOverride> getAssociationOverrides()
-	{
-		if (associationOverrides == null)
-		{
-			associationOverrides = new EObjectContainmentEList<XmlAssociationOverride>(XmlAssociationOverride.class, this, OrmPackage.XML_ENTITY__ASSOCIATION_OVERRIDES);
-		}
-		return associationOverrides;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ENTITY__TABLE:
-				return basicSetTable(null, msgs);
-			case OrmPackage.XML_ENTITY__SECONDARY_TABLES:
-				return ((InternalEList<?>)getSecondaryTables()).basicRemove(otherEnd, msgs);
-			case OrmPackage.XML_ENTITY__PRIMARY_KEY_JOIN_COLUMNS:
-				return ((InternalEList<?>)getPrimaryKeyJoinColumns()).basicRemove(otherEnd, msgs);
-			case OrmPackage.XML_ENTITY__ID_CLASS:
-				return basicSetIdClass(null, msgs);
-			case OrmPackage.XML_ENTITY__INHERITANCE:
-				return basicSetInheritance(null, msgs);
-			case OrmPackage.XML_ENTITY__DISCRIMINATOR_COLUMN:
-				return basicSetDiscriminatorColumn(null, msgs);
-			case OrmPackage.XML_ENTITY__SEQUENCE_GENERATOR:
-				return basicSetSequenceGenerator(null, msgs);
-			case OrmPackage.XML_ENTITY__TABLE_GENERATOR:
-				return basicSetTableGenerator(null, msgs);
-			case OrmPackage.XML_ENTITY__NAMED_QUERIES:
-				return ((InternalEList<?>)getNamedQueries()).basicRemove(otherEnd, msgs);
-			case OrmPackage.XML_ENTITY__NAMED_NATIVE_QUERIES:
-				return ((InternalEList<?>)getNamedNativeQueries()).basicRemove(otherEnd, msgs);
-			case OrmPackage.XML_ENTITY__SQL_RESULT_SET_MAPPINGS:
-				return ((InternalEList<?>)getSqlResultSetMappings()).basicRemove(otherEnd, msgs);
-			case OrmPackage.XML_ENTITY__ENTITY_LISTENERS:
-				return basicSetEntityListeners(null, msgs);
-			case OrmPackage.XML_ENTITY__PRE_PERSIST:
-				return basicSetPrePersist(null, msgs);
-			case OrmPackage.XML_ENTITY__POST_PERSIST:
-				return basicSetPostPersist(null, msgs);
-			case OrmPackage.XML_ENTITY__PRE_REMOVE:
-				return basicSetPreRemove(null, msgs);
-			case OrmPackage.XML_ENTITY__POST_REMOVE:
-				return basicSetPostRemove(null, msgs);
-			case OrmPackage.XML_ENTITY__PRE_UPDATE:
-				return basicSetPreUpdate(null, msgs);
-			case OrmPackage.XML_ENTITY__POST_UPDATE:
-				return basicSetPostUpdate(null, msgs);
-			case OrmPackage.XML_ENTITY__POST_LOAD:
-				return basicSetPostLoad(null, msgs);
-			case OrmPackage.XML_ENTITY__ATTRIBUTE_OVERRIDES:
-				return ((InternalEList<?>)getAttributeOverrides()).basicRemove(otherEnd, msgs);
-			case OrmPackage.XML_ENTITY__ASSOCIATION_OVERRIDES:
-				return ((InternalEList<?>)getAssociationOverrides()).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 OrmPackage.XML_ENTITY__NAME:
-				return getName();
-			case OrmPackage.XML_ENTITY__TABLE:
-				return getTable();
-			case OrmPackage.XML_ENTITY__SECONDARY_TABLES:
-				return getSecondaryTables();
-			case OrmPackage.XML_ENTITY__PRIMARY_KEY_JOIN_COLUMNS:
-				return getPrimaryKeyJoinColumns();
-			case OrmPackage.XML_ENTITY__ID_CLASS:
-				return getIdClass();
-			case OrmPackage.XML_ENTITY__INHERITANCE:
-				return getInheritance();
-			case OrmPackage.XML_ENTITY__DISCRIMINATOR_VALUE:
-				return getDiscriminatorValue();
-			case OrmPackage.XML_ENTITY__DISCRIMINATOR_COLUMN:
-				return getDiscriminatorColumn();
-			case OrmPackage.XML_ENTITY__SEQUENCE_GENERATOR:
-				return getSequenceGenerator();
-			case OrmPackage.XML_ENTITY__TABLE_GENERATOR:
-				return getTableGenerator();
-			case OrmPackage.XML_ENTITY__NAMED_QUERIES:
-				return getNamedQueries();
-			case OrmPackage.XML_ENTITY__NAMED_NATIVE_QUERIES:
-				return getNamedNativeQueries();
-			case OrmPackage.XML_ENTITY__SQL_RESULT_SET_MAPPINGS:
-				return getSqlResultSetMappings();
-			case OrmPackage.XML_ENTITY__EXCLUDE_DEFAULT_LISTENERS:
-				return isExcludeDefaultListeners() ? Boolean.TRUE : Boolean.FALSE;
-			case OrmPackage.XML_ENTITY__EXCLUDE_SUPERCLASS_LISTENERS:
-				return isExcludeSuperclassListeners() ? Boolean.TRUE : Boolean.FALSE;
-			case OrmPackage.XML_ENTITY__ENTITY_LISTENERS:
-				return getEntityListeners();
-			case OrmPackage.XML_ENTITY__PRE_PERSIST:
-				return getPrePersist();
-			case OrmPackage.XML_ENTITY__POST_PERSIST:
-				return getPostPersist();
-			case OrmPackage.XML_ENTITY__PRE_REMOVE:
-				return getPreRemove();
-			case OrmPackage.XML_ENTITY__POST_REMOVE:
-				return getPostRemove();
-			case OrmPackage.XML_ENTITY__PRE_UPDATE:
-				return getPreUpdate();
-			case OrmPackage.XML_ENTITY__POST_UPDATE:
-				return getPostUpdate();
-			case OrmPackage.XML_ENTITY__POST_LOAD:
-				return getPostLoad();
-			case OrmPackage.XML_ENTITY__ATTRIBUTE_OVERRIDES:
-				return getAttributeOverrides();
-			case OrmPackage.XML_ENTITY__ASSOCIATION_OVERRIDES:
-				return getAssociationOverrides();
-		}
-		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 OrmPackage.XML_ENTITY__NAME:
-				setName((String)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__TABLE:
-				setTable((XmlTable)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__SECONDARY_TABLES:
-				getSecondaryTables().clear();
-				getSecondaryTables().addAll((Collection<? extends XmlSecondaryTable>)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__PRIMARY_KEY_JOIN_COLUMNS:
-				getPrimaryKeyJoinColumns().clear();
-				getPrimaryKeyJoinColumns().addAll((Collection<? extends XmlPrimaryKeyJoinColumn>)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__ID_CLASS:
-				setIdClass((XmlIdClass)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__INHERITANCE:
-				setInheritance((Inheritance)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__DISCRIMINATOR_VALUE:
-				setDiscriminatorValue((String)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__DISCRIMINATOR_COLUMN:
-				setDiscriminatorColumn((XmlDiscriminatorColumn)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__SEQUENCE_GENERATOR:
-				setSequenceGenerator((XmlSequenceGenerator)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__TABLE_GENERATOR:
-				setTableGenerator((XmlTableGenerator)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__NAMED_QUERIES:
-				getNamedQueries().clear();
-				getNamedQueries().addAll((Collection<? extends XmlNamedQuery>)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__NAMED_NATIVE_QUERIES:
-				getNamedNativeQueries().clear();
-				getNamedNativeQueries().addAll((Collection<? extends XmlNamedNativeQuery>)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__SQL_RESULT_SET_MAPPINGS:
-				getSqlResultSetMappings().clear();
-				getSqlResultSetMappings().addAll((Collection<? extends SqlResultSetMapping>)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__EXCLUDE_DEFAULT_LISTENERS:
-				setExcludeDefaultListeners(((Boolean)newValue).booleanValue());
-				return;
-			case OrmPackage.XML_ENTITY__EXCLUDE_SUPERCLASS_LISTENERS:
-				setExcludeSuperclassListeners(((Boolean)newValue).booleanValue());
-				return;
-			case OrmPackage.XML_ENTITY__ENTITY_LISTENERS:
-				setEntityListeners((EntityListeners)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__PRE_PERSIST:
-				setPrePersist((PrePersist)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__POST_PERSIST:
-				setPostPersist((PostPersist)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__PRE_REMOVE:
-				setPreRemove((PreRemove)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__POST_REMOVE:
-				setPostRemove((PostRemove)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__PRE_UPDATE:
-				setPreUpdate((PreUpdate)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__POST_UPDATE:
-				setPostUpdate((PostUpdate)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__POST_LOAD:
-				setPostLoad((PostLoad)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__ATTRIBUTE_OVERRIDES:
-				getAttributeOverrides().clear();
-				getAttributeOverrides().addAll((Collection<? extends XmlAttributeOverride>)newValue);
-				return;
-			case OrmPackage.XML_ENTITY__ASSOCIATION_OVERRIDES:
-				getAssociationOverrides().clear();
-				getAssociationOverrides().addAll((Collection<? extends XmlAssociationOverride>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ENTITY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case OrmPackage.XML_ENTITY__TABLE:
-				setTable((XmlTable)null);
-				return;
-			case OrmPackage.XML_ENTITY__SECONDARY_TABLES:
-				getSecondaryTables().clear();
-				return;
-			case OrmPackage.XML_ENTITY__PRIMARY_KEY_JOIN_COLUMNS:
-				getPrimaryKeyJoinColumns().clear();
-				return;
-			case OrmPackage.XML_ENTITY__ID_CLASS:
-				setIdClass((XmlIdClass)null);
-				return;
-			case OrmPackage.XML_ENTITY__INHERITANCE:
-				setInheritance((Inheritance)null);
-				return;
-			case OrmPackage.XML_ENTITY__DISCRIMINATOR_VALUE:
-				setDiscriminatorValue(DISCRIMINATOR_VALUE_EDEFAULT);
-				return;
-			case OrmPackage.XML_ENTITY__DISCRIMINATOR_COLUMN:
-				setDiscriminatorColumn((XmlDiscriminatorColumn)null);
-				return;
-			case OrmPackage.XML_ENTITY__SEQUENCE_GENERATOR:
-				setSequenceGenerator((XmlSequenceGenerator)null);
-				return;
-			case OrmPackage.XML_ENTITY__TABLE_GENERATOR:
-				setTableGenerator((XmlTableGenerator)null);
-				return;
-			case OrmPackage.XML_ENTITY__NAMED_QUERIES:
-				getNamedQueries().clear();
-				return;
-			case OrmPackage.XML_ENTITY__NAMED_NATIVE_QUERIES:
-				getNamedNativeQueries().clear();
-				return;
-			case OrmPackage.XML_ENTITY__SQL_RESULT_SET_MAPPINGS:
-				getSqlResultSetMappings().clear();
-				return;
-			case OrmPackage.XML_ENTITY__EXCLUDE_DEFAULT_LISTENERS:
-				setExcludeDefaultListeners(EXCLUDE_DEFAULT_LISTENERS_EDEFAULT);
-				return;
-			case OrmPackage.XML_ENTITY__EXCLUDE_SUPERCLASS_LISTENERS:
-				setExcludeSuperclassListeners(EXCLUDE_SUPERCLASS_LISTENERS_EDEFAULT);
-				return;
-			case OrmPackage.XML_ENTITY__ENTITY_LISTENERS:
-				setEntityListeners((EntityListeners)null);
-				return;
-			case OrmPackage.XML_ENTITY__PRE_PERSIST:
-				setPrePersist((PrePersist)null);
-				return;
-			case OrmPackage.XML_ENTITY__POST_PERSIST:
-				setPostPersist((PostPersist)null);
-				return;
-			case OrmPackage.XML_ENTITY__PRE_REMOVE:
-				setPreRemove((PreRemove)null);
-				return;
-			case OrmPackage.XML_ENTITY__POST_REMOVE:
-				setPostRemove((PostRemove)null);
-				return;
-			case OrmPackage.XML_ENTITY__PRE_UPDATE:
-				setPreUpdate((PreUpdate)null);
-				return;
-			case OrmPackage.XML_ENTITY__POST_UPDATE:
-				setPostUpdate((PostUpdate)null);
-				return;
-			case OrmPackage.XML_ENTITY__POST_LOAD:
-				setPostLoad((PostLoad)null);
-				return;
-			case OrmPackage.XML_ENTITY__ATTRIBUTE_OVERRIDES:
-				getAttributeOverrides().clear();
-				return;
-			case OrmPackage.XML_ENTITY__ASSOCIATION_OVERRIDES:
-				getAssociationOverrides().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ENTITY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case OrmPackage.XML_ENTITY__TABLE:
-				return table != null;
-			case OrmPackage.XML_ENTITY__SECONDARY_TABLES:
-				return secondaryTables != null && !secondaryTables.isEmpty();
-			case OrmPackage.XML_ENTITY__PRIMARY_KEY_JOIN_COLUMNS:
-				return primaryKeyJoinColumns != null && !primaryKeyJoinColumns.isEmpty();
-			case OrmPackage.XML_ENTITY__ID_CLASS:
-				return idClass != null;
-			case OrmPackage.XML_ENTITY__INHERITANCE:
-				return inheritance != null;
-			case OrmPackage.XML_ENTITY__DISCRIMINATOR_VALUE:
-				return DISCRIMINATOR_VALUE_EDEFAULT == null ? discriminatorValue != null : !DISCRIMINATOR_VALUE_EDEFAULT.equals(discriminatorValue);
-			case OrmPackage.XML_ENTITY__DISCRIMINATOR_COLUMN:
-				return discriminatorColumn != null;
-			case OrmPackage.XML_ENTITY__SEQUENCE_GENERATOR:
-				return sequenceGenerator != null;
-			case OrmPackage.XML_ENTITY__TABLE_GENERATOR:
-				return tableGenerator != null;
-			case OrmPackage.XML_ENTITY__NAMED_QUERIES:
-				return namedQueries != null && !namedQueries.isEmpty();
-			case OrmPackage.XML_ENTITY__NAMED_NATIVE_QUERIES:
-				return namedNativeQueries != null && !namedNativeQueries.isEmpty();
-			case OrmPackage.XML_ENTITY__SQL_RESULT_SET_MAPPINGS:
-				return sqlResultSetMappings != null && !sqlResultSetMappings.isEmpty();
-			case OrmPackage.XML_ENTITY__EXCLUDE_DEFAULT_LISTENERS:
-				return excludeDefaultListeners != EXCLUDE_DEFAULT_LISTENERS_EDEFAULT;
-			case OrmPackage.XML_ENTITY__EXCLUDE_SUPERCLASS_LISTENERS:
-				return excludeSuperclassListeners != EXCLUDE_SUPERCLASS_LISTENERS_EDEFAULT;
-			case OrmPackage.XML_ENTITY__ENTITY_LISTENERS:
-				return entityListeners != null;
-			case OrmPackage.XML_ENTITY__PRE_PERSIST:
-				return prePersist != null;
-			case OrmPackage.XML_ENTITY__POST_PERSIST:
-				return postPersist != null;
-			case OrmPackage.XML_ENTITY__PRE_REMOVE:
-				return preRemove != null;
-			case OrmPackage.XML_ENTITY__POST_REMOVE:
-				return postRemove != null;
-			case OrmPackage.XML_ENTITY__PRE_UPDATE:
-				return preUpdate != null;
-			case OrmPackage.XML_ENTITY__POST_UPDATE:
-				return postUpdate != null;
-			case OrmPackage.XML_ENTITY__POST_LOAD:
-				return postLoad != null;
-			case OrmPackage.XML_ENTITY__ATTRIBUTE_OVERRIDES:
-				return attributeOverrides != null && !attributeOverrides.isEmpty();
-			case OrmPackage.XML_ENTITY__ASSOCIATION_OVERRIDES:
-				return associationOverrides != null && !associationOverrides.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(", discriminatorValue: ");
-		result.append(discriminatorValue);
-		result.append(", excludeDefaultListeners: ");
-		result.append(excludeDefaultListeners);
-		result.append(", excludeSuperclassListeners: ");
-		result.append(excludeSuperclassListeners);
-		result.append(')');
-		return result.toString();
-	}
-
-} // Entity
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntityMappings.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntityMappings.java
deleted file mode 100644
index a722bf490c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntityMappings.java
+++ /dev/null
@@ -1,1079 +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.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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>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.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getVersion <em>Version</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getPersistenceUnitMetadata <em>Persistence Unit Metadata</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getPackage <em>Package</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getSchema <em>Schema</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getCatalog <em>Catalog</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getAccess <em>Access</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getSequenceGenerators <em>Sequence Generators</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getTableGenerators <em>Table Generators</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getNamedQueries <em>Named Queries</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getNamedNativeQueries <em>Named Native Queries</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getSqlResultSetMappings <em>Sql Result Set Mappings</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getMappedSuperclasses <em>Mapped Superclasses</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getEntities <em>Entities</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getEmbeddables <em>Embeddables</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntityMappings()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlEntityMappings extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = "1.0";
-
-	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String version = VERSION_EDEFAULT;
-
-	/**
-	 * This is true if the Version attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean versionESet;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPersistenceUnitMetadata() <em>Persistence Unit Metadata</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceUnitMetadata()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPersistenceUnitMetadata persistenceUnitMetadata;
-
-	/**
-	 * The default value of the '{@link #getPackage() <em>Package</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPackage()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PACKAGE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPackage() <em>Package</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPackage()
-	 * @generated
-	 * @ordered
-	 */
-	protected String package_ = PACKAGE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSchema() <em>Schema</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSchema()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SCHEMA_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSchema() <em>Schema</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSchema()
-	 * @generated
-	 * @ordered
-	 */
-	protected String schema = SCHEMA_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCatalog() <em>Catalog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCatalog()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CATALOG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCatalog() <em>Catalog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCatalog()
-	 * @generated
-	 * @ordered
-	 */
-	protected String catalog = CATALOG_EDEFAULT;
-
-	/**
-	 * 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 #getSequenceGenerators() <em>Sequence Generators</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSequenceGenerators()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlSequenceGenerator> sequenceGenerators;
-
-	/**
-	 * The cached value of the '{@link #getTableGenerators() <em>Table Generators</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTableGenerators()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlTableGenerator> tableGenerators;
-
-	/**
-	 * The cached value of the '{@link #getNamedQueries() <em>Named Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamedQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlNamedQuery> namedQueries;
-
-	/**
-	 * The cached value of the '{@link #getNamedNativeQueries() <em>Named Native Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamedNativeQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlNamedNativeQuery> namedNativeQueries;
-
-	/**
-	 * The cached value of the '{@link #getSqlResultSetMappings() <em>Sql Result Set Mappings</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSqlResultSetMappings()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<SqlResultSetMapping> sqlResultSetMappings;
-
-	/**
-	 * The cached value of the '{@link #getMappedSuperclasses() <em>Mapped Superclasses</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedSuperclasses()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlMappedSuperclass> mappedSuperclasses;
-
-	/**
-	 * The cached value of the '{@link #getEntities() <em>Entities</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEntities()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlEntity> entities;
-
-	/**
-	 * The cached value of the '{@link #getEmbeddables() <em>Embeddables</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEmbeddables()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlEmbeddable> embeddables;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlEntityMappings()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_ENTITY_MAPPINGS;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * The default value is <code>"1.0"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Version</em>' attribute.
-	 * @see #isSetVersion()
-	 * @see #unsetVersion()
-	 * @see #setVersion(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntityMappings_Version()
-	 * @model default="1.0" unsettable="true" dataType="org.eclipse.jpt.core.resource.orm.VersionType" required="true"
-	 * @generated
-	 */
-	public String getVersion()
-	{
-		return version;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' attribute.
-	 * @see #isSetVersion()
-	 * @see #unsetVersion()
-	 * @see #getVersion()
-	 * @generated
-	 */
-	public void setVersion(String newVersion)
-	{
-		String oldVersion = version;
-		version = newVersion;
-		boolean oldVersionESet = versionESet;
-		versionESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY_MAPPINGS__VERSION, oldVersion, version, !oldVersionESet));
-	}
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetVersion()
-	 * @see #getVersion()
-	 * @see #setVersion(String)
-	 * @generated
-	 */
-	public void unsetVersion()
-	{
-		String oldVersion = version;
-		boolean oldVersionESet = versionESet;
-		version = VERSION_EDEFAULT;
-		versionESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, OrmPackage.XML_ENTITY_MAPPINGS__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet));
-	}
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getVersion <em>Version</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Version</em>' attribute is set.
-	 * @see #unsetVersion()
-	 * @see #getVersion()
-	 * @see #setVersion(String)
-	 * @generated
-	 */
-	public boolean isSetVersion()
-	{
-		return versionESet;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntityMappings_Description()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getDescription()
-	{
-		return description;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	public void setDescription(String newDescription)
-	{
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY_MAPPINGS__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Unit Metadata</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XmlPersistence Unit Metadata</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Persistence Unit Metadata</em>' containment reference.
-	 * @see #setPersistenceUnitMetadata(XmlPersistenceUnitMetadata)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntityMappings_PersistenceUnitMetadata()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPersistenceUnitMetadata getPersistenceUnitMetadata()
-	{
-		return persistenceUnitMetadata;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPersistenceUnitMetadata(XmlPersistenceUnitMetadata newPersistenceUnitMetadata, NotificationChain msgs)
-	{
-		XmlPersistenceUnitMetadata oldPersistenceUnitMetadata = persistenceUnitMetadata;
-		persistenceUnitMetadata = newPersistenceUnitMetadata;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY_MAPPINGS__PERSISTENCE_UNIT_METADATA, oldPersistenceUnitMetadata, newPersistenceUnitMetadata);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getPersistenceUnitMetadata <em>Persistence Unit Metadata</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Persistence Unit Metadata</em>' containment reference.
-	 * @see #getPersistenceUnitMetadata()
-	 * @generated
-	 */
-	public void setPersistenceUnitMetadata(XmlPersistenceUnitMetadata newPersistenceUnitMetadata)
-	{
-		if (newPersistenceUnitMetadata != persistenceUnitMetadata)
-		{
-			NotificationChain msgs = null;
-			if (persistenceUnitMetadata != null)
-				msgs = ((InternalEObject)persistenceUnitMetadata).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY_MAPPINGS__PERSISTENCE_UNIT_METADATA, null, msgs);
-			if (newPersistenceUnitMetadata != null)
-				msgs = ((InternalEObject)newPersistenceUnitMetadata).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY_MAPPINGS__PERSISTENCE_UNIT_METADATA, null, msgs);
-			msgs = basicSetPersistenceUnitMetadata(newPersistenceUnitMetadata, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY_MAPPINGS__PERSISTENCE_UNIT_METADATA, newPersistenceUnitMetadata, newPersistenceUnitMetadata));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Package</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Package</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Package</em>' attribute.
-	 * @see #setPackage(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntityMappings_Package()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getPackage()
-	{
-		return package_;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getPackage <em>Package</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Package</em>' attribute.
-	 * @see #getPackage()
-	 * @generated
-	 */
-	public void setPackage(String newPackage)
-	{
-		String oldPackage = package_;
-		package_ = newPackage;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY_MAPPINGS__PACKAGE, oldPackage, package_));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Schema</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Schema</em>' attribute.
-	 * @see #setSchema(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntityMappings_Schema()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getSchema()
-	{
-		return schema;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getSchema <em>Schema</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Schema</em>' attribute.
-	 * @see #getSchema()
-	 * @generated
-	 */
-	public void setSchema(String newSchema)
-	{
-		String oldSchema = schema;
-		schema = newSchema;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY_MAPPINGS__SCHEMA, oldSchema, schema));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Catalog</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Catalog</em>' attribute.
-	 * @see #setCatalog(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntityMappings_Catalog()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getCatalog()
-	{
-		return catalog;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#getCatalog <em>Catalog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Catalog</em>' attribute.
-	 * @see #getCatalog()
-	 * @generated
-	 */
-	public void setCatalog(String newCatalog)
-	{
-		String oldCatalog = catalog;
-		catalog = newCatalog;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY_MAPPINGS__CATALOG, oldCatalog, catalog));
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlEntityMappings_Access()
-	 * @model default="PROPERTY"
-	 * @generated
-	 */
-	public AccessType getAccess()
-	{
-		return access;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntityMappings#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, OrmPackage.XML_ENTITY_MAPPINGS__ACCESS, oldAccess, access));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Sequence Generators</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sequence Generators</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>Sequence Generators</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntityMappings_SequenceGenerators()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlSequenceGenerator> getSequenceGenerators()
-	{
-		if (sequenceGenerators == null)
-		{
-			sequenceGenerators = new EObjectContainmentEList<XmlSequenceGenerator>(XmlSequenceGenerator.class, this, OrmPackage.XML_ENTITY_MAPPINGS__SEQUENCE_GENERATORS);
-		}
-		return sequenceGenerators;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Table Generators</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table Generators</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>Table Generators</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntityMappings_TableGenerators()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlTableGenerator> getTableGenerators()
-	{
-		if (tableGenerators == null)
-		{
-			tableGenerators = new EObjectContainmentEList<XmlTableGenerator>(XmlTableGenerator.class, this, OrmPackage.XML_ENTITY_MAPPINGS__TABLE_GENERATORS);
-		}
-		return tableGenerators;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Named Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlNamedQuery}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntityMappings_NamedQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlNamedQuery> getNamedQueries()
-	{
-		if (namedQueries == null)
-		{
-			namedQueries = new EObjectContainmentEList<XmlNamedQuery>(XmlNamedQuery.class, this, OrmPackage.XML_ENTITY_MAPPINGS__NAMED_QUERIES);
-		}
-		return namedQueries;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Named Native Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Native Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Native Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntityMappings_NamedNativeQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlNamedNativeQuery> getNamedNativeQueries()
-	{
-		if (namedNativeQueries == null)
-		{
-			namedNativeQueries = new EObjectContainmentEList<XmlNamedNativeQuery>(XmlNamedNativeQuery.class, this, OrmPackage.XML_ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES);
-		}
-		return namedNativeQueries;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Sql Result Set Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sql Result Set Mappings</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sql Result Set Mappings</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntityMappings_SqlResultSetMappings()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<SqlResultSetMapping> getSqlResultSetMappings()
-	{
-		if (sqlResultSetMappings == null)
-		{
-			sqlResultSetMappings = new EObjectContainmentEList<SqlResultSetMapping>(SqlResultSetMapping.class, this, OrmPackage.XML_ENTITY_MAPPINGS__SQL_RESULT_SET_MAPPINGS);
-		}
-		return sqlResultSetMappings;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Mapped Superclasses</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mapped Superclasses</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>Mapped Superclasses</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntityMappings_MappedSuperclasses()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlMappedSuperclass> getMappedSuperclasses()
-	{
-		if (mappedSuperclasses == null)
-		{
-			mappedSuperclasses = new EObjectContainmentEList<XmlMappedSuperclass>(XmlMappedSuperclass.class, this, OrmPackage.XML_ENTITY_MAPPINGS__MAPPED_SUPERCLASSES);
-		}
-		return mappedSuperclasses;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Entities</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlEntity}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Entities</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>Entities</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntityMappings_Entities()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlEntity> getEntities()
-	{
-		if (entities == null)
-		{
-			entities = new EObjectContainmentEList<XmlEntity>(XmlEntity.class, this, OrmPackage.XML_ENTITY_MAPPINGS__ENTITIES);
-		}
-		return entities;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Embeddables</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlEmbeddable}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Embeddables</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>Embeddables</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntityMappings_Embeddables()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlEmbeddable> getEmbeddables()
-	{
-		if (embeddables == null)
-		{
-			embeddables = new EObjectContainmentEList<XmlEmbeddable>(XmlEmbeddable.class, this, OrmPackage.XML_ENTITY_MAPPINGS__EMBEDDABLES);
-		}
-		return embeddables;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ENTITY_MAPPINGS__PERSISTENCE_UNIT_METADATA:
-				return basicSetPersistenceUnitMetadata(null, msgs);
-			case OrmPackage.XML_ENTITY_MAPPINGS__SEQUENCE_GENERATORS:
-				return ((InternalEList<?>)getSequenceGenerators()).basicRemove(otherEnd, msgs);
-			case OrmPackage.XML_ENTITY_MAPPINGS__TABLE_GENERATORS:
-				return ((InternalEList<?>)getTableGenerators()).basicRemove(otherEnd, msgs);
-			case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_QUERIES:
-				return ((InternalEList<?>)getNamedQueries()).basicRemove(otherEnd, msgs);
-			case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES:
-				return ((InternalEList<?>)getNamedNativeQueries()).basicRemove(otherEnd, msgs);
-			case OrmPackage.XML_ENTITY_MAPPINGS__SQL_RESULT_SET_MAPPINGS:
-				return ((InternalEList<?>)getSqlResultSetMappings()).basicRemove(otherEnd, msgs);
-			case OrmPackage.XML_ENTITY_MAPPINGS__MAPPED_SUPERCLASSES:
-				return ((InternalEList<?>)getMappedSuperclasses()).basicRemove(otherEnd, msgs);
-			case OrmPackage.XML_ENTITY_MAPPINGS__ENTITIES:
-				return ((InternalEList<?>)getEntities()).basicRemove(otherEnd, msgs);
-			case OrmPackage.XML_ENTITY_MAPPINGS__EMBEDDABLES:
-				return ((InternalEList<?>)getEmbeddables()).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 OrmPackage.XML_ENTITY_MAPPINGS__VERSION:
-				return getVersion();
-			case OrmPackage.XML_ENTITY_MAPPINGS__DESCRIPTION:
-				return getDescription();
-			case OrmPackage.XML_ENTITY_MAPPINGS__PERSISTENCE_UNIT_METADATA:
-				return getPersistenceUnitMetadata();
-			case OrmPackage.XML_ENTITY_MAPPINGS__PACKAGE:
-				return getPackage();
-			case OrmPackage.XML_ENTITY_MAPPINGS__SCHEMA:
-				return getSchema();
-			case OrmPackage.XML_ENTITY_MAPPINGS__CATALOG:
-				return getCatalog();
-			case OrmPackage.XML_ENTITY_MAPPINGS__ACCESS:
-				return getAccess();
-			case OrmPackage.XML_ENTITY_MAPPINGS__SEQUENCE_GENERATORS:
-				return getSequenceGenerators();
-			case OrmPackage.XML_ENTITY_MAPPINGS__TABLE_GENERATORS:
-				return getTableGenerators();
-			case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_QUERIES:
-				return getNamedQueries();
-			case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES:
-				return getNamedNativeQueries();
-			case OrmPackage.XML_ENTITY_MAPPINGS__SQL_RESULT_SET_MAPPINGS:
-				return getSqlResultSetMappings();
-			case OrmPackage.XML_ENTITY_MAPPINGS__MAPPED_SUPERCLASSES:
-				return getMappedSuperclasses();
-			case OrmPackage.XML_ENTITY_MAPPINGS__ENTITIES:
-				return getEntities();
-			case OrmPackage.XML_ENTITY_MAPPINGS__EMBEDDABLES:
-				return getEmbeddables();
-		}
-		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 OrmPackage.XML_ENTITY_MAPPINGS__VERSION:
-				setVersion((String)newValue);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__PERSISTENCE_UNIT_METADATA:
-				setPersistenceUnitMetadata((XmlPersistenceUnitMetadata)newValue);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__PACKAGE:
-				setPackage((String)newValue);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__SCHEMA:
-				setSchema((String)newValue);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__CATALOG:
-				setCatalog((String)newValue);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__ACCESS:
-				setAccess((AccessType)newValue);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__SEQUENCE_GENERATORS:
-				getSequenceGenerators().clear();
-				getSequenceGenerators().addAll((Collection<? extends XmlSequenceGenerator>)newValue);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__TABLE_GENERATORS:
-				getTableGenerators().clear();
-				getTableGenerators().addAll((Collection<? extends XmlTableGenerator>)newValue);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_QUERIES:
-				getNamedQueries().clear();
-				getNamedQueries().addAll((Collection<? extends XmlNamedQuery>)newValue);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES:
-				getNamedNativeQueries().clear();
-				getNamedNativeQueries().addAll((Collection<? extends XmlNamedNativeQuery>)newValue);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__SQL_RESULT_SET_MAPPINGS:
-				getSqlResultSetMappings().clear();
-				getSqlResultSetMappings().addAll((Collection<? extends SqlResultSetMapping>)newValue);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__MAPPED_SUPERCLASSES:
-				getMappedSuperclasses().clear();
-				getMappedSuperclasses().addAll((Collection<? extends XmlMappedSuperclass>)newValue);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__ENTITIES:
-				getEntities().clear();
-				getEntities().addAll((Collection<? extends XmlEntity>)newValue);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__EMBEDDABLES:
-				getEmbeddables().clear();
-				getEmbeddables().addAll((Collection<? extends XmlEmbeddable>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ENTITY_MAPPINGS__VERSION:
-				unsetVersion();
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__PERSISTENCE_UNIT_METADATA:
-				setPersistenceUnitMetadata((XmlPersistenceUnitMetadata)null);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__PACKAGE:
-				setPackage(PACKAGE_EDEFAULT);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__SCHEMA:
-				setSchema(SCHEMA_EDEFAULT);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__CATALOG:
-				setCatalog(CATALOG_EDEFAULT);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__ACCESS:
-				setAccess(ACCESS_EDEFAULT);
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__SEQUENCE_GENERATORS:
-				getSequenceGenerators().clear();
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__TABLE_GENERATORS:
-				getTableGenerators().clear();
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_QUERIES:
-				getNamedQueries().clear();
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES:
-				getNamedNativeQueries().clear();
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__SQL_RESULT_SET_MAPPINGS:
-				getSqlResultSetMappings().clear();
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__MAPPED_SUPERCLASSES:
-				getMappedSuperclasses().clear();
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__ENTITIES:
-				getEntities().clear();
-				return;
-			case OrmPackage.XML_ENTITY_MAPPINGS__EMBEDDABLES:
-				getEmbeddables().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ENTITY_MAPPINGS__VERSION:
-				return isSetVersion();
-			case OrmPackage.XML_ENTITY_MAPPINGS__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case OrmPackage.XML_ENTITY_MAPPINGS__PERSISTENCE_UNIT_METADATA:
-				return persistenceUnitMetadata != null;
-			case OrmPackage.XML_ENTITY_MAPPINGS__PACKAGE:
-				return PACKAGE_EDEFAULT == null ? package_ != null : !PACKAGE_EDEFAULT.equals(package_);
-			case OrmPackage.XML_ENTITY_MAPPINGS__SCHEMA:
-				return SCHEMA_EDEFAULT == null ? schema != null : !SCHEMA_EDEFAULT.equals(schema);
-			case OrmPackage.XML_ENTITY_MAPPINGS__CATALOG:
-				return CATALOG_EDEFAULT == null ? catalog != null : !CATALOG_EDEFAULT.equals(catalog);
-			case OrmPackage.XML_ENTITY_MAPPINGS__ACCESS:
-				return access != ACCESS_EDEFAULT;
-			case OrmPackage.XML_ENTITY_MAPPINGS__SEQUENCE_GENERATORS:
-				return sequenceGenerators != null && !sequenceGenerators.isEmpty();
-			case OrmPackage.XML_ENTITY_MAPPINGS__TABLE_GENERATORS:
-				return tableGenerators != null && !tableGenerators.isEmpty();
-			case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_QUERIES:
-				return namedQueries != null && !namedQueries.isEmpty();
-			case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES:
-				return namedNativeQueries != null && !namedNativeQueries.isEmpty();
-			case OrmPackage.XML_ENTITY_MAPPINGS__SQL_RESULT_SET_MAPPINGS:
-				return sqlResultSetMappings != null && !sqlResultSetMappings.isEmpty();
-			case OrmPackage.XML_ENTITY_MAPPINGS__MAPPED_SUPERCLASSES:
-				return mappedSuperclasses != null && !mappedSuperclasses.isEmpty();
-			case OrmPackage.XML_ENTITY_MAPPINGS__ENTITIES:
-				return entities != null && !entities.isEmpty();
-			case OrmPackage.XML_ENTITY_MAPPINGS__EMBEDDABLES:
-				return embeddables != null && !embeddables.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-	
-	
-	// **************** overrides **********************************************
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (version: ");
-		if (versionESet) result.append(version); else result.append("<unset>");
-		result.append(", description: ");
-		result.append(description);
-		result.append(", package: ");
-		result.append(package_);
-		result.append(", schema: ");
-		result.append(schema);
-		result.append(", catalog: ");
-		result.append(catalog);
-		result.append(", access: ");
-		result.append(access);
-		result.append(')');
-		return result.toString();
-	}
-	
-	@Override
-	public JpaEObject getRoot() {
-		return this;
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlGeneratedValue.java
deleted file mode 100644
index 26eef8a2fd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlGeneratedValue.java
+++ /dev/null
@@ -1,102 +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.core.resource.orm;
-
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Generated 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.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValue#getGenerator <em>Generator</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValue#getStrategy <em>Strategy</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGeneratedValue()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlGeneratedValue extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Generator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Generator</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Generator</em>' attribute.
-	 * @see #setGenerator(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGeneratedValue_Generator()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getGenerator();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValue#getGenerator <em>Generator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Generator</em>' attribute.
-	 * @see #getGenerator()
-	 * @generated
-	 */
-	void setGenerator(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Strategy</b></em>' attribute.
-	 * The default value is <code>"TABLE"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.GenerationType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Strategy</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Strategy</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.GenerationType
-	 * @see #setStrategy(GenerationType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGeneratedValue_Strategy()
-	 * @model default="TABLE"
-	 * @generated
-	 */
-	GenerationType getStrategy();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValue#getStrategy <em>Strategy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Strategy</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.GenerationType
-	 * @see #getStrategy()
-	 * @generated
-	 */
-	void setStrategy(GenerationType value);
-
-	/**
-	 * Return the {@link TextRange} for the generator attibute.  If the generator attibute 
-	 * does not exist return the {@link TextRange} for the generated-value element.
-	 */
-	TextRange getGeneratorTextRange();
-} // GeneratedValue
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlGeneratedValueImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlGeneratedValueImpl.java
deleted file mode 100644
index 227227f84b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlGeneratedValueImpl.java
+++ /dev/null
@@ -1,269 +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.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.internal.utility.emf.DOMUtilities;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Generated 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.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGeneratedValueImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlGeneratedValueImpl extends AbstractJpaEObject implements XmlGeneratedValue
-{
-	/**
-	 * The default value of the '{@link #getGenerator() <em>Generator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGenerator()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String GENERATOR_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getGenerator() <em>Generator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGenerator()
-	 * @generated
-	 * @ordered
-	 */
-	protected String generator = GENERATOR_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 GenerationType STRATEGY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStrategy() <em>Strategy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStrategy()
-	 * @generated
-	 * @ordered
-	 */
-	protected GenerationType strategy = STRATEGY_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlGeneratedValueImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_GENERATED_VALUE_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Generator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Generator</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Generator</em>' attribute.
-	 * @see #setGenerator(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGeneratedValue_Generator()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getGenerator()
-	{
-		return generator;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValueImpl#getGenerator <em>Generator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Generator</em>' attribute.
-	 * @see #getGenerator()
-	 * @generated
-	 */
-	public void setGenerator(String newGenerator)
-	{
-		String oldGenerator = generator;
-		generator = newGenerator;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_GENERATED_VALUE_IMPL__GENERATOR, oldGenerator, generator));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Strategy</b></em>' attribute.
-	 * The default value is <code>"TABLE"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.GenerationType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Strategy</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Strategy</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.GenerationType
-	 * @see #setStrategy(GenerationType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGeneratedValue_Strategy()
-	 * @model default="TABLE"
-	 * @generated
-	 */
-	public GenerationType getStrategy()
-	{
-		return strategy;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValueImpl#getStrategy <em>Strategy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Strategy</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.GenerationType
-	 * @see #getStrategy()
-	 * @generated
-	 */
-	public void setStrategy(GenerationType newStrategy)
-	{
-		GenerationType oldStrategy = strategy;
-		strategy = newStrategy == null ? STRATEGY_EDEFAULT : newStrategy;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_GENERATED_VALUE_IMPL__STRATEGY, oldStrategy, strategy));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_GENERATED_VALUE_IMPL__GENERATOR:
-				return getGenerator();
-			case OrmPackage.XML_GENERATED_VALUE_IMPL__STRATEGY:
-				return getStrategy();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_GENERATED_VALUE_IMPL__GENERATOR:
-				setGenerator((String)newValue);
-				return;
-			case OrmPackage.XML_GENERATED_VALUE_IMPL__STRATEGY:
-				setStrategy((GenerationType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_GENERATED_VALUE_IMPL__GENERATOR:
-				setGenerator(GENERATOR_EDEFAULT);
-				return;
-			case OrmPackage.XML_GENERATED_VALUE_IMPL__STRATEGY:
-				setStrategy(STRATEGY_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_GENERATED_VALUE_IMPL__GENERATOR:
-				return GENERATOR_EDEFAULT == null ? generator != null : !GENERATOR_EDEFAULT.equals(generator);
-			case OrmPackage.XML_GENERATED_VALUE_IMPL__STRATEGY:
-				return strategy != STRATEGY_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(" (generator: ");
-		result.append(generator);
-		result.append(", strategy: ");
-		result.append(strategy);
-		result.append(')');
-		return result.toString();
-	}
-
-	public TextRange getGeneratorTextRange() {
-		IDOMNode generatorNode = (IDOMNode) DOMUtilities.childAttributeNode(this.node, OrmXmlMapper.GENERATOR);
-		return (generatorNode == null) ? getValidationTextRange() : buildTextRange(generatorNode);
-	}
-} // GeneratedValue
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlGenerator.java
deleted file mode 100644
index 51b4174e8d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlGenerator.java
+++ /dev/null
@@ -1,123 +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.core.resource.orm;
-
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Generator</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.core.resource.orm.XmlGenerator#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlGenerator#getInitialValue <em>Initial Value</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlGenerator#getAllocationSize <em>Allocation Size</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGenerator()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlGenerator 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.core.resource.orm.OrmPackage#getXmlGenerator_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlGenerator#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Initial Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Initial 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>Initial Value</em>' attribute.
-	 * @see #setInitialValue(Integer)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGenerator_InitialValue()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	Integer getInitialValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlGenerator#getInitialValue <em>Initial Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Initial Value</em>' attribute.
-	 * @see #getInitialValue()
-	 * @generated
-	 */
-	void setInitialValue(Integer value);
-
-	/**
-	 * Returns the value of the '<em><b>Allocation Size</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Allocation 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>Allocation Size</em>' attribute.
-	 * @see #setAllocationSize(Integer)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGenerator_AllocationSize()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	Integer getAllocationSize();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlGenerator#getAllocationSize <em>Allocation Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Allocation Size</em>' attribute.
-	 * @see #getAllocationSize()
-	 * @generated
-	 */
-	void setAllocationSize(Integer value);
-	
-	public TextRange getNameTextRange();
-	
-	boolean isVirtual();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlId.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlId.java
deleted file mode 100644
index c56d38c1d9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlId.java
+++ /dev/null
@@ -1,147 +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.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>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.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlId#getGeneratedValue <em>Generated Value</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlId#getTemporal <em>Temporal</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlId#getTableGenerator <em>Table Generator</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlId#getSequenceGenerator <em>Sequence Generator</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlId()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlId extends XmlAttributeMapping, ColumnMapping
-{
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlId_GeneratedValue()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlGeneratedValue getGeneratedValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlId#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>Temporal</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.TemporalType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Temporal</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Temporal</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.TemporalType
-	 * @see #setTemporal(TemporalType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlId_Temporal()
-	 * @model
-	 * @generated
-	 */
-	TemporalType getTemporal();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlId#getTemporal <em>Temporal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Temporal</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.TemporalType
-	 * @see #getTemporal()
-	 * @generated
-	 */
-	void setTemporal(TemporalType 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.core.resource.orm.OrmPackage#getXmlId_TableGenerator()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlTableGenerator getTableGenerator();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlId#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.core.resource.orm.OrmPackage#getXmlId_SequenceGenerator()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlSequenceGenerator getSequenceGenerator();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlId#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);
-
-} // Id
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlIdClass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlIdClass.java
deleted file mode 100644
index 1bb0e3dd92..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlIdClass.java
+++ /dev/null
@@ -1,202 +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.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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Id Class</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.core.resource.orm.XmlIdClass#getClassName <em>Class Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlIdClass()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlIdClass extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * 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 XmlIdClass()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_ID_CLASS;
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlIdClass_ClassName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getClassName()
-	{
-		return className;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlIdClass#getClassName <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class Name</em>' attribute.
-	 * @see #getClassName()
-	 * @generated
-	 */
-	public void setClassName(String newClassName)
-	{
-		String oldClassName = className;
-		className = newClassName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ID_CLASS__CLASS_NAME, oldClassName, className));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ID_CLASS__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 OrmPackage.XML_ID_CLASS__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 OrmPackage.XML_ID_CLASS__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 OrmPackage.XML_ID_CLASS__CLASS_NAME:
-				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (className: ");
-		result.append(className);
-		result.append(')');
-		return result.toString();
-	}
-
-} // IdClass
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlIdImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlIdImpl.java
deleted file mode 100644
index 1f675e59ab..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlIdImpl.java
+++ /dev/null
@@ -1,596 +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.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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>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.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlIdImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlIdImpl extends AbstractXmlAttributeMapping implements XmlId
-{
-	/**
-	 * The cached value of the '{@link #getColumn() <em>Column</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getColumn()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlColumn column;
-
-	/**
-	 * 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;
-
-	/**
-	 * 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 TemporalType TEMPORAL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTemporal() <em>Temporal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTemporal()
-	 * @generated
-	 * @ordered
-	 */
-	protected TemporalType temporal = TEMPORAL_EDEFAULT;
-
-	/**
-	 * 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 XmlIdImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_ID_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Column</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Column</em>' containment reference.
-	 * @see #setColumn(XmlColumn)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnMapping_Column()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlColumn getColumn()
-	{
-		return column;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetColumn(XmlColumn newColumn, NotificationChain msgs)
-	{
-		XmlColumn oldColumn = column;
-		column = newColumn;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ID_IMPL__COLUMN, oldColumn, newColumn);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlIdImpl#getColumn <em>Column</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Column</em>' containment reference.
-	 * @see #getColumn()
-	 * @generated
-	 */
-	public void setColumn(XmlColumn newColumn)
-	{
-		if (newColumn != column)
-		{
-			NotificationChain msgs = null;
-			if (column != null)
-				msgs = ((InternalEObject)column).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ID_IMPL__COLUMN, null, msgs);
-			if (newColumn != null)
-				msgs = ((InternalEObject)newColumn).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ID_IMPL__COLUMN, null, msgs);
-			msgs = basicSetColumn(newColumn, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ID_IMPL__COLUMN, newColumn, newColumn));
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlId_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, OrmPackage.XML_ID_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.core.resource.orm.XmlIdImpl#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 - OrmPackage.XML_ID_IMPL__GENERATED_VALUE, null, msgs);
-			if (newGeneratedValue != null)
-				msgs = ((InternalEObject)newGeneratedValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ID_IMPL__GENERATED_VALUE, null, msgs);
-			msgs = basicSetGeneratedValue(newGeneratedValue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ID_IMPL__GENERATED_VALUE, newGeneratedValue, newGeneratedValue));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Temporal</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.TemporalType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Temporal</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Temporal</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.TemporalType
-	 * @see #setTemporal(TemporalType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlId_Temporal()
-	 * @model
-	 * @generated
-	 */
-	public TemporalType getTemporal()
-	{
-		return temporal;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlIdImpl#getTemporal <em>Temporal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Temporal</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.TemporalType
-	 * @see #getTemporal()
-	 * @generated
-	 */
-	public void setTemporal(TemporalType newTemporal)
-	{
-		TemporalType oldTemporal = temporal;
-		temporal = newTemporal == null ? TEMPORAL_EDEFAULT : newTemporal;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ID_IMPL__TEMPORAL, oldTemporal, temporal));
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlId_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, OrmPackage.XML_ID_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.core.resource.orm.XmlIdImpl#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 - OrmPackage.XML_ID_IMPL__TABLE_GENERATOR, null, msgs);
-			if (newTableGenerator != null)
-				msgs = ((InternalEObject)newTableGenerator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ID_IMPL__TABLE_GENERATOR, null, msgs);
-			msgs = basicSetTableGenerator(newTableGenerator, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ID_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.core.resource.orm.OrmPackage#getXmlId_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, OrmPackage.XML_ID_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.core.resource.orm.XmlIdImpl#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 - OrmPackage.XML_ID_IMPL__SEQUENCE_GENERATOR, null, msgs);
-			if (newSequenceGenerator != null)
-				msgs = ((InternalEObject)newSequenceGenerator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ID_IMPL__SEQUENCE_GENERATOR, null, msgs);
-			msgs = basicSetSequenceGenerator(newSequenceGenerator, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ID_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 OrmPackage.XML_ID_IMPL__COLUMN:
-				return basicSetColumn(null, msgs);
-			case OrmPackage.XML_ID_IMPL__GENERATED_VALUE:
-				return basicSetGeneratedValue(null, msgs);
-			case OrmPackage.XML_ID_IMPL__TABLE_GENERATOR:
-				return basicSetTableGenerator(null, msgs);
-			case OrmPackage.XML_ID_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 OrmPackage.XML_ID_IMPL__COLUMN:
-				return getColumn();
-			case OrmPackage.XML_ID_IMPL__GENERATED_VALUE:
-				return getGeneratedValue();
-			case OrmPackage.XML_ID_IMPL__TEMPORAL:
-				return getTemporal();
-			case OrmPackage.XML_ID_IMPL__TABLE_GENERATOR:
-				return getTableGenerator();
-			case OrmPackage.XML_ID_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 OrmPackage.XML_ID_IMPL__COLUMN:
-				setColumn((XmlColumn)newValue);
-				return;
-			case OrmPackage.XML_ID_IMPL__GENERATED_VALUE:
-				setGeneratedValue((XmlGeneratedValue)newValue);
-				return;
-			case OrmPackage.XML_ID_IMPL__TEMPORAL:
-				setTemporal((TemporalType)newValue);
-				return;
-			case OrmPackage.XML_ID_IMPL__TABLE_GENERATOR:
-				setTableGenerator((XmlTableGenerator)newValue);
-				return;
-			case OrmPackage.XML_ID_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 OrmPackage.XML_ID_IMPL__COLUMN:
-				setColumn((XmlColumn)null);
-				return;
-			case OrmPackage.XML_ID_IMPL__GENERATED_VALUE:
-				setGeneratedValue((XmlGeneratedValue)null);
-				return;
-			case OrmPackage.XML_ID_IMPL__TEMPORAL:
-				setTemporal(TEMPORAL_EDEFAULT);
-				return;
-			case OrmPackage.XML_ID_IMPL__TABLE_GENERATOR:
-				setTableGenerator((XmlTableGenerator)null);
-				return;
-			case OrmPackage.XML_ID_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 OrmPackage.XML_ID_IMPL__COLUMN:
-				return column != null;
-			case OrmPackage.XML_ID_IMPL__GENERATED_VALUE:
-				return generatedValue != null;
-			case OrmPackage.XML_ID_IMPL__TEMPORAL:
-				return temporal != TEMPORAL_EDEFAULT;
-			case OrmPackage.XML_ID_IMPL__TABLE_GENERATOR:
-				return tableGenerator != null;
-			case OrmPackage.XML_ID_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 == ColumnMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_ID_IMPL__COLUMN: return OrmPackage.COLUMN_MAPPING__COLUMN;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlId.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_ID_IMPL__GENERATED_VALUE: return OrmPackage.XML_ID__GENERATED_VALUE;
-				case OrmPackage.XML_ID_IMPL__TEMPORAL: return OrmPackage.XML_ID__TEMPORAL;
-				case OrmPackage.XML_ID_IMPL__TABLE_GENERATOR: return OrmPackage.XML_ID__TABLE_GENERATOR;
-				case OrmPackage.XML_ID_IMPL__SEQUENCE_GENERATOR: return OrmPackage.XML_ID__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 == ColumnMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.COLUMN_MAPPING__COLUMN: return OrmPackage.XML_ID_IMPL__COLUMN;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlId.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_ID__GENERATED_VALUE: return OrmPackage.XML_ID_IMPL__GENERATED_VALUE;
-				case OrmPackage.XML_ID__TEMPORAL: return OrmPackage.XML_ID_IMPL__TEMPORAL;
-				case OrmPackage.XML_ID__TABLE_GENERATOR: return OrmPackage.XML_ID_IMPL__TABLE_GENERATOR;
-				case OrmPackage.XML_ID__SEQUENCE_GENERATOR: return OrmPackage.XML_ID_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(" (temporal: ");
-		result.append(temporal);
-		result.append(')');
-		return result.toString();
-	}
-
-} // Id
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlJoinColumn.java
deleted file mode 100644
index b2e260a3a4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlJoinColumn.java
+++ /dev/null
@@ -1,67 +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.core.resource.orm;
-
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Join Column</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.core.resource.orm.XmlJoinColumn#getReferencedColumnName <em>Referenced Column Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinColumn()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlJoinColumn extends XmlAbstractColumn
-{
-	/**
-	 * Returns the value of the '<em><b>Referenced Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Referenced Column 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>Referenced Column Name</em>' attribute.
-	 * @see #setReferencedColumnName(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinColumn_ReferencedColumnName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getReferencedColumnName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn#getReferencedColumnName <em>Referenced Column Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Referenced Column Name</em>' attribute.
-	 * @see #getReferencedColumnName()
-	 * @generated
-	 */
-	void setReferencedColumnName(String value);
-	
-	TextRange getReferencedColumnNameTextRange();
-
-} // JoinColumn
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlJoinColumnImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlJoinColumnImpl.java
deleted file mode 100644
index 61e65f7801..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlJoinColumnImpl.java
+++ /dev/null
@@ -1,239 +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.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.internal.utility.emf.DOMUtilities;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Join Column</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.core.resource.orm.OrmPackage#getXmlJoinColumnImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlJoinColumnImpl extends AbstractXmlAbstractColumn implements XmlJoinColumn
-{
-	/**
-	 * The default value of the '{@link #getReferencedColumnName() <em>Referenced Column Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReferencedColumnName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REFERENCED_COLUMN_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getReferencedColumnName() <em>Referenced Column Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReferencedColumnName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String referencedColumnName = REFERENCED_COLUMN_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlJoinColumnImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_JOIN_COLUMN_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Referenced Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Referenced Column 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>Referenced Column Name</em>' attribute.
-	 * @see #setReferencedColumnName(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinColumn_ReferencedColumnName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getReferencedColumnName()
-	{
-		return referencedColumnName;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlJoinColumnImpl#getReferencedColumnName <em>Referenced Column Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Referenced Column Name</em>' attribute.
-	 * @see #getReferencedColumnName()
-	 * @generated
-	 */
-	public void setReferencedColumnName(String newReferencedColumnName)
-	{
-		String oldReferencedColumnName = referencedColumnName;
-		referencedColumnName = newReferencedColumnName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_JOIN_COLUMN_IMPL__REFERENCED_COLUMN_NAME, oldReferencedColumnName, referencedColumnName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_JOIN_COLUMN_IMPL__REFERENCED_COLUMN_NAME:
-				return getReferencedColumnName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_JOIN_COLUMN_IMPL__REFERENCED_COLUMN_NAME:
-				setReferencedColumnName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_JOIN_COLUMN_IMPL__REFERENCED_COLUMN_NAME:
-				setReferencedColumnName(REFERENCED_COLUMN_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_JOIN_COLUMN_IMPL__REFERENCED_COLUMN_NAME:
-				return REFERENCED_COLUMN_NAME_EDEFAULT == null ? referencedColumnName != null : !REFERENCED_COLUMN_NAME_EDEFAULT.equals(referencedColumnName);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlJoinColumn.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_JOIN_COLUMN_IMPL__REFERENCED_COLUMN_NAME: return OrmPackage.XML_JOIN_COLUMN__REFERENCED_COLUMN_NAME;
-				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 == XmlJoinColumn.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_JOIN_COLUMN__REFERENCED_COLUMN_NAME: return OrmPackage.XML_JOIN_COLUMN_IMPL__REFERENCED_COLUMN_NAME;
-				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(" (referencedColumnName: ");
-		result.append(referencedColumnName);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getReferencedColumnNameTextRange() {
-		IDOMNode referencedColumnNameNode = (IDOMNode) DOMUtilities.childAttributeNode(this.node, OrmXmlMapper.REFERENCED_COLUMN_NAME);
-		return (referencedColumnNameNode == null) ? getValidationTextRange() : buildTextRange(referencedColumnNameNode);
-	}
-} // JoinColumn
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlJoinTable.java
deleted file mode 100644
index dd393c3079..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlJoinTable.java
+++ /dev/null
@@ -1,72 +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.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Join Table</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlJoinTable#getJoinColumns <em>Join Columns</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlJoinTable#getInverseJoinColumns <em>Inverse Join Columns</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinTable()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlJoinTable extends XmlBaseTable
-{
-	/**
-	 * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join 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>Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinTable_JoinColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlJoinColumn> getJoinColumns();
-
-	/**
-	 * Returns the value of the '<em><b>Inverse Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Inverse Join 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>Inverse Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinTable_InverseJoinColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlJoinColumn> getInverseJoinColumns();
-
-	boolean isSpecified();
-} // JoinTable
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlJoinTableImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlJoinTableImpl.java
deleted file mode 100644
index 499fb4e1a8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlJoinTableImpl.java
+++ /dev/null
@@ -1,264 +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.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>Join Table</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinTableImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlJoinTableImpl extends AbstractXmlBaseTable implements XmlJoinTable
-{
-	/**
-	 * The cached value of the '{@link #getJoinColumns() <em>Join Columns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJoinColumns()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlJoinColumn> joinColumns;
-	/**
-	 * The cached value of the '{@link #getInverseJoinColumns() <em>Inverse Join Columns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInverseJoinColumns()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlJoinColumn> inverseJoinColumns;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlJoinTableImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_JOIN_TABLE_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join 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>Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinTable_JoinColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlJoinColumn> getJoinColumns()
-	{
-		if (joinColumns == null)
-		{
-			joinColumns = new EObjectContainmentEList<XmlJoinColumn>(XmlJoinColumn.class, this, OrmPackage.XML_JOIN_TABLE_IMPL__JOIN_COLUMNS);
-		}
-		return joinColumns;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Inverse Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Inverse Join 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>Inverse Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinTable_InverseJoinColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlJoinColumn> getInverseJoinColumns()
-	{
-		if (inverseJoinColumns == null)
-		{
-			inverseJoinColumns = new EObjectContainmentEList<XmlJoinColumn>(XmlJoinColumn.class, this, OrmPackage.XML_JOIN_TABLE_IMPL__INVERSE_JOIN_COLUMNS);
-		}
-		return inverseJoinColumns;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_JOIN_TABLE_IMPL__JOIN_COLUMNS:
-				return ((InternalEList<?>)getJoinColumns()).basicRemove(otherEnd, msgs);
-			case OrmPackage.XML_JOIN_TABLE_IMPL__INVERSE_JOIN_COLUMNS:
-				return ((InternalEList<?>)getInverseJoinColumns()).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 OrmPackage.XML_JOIN_TABLE_IMPL__JOIN_COLUMNS:
-				return getJoinColumns();
-			case OrmPackage.XML_JOIN_TABLE_IMPL__INVERSE_JOIN_COLUMNS:
-				return getInverseJoinColumns();
-		}
-		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 OrmPackage.XML_JOIN_TABLE_IMPL__JOIN_COLUMNS:
-				getJoinColumns().clear();
-				getJoinColumns().addAll((Collection<? extends XmlJoinColumn>)newValue);
-				return;
-			case OrmPackage.XML_JOIN_TABLE_IMPL__INVERSE_JOIN_COLUMNS:
-				getInverseJoinColumns().clear();
-				getInverseJoinColumns().addAll((Collection<? extends XmlJoinColumn>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_JOIN_TABLE_IMPL__JOIN_COLUMNS:
-				getJoinColumns().clear();
-				return;
-			case OrmPackage.XML_JOIN_TABLE_IMPL__INVERSE_JOIN_COLUMNS:
-				getInverseJoinColumns().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_JOIN_TABLE_IMPL__JOIN_COLUMNS:
-				return joinColumns != null && !joinColumns.isEmpty();
-			case OrmPackage.XML_JOIN_TABLE_IMPL__INVERSE_JOIN_COLUMNS:
-				return inverseJoinColumns != null && !inverseJoinColumns.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlJoinTable.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_JOIN_TABLE_IMPL__JOIN_COLUMNS: return OrmPackage.XML_JOIN_TABLE__JOIN_COLUMNS;
-				case OrmPackage.XML_JOIN_TABLE_IMPL__INVERSE_JOIN_COLUMNS: return OrmPackage.XML_JOIN_TABLE__INVERSE_JOIN_COLUMNS;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlJoinTable.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_JOIN_TABLE__JOIN_COLUMNS: return OrmPackage.XML_JOIN_TABLE_IMPL__JOIN_COLUMNS;
-				case OrmPackage.XML_JOIN_TABLE__INVERSE_JOIN_COLUMNS: return OrmPackage.XML_JOIN_TABLE_IMPL__INVERSE_JOIN_COLUMNS;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	public boolean isSpecified() {
-		return true;
-	}
-} // JoinTable
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java
deleted file mode 100644
index 8745efe5f4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.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.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>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.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlManyToMany()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlManyToMany extends XmlMultiRelationshipMapping
-{
-} // ManyToMany
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToManyImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToManyImpl.java
deleted file mode 100644
index 82c025aaad..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToManyImpl.java
+++ /dev/null
@@ -1,742 +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.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.internal.resource.orm.translators.OrmXmlMapper;
-import org.eclipse.jpt.core.internal.utility.emf.DOMUtilities;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>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.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlManyToManyImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlManyToManyImpl extends AbstractXmlAttributeMapping implements XmlManyToMany
-{
-	/**
-	 * The default value of the '{@link #getTargetEntity() <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTargetEntity()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TARGET_ENTITY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTargetEntity() <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTargetEntity()
-	 * @generated
-	 * @ordered
-	 */
-	protected String targetEntity = TARGET_ENTITY_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 FetchType FETCH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFetch() <em>Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFetch()
-	 * @generated
-	 * @ordered
-	 */
-	protected FetchType fetch = FETCH_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getJoinTable() <em>Join Table</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJoinTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlJoinTable joinTable;
-
-	/**
-	 * The cached value of the '{@link #getCascade() <em>Cascade</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascade()
-	 * @generated
-	 * @ordered
-	 */
-	protected CascadeType cascade;
-
-	/**
-	 * The default value of the '{@link #getMappedBy() <em>Mapped By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAPPED_BY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMappedBy() <em>Mapped By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mappedBy = MAPPED_BY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOrderBy() <em>Order By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOrderBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ORDER_BY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOrderBy() <em>Order By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOrderBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected String orderBy = ORDER_BY_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getMapKey() <em>Map Key</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMapKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected MapKey mapKey;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlManyToManyImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_MANY_TO_MANY_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Target Entity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Target Entity</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Target Entity</em>' attribute.
-	 * @see #setTargetEntity(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_TargetEntity()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getTargetEntity()
-	{
-		return targetEntity;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToManyImpl#getTargetEntity <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Entity</em>' attribute.
-	 * @see #getTargetEntity()
-	 * @generated
-	 */
-	public void setTargetEntity(String newTargetEntity)
-	{
-		String oldTargetEntity = targetEntity;
-		targetEntity = newTargetEntity;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_MANY_IMPL__TARGET_ENTITY, oldTargetEntity, targetEntity));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Fetch</b></em>' attribute.
-	 * The default value is <code>"LAZY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.FetchType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.FetchType
-	 * @see #setFetch(FetchType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_Fetch()
-	 * @model default="LAZY"
-	 * @generated
-	 */
-	public FetchType getFetch()
-	{
-		return fetch;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToManyImpl#getFetch <em>Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.FetchType
-	 * @see #getFetch()
-	 * @generated
-	 */
-	public void setFetch(FetchType newFetch)
-	{
-		FetchType oldFetch = fetch;
-		fetch = newFetch == null ? FETCH_EDEFAULT : newFetch;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_MANY_IMPL__FETCH, oldFetch, fetch));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Mapped By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mapped By</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mapped By</em>' attribute.
-	 * @see #setMappedBy(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMultiRelationshipMapping_MappedBy()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getMappedBy()
-	{
-		return mappedBy;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToManyImpl#getMappedBy <em>Mapped By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapped By</em>' attribute.
-	 * @see #getMappedBy()
-	 * @generated
-	 */
-	public void setMappedBy(String newMappedBy)
-	{
-		String oldMappedBy = mappedBy;
-		mappedBy = newMappedBy;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_MANY_IMPL__MAPPED_BY, oldMappedBy, mappedBy));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Order By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Order By</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Order By</em>' attribute.
-	 * @see #setOrderBy(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMultiRelationshipMapping_OrderBy()
-	 * @model dataType="org.eclipse.jpt.core.resource.orm.OrderBy"
-	 * @generated
-	 */
-	public String getOrderBy()
-	{
-		return orderBy;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToManyImpl#getOrderBy <em>Order By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Order By</em>' attribute.
-	 * @see #getOrderBy()
-	 * @generated
-	 */
-	public void setOrderBy(String newOrderBy)
-	{
-		String oldOrderBy = orderBy;
-		orderBy = newOrderBy;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_MANY_IMPL__ORDER_BY, oldOrderBy, orderBy));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Map Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Map Key</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Map Key</em>' containment reference.
-	 * @see #setMapKey(MapKey)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMultiRelationshipMapping_MapKey()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public MapKey getMapKey()
-	{
-		return mapKey;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetMapKey(MapKey newMapKey, NotificationChain msgs)
-	{
-		MapKey oldMapKey = mapKey;
-		mapKey = newMapKey;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_MANY_IMPL__MAP_KEY, oldMapKey, newMapKey);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToManyImpl#getMapKey <em>Map Key</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Map Key</em>' containment reference.
-	 * @see #getMapKey()
-	 * @generated
-	 */
-	public void setMapKey(MapKey newMapKey)
-	{
-		if (newMapKey != mapKey)
-		{
-			NotificationChain msgs = null;
-			if (mapKey != null)
-				msgs = ((InternalEObject)mapKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MANY_TO_MANY_IMPL__MAP_KEY, null, msgs);
-			if (newMapKey != null)
-				msgs = ((InternalEObject)newMapKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MANY_TO_MANY_IMPL__MAP_KEY, null, msgs);
-			msgs = basicSetMapKey(newMapKey, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_MANY_IMPL__MAP_KEY, newMapKey, newMapKey));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Join Table</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join Table</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Join Table</em>' containment reference.
-	 * @see #setJoinTable(XmlJoinTable)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_JoinTable()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlJoinTable getJoinTable()
-	{
-		return joinTable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetJoinTable(XmlJoinTable newJoinTable, NotificationChain msgs)
-	{
-		XmlJoinTable oldJoinTable = joinTable;
-		joinTable = newJoinTable;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_MANY_IMPL__JOIN_TABLE, oldJoinTable, newJoinTable);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToManyImpl#getJoinTable <em>Join Table</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Join Table</em>' containment reference.
-	 * @see #getJoinTable()
-	 * @generated
-	 */
-	public void setJoinTable(XmlJoinTable newJoinTable)
-	{
-		if (newJoinTable != joinTable)
-		{
-			NotificationChain msgs = null;
-			if (joinTable != null)
-				msgs = ((InternalEObject)joinTable).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MANY_TO_MANY_IMPL__JOIN_TABLE, null, msgs);
-			if (newJoinTable != null)
-				msgs = ((InternalEObject)newJoinTable).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MANY_TO_MANY_IMPL__JOIN_TABLE, null, msgs);
-			msgs = basicSetJoinTable(newJoinTable, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_MANY_IMPL__JOIN_TABLE, newJoinTable, newJoinTable));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cascade</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade</em>' containment reference.
-	 * @see #setCascade(CascadeType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_Cascade()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public CascadeType getCascade()
-	{
-		return cascade;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCascade(CascadeType newCascade, NotificationChain msgs)
-	{
-		CascadeType oldCascade = cascade;
-		cascade = newCascade;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_MANY_IMPL__CASCADE, oldCascade, newCascade);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToManyImpl#getCascade <em>Cascade</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade</em>' containment reference.
-	 * @see #getCascade()
-	 * @generated
-	 */
-	public void setCascade(CascadeType newCascade)
-	{
-		if (newCascade != cascade)
-		{
-			NotificationChain msgs = null;
-			if (cascade != null)
-				msgs = ((InternalEObject)cascade).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MANY_TO_MANY_IMPL__CASCADE, null, msgs);
-			if (newCascade != null)
-				msgs = ((InternalEObject)newCascade).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MANY_TO_MANY_IMPL__CASCADE, null, msgs);
-			msgs = basicSetCascade(newCascade, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_MANY_IMPL__CASCADE, newCascade, newCascade));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__JOIN_TABLE:
-				return basicSetJoinTable(null, msgs);
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__CASCADE:
-				return basicSetCascade(null, msgs);
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__MAP_KEY:
-				return basicSetMapKey(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 OrmPackage.XML_MANY_TO_MANY_IMPL__TARGET_ENTITY:
-				return getTargetEntity();
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__FETCH:
-				return getFetch();
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__JOIN_TABLE:
-				return getJoinTable();
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__CASCADE:
-				return getCascade();
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__MAPPED_BY:
-				return getMappedBy();
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__ORDER_BY:
-				return getOrderBy();
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__MAP_KEY:
-				return getMapKey();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__TARGET_ENTITY:
-				setTargetEntity((String)newValue);
-				return;
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__FETCH:
-				setFetch((FetchType)newValue);
-				return;
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__JOIN_TABLE:
-				setJoinTable((XmlJoinTable)newValue);
-				return;
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__CASCADE:
-				setCascade((CascadeType)newValue);
-				return;
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__MAPPED_BY:
-				setMappedBy((String)newValue);
-				return;
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__ORDER_BY:
-				setOrderBy((String)newValue);
-				return;
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__MAP_KEY:
-				setMapKey((MapKey)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__TARGET_ENTITY:
-				setTargetEntity(TARGET_ENTITY_EDEFAULT);
-				return;
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__FETCH:
-				setFetch(FETCH_EDEFAULT);
-				return;
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__JOIN_TABLE:
-				setJoinTable((XmlJoinTable)null);
-				return;
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__CASCADE:
-				setCascade((CascadeType)null);
-				return;
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__MAPPED_BY:
-				setMappedBy(MAPPED_BY_EDEFAULT);
-				return;
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__ORDER_BY:
-				setOrderBy(ORDER_BY_EDEFAULT);
-				return;
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__MAP_KEY:
-				setMapKey((MapKey)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__TARGET_ENTITY:
-				return TARGET_ENTITY_EDEFAULT == null ? targetEntity != null : !TARGET_ENTITY_EDEFAULT.equals(targetEntity);
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__FETCH:
-				return fetch != FETCH_EDEFAULT;
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__JOIN_TABLE:
-				return joinTable != null;
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__CASCADE:
-				return cascade != null;
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__MAPPED_BY:
-				return MAPPED_BY_EDEFAULT == null ? mappedBy != null : !MAPPED_BY_EDEFAULT.equals(mappedBy);
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__ORDER_BY:
-				return ORDER_BY_EDEFAULT == null ? orderBy != null : !ORDER_BY_EDEFAULT.equals(orderBy);
-			case OrmPackage.XML_MANY_TO_MANY_IMPL__MAP_KEY:
-				return mapKey != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlRelationshipMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_MANY_TO_MANY_IMPL__TARGET_ENTITY: return OrmPackage.XML_RELATIONSHIP_MAPPING__TARGET_ENTITY;
-				case OrmPackage.XML_MANY_TO_MANY_IMPL__FETCH: return OrmPackage.XML_RELATIONSHIP_MAPPING__FETCH;
-				case OrmPackage.XML_MANY_TO_MANY_IMPL__JOIN_TABLE: return OrmPackage.XML_RELATIONSHIP_MAPPING__JOIN_TABLE;
-				case OrmPackage.XML_MANY_TO_MANY_IMPL__CASCADE: return OrmPackage.XML_RELATIONSHIP_MAPPING__CASCADE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMultiRelationshipMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_MANY_TO_MANY_IMPL__MAPPED_BY: return OrmPackage.XML_MULTI_RELATIONSHIP_MAPPING__MAPPED_BY;
-				case OrmPackage.XML_MANY_TO_MANY_IMPL__ORDER_BY: return OrmPackage.XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY;
-				case OrmPackage.XML_MANY_TO_MANY_IMPL__MAP_KEY: return OrmPackage.XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY;
-				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 == XmlRelationshipMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_RELATIONSHIP_MAPPING__TARGET_ENTITY: return OrmPackage.XML_MANY_TO_MANY_IMPL__TARGET_ENTITY;
-				case OrmPackage.XML_RELATIONSHIP_MAPPING__FETCH: return OrmPackage.XML_MANY_TO_MANY_IMPL__FETCH;
-				case OrmPackage.XML_RELATIONSHIP_MAPPING__JOIN_TABLE: return OrmPackage.XML_MANY_TO_MANY_IMPL__JOIN_TABLE;
-				case OrmPackage.XML_RELATIONSHIP_MAPPING__CASCADE: return OrmPackage.XML_MANY_TO_MANY_IMPL__CASCADE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMultiRelationshipMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_MULTI_RELATIONSHIP_MAPPING__MAPPED_BY: return OrmPackage.XML_MANY_TO_MANY_IMPL__MAPPED_BY;
-				case OrmPackage.XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY: return OrmPackage.XML_MANY_TO_MANY_IMPL__ORDER_BY;
-				case OrmPackage.XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY: return OrmPackage.XML_MANY_TO_MANY_IMPL__MAP_KEY;
-				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(" (targetEntity: ");
-		result.append(targetEntity);
-		result.append(", fetch: ");
-		result.append(fetch);
-		result.append(", mappedBy: ");
-		result.append(mappedBy);
-		result.append(", orderBy: ");
-		result.append(orderBy);
-		result.append(')');
-		return result.toString();
-	}
-
-	public TextRange getMappedByTextRange() {
-		IDOMNode mappedByNode = (IDOMNode) DOMUtilities.childAttributeNode(getNode(), OrmXmlMapper.MAPPED_BY);
-		return (mappedByNode == null) ? getValidationTextRange() : buildTextRange(mappedByNode);
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToOne.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToOne.java
deleted file mode 100644
index 10c32ac72f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToOne.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.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>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.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlManyToOne()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlManyToOne extends XmlSingleRelationshipMapping
-{
-} // ManyToOne
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToOneImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToOneImpl.java
deleted file mode 100644
index 21996c930c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToOneImpl.java
+++ /dev/null
@@ -1,634 +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.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>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.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlManyToOneImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlManyToOneImpl extends AbstractXmlAttributeMapping implements XmlManyToOne
-{
-	/**
-	 * The default value of the '{@link #getTargetEntity() <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTargetEntity()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TARGET_ENTITY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTargetEntity() <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTargetEntity()
-	 * @generated
-	 * @ordered
-	 */
-	protected String targetEntity = TARGET_ENTITY_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 FetchType FETCH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFetch() <em>Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFetch()
-	 * @generated
-	 * @ordered
-	 */
-	protected FetchType fetch = FETCH_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getJoinTable() <em>Join Table</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJoinTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlJoinTable joinTable;
-
-	/**
-	 * The cached value of the '{@link #getCascade() <em>Cascade</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascade()
-	 * @generated
-	 * @ordered
-	 */
-	protected CascadeType cascade;
-
-	/**
-	 * The default value of the '{@link #getOptional() <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOptional()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean OPTIONAL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOptional() <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOptional()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean optional = OPTIONAL_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getJoinColumns() <em>Join Columns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJoinColumns()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlJoinColumn> joinColumns;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlManyToOneImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_MANY_TO_ONE_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Target Entity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Target Entity</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Target Entity</em>' attribute.
-	 * @see #setTargetEntity(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_TargetEntity()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getTargetEntity()
-	{
-		return targetEntity;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToOneImpl#getTargetEntity <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Entity</em>' attribute.
-	 * @see #getTargetEntity()
-	 * @generated
-	 */
-	public void setTargetEntity(String newTargetEntity)
-	{
-		String oldTargetEntity = targetEntity;
-		targetEntity = newTargetEntity;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_ONE_IMPL__TARGET_ENTITY, oldTargetEntity, targetEntity));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Fetch</b></em>' attribute.
-	 * The default value is <code>"LAZY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.FetchType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.FetchType
-	 * @see #setFetch(FetchType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_Fetch()
-	 * @model default="LAZY"
-	 * @generated
-	 */
-	public FetchType getFetch()
-	{
-		return fetch;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToOneImpl#getFetch <em>Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.FetchType
-	 * @see #getFetch()
-	 * @generated
-	 */
-	public void setFetch(FetchType newFetch)
-	{
-		FetchType oldFetch = fetch;
-		fetch = newFetch == null ? FETCH_EDEFAULT : newFetch;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_ONE_IMPL__FETCH, oldFetch, fetch));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Optional</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Optional</em>' attribute.
-	 * @see #setOptional(Boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSingleRelationshipMapping_Optional()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getOptional()
-	{
-		return optional;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToOneImpl#getOptional <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Optional</em>' attribute.
-	 * @see #getOptional()
-	 * @generated
-	 */
-	public void setOptional(Boolean newOptional)
-	{
-		Boolean oldOptional = optional;
-		optional = newOptional;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_ONE_IMPL__OPTIONAL, oldOptional, optional));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join 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>Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSingleRelationshipMapping_JoinColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlJoinColumn> getJoinColumns()
-	{
-		if (joinColumns == null)
-		{
-			joinColumns = new EObjectContainmentEList<XmlJoinColumn>(XmlJoinColumn.class, this, OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_COLUMNS);
-		}
-		return joinColumns;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Join Table</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join Table</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Join Table</em>' containment reference.
-	 * @see #setJoinTable(XmlJoinTable)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_JoinTable()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlJoinTable getJoinTable()
-	{
-		return joinTable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetJoinTable(XmlJoinTable newJoinTable, NotificationChain msgs)
-	{
-		XmlJoinTable oldJoinTable = joinTable;
-		joinTable = newJoinTable;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_TABLE, oldJoinTable, newJoinTable);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToOneImpl#getJoinTable <em>Join Table</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Join Table</em>' containment reference.
-	 * @see #getJoinTable()
-	 * @generated
-	 */
-	public void setJoinTable(XmlJoinTable newJoinTable)
-	{
-		if (newJoinTable != joinTable)
-		{
-			NotificationChain msgs = null;
-			if (joinTable != null)
-				msgs = ((InternalEObject)joinTable).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_TABLE, null, msgs);
-			if (newJoinTable != null)
-				msgs = ((InternalEObject)newJoinTable).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_TABLE, null, msgs);
-			msgs = basicSetJoinTable(newJoinTable, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_TABLE, newJoinTable, newJoinTable));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cascade</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade</em>' containment reference.
-	 * @see #setCascade(CascadeType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_Cascade()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public CascadeType getCascade()
-	{
-		return cascade;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCascade(CascadeType newCascade, NotificationChain msgs)
-	{
-		CascadeType oldCascade = cascade;
-		cascade = newCascade;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_ONE_IMPL__CASCADE, oldCascade, newCascade);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToOneImpl#getCascade <em>Cascade</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade</em>' containment reference.
-	 * @see #getCascade()
-	 * @generated
-	 */
-	public void setCascade(CascadeType newCascade)
-	{
-		if (newCascade != cascade)
-		{
-			NotificationChain msgs = null;
-			if (cascade != null)
-				msgs = ((InternalEObject)cascade).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MANY_TO_ONE_IMPL__CASCADE, null, msgs);
-			if (newCascade != null)
-				msgs = ((InternalEObject)newCascade).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MANY_TO_ONE_IMPL__CASCADE, null, msgs);
-			msgs = basicSetCascade(newCascade, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_ONE_IMPL__CASCADE, newCascade, newCascade));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_TABLE:
-				return basicSetJoinTable(null, msgs);
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__CASCADE:
-				return basicSetCascade(null, msgs);
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_COLUMNS:
-				return ((InternalEList<?>)getJoinColumns()).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 OrmPackage.XML_MANY_TO_ONE_IMPL__TARGET_ENTITY:
-				return getTargetEntity();
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__FETCH:
-				return getFetch();
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_TABLE:
-				return getJoinTable();
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__CASCADE:
-				return getCascade();
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__OPTIONAL:
-				return getOptional();
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_COLUMNS:
-				return getJoinColumns();
-		}
-		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 OrmPackage.XML_MANY_TO_ONE_IMPL__TARGET_ENTITY:
-				setTargetEntity((String)newValue);
-				return;
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__FETCH:
-				setFetch((FetchType)newValue);
-				return;
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_TABLE:
-				setJoinTable((XmlJoinTable)newValue);
-				return;
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__CASCADE:
-				setCascade((CascadeType)newValue);
-				return;
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__OPTIONAL:
-				setOptional((Boolean)newValue);
-				return;
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_COLUMNS:
-				getJoinColumns().clear();
-				getJoinColumns().addAll((Collection<? extends XmlJoinColumn>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__TARGET_ENTITY:
-				setTargetEntity(TARGET_ENTITY_EDEFAULT);
-				return;
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__FETCH:
-				setFetch(FETCH_EDEFAULT);
-				return;
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_TABLE:
-				setJoinTable((XmlJoinTable)null);
-				return;
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__CASCADE:
-				setCascade((CascadeType)null);
-				return;
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__OPTIONAL:
-				setOptional(OPTIONAL_EDEFAULT);
-				return;
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_COLUMNS:
-				getJoinColumns().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__TARGET_ENTITY:
-				return TARGET_ENTITY_EDEFAULT == null ? targetEntity != null : !TARGET_ENTITY_EDEFAULT.equals(targetEntity);
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__FETCH:
-				return fetch != FETCH_EDEFAULT;
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_TABLE:
-				return joinTable != null;
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__CASCADE:
-				return cascade != null;
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__OPTIONAL:
-				return OPTIONAL_EDEFAULT == null ? optional != null : !OPTIONAL_EDEFAULT.equals(optional);
-			case OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_COLUMNS:
-				return joinColumns != null && !joinColumns.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlRelationshipMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_MANY_TO_ONE_IMPL__TARGET_ENTITY: return OrmPackage.XML_RELATIONSHIP_MAPPING__TARGET_ENTITY;
-				case OrmPackage.XML_MANY_TO_ONE_IMPL__FETCH: return OrmPackage.XML_RELATIONSHIP_MAPPING__FETCH;
-				case OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_TABLE: return OrmPackage.XML_RELATIONSHIP_MAPPING__JOIN_TABLE;
-				case OrmPackage.XML_MANY_TO_ONE_IMPL__CASCADE: return OrmPackage.XML_RELATIONSHIP_MAPPING__CASCADE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlSingleRelationshipMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_MANY_TO_ONE_IMPL__OPTIONAL: return OrmPackage.XML_SINGLE_RELATIONSHIP_MAPPING__OPTIONAL;
-				case OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_COLUMNS: return OrmPackage.XML_SINGLE_RELATIONSHIP_MAPPING__JOIN_COLUMNS;
-				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 == XmlRelationshipMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_RELATIONSHIP_MAPPING__TARGET_ENTITY: return OrmPackage.XML_MANY_TO_ONE_IMPL__TARGET_ENTITY;
-				case OrmPackage.XML_RELATIONSHIP_MAPPING__FETCH: return OrmPackage.XML_MANY_TO_ONE_IMPL__FETCH;
-				case OrmPackage.XML_RELATIONSHIP_MAPPING__JOIN_TABLE: return OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_TABLE;
-				case OrmPackage.XML_RELATIONSHIP_MAPPING__CASCADE: return OrmPackage.XML_MANY_TO_ONE_IMPL__CASCADE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlSingleRelationshipMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_SINGLE_RELATIONSHIP_MAPPING__OPTIONAL: return OrmPackage.XML_MANY_TO_ONE_IMPL__OPTIONAL;
-				case OrmPackage.XML_SINGLE_RELATIONSHIP_MAPPING__JOIN_COLUMNS: return OrmPackage.XML_MANY_TO_ONE_IMPL__JOIN_COLUMNS;
-				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(" (targetEntity: ");
-		result.append(targetEntity);
-		result.append(", fetch: ");
-		result.append(fetch);
-		result.append(", optional: ");
-		result.append(optional);
-		result.append(')');
-		return result.toString();
-	}
-
-} // ManyToOne
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlMappedSuperclass.java
deleted file mode 100644
index 483d429b7d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlMappedSuperclass.java
+++ /dev/null
@@ -1,1040 +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.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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>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.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getIdClass <em>Id Class</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#isExcludeDefaultListeners <em>Exclude Default Listeners</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#isExcludeSuperclassListeners <em>Exclude Superclass Listeners</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getEntityListeners <em>Entity Listeners</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPrePersist <em>Pre Persist</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostPersist <em>Post Persist</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPreRemove <em>Pre Remove</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostRemove <em>Post Remove</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPreUpdate <em>Pre Update</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostUpdate <em>Post Update</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostLoad <em>Post Load</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMappedSuperclass()
- * @model kind="class"
- * @generated
- */
-public class XmlMappedSuperclass extends AbstractXmlTypeMapping
-{
-	/**
-	 * 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 #getIdClass() <em>Id Class</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIdClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlIdClass idClass;
-
-	/**
-	 * The default value of the '{@link #isExcludeDefaultListeners() <em>Exclude Default Listeners</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExcludeDefaultListeners()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EXCLUDE_DEFAULT_LISTENERS_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isExcludeDefaultListeners() <em>Exclude Default Listeners</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExcludeDefaultListeners()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean excludeDefaultListeners = EXCLUDE_DEFAULT_LISTENERS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isExcludeSuperclassListeners() <em>Exclude Superclass Listeners</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExcludeSuperclassListeners()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EXCLUDE_SUPERCLASS_LISTENERS_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isExcludeSuperclassListeners() <em>Exclude Superclass Listeners</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExcludeSuperclassListeners()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean excludeSuperclassListeners = EXCLUDE_SUPERCLASS_LISTENERS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getEntityListeners() <em>Entity Listeners</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEntityListeners()
-	 * @generated
-	 * @ordered
-	 */
-	protected EntityListeners entityListeners;
-
-	/**
-	 * The cached value of the '{@link #getPrePersist() <em>Pre Persist</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrePersist()
-	 * @generated
-	 * @ordered
-	 */
-	protected PrePersist prePersist;
-
-	/**
-	 * The cached value of the '{@link #getPostPersist() <em>Post Persist</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostPersist()
-	 * @generated
-	 * @ordered
-	 */
-	protected PostPersist postPersist;
-
-	/**
-	 * The cached value of the '{@link #getPreRemove() <em>Pre Remove</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPreRemove()
-	 * @generated
-	 * @ordered
-	 */
-	protected PreRemove preRemove;
-
-	/**
-	 * The cached value of the '{@link #getPostRemove() <em>Post Remove</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostRemove()
-	 * @generated
-	 * @ordered
-	 */
-	protected PostRemove postRemove;
-
-	/**
-	 * The cached value of the '{@link #getPreUpdate() <em>Pre Update</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPreUpdate()
-	 * @generated
-	 * @ordered
-	 */
-	protected PreUpdate preUpdate;
-
-	/**
-	 * The cached value of the '{@link #getPostUpdate() <em>Post Update</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostUpdate()
-	 * @generated
-	 * @ordered
-	 */
-	protected PostUpdate postUpdate;
-
-	/**
-	 * The cached value of the '{@link #getPostLoad() <em>Post Load</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPostLoad()
-	 * @generated
-	 * @ordered
-	 */
-	protected PostLoad postLoad;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlMappedSuperclass()
-	{
-		super();
-	}
-
-	public XmlEntityMappings entityMappings() {
-		return (XmlEntityMappings) eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_MAPPED_SUPERCLASS;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Id Class</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id Class</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id Class</em>' containment reference.
-	 * @see #setIdClass(XmlIdClass)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMappedSuperclass_IdClass()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlIdClass getIdClass()
-	{
-		return idClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetIdClass(XmlIdClass newIdClass, NotificationChain msgs)
-	{
-		XmlIdClass oldIdClass = idClass;
-		idClass = newIdClass;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__ID_CLASS, oldIdClass, newIdClass);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getIdClass <em>Id Class</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id Class</em>' containment reference.
-	 * @see #getIdClass()
-	 * @generated
-	 */
-	public void setIdClass(XmlIdClass newIdClass)
-	{
-		if (newIdClass != idClass)
-		{
-			NotificationChain msgs = null;
-			if (idClass != null)
-				msgs = ((InternalEObject)idClass).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MAPPED_SUPERCLASS__ID_CLASS, null, msgs);
-			if (newIdClass != null)
-				msgs = ((InternalEObject)newIdClass).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MAPPED_SUPERCLASS__ID_CLASS, null, msgs);
-			msgs = basicSetIdClass(newIdClass, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__ID_CLASS, newIdClass, newIdClass));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Exclude Default Listeners</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Exclude Default Listeners</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 Listeners</em>' attribute.
-	 * @see #setExcludeDefaultListeners(boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMappedSuperclass_ExcludeDefaultListeners()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isExcludeDefaultListeners()
-	{
-		return excludeDefaultListeners;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#isExcludeDefaultListeners <em>Exclude Default Listeners</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Exclude Default Listeners</em>' attribute.
-	 * @see #isExcludeDefaultListeners()
-	 * @generated
-	 */
-	public void setExcludeDefaultListeners(boolean newExcludeDefaultListeners)
-	{
-		boolean oldExcludeDefaultListeners = excludeDefaultListeners;
-		excludeDefaultListeners = newExcludeDefaultListeners;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_LISTENERS, oldExcludeDefaultListeners, excludeDefaultListeners));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Exclude Superclass Listeners</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Exclude Superclass Listeners</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 Superclass Listeners</em>' attribute.
-	 * @see #setExcludeSuperclassListeners(boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMappedSuperclass_ExcludeSuperclassListeners()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isExcludeSuperclassListeners()
-	{
-		return excludeSuperclassListeners;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#isExcludeSuperclassListeners <em>Exclude Superclass Listeners</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Exclude Superclass Listeners</em>' attribute.
-	 * @see #isExcludeSuperclassListeners()
-	 * @generated
-	 */
-	public void setExcludeSuperclassListeners(boolean newExcludeSuperclassListeners)
-	{
-		boolean oldExcludeSuperclassListeners = excludeSuperclassListeners;
-		excludeSuperclassListeners = newExcludeSuperclassListeners;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_SUPERCLASS_LISTENERS, oldExcludeSuperclassListeners, excludeSuperclassListeners));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Entity Listeners</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Entity Listeners</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Entity Listeners</em>' containment reference.
-	 * @see #setEntityListeners(EntityListeners)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMappedSuperclass_EntityListeners()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EntityListeners getEntityListeners()
-	{
-		return entityListeners;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetEntityListeners(EntityListeners newEntityListeners, NotificationChain msgs)
-	{
-		EntityListeners oldEntityListeners = entityListeners;
-		entityListeners = newEntityListeners;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__ENTITY_LISTENERS, oldEntityListeners, newEntityListeners);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getEntityListeners <em>Entity Listeners</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Entity Listeners</em>' containment reference.
-	 * @see #getEntityListeners()
-	 * @generated
-	 */
-	public void setEntityListeners(EntityListeners newEntityListeners)
-	{
-		if (newEntityListeners != entityListeners)
-		{
-			NotificationChain msgs = null;
-			if (entityListeners != null)
-				msgs = ((InternalEObject)entityListeners).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MAPPED_SUPERCLASS__ENTITY_LISTENERS, null, msgs);
-			if (newEntityListeners != null)
-				msgs = ((InternalEObject)newEntityListeners).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MAPPED_SUPERCLASS__ENTITY_LISTENERS, null, msgs);
-			msgs = basicSetEntityListeners(newEntityListeners, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__ENTITY_LISTENERS, newEntityListeners, newEntityListeners));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pre Persist</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pre Persist</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pre Persist</em>' containment reference.
-	 * @see #setPrePersist(PrePersist)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMappedSuperclass_PrePersist()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PrePersist getPrePersist()
-	{
-		return prePersist;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPrePersist(PrePersist newPrePersist, NotificationChain msgs)
-	{
-		PrePersist oldPrePersist = prePersist;
-		prePersist = newPrePersist;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__PRE_PERSIST, oldPrePersist, newPrePersist);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPrePersist <em>Pre Persist</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pre Persist</em>' containment reference.
-	 * @see #getPrePersist()
-	 * @generated
-	 */
-	public void setPrePersist(PrePersist newPrePersist)
-	{
-		if (newPrePersist != prePersist)
-		{
-			NotificationChain msgs = null;
-			if (prePersist != null)
-				msgs = ((InternalEObject)prePersist).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MAPPED_SUPERCLASS__PRE_PERSIST, null, msgs);
-			if (newPrePersist != null)
-				msgs = ((InternalEObject)newPrePersist).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MAPPED_SUPERCLASS__PRE_PERSIST, null, msgs);
-			msgs = basicSetPrePersist(newPrePersist, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__PRE_PERSIST, newPrePersist, newPrePersist));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Post Persist</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Persist</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Persist</em>' containment reference.
-	 * @see #setPostPersist(PostPersist)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMappedSuperclass_PostPersist()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PostPersist getPostPersist()
-	{
-		return postPersist;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPostPersist(PostPersist newPostPersist, NotificationChain msgs)
-	{
-		PostPersist oldPostPersist = postPersist;
-		postPersist = newPostPersist;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__POST_PERSIST, oldPostPersist, newPostPersist);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostPersist <em>Post Persist</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Post Persist</em>' containment reference.
-	 * @see #getPostPersist()
-	 * @generated
-	 */
-	public void setPostPersist(PostPersist newPostPersist)
-	{
-		if (newPostPersist != postPersist)
-		{
-			NotificationChain msgs = null;
-			if (postPersist != null)
-				msgs = ((InternalEObject)postPersist).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MAPPED_SUPERCLASS__POST_PERSIST, null, msgs);
-			if (newPostPersist != null)
-				msgs = ((InternalEObject)newPostPersist).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MAPPED_SUPERCLASS__POST_PERSIST, null, msgs);
-			msgs = basicSetPostPersist(newPostPersist, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__POST_PERSIST, newPostPersist, newPostPersist));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pre Remove</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pre Remove</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pre Remove</em>' containment reference.
-	 * @see #setPreRemove(PreRemove)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMappedSuperclass_PreRemove()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PreRemove getPreRemove()
-	{
-		return preRemove;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPreRemove(PreRemove newPreRemove, NotificationChain msgs)
-	{
-		PreRemove oldPreRemove = preRemove;
-		preRemove = newPreRemove;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__PRE_REMOVE, oldPreRemove, newPreRemove);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPreRemove <em>Pre Remove</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pre Remove</em>' containment reference.
-	 * @see #getPreRemove()
-	 * @generated
-	 */
-	public void setPreRemove(PreRemove newPreRemove)
-	{
-		if (newPreRemove != preRemove)
-		{
-			NotificationChain msgs = null;
-			if (preRemove != null)
-				msgs = ((InternalEObject)preRemove).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MAPPED_SUPERCLASS__PRE_REMOVE, null, msgs);
-			if (newPreRemove != null)
-				msgs = ((InternalEObject)newPreRemove).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MAPPED_SUPERCLASS__PRE_REMOVE, null, msgs);
-			msgs = basicSetPreRemove(newPreRemove, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__PRE_REMOVE, newPreRemove, newPreRemove));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Post Remove</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Remove</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Remove</em>' containment reference.
-	 * @see #setPostRemove(PostRemove)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMappedSuperclass_PostRemove()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PostRemove getPostRemove()
-	{
-		return postRemove;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPostRemove(PostRemove newPostRemove, NotificationChain msgs)
-	{
-		PostRemove oldPostRemove = postRemove;
-		postRemove = newPostRemove;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__POST_REMOVE, oldPostRemove, newPostRemove);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostRemove <em>Post Remove</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Post Remove</em>' containment reference.
-	 * @see #getPostRemove()
-	 * @generated
-	 */
-	public void setPostRemove(PostRemove newPostRemove)
-	{
-		if (newPostRemove != postRemove)
-		{
-			NotificationChain msgs = null;
-			if (postRemove != null)
-				msgs = ((InternalEObject)postRemove).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MAPPED_SUPERCLASS__POST_REMOVE, null, msgs);
-			if (newPostRemove != null)
-				msgs = ((InternalEObject)newPostRemove).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MAPPED_SUPERCLASS__POST_REMOVE, null, msgs);
-			msgs = basicSetPostRemove(newPostRemove, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__POST_REMOVE, newPostRemove, newPostRemove));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pre Update</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pre Update</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pre Update</em>' containment reference.
-	 * @see #setPreUpdate(PreUpdate)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMappedSuperclass_PreUpdate()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PreUpdate getPreUpdate()
-	{
-		return preUpdate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPreUpdate(PreUpdate newPreUpdate, NotificationChain msgs)
-	{
-		PreUpdate oldPreUpdate = preUpdate;
-		preUpdate = newPreUpdate;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__PRE_UPDATE, oldPreUpdate, newPreUpdate);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPreUpdate <em>Pre Update</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pre Update</em>' containment reference.
-	 * @see #getPreUpdate()
-	 * @generated
-	 */
-	public void setPreUpdate(PreUpdate newPreUpdate)
-	{
-		if (newPreUpdate != preUpdate)
-		{
-			NotificationChain msgs = null;
-			if (preUpdate != null)
-				msgs = ((InternalEObject)preUpdate).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MAPPED_SUPERCLASS__PRE_UPDATE, null, msgs);
-			if (newPreUpdate != null)
-				msgs = ((InternalEObject)newPreUpdate).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MAPPED_SUPERCLASS__PRE_UPDATE, null, msgs);
-			msgs = basicSetPreUpdate(newPreUpdate, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__PRE_UPDATE, newPreUpdate, newPreUpdate));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Post Update</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Update</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Update</em>' containment reference.
-	 * @see #setPostUpdate(PostUpdate)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMappedSuperclass_PostUpdate()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PostUpdate getPostUpdate()
-	{
-		return postUpdate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPostUpdate(PostUpdate newPostUpdate, NotificationChain msgs)
-	{
-		PostUpdate oldPostUpdate = postUpdate;
-		postUpdate = newPostUpdate;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__POST_UPDATE, oldPostUpdate, newPostUpdate);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostUpdate <em>Post Update</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Post Update</em>' containment reference.
-	 * @see #getPostUpdate()
-	 * @generated
-	 */
-	public void setPostUpdate(PostUpdate newPostUpdate)
-	{
-		if (newPostUpdate != postUpdate)
-		{
-			NotificationChain msgs = null;
-			if (postUpdate != null)
-				msgs = ((InternalEObject)postUpdate).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MAPPED_SUPERCLASS__POST_UPDATE, null, msgs);
-			if (newPostUpdate != null)
-				msgs = ((InternalEObject)newPostUpdate).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MAPPED_SUPERCLASS__POST_UPDATE, null, msgs);
-			msgs = basicSetPostUpdate(newPostUpdate, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__POST_UPDATE, newPostUpdate, newPostUpdate));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Post Load</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Post Load</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Post Load</em>' containment reference.
-	 * @see #setPostLoad(PostLoad)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMappedSuperclass_PostLoad()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public PostLoad getPostLoad()
-	{
-		return postLoad;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPostLoad(PostLoad newPostLoad, NotificationChain msgs)
-	{
-		PostLoad oldPostLoad = postLoad;
-		postLoad = newPostLoad;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__POST_LOAD, oldPostLoad, newPostLoad);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostLoad <em>Post Load</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Post Load</em>' containment reference.
-	 * @see #getPostLoad()
-	 * @generated
-	 */
-	public void setPostLoad(PostLoad newPostLoad)
-	{
-		if (newPostLoad != postLoad)
-		{
-			NotificationChain msgs = null;
-			if (postLoad != null)
-				msgs = ((InternalEObject)postLoad).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MAPPED_SUPERCLASS__POST_LOAD, null, msgs);
-			if (newPostLoad != null)
-				msgs = ((InternalEObject)newPostLoad).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MAPPED_SUPERCLASS__POST_LOAD, null, msgs);
-			msgs = basicSetPostLoad(newPostLoad, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAPPED_SUPERCLASS__POST_LOAD, newPostLoad, newPostLoad));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_MAPPED_SUPERCLASS__ID_CLASS:
-				return basicSetIdClass(null, msgs);
-			case OrmPackage.XML_MAPPED_SUPERCLASS__ENTITY_LISTENERS:
-				return basicSetEntityListeners(null, msgs);
-			case OrmPackage.XML_MAPPED_SUPERCLASS__PRE_PERSIST:
-				return basicSetPrePersist(null, msgs);
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_PERSIST:
-				return basicSetPostPersist(null, msgs);
-			case OrmPackage.XML_MAPPED_SUPERCLASS__PRE_REMOVE:
-				return basicSetPreRemove(null, msgs);
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_REMOVE:
-				return basicSetPostRemove(null, msgs);
-			case OrmPackage.XML_MAPPED_SUPERCLASS__PRE_UPDATE:
-				return basicSetPreUpdate(null, msgs);
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_UPDATE:
-				return basicSetPostUpdate(null, msgs);
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_LOAD:
-				return basicSetPostLoad(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 OrmPackage.XML_MAPPED_SUPERCLASS__ID_CLASS:
-				return getIdClass();
-			case OrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_LISTENERS:
-				return isExcludeDefaultListeners() ? Boolean.TRUE : Boolean.FALSE;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_SUPERCLASS_LISTENERS:
-				return isExcludeSuperclassListeners() ? Boolean.TRUE : Boolean.FALSE;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__ENTITY_LISTENERS:
-				return getEntityListeners();
-			case OrmPackage.XML_MAPPED_SUPERCLASS__PRE_PERSIST:
-				return getPrePersist();
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_PERSIST:
-				return getPostPersist();
-			case OrmPackage.XML_MAPPED_SUPERCLASS__PRE_REMOVE:
-				return getPreRemove();
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_REMOVE:
-				return getPostRemove();
-			case OrmPackage.XML_MAPPED_SUPERCLASS__PRE_UPDATE:
-				return getPreUpdate();
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_UPDATE:
-				return getPostUpdate();
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_LOAD:
-				return getPostLoad();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_MAPPED_SUPERCLASS__ID_CLASS:
-				setIdClass((XmlIdClass)newValue);
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_LISTENERS:
-				setExcludeDefaultListeners(((Boolean)newValue).booleanValue());
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_SUPERCLASS_LISTENERS:
-				setExcludeSuperclassListeners(((Boolean)newValue).booleanValue());
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__ENTITY_LISTENERS:
-				setEntityListeners((EntityListeners)newValue);
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__PRE_PERSIST:
-				setPrePersist((PrePersist)newValue);
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_PERSIST:
-				setPostPersist((PostPersist)newValue);
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__PRE_REMOVE:
-				setPreRemove((PreRemove)newValue);
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_REMOVE:
-				setPostRemove((PostRemove)newValue);
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__PRE_UPDATE:
-				setPreUpdate((PreUpdate)newValue);
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_UPDATE:
-				setPostUpdate((PostUpdate)newValue);
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_LOAD:
-				setPostLoad((PostLoad)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_MAPPED_SUPERCLASS__ID_CLASS:
-				setIdClass((XmlIdClass)null);
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_LISTENERS:
-				setExcludeDefaultListeners(EXCLUDE_DEFAULT_LISTENERS_EDEFAULT);
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_SUPERCLASS_LISTENERS:
-				setExcludeSuperclassListeners(EXCLUDE_SUPERCLASS_LISTENERS_EDEFAULT);
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__ENTITY_LISTENERS:
-				setEntityListeners((EntityListeners)null);
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__PRE_PERSIST:
-				setPrePersist((PrePersist)null);
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_PERSIST:
-				setPostPersist((PostPersist)null);
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__PRE_REMOVE:
-				setPreRemove((PreRemove)null);
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_REMOVE:
-				setPostRemove((PostRemove)null);
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__PRE_UPDATE:
-				setPreUpdate((PreUpdate)null);
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_UPDATE:
-				setPostUpdate((PostUpdate)null);
-				return;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_LOAD:
-				setPostLoad((PostLoad)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_MAPPED_SUPERCLASS__ID_CLASS:
-				return idClass != null;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_LISTENERS:
-				return excludeDefaultListeners != EXCLUDE_DEFAULT_LISTENERS_EDEFAULT;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_SUPERCLASS_LISTENERS:
-				return excludeSuperclassListeners != EXCLUDE_SUPERCLASS_LISTENERS_EDEFAULT;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__ENTITY_LISTENERS:
-				return entityListeners != null;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__PRE_PERSIST:
-				return prePersist != null;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_PERSIST:
-				return postPersist != null;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__PRE_REMOVE:
-				return preRemove != null;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_REMOVE:
-				return postRemove != null;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__PRE_UPDATE:
-				return preUpdate != null;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_UPDATE:
-				return postUpdate != null;
-			case OrmPackage.XML_MAPPED_SUPERCLASS__POST_LOAD:
-				return postLoad != 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(" (excludeDefaultListeners: ");
-		result.append(excludeDefaultListeners);
-		result.append(", excludeSuperclassListeners: ");
-		result.append(excludeSuperclassListeners);
-		result.append(')');
-		return result.toString();
-	}
-
-} // MappedSuperclass
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlMultiRelationshipMapping.java
deleted file mode 100644
index 8bc2997a6e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlMultiRelationshipMapping.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.core.resource.orm;
-
-import org.eclipse.jpt.core.utility.TextRange;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Multi Relationship Mapping</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getMappedBy <em>Mapped By</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getOrderBy <em>Order By</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getMapKey <em>Map Key</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMultiRelationshipMapping()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlMultiRelationshipMapping extends XmlRelationshipMapping
-{
-	/**
-	 * Returns the value of the '<em><b>Order By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Order By</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Order By</em>' attribute.
-	 * @see #setOrderBy(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMultiRelationshipMapping_OrderBy()
-	 * @model dataType="org.eclipse.jpt.core.resource.orm.OrderBy"
-	 * @generated
-	 */
-	String getOrderBy();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getOrderBy <em>Order By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Order By</em>' attribute.
-	 * @see #getOrderBy()
-	 * @generated
-	 */
-	void setOrderBy(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Map Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Map Key</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Map Key</em>' containment reference.
-	 * @see #setMapKey(MapKey)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMultiRelationshipMapping_MapKey()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MapKey getMapKey();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getMapKey <em>Map Key</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Map Key</em>' containment reference.
-	 * @see #getMapKey()
-	 * @generated
-	 */
-	void setMapKey(MapKey value);
-
-	/**
-	 * Returns the value of the '<em><b>Mapped By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mapped By</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mapped By</em>' attribute.
-	 * @see #setMappedBy(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMultiRelationshipMapping_MappedBy()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getMappedBy();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getMappedBy <em>Mapped By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapped By</em>' attribute.
-	 * @see #getMappedBy()
-	 * @generated
-	 */
-	void setMappedBy(String value);
-
-	TextRange getMappedByTextRange();
-} // MultiRelationshipMapping
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlNamedColumn.java
deleted file mode 100644
index 688f19bdc7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlNamedColumn.java
+++ /dev/null
@@ -1,99 +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.core.resource.orm;
-
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Named Column</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.core.resource.orm.XmlNamedColumn#getColumnDefinition <em>Column Definition</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlNamedColumn#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlNamedColumn()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlNamedColumn extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Column Definition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Column Definition</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Column Definition</em>' attribute.
-	 * @see #setColumnDefinition(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlNamedColumn_ColumnDefinition()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getColumnDefinition();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedColumn#getColumnDefinition <em>Column Definition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Column Definition</em>' attribute.
-	 * @see #getColumnDefinition()
-	 * @generated
-	 */
-	void setColumnDefinition(String value);
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlNamedColumn_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedColumn#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);
-
-	/**
-	 * Return the {@link TextRange} for the name attibute.  If the name attibute 
-	 * does not exist return the {@link TextRange} for the *table element.
-	 */
-	TextRange getNameTextRange();
-
-} // NamedColumn
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlNamedNativeQuery.java
deleted file mode 100644
index 13df8211fe..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlNamedNativeQuery.java
+++ /dev/null
@@ -1,477 +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.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.internal.resource.orm.translators.OrmXmlMapper;
-import org.eclipse.jpt.core.internal.utility.emf.DOMUtilities;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Named Native 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.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery#getResultClass <em>Result Class</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery#getResultSetMapping <em>Result Set Mapping</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlNamedNativeQuery()
- * @model kind="class"
- * @generated
- */
-public class XmlNamedNativeQuery extends AbstractJpaEObject implements XmlQuery
-{
-	/**
-	 * 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 #getQuery() <em>Query</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQuery()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String QUERY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getQuery() <em>Query</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQuery()
-	 * @generated
-	 * @ordered
-	 */
-	protected String query = QUERY_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 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;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlNamedNativeQuery()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_NAMED_NATIVE_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.core.resource.orm.OrmPackage#getXmlQuery_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery#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, OrmPackage.XML_NAMED_NATIVE_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.core.resource.orm.OrmPackage#getXmlNamedNativeQuery_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.core.resource.orm.XmlNamedNativeQuery#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, OrmPackage.XML_NAMED_NATIVE_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.core.resource.orm.OrmPackage#getXmlNamedNativeQuery_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.core.resource.orm.XmlNamedNativeQuery#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, OrmPackage.XML_NAMED_NATIVE_QUERY__RESULT_SET_MAPPING, oldResultSetMapping, resultSetMapping));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Query</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Query</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</em>' attribute.
-	 * @see #setQuery(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlQuery_Query()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getQuery()
-	{
-		return query;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery#getQuery <em>Query</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Query</em>' attribute.
-	 * @see #getQuery()
-	 * @generated
-	 */
-	public void setQuery(String newQuery)
-	{
-		String oldQuery = query;
-		query = newQuery;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_NAMED_NATIVE_QUERY__QUERY, oldQuery, query));
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlQuery_Hints()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlQueryHint> getHints()
-	{
-		if (hints == null)
-		{
-			hints = new EObjectContainmentEList<XmlQueryHint>(XmlQueryHint.class, this, OrmPackage.XML_NAMED_NATIVE_QUERY__HINTS);
-		}
-		return hints;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__HINTS:
-				return ((InternalEList<?>)getHints()).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 OrmPackage.XML_NAMED_NATIVE_QUERY__NAME:
-				return getName();
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__QUERY:
-				return getQuery();
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__HINTS:
-				return getHints();
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__RESULT_CLASS:
-				return getResultClass();
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__RESULT_SET_MAPPING:
-				return getResultSetMapping();
-		}
-		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 OrmPackage.XML_NAMED_NATIVE_QUERY__NAME:
-				setName((String)newValue);
-				return;
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__QUERY:
-				setQuery((String)newValue);
-				return;
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__HINTS:
-				getHints().clear();
-				getHints().addAll((Collection<? extends XmlQueryHint>)newValue);
-				return;
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__RESULT_CLASS:
-				setResultClass((String)newValue);
-				return;
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__RESULT_SET_MAPPING:
-				setResultSetMapping((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__QUERY:
-				setQuery(QUERY_EDEFAULT);
-				return;
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__HINTS:
-				getHints().clear();
-				return;
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__RESULT_CLASS:
-				setResultClass(RESULT_CLASS_EDEFAULT);
-				return;
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__RESULT_SET_MAPPING:
-				setResultSetMapping(RESULT_SET_MAPPING_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__QUERY:
-				return QUERY_EDEFAULT == null ? query != null : !QUERY_EDEFAULT.equals(query);
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__HINTS:
-				return hints != null && !hints.isEmpty();
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__RESULT_CLASS:
-				return RESULT_CLASS_EDEFAULT == null ? resultClass != null : !RESULT_CLASS_EDEFAULT.equals(resultClass);
-			case OrmPackage.XML_NAMED_NATIVE_QUERY__RESULT_SET_MAPPING:
-				return RESULT_SET_MAPPING_EDEFAULT == null ? resultSetMapping != null : !RESULT_SET_MAPPING_EDEFAULT.equals(resultSetMapping);
-		}
-		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(", query: ");
-		result.append(query);
-		result.append(", resultClass: ");
-		result.append(resultClass);
-		result.append(", resultSetMapping: ");
-		result.append(resultSetMapping);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getNameTextRange() {
-		IDOMNode nameNode = (IDOMNode) DOMUtilities.childAttributeNode(getNode(), OrmXmlMapper.NAME);
-		return (nameNode == null) ? getValidationTextRange() : buildTextRange(nameNode);
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlNamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlNamedQuery.java
deleted file mode 100644
index 742966a42f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlNamedQuery.java
+++ /dev/null
@@ -1,336 +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.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.internal.resource.orm.translators.OrmXmlMapper;
-import org.eclipse.jpt.core.internal.utility.emf.DOMUtilities;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Named 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.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlNamedQuery()
- * @model kind="class"
- * @generated
- */
-public class XmlNamedQuery extends AbstractJpaEObject implements XmlQuery
-{
-	/**
-	 * 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 #getQuery() <em>Query</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQuery()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String QUERY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getQuery() <em>Query</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQuery()
-	 * @generated
-	 * @ordered
-	 */
-	protected String query = QUERY_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;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlNamedQuery()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_NAMED_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.core.resource.orm.OrmPackage#getXmlQuery_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedQuery#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, OrmPackage.XML_NAMED_QUERY__NAME, oldName, name));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Query</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Query</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</em>' attribute.
-	 * @see #setQuery(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlQuery_Query()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getQuery()
-	{
-		return query;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedQuery#getQuery <em>Query</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Query</em>' attribute.
-	 * @see #getQuery()
-	 * @generated
-	 */
-	public void setQuery(String newQuery)
-	{
-		String oldQuery = query;
-		query = newQuery;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_NAMED_QUERY__QUERY, oldQuery, query));
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlQuery_Hints()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlQueryHint> getHints()
-	{
-		if (hints == null)
-		{
-			hints = new EObjectContainmentEList<XmlQueryHint>(XmlQueryHint.class, this, OrmPackage.XML_NAMED_QUERY__HINTS);
-		}
-		return hints;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_NAMED_QUERY__HINTS:
-				return ((InternalEList<?>)getHints()).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 OrmPackage.XML_NAMED_QUERY__NAME:
-				return getName();
-			case OrmPackage.XML_NAMED_QUERY__QUERY:
-				return getQuery();
-			case OrmPackage.XML_NAMED_QUERY__HINTS:
-				return getHints();
-		}
-		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 OrmPackage.XML_NAMED_QUERY__NAME:
-				setName((String)newValue);
-				return;
-			case OrmPackage.XML_NAMED_QUERY__QUERY:
-				setQuery((String)newValue);
-				return;
-			case OrmPackage.XML_NAMED_QUERY__HINTS:
-				getHints().clear();
-				getHints().addAll((Collection<? extends XmlQueryHint>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_NAMED_QUERY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case OrmPackage.XML_NAMED_QUERY__QUERY:
-				setQuery(QUERY_EDEFAULT);
-				return;
-			case OrmPackage.XML_NAMED_QUERY__HINTS:
-				getHints().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_NAMED_QUERY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case OrmPackage.XML_NAMED_QUERY__QUERY:
-				return QUERY_EDEFAULT == null ? query != null : !QUERY_EDEFAULT.equals(query);
-			case OrmPackage.XML_NAMED_QUERY__HINTS:
-				return hints != null && !hints.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(", query: ");
-		result.append(query);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getNameTextRange() {
-		IDOMNode nameNode = (IDOMNode) DOMUtilities.childAttributeNode(getNode(), OrmXmlMapper.NAME);
-		return (nameNode == null) ? getValidationTextRange() : buildTextRange(nameNode);
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlNullAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlNullAttributeMapping.java
deleted file mode 100644
index d37a53078b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlNullAttributeMapping.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.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Null Attribute Mapping</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlNullAttributeMapping()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlNullAttributeMapping extends XmlAttributeMapping
-{
-} // XmlNullAttributeMapping
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java
deleted file mode 100644
index 4502f8fc94..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.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.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>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.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlOneToMany#getJoinColumns <em>Join Columns</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToMany()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlOneToMany extends XmlMultiRelationshipMapping
-{
-	/**
-	 * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join 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>Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToMany_JoinColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlJoinColumn> getJoinColumns();
-
-} // OneToMany
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToManyImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToManyImpl.java
deleted file mode 100644
index a7c2d5639d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToManyImpl.java
+++ /dev/null
@@ -1,795 +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.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.internal.resource.orm.translators.OrmXmlMapper;
-import org.eclipse.jpt.core.internal.utility.emf.DOMUtilities;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>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.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToManyImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlOneToManyImpl extends AbstractXmlAttributeMapping implements XmlOneToMany
-{
-	/**
-	 * The default value of the '{@link #getTargetEntity() <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTargetEntity()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TARGET_ENTITY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTargetEntity() <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTargetEntity()
-	 * @generated
-	 * @ordered
-	 */
-	protected String targetEntity = TARGET_ENTITY_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 FetchType FETCH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFetch() <em>Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFetch()
-	 * @generated
-	 * @ordered
-	 */
-	protected FetchType fetch = FETCH_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getJoinTable() <em>Join Table</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJoinTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlJoinTable joinTable;
-
-	/**
-	 * The cached value of the '{@link #getCascade() <em>Cascade</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascade()
-	 * @generated
-	 * @ordered
-	 */
-	protected CascadeType cascade;
-
-	/**
-	 * The default value of the '{@link #getMappedBy() <em>Mapped By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAPPED_BY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMappedBy() <em>Mapped By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mappedBy = MAPPED_BY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOrderBy() <em>Order By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOrderBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ORDER_BY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOrderBy() <em>Order By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOrderBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected String orderBy = ORDER_BY_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getMapKey() <em>Map Key</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMapKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected MapKey mapKey;
-
-	/**
-	 * The cached value of the '{@link #getJoinColumns() <em>Join Columns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJoinColumns()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlJoinColumn> joinColumns;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlOneToManyImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_ONE_TO_MANY_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Target Entity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Target Entity</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Target Entity</em>' attribute.
-	 * @see #setTargetEntity(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_TargetEntity()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getTargetEntity()
-	{
-		return targetEntity;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToManyImpl#getTargetEntity <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Entity</em>' attribute.
-	 * @see #getTargetEntity()
-	 * @generated
-	 */
-	public void setTargetEntity(String newTargetEntity)
-	{
-		String oldTargetEntity = targetEntity;
-		targetEntity = newTargetEntity;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_MANY_IMPL__TARGET_ENTITY, oldTargetEntity, targetEntity));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Fetch</b></em>' attribute.
-	 * The default value is <code>"LAZY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.FetchType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.FetchType
-	 * @see #setFetch(FetchType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_Fetch()
-	 * @model default="LAZY"
-	 * @generated
-	 */
-	public FetchType getFetch()
-	{
-		return fetch;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToManyImpl#getFetch <em>Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.FetchType
-	 * @see #getFetch()
-	 * @generated
-	 */
-	public void setFetch(FetchType newFetch)
-	{
-		FetchType oldFetch = fetch;
-		fetch = newFetch == null ? FETCH_EDEFAULT : newFetch;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_MANY_IMPL__FETCH, oldFetch, fetch));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Mapped By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mapped By</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mapped By</em>' attribute.
-	 * @see #setMappedBy(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMultiRelationshipMapping_MappedBy()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getMappedBy()
-	{
-		return mappedBy;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToManyImpl#getMappedBy <em>Mapped By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapped By</em>' attribute.
-	 * @see #getMappedBy()
-	 * @generated
-	 */
-	public void setMappedBy(String newMappedBy)
-	{
-		String oldMappedBy = mappedBy;
-		mappedBy = newMappedBy;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_MANY_IMPL__MAPPED_BY, oldMappedBy, mappedBy));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Order By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Order By</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Order By</em>' attribute.
-	 * @see #setOrderBy(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMultiRelationshipMapping_OrderBy()
-	 * @model dataType="org.eclipse.jpt.core.resource.orm.OrderBy"
-	 * @generated
-	 */
-	public String getOrderBy()
-	{
-		return orderBy;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToManyImpl#getOrderBy <em>Order By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Order By</em>' attribute.
-	 * @see #getOrderBy()
-	 * @generated
-	 */
-	public void setOrderBy(String newOrderBy)
-	{
-		String oldOrderBy = orderBy;
-		orderBy = newOrderBy;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_MANY_IMPL__ORDER_BY, oldOrderBy, orderBy));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Map Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Map Key</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Map Key</em>' containment reference.
-	 * @see #setMapKey(MapKey)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMultiRelationshipMapping_MapKey()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public MapKey getMapKey()
-	{
-		return mapKey;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetMapKey(MapKey newMapKey, NotificationChain msgs)
-	{
-		MapKey oldMapKey = mapKey;
-		mapKey = newMapKey;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_MANY_IMPL__MAP_KEY, oldMapKey, newMapKey);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToManyImpl#getMapKey <em>Map Key</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Map Key</em>' containment reference.
-	 * @see #getMapKey()
-	 * @generated
-	 */
-	public void setMapKey(MapKey newMapKey)
-	{
-		if (newMapKey != mapKey)
-		{
-			NotificationChain msgs = null;
-			if (mapKey != null)
-				msgs = ((InternalEObject)mapKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_MANY_IMPL__MAP_KEY, null, msgs);
-			if (newMapKey != null)
-				msgs = ((InternalEObject)newMapKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_MANY_IMPL__MAP_KEY, null, msgs);
-			msgs = basicSetMapKey(newMapKey, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_MANY_IMPL__MAP_KEY, newMapKey, newMapKey));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Join Table</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join Table</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Join Table</em>' containment reference.
-	 * @see #setJoinTable(XmlJoinTable)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_JoinTable()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlJoinTable getJoinTable()
-	{
-		return joinTable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetJoinTable(XmlJoinTable newJoinTable, NotificationChain msgs)
-	{
-		XmlJoinTable oldJoinTable = joinTable;
-		joinTable = newJoinTable;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_TABLE, oldJoinTable, newJoinTable);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToManyImpl#getJoinTable <em>Join Table</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Join Table</em>' containment reference.
-	 * @see #getJoinTable()
-	 * @generated
-	 */
-	public void setJoinTable(XmlJoinTable newJoinTable)
-	{
-		if (newJoinTable != joinTable)
-		{
-			NotificationChain msgs = null;
-			if (joinTable != null)
-				msgs = ((InternalEObject)joinTable).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_TABLE, null, msgs);
-			if (newJoinTable != null)
-				msgs = ((InternalEObject)newJoinTable).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_TABLE, null, msgs);
-			msgs = basicSetJoinTable(newJoinTable, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_TABLE, newJoinTable, newJoinTable));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join 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>Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToMany_JoinColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlJoinColumn> getJoinColumns()
-	{
-		if (joinColumns == null)
-		{
-			joinColumns = new EObjectContainmentEList<XmlJoinColumn>(XmlJoinColumn.class, this, OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_COLUMNS);
-		}
-		return joinColumns;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cascade</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade</em>' containment reference.
-	 * @see #setCascade(CascadeType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_Cascade()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public CascadeType getCascade()
-	{
-		return cascade;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCascade(CascadeType newCascade, NotificationChain msgs)
-	{
-		CascadeType oldCascade = cascade;
-		cascade = newCascade;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_MANY_IMPL__CASCADE, oldCascade, newCascade);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToManyImpl#getCascade <em>Cascade</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade</em>' containment reference.
-	 * @see #getCascade()
-	 * @generated
-	 */
-	public void setCascade(CascadeType newCascade)
-	{
-		if (newCascade != cascade)
-		{
-			NotificationChain msgs = null;
-			if (cascade != null)
-				msgs = ((InternalEObject)cascade).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_MANY_IMPL__CASCADE, null, msgs);
-			if (newCascade != null)
-				msgs = ((InternalEObject)newCascade).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_MANY_IMPL__CASCADE, null, msgs);
-			msgs = basicSetCascade(newCascade, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_MANY_IMPL__CASCADE, newCascade, newCascade));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_TABLE:
-				return basicSetJoinTable(null, msgs);
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__CASCADE:
-				return basicSetCascade(null, msgs);
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__MAP_KEY:
-				return basicSetMapKey(null, msgs);
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_COLUMNS:
-				return ((InternalEList<?>)getJoinColumns()).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 OrmPackage.XML_ONE_TO_MANY_IMPL__TARGET_ENTITY:
-				return getTargetEntity();
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__FETCH:
-				return getFetch();
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_TABLE:
-				return getJoinTable();
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__CASCADE:
-				return getCascade();
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__MAPPED_BY:
-				return getMappedBy();
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__ORDER_BY:
-				return getOrderBy();
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__MAP_KEY:
-				return getMapKey();
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_COLUMNS:
-				return getJoinColumns();
-		}
-		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 OrmPackage.XML_ONE_TO_MANY_IMPL__TARGET_ENTITY:
-				setTargetEntity((String)newValue);
-				return;
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__FETCH:
-				setFetch((FetchType)newValue);
-				return;
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_TABLE:
-				setJoinTable((XmlJoinTable)newValue);
-				return;
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__CASCADE:
-				setCascade((CascadeType)newValue);
-				return;
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__MAPPED_BY:
-				setMappedBy((String)newValue);
-				return;
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__ORDER_BY:
-				setOrderBy((String)newValue);
-				return;
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__MAP_KEY:
-				setMapKey((MapKey)newValue);
-				return;
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_COLUMNS:
-				getJoinColumns().clear();
-				getJoinColumns().addAll((Collection<? extends XmlJoinColumn>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__TARGET_ENTITY:
-				setTargetEntity(TARGET_ENTITY_EDEFAULT);
-				return;
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__FETCH:
-				setFetch(FETCH_EDEFAULT);
-				return;
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_TABLE:
-				setJoinTable((XmlJoinTable)null);
-				return;
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__CASCADE:
-				setCascade((CascadeType)null);
-				return;
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__MAPPED_BY:
-				setMappedBy(MAPPED_BY_EDEFAULT);
-				return;
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__ORDER_BY:
-				setOrderBy(ORDER_BY_EDEFAULT);
-				return;
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__MAP_KEY:
-				setMapKey((MapKey)null);
-				return;
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_COLUMNS:
-				getJoinColumns().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__TARGET_ENTITY:
-				return TARGET_ENTITY_EDEFAULT == null ? targetEntity != null : !TARGET_ENTITY_EDEFAULT.equals(targetEntity);
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__FETCH:
-				return fetch != FETCH_EDEFAULT;
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_TABLE:
-				return joinTable != null;
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__CASCADE:
-				return cascade != null;
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__MAPPED_BY:
-				return MAPPED_BY_EDEFAULT == null ? mappedBy != null : !MAPPED_BY_EDEFAULT.equals(mappedBy);
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__ORDER_BY:
-				return ORDER_BY_EDEFAULT == null ? orderBy != null : !ORDER_BY_EDEFAULT.equals(orderBy);
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__MAP_KEY:
-				return mapKey != null;
-			case OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_COLUMNS:
-				return joinColumns != null && !joinColumns.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlRelationshipMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_ONE_TO_MANY_IMPL__TARGET_ENTITY: return OrmPackage.XML_RELATIONSHIP_MAPPING__TARGET_ENTITY;
-				case OrmPackage.XML_ONE_TO_MANY_IMPL__FETCH: return OrmPackage.XML_RELATIONSHIP_MAPPING__FETCH;
-				case OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_TABLE: return OrmPackage.XML_RELATIONSHIP_MAPPING__JOIN_TABLE;
-				case OrmPackage.XML_ONE_TO_MANY_IMPL__CASCADE: return OrmPackage.XML_RELATIONSHIP_MAPPING__CASCADE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMultiRelationshipMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_ONE_TO_MANY_IMPL__MAPPED_BY: return OrmPackage.XML_MULTI_RELATIONSHIP_MAPPING__MAPPED_BY;
-				case OrmPackage.XML_ONE_TO_MANY_IMPL__ORDER_BY: return OrmPackage.XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY;
-				case OrmPackage.XML_ONE_TO_MANY_IMPL__MAP_KEY: return OrmPackage.XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToMany.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_COLUMNS: return OrmPackage.XML_ONE_TO_MANY__JOIN_COLUMNS;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlRelationshipMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_RELATIONSHIP_MAPPING__TARGET_ENTITY: return OrmPackage.XML_ONE_TO_MANY_IMPL__TARGET_ENTITY;
-				case OrmPackage.XML_RELATIONSHIP_MAPPING__FETCH: return OrmPackage.XML_ONE_TO_MANY_IMPL__FETCH;
-				case OrmPackage.XML_RELATIONSHIP_MAPPING__JOIN_TABLE: return OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_TABLE;
-				case OrmPackage.XML_RELATIONSHIP_MAPPING__CASCADE: return OrmPackage.XML_ONE_TO_MANY_IMPL__CASCADE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMultiRelationshipMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_MULTI_RELATIONSHIP_MAPPING__MAPPED_BY: return OrmPackage.XML_ONE_TO_MANY_IMPL__MAPPED_BY;
-				case OrmPackage.XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY: return OrmPackage.XML_ONE_TO_MANY_IMPL__ORDER_BY;
-				case OrmPackage.XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY: return OrmPackage.XML_ONE_TO_MANY_IMPL__MAP_KEY;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToMany.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_ONE_TO_MANY__JOIN_COLUMNS: return OrmPackage.XML_ONE_TO_MANY_IMPL__JOIN_COLUMNS;
-				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(" (targetEntity: ");
-		result.append(targetEntity);
-		result.append(", fetch: ");
-		result.append(fetch);
-		result.append(", mappedBy: ");
-		result.append(mappedBy);
-		result.append(", orderBy: ");
-		result.append(orderBy);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getMappedByTextRange() {
-		IDOMNode mappedByNode = (IDOMNode) DOMUtilities.childAttributeNode(getNode(), OrmXmlMapper.MAPPED_BY);
-		return (mappedByNode == null) ? getValidationTextRange() : buildTextRange(mappedByNode);
-	}
-} // OneToMany
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToOne.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToOne.java
deleted file mode 100644
index de2ac0d6ff..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToOne.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.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>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.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlOneToOne#getMappedBy <em>Mapped By</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlOneToOne#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToOne()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlOneToOne extends XmlSingleRelationshipMapping
-{
-	/**
-	 * Returns the value of the '<em><b>Mapped By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mapped By</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mapped By</em>' attribute.
-	 * @see #setMappedBy(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToOne_MappedBy()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getMappedBy();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOne#getMappedBy <em>Mapped By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapped By</em>' attribute.
-	 * @see #getMappedBy()
-	 * @generated
-	 */
-	void setMappedBy(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Primary Key Join 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>Primary Key Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToOne_PrimaryKeyJoinColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlPrimaryKeyJoinColumn> getPrimaryKeyJoinColumns();
-	
-	TextRange getMappedByTextRange();
-
-} // OneToOne
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToOneImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToOneImpl.java
deleted file mode 100644
index 6bc035f0f3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToOneImpl.java
+++ /dev/null
@@ -1,759 +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.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.internal.resource.orm.translators.OrmXmlMapper;
-import org.eclipse.jpt.core.internal.utility.emf.DOMUtilities;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>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.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToOneImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlOneToOneImpl extends AbstractXmlAttributeMapping implements XmlOneToOne
-{
-	/**
-	 * The default value of the '{@link #getTargetEntity() <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTargetEntity()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TARGET_ENTITY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTargetEntity() <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTargetEntity()
-	 * @generated
-	 * @ordered
-	 */
-	protected String targetEntity = TARGET_ENTITY_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 FetchType FETCH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFetch() <em>Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFetch()
-	 * @generated
-	 * @ordered
-	 */
-	protected FetchType fetch = FETCH_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getJoinTable() <em>Join Table</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJoinTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlJoinTable joinTable;
-
-	/**
-	 * The cached value of the '{@link #getCascade() <em>Cascade</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascade()
-	 * @generated
-	 * @ordered
-	 */
-	protected CascadeType cascade;
-
-	/**
-	 * The default value of the '{@link #getOptional() <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOptional()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean OPTIONAL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOptional() <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOptional()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean optional = OPTIONAL_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getJoinColumns() <em>Join Columns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJoinColumns()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlJoinColumn> joinColumns;
-
-	/**
-	 * The default value of the '{@link #getMappedBy() <em>Mapped By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAPPED_BY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMappedBy() <em>Mapped By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappedBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mappedBy = MAPPED_BY_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPrimaryKeyJoinColumns() <em>Primary Key Join Columns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrimaryKeyJoinColumns()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlPrimaryKeyJoinColumn> primaryKeyJoinColumns;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlOneToOneImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_ONE_TO_ONE_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Target Entity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Target Entity</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Target Entity</em>' attribute.
-	 * @see #setTargetEntity(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_TargetEntity()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getTargetEntity()
-	{
-		return targetEntity;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOneImpl#getTargetEntity <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Entity</em>' attribute.
-	 * @see #getTargetEntity()
-	 * @generated
-	 */
-	public void setTargetEntity(String newTargetEntity)
-	{
-		String oldTargetEntity = targetEntity;
-		targetEntity = newTargetEntity;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_ONE_IMPL__TARGET_ENTITY, oldTargetEntity, targetEntity));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Fetch</b></em>' attribute.
-	 * The default value is <code>"LAZY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.FetchType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.FetchType
-	 * @see #setFetch(FetchType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_Fetch()
-	 * @model default="LAZY"
-	 * @generated
-	 */
-	public FetchType getFetch()
-	{
-		return fetch;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOneImpl#getFetch <em>Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.FetchType
-	 * @see #getFetch()
-	 * @generated
-	 */
-	public void setFetch(FetchType newFetch)
-	{
-		FetchType oldFetch = fetch;
-		fetch = newFetch == null ? FETCH_EDEFAULT : newFetch;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_ONE_IMPL__FETCH, oldFetch, fetch));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Optional</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Optional</em>' attribute.
-	 * @see #setOptional(Boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSingleRelationshipMapping_Optional()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getOptional()
-	{
-		return optional;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOneImpl#getOptional <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Optional</em>' attribute.
-	 * @see #getOptional()
-	 * @generated
-	 */
-	public void setOptional(Boolean newOptional)
-	{
-		Boolean oldOptional = optional;
-		optional = newOptional;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_ONE_IMPL__OPTIONAL, oldOptional, optional));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Mapped By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mapped By</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mapped By</em>' attribute.
-	 * @see #setMappedBy(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToOne_MappedBy()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getMappedBy()
-	{
-		return mappedBy;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOneImpl#getMappedBy <em>Mapped By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapped By</em>' attribute.
-	 * @see #getMappedBy()
-	 * @generated
-	 */
-	public void setMappedBy(String newMappedBy)
-	{
-		String oldMappedBy = mappedBy;
-		mappedBy = newMappedBy;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_ONE_IMPL__MAPPED_BY, oldMappedBy, mappedBy));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Primary Key Join 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>Primary Key Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToOne_PrimaryKeyJoinColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlPrimaryKeyJoinColumn> getPrimaryKeyJoinColumns()
-	{
-		if (primaryKeyJoinColumns == null)
-		{
-			primaryKeyJoinColumns = new EObjectContainmentEList<XmlPrimaryKeyJoinColumn>(XmlPrimaryKeyJoinColumn.class, this, OrmPackage.XML_ONE_TO_ONE_IMPL__PRIMARY_KEY_JOIN_COLUMNS);
-		}
-		return primaryKeyJoinColumns;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join 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>Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSingleRelationshipMapping_JoinColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlJoinColumn> getJoinColumns()
-	{
-		if (joinColumns == null)
-		{
-			joinColumns = new EObjectContainmentEList<XmlJoinColumn>(XmlJoinColumn.class, this, OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_COLUMNS);
-		}
-		return joinColumns;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Join Table</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join Table</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Join Table</em>' containment reference.
-	 * @see #setJoinTable(XmlJoinTable)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_JoinTable()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlJoinTable getJoinTable()
-	{
-		return joinTable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetJoinTable(XmlJoinTable newJoinTable, NotificationChain msgs)
-	{
-		XmlJoinTable oldJoinTable = joinTable;
-		joinTable = newJoinTable;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_TABLE, oldJoinTable, newJoinTable);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOneImpl#getJoinTable <em>Join Table</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Join Table</em>' containment reference.
-	 * @see #getJoinTable()
-	 * @generated
-	 */
-	public void setJoinTable(XmlJoinTable newJoinTable)
-	{
-		if (newJoinTable != joinTable)
-		{
-			NotificationChain msgs = null;
-			if (joinTable != null)
-				msgs = ((InternalEObject)joinTable).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_TABLE, null, msgs);
-			if (newJoinTable != null)
-				msgs = ((InternalEObject)newJoinTable).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_TABLE, null, msgs);
-			msgs = basicSetJoinTable(newJoinTable, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_TABLE, newJoinTable, newJoinTable));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cascade</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade</em>' containment reference.
-	 * @see #setCascade(CascadeType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_Cascade()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public CascadeType getCascade()
-	{
-		return cascade;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCascade(CascadeType newCascade, NotificationChain msgs)
-	{
-		CascadeType oldCascade = cascade;
-		cascade = newCascade;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_ONE_IMPL__CASCADE, oldCascade, newCascade);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOneImpl#getCascade <em>Cascade</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade</em>' containment reference.
-	 * @see #getCascade()
-	 * @generated
-	 */
-	public void setCascade(CascadeType newCascade)
-	{
-		if (newCascade != cascade)
-		{
-			NotificationChain msgs = null;
-			if (cascade != null)
-				msgs = ((InternalEObject)cascade).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_ONE_IMPL__CASCADE, null, msgs);
-			if (newCascade != null)
-				msgs = ((InternalEObject)newCascade).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_ONE_IMPL__CASCADE, null, msgs);
-			msgs = basicSetCascade(newCascade, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_ONE_IMPL__CASCADE, newCascade, newCascade));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_TABLE:
-				return basicSetJoinTable(null, msgs);
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__CASCADE:
-				return basicSetCascade(null, msgs);
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_COLUMNS:
-				return ((InternalEList<?>)getJoinColumns()).basicRemove(otherEnd, msgs);
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__PRIMARY_KEY_JOIN_COLUMNS:
-				return ((InternalEList<?>)getPrimaryKeyJoinColumns()).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 OrmPackage.XML_ONE_TO_ONE_IMPL__TARGET_ENTITY:
-				return getTargetEntity();
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__FETCH:
-				return getFetch();
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_TABLE:
-				return getJoinTable();
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__CASCADE:
-				return getCascade();
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__OPTIONAL:
-				return getOptional();
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_COLUMNS:
-				return getJoinColumns();
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__MAPPED_BY:
-				return getMappedBy();
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__PRIMARY_KEY_JOIN_COLUMNS:
-				return getPrimaryKeyJoinColumns();
-		}
-		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 OrmPackage.XML_ONE_TO_ONE_IMPL__TARGET_ENTITY:
-				setTargetEntity((String)newValue);
-				return;
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__FETCH:
-				setFetch((FetchType)newValue);
-				return;
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_TABLE:
-				setJoinTable((XmlJoinTable)newValue);
-				return;
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__CASCADE:
-				setCascade((CascadeType)newValue);
-				return;
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__OPTIONAL:
-				setOptional((Boolean)newValue);
-				return;
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_COLUMNS:
-				getJoinColumns().clear();
-				getJoinColumns().addAll((Collection<? extends XmlJoinColumn>)newValue);
-				return;
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__MAPPED_BY:
-				setMappedBy((String)newValue);
-				return;
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__PRIMARY_KEY_JOIN_COLUMNS:
-				getPrimaryKeyJoinColumns().clear();
-				getPrimaryKeyJoinColumns().addAll((Collection<? extends XmlPrimaryKeyJoinColumn>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__TARGET_ENTITY:
-				setTargetEntity(TARGET_ENTITY_EDEFAULT);
-				return;
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__FETCH:
-				setFetch(FETCH_EDEFAULT);
-				return;
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_TABLE:
-				setJoinTable((XmlJoinTable)null);
-				return;
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__CASCADE:
-				setCascade((CascadeType)null);
-				return;
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__OPTIONAL:
-				setOptional(OPTIONAL_EDEFAULT);
-				return;
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_COLUMNS:
-				getJoinColumns().clear();
-				return;
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__MAPPED_BY:
-				setMappedBy(MAPPED_BY_EDEFAULT);
-				return;
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__PRIMARY_KEY_JOIN_COLUMNS:
-				getPrimaryKeyJoinColumns().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__TARGET_ENTITY:
-				return TARGET_ENTITY_EDEFAULT == null ? targetEntity != null : !TARGET_ENTITY_EDEFAULT.equals(targetEntity);
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__FETCH:
-				return fetch != FETCH_EDEFAULT;
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_TABLE:
-				return joinTable != null;
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__CASCADE:
-				return cascade != null;
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__OPTIONAL:
-				return OPTIONAL_EDEFAULT == null ? optional != null : !OPTIONAL_EDEFAULT.equals(optional);
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_COLUMNS:
-				return joinColumns != null && !joinColumns.isEmpty();
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__MAPPED_BY:
-				return MAPPED_BY_EDEFAULT == null ? mappedBy != null : !MAPPED_BY_EDEFAULT.equals(mappedBy);
-			case OrmPackage.XML_ONE_TO_ONE_IMPL__PRIMARY_KEY_JOIN_COLUMNS:
-				return primaryKeyJoinColumns != null && !primaryKeyJoinColumns.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlRelationshipMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_ONE_TO_ONE_IMPL__TARGET_ENTITY: return OrmPackage.XML_RELATIONSHIP_MAPPING__TARGET_ENTITY;
-				case OrmPackage.XML_ONE_TO_ONE_IMPL__FETCH: return OrmPackage.XML_RELATIONSHIP_MAPPING__FETCH;
-				case OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_TABLE: return OrmPackage.XML_RELATIONSHIP_MAPPING__JOIN_TABLE;
-				case OrmPackage.XML_ONE_TO_ONE_IMPL__CASCADE: return OrmPackage.XML_RELATIONSHIP_MAPPING__CASCADE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlSingleRelationshipMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_ONE_TO_ONE_IMPL__OPTIONAL: return OrmPackage.XML_SINGLE_RELATIONSHIP_MAPPING__OPTIONAL;
-				case OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_COLUMNS: return OrmPackage.XML_SINGLE_RELATIONSHIP_MAPPING__JOIN_COLUMNS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToOne.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_ONE_TO_ONE_IMPL__MAPPED_BY: return OrmPackage.XML_ONE_TO_ONE__MAPPED_BY;
-				case OrmPackage.XML_ONE_TO_ONE_IMPL__PRIMARY_KEY_JOIN_COLUMNS: return OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_JOIN_COLUMNS;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlRelationshipMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_RELATIONSHIP_MAPPING__TARGET_ENTITY: return OrmPackage.XML_ONE_TO_ONE_IMPL__TARGET_ENTITY;
-				case OrmPackage.XML_RELATIONSHIP_MAPPING__FETCH: return OrmPackage.XML_ONE_TO_ONE_IMPL__FETCH;
-				case OrmPackage.XML_RELATIONSHIP_MAPPING__JOIN_TABLE: return OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_TABLE;
-				case OrmPackage.XML_RELATIONSHIP_MAPPING__CASCADE: return OrmPackage.XML_ONE_TO_ONE_IMPL__CASCADE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlSingleRelationshipMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_SINGLE_RELATIONSHIP_MAPPING__OPTIONAL: return OrmPackage.XML_ONE_TO_ONE_IMPL__OPTIONAL;
-				case OrmPackage.XML_SINGLE_RELATIONSHIP_MAPPING__JOIN_COLUMNS: return OrmPackage.XML_ONE_TO_ONE_IMPL__JOIN_COLUMNS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToOne.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_ONE_TO_ONE__MAPPED_BY: return OrmPackage.XML_ONE_TO_ONE_IMPL__MAPPED_BY;
-				case OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_JOIN_COLUMNS: return OrmPackage.XML_ONE_TO_ONE_IMPL__PRIMARY_KEY_JOIN_COLUMNS;
-				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(" (targetEntity: ");
-		result.append(targetEntity);
-		result.append(", fetch: ");
-		result.append(fetch);
-		result.append(", optional: ");
-		result.append(optional);
-		result.append(", mappedBy: ");
-		result.append(mappedBy);
-		result.append(')');
-		return result.toString();
-	}
-
-	public TextRange getMappedByTextRange() {
-		IDOMNode mappedByNode = (IDOMNode) DOMUtilities.childAttributeNode(getNode(), OrmXmlMapper.MAPPED_BY);
-		return (mappedByNode == null) ? getValidationTextRange() : buildTextRange(mappedByNode);
-	}
-} // OneToOne
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPersistenceUnitDefaults.java
deleted file mode 100644
index 9c35c572ac..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPersistenceUnitDefaults.java
+++ /dev/null
@@ -1,505 +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.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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>XmlPersistence Unit Defaults</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#getSchema <em>Schema</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#getCatalog <em>Catalog</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#getAccess <em>Access</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#isCascadePersist <em>Cascade Persist</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#getEntityListeners <em>Entity Listeners</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPersistenceUnitDefaults()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlPersistenceUnitDefaults extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The default value of the '{@link #getSchema() <em>Schema</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSchema()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SCHEMA_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSchema() <em>Schema</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSchema()
-	 * @generated
-	 * @ordered
-	 */
-	protected String schema = SCHEMA_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCatalog() <em>Catalog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCatalog()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CATALOG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCatalog() <em>Catalog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCatalog()
-	 * @generated
-	 * @ordered
-	 */
-	protected String catalog = CATALOG_EDEFAULT;
-
-	/**
-	 * 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 default value of the '{@link #isCascadePersist() <em>Cascade Persist</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCascadePersist()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean CASCADE_PERSIST_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isCascadePersist() <em>Cascade Persist</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCascadePersist()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean cascadePersist = CASCADE_PERSIST_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getEntityListeners() <em>Entity Listeners</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEntityListeners()
-	 * @generated
-	 * @ordered
-	 */
-	protected EntityListeners entityListeners;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlPersistenceUnitDefaults()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_PERSISTENCE_UNIT_DEFAULTS;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Schema</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Schema</em>' attribute.
-	 * @see #setSchema(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPersistenceUnitDefaults_Schema()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getSchema()
-	{
-		return schema;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#getSchema <em>Schema</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Schema</em>' attribute.
-	 * @see #getSchema()
-	 * @generated
-	 */
-	public void setSchema(String newSchema)
-	{
-		String oldSchema = schema;
-		schema = newSchema;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__SCHEMA, oldSchema, schema));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Catalog</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Catalog</em>' attribute.
-	 * @see #setCatalog(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPersistenceUnitDefaults_Catalog()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getCatalog()
-	{
-		return catalog;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#getCatalog <em>Catalog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Catalog</em>' attribute.
-	 * @see #getCatalog()
-	 * @generated
-	 */
-	public void setCatalog(String newCatalog)
-	{
-		String oldCatalog = catalog;
-		catalog = newCatalog;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__CATALOG, oldCatalog, catalog));
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlPersistenceUnitDefaults_Access()
-	 * @model default="PROPERTY"
-	 * @generated
-	 */
-	public AccessType getAccess()
-	{
-		return access;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#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, OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS, oldAccess, access));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cascade Persist</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade Persist</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 Persist</em>' attribute.
-	 * @see #setCascadePersist(boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPersistenceUnitDefaults_CascadePersist()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isCascadePersist()
-	{
-		return cascadePersist;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#isCascadePersist <em>Cascade Persist</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade Persist</em>' attribute.
-	 * @see #isCascadePersist()
-	 * @generated
-	 */
-	public void setCascadePersist(boolean newCascadePersist)
-	{
-		boolean oldCascadePersist = cascadePersist;
-		cascadePersist = newCascadePersist;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__CASCADE_PERSIST, oldCascadePersist, cascadePersist));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Entity Listeners</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Entity Listeners</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Entity Listeners</em>' containment reference.
-	 * @see #setEntityListeners(EntityListeners)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPersistenceUnitDefaults_EntityListeners()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EntityListeners getEntityListeners()
-	{
-		return entityListeners;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetEntityListeners(EntityListeners newEntityListeners, NotificationChain msgs)
-	{
-		EntityListeners oldEntityListeners = entityListeners;
-		entityListeners = newEntityListeners;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ENTITY_LISTENERS, oldEntityListeners, newEntityListeners);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults#getEntityListeners <em>Entity Listeners</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Entity Listeners</em>' containment reference.
-	 * @see #getEntityListeners()
-	 * @generated
-	 */
-	public void setEntityListeners(EntityListeners newEntityListeners)
-	{
-		if (newEntityListeners != entityListeners)
-		{
-			NotificationChain msgs = null;
-			if (entityListeners != null)
-				msgs = ((InternalEObject)entityListeners).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ENTITY_LISTENERS, null, msgs);
-			if (newEntityListeners != null)
-				msgs = ((InternalEObject)newEntityListeners).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ENTITY_LISTENERS, null, msgs);
-			msgs = basicSetEntityListeners(newEntityListeners, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ENTITY_LISTENERS, newEntityListeners, newEntityListeners));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ENTITY_LISTENERS:
-				return basicSetEntityListeners(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 OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__SCHEMA:
-				return getSchema();
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__CATALOG:
-				return getCatalog();
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS:
-				return getAccess();
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__CASCADE_PERSIST:
-				return isCascadePersist() ? Boolean.TRUE : Boolean.FALSE;
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ENTITY_LISTENERS:
-				return getEntityListeners();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__SCHEMA:
-				setSchema((String)newValue);
-				return;
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__CATALOG:
-				setCatalog((String)newValue);
-				return;
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS:
-				setAccess((AccessType)newValue);
-				return;
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__CASCADE_PERSIST:
-				setCascadePersist(((Boolean)newValue).booleanValue());
-				return;
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ENTITY_LISTENERS:
-				setEntityListeners((EntityListeners)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__SCHEMA:
-				setSchema(SCHEMA_EDEFAULT);
-				return;
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__CATALOG:
-				setCatalog(CATALOG_EDEFAULT);
-				return;
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS:
-				setAccess(ACCESS_EDEFAULT);
-				return;
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__CASCADE_PERSIST:
-				setCascadePersist(CASCADE_PERSIST_EDEFAULT);
-				return;
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ENTITY_LISTENERS:
-				setEntityListeners((EntityListeners)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__SCHEMA:
-				return SCHEMA_EDEFAULT == null ? schema != null : !SCHEMA_EDEFAULT.equals(schema);
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__CATALOG:
-				return CATALOG_EDEFAULT == null ? catalog != null : !CATALOG_EDEFAULT.equals(catalog);
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS:
-				return access != ACCESS_EDEFAULT;
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__CASCADE_PERSIST:
-				return cascadePersist != CASCADE_PERSIST_EDEFAULT;
-			case OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ENTITY_LISTENERS:
-				return entityListeners != 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(" (schema: ");
-		result.append(schema);
-		result.append(", catalog: ");
-		result.append(catalog);
-		result.append(", access: ");
-		result.append(access);
-		result.append(", cascadePersist: ");
-		result.append(cascadePersist);
-		result.append(')');
-		return result.toString();
-	}
-
-} // PersistenceUnitDefaults
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPersistenceUnitMetadata.java
deleted file mode 100644
index 06b617dd77..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPersistenceUnitMetadata.java
+++ /dev/null
@@ -1,301 +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.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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>XmlPersistence 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.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata#isXmlMappingMetadataComplete <em>Xml Mapping Metadata Complete</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata#getPersistenceUnitDefaults <em>Persistence Unit Defaults</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPersistenceUnitMetadata()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlPersistenceUnitMetadata extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The default value of the '{@link #isXmlMappingMetadataComplete() <em>Xml Mapping Metadata Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isXmlMappingMetadataComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean XML_MAPPING_METADATA_COMPLETE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isXmlMappingMetadataComplete() <em>Xml Mapping Metadata Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isXmlMappingMetadataComplete()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean xmlMappingMetadataComplete = XML_MAPPING_METADATA_COMPLETE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPersistenceUnitDefaults() <em>Persistence Unit Defaults</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceUnitDefaults()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPersistenceUnitDefaults persistenceUnitDefaults;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlPersistenceUnitMetadata()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_PERSISTENCE_UNIT_METADATA;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Xml Mapping Metadata Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Xml Mapping Metadata Complete</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Xml Mapping Metadata Complete</em>' attribute.
-	 * @see #setXmlMappingMetadataComplete(boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPersistenceUnitMetadata_XmlMappingMetadataComplete()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isXmlMappingMetadataComplete()
-	{
-		return xmlMappingMetadataComplete;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata#isXmlMappingMetadataComplete <em>Xml Mapping Metadata Complete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Xml Mapping Metadata Complete</em>' attribute.
-	 * @see #isXmlMappingMetadataComplete()
-	 * @generated
-	 */
-	public void setXmlMappingMetadataComplete(boolean newXmlMappingMetadataComplete)
-	{
-		boolean oldXmlMappingMetadataComplete = xmlMappingMetadataComplete;
-		xmlMappingMetadataComplete = newXmlMappingMetadataComplete;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_PERSISTENCE_UNIT_METADATA__XML_MAPPING_METADATA_COMPLETE, oldXmlMappingMetadataComplete, xmlMappingMetadataComplete));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Unit Defaults</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XmlPersistence Unit Defaults</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Persistence Unit Defaults</em>' containment reference.
-	 * @see #setPersistenceUnitDefaults(XmlPersistenceUnitDefaults)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPersistenceUnitMetadata_PersistenceUnitDefaults()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPersistenceUnitDefaults getPersistenceUnitDefaults()
-	{
-		return persistenceUnitDefaults;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPersistenceUnitDefaults(XmlPersistenceUnitDefaults newPersistenceUnitDefaults, NotificationChain msgs)
-	{
-		XmlPersistenceUnitDefaults oldPersistenceUnitDefaults = persistenceUnitDefaults;
-		persistenceUnitDefaults = newPersistenceUnitDefaults;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_PERSISTENCE_UNIT_METADATA__PERSISTENCE_UNIT_DEFAULTS, oldPersistenceUnitDefaults, newPersistenceUnitDefaults);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata#getPersistenceUnitDefaults <em>Persistence Unit Defaults</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Persistence Unit Defaults</em>' containment reference.
-	 * @see #getPersistenceUnitDefaults()
-	 * @generated
-	 */
-	public void setPersistenceUnitDefaults(XmlPersistenceUnitDefaults newPersistenceUnitDefaults)
-	{
-		if (newPersistenceUnitDefaults != persistenceUnitDefaults)
-		{
-			NotificationChain msgs = null;
-			if (persistenceUnitDefaults != null)
-				msgs = ((InternalEObject)persistenceUnitDefaults).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_PERSISTENCE_UNIT_METADATA__PERSISTENCE_UNIT_DEFAULTS, null, msgs);
-			if (newPersistenceUnitDefaults != null)
-				msgs = ((InternalEObject)newPersistenceUnitDefaults).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_PERSISTENCE_UNIT_METADATA__PERSISTENCE_UNIT_DEFAULTS, null, msgs);
-			msgs = basicSetPersistenceUnitDefaults(newPersistenceUnitDefaults, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_PERSISTENCE_UNIT_METADATA__PERSISTENCE_UNIT_DEFAULTS, newPersistenceUnitDefaults, newPersistenceUnitDefaults));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_PERSISTENCE_UNIT_METADATA__PERSISTENCE_UNIT_DEFAULTS:
-				return basicSetPersistenceUnitDefaults(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 OrmPackage.XML_PERSISTENCE_UNIT_METADATA__XML_MAPPING_METADATA_COMPLETE:
-				return isXmlMappingMetadataComplete() ? Boolean.TRUE : Boolean.FALSE;
-			case OrmPackage.XML_PERSISTENCE_UNIT_METADATA__PERSISTENCE_UNIT_DEFAULTS:
-				return getPersistenceUnitDefaults();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_PERSISTENCE_UNIT_METADATA__XML_MAPPING_METADATA_COMPLETE:
-				setXmlMappingMetadataComplete(((Boolean)newValue).booleanValue());
-				return;
-			case OrmPackage.XML_PERSISTENCE_UNIT_METADATA__PERSISTENCE_UNIT_DEFAULTS:
-				setPersistenceUnitDefaults((XmlPersistenceUnitDefaults)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_PERSISTENCE_UNIT_METADATA__XML_MAPPING_METADATA_COMPLETE:
-				setXmlMappingMetadataComplete(XML_MAPPING_METADATA_COMPLETE_EDEFAULT);
-				return;
-			case OrmPackage.XML_PERSISTENCE_UNIT_METADATA__PERSISTENCE_UNIT_DEFAULTS:
-				setPersistenceUnitDefaults((XmlPersistenceUnitDefaults)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_PERSISTENCE_UNIT_METADATA__XML_MAPPING_METADATA_COMPLETE:
-				return xmlMappingMetadataComplete != XML_MAPPING_METADATA_COMPLETE_EDEFAULT;
-			case OrmPackage.XML_PERSISTENCE_UNIT_METADATA__PERSISTENCE_UNIT_DEFAULTS:
-				return persistenceUnitDefaults != 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(" (xmlMappingMetadataComplete: ");
-		result.append(xmlMappingMetadataComplete);
-		result.append(')');
-		return result.toString();
-	}
-
-} // PersistenceUnitMetadata
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPrimaryKeyJoinColumn.java
deleted file mode 100644
index 1cb74716ef..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPrimaryKeyJoinColumn.java
+++ /dev/null
@@ -1,72 +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.core.resource.orm;
-
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Primary Key Join Column</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.core.resource.orm.XmlPrimaryKeyJoinColumn#getReferencedColumnName <em>Referenced Column Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPrimaryKeyJoinColumn()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlPrimaryKeyJoinColumn extends XmlNamedColumn
-{
-
-	/**
-	 * Returns the value of the '<em><b>Referenced Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Referenced Column 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>Referenced Column Name</em>' attribute.
-	 * @see #setReferencedColumnName(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPrimaryKeyJoinColumn_ReferencedColumnName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getReferencedColumnName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn#getReferencedColumnName <em>Referenced Column Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Referenced Column Name</em>' attribute.
-	 * @see #getReferencedColumnName()
-	 * @generated
-	 */
-	void setReferencedColumnName(String value);
-
-
-	/**
-	 * Return the {@link TextRange} for the referenced-column-name attibute.  If the referenced-column-name attibute 
-	 * does not exist return the {@link TextRange} for the *table element.
-	 */
-	TextRange getReferencedColumnNameTextRange();
-
-} // PrimaryKeyJoinColumn
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPrimaryKeyJoinColumnImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPrimaryKeyJoinColumnImpl.java
deleted file mode 100644
index 552b57aec1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPrimaryKeyJoinColumnImpl.java
+++ /dev/null
@@ -1,239 +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.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.internal.utility.emf.DOMUtilities;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Primary Key Join Column 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.core.resource.orm.OrmPackage#getXmlPrimaryKeyJoinColumnImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlPrimaryKeyJoinColumnImpl extends AbstractXmlNamedColumn implements XmlPrimaryKeyJoinColumn
-{
-	/**
-	 * The default value of the '{@link #getReferencedColumnName() <em>Referenced Column Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReferencedColumnName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REFERENCED_COLUMN_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getReferencedColumnName() <em>Referenced Column Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReferencedColumnName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String referencedColumnName = REFERENCED_COLUMN_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlPrimaryKeyJoinColumnImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_PRIMARY_KEY_JOIN_COLUMN_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Referenced Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Referenced Column 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>Referenced Column Name</em>' attribute.
-	 * @see #setReferencedColumnName(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPrimaryKeyJoinColumn_ReferencedColumnName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getReferencedColumnName()
-	{
-		return referencedColumnName;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumnImpl#getReferencedColumnName <em>Referenced Column Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Referenced Column Name</em>' attribute.
-	 * @see #getReferencedColumnName()
-	 * @generated
-	 */
-	public void setReferencedColumnName(String newReferencedColumnName)
-	{
-		String oldReferencedColumnName = referencedColumnName;
-		referencedColumnName = newReferencedColumnName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_PRIMARY_KEY_JOIN_COLUMN_IMPL__REFERENCED_COLUMN_NAME, oldReferencedColumnName, referencedColumnName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_PRIMARY_KEY_JOIN_COLUMN_IMPL__REFERENCED_COLUMN_NAME:
-				return getReferencedColumnName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_PRIMARY_KEY_JOIN_COLUMN_IMPL__REFERENCED_COLUMN_NAME:
-				setReferencedColumnName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_PRIMARY_KEY_JOIN_COLUMN_IMPL__REFERENCED_COLUMN_NAME:
-				setReferencedColumnName(REFERENCED_COLUMN_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_PRIMARY_KEY_JOIN_COLUMN_IMPL__REFERENCED_COLUMN_NAME:
-				return REFERENCED_COLUMN_NAME_EDEFAULT == null ? referencedColumnName != null : !REFERENCED_COLUMN_NAME_EDEFAULT.equals(referencedColumnName);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlPrimaryKeyJoinColumn.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_PRIMARY_KEY_JOIN_COLUMN_IMPL__REFERENCED_COLUMN_NAME: return OrmPackage.XML_PRIMARY_KEY_JOIN_COLUMN__REFERENCED_COLUMN_NAME;
-				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 == XmlPrimaryKeyJoinColumn.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_PRIMARY_KEY_JOIN_COLUMN__REFERENCED_COLUMN_NAME: return OrmPackage.XML_PRIMARY_KEY_JOIN_COLUMN_IMPL__REFERENCED_COLUMN_NAME;
-				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(" (referencedColumnName: ");
-		result.append(referencedColumnName);
-		result.append(')');
-		return result.toString();
-	}
-
-	public TextRange getReferencedColumnNameTextRange() {
-		IDOMNode referencedColumnNameNode = (IDOMNode) DOMUtilities.childAttributeNode(this.node, OrmXmlMapper.REFERENCED_COLUMN_NAME);
-		return (referencedColumnNameNode == null) ? getValidationTextRange() : buildTextRange(referencedColumnNameNode);
-	}
-} // XmlPrimaryKeyJoinColumnImpl
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlQuery.java
deleted file mode 100644
index b09de55800..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlQuery.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.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>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.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlQuery#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlQuery#getQuery <em>Query</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlQuery#getHints <em>Hints</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlQuery()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlQuery 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.core.resource.orm.OrmPackage#getXmlQuery_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlQuery#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Query</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Query</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</em>' attribute.
-	 * @see #setQuery(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlQuery_Query()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	String getQuery();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlQuery#getQuery <em>Query</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Query</em>' attribute.
-	 * @see #getQuery()
-	 * @generated
-	 */
-	void setQuery(String value);
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlQuery_Hints()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlQueryHint> getHints();
-	
-	public TextRange getNameTextRange();
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlQueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlQueryHint.java
deleted file mode 100644
index ed0a6c85ea..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlQueryHint.java
+++ /dev/null
@@ -1,270 +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.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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Query Hint</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.core.resource.orm.XmlQueryHint#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlQueryHint()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlQueryHint 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;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlQueryHint()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_QUERY_HINT;
-	}
-
-	/**
-	 * 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.core.resource.orm.OrmPackage#getXmlQueryHint_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint#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, OrmPackage.XML_QUERY_HINT__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.core.resource.orm.OrmPackage#getXmlQueryHint_Value()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getValue()
-	{
-		return value;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint#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, OrmPackage.XML_QUERY_HINT__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_QUERY_HINT__NAME:
-				return getName();
-			case OrmPackage.XML_QUERY_HINT__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_QUERY_HINT__NAME:
-				setName((String)newValue);
-				return;
-			case OrmPackage.XML_QUERY_HINT__VALUE:
-				setValue((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_QUERY_HINT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case OrmPackage.XML_QUERY_HINT__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_QUERY_HINT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case OrmPackage.XML_QUERY_HINT__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-} // QueryHint
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlRelationshipMapping.java
deleted file mode 100644
index 78ee50bc0a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlRelationshipMapping.java
+++ /dev/null
@@ -1,148 +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.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Relationship Mapping</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getTargetEntity <em>Target Entity</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getFetch <em>Fetch</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getJoinTable <em>Join Table</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getCascade <em>Cascade</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlRelationshipMapping extends XmlAttributeMapping
-{
-	/**
-	 * Returns the value of the '<em><b>Target Entity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Target Entity</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Target Entity</em>' attribute.
-	 * @see #setTargetEntity(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_TargetEntity()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getTargetEntity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getTargetEntity <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Entity</em>' attribute.
-	 * @see #getTargetEntity()
-	 * @generated
-	 */
-	void setTargetEntity(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Fetch</b></em>' attribute.
-	 * The default value is <code>"LAZY"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.FetchType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.FetchType
-	 * @see #setFetch(FetchType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_Fetch()
-	 * @model default="LAZY"
-	 * @generated
-	 */
-	FetchType getFetch();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getFetch <em>Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.FetchType
-	 * @see #getFetch()
-	 * @generated
-	 */
-	void setFetch(FetchType value);
-
-	/**
-	 * Returns the value of the '<em><b>Cascade</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade</em>' containment reference.
-	 * @see #setCascade(CascadeType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_Cascade()
-	 * @model containment="true"
-	 * @generated
-	 */
-	CascadeType getCascade();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getCascade <em>Cascade</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade</em>' containment reference.
-	 * @see #getCascade()
-	 * @generated
-	 */
-	void setCascade(CascadeType value);
-
-	/**
-	 * Returns the value of the '<em><b>Join Table</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join Table</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Join Table</em>' containment reference.
-	 * @see #setJoinTable(XmlJoinTable)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlRelationshipMapping_JoinTable()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlJoinTable getJoinTable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getJoinTable <em>Join Table</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Join Table</em>' containment reference.
-	 * @see #getJoinTable()
-	 * @generated
-	 */
-	void setJoinTable(XmlJoinTable value);
-
-} // RelationshipMapping
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSecondaryTable.java
deleted file mode 100644
index a6cfb7aa0a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSecondaryTable.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.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Secondary Table</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTable#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSecondaryTable()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlSecondaryTable extends XmlBaseTable
-{
-
-	/**
-	 * Returns the value of the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Primary Key Join 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>Primary Key Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSecondaryTable_PrimaryKeyJoinColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlPrimaryKeyJoinColumn> getPrimaryKeyJoinColumns();
-
-} // SecondaryTable
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSecondaryTableImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSecondaryTableImpl.java
deleted file mode 100644
index d0d68d926c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSecondaryTableImpl.java
+++ /dev/null
@@ -1,214 +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.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 Secondary Table 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.core.resource.orm.OrmPackage#getXmlSecondaryTableImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlSecondaryTableImpl extends AbstractXmlBaseTable implements XmlSecondaryTable
-{
-	/**
-	 * The cached value of the '{@link #getPrimaryKeyJoinColumns() <em>Primary Key Join Columns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrimaryKeyJoinColumns()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlPrimaryKeyJoinColumn> primaryKeyJoinColumns;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlSecondaryTableImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_SECONDARY_TABLE_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Primary Key Join 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>Primary Key Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSecondaryTable_PrimaryKeyJoinColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlPrimaryKeyJoinColumn> getPrimaryKeyJoinColumns()
-	{
-		if (primaryKeyJoinColumns == null)
-		{
-			primaryKeyJoinColumns = new EObjectContainmentEList<XmlPrimaryKeyJoinColumn>(XmlPrimaryKeyJoinColumn.class, this, OrmPackage.XML_SECONDARY_TABLE_IMPL__PRIMARY_KEY_JOIN_COLUMNS);
-		}
-		return primaryKeyJoinColumns;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_SECONDARY_TABLE_IMPL__PRIMARY_KEY_JOIN_COLUMNS:
-				return ((InternalEList<?>)getPrimaryKeyJoinColumns()).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 OrmPackage.XML_SECONDARY_TABLE_IMPL__PRIMARY_KEY_JOIN_COLUMNS:
-				return getPrimaryKeyJoinColumns();
-		}
-		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 OrmPackage.XML_SECONDARY_TABLE_IMPL__PRIMARY_KEY_JOIN_COLUMNS:
-				getPrimaryKeyJoinColumns().clear();
-				getPrimaryKeyJoinColumns().addAll((Collection<? extends XmlPrimaryKeyJoinColumn>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_SECONDARY_TABLE_IMPL__PRIMARY_KEY_JOIN_COLUMNS:
-				getPrimaryKeyJoinColumns().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_SECONDARY_TABLE_IMPL__PRIMARY_KEY_JOIN_COLUMNS:
-				return primaryKeyJoinColumns != null && !primaryKeyJoinColumns.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlSecondaryTable.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_SECONDARY_TABLE_IMPL__PRIMARY_KEY_JOIN_COLUMNS: return OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlSecondaryTable.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS: return OrmPackage.XML_SECONDARY_TABLE_IMPL__PRIMARY_KEY_JOIN_COLUMNS;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-} // XmlSecondaryTableImpl
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSequenceGenerator.java
deleted file mode 100644
index 161fdc9c3d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSequenceGenerator.java
+++ /dev/null
@@ -1,63 +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.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Sequence Generator</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.core.resource.orm.XmlSequenceGenerator#getSequenceName <em>Sequence Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSequenceGenerator()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlSequenceGenerator extends XmlGenerator
-{
-	/**
-	 * Returns the value of the '<em><b>Sequence Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sequence 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>Sequence Name</em>' attribute.
-	 * @see #setSequenceName(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSequenceGenerator_SequenceName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getSequenceName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator#getSequenceName <em>Sequence Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Sequence Name</em>' attribute.
-	 * @see #getSequenceName()
-	 * @generated
-	 */
-	void setSequenceName(String value);
-
-} // SequenceGenerator
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSequenceGeneratorImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSequenceGeneratorImpl.java
deleted file mode 100644
index 121fb05983..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSequenceGeneratorImpl.java
+++ /dev/null
@@ -1,407 +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.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.internal.utility.emf.DOMUtilities;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Sequence Generator</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.core.resource.orm.OrmPackage#getXmlSequenceGeneratorImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlSequenceGeneratorImpl extends AbstractJpaEObject implements XmlSequenceGenerator
-{
-	/**
-	 * 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 #getInitialValue() <em>Initial Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitialValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Integer INITIAL_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getInitialValue() <em>Initial Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitialValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected Integer initialValue = INITIAL_VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAllocationSize() <em>Allocation Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAllocationSize()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Integer ALLOCATION_SIZE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAllocationSize() <em>Allocation Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAllocationSize()
-	 * @generated
-	 * @ordered
-	 */
-	protected Integer allocationSize = ALLOCATION_SIZE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSequenceName() <em>Sequence Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSequenceName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SEQUENCE_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSequenceName() <em>Sequence Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSequenceName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String sequenceName = SEQUENCE_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlSequenceGeneratorImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_SEQUENCE_GENERATOR_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.core.resource.orm.OrmPackage#getXmlGenerator_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGeneratorImpl#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, OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__NAME, oldName, name));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Sequence Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sequence 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>Sequence Name</em>' attribute.
-	 * @see #setSequenceName(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSequenceGenerator_SequenceName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getSequenceName()
-	{
-		return sequenceName;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGeneratorImpl#getSequenceName <em>Sequence Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Sequence Name</em>' attribute.
-	 * @see #getSequenceName()
-	 * @generated
-	 */
-	public void setSequenceName(String newSequenceName)
-	{
-		String oldSequenceName = sequenceName;
-		sequenceName = newSequenceName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__SEQUENCE_NAME, oldSequenceName, sequenceName));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Initial Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Initial 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>Initial Value</em>' attribute.
-	 * @see #setInitialValue(Integer)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGenerator_InitialValue()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	public Integer getInitialValue()
-	{
-		return initialValue;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGeneratorImpl#getInitialValue <em>Initial Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Initial Value</em>' attribute.
-	 * @see #getInitialValue()
-	 * @generated
-	 */
-	public void setInitialValue(Integer newInitialValue)
-	{
-		Integer oldInitialValue = initialValue;
-		initialValue = newInitialValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__INITIAL_VALUE, oldInitialValue, initialValue));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Allocation Size</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Allocation 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>Allocation Size</em>' attribute.
-	 * @see #setAllocationSize(Integer)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGenerator_AllocationSize()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	public Integer getAllocationSize()
-	{
-		return allocationSize;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGeneratorImpl#getAllocationSize <em>Allocation Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Allocation Size</em>' attribute.
-	 * @see #getAllocationSize()
-	 * @generated
-	 */
-	public void setAllocationSize(Integer newAllocationSize)
-	{
-		Integer oldAllocationSize = allocationSize;
-		allocationSize = newAllocationSize;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__ALLOCATION_SIZE, oldAllocationSize, allocationSize));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__NAME:
-				return getName();
-			case OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__INITIAL_VALUE:
-				return getInitialValue();
-			case OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__ALLOCATION_SIZE:
-				return getAllocationSize();
-			case OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__SEQUENCE_NAME:
-				return getSequenceName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__NAME:
-				setName((String)newValue);
-				return;
-			case OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__INITIAL_VALUE:
-				setInitialValue((Integer)newValue);
-				return;
-			case OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__ALLOCATION_SIZE:
-				setAllocationSize((Integer)newValue);
-				return;
-			case OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__SEQUENCE_NAME:
-				setSequenceName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__INITIAL_VALUE:
-				setInitialValue(INITIAL_VALUE_EDEFAULT);
-				return;
-			case OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__ALLOCATION_SIZE:
-				setAllocationSize(ALLOCATION_SIZE_EDEFAULT);
-				return;
-			case OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__SEQUENCE_NAME:
-				setSequenceName(SEQUENCE_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__INITIAL_VALUE:
-				return INITIAL_VALUE_EDEFAULT == null ? initialValue != null : !INITIAL_VALUE_EDEFAULT.equals(initialValue);
-			case OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__ALLOCATION_SIZE:
-				return ALLOCATION_SIZE_EDEFAULT == null ? allocationSize != null : !ALLOCATION_SIZE_EDEFAULT.equals(allocationSize);
-			case OrmPackage.XML_SEQUENCE_GENERATOR_IMPL__SEQUENCE_NAME:
-				return SEQUENCE_NAME_EDEFAULT == null ? sequenceName != null : !SEQUENCE_NAME_EDEFAULT.equals(sequenceName);
-		}
-		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(", initialValue: ");
-		result.append(initialValue);
-		result.append(", allocationSize: ");
-		result.append(allocationSize);
-		result.append(", sequenceName: ");
-		result.append(sequenceName);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getNameTextRange() {
-		IDOMNode nameNode = (IDOMNode) DOMUtilities.childAttributeNode(getNode(), OrmXmlMapper.NAME);
-		return (nameNode == null) ? getValidationTextRange() : buildTextRange(nameNode);
-	}
-	
-	public boolean isVirtual() {
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSingleRelationshipMapping.java
deleted file mode 100644
index 7ffe31a8b4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSingleRelationshipMapping.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.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Single Relationship Mapping</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping#getOptional <em>Optional</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping#getJoinColumns <em>Join Columns</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSingleRelationshipMapping()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlSingleRelationshipMapping extends XmlRelationshipMapping
-{
-	/**
-	 * Returns the value of the '<em><b>Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Optional</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Optional</em>' attribute.
-	 * @see #setOptional(Boolean)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSingleRelationshipMapping_Optional()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getOptional();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping#getOptional <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Optional</em>' attribute.
-	 * @see #getOptional()
-	 * @generated
-	 */
-	void setOptional(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join 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>Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSingleRelationshipMapping_JoinColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlJoinColumn> getJoinColumns();
-
-} // SingleRelationshipMapping
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTable.java
deleted file mode 100644
index ddcde8ddc3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTable.java
+++ /dev/null
@@ -1,52 +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.core.resource.orm;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Table</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTable()
- * @model kind="class"
- * @generated
- */
-public class XmlTable extends AbstractXmlBaseTable
-{
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlTable()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_TABLE;
-	}
-} // Table
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTableGenerator.java
deleted file mode 100644
index 49bc56c5b9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTableGenerator.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.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Table Generator</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.core.resource.orm.XmlTableGenerator#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getCatalog <em>Catalog</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getSchema <em>Schema</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getPkColumnName <em>Pk Column Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getValueColumnName <em>Value Column Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getPkColumnValue <em>Pk Column Value</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getUniqueConstraints <em>Unique Constraints</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlTableGenerator extends XmlGenerator
-{
-	/**
-	 * Returns the value of the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Table</em>' attribute.
-	 * @see #setTable(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator_Table()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getTable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getTable <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Table</em>' attribute.
-	 * @see #getTable()
-	 * @generated
-	 */
-	void setTable(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Catalog</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Catalog</em>' attribute.
-	 * @see #setCatalog(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator_Catalog()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getCatalog();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getCatalog <em>Catalog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Catalog</em>' attribute.
-	 * @see #getCatalog()
-	 * @generated
-	 */
-	void setCatalog(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Schema</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Schema</em>' attribute.
-	 * @see #setSchema(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator_Schema()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getSchema();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getSchema <em>Schema</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Schema</em>' attribute.
-	 * @see #getSchema()
-	 * @generated
-	 */
-	void setSchema(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Pk Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pk Column 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>Pk Column Name</em>' attribute.
-	 * @see #setPkColumnName(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator_PkColumnName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getPkColumnName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getPkColumnName <em>Pk Column Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pk Column Name</em>' attribute.
-	 * @see #getPkColumnName()
-	 * @generated
-	 */
-	void setPkColumnName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value Column 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>Value Column Name</em>' attribute.
-	 * @see #setValueColumnName(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator_ValueColumnName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getValueColumnName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getValueColumnName <em>Value Column Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value Column Name</em>' attribute.
-	 * @see #getValueColumnName()
-	 * @generated
-	 */
-	void setValueColumnName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Pk Column Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pk Column 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>Pk Column Value</em>' attribute.
-	 * @see #setPkColumnValue(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator_PkColumnValue()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getPkColumnValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getPkColumnValue <em>Pk Column Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pk Column Value</em>' attribute.
-	 * @see #getPkColumnValue()
-	 * @generated
-	 */
-	void setPkColumnValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Unique Constraints</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Unique Constraints</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>Unique Constraints</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator_UniqueConstraints()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlUniqueConstraint> getUniqueConstraints();
-
-} // TableGenerator
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTableGeneratorImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTableGeneratorImpl.java
deleted file mode 100644
index fdb15f4837..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTableGeneratorImpl.java
+++ /dev/null
@@ -1,809 +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.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.internal.resource.orm.translators.OrmXmlMapper;
-import org.eclipse.jpt.core.internal.utility.emf.DOMUtilities;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Table Generator</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.core.resource.orm.OrmPackage#getXmlTableGeneratorImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlTableGeneratorImpl extends AbstractJpaEObject implements XmlTableGenerator
-{
-	/**
-	 * 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 #getInitialValue() <em>Initial Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitialValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Integer INITIAL_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getInitialValue() <em>Initial Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitialValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected Integer initialValue = INITIAL_VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAllocationSize() <em>Allocation Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAllocationSize()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Integer ALLOCATION_SIZE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAllocationSize() <em>Allocation Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAllocationSize()
-	 * @generated
-	 * @ordered
-	 */
-	protected Integer allocationSize = ALLOCATION_SIZE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTable() <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TABLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTable() <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected String table = TABLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCatalog() <em>Catalog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCatalog()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CATALOG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCatalog() <em>Catalog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCatalog()
-	 * @generated
-	 * @ordered
-	 */
-	protected String catalog = CATALOG_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSchema() <em>Schema</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSchema()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SCHEMA_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSchema() <em>Schema</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSchema()
-	 * @generated
-	 * @ordered
-	 */
-	protected String schema = SCHEMA_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPkColumnName() <em>Pk Column Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPkColumnName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PK_COLUMN_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPkColumnName() <em>Pk Column Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPkColumnName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String pkColumnName = PK_COLUMN_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValueColumnName() <em>Value Column Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueColumnName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_COLUMN_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValueColumnName() <em>Value Column Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueColumnName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String valueColumnName = VALUE_COLUMN_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPkColumnValue() <em>Pk Column Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPkColumnValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PK_COLUMN_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPkColumnValue() <em>Pk Column Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPkColumnValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String pkColumnValue = PK_COLUMN_VALUE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getUniqueConstraints() <em>Unique Constraints</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUniqueConstraints()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlUniqueConstraint> uniqueConstraints;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlTableGeneratorImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_TABLE_GENERATOR_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.core.resource.orm.OrmPackage#getXmlGenerator_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGeneratorImpl#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, OrmPackage.XML_TABLE_GENERATOR_IMPL__NAME, oldName, name));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Table</em>' attribute.
-	 * @see #setTable(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator_Table()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getTable()
-	{
-		return table;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGeneratorImpl#getTable <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Table</em>' attribute.
-	 * @see #getTable()
-	 * @generated
-	 */
-	public void setTable(String newTable)
-	{
-		String oldTable = table;
-		table = newTable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_TABLE_GENERATOR_IMPL__TABLE, oldTable, table));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Catalog</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Catalog</em>' attribute.
-	 * @see #setCatalog(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator_Catalog()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getCatalog()
-	{
-		return catalog;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGeneratorImpl#getCatalog <em>Catalog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Catalog</em>' attribute.
-	 * @see #getCatalog()
-	 * @generated
-	 */
-	public void setCatalog(String newCatalog)
-	{
-		String oldCatalog = catalog;
-		catalog = newCatalog;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_TABLE_GENERATOR_IMPL__CATALOG, oldCatalog, catalog));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Schema</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Schema</em>' attribute.
-	 * @see #setSchema(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator_Schema()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getSchema()
-	{
-		return schema;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGeneratorImpl#getSchema <em>Schema</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Schema</em>' attribute.
-	 * @see #getSchema()
-	 * @generated
-	 */
-	public void setSchema(String newSchema)
-	{
-		String oldSchema = schema;
-		schema = newSchema;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_TABLE_GENERATOR_IMPL__SCHEMA, oldSchema, schema));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pk Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pk Column 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>Pk Column Name</em>' attribute.
-	 * @see #setPkColumnName(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator_PkColumnName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getPkColumnName()
-	{
-		return pkColumnName;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGeneratorImpl#getPkColumnName <em>Pk Column Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pk Column Name</em>' attribute.
-	 * @see #getPkColumnName()
-	 * @generated
-	 */
-	public void setPkColumnName(String newPkColumnName)
-	{
-		String oldPkColumnName = pkColumnName;
-		pkColumnName = newPkColumnName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_TABLE_GENERATOR_IMPL__PK_COLUMN_NAME, oldPkColumnName, pkColumnName));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Value Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value Column 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>Value Column Name</em>' attribute.
-	 * @see #setValueColumnName(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator_ValueColumnName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getValueColumnName()
-	{
-		return valueColumnName;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGeneratorImpl#getValueColumnName <em>Value Column Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value Column Name</em>' attribute.
-	 * @see #getValueColumnName()
-	 * @generated
-	 */
-	public void setValueColumnName(String newValueColumnName)
-	{
-		String oldValueColumnName = valueColumnName;
-		valueColumnName = newValueColumnName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_TABLE_GENERATOR_IMPL__VALUE_COLUMN_NAME, oldValueColumnName, valueColumnName));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pk Column Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pk Column 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>Pk Column Value</em>' attribute.
-	 * @see #setPkColumnValue(String)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator_PkColumnValue()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getPkColumnValue()
-	{
-		return pkColumnValue;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGeneratorImpl#getPkColumnValue <em>Pk Column Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pk Column Value</em>' attribute.
-	 * @see #getPkColumnValue()
-	 * @generated
-	 */
-	public void setPkColumnValue(String newPkColumnValue)
-	{
-		String oldPkColumnValue = pkColumnValue;
-		pkColumnValue = newPkColumnValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_TABLE_GENERATOR_IMPL__PK_COLUMN_VALUE, oldPkColumnValue, pkColumnValue));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Initial Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Initial 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>Initial Value</em>' attribute.
-	 * @see #setInitialValue(Integer)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGenerator_InitialValue()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	public Integer getInitialValue()
-	{
-		return initialValue;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGeneratorImpl#getInitialValue <em>Initial Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Initial Value</em>' attribute.
-	 * @see #getInitialValue()
-	 * @generated
-	 */
-	public void setInitialValue(Integer newInitialValue)
-	{
-		Integer oldInitialValue = initialValue;
-		initialValue = newInitialValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_TABLE_GENERATOR_IMPL__INITIAL_VALUE, oldInitialValue, initialValue));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Allocation Size</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Allocation 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>Allocation Size</em>' attribute.
-	 * @see #setAllocationSize(Integer)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlGenerator_AllocationSize()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	public Integer getAllocationSize()
-	{
-		return allocationSize;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGeneratorImpl#getAllocationSize <em>Allocation Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Allocation Size</em>' attribute.
-	 * @see #getAllocationSize()
-	 * @generated
-	 */
-	public void setAllocationSize(Integer newAllocationSize)
-	{
-		Integer oldAllocationSize = allocationSize;
-		allocationSize = newAllocationSize;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_TABLE_GENERATOR_IMPL__ALLOCATION_SIZE, oldAllocationSize, allocationSize));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Unique Constraints</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Unique Constraints</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>Unique Constraints</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator_UniqueConstraints()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlUniqueConstraint> getUniqueConstraints()
-	{
-		if (uniqueConstraints == null)
-		{
-			uniqueConstraints = new EObjectContainmentEList<XmlUniqueConstraint>(XmlUniqueConstraint.class, this, OrmPackage.XML_TABLE_GENERATOR_IMPL__UNIQUE_CONSTRAINTS);
-		}
-		return uniqueConstraints;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__UNIQUE_CONSTRAINTS:
-				return ((InternalEList<?>)getUniqueConstraints()).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 OrmPackage.XML_TABLE_GENERATOR_IMPL__NAME:
-				return getName();
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__INITIAL_VALUE:
-				return getInitialValue();
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__ALLOCATION_SIZE:
-				return getAllocationSize();
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__TABLE:
-				return getTable();
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__CATALOG:
-				return getCatalog();
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__SCHEMA:
-				return getSchema();
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__PK_COLUMN_NAME:
-				return getPkColumnName();
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__VALUE_COLUMN_NAME:
-				return getValueColumnName();
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__PK_COLUMN_VALUE:
-				return getPkColumnValue();
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__UNIQUE_CONSTRAINTS:
-				return getUniqueConstraints();
-		}
-		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 OrmPackage.XML_TABLE_GENERATOR_IMPL__NAME:
-				setName((String)newValue);
-				return;
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__INITIAL_VALUE:
-				setInitialValue((Integer)newValue);
-				return;
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__ALLOCATION_SIZE:
-				setAllocationSize((Integer)newValue);
-				return;
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__TABLE:
-				setTable((String)newValue);
-				return;
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__CATALOG:
-				setCatalog((String)newValue);
-				return;
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__SCHEMA:
-				setSchema((String)newValue);
-				return;
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__PK_COLUMN_NAME:
-				setPkColumnName((String)newValue);
-				return;
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__VALUE_COLUMN_NAME:
-				setValueColumnName((String)newValue);
-				return;
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__PK_COLUMN_VALUE:
-				setPkColumnValue((String)newValue);
-				return;
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__UNIQUE_CONSTRAINTS:
-				getUniqueConstraints().clear();
-				getUniqueConstraints().addAll((Collection<? extends XmlUniqueConstraint>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__INITIAL_VALUE:
-				setInitialValue(INITIAL_VALUE_EDEFAULT);
-				return;
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__ALLOCATION_SIZE:
-				setAllocationSize(ALLOCATION_SIZE_EDEFAULT);
-				return;
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__TABLE:
-				setTable(TABLE_EDEFAULT);
-				return;
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__CATALOG:
-				setCatalog(CATALOG_EDEFAULT);
-				return;
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__SCHEMA:
-				setSchema(SCHEMA_EDEFAULT);
-				return;
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__PK_COLUMN_NAME:
-				setPkColumnName(PK_COLUMN_NAME_EDEFAULT);
-				return;
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__VALUE_COLUMN_NAME:
-				setValueColumnName(VALUE_COLUMN_NAME_EDEFAULT);
-				return;
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__PK_COLUMN_VALUE:
-				setPkColumnValue(PK_COLUMN_VALUE_EDEFAULT);
-				return;
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__UNIQUE_CONSTRAINTS:
-				getUniqueConstraints().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__INITIAL_VALUE:
-				return INITIAL_VALUE_EDEFAULT == null ? initialValue != null : !INITIAL_VALUE_EDEFAULT.equals(initialValue);
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__ALLOCATION_SIZE:
-				return ALLOCATION_SIZE_EDEFAULT == null ? allocationSize != null : !ALLOCATION_SIZE_EDEFAULT.equals(allocationSize);
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__TABLE:
-				return TABLE_EDEFAULT == null ? table != null : !TABLE_EDEFAULT.equals(table);
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__CATALOG:
-				return CATALOG_EDEFAULT == null ? catalog != null : !CATALOG_EDEFAULT.equals(catalog);
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__SCHEMA:
-				return SCHEMA_EDEFAULT == null ? schema != null : !SCHEMA_EDEFAULT.equals(schema);
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__PK_COLUMN_NAME:
-				return PK_COLUMN_NAME_EDEFAULT == null ? pkColumnName != null : !PK_COLUMN_NAME_EDEFAULT.equals(pkColumnName);
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__VALUE_COLUMN_NAME:
-				return VALUE_COLUMN_NAME_EDEFAULT == null ? valueColumnName != null : !VALUE_COLUMN_NAME_EDEFAULT.equals(valueColumnName);
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__PK_COLUMN_VALUE:
-				return PK_COLUMN_VALUE_EDEFAULT == null ? pkColumnValue != null : !PK_COLUMN_VALUE_EDEFAULT.equals(pkColumnValue);
-			case OrmPackage.XML_TABLE_GENERATOR_IMPL__UNIQUE_CONSTRAINTS:
-				return uniqueConstraints != null && !uniqueConstraints.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(", initialValue: ");
-		result.append(initialValue);
-		result.append(", allocationSize: ");
-		result.append(allocationSize);
-		result.append(", table: ");
-		result.append(table);
-		result.append(", catalog: ");
-		result.append(catalog);
-		result.append(", schema: ");
-		result.append(schema);
-		result.append(", pkColumnName: ");
-		result.append(pkColumnName);
-		result.append(", valueColumnName: ");
-		result.append(valueColumnName);
-		result.append(", pkColumnValue: ");
-		result.append(pkColumnValue);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getNameTextRange() {
-		IDOMNode nameNode = (IDOMNode) DOMUtilities.childAttributeNode(getNode(), OrmXmlMapper.NAME);
-		return (nameNode == null) ? getValidationTextRange() : buildTextRange(nameNode);
-	}
-	
-	public boolean isVirtual() {
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTransient.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTransient.java
deleted file mode 100644
index aeae56313b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTransient.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.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Transient</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.core.resource.orm.OrmPackage#getXmlTransient()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlTransient extends XmlAttributeMapping
-{
-} // Transient
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTransientImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTransientImpl.java
deleted file mode 100644
index 20a95752ee..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTransientImpl.java
+++ /dev/null
@@ -1,53 +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.core.resource.orm;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Transient</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.core.resource.orm.OrmPackage#getXmlTransientImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlTransientImpl extends AbstractXmlAttributeMapping implements XmlTransient
-{
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlTransientImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_TRANSIENT_IMPL;
-	}
-
-} // Transient
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlUniqueConstraint.java
deleted file mode 100644
index 553b26fbe5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlUniqueConstraint.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.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Unique Constraint</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.core.resource.orm.XmlUniqueConstraint#getColumnNames <em>Column Names</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlUniqueConstraint()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlUniqueConstraint extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Column Names</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Column Names</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Column Names</em>' attribute list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlUniqueConstraint_ColumnNames()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	EList<String> getColumnNames();
-
-} // XmlUniqueConstraint
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlUniqueConstraintImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlUniqueConstraintImpl.java
deleted file mode 100644
index 48ea18b122..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlUniqueConstraintImpl.java
+++ /dev/null
@@ -1,175 +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.core.resource.orm;
-
-import java.util.Collection;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.util.EDataTypeEList;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Unique Constraint</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.core.resource.orm.OrmPackage#getXmlUniqueConstraintImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlUniqueConstraintImpl extends AbstractJpaEObject implements XmlUniqueConstraint
-{
-	/**
-	 * The cached value of the '{@link #getColumnNames() <em>Column Names</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getColumnNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<String> columnNames;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlUniqueConstraintImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_UNIQUE_CONSTRAINT_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Column Names</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Column Names</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Column Names</em>' attribute list.
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlUniqueConstraint_ColumnNames()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public EList<String> getColumnNames()
-	{
-		if (columnNames == null)
-		{
-			columnNames = new EDataTypeEList<String>(String.class, this, OrmPackage.XML_UNIQUE_CONSTRAINT_IMPL__COLUMN_NAMES);
-		}
-		return columnNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_UNIQUE_CONSTRAINT_IMPL__COLUMN_NAMES:
-				return getColumnNames();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_UNIQUE_CONSTRAINT_IMPL__COLUMN_NAMES:
-				getColumnNames().clear();
-				getColumnNames().addAll((Collection<? extends String>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_UNIQUE_CONSTRAINT_IMPL__COLUMN_NAMES:
-				getColumnNames().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_UNIQUE_CONSTRAINT_IMPL__COLUMN_NAMES:
-				return columnNames != null && !columnNames.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (columnNames: ");
-		result.append(columnNames);
-		result.append(')');
-		return result.toString();
-	}
-
-} // UniqueConstraint
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlVersion.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlVersion.java
deleted file mode 100644
index c1e5ed9ac2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlVersion.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.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>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.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.core.resource.orm.XmlVersion#getTemporal <em>Temporal</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlVersion()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlVersion extends XmlAttributeMapping, ColumnMapping
-{
-	/**
-	 * Returns the value of the '<em><b>Temporal</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.TemporalType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Temporal</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Temporal</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.TemporalType
-	 * @see #setTemporal(TemporalType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlVersion_Temporal()
-	 * @model
-	 * @generated
-	 */
-	TemporalType getTemporal();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlVersion#getTemporal <em>Temporal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Temporal</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.TemporalType
-	 * @see #getTemporal()
-	 * @generated
-	 */
-	void setTemporal(TemporalType value);
-
-} // Version
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlVersionImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlVersionImpl.java
deleted file mode 100644
index e5638836bc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlVersionImpl.java
+++ /dev/null
@@ -1,344 +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.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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>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.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlVersionImpl()
- * @model kind="class"
- * @generated
- */
-public class XmlVersionImpl extends AbstractXmlAttributeMapping implements XmlVersion
-{
-	/**
-	 * The cached value of the '{@link #getColumn() <em>Column</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getColumn()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlColumn column;
-
-	/**
-	 * 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 TemporalType TEMPORAL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTemporal() <em>Temporal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTemporal()
-	 * @generated
-	 * @ordered
-	 */
-	protected TemporalType temporal = TEMPORAL_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlVersionImpl()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return OrmPackage.Literals.XML_VERSION_IMPL;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Column</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Column</em>' containment reference.
-	 * @see #setColumn(XmlColumn)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnMapping_Column()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlColumn getColumn()
-	{
-		return column;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetColumn(XmlColumn newColumn, NotificationChain msgs)
-	{
-		XmlColumn oldColumn = column;
-		column = newColumn;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_VERSION_IMPL__COLUMN, oldColumn, newColumn);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlVersionImpl#getColumn <em>Column</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Column</em>' containment reference.
-	 * @see #getColumn()
-	 * @generated
-	 */
-	public void setColumn(XmlColumn newColumn)
-	{
-		if (newColumn != column)
-		{
-			NotificationChain msgs = null;
-			if (column != null)
-				msgs = ((InternalEObject)column).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_VERSION_IMPL__COLUMN, null, msgs);
-			if (newColumn != null)
-				msgs = ((InternalEObject)newColumn).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_VERSION_IMPL__COLUMN, null, msgs);
-			msgs = basicSetColumn(newColumn, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_VERSION_IMPL__COLUMN, newColumn, newColumn));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Temporal</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.TemporalType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Temporal</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Temporal</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.TemporalType
-	 * @see #setTemporal(TemporalType)
-	 * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlVersion_Temporal()
-	 * @model
-	 * @generated
-	 */
-	public TemporalType getTemporal()
-	{
-		return temporal;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlVersionImpl#getTemporal <em>Temporal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Temporal</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.orm.TemporalType
-	 * @see #getTemporal()
-	 * @generated
-	 */
-	public void setTemporal(TemporalType newTemporal)
-	{
-		TemporalType oldTemporal = temporal;
-		temporal = newTemporal == null ? TEMPORAL_EDEFAULT : newTemporal;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_VERSION_IMPL__TEMPORAL, oldTemporal, temporal));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_VERSION_IMPL__COLUMN:
-				return basicSetColumn(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 OrmPackage.XML_VERSION_IMPL__COLUMN:
-				return getColumn();
-			case OrmPackage.XML_VERSION_IMPL__TEMPORAL:
-				return getTemporal();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_VERSION_IMPL__COLUMN:
-				setColumn((XmlColumn)newValue);
-				return;
-			case OrmPackage.XML_VERSION_IMPL__TEMPORAL:
-				setTemporal((TemporalType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_VERSION_IMPL__COLUMN:
-				setColumn((XmlColumn)null);
-				return;
-			case OrmPackage.XML_VERSION_IMPL__TEMPORAL:
-				setTemporal(TEMPORAL_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case OrmPackage.XML_VERSION_IMPL__COLUMN:
-				return column != null;
-			case OrmPackage.XML_VERSION_IMPL__TEMPORAL:
-				return temporal != TEMPORAL_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == ColumnMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_VERSION_IMPL__COLUMN: return OrmPackage.COLUMN_MAPPING__COLUMN;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlVersion.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case OrmPackage.XML_VERSION_IMPL__TEMPORAL: return OrmPackage.XML_VERSION__TEMPORAL;
-				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 == ColumnMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.COLUMN_MAPPING__COLUMN: return OrmPackage.XML_VERSION_IMPL__COLUMN;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlVersion.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_VERSION__TEMPORAL: return OrmPackage.XML_VERSION_IMPL__TEMPORAL;
-				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(" (temporal: ");
-		result.append(temporal);
-		result.append(')');
-		return result.toString();
-	}
-
-} // Version
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceArtifactEdit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceArtifactEdit.java
deleted file mode 100644
index d391e1712b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceArtifactEdit.java
+++ /dev/null
@@ -1,123 +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.core.resource.persistence;
-
-import java.io.IOException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.resource.common.JpaArtifactEdit;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 PersistenceArtifactEdit extends JpaArtifactEdit
-{
-	/**
-	 * @param aProject
-	 * @return a persistence artifact for project aProject.
-	 * Opened only for read access (no write)
-	 */
-	public static PersistenceArtifactEdit getArtifactEditForRead(IProject aProject) {
-		PersistenceArtifactEdit artifactEdit = null;
-		try {
-			artifactEdit = new PersistenceArtifactEdit(aProject, true);
-		} 
-		catch (IllegalArgumentException iae) {
-            // suppress illegal argument exception
-            JptCorePlugin.log(iae);
-		}
-		return artifactEdit;
-	}
-	
-    /**
-	 * @param aProject
-	 * @return a persistence artifact for the project aProject.
-     * Opened for both write and read access
-     */	
-	public static PersistenceArtifactEdit getArtifactEditForWrite(IProject aProject) {
-		PersistenceArtifactEdit artifactEdit = null;
-		try {
-			artifactEdit = new PersistenceArtifactEdit(aProject, false);
-		} 
-		catch (IllegalArgumentException iae) {
-            // suppress illegal argument exception
-            JptCorePlugin.log(iae);
-		}
-		return artifactEdit;
-	}
-	
-    
-	public PersistenceArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) 
-			throws IllegalArgumentException {
-		super(aProject, toAccessAsReadOnly);
-	}
-	
-	
-	@Override
-	public PersistenceResource getResource(IFile file) {
-		// This *seems* to do the same basic thing as below, but circumvents the
-		// URI munging that ArtifactEditModel does (see bug 209093)
-		try {
-			PersistenceResource resource = 
-					(PersistenceResource) getArtifactEditModel().createResource(URI.createPlatformResourceURI(file.getFullPath().toString()));
-			if (! resource.isLoaded()) {
-				resource.load(getArtifactEditModel().getResourceSet().getLoadOptions());
-			}
-			return resource;
-		}
-		catch (ClassCastException cce) {
-			return null;
-		}
-		catch (IOException ioe) {
-			JptCorePlugin.log(ioe);
-			return null;
-		}
-	}
-	
-	@Override
-	public PersistenceResource getResource(String fileURI) {
-		try {
-			return (PersistenceResource) getArtifactEditModel().getResource(URI.createURI(fileURI));
-		}
-		catch (ClassCastException cce) {
-			return null;
-		}
-	}
-	
-	/**
-	 * Return a persistence resource for the default deploy location
-	 */
-	public PersistenceResource getResource() {
-		return getResource(JptCorePlugin.getPersistenceXmlDeploymentURI(getProject()));
-	}
-	
-	/**
-	 * Create a persistence resource with base defaults
-	 */
-	public PersistenceResource createDefaultResource() {
-		PersistenceResource resource = getResource();
-		XmlPersistence persistence = PersistenceFactory.eINSTANCE.createXmlPersistence();
-		persistence.setVersion("1.0");
-		XmlPersistenceUnit pUnit = PersistenceFactory.eINSTANCE.createXmlPersistenceUnit();
-		pUnit.setName(getProject().getName());
-		persistence.getPersistenceUnits().add(pUnit);
-		resource.getContents().add(persistence);
-		save(null);
-		return resource;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceFactory.java
deleted file mode 100644
index 4fbedaaaaa..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceFactory.java
+++ /dev/null
@@ -1,291 +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.core.resource.persistence;
-
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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.core.resource.persistence.PersistencePackage
- * @generated
- */
-public class PersistenceFactory extends EFactoryImpl
-{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final PersistenceFactory eINSTANCE = init();
-
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PersistenceFactory init()
-	{
-		try
-		{
-			PersistenceFactory thePersistenceFactory = (PersistenceFactory)EPackage.Registry.INSTANCE.getEFactory("jpt.persistence.xmi"); 
-			if (thePersistenceFactory != null)
-			{
-				return thePersistenceFactory;
-			}
-		}
-		catch (Exception exception)
-		{
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new PersistenceFactory();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PersistenceFactory()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass)
-	{
-		switch (eClass.getClassifierID())
-		{
-			case PersistencePackage.XML_PERSISTENCE: return (EObject)createXmlPersistence();
-			case PersistencePackage.XML_PERSISTENCE_UNIT: return (EObject)createXmlPersistenceUnit();
-			case PersistencePackage.XML_MAPPING_FILE_REF: return (EObject)createXmlMappingFileRef();
-			case PersistencePackage.XML_JAVA_CLASS_REF: return (EObject)createXmlJavaClassRef();
-			case PersistencePackage.XML_PROPERTIES: return (EObject)createXmlProperties();
-			case PersistencePackage.XML_PROPERTY: return (EObject)createXmlProperty();
-			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 PersistencePackage.XML_PERSISTENCE_UNIT_TRANSACTION_TYPE:
-				return createXmlPersistenceUnitTransactionTypeFromString(eDataType, initialValue);
-			case PersistencePackage.XML_PERSISTENCE_UNIT_TRANSACTION_TYPE_OBJECT:
-				return createXmlPersistenceUnitTransactionTypeObjectFromString(eDataType, initialValue);
-			case PersistencePackage.XML_VERSION:
-				return createXmlVersionFromString(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 PersistencePackage.XML_PERSISTENCE_UNIT_TRANSACTION_TYPE:
-				return convertXmlPersistenceUnitTransactionTypeToString(eDataType, instanceValue);
-			case PersistencePackage.XML_PERSISTENCE_UNIT_TRANSACTION_TYPE_OBJECT:
-				return convertXmlPersistenceUnitTransactionTypeObjectToString(eDataType, instanceValue);
-			case PersistencePackage.XML_VERSION:
-				return convertXmlVersionToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlPersistence createXmlPersistence()
-	{
-		XmlPersistence xmlPersistence = new XmlPersistence();
-		return xmlPersistence;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlPersistenceUnit createXmlPersistenceUnit()
-	{
-		XmlPersistenceUnit xmlPersistenceUnit = new XmlPersistenceUnit();
-		return xmlPersistenceUnit;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlMappingFileRef createXmlMappingFileRef()
-	{
-		XmlMappingFileRef xmlMappingFileRef = new XmlMappingFileRef();
-		return xmlMappingFileRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlJavaClassRef createXmlJavaClassRef()
-	{
-		XmlJavaClassRef xmlJavaClassRef = new XmlJavaClassRef();
-		return xmlJavaClassRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlProperties createXmlProperties()
-	{
-		XmlProperties xmlProperties = new XmlProperties();
-		return xmlProperties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlProperty createXmlProperty()
-	{
-		XmlProperty xmlProperty = new XmlProperty();
-		return xmlProperty;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlPersistenceUnitTransactionType createXmlPersistenceUnitTransactionTypeFromString(EDataType eDataType, String initialValue)
-	{
-		XmlPersistenceUnitTransactionType result = XmlPersistenceUnitTransactionType.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 convertXmlPersistenceUnitTransactionTypeToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Enumerator createXmlPersistenceUnitTransactionTypeObjectFromString(EDataType eDataType, String initialValue)
-	{
-		return (Enumerator)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertXmlPersistenceUnitTransactionTypeObjectToString(EDataType eDataType, Object instanceValue)
-	{
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createXmlVersionFromString(EDataType eDataType, String initialValue)
-	{
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertXmlVersionToString(EDataType eDataType, Object instanceValue)
-	{
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PersistencePackage getPersistencePackage()
-	{
-		return (PersistencePackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static PersistencePackage getPackage()
-	{
-		return PersistencePackage.eINSTANCE;
-	}
-
-} //PersistenceFactory
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistencePackage.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistencePackage.java
deleted file mode 100644
index 9cb233159f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistencePackage.java
+++ /dev/null
@@ -1,1324 +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.core.resource.persistence;
-
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-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.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.persistence.PersistenceFactory
- * @model kind="package"
- * @generated
- */
-public class PersistencePackage extends EPackageImpl
-{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNAME = "persistence";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNS_URI = "jpt.persistence.xmi";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNS_PREFIX = "org.eclipse.jpt.core.resource.persistence";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final PersistencePackage eINSTANCE = org.eclipse.jpt.core.resource.persistence.PersistencePackage.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistence <em>Xml Persistence</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistence
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistence()
-	 * @generated
-	 */
-	public static final int XML_PERSISTENCE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Persistence Units</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE__PERSISTENCE_UNITS = 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_PERSISTENCE__VERSION = 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Persistence</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit <em>Xml Persistence Unit</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit()
-	 * @generated
-	 */
-	public static final int XML_PERSISTENCE_UNIT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT__DESCRIPTION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Provider</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT__PROVIDER = 1;
-
-	/**
-	 * The feature id for the '<em><b>Jta Data Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT__JTA_DATA_SOURCE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Non Jta Data Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT__NON_JTA_DATA_SOURCE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Mapping Files</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT__MAPPING_FILES = 4;
-
-	/**
-	 * The feature id for the '<em><b>Jar Files</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT__JAR_FILES = 5;
-
-	/**
-	 * The feature id for the '<em><b>Classes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT__CLASSES = 6;
-
-	/**
-	 * The feature id for the '<em><b>Exclude Unlisted Classes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT__EXCLUDE_UNLISTED_CLASSES = 7;
-
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT__PROPERTIES = 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_PERSISTENCE_UNIT__NAME = 9;
-
-	/**
-	 * The feature id for the '<em><b>Transaction Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT__TRANSACTION_TYPE = 10;
-
-	/**
-	 * The number of structural features of the '<em>Xml Persistence Unit</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_FEATURE_COUNT = 11;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef <em>Xml Mapping File Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlMappingFileRef()
-	 * @generated
-	 */
-	public static final int XML_MAPPING_FILE_REF = 2;
-
-	/**
-	 * The feature id for the '<em><b>File Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPING_FILE_REF__FILE_NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Mapping File Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPING_FILE_REF_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef <em>Xml Java Class Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlJavaClassRef()
-	 * @generated
-	 */
-	public static final int XML_JAVA_CLASS_REF = 3;
-
-	/**
-	 * The feature id for the '<em><b>Java Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JAVA_CLASS_REF__JAVA_CLASS = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Java Class Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JAVA_CLASS_REF_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlProperties <em>Xml Properties</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlProperties
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlProperties()
-	 * @generated
-	 */
-	public static final int XML_PROPERTIES = 4;
-
-	/**
-	 * 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_PROPERTIES__PROPERTIES = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Properties</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PROPERTIES_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlProperty <em>Xml Property</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlProperty
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlProperty()
-	 * @generated
-	 */
-	public static final int XML_PROPERTY = 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_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 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 = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType <em>Xml Persistence Unit Transaction Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnitTransactionType()
-	 * @generated
-	 */
-	public static final int XML_PERSISTENCE_UNIT_TRANSACTION_TYPE = 6;
-
-	/**
-	 * The meta object id for the '<em>Xml Persistence Unit Transaction Type Object</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.common.util.Enumerator
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnitTransactionTypeObject()
-	 * @generated
-	 */
-	public static final int XML_PERSISTENCE_UNIT_TRANSACTION_TYPE_OBJECT = 7;
-
-	/**
-	 * The meta object id for the '<em>Xml Version</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlVersion()
-	 * @generated
-	 */
-	public static final int XML_VERSION = 8;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPersistenceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPersistenceUnitEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlMappingFileRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlJavaClassRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPropertiesEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPropertyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum xmlPersistenceUnitTransactionTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType xmlPersistenceUnitTransactionTypeObjectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType xmlVersionEDataType = 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.core.resource.persistence.PersistencePackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private PersistencePackage()
-	{
-		super(eNS_URI, PersistenceFactory.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 PersistencePackage init()
-	{
-		if (isInited) return (PersistencePackage)EPackage.Registry.INSTANCE.getEPackage(PersistencePackage.eNS_URI);
-
-		// Obtain or create and register package
-		PersistencePackage thePersistencePackage = (PersistencePackage)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof PersistencePackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new PersistencePackage());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		XMLTypePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		OrmPackage theOrmPackage = (OrmPackage)(EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI) instanceof OrmPackage ? EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI) : OrmPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		thePersistencePackage.createPackageContents();
-		theOrmPackage.createPackageContents();
-
-		// Initialize created meta-data
-		thePersistencePackage.initializePackageContents();
-		theOrmPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		thePersistencePackage.freeze();
-
-		return thePersistencePackage;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistence <em>Xml Persistence</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Persistence</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistence
-	 * @generated
-	 */
-	public EClass getXmlPersistence()
-	{
-		return xmlPersistenceEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistence#getPersistenceUnits <em>Persistence Units</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Persistence Units</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistence#getPersistenceUnits()
-	 * @see #getXmlPersistence()
-	 * @generated
-	 */
-	public EReference getXmlPersistence_PersistenceUnits()
-	{
-		return (EReference)xmlPersistenceEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistence#getVersion <em>Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistence#getVersion()
-	 * @see #getXmlPersistence()
-	 * @generated
-	 */
-	public EAttribute getXmlPersistence_Version()
-	{
-		return (EAttribute)xmlPersistenceEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit <em>Xml Persistence Unit</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Persistence Unit</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit
-	 * @generated
-	 */
-	public EClass getXmlPersistenceUnit()
-	{
-		return xmlPersistenceUnitEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getDescription()
-	 * @see #getXmlPersistenceUnit()
-	 * @generated
-	 */
-	public EAttribute getXmlPersistenceUnit_Description()
-	{
-		return (EAttribute)xmlPersistenceUnitEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getProvider <em>Provider</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Provider</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getProvider()
-	 * @see #getXmlPersistenceUnit()
-	 * @generated
-	 */
-	public EAttribute getXmlPersistenceUnit_Provider()
-	{
-		return (EAttribute)xmlPersistenceUnitEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getJtaDataSource <em>Jta Data Source</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Jta Data Source</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getJtaDataSource()
-	 * @see #getXmlPersistenceUnit()
-	 * @generated
-	 */
-	public EAttribute getXmlPersistenceUnit_JtaDataSource()
-	{
-		return (EAttribute)xmlPersistenceUnitEClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getNonJtaDataSource <em>Non Jta Data Source</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Non Jta Data Source</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getNonJtaDataSource()
-	 * @see #getXmlPersistenceUnit()
-	 * @generated
-	 */
-	public EAttribute getXmlPersistenceUnit_NonJtaDataSource()
-	{
-		return (EAttribute)xmlPersistenceUnitEClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getMappingFiles <em>Mapping Files</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Mapping Files</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getMappingFiles()
-	 * @see #getXmlPersistenceUnit()
-	 * @generated
-	 */
-	public EReference getXmlPersistenceUnit_MappingFiles()
-	{
-		return (EReference)xmlPersistenceUnitEClass.getEStructuralFeatures().get(4);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getJarFiles <em>Jar Files</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Jar Files</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getJarFiles()
-	 * @see #getXmlPersistenceUnit()
-	 * @generated
-	 */
-	public EAttribute getXmlPersistenceUnit_JarFiles()
-	{
-		return (EAttribute)xmlPersistenceUnitEClass.getEStructuralFeatures().get(5);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getClasses <em>Classes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Classes</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getClasses()
-	 * @see #getXmlPersistenceUnit()
-	 * @generated
-	 */
-	public EReference getXmlPersistenceUnit_Classes()
-	{
-		return (EReference)xmlPersistenceUnitEClass.getEStructuralFeatures().get(6);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getExcludeUnlistedClasses <em>Exclude Unlisted Classes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Exclude Unlisted Classes</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getExcludeUnlistedClasses()
-	 * @see #getXmlPersistenceUnit()
-	 * @generated
-	 */
-	public EAttribute getXmlPersistenceUnit_ExcludeUnlistedClasses()
-	{
-		return (EAttribute)xmlPersistenceUnitEClass.getEStructuralFeatures().get(7);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getProperties <em>Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Properties</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getProperties()
-	 * @see #getXmlPersistenceUnit()
-	 * @generated
-	 */
-	public EReference getXmlPersistenceUnit_Properties()
-	{
-		return (EReference)xmlPersistenceUnitEClass.getEStructuralFeatures().get(8);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getName()
-	 * @see #getXmlPersistenceUnit()
-	 * @generated
-	 */
-	public EAttribute getXmlPersistenceUnit_Name()
-	{
-		return (EAttribute)xmlPersistenceUnitEClass.getEStructuralFeatures().get(9);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getTransactionType <em>Transaction Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Transaction Type</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getTransactionType()
-	 * @see #getXmlPersistenceUnit()
-	 * @generated
-	 */
-	public EAttribute getXmlPersistenceUnit_TransactionType()
-	{
-		return (EAttribute)xmlPersistenceUnitEClass.getEStructuralFeatures().get(10);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef <em>Xml Mapping File Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Mapping File Ref</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef
-	 * @generated
-	 */
-	public EClass getXmlMappingFileRef()
-	{
-		return xmlMappingFileRefEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef#getFileName <em>File Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>File Name</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef#getFileName()
-	 * @see #getXmlMappingFileRef()
-	 * @generated
-	 */
-	public EAttribute getXmlMappingFileRef_FileName()
-	{
-		return (EAttribute)xmlMappingFileRefEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef <em>Xml Java Class Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Java Class Ref</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef
-	 * @generated
-	 */
-	public EClass getXmlJavaClassRef()
-	{
-		return xmlJavaClassRefEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef#getJavaClass <em>Java Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Java Class</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef#getJavaClass()
-	 * @see #getXmlJavaClassRef()
-	 * @generated
-	 */
-	public EAttribute getXmlJavaClassRef_JavaClass()
-	{
-		return (EAttribute)xmlJavaClassRefEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.persistence.XmlProperties <em>Xml Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Properties</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlProperties
-	 * @generated
-	 */
-	public EClass getXmlProperties()
-	{
-		return xmlPropertiesEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.persistence.XmlProperties#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.core.resource.persistence.XmlProperties#getProperties()
-	 * @see #getXmlProperties()
-	 * @generated
-	 */
-	public EReference getXmlProperties_Properties()
-	{
-		return (EReference)xmlPropertiesEClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.persistence.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.core.resource.persistence.XmlProperty
-	 * @generated
-	 */
-	public EClass getXmlProperty()
-	{
-		return xmlPropertyEClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.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.core.resource.persistence.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.core.resource.persistence.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.core.resource.persistence.XmlProperty#getValue()
-	 * @see #getXmlProperty()
-	 * @generated
-	 */
-	public EAttribute getXmlProperty_Value()
-	{
-		return (EAttribute)xmlPropertyEClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType <em>Xml Persistence Unit Transaction Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Xml Persistence Unit Transaction Type</em>'.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType
-	 * @generated
-	 */
-	public EEnum getXmlPersistenceUnitTransactionType()
-	{
-		return xmlPersistenceUnitTransactionTypeEEnum;
-	}
-
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.emf.common.util.Enumerator <em>Xml Persistence Unit Transaction Type Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Xml Persistence Unit Transaction Type Object</em>'.
-	 * @see org.eclipse.emf.common.util.Enumerator
-	 * @model instanceClass="org.eclipse.emf.common.util.Enumerator"
-	 * @generated
-	 */
-	public EDataType getXmlPersistenceUnitTransactionTypeObject()
-	{
-		return xmlPersistenceUnitTransactionTypeObjectEDataType;
-	}
-
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Xml Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Xml Version</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 * @generated
-	 */
-	public EDataType getXmlVersion()
-	{
-		return xmlVersionEDataType;
-	}
-
-
-	/**
-	 * 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 PersistenceFactory getPersistenceFactory()
-	{
-		return (PersistenceFactory)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
-		xmlPersistenceEClass = createEClass(XML_PERSISTENCE);
-		createEReference(xmlPersistenceEClass, XML_PERSISTENCE__PERSISTENCE_UNITS);
-		createEAttribute(xmlPersistenceEClass, XML_PERSISTENCE__VERSION);
-
-		xmlPersistenceUnitEClass = createEClass(XML_PERSISTENCE_UNIT);
-		createEAttribute(xmlPersistenceUnitEClass, XML_PERSISTENCE_UNIT__DESCRIPTION);
-		createEAttribute(xmlPersistenceUnitEClass, XML_PERSISTENCE_UNIT__PROVIDER);
-		createEAttribute(xmlPersistenceUnitEClass, XML_PERSISTENCE_UNIT__JTA_DATA_SOURCE);
-		createEAttribute(xmlPersistenceUnitEClass, XML_PERSISTENCE_UNIT__NON_JTA_DATA_SOURCE);
-		createEReference(xmlPersistenceUnitEClass, XML_PERSISTENCE_UNIT__MAPPING_FILES);
-		createEAttribute(xmlPersistenceUnitEClass, XML_PERSISTENCE_UNIT__JAR_FILES);
-		createEReference(xmlPersistenceUnitEClass, XML_PERSISTENCE_UNIT__CLASSES);
-		createEAttribute(xmlPersistenceUnitEClass, XML_PERSISTENCE_UNIT__EXCLUDE_UNLISTED_CLASSES);
-		createEReference(xmlPersistenceUnitEClass, XML_PERSISTENCE_UNIT__PROPERTIES);
-		createEAttribute(xmlPersistenceUnitEClass, XML_PERSISTENCE_UNIT__NAME);
-		createEAttribute(xmlPersistenceUnitEClass, XML_PERSISTENCE_UNIT__TRANSACTION_TYPE);
-
-		xmlMappingFileRefEClass = createEClass(XML_MAPPING_FILE_REF);
-		createEAttribute(xmlMappingFileRefEClass, XML_MAPPING_FILE_REF__FILE_NAME);
-
-		xmlJavaClassRefEClass = createEClass(XML_JAVA_CLASS_REF);
-		createEAttribute(xmlJavaClassRefEClass, XML_JAVA_CLASS_REF__JAVA_CLASS);
-
-		xmlPropertiesEClass = createEClass(XML_PROPERTIES);
-		createEReference(xmlPropertiesEClass, XML_PROPERTIES__PROPERTIES);
-
-		xmlPropertyEClass = createEClass(XML_PROPERTY);
-		createEAttribute(xmlPropertyEClass, XML_PROPERTY__NAME);
-		createEAttribute(xmlPropertyEClass, XML_PROPERTY__VALUE);
-
-		// Create enums
-		xmlPersistenceUnitTransactionTypeEEnum = createEEnum(XML_PERSISTENCE_UNIT_TRANSACTION_TYPE);
-
-		// Create data types
-		xmlPersistenceUnitTransactionTypeObjectEDataType = createEDataType(XML_PERSISTENCE_UNIT_TRANSACTION_TYPE_OBJECT);
-		xmlVersionEDataType = createEDataType(XML_VERSION);
-	}
-
-	/**
-	 * <!-- 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);
-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(xmlPersistenceEClass, XmlPersistence.class, "XmlPersistence", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlPersistence_PersistenceUnits(), this.getXmlPersistenceUnit(), null, "persistenceUnits", null, 0, -1, XmlPersistence.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlPersistence_Version(), this.getXmlVersion(), "version", null, 1, 1, XmlPersistence.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlPersistenceUnitEClass, XmlPersistenceUnit.class, "XmlPersistenceUnit", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlPersistenceUnit_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, XmlPersistenceUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlPersistenceUnit_Provider(), theXMLTypePackage.getString(), "provider", null, 0, 1, XmlPersistenceUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlPersistenceUnit_JtaDataSource(), theXMLTypePackage.getString(), "jtaDataSource", null, 0, 1, XmlPersistenceUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlPersistenceUnit_NonJtaDataSource(), theXMLTypePackage.getString(), "nonJtaDataSource", null, 0, 1, XmlPersistenceUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlPersistenceUnit_MappingFiles(), this.getXmlMappingFileRef(), null, "mappingFiles", null, 0, -1, XmlPersistenceUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlPersistenceUnit_JarFiles(), theXMLTypePackage.getString(), "jarFiles", null, 0, -1, XmlPersistenceUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlPersistenceUnit_Classes(), this.getXmlJavaClassRef(), null, "classes", null, 0, -1, XmlPersistenceUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlPersistenceUnit_ExcludeUnlistedClasses(), theXMLTypePackage.getBooleanObject(), "excludeUnlistedClasses", null, 0, 1, XmlPersistenceUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlPersistenceUnit_Properties(), this.getXmlProperties(), null, "properties", null, 0, 1, XmlPersistenceUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlPersistenceUnit_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlPersistenceUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlPersistenceUnit_TransactionType(), this.getXmlPersistenceUnitTransactionType(), "transactionType", "JTA", 0, 1, XmlPersistenceUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlMappingFileRefEClass, XmlMappingFileRef.class, "XmlMappingFileRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlMappingFileRef_FileName(), theEcorePackage.getEString(), "fileName", "", 0, 1, XmlMappingFileRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(xmlJavaClassRefEClass, XmlJavaClassRef.class, "XmlJavaClassRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlJavaClassRef_JavaClass(), theEcorePackage.getEString(), "javaClass", "", 0, 1, XmlJavaClassRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(xmlPropertiesEClass, XmlProperties.class, "XmlProperties", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlProperties_Properties(), this.getXmlProperty(), null, "properties", null, 0, -1, XmlProperties.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, 1, 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, 1, 1, XmlProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(xmlPersistenceUnitTransactionTypeEEnum, XmlPersistenceUnitTransactionType.class, "XmlPersistenceUnitTransactionType");
-		addEEnumLiteral(xmlPersistenceUnitTransactionTypeEEnum, XmlPersistenceUnitTransactionType.JTA);
-		addEEnumLiteral(xmlPersistenceUnitTransactionTypeEEnum, XmlPersistenceUnitTransactionType.RESOURCE_LOCAL);
-
-		// Initialize data types
-		initEDataType(xmlPersistenceUnitTransactionTypeObjectEDataType, Enumerator.class, "XmlPersistenceUnitTransactionTypeObject", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(xmlVersionEDataType, String.class, "XmlVersion", IS_SERIALIZABLE, !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.core.resource.persistence.XmlPersistence <em>Xml Persistence</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistence
-		 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistence()
-		 * @generated
-		 */
-		public static final EClass XML_PERSISTENCE = eINSTANCE.getXmlPersistence();
-
-		/**
-		 * The meta object literal for the '<em><b>Persistence Units</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_PERSISTENCE__PERSISTENCE_UNITS = eINSTANCE.getXmlPersistence_PersistenceUnits();
-
-		/**
-		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PERSISTENCE__VERSION = eINSTANCE.getXmlPersistence_Version();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit <em>Xml Persistence Unit</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit
-		 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit()
-		 * @generated
-		 */
-		public static final EClass XML_PERSISTENCE_UNIT = eINSTANCE.getXmlPersistenceUnit();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PERSISTENCE_UNIT__DESCRIPTION = eINSTANCE.getXmlPersistenceUnit_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Provider</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PERSISTENCE_UNIT__PROVIDER = eINSTANCE.getXmlPersistenceUnit_Provider();
-
-		/**
-		 * The meta object literal for the '<em><b>Jta Data Source</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PERSISTENCE_UNIT__JTA_DATA_SOURCE = eINSTANCE.getXmlPersistenceUnit_JtaDataSource();
-
-		/**
-		 * The meta object literal for the '<em><b>Non Jta Data Source</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PERSISTENCE_UNIT__NON_JTA_DATA_SOURCE = eINSTANCE.getXmlPersistenceUnit_NonJtaDataSource();
-
-		/**
-		 * The meta object literal for the '<em><b>Mapping Files</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_PERSISTENCE_UNIT__MAPPING_FILES = eINSTANCE.getXmlPersistenceUnit_MappingFiles();
-
-		/**
-		 * The meta object literal for the '<em><b>Jar Files</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PERSISTENCE_UNIT__JAR_FILES = eINSTANCE.getXmlPersistenceUnit_JarFiles();
-
-		/**
-		 * The meta object literal for the '<em><b>Classes</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_PERSISTENCE_UNIT__CLASSES = eINSTANCE.getXmlPersistenceUnit_Classes();
-
-		/**
-		 * The meta object literal for the '<em><b>Exclude Unlisted Classes</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PERSISTENCE_UNIT__EXCLUDE_UNLISTED_CLASSES = eINSTANCE.getXmlPersistenceUnit_ExcludeUnlistedClasses();
-
-		/**
-		 * The meta object literal for the '<em><b>Properties</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_PERSISTENCE_UNIT__PROPERTIES = eINSTANCE.getXmlPersistenceUnit_Properties();
-
-		/**
-		 * 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_PERSISTENCE_UNIT__NAME = eINSTANCE.getXmlPersistenceUnit_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Transaction Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PERSISTENCE_UNIT__TRANSACTION_TYPE = eINSTANCE.getXmlPersistenceUnit_TransactionType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef <em>Xml Mapping File Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef
-		 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlMappingFileRef()
-		 * @generated
-		 */
-		public static final EClass XML_MAPPING_FILE_REF = eINSTANCE.getXmlMappingFileRef();
-
-		/**
-		 * The meta object literal for the '<em><b>File Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_MAPPING_FILE_REF__FILE_NAME = eINSTANCE.getXmlMappingFileRef_FileName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef <em>Xml Java Class Ref</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef
-		 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlJavaClassRef()
-		 * @generated
-		 */
-		public static final EClass XML_JAVA_CLASS_REF = eINSTANCE.getXmlJavaClassRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Java Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_JAVA_CLASS_REF__JAVA_CLASS = eINSTANCE.getXmlJavaClassRef_JavaClass();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.persistence.XmlProperties <em>Xml Properties</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.persistence.XmlProperties
-		 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlProperties()
-		 * @generated
-		 */
-		public static final EClass XML_PROPERTIES = eINSTANCE.getXmlProperties();
-
-		/**
-		 * 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_PROPERTIES__PROPERTIES = eINSTANCE.getXmlProperties_Properties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.core.resource.persistence.XmlProperty <em>Xml Property</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.persistence.XmlProperty
-		 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#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 '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType <em>Xml Persistence Unit Transaction Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType
-		 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnitTransactionType()
-		 * @generated
-		 */
-		public static final EEnum XML_PERSISTENCE_UNIT_TRANSACTION_TYPE = eINSTANCE.getXmlPersistenceUnitTransactionType();
-
-		/**
-		 * The meta object literal for the '<em>Xml Persistence Unit Transaction Type Object</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.common.util.Enumerator
-		 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnitTransactionTypeObject()
-		 * @generated
-		 */
-		public static final EDataType XML_PERSISTENCE_UNIT_TRANSACTION_TYPE_OBJECT = eINSTANCE.getXmlPersistenceUnitTransactionTypeObject();
-
-		/**
-		 * The meta object literal for the '<em>Xml Version</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlVersion()
-		 * @generated
-		 */
-		public static final EDataType XML_VERSION = eINSTANCE.getXmlVersion();
-
-	}
-
-} //PersistencePackage
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResource.java
deleted file mode 100644
index 2089873bf7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResource.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.core.resource.persistence;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jpt.core.internal.resource.persistence.translators.PersistenceTranslator;
-import org.eclipse.jpt.core.resource.common.JpaXmlResource;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 PersistenceResource extends JpaXmlResource
-{
-	public PersistenceResource(Renderer aRenderer) {
-		super(aRenderer);
-	}
-
-	public PersistenceResource(URI uri, Renderer aRenderer) {
-		super(uri, aRenderer);
-	}
-	
-	public Translator getRootTranslator() {
-		return PersistenceTranslator.INSTANCE;
-	}
-	
-	@Override
-	public void javaElementChanged(ElementChangedEvent event) {
-		// TODO
-	}
-	
-	@Override
-	public void updateFromResource() {
-		// TODO
-	}
-	
-	public XmlPersistence getPersistence() {
-		return (XmlPersistence) getRootObject();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResourceFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResourceFactory.java
deleted file mode 100644
index 58b34972d6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResourceFactory.java
+++ /dev/null
@@ -1,48 +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.core.resource.persistence;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceFactory;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- */
-public class PersistenceResourceFactory extends TranslatorResourceFactory
-{
-	public PersistenceResourceFactory() {
-		this(RendererFactory.getDefaultRendererFactory());
-	}
-	
-	public PersistenceResourceFactory(RendererFactory aRendererFactory) {
-		super(aRendererFactory);
-	}
-	
-	public PersistenceResourceFactory(RendererFactory aRendererFactory, boolean listeningForUpdates) {
-		super(aRendererFactory, listeningForUpdates);
-	}
-	
-	
-	/**
-	 * @see TranslatorResourceFactory#createResource(URI, Renderer)
-	 */
-	protected TranslatorResource createResource(URI uri, Renderer renderer) {
-		return new PersistenceResource(uri, renderer);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResourceModel.java
deleted file mode 100644
index 7cfe62a3ab..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResourceModel.java
+++ /dev/null
@@ -1,44 +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.core.resource.persistence;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jpt.core.ResourceModel;
-import org.eclipse.jpt.core.resource.common.JpaXmlResourceModel;
-
-/**
- * 
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 PersistenceResourceModel extends JpaXmlResourceModel
-{
-	public PersistenceResourceModel(IFile file) {
-		super(file);
-	}
-	
-	
-	/**
-	 * @see ResourceModel#getResourceType()
-	 */
-	public String getResourceType() {
-		return ResourceModel.PERSISTENCE_RESOURCE_TYPE;
-	}
-	
-	@Override
-	protected PersistenceArtifactEdit buildArtifactEdit(IProject project) {
-		return PersistenceArtifactEdit.getArtifactEditForRead(project);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlJavaClassRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlJavaClassRef.java
deleted file mode 100644
index 4792c501ef..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlJavaClassRef.java
+++ /dev/null
@@ -1,203 +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.core.resource.persistence;
-
-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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Java Class Ref</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.core.resource.persistence.XmlJavaClassRef#getJavaClass <em>Java Class</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlJavaClassRef()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlJavaClassRef extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The default value of the '{@link #getJavaClass() <em>Java Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJavaClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String JAVA_CLASS_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getJavaClass() <em>Java Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJavaClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String javaClass = JAVA_CLASS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlJavaClassRef()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return PersistencePackage.Literals.XML_JAVA_CLASS_REF;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Java Class</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Java 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>Java Class</em>' attribute.
-	 * @see #setJavaClass(String)
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlJavaClassRef_JavaClass()
-	 * @model default="" unique="false" ordered="false"
-	 * @generated
-	 */
-	public String getJavaClass()
-	{
-		return javaClass;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef#getJavaClass <em>Java Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Java Class</em>' attribute.
-	 * @see #getJavaClass()
-	 * @generated
-	 */
-	public void setJavaClass(String newJavaClass)
-	{
-		String oldJavaClass = javaClass;
-		javaClass = newJavaClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PersistencePackage.XML_JAVA_CLASS_REF__JAVA_CLASS, oldJavaClass, javaClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_JAVA_CLASS_REF__JAVA_CLASS:
-				return getJavaClass();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_JAVA_CLASS_REF__JAVA_CLASS:
-				setJavaClass((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_JAVA_CLASS_REF__JAVA_CLASS:
-				setJavaClass(JAVA_CLASS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_JAVA_CLASS_REF__JAVA_CLASS:
-				return JAVA_CLASS_EDEFAULT == null ? javaClass != null : !JAVA_CLASS_EDEFAULT.equals(javaClass);
-		}
-		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(" (javaClass: ");
-		result.append(javaClass);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlJavaClassRef
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlMappingFileRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlMappingFileRef.java
deleted file mode 100644
index 557b9b76ae..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlMappingFileRef.java
+++ /dev/null
@@ -1,203 +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.core.resource.persistence;
-
-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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Mapping File Ref</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.core.resource.persistence.XmlMappingFileRef#getFileName <em>File Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlMappingFileRef()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlMappingFileRef extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The default value of the '{@link #getFileName() <em>File Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFileName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FILE_NAME_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getFileName() <em>File Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFileName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String fileName = FILE_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlMappingFileRef()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return PersistencePackage.Literals.XML_MAPPING_FILE_REF;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>File Name</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>File 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>File Name</em>' attribute.
-	 * @see #setFileName(String)
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlMappingFileRef_FileName()
-	 * @model default="" unique="false" ordered="false"
-	 * @generated
-	 */
-	public String getFileName()
-	{
-		return fileName;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef#getFileName <em>File Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>File Name</em>' attribute.
-	 * @see #getFileName()
-	 * @generated
-	 */
-	public void setFileName(String newFileName)
-	{
-		String oldFileName = fileName;
-		fileName = newFileName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PersistencePackage.XML_MAPPING_FILE_REF__FILE_NAME, oldFileName, fileName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_MAPPING_FILE_REF__FILE_NAME:
-				return getFileName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_MAPPING_FILE_REF__FILE_NAME:
-				setFileName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_MAPPING_FILE_REF__FILE_NAME:
-				setFileName(FILE_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_MAPPING_FILE_REF__FILE_NAME:
-				return FILE_NAME_EDEFAULT == null ? fileName != null : !FILE_NAME_EDEFAULT.equals(fileName);
-		}
-		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(" (fileName: ");
-		result.append(fileName);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlMappingFileRef
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlPersistence.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlPersistence.java
deleted file mode 100644
index cdc7843908..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlPersistence.java
+++ /dev/null
@@ -1,277 +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.core.resource.persistence;
-
-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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>XmlPersistence</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.core.resource.persistence.XmlPersistence#getPersistenceUnits <em>Persistence Units</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistence#getVersion <em>Version</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistence()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlPersistence extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The cached value of the '{@link #getPersistenceUnits() <em>Persistence Units</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPersistenceUnits()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlPersistenceUnit> persistenceUnits;
-
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String version = VERSION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlPersistence()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return PersistencePackage.Literals.XML_PERSISTENCE;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Version</em>' attribute.
-	 * @see #setVersion(String)
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistence_Version()
-	 * @model unique="false" dataType="org.eclipse.jpt.core.resource.persistence.XmlVersion" required="true"
-	 * @generated
-	 */
-	public String getVersion()
-	{
-		return version;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistence#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' attribute.
-	 * @see #getVersion()
-	 * @generated
-	 */
-	public void setVersion(String newVersion)
-	{
-		String oldVersion = version;
-		version = newVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PersistencePackage.XML_PERSISTENCE__VERSION, oldVersion, version));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Persistence Units</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XmlPersistence Units</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>Persistence Units</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistence_PersistenceUnits()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlPersistenceUnit> getPersistenceUnits()
-	{
-		if (persistenceUnits == null)
-		{
-			persistenceUnits = new EObjectContainmentEList<XmlPersistenceUnit>(XmlPersistenceUnit.class, this, PersistencePackage.XML_PERSISTENCE__PERSISTENCE_UNITS);
-		}
-		return persistenceUnits;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_PERSISTENCE__PERSISTENCE_UNITS:
-				return ((InternalEList<?>)getPersistenceUnits()).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 PersistencePackage.XML_PERSISTENCE__PERSISTENCE_UNITS:
-				return getPersistenceUnits();
-			case PersistencePackage.XML_PERSISTENCE__VERSION:
-				return getVersion();
-		}
-		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 PersistencePackage.XML_PERSISTENCE__PERSISTENCE_UNITS:
-				getPersistenceUnits().clear();
-				getPersistenceUnits().addAll((Collection<? extends XmlPersistenceUnit>)newValue);
-				return;
-			case PersistencePackage.XML_PERSISTENCE__VERSION:
-				setVersion((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_PERSISTENCE__PERSISTENCE_UNITS:
-				getPersistenceUnits().clear();
-				return;
-			case PersistencePackage.XML_PERSISTENCE__VERSION:
-				setVersion(VERSION_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_PERSISTENCE__PERSISTENCE_UNITS:
-				return persistenceUnits != null && !persistenceUnits.isEmpty();
-			case PersistencePackage.XML_PERSISTENCE__VERSION:
-				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
-		}
-		return super.eIsSet(featureID);
-	}
-	
-	
-	// **************** overrides **********************************************
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (version: ");
-		result.append(version);
-		result.append(')');
-		return result.toString();
-	}
-	
-	@Override
-	public JpaEObject getRoot() {
-		return this;
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlPersistenceUnit.java
deleted file mode 100644
index d31a80a1e8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlPersistenceUnit.java
+++ /dev/null
@@ -1,856 +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.core.resource.persistence;
-
-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.EDataTypeEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Unit</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.core.resource.persistence.XmlPersistenceUnit#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getProvider <em>Provider</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getJtaDataSource <em>Jta Data Source</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getNonJtaDataSource <em>Non Jta Data Source</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getMappingFiles <em>Mapping Files</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getJarFiles <em>Jar Files</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getClasses <em>Classes</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getExcludeUnlistedClasses <em>Exclude Unlisted Classes</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getProperties <em>Properties</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getTransactionType <em>Transaction Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlPersistenceUnit extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getProvider() <em>Provider</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProvider()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PROVIDER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getProvider() <em>Provider</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProvider()
-	 * @generated
-	 * @ordered
-	 */
-	protected String provider = PROVIDER_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getJtaDataSource() <em>Jta Data Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJtaDataSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String JTA_DATA_SOURCE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getJtaDataSource() <em>Jta Data Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJtaDataSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected String jtaDataSource = JTA_DATA_SOURCE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getNonJtaDataSource() <em>Non Jta Data Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNonJtaDataSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NON_JTA_DATA_SOURCE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getNonJtaDataSource() <em>Non Jta Data Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNonJtaDataSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected String nonJtaDataSource = NON_JTA_DATA_SOURCE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getMappingFiles() <em>Mapping Files</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMappingFiles()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlMappingFileRef> mappingFiles;
-
-	/**
-	 * The cached value of the '{@link #getJarFiles() <em>Jar Files</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJarFiles()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<String> jarFiles;
-
-	/**
-	 * The cached value of the '{@link #getClasses() <em>Classes</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClasses()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlJavaClassRef> classes;
-
-	/**
-	 * The default value of the '{@link #getExcludeUnlistedClasses() <em>Exclude Unlisted Classes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExcludeUnlistedClasses()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean EXCLUDE_UNLISTED_CLASSES_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExcludeUnlistedClasses() <em>Exclude Unlisted Classes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExcludeUnlistedClasses()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean excludeUnlistedClasses = EXCLUDE_UNLISTED_CLASSES_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlProperties properties;
-
-	/**
-	 * 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;
-
-	/**
-	 * 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 XmlPersistenceUnitTransactionType TRANSACTION_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTransactionType() <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransactionType()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPersistenceUnitTransactionType transactionType = TRANSACTION_TYPE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlPersistenceUnit()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return PersistencePackage.Literals.XML_PERSISTENCE_UNIT;
-	}
-
-	/**
-	 * 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.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_Name()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#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, PersistencePackage.XML_PERSISTENCE_UNIT__NAME, oldName, name));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Transaction Type</b></em>' attribute.
-	 * The default value is <code>"JTA"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Transaction 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>Transaction Type</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType
-	 * @see #setTransactionType(XmlPersistenceUnitTransactionType)
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_TransactionType()
-	 * @model default="JTA" unique="false"
-	 * @generated
-	 */
-	public XmlPersistenceUnitTransactionType getTransactionType()
-	{
-		return transactionType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getTransactionType <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transaction Type</em>' attribute.
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType
-	 * @see #getTransactionType()
-	 * @generated
-	 */
-	public void setTransactionType(XmlPersistenceUnitTransactionType newTransactionType)
-	{
-		XmlPersistenceUnitTransactionType oldTransactionType = transactionType;
-		transactionType = newTransactionType == null ? TRANSACTION_TYPE_EDEFAULT : newTransactionType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PersistencePackage.XML_PERSISTENCE_UNIT__TRANSACTION_TYPE, oldTransactionType, transactionType));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_Description()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getDescription()
-	{
-		return description;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	public void setDescription(String newDescription)
-	{
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PersistencePackage.XML_PERSISTENCE_UNIT__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Provider</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Provider</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Provider</em>' attribute.
-	 * @see #setProvider(String)
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_Provider()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getProvider()
-	{
-		return provider;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getProvider <em>Provider</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Provider</em>' attribute.
-	 * @see #getProvider()
-	 * @generated
-	 */
-	public void setProvider(String newProvider)
-	{
-		String oldProvider = provider;
-		provider = newProvider;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PersistencePackage.XML_PERSISTENCE_UNIT__PROVIDER, oldProvider, provider));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Jta Data Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Jta Data Source</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Jta Data Source</em>' attribute.
-	 * @see #setJtaDataSource(String)
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_JtaDataSource()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getJtaDataSource()
-	{
-		return jtaDataSource;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getJtaDataSource <em>Jta Data Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Jta Data Source</em>' attribute.
-	 * @see #getJtaDataSource()
-	 * @generated
-	 */
-	public void setJtaDataSource(String newJtaDataSource)
-	{
-		String oldJtaDataSource = jtaDataSource;
-		jtaDataSource = newJtaDataSource;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PersistencePackage.XML_PERSISTENCE_UNIT__JTA_DATA_SOURCE, oldJtaDataSource, jtaDataSource));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Non Jta Data Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Non Jta Data Source</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Non Jta Data Source</em>' attribute.
-	 * @see #setNonJtaDataSource(String)
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_NonJtaDataSource()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getNonJtaDataSource()
-	{
-		return nonJtaDataSource;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getNonJtaDataSource <em>Non Jta Data Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Non Jta Data Source</em>' attribute.
-	 * @see #getNonJtaDataSource()
-	 * @generated
-	 */
-	public void setNonJtaDataSource(String newNonJtaDataSource)
-	{
-		String oldNonJtaDataSource = nonJtaDataSource;
-		nonJtaDataSource = newNonJtaDataSource;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PersistencePackage.XML_PERSISTENCE_UNIT__NON_JTA_DATA_SOURCE, oldNonJtaDataSource, nonJtaDataSource));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Mapping Files</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mapping Files</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>Mapping Files</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_MappingFiles()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlMappingFileRef> getMappingFiles()
-	{
-		if (mappingFiles == null)
-		{
-			mappingFiles = new EObjectContainmentEList<XmlMappingFileRef>(XmlMappingFileRef.class, this, PersistencePackage.XML_PERSISTENCE_UNIT__MAPPING_FILES);
-		}
-		return mappingFiles;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Jar Files</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Jar Files</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Jar Files</em>' attribute list.
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_JarFiles()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public EList<String> getJarFiles()
-	{
-		if (jarFiles == null)
-		{
-			jarFiles = new EDataTypeEList<String>(String.class, this, PersistencePackage.XML_PERSISTENCE_UNIT__JAR_FILES);
-		}
-		return jarFiles;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Classes</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Classes</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>Classes</em>' containment reference list.
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_Classes()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlJavaClassRef> getClasses()
-	{
-		if (classes == null)
-		{
-			classes = new EObjectContainmentEList<XmlJavaClassRef>(XmlJavaClassRef.class, this, PersistencePackage.XML_PERSISTENCE_UNIT__CLASSES);
-		}
-		return classes;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Exclude Unlisted Classes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Exclude Unlisted Classes</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 Unlisted Classes</em>' attribute.
-	 * @see #setExcludeUnlistedClasses(Boolean)
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_ExcludeUnlistedClasses()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getExcludeUnlistedClasses()
-	{
-		return excludeUnlistedClasses;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getExcludeUnlistedClasses <em>Exclude Unlisted Classes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Exclude Unlisted Classes</em>' attribute.
-	 * @see #getExcludeUnlistedClasses()
-	 * @generated
-	 */
-	public void setExcludeUnlistedClasses(Boolean newExcludeUnlistedClasses)
-	{
-		Boolean oldExcludeUnlistedClasses = excludeUnlistedClasses;
-		excludeUnlistedClasses = newExcludeUnlistedClasses;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PersistencePackage.XML_PERSISTENCE_UNIT__EXCLUDE_UNLISTED_CLASSES, oldExcludeUnlistedClasses, excludeUnlistedClasses));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XmlProperties</em>' containment reference 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.
-	 * @see #setProperties(XmlProperties)
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlProperties getProperties()
-	{
-		return properties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetProperties(XmlProperties newProperties, NotificationChain msgs)
-	{
-		XmlProperties oldProperties = properties;
-		properties = newProperties;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PersistencePackage.XML_PERSISTENCE_UNIT__PROPERTIES, oldProperties, newProperties);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getProperties <em>Properties</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Properties</em>' containment reference.
-	 * @see #getProperties()
-	 * @generated
-	 */
-	public void setProperties(XmlProperties newProperties)
-	{
-		if (newProperties != properties)
-		{
-			NotificationChain msgs = null;
-			if (properties != null)
-				msgs = ((InternalEObject)properties).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PersistencePackage.XML_PERSISTENCE_UNIT__PROPERTIES, null, msgs);
-			if (newProperties != null)
-				msgs = ((InternalEObject)newProperties).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PersistencePackage.XML_PERSISTENCE_UNIT__PROPERTIES, null, msgs);
-			msgs = basicSetProperties(newProperties, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PersistencePackage.XML_PERSISTENCE_UNIT__PROPERTIES, newProperties, newProperties));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_PERSISTENCE_UNIT__MAPPING_FILES:
-				return ((InternalEList<?>)getMappingFiles()).basicRemove(otherEnd, msgs);
-			case PersistencePackage.XML_PERSISTENCE_UNIT__CLASSES:
-				return ((InternalEList<?>)getClasses()).basicRemove(otherEnd, msgs);
-			case PersistencePackage.XML_PERSISTENCE_UNIT__PROPERTIES:
-				return basicSetProperties(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 PersistencePackage.XML_PERSISTENCE_UNIT__DESCRIPTION:
-				return getDescription();
-			case PersistencePackage.XML_PERSISTENCE_UNIT__PROVIDER:
-				return getProvider();
-			case PersistencePackage.XML_PERSISTENCE_UNIT__JTA_DATA_SOURCE:
-				return getJtaDataSource();
-			case PersistencePackage.XML_PERSISTENCE_UNIT__NON_JTA_DATA_SOURCE:
-				return getNonJtaDataSource();
-			case PersistencePackage.XML_PERSISTENCE_UNIT__MAPPING_FILES:
-				return getMappingFiles();
-			case PersistencePackage.XML_PERSISTENCE_UNIT__JAR_FILES:
-				return getJarFiles();
-			case PersistencePackage.XML_PERSISTENCE_UNIT__CLASSES:
-				return getClasses();
-			case PersistencePackage.XML_PERSISTENCE_UNIT__EXCLUDE_UNLISTED_CLASSES:
-				return getExcludeUnlistedClasses();
-			case PersistencePackage.XML_PERSISTENCE_UNIT__PROPERTIES:
-				return getProperties();
-			case PersistencePackage.XML_PERSISTENCE_UNIT__NAME:
-				return getName();
-			case PersistencePackage.XML_PERSISTENCE_UNIT__TRANSACTION_TYPE:
-				return getTransactionType();
-		}
-		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 PersistencePackage.XML_PERSISTENCE_UNIT__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__PROVIDER:
-				setProvider((String)newValue);
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__JTA_DATA_SOURCE:
-				setJtaDataSource((String)newValue);
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__NON_JTA_DATA_SOURCE:
-				setNonJtaDataSource((String)newValue);
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__MAPPING_FILES:
-				getMappingFiles().clear();
-				getMappingFiles().addAll((Collection<? extends XmlMappingFileRef>)newValue);
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__JAR_FILES:
-				getJarFiles().clear();
-				getJarFiles().addAll((Collection<? extends String>)newValue);
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__CLASSES:
-				getClasses().clear();
-				getClasses().addAll((Collection<? extends XmlJavaClassRef>)newValue);
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__EXCLUDE_UNLISTED_CLASSES:
-				setExcludeUnlistedClasses((Boolean)newValue);
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__PROPERTIES:
-				setProperties((XmlProperties)newValue);
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__NAME:
-				setName((String)newValue);
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__TRANSACTION_TYPE:
-				setTransactionType((XmlPersistenceUnitTransactionType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_PERSISTENCE_UNIT__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__PROVIDER:
-				setProvider(PROVIDER_EDEFAULT);
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__JTA_DATA_SOURCE:
-				setJtaDataSource(JTA_DATA_SOURCE_EDEFAULT);
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__NON_JTA_DATA_SOURCE:
-				setNonJtaDataSource(NON_JTA_DATA_SOURCE_EDEFAULT);
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__MAPPING_FILES:
-				getMappingFiles().clear();
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__JAR_FILES:
-				getJarFiles().clear();
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__CLASSES:
-				getClasses().clear();
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__EXCLUDE_UNLISTED_CLASSES:
-				setExcludeUnlistedClasses(EXCLUDE_UNLISTED_CLASSES_EDEFAULT);
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__PROPERTIES:
-				setProperties((XmlProperties)null);
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__TRANSACTION_TYPE:
-				setTransactionType(TRANSACTION_TYPE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_PERSISTENCE_UNIT__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case PersistencePackage.XML_PERSISTENCE_UNIT__PROVIDER:
-				return PROVIDER_EDEFAULT == null ? provider != null : !PROVIDER_EDEFAULT.equals(provider);
-			case PersistencePackage.XML_PERSISTENCE_UNIT__JTA_DATA_SOURCE:
-				return JTA_DATA_SOURCE_EDEFAULT == null ? jtaDataSource != null : !JTA_DATA_SOURCE_EDEFAULT.equals(jtaDataSource);
-			case PersistencePackage.XML_PERSISTENCE_UNIT__NON_JTA_DATA_SOURCE:
-				return NON_JTA_DATA_SOURCE_EDEFAULT == null ? nonJtaDataSource != null : !NON_JTA_DATA_SOURCE_EDEFAULT.equals(nonJtaDataSource);
-			case PersistencePackage.XML_PERSISTENCE_UNIT__MAPPING_FILES:
-				return mappingFiles != null && !mappingFiles.isEmpty();
-			case PersistencePackage.XML_PERSISTENCE_UNIT__JAR_FILES:
-				return jarFiles != null && !jarFiles.isEmpty();
-			case PersistencePackage.XML_PERSISTENCE_UNIT__CLASSES:
-				return classes != null && !classes.isEmpty();
-			case PersistencePackage.XML_PERSISTENCE_UNIT__EXCLUDE_UNLISTED_CLASSES:
-				return EXCLUDE_UNLISTED_CLASSES_EDEFAULT == null ? excludeUnlistedClasses != null : !EXCLUDE_UNLISTED_CLASSES_EDEFAULT.equals(excludeUnlistedClasses);
-			case PersistencePackage.XML_PERSISTENCE_UNIT__PROPERTIES:
-				return properties != null;
-			case PersistencePackage.XML_PERSISTENCE_UNIT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case PersistencePackage.XML_PERSISTENCE_UNIT__TRANSACTION_TYPE:
-				return transactionType != TRANSACTION_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(" (description: ");
-		result.append(description);
-		result.append(", provider: ");
-		result.append(provider);
-		result.append(", jtaDataSource: ");
-		result.append(jtaDataSource);
-		result.append(", nonJtaDataSource: ");
-		result.append(nonJtaDataSource);
-		result.append(", jarFiles: ");
-		result.append(jarFiles);
-		result.append(", excludeUnlistedClasses: ");
-		result.append(excludeUnlistedClasses);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", transactionType: ");
-		result.append(transactionType);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlPersistenceUnit
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlPersistenceUnitTransactionType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlPersistenceUnitTransactionType.java
deleted file mode 100644
index bbebb80f44..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlPersistenceUnitTransactionType.java
+++ /dev/null
@@ -1,235 +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.core.resource.persistence;
-
-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>Unit Transaction 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.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnitTransactionType()
- * @model
- * @generated
- */
-public enum XmlPersistenceUnitTransactionType implements Enumerator
-{
-	/**
-	 * The '<em><b>JTA</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #JTA_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	JTA(0, "JTA", "JTA"),
-
-	/**
-	 * The '<em><b>RESOURCE LOCAL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #RESOURCE_LOCAL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	RESOURCE_LOCAL(1, "RESOURCE_LOCAL", "RESOURCE_LOCAL");
-
-	/**
-	 * The '<em><b>JTA</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>JTA</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JTA
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int JTA_VALUE = 0;
-
-	/**
-	 * The '<em><b>RESOURCE LOCAL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>RESOURCE LOCAL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #RESOURCE_LOCAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int RESOURCE_LOCAL_VALUE = 1;
-
-	/**
-	 * An array of all the '<em><b>Xml Persistence Unit Transaction Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final XmlPersistenceUnitTransactionType[] VALUES_ARRAY =
-		new XmlPersistenceUnitTransactionType[]
-		{
-			JTA,
-			RESOURCE_LOCAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Xml Persistence Unit Transaction Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<XmlPersistenceUnitTransactionType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Xml Persistence Unit Transaction Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static XmlPersistenceUnitTransactionType get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			XmlPersistenceUnitTransactionType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Xml Persistence Unit Transaction Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static XmlPersistenceUnitTransactionType getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			XmlPersistenceUnitTransactionType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Xml Persistence Unit Transaction Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static XmlPersistenceUnitTransactionType get(int value)
-	{
-		switch (value)
-		{
-			case JTA_VALUE: return JTA;
-			case RESOURCE_LOCAL_VALUE: return RESOURCE_LOCAL;
-		}
-		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 XmlPersistenceUnitTransactionType(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;
-	}
-	
-} //XmlPersistenceUnitTransactionType
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlProperties.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlProperties.java
deleted file mode 100644
index e0906944e3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlProperties.java
+++ /dev/null
@@ -1,185 +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.core.resource.persistence;
-
-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;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>XmlProperties</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.core.resource.persistence.XmlProperties#getProperties <em>Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlProperties()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlProperties extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * 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 XmlProperties()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return PersistencePackage.Literals.XML_PROPERTIES;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.core.resource.persistence.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XmlProperties</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.core.resource.persistence.PersistencePackage#getXmlProperties_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, PersistencePackage.XML_PROPERTIES__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_PROPERTIES__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 PersistencePackage.XML_PROPERTIES__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 PersistencePackage.XML_PROPERTIES__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 PersistencePackage.XML_PROPERTIES__PROPERTIES:
-				getProperties().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_PROPERTIES__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} // XmlProperties
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlProperty.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlProperty.java
deleted file mode 100644
index 89ea3f4ebb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlProperty.java
+++ /dev/null
@@ -1,266 +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.core.resource.persistence;
-
-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.common.AbstractJpaEObject;
-import org.eclipse.jpt.core.resource.common.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>XmlProperty</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.core.resource.persistence.XmlProperty#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.core.resource.persistence.XmlProperty#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#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;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlProperty()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return PersistencePackage.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.core.resource.persistence.PersistencePackage#getXmlProperty_Name()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.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, PersistencePackage.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.core.resource.persistence.PersistencePackage#getXmlProperty_Value()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
-	public String getValue()
-	{
-		return value;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.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, PersistencePackage.XML_PROPERTY__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_PROPERTY__NAME:
-				return getName();
-			case PersistencePackage.XML_PROPERTY__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_PROPERTY__NAME:
-				setName((String)newValue);
-				return;
-			case PersistencePackage.XML_PROPERTY__VALUE:
-				setValue((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_PROPERTY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case PersistencePackage.XML_PROPERTY__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case PersistencePackage.XML_PROPERTY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case PersistencePackage.XML_PROPERTY__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuilder result = new StringBuilder(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlProperty
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/AbstractTextRange.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/AbstractTextRange.java
deleted file mode 100644
index 8b8c5ef547..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/AbstractTextRange.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.core.utility;
-
-import org.eclipse.jpt.utility.internal.StringTools;
-
-/**
- * Partial implementation of text range.
- * 
- * 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 AbstractTextRange
-	implements TextRange
-{
-
-	public boolean includes(int index) {
-		return (this.getOffset() <= index) && (index < this.end());
-	}
-
-	public boolean touches(int index) {
-		return this.includes(index) || (index == this.end());
-	}
-
-	/**
-	 * The end offset is "exclusive", i.e. the element at the end offset
-	 * is not included in the range.
-	 */
-	protected int end() {
-		return this.getOffset() + this.getLength();
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (o == this) {
-			return true;
-		}
-		if ( ! (o instanceof TextRange)) {
-			return false;
-		}
-		TextRange r = (TextRange) o;
-		return (r.getOffset() == this.getOffset())
-				&& (r.getLength() == this.getLength());
-	}
-
-	@Override
-	public int hashCode() {
-		return this.getOffset() ^ this.getLength();
-	}
-
-	@Override
-	public String toString() {
-		String start = String.valueOf(this.getOffset());
-		String end = String.valueOf(this.end());
-		return StringTools.buildToStringFor(this, start + ", " + end);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/TextRange.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/TextRange.java
deleted file mode 100644
index 0c6505572b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/TextRange.java
+++ /dev/null
@@ -1,114 +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.core.utility;
-
-/**
- * A text range defines the offset into, length of, and line of a piece
- * of text.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 TextRange {
-
-	/**
-	 * Returns the offset of the text.
-	 *
-	 * @return the offset of the text
-	 */
-	int getOffset();
-	
-	/**
-	 * Return the length of the text.
-	 */
-	int getLength();
-
-	/**
-	 * Return whether the range includes the character at the specified index.
-	 */
-	boolean includes(int index);
-
-	/**
-	 * Return whether the range touches an insertion cursor at the
-	 * specified index.
-	 */
-	boolean touches(int index);
-
-	/**
-	 * Return the line number of the text.
-	 */
-	int getLineNumber();
-
-	/**
-	 * Return true if the offsets and lengths are the same.
-	 */
-	boolean equals(Object obj);
-
-	/**
-	 * Return a hash code that corresponds to the #equals() contract.
-	 */
-	int hashCode();
-
-
-	/**
-	 * Empty implementation of text range.
-	 */
-	final class Empty implements TextRange {
-		public static final TextRange INSTANCE = new Empty();
-		public static TextRange instance() {
-			return INSTANCE;
-		}
-		// ensure single instance
-		private Empty() {
-			super();
-		}
-		public int getOffset() {
-			return 0;
-		}
-		public int getLength() {
-			return 0;
-		}
-		public boolean includes(int index) {
-			return false;
-		}
-		public boolean touches(int index) {
-			return index == 0;  // ???
-		}
-		public int getLineNumber() {
-			return 0;
-		}
-		@Override
-		public boolean equals(Object o) {
-			if (o == this) {
-				return true;
-			}
-			if ( ! (o instanceof TextRange)) {
-				return false;
-			}
-			TextRange r = (TextRange) o;
-			return (r.getOffset() == 0)
-					&& (r.getLength() == 0);
-		}
-		@Override
-		public int hashCode() {
-			return 0;
-		}
-		@Override
-		public String toString() {
-			return "TextRange.Empty";
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/AnnotationAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/AnnotationAdapter.java
deleted file mode 100644
index b0920c3816..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/AnnotationAdapter.java
+++ /dev/null
@@ -1,63 +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.core.utility.jdt;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-/**
- * Adapt a Java annotation with a simple-to-use 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.
- * 
- * This interface is not intended to be implemented by clients.
- */
-public interface AnnotationAdapter {
-
-	/**
-	 * Given the specified compilation unit, return the value of the
-	 * adapter's annotation.
-	 * @see #getAnnotation()
-	 */
-	Annotation getAnnotation(CompilationUnit astRoot);
-
-	/**
-	 * Build a new marker annotation, replacing the original annotation if present.
-	 */
-	void newMarkerAnnotation();
-
-	/**
-	 * Build a new single member annotation, replacing the original annotation if present.
-	 */
-	void newSingleMemberAnnotation();
-
-	/**
-	 * Build a new normal annotation, replacing the original annotation if present.
-	 */
-	void newNormalAnnotation();
-
-	/**
-	 * Remove the annotation.
-	 */
-	void removeAnnotation();
-
-	/**
-	 * Return the AST node corresponding to the annotation.
-	 * If the annotation is missing, return the annotation's parent node.
-	 * @see #getAstNode()
-	 */
-	ASTNode getAstNode(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/AnnotationEditFormatter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/AnnotationEditFormatter.java
deleted file mode 100644
index f8c98a3984..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/AnnotationEditFormatter.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.core.utility.jdt;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.TextEdit;
-
-/**
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 AnnotationEditFormatter {
-
-	/**
-	 * Review the specified edits and format the specified document as needed.
-	 */
-	void format(IDocument doc, TextEdit editTree) throws MalformedTreeException, BadLocationException;
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/AnnotationElementAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/AnnotationElementAdapter.java
deleted file mode 100644
index 2a5d589e49..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/AnnotationElementAdapter.java
+++ /dev/null
@@ -1,68 +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.core.utility.jdt;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-
-/**
- * Adapt a Java annotation element with a simple-to-use 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.
- * 
- * This interface is not intended to be implemented by clients.
- */
-public interface AnnotationElementAdapter<T> {
-
-	/**
-	 * Return the value of the adapter's annotation element.
-	 * Return null if the element is not present.
-	 * If the compilation unit is available, #value(CompilationUnit)
-	 * might be more performant.
-	 * @see #getValue(org.eclipse.jdt.core.dom.CompilationUnit)
-	 */
-	T getValue();
-
-	/**
-	 * Given the specified compilation unit, return the value of the
-	 * adapter's annotation element.
-	 * Return null if the element is not present.
-	 * @see #getValue()
-	 */
-	T getValue(CompilationUnit astRoot);
-
-	/**
-	 * Set the value of the adapter's annotation element.
-	 * Setting the value of the element to null will cause
-	 * the element to be removed from its annotation.
-	 */
-	void setValue(T value);
-
-	/**
-	 * Given the specified compilation unit, return the expression value of the
-	 * adapter's annotation element.
-	 * Return null if the element is not present.
-	 * @see #getExpression()
-	 */
-	Expression getExpression(CompilationUnit astRoot);
-
-	/**
-	 * Return the AST node corresponding to the element.
-	 * If the element is missing, return the annotation's node.
-	 * @see #getAstNode()
-	 */
-	ASTNode getAstNode(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/Attribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/Attribute.java
deleted file mode 100644
index c4e917a82c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/Attribute.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.core.utility.jdt;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-
-/**
- * Attributes are either represented by fields ('foo') or properties/method
- * pairs ('getFoo()'/'setFoo()').
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 Attribute extends Member {
-
-	/**
-	 * Return the attribute's name, as opposed to the member's name
-	 * (e.g. "getFoo()" returns "foo").
-	 */
-	// TODO rename to getName()?
-	String getAttributeName();
-
-	/**
-	 * Return the type binding for the attribute's declared type,
-	 * as opposed to its declaring type.
-	 */
-	ITypeBinding getTypeBinding(CompilationUnit astRoot);
-
-	/**
-	 * Return whether the attribute is a field.
-	 */
-	boolean isField();
-
-	/**
-	 * Return whether the attribute is a property/method pair.
-	 */
-	// TODO rename to isProperty()?
-	boolean isMethod();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/DeclarationAnnotationAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/DeclarationAnnotationAdapter.java
deleted file mode 100644
index 290d389e4f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/DeclarationAnnotationAdapter.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.core.utility.jdt;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-
-/**
- * Provide clients with a pluggable way to manipulate an
- * annotation modifying a "declaration".
- * 
- * TODO specify how multiple annotations with the same name are to be handled
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 DeclarationAnnotationAdapter {
-
-	/**
-	 * Given the specified declaration, return the annotation.
-	 */
-	Annotation getAnnotation(ModifiedDeclaration declaration);
-
-	/**
-	 * Given the specified declaration, modify it with
-	 * a new marker annotation, replacing the original annotation if present.
-	 * Return the new annotation.
-	 */
-	MarkerAnnotation newMarkerAnnotation(ModifiedDeclaration declaration);
-
-	/**
-	 * Given the specified declaration, modify it with
-	 * a new single member annotation, replacing the original annotation if present.
-	 * Return the new annotation.
-	 */
-	SingleMemberAnnotation newSingleMemberAnnotation(ModifiedDeclaration declaration);
-
-	/**
-	 * Given the specified declaration, modify it with
-	 * a new normal annotation, replacing the original annotation if present.
-	 * Return the new annotation.
-	 */
-	NormalAnnotation newNormalAnnotation(ModifiedDeclaration declaration);
-
-	/**
-	 * Remove the annotation from the specified declaration.
-	 */
-	void removeAnnotation(ModifiedDeclaration declaration);
-
-	/**
-	 * Given the specified declaration, return the AST node
-	 * corresponding to the annotation.
-	 * If the annotation is missing, return its parent node.
-	 */
-	ASTNode getAstNode(ModifiedDeclaration declaration);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/DeclarationAnnotationElementAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/DeclarationAnnotationElementAdapter.java
deleted file mode 100644
index 47868d6bd8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/DeclarationAnnotationElementAdapter.java
+++ /dev/null
@@ -1,58 +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.core.utility.jdt;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Expression;
-
-/**
- * Provide clients with a pluggable way to manipulate an
- * annotation element modifying a "declaration".
- * T is the type of the object to be passed to and returned by the adapter.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 DeclarationAnnotationElementAdapter<T> {
-
-	/**
-	 * Given the specified declaration, return the value of the
-	 * annotation element. Return null or an empty array
-	 * if the element is not present.
-	 */
-	T getValue(ModifiedDeclaration declaration);
-
-	/**
-	 * Given the specified declaration, set the value of the
-	 * annotation element. Setting the value of the element
-	 * to null will cause the element to be removed from its
-	 * annotation.
-	 */
-	void setValue(T value, ModifiedDeclaration declaration);
-
-	/**
-	 * Given the specified declaration, return the element's value expression.
-	 * Return null if the element is not present.
-	 */
-	Expression getExpression(ModifiedDeclaration declaration);
-
-	/**
-	 * Given the specified declaration, return the AST node
-	 * corresponding to the element's value.
-	 * If the element is missing, return the annotation's node.
-	 */
-	ASTNode getAstNode(ModifiedDeclaration declaration);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/ExpressionConverter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/ExpressionConverter.java
deleted file mode 100644
index d21d0c7a37..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/ExpressionConverter.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.core.utility.jdt;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.Expression;
-
-/**
- * Define the protocol for converting an AST expression back and forth
- * from an arbitrary type (e.g. StringLiteral <=> String).
- * T is the type of the object to be converted to and from an expression.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 ExpressionConverter<T> {
-
-	/**
-	 * Convert the specified object to an
-	 * expression that is owned by the specified AST.
-	 * The type of the object is determined by the
-	 * contract specified by the client.
-	 */
-	Expression convert(T object, AST ast);
-
-	/**
-	 * Convert the specified expression to an object of some
-	 * pre-determined type.
-	 */
-	T convert(Expression expression);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/FieldAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/FieldAttribute.java
deleted file mode 100644
index 4046cf9f49..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/FieldAttribute.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.core.utility.jdt;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.IVariableBinding;
-
-/**
- * Field attribute: just some covariant overrides.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 FieldAttribute extends Attribute {
-
-	/**
-	 * Covariant override.
-	 */
-	IVariableBinding getBinding(CompilationUnit astRoot);
-
-	/**
-	 * Covariant override.
-	 */
-	FieldDeclaration getBodyDeclaration(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/IndexedAnnotationAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/IndexedAnnotationAdapter.java
deleted file mode 100644
index ba2209e3cc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/IndexedAnnotationAdapter.java
+++ /dev/null
@@ -1,37 +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.core.utility.jdt;
-
-
-/**
- * Adapt an indexed Java annotation with a simple-to-use 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.
- * 
- * This interface is not intended to be implemented by clients.
- */
-public interface IndexedAnnotationAdapter extends AnnotationAdapter {
-
-	/**
-	 * Return the the index at which the annotation is situated.
-	 */
-	int getIndex();
-
-	/**
-	 * Move the annotation to the specified index, leaving its original
-	 * position cleared out.
-	 */
-	void moveAnnotation(int newIndex);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/IndexedDeclarationAnnotationAdapter.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/IndexedDeclarationAnnotationAdapter.java
deleted file mode 100644
index 1336363bd6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/IndexedDeclarationAnnotationAdapter.java
+++ /dev/null
@@ -1,37 +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.core.utility.jdt;
-
-
-/**
- * Allow clients to manipulate an annotation within an array of annotations.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 IndexedDeclarationAnnotationAdapter extends DeclarationAnnotationAdapter {
-
-	/**
-	 * Return the the index at which the annotation is situated.
-	 */
-	int getIndex();
-
-	/**
-	 * Move the annotation to the specified index, leaving its original
-	 * position cleared out.
-	 */
-	void moveAnnotation(int newIndex, ModifiedDeclaration declaration);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/Member.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/Member.java
deleted file mode 100644
index d36bbf6862..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/Member.java
+++ /dev/null
@@ -1,91 +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.core.utility.jdt;
-
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IBinding;
-import org.eclipse.jpt.core.utility.TextRange;
-
-/**
- * Dali manipulates annotations on members (types, fields, and methods).
- * This interface simplifies those manipulations.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 Member {
-
-	/**
-	 * Return the member's body declaration from the specified AST.
-	 * This can be null if the member is no longer present in the AST
-	 * because the source has been changed in another thread.
-	 */
-	BodyDeclaration getBodyDeclaration(CompilationUnit astRoot);
-
-	/**
-	 * Return the member's binding from the specified AST.
-	 */
-	IBinding getBinding(CompilationUnit astRoot);
-
-	/**
-	 * Return the member's "modified" declaration from the specified AST.
-	 */
-	ModifiedDeclaration getModifiedDeclaration(CompilationUnit astRoot);
-
-	/**
-	 * Return the member's "modified" declaration from a newly-generated AST.
-	 */
-	ModifiedDeclaration getModifiedDeclaration();
-
-	/**
-	 * Return whether the attribute is a persistable field or property getter.
-	 */
-	boolean isPersistable(CompilationUnit astRoot);
-
-	/**
-	 * Return whether the member matches the specified member
-	 * and occurrence.
-	 */
-	boolean matches(String memberName, int occurrence);
-
-	/**
-	 * Return the member's name text range from the specified AST.
-	 */
-	TextRange getNameTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Edit the member's declaration using the specified editor.
-	 */
-	void edit(Editor editor);
-
-
-	// ********** "editor" interface **********
-
-	/**
-	 * This interface defines a callback that is invoked when the member's
-	 * compilation unit/AST is in a state to be manipulated.
-	 */
-	public interface Editor {
-
-		/**
-		 * Edit the specified declaration. Any changes made to the declaration
-		 * will be captured and applied to the member's compilation unit.
-		 */
-		void edit(ModifiedDeclaration declaration);
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/MethodAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/MethodAttribute.java
deleted file mode 100644
index 4637ab76cf..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/MethodAttribute.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.core.utility.jdt;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IMethodBinding;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jpt.utility.MethodSignature;
-
-/**
- * Property attribute: just some covariant overrides.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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.
- */
-// TODO rename PropertyAttribute?
-public interface MethodAttribute extends Attribute {
-
-	/**
-	 * Covariant override.
-	 */
-	IMethodBinding getBinding(CompilationUnit astRoot);
-
-	/**
-	 * Covariant override.
-	 */
-	MethodDeclaration getBodyDeclaration(CompilationUnit astRoot);
-
-	/**
-	 * This method must be used instead of Member#matches(String, int).
-	 */
-	boolean matches(MethodSignature signature, int occurrence);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/ModifiedDeclaration.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/ModifiedDeclaration.java
deleted file mode 100644
index 682b2974e1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/ModifiedDeclaration.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.core.utility.jdt;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-
-/**
- * Define a wrapper that provides a common protocol for all the various AST
- * declarations that have modifiers (i.e. there are a number of AST node
- * classes that implement the method #modifiers(), but they do not implement
- * a common interface):
- *     BodyDeclaration
- *     SingleVariableDeclaration
- *     VariableDeclarationExpression
- *     VariableDeclarationStatement
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 ModifiedDeclaration {
-
-	/**
-	 * Return the "declaration" AST node.
-	 */
-	ASTNode getDeclaration();
-
-	/**
-	 * Return the "declaration" AST.
-	 */
-	AST getAst();
-
-	/**
-	 * Return the *first* annotation with the specified name.
-	 * Return null if the declaration has no such annotation.
-	 */
-	Annotation getAnnotationNamed(String annotationName);
-
-	/**
-	 * Remove the *first* annotation with the specified name from the declaration.
-	 */
-	void removeAnnotationNamed(String annotationName);
-
-	/**
-	 * Replace the specified old annotation with the specified new annotation.
-	 * If there is no annotation with the specified name, simply add the new
-	 * annotation to the declaration's modifiers.
-	 */
-	void replaceAnnotationNamed(String oldAnnotationName, Annotation newAnnotation);
-
-	/**
-	 * Add the specified import to the declaration's compilation unit.
-	 */
-	void addImport(String importName);
-
-	/**
-	 * Add the specified static import to the declaration's compilation unit.
-	 */
-	void addStaticImport(String importName);
-
-	/**
-	 * Add the specified import to the declaration's compilation unit.
-	 */
-	void addImport(String importName, boolean static_);
-
-	/**
-	 * Return whether the specified annotation has the specified name.
-	 */
-	boolean annotationIsNamed(Annotation annotation, String name);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/Type.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/Type.java
deleted file mode 100644
index 26726d98a7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/utility/jdt/Type.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.core.utility.jdt;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-
-/**
- * Type: just some covariant overrides.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit 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 Type extends Member {
-
-	/**
-	 * Covariant override.
-	 */
-	ITypeBinding getBinding(CompilationUnit astRoot);
-
-	/**
-	 * Covariant override.
-	 */
-	TypeDeclaration getBodyDeclaration(CompilationUnit astRoot);
-
-	/**
-	 * Return the type's nested types (does not include annotations or enums).
-	 */
-	TypeDeclaration[] getTypes(CompilationUnit astRoot);
-
-	/**
-	 * Return the type's fields.
-	 */
-	FieldDeclaration[] getFields(CompilationUnit astRoot);
-
-	/**
-	 * Return the type's methods.
-	 */
-	MethodDeclaration[] getMethods(CompilationUnit astRoot);
-
-}