adds a new mapping file content type, cleans up how we find and create xml resource model objects, also fixes bugs: 254784, 257131

161 files changed, 4607 insertions, 5104 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/plugin.properties b/jpa/plugins/org.eclipse.jpt.core/plugin.properties
index 49bce3dd6a..4793d1b513 100644
--- a/jpa/plugins/org.eclipse.jpt.core/plugin.properties
+++ b/jpa/plugins/org.eclipse.jpt.core/plugin.properties
@@ -29,6 +29,7 @@ JPA_PROBLEM_MARKER=JPA Problem Marker
 JPA_FILE_CONTENT=JPA File Content
 
 BASE_JPA_CONTENT = Base JPA Content
+MAPPING_FILE_CONTENT = Mapping File Content
 ORM_XML_CONTENT = ORM XML Content
 PERSISTENCE_XML_CONTENT = Persistence XML Content
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/plugin.xml b/jpa/plugins/org.eclipse.jpt.core/plugin.xml
index 923a6d8bf1..e93b6b66da 100644
--- a/jpa/plugins/org.eclipse.jpt.core/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.core/plugin.xml
@@ -12,10 +12,6 @@
 	/>
 	
 	
-	<extension-point 
-		id="resourceModelProviders" 
-		name="%JPA_RESOURCE_MODEL_PROVIDERS" 
-		schema="schema/resourceModelProviders.exsd"/>
 	
 	
 	<!-- ***** Eclipse core extensions ***** -->
@@ -81,15 +77,19 @@
 		<content-type
 			id="org.eclipse.jpt.core.content.baseJpaContent"
 			name="%BASE_JPA_CONTENT"
-			base-type="org.eclipse.core.runtime.xml">
-			<describer
-				class="org.eclipse.jpt.core.internal.resource.IndeterminateContentDescriber"/>
+			base-type="org.eclipse.core.runtime.xml"
+			describer="org.eclipse.jpt.core.internal.resource.IndeterminateContentDescriber">
 		</content-type>
+	  	<content-type
+	        base-type="org.eclipse.jpt.core.content.baseJpaContent"
+	        id="org.eclipse.jpt.core.content.mappingFile"
+	        name="%MAPPING_FILE_CONTENT">
+	  	</content-type>
 		
 		<content-type
-			id="org.eclipse.jpt.core.content.orm"
-			name="%ORM_XML_CONTENT"
-			base-type="org.eclipse.jpt.core.content.baseJpaContent">
+	        base-type="org.eclipse.jpt.core.content.mappingFile"
+	        id="org.eclipse.jpt.core.content.orm"
+	        name="%ORM_XML_CONTENT">
 			<describer
 				class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber2">
 				<parameter 
@@ -137,18 +137,6 @@
 	</extension>
 	
 	
-	<extension
-		point="org.eclipse.jpt.core.resourceModelProviders">
-		
-		<modelProvider
-			fileContentType="org.eclipse.jpt.core.content.persistence"
-			factoryClass="org.eclipse.jpt.core.internal.resource.persistence.PersistenceXmlResourceProviderFactory"/>
-		
-		<modelProvider
-			fileContentType="org.eclipse.jpt.core.content.orm"
-			factoryClass="org.eclipse.jpt.core.internal.resource.orm.OrmXmlResourceProviderFactory"/>
-		
-	</extension>
 	
 	
 	<!--
diff --git a/jpa/plugins/org.eclipse.jpt.core/schema/resourceModelProviders.exsd b/jpa/plugins/org.eclipse.jpt.core/schema/resourceModelProviders.exsd
deleted file mode 100644
index fd5388c51a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/schema/resourceModelProviders.exsd
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jpt.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="org.eclipse.jpt.core" id="resourceModelProviders" name="JPA Resource Model Providers"/>
-      </appinfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appinfo>
-            <meta.element />
-         </appinfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="modelProvider" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="modelProvider">
-      <complexType>
-         <attribute name="fileContentType" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="factoryClass" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.jpt.core.resource.JpaXmlResourceProviderFactory"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="since"/>
-      </appinfo>
-      <documentation>
-         JPT 2.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="examples"/>
-      </appinfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="apiinfo"/>
-      </appinfo>
-      <documentation>
-         Provisional API: This interface is part of an interim API that is still
-under development and expected to change significantly before reaching
-stability. It is available at this early stage to solicit feedback from
-pioneering adopters on the understanding that any code that uses this API
-will almost certainly be broken (repeatedly) as the API evolves.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="implementation"/>
-      </appinfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="copyright"/>
-      </appinfo>
-      <documentation>
-         Copyright (c) 2006, 2009 Oracle. All rights reserved.
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0, which accompanies this distribution
-and is available at http://www.eclipse.org/legal/epl-v10.html.
- 
-Contributors:
-Oracle - initial API and implementation
-      </documentation>
-   </annotation>
-
-</schema>
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
index 6f34a68935..7621349db9 100644
--- 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
@@ -106,9 +106,9 @@ 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.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
 import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
 import org.eclipse.jpt.core.resource.orm.XmlBasic;
@@ -133,7 +133,6 @@ import org.eclipse.jpt.core.resource.orm.XmlTableGenerator;
 import org.eclipse.jpt.core.resource.orm.XmlTransient;
 import org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint;
 import org.eclipse.jpt.core.resource.orm.XmlVersion;
-import org.eclipse.jpt.core.resource.persistence.PersistenceXmlResource;
 import org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistence;
@@ -196,22 +195,24 @@ public interface JpaFactory
 	 */
 	JpaRootContextNode buildRootContextNode(JpaProject jpaProject);
 
-	MappingFile buildMappingFile(MappingFileRef parent, OrmXmlResource resource);
+	MappingFile buildMappingFile(MappingFileRef parent, JpaXmlResource resource);
 	
 	
 	// ********** Persistence Context Model **********
 	
-	PersistenceXml buildPersistenceXml(JpaRootContextNode parent, PersistenceXmlResource persistenceResource);
+	PersistenceXml buildPersistenceXml(JpaRootContextNode parent, JpaXmlResource resource);
 	
 	Persistence buildPersistence(PersistenceXml parent, XmlPersistence resourcePersistence);
 	
 	PersistenceUnit buildPersistenceUnit(Persistence parent, XmlPersistenceUnit resourcePersistenceUnit);
 	
 	/**
-	 * xmlMappingFileRef is allowed to be null, this would be used for the implied mapping file ref
+	 * xmlMappingFileRef is not allowed to be null, use buildImpliedMappingFileRef instead
 	 */
 	MappingFileRef buildMappingFileRef(PersistenceUnit parent, XmlMappingFileRef xmlMappingFileRef);
 	
+	MappingFileRef buildImpliedMappingFileRef(PersistenceUnit parent);
+	
 	ClassRef buildClassRef(PersistenceUnit parent, XmlJavaClassRef xmlClassRef);
 	
 	ClassRef buildClassRef(PersistenceUnit parent, String className);
@@ -221,7 +222,7 @@ public interface JpaFactory
 	
 	// ********** ORM Context Model **********
 	
-	OrmXml buildOrmXml(MappingFileRef parent, OrmXmlResource ormResource);
+	OrmXml buildOrmXml(MappingFileRef parent, JpaXmlResource resource);
 	
 	EntityMappings buildEntityMappings(OrmXml parent, XmlEntityMappings entityMappings);
 	
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
index 2cec26b2c5..d5db4b7522 100644
--- 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
@@ -20,7 +20,7 @@ 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.persistence.MappingFileRef;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.core.utility.jdt.AnnotationEditFormatter;
 import org.eclipse.jpt.db.ConnectionProfileFactory;
@@ -143,7 +143,7 @@ public interface JpaPlatform
 
 	// ********** Mapping File **********
 
-	MappingFile buildMappingFile(MappingFileRef parent, OrmXmlResource resource);
+	MappingFile buildMappingFile(MappingFileRef parent, JpaXmlResource resource);
 
 
 	// ********** ORM type mappings **********
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
index 801cf1e07b..23967872f5 100644
--- 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
@@ -20,6 +20,7 @@ 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.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.db.Catalog;
 import org.eclipse.jpt.db.ConnectionProfile;
@@ -106,7 +107,33 @@ public interface JpaProject
 	 */
 	JpaFile getJpaFile(IFile file);
 
+	
+	// ********** xml resources **********
 
+	/**
+	 * Return the resource model object that corresponds to the file
+	 * 'META-INF/persistence.xml' if that file has the persistence ContentType
+	 * 
+	 * @see JptCorePlugin.DEFAULT_PERSISTENCE_XML_FILE_PATH
+	 */
+	JpaXmlResource getPersistenceXmlResource();
+	
+	/**
+	 * Return the resource model object that corresponds to the file
+	 * at the given filePath if that file has the mapping file ContentType
+	 * (org.eclipse.jpt.core.content.mappingFile)
+	 */
+	JpaXmlResource getMappingFileResource(String filePath);
+
+	/**
+	 * Return the resource model object that corresponds to the file
+	 * 'META-INF/orm.xml' if that file has the mapping file ContentType
+	 * 
+	 * @see JptCorePlugin.DEFAULT_ORM_XML_FILE_PATH
+	 */
+	JpaXmlResource getDefaultOrmXmlResource();
+	
+	
 	// ********** Java resources **********
 
 	/**
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
index a29765dd57..7c90f7363d 100644
--- 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
@@ -13,7 +13,9 @@ 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.IPath;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.QualifiedName;
@@ -29,7 +31,9 @@ import org.eclipse.jpt.core.internal.platform.GenericJpaPlatformProvider;
 import org.eclipse.jpt.core.internal.platform.JpaPlatformRegistry;
 import org.eclipse.jpt.core.internal.prefs.JpaPreferenceConstants;
 import org.eclipse.jst.j2ee.internal.J2EEConstants;
+import org.eclipse.wst.common.componentcore.ComponentCore;
 import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
 import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.prefs.BackingStoreException;
@@ -102,6 +106,8 @@ public class JptCorePlugin extends Plugin {
 	 */
 	public static final IContentType JAVA_SOURCE_CONTENT_TYPE = Platform.getContentTypeManager().getContentType(JavaCore.JAVA_SOURCE_CONTENT_TYPE);
 
+	public static final IContentType MAPPING_FILE_CONTENT_TYPE = Platform.getContentTypeManager().getContentType(PLUGIN_ID + ".content.mappingFile"); //$NON-NLS-1$
+	
 	/**
 	 * The content type for orm.xml mappings files. Use this to add new 
 	 * orm.xml-like extensions to this content type.
@@ -238,6 +244,18 @@ public class JptCorePlugin extends Plugin {
 				defaultURI;
 	}
 	
+	public static IFile getPlatformFile(IProject project, String defaultURI) {
+		IPath deploymentPath = new Path(getDeploymentURI(project, defaultURI));
+		IVirtualFile vFile = ComponentCore.createFile(project, deploymentPath);
+		return vFile.getUnderlyingFile();
+
+	}
+	
+	public static JpaFile getJpaFile(IProject project, String defaultURI) {
+		IFile xmlFile = getPlatformFile(project, defaultURI);
+		return xmlFile.exists() ? getJpaFile(xmlFile) : null;
+	}
+	
 	/**
 	 * Return the default JPA preferences
 	 * @see JpaPreferenceInitializer
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
index 925ff20573..aeecbcc081 100644
--- 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -37,19 +37,6 @@ public interface JpaRootContextNode extends JpaContextNode
 	 */
 	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 ***********************************************
 	
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/MappingFile.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/MappingFile.java
index a5e6796077..ee0dd50ebc 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/MappingFile.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/MappingFile.java
@@ -40,11 +40,6 @@ public interface MappingFile
 	
 	
 	// **************** updating **********************************************
-	/**
-	 * Initialize the MappingFile context model object to match the JpaXmlResource 
-	 * resource model object.
-	 */
-	void initialize(JpaXmlResource mappingFileResource);
 	
 	/**
 	 * Update the MappingFile context model object to match the JpaXmlResource 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/MappingFileProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/MappingFileProvider.java
index 87bd940faf..4e94474d02 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/MappingFileProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/MappingFileProvider.java
@@ -9,9 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.context;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
 import org.eclipse.jpt.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 
 /**
  * Provisional API: This interface is part of an interim API that is still
@@ -23,13 +24,13 @@ import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
 public interface MappingFileProvider {
 
 	/**
-	 * Return the associated mapping file resource type.
+	 * Return the associated mapping file content type.
 	 */
-	String getResourceType();
+	IContentType getContentType();
 
 	/**
 	 * Build a mapping with the specified parent and resource.
 	 */
-	MappingFile buildMappingFile(MappingFileRef parent, OrmXmlResource resource, JpaFactory factory);
+	MappingFile buildMappingFile(MappingFileRef parent, JpaXmlResource resource, JpaFactory factory);
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/ExtendedOrmAttributeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/ExtendedOrmAttributeMappingProvider.java
index 524c2e021f..59df970f7b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/ExtendedOrmAttributeMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/ExtendedOrmAttributeMappingProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.context.orm;
 
+import org.eclipse.core.runtime.content.IContentType;
+
 /**
  * Extend the default provider to allow ORM-specific providers.
  * 
@@ -21,5 +23,5 @@ package org.eclipse.jpt.core.context.orm;
 public interface ExtendedOrmAttributeMappingProvider
 	extends OrmAttributeMappingProvider
 {
-	String getOrmType();
+	IContentType getContentType();
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/ExtendedOrmTypeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/ExtendedOrmTypeMappingProvider.java
index f2be911cdc..011dd55a57 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/ExtendedOrmTypeMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/ExtendedOrmTypeMappingProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.context.orm;
 
+import org.eclipse.core.runtime.content.IContentType;
+
 /**
  * Extend the default provider to allow ORM-specific providers.
  * 
@@ -22,6 +24,6 @@ public interface ExtendedOrmTypeMappingProvider
 	extends OrmTypeMappingProvider
 {
 
-	String getOrmType();
+	IContentType getContentType();
 
 }
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
index ad97f9e782..956a659236 100644
--- 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
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.context.orm;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.context.PersistentAttribute;
 import org.eclipse.jpt.core.context.XmlContextNode;
 import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
@@ -84,7 +85,7 @@ public interface OrmPersistentAttribute
 
 	void nameChanged(String oldName, String newName);
 
-	String getOrmType();
+	IContentType getContentType();
 
 	
 	// ********** initialization/updating **********
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmStructureNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmStructureNode.java
index d638fec6ad..fe9a3f2112 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmStructureNode.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmStructureNode.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.context.orm;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
 
 /**
@@ -23,11 +24,11 @@ import org.eclipse.jpt.core.JptCorePlugin;
 public interface OrmStructureNode 
 {
 	/**
-	 * Return the type of the node's ORM.
+	 * Return the content type of the node's ORM.
 	 * This is used to find the appropriate provider when building ORM type
 	 * mappings (they can be ORM-specific) for the persistent type.
 	 */
-	String getOrmType();
+	IContentType getContentType();
 	
 	String ENTITY_MAPPINGS_ID = JptCorePlugin.PLUGIN_ID + ".orm.entityMappings"; //$NON-NLS-1$
 	
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
index 96d03b0d0e..0c7f3f380c 100644
--- 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
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.core.context.orm;
 
 import java.util.Iterator;
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.XmlContextNode;
 import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
@@ -63,7 +64,7 @@ public interface OrmTypeMapping
 
 	XmlTypeMapping getResourceTypeMapping();
 
-	String getOrmType();
+	IContentType getContentType();
 
 	TextRange getSelectionTextRange();
 
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
index 5895ca6e88..ddf8b2be3d 100644
--- 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.context.orm;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.context.MappingFile;
 import org.eclipse.jpt.core.context.XmlContextNode;
 import org.eclipse.jpt.core.context.persistence.MappingFileRef;
@@ -28,7 +29,7 @@ public interface OrmXml
 	 */
 	MappingFileRef getParent();
 
-	String getType();
+	IContentType getContentType();
 
 
 	// ********** entity mappings **********
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
index 0e14d6b096..13d3141d53 100644
--- 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
@@ -614,12 +614,6 @@ public interface PersistenceUnit
 
 
 	// ********** updating **********
-	
-	/**
-	 * Initialize the PersistenceUnit context model object to match the XmlPersistenceUnit 
-	 * resource model object. see {@link org.eclipse.jpt.core.JpaProject#update()}
-	 */
-	 void initialize(XmlPersistenceUnit persistenceUnit);
 	 
 	/**
 	 * Update the PersistenceUnit context model object to match the XmlPersistenceUnit 
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
index de82c1d493..8195ed90ea 100644
--- 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
@@ -11,7 +11,7 @@ package org.eclipse.jpt.core.context.persistence;
 
 import org.eclipse.jpt.core.JpaStructureNode;
 import org.eclipse.jpt.core.context.XmlContextNode;
-import org.eclipse.jpt.core.resource.persistence.PersistenceXmlResource;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 
 /**
  * 
@@ -50,12 +50,16 @@ public interface PersistenceXml extends XmlContextNode, JpaStructureNode
 	 */
 	void removePersistence();
 	
+	/**
+	 * Return the resource model object
+	 */
+	JpaXmlResource getXmlResource();
 	
 	// **************** updating **********************************************
 	
 	/**
-	 * Update the PersistenceXml context model object to match the PersistenceResource 
+	 * Update the PersistenceXml context model object to match the JpaXmlResource 
 	 * resource model object. see {@link org.eclipse.jpt.core.JpaProject#update()}
 	 */
-	void update(PersistenceXmlResource persistenceResource);
+	void update(JpaXmlResource resource);
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaProject.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaProject.java
new file mode 100644
index 0000000000..a9420e58c5
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaProject.java
@@ -0,0 +1,967 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2009 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.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.core.runtime.content.IContentType;
+import org.eclipse.jdt.core.ElementChangedEvent;
+import org.eclipse.jdt.core.IAnnotatable;
+import org.eclipse.jdt.core.IAnnotation;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IJavaElementDelta;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+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.JpaResourceModelListener;
+import org.eclipse.jpt.core.JptCorePlugin;
+import org.eclipse.jpt.core.context.JpaRootContextNode;
+import org.eclipse.jpt.core.internal.utility.PlatformTools;
+import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
+import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
+import org.eclipse.jpt.core.resource.java.JavaResourceCompilationUnit;
+import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
+import org.eclipse.jpt.db.Catalog;
+import org.eclipse.jpt.db.ConnectionProfile;
+import org.eclipse.jpt.db.Database;
+import org.eclipse.jpt.db.Schema;
+import org.eclipse.jpt.db.SchemaContainer;
+import org.eclipse.jpt.utility.CommandExecutor;
+import org.eclipse.jpt.utility.internal.BitTools;
+import org.eclipse.jpt.utility.internal.StringTools;
+import org.eclipse.jpt.utility.internal.ThreadLocalCommandExecutor;
+import org.eclipse.jpt.utility.internal.iterators.CloneIterator;
+import org.eclipse.jpt.utility.internal.iterators.CompositeIterator;
+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 AbstractJpaProject
+	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 JPA files associated with the JPA project:
+	 *     persistence.xml
+	 *     orm.xml
+	 *     java
+	 */
+	protected final Vector<JpaFile> jpaFiles;
+
+	/**
+	 * Resource models notify this listener when they change. A project update
+	 * should occur any time a resource model changes.
+	 */
+	protected final JpaResourceModelListener resourceModelListener;
+
+	/**
+	 * The root of the model representing the collated resources associated with 
+	 * the JPA project.
+	 */
+	protected final JpaRootContextNode rootContextNode;
+
+	/**
+	 * A pluggable updater that can be used to "update" the JPA project either
+	 * synchronously or asynchronously (or not at all). A synchronous updater
+	 * is the default, allowing a newly-constructed JPA project to be "updated"
+	 * upon return from the constructor. For performance reasons, a UI should
+	 * immediately change this to an asynchronous updater. A synchronous
+	 * updater can be used when the project is being manipulated by a "batch"
+	 * (or non-UI) client (e.g. when testing the "update" behavior). A null
+	 * updater can used during tests that do not care whether "updates" occur.
+	 * Clients will need to explicitly configure the updater if they require
+	 * something other than a synchronous updater.
+	 */
+	protected Updater updater;
+
+	/**
+	 * The data source that wraps the DTP model.
+	 */
+	protected final JpaDataSource dataSource;
+	
+	/**
+	 * A catalog name used to override the connection's default catalog.
+	 */
+	protected String userOverrideDefaultCatalog;
+
+	/**
+	 * A schema name used to override the connection's default schema.
+	 */
+	protected String userOverrideDefaultSchema;
+
+	/**
+	 * 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;
+
+	/**
+	 * Support for modifying documents shared with the UI.
+	 */
+	protected final ThreadLocalCommandExecutor modifySharedDocumentCommandExecutor;
+
+
+	// ********** constructor/initialization **********
+
+	public AbstractJpaProject(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.userOverrideDefaultCatalog = config.getUserOverrideDefaultCatalog();
+		this.userOverrideDefaultSchema = config.getUserOverrideDefaultSchema();
+		this.discoversAnnotatedClasses = config.discoverAnnotatedClasses();
+		this.jpaFiles = this.buildEmptyJpaFiles();
+
+		this.modifySharedDocumentCommandExecutor = this.buildModifySharedDocumentCommandExecutor();
+
+		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();
+
+		// "update" the project before returning
+		this.setUpdater_(new SynchronousJpaProjectUpdater(this));
+	}
+
+	@Override
+	protected boolean requiresParent() {
+		return false;
+	}
+	
+	@Override
+	public IResource getResource() {
+		return this.project;
+	}
+
+	protected Vector<JpaFile> buildEmptyJpaFiles() {
+		return new Vector<JpaFile>();
+	}
+
+	protected ThreadLocalCommandExecutor buildModifySharedDocumentCommandExecutor() {
+		return new ThreadLocalCommandExecutor();
+	}
+
+	protected JpaResourceModelListener buildResourceModelListener() {
+		return new DefaultResourceModelListener();
+	}
+
+	protected IResourceProxyVisitor buildInitialResourceProxyVisitor() {
+		return new InitialResourceProxyVisitor();
+	}
+
+	protected JpaRootContextNode buildRootContextNode() {
+		return this.getJpaFactory().buildRootContextNode(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 :
+					AbstractJpaProject.this.addJpaFile_((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;
+	}
+
+
+	// ********** database **********
+
+	@Override
+	public JpaDataSource getDataSource() {
+		return this.dataSource;
+	}
+
+	public ConnectionProfile getConnectionProfile() {
+		return this.dataSource.getConnectionProfile();
+	}
+
+	public Catalog getDefaultDbCatalog() {
+		String catalog = this.getDefaultCatalog();
+		return (catalog == null) ? null : this.getDbCatalog(catalog);
+	}
+
+	public String getDefaultCatalog() {
+		String catalog = this.getUserOverrideDefaultCatalog();
+		return (catalog != null) ? catalog : this.getDatabaseDefaultCatalog();
+	}
+
+	protected String getDatabaseDefaultCatalog() {
+		Catalog dbCatalog = this.getDatabaseDefaultDbCatalog();
+		return (dbCatalog == null ) ? null : dbCatalog.getIdentifier();
+	}
+
+	protected Catalog getDatabaseDefaultDbCatalog() {
+		Database db = this.getDatabase();
+		return (db == null ) ? null : db.getDefaultCatalog();
+	}
+
+	/**
+	 * If we don't have a catalog (i.e. we don't even have a *default* catalog),
+	 * then the database probably does not support catalogs; and we need to
+	 * get the schema directly from the database.
+	 */
+	public SchemaContainer getDefaultDbSchemaContainer() {
+		String catalog = this.getDefaultCatalog();
+		return (catalog != null) ? this.getDbCatalog(catalog) : this.getDatabase();
+	}
+
+	public Schema getDefaultDbSchema() {
+		SchemaContainer sc = this.getDefaultDbSchemaContainer();
+		return (sc == null) ? null : sc.getSchemaForIdentifier(this.getDefaultSchema());
+	}
+
+	public String getDefaultSchema() {
+		String schema = this.getUserOverrideDefaultSchema();
+		if (schema != null) {
+			return schema;
+		}
+		String catalog = this.getDefaultCatalog();
+		if (catalog != null) {
+			Catalog dbCatalog = this.getDbCatalog(catalog);
+			if (dbCatalog != null) {
+				Schema dbSchema = dbCatalog.getDefaultSchema();
+				if (dbSchema != null) {
+					return dbSchema.getIdentifier();
+				}
+			}
+		}
+		// if there is no default catalog,
+		// the database probably does not support catalogs;
+		// return the database's default schema
+		return this.getDatabaseDefaultSchema();
+	}
+
+	protected String getDatabaseDefaultSchema() {
+		Schema schema = this.getDatabaseDefaultDbSchema();
+		return (schema == null ) ? null : schema.getIdentifier();
+	}
+
+	protected Schema getDatabaseDefaultDbSchema() {
+		Database db = this.getDatabase();
+		return (db == null ) ? null : db.getDefaultSchema();
+	}
+
+
+	// **************** user override default catalog **********************
+	
+	public String getUserOverrideDefaultCatalog() {
+		return this.userOverrideDefaultCatalog;
+	}
+	
+	public void setUserOverrideDefaultCatalog(String catalog) {
+		String old = this.userOverrideDefaultCatalog;
+		this.userOverrideDefaultCatalog = catalog;
+		this.firePropertyChanged(USER_OVERRIDE_DEFAULT_CATALOG_PROPERTY, old, catalog);
+	}
+	
+	
+	// **************** user override default schema **********************
+	
+	public String getUserOverrideDefaultSchema() {
+		return this.userOverrideDefaultSchema;
+	}
+	
+	public void setUserOverrideDefaultSchema(String schema) {
+		String old = this.userOverrideDefaultSchema;
+		this.userOverrideDefaultSchema = schema;
+		this.firePropertyChanged(USER_OVERRIDE_DEFAULT_SCHEMA_PROPERTY, old, schema);
+	}
+	
+	
+	// **************** 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();
+	}
+
+	protected Iterator<JpaFile> jpaFiles(final IContentType contentType) {
+		return new FilteringIterator<JpaFile, JpaFile>(this.jpaFiles()) {
+			@Override
+			protected boolean accept(JpaFile jpaFile) {
+				return jpaFile.getContentType().isKindOf(contentType);
+			}
+		};
+	}
+
+	@Override
+	public JpaFile getJpaFile(IFile file) {
+		synchronized (this.jpaFiles) {
+			for (JpaFile jpaFile : this.jpaFiles) {
+				if (jpaFile.getFile().equals(file)) {
+					return jpaFile;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * 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.addJpaFile_(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 addJpaFile_(IFile file) {
+		if ( ! this.getJavaProject().isOnClasspath(file)) {
+			return null;  // the file must be on the Java classpath
+		}
+
+		JpaFile jpaFile = this.getJpaPlatform().buildJpaFile(this, file);
+		if (jpaFile == null) {
+			return null;
+		}
+		jpaFile.getResourceModel().addResourceModelListener(this.resourceModelListener);
+		this.jpaFiles.add(jpaFile);
+		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) {
+		synchronized (this.jpaFiles) {
+			JpaFile jpaFile = this.getJpaFile(file);
+			if (jpaFile != null) {  // a JpaFile is not added for every IFile
+				this.removeJpaFile(jpaFile);
+				return true;
+			}
+			return false;
+		}
+	}
+	
+	/**
+	 * Remove the JPA file and dispose of it
+	 */
+	protected void removeJpaFile(JpaFile jpaFile) {
+		jpaFile.getResourceModel().removeResourceModelListener(this.resourceModelListener);
+		if ( ! this.removeItemFromCollection(jpaFile, this.jpaFiles, JPA_FILES_COLLECTION)) {
+			throw new IllegalArgumentException(jpaFile.toString());
+		}
+	}
+
+
+	// ********** context model **********
+
+	public JpaRootContextNode getRootContextNode() {
+		return this.rootContextNode;
+	}
+
+
+	// ********** more queries **********
+
+	public JpaXmlResource getPersistenceXmlResource() {
+		IFile persistenceXmlFile = JptCorePlugin.getPlatformFile(getProject(), JptCorePlugin.DEFAULT_PERSISTENCE_XML_FILE_PATH);
+		if (persistenceXmlFile.exists()) {
+			JpaFile jpaFile = this.getJpaFile(persistenceXmlFile);
+			if (jpaFile != null) {
+				if (jpaFile.getContentType().isKindOf(JptCorePlugin.PERSISTENCE_XML_CONTENT_TYPE)) {
+					return (JpaXmlResource) jpaFile.getResourceModel();
+				}
+			}
+		}
+		return null;
+	}
+
+	public JpaXmlResource getDefaultOrmXmlResource() {
+		return getMappingFileResource(JptCorePlugin.DEFAULT_ORM_XML_FILE_PATH);
+	}
+	
+	public JpaXmlResource getMappingFileResource(String fileName) {
+		IFile mappingFile = JptCorePlugin.getPlatformFile(getProject(), fileName);
+		return (mappingFile.exists()) ? getMappingFileResource(mappingFile, JptCorePlugin.MAPPING_FILE_CONTENT_TYPE) :  null;
+	}
+	
+	protected JpaXmlResource getMappingFileResource(String fileName, IContentType contentType) {
+		IFile mappingFile = JptCorePlugin.getPlatformFile(getProject(), fileName);
+		return (mappingFile.exists()) ? getMappingFileResource(mappingFile, contentType) :  null;
+	}
+	
+	protected JpaXmlResource getMappingFileResource(IFile file, IContentType contentType) {
+		JpaFile jpaFile = getJpaFile(file);
+		if (jpaFile != null) {
+			return getMappingFileResource(jpaFile, contentType);
+		}
+		return null;
+	}
+	
+	protected JpaXmlResource getMappingFileResource(JpaFile jpaFile, IContentType contentType) {
+		if (jpaFile.getContentType().isKindOf(contentType)) {
+			return (JpaXmlResource) jpaFile.getResourceModel();
+		}
+		return null;
+	}
+
+	protected Iterator<JpaFile> javaJpaFiles() {
+		return this.jpaFiles(JptCorePlugin.JAVA_SOURCE_CONTENT_TYPE);
+	}
+
+	protected Iterator<JavaResourceCompilationUnit> javaResourceCompilationUnits() {
+		return new TransformationIterator<JpaFile, JavaResourceCompilationUnit>(this.javaJpaFiles()) {
+			@Override
+			protected JavaResourceCompilationUnit transform(JpaFile jpaFile) {
+				return (JavaResourceCompilationUnit) jpaFile.getResourceModel();
+			}
+		};
+	}
+
+	public Iterator<String> annotatedClassNames() {
+		return new TransformationIterator<JavaResourcePersistentType, String>(this.persistedJavaResourcePersistentTypes()) {
+			@Override
+			protected String transform(JavaResourcePersistentType jrpt) {
+				return jrpt.getQualifiedName();
+			}
+		};
+	}
+	
+	protected Iterator<JavaResourcePersistentType> persistedJavaResourcePersistentTypes() {
+		return new FilteringIterator<JavaResourcePersistentType, JavaResourcePersistentType>(this.persistableJavaResourcePersistentTypes()) {
+			@Override
+			protected boolean accept(JavaResourcePersistentType jrpt) {
+				return jrpt.isPersisted();
+			}
+		};
+	}
+	
+	protected Iterator<JavaResourcePersistentType> persistableJavaResourcePersistentTypes() {
+		return new CompositeIterator<JavaResourcePersistentType>(this.persistableJavaResourcePersistentTypeIterators());
+	}
+
+	protected Iterator<Iterator<JavaResourcePersistentType>> persistableJavaResourcePersistentTypeIterators() {
+		return new TransformationIterator<JavaResourceCompilationUnit, Iterator<JavaResourcePersistentType>>(this.javaResourceCompilationUnits()) {
+			@Override
+			protected Iterator<JavaResourcePersistentType> transform(JavaResourceCompilationUnit compilationUnit) {
+				return compilationUnit.persistableTypes();
+			}
+		};
+	}
+
+	public JavaResourcePersistentType getJavaResourcePersistentType(String typeName) {
+		for (Iterator<JavaResourcePersistentType> stream = this.persistableJavaResourcePersistentTypes(); stream.hasNext(); ) {
+			JavaResourcePersistentType pt =  stream.next();
+			if (pt.getQualifiedName().equals(typeName)) {
+				return pt;
+			}
+		}
+//		this.javaProject().findType(typeName);
+		return null;
+	}
+
+
+	// ********** Java change **********
+
+	public void javaElementChanged(ElementChangedEvent event) {
+		this.synchWithJavaDelta(event.getDelta());
+	}
+
+	/**
+	 * We recurse back here when processing 'affectedChildren'.
+	 */
+	protected void synchWithJavaDelta(IJavaElementDelta delta) {
+		switch (delta.getElement().getElementType()) {
+			case IJavaElement.JAVA_MODEL :
+				this.javaModelChanged(delta);
+				break;
+			case IJavaElement.JAVA_PROJECT :
+				this.javaProjectChanged(delta);
+				break;
+			case IJavaElement.PACKAGE_FRAGMENT_ROOT :
+				this.javaPackageFragmentRootChanged(delta);
+				break;
+			case IJavaElement.PACKAGE_FRAGMENT :
+				this.javaPackageFragmentChanged(delta);
+				break;
+			case IJavaElement.COMPILATION_UNIT :
+				this.javaCompilationUnitChanged(delta);
+				break;
+			default :
+				break; // ignore the elements inside a compilation unit
+		}
+	}
+
+	// ***** model
+	protected void javaModelChanged(IJavaElementDelta delta) {
+		// process the java model's projects
+		this.synchWithJavaDeltaChildren(delta);
+	}
+
+	protected void synchWithJavaDeltaChildren(IJavaElementDelta delta) {
+		for (IJavaElementDelta child : delta.getAffectedChildren()) {
+			this.synchWithJavaDelta(child); // recurse
+		}
+	}
+
+	// ***** project
+	protected void javaProjectChanged(IJavaElementDelta delta) {
+		if ( ! delta.getElement().equals(this.getJavaProject())) {
+			return;  // ignore
+		}
+
+		// process the java project's package fragment roots
+		this.synchWithJavaDeltaChildren(delta);
+
+		if (this.classpathHasChanged(delta)) {
+			// the jars were processed above, now force all the JPA files to update
+			this.updateFromJava();
+		}
+	}
+
+	protected boolean classpathHasChanged(IJavaElementDelta delta) {
+		return BitTools.flagIsSet(delta.getFlags(), IJavaElementDelta.F_RESOLVED_CLASSPATH_CHANGED);
+	}
+
+	protected void updateFromJava() {
+		for (Iterator<JavaResourceCompilationUnit> stream = this.javaResourceCompilationUnits(); stream.hasNext(); ) {
+			stream.next().update();
+		}
+	}
+
+	// ***** package fragment root
+	protected void javaPackageFragmentRootChanged(IJavaElementDelta delta) {
+		// process the java package fragment root's package fragments
+		this.synchWithJavaDeltaChildren(delta);
+
+		if (this.classpathEntryHasBeenAdded(delta)) {
+			this.dump(delta);
+		} else if (this.classpathEntryHasBeenRemoved(delta)) {  // should be mutually-exclusive w/added (?)
+			
+		}
+	}
+
+	protected void dump(IJavaElementDelta delta) {
+//		try {
+//			this.dump_(delta);
+//		} catch (JavaModelException ex) {
+//			throw new RuntimeException(ex);
+//		}
+	}
+
+//	protected void remove() {
+//		removeDump_();
+//	}
+//	@SuppressWarnings("nls")
+//	protected void dump_(IJavaElementDelta delta) throws JavaModelException {
+//		System.out.println(delta);
+//		IPackageFragmentRoot pfr = (IPackageFragmentRoot) delta.getElement();
+//			IFile file = (IFile) pfr.getResource();
+//			System.out.println("file: " + file.getFullPath());
+//			System.out.println("content type: " + PlatformTools.getContentType(file));
+//		System.out.println("kind: " + this.getKindString(pfr));
+//		System.out.println("archive: " + pfr.isArchive());
+//		System.out.println("external: " + pfr.isExternal());
+//		for (IJavaElement pf : pfr.getChildren()) {
+//			System.out.println("\tpackage fragment: " + pf);
+//			for (IJavaElement classFile : ((IPackageFragment) pf).getChildren()) {
+//				System.out.println("\t\tclass file: " + classFile);
+//				IType type = ((IClassFile) classFile).getType();
+//				System.out.println("\t\t\ttype: " + type);
+//				this.dumpAnnotations(type);
+//				for (IField field : type.getFields()) {
+//					System.out.println("\t\t\t\tfield: " + field);
+//					this.dumpAnnotations(field);
+//				}
+//				for (IMethod method : type.getMethods()) {
+//					System.out.println("\t\t\t\tmethod: " + method);
+//					this.dumpAnnotations(method);
+//				}
+//			}
+//		}
+//		System.out.flush();
+//	}
+//
+	@SuppressWarnings("nls")
+	protected String getKindString(IPackageFragmentRoot pfr) throws JavaModelException {
+		switch (pfr.getKind()) {
+			case IPackageFragmentRoot.K_BINARY:
+				return "BINARY";
+			case IPackageFragmentRoot.K_SOURCE:
+				return "SOURCE";
+			default:
+				return "[UNKNOWN]";
+		}
+	}
+
+	@SuppressWarnings("nls")
+	protected void dumpAnnotations(IAnnotatable annotatable) throws JavaModelException {
+		for (IAnnotation annotation : annotatable.getAnnotations()) {
+			System.out.println("\t\t\t\t\tannotation: " + annotation);
+		}
+	}
+
+	protected boolean classpathEntryHasBeenAdded(IJavaElementDelta delta) {
+		return BitTools.flagIsSet(delta.getFlags(), IJavaElementDelta.F_ADDED_TO_CLASSPATH);
+	}
+
+	protected boolean classpathEntryHasBeenRemoved(IJavaElementDelta delta) {
+		return BitTools.flagIsSet(delta.getFlags(), IJavaElementDelta.F_REMOVED_FROM_CLASSPATH);
+	}
+
+	// ***** package fragment
+	protected void javaPackageFragmentChanged(IJavaElementDelta delta) {
+		// process the java package fragment's compilation units
+		this.synchWithJavaDeltaChildren(delta);
+	}
+
+	// ***** compilation unit
+	protected void javaCompilationUnitChanged(IJavaElementDelta delta) {
+		if (this.javaCompilationUnitDeltaIsRelevant(delta)) {
+			ICompilationUnit compilationUnit = (ICompilationUnit) delta.getElement();
+			for (Iterator<JavaResourceCompilationUnit> stream = this.javaResourceCompilationUnits(); stream.hasNext(); ) {
+				JavaResourceCompilationUnit jrcu = stream.next();
+				if (jrcu.getCompilationUnit().equals(compilationUnit)) {
+					jrcu.update();
+					break;  // there *shouldn't* be any more...
+				}
+			}
+		}
+		// ignore the java compilation unit's children
+	}
+
+	protected boolean javaCompilationUnitDeltaIsRelevant(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 false;
+		}
+
+		// ignore java notification for ADDED or REMOVED;
+		// these are handled via resource notification
+		return delta.getKind() == IJavaElementDelta.CHANGED;
+	}
+
+
+	// ********** validation **********
+	
+	public Iterator<IMessage> validationMessages() {
+		List<IMessage> messages = new ArrayList<IMessage>();
+		this.validate(messages);
+		return messages.iterator();
+	}
+	
+	protected void validate(List<IMessage> messages) {
+		this.validateConnection(messages);
+		this.rootContextNode.validate(messages);
+	}
+
+	protected void validateConnection(List<IMessage> messages) {
+		String cpName = this.dataSource.getConnectionProfileName();
+		if (StringTools.stringIsEmpty(cpName)) {
+			messages.add(
+				DefaultJpaValidationMessages.buildMessage(
+					IMessage.NORMAL_SEVERITY,
+					JpaValidationMessages.PROJECT_NO_CONNECTION,
+					this
+				)
+			);
+			return;
+		}
+		ConnectionProfile cp = this.dataSource.getConnectionProfile();
+		if (cp == null) {
+			messages.add(
+				DefaultJpaValidationMessages.buildMessage(
+					IMessage.NORMAL_SEVERITY,
+					JpaValidationMessages.PROJECT_INVALID_CONNECTION,
+					new String[] {cpName},
+					this
+				)
+			);
+			return;
+		}
+		if (cp.isInactive()) {
+			messages.add(
+				DefaultJpaValidationMessages.buildMessage(
+					IMessage.NORMAL_SEVERITY,
+					JpaValidationMessages.PROJECT_INACTIVE_CONNECTION,
+					new String[] {cpName},
+					this
+				)
+			);
+		}
+	}
+	
+	
+	// ********** dispose **********
+
+	public void dispose() {
+		this.updater.stop();
+		this.dataSource.dispose();
+	}
+
+
+	// ********** resource model listener **********
+
+	protected class DefaultResourceModelListener implements JpaResourceModelListener {
+		protected DefaultResourceModelListener() {
+			super();
+		}
+		public void resourceModelChanged() {
+			AbstractJpaProject.this.update();
+		}
+	}
+
+
+	// ********** handling resource deltas **********
+
+	public void projectChanged(IResourceDelta delta) throws CoreException {
+		ResourceDeltaVisitor resourceDeltaVisitor = this.buildResourceDeltaVisitor();
+		delta.accept(resourceDeltaVisitor);
+		if (resourceDeltaVisitor.jpaFilesChanged()) {
+			for (Iterator<JavaResourceCompilationUnit> stream = this.javaResourceCompilationUnits(); stream.hasNext(); ) {
+				stream.next().resolveTypes();
+			}
+		}
+	}
+
+	protected ResourceDeltaVisitor buildResourceDeltaVisitor() {
+		return new ResourceDeltaVisitor();
+	}
+
+	/**
+	 * 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 :
+				JpaFile jpaFile = this.getJpaFile(file);
+				if (jpaFile != null) {
+					//if the content type changed, we need to build a new JpaFile
+					//this could happen if the schema of an orm.xml file was changed
+					if (!jpaFile.getContentType().equals(PlatformTools.getContentType(file))) {
+						removeJpaFile(jpaFile);
+						addJpaFile(file);
+						return true;
+					}
+				}
+				else {
+					return addJpaFile(file);
+				}
+			case IResourceDelta.ADDED_PHANTOM :
+			case IResourceDelta.REMOVED_PHANTOM :
+			default :
+				break;  // only worried about added/removed/changed files
+		}
+
+		return false;
+	}
+
+	// ***** inner class
+	/**
+	 * add or remove 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 (AbstractJpaProject.this.synchronizeJpaFiles((IFile) res, delta.getKind())) {
+						this.jpaFilesChanged = true;
+					}
+					return false;  // no children
+				default :
+					return false;  // no children
+			}
+		}
+
+		/**
+		 * Return whether the collection of JPA files was modified while
+		 * traversing the IResourceDelta (i.e. a JPA file was added or removed).
+		 */
+		protected boolean jpaFilesChanged() {
+			return this.jpaFilesChanged;
+		}
+
+	}
+
+
+	// ********** support for modifying documents shared with the UI **********
+
+	public void setThreadLocalModifySharedDocumentCommandExecutor(CommandExecutor commandExecutor) {
+		this.modifySharedDocumentCommandExecutor.set(commandExecutor);
+	}
+
+	public CommandExecutor getModifySharedDocumentCommandExecutor() {
+		return this.modifySharedDocumentCommandExecutor;
+	}
+
+
+	// ********** project "update" **********
+
+	public Updater getUpdater() {
+		return this.updater;
+	}
+
+	public void setUpdater(Updater updater) {
+		if (updater == null) {
+			throw new NullPointerException();
+		}
+		this.updater.stop();
+		this.setUpdater_(updater);
+	}
+
+	protected void setUpdater_(Updater updater) {
+		this.updater = updater;
+		this.updater.start();
+	}
+
+	/**
+	 * Delegate to the updater so clients can configure how updates occur.
+	 */
+	public void update() {
+		this.updater.update();
+	}
+
+	/**
+	 * Called by the updater.
+	 */
+	public IStatus update(IProgressMonitor monitor) {
+		try {
+			this.rootContextNode.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/GenericJpaModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaModel.java
index e165705d40..5e0187d5db 100644
--- 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
@@ -224,23 +224,23 @@ public class GenericJpaModel
 	}
 
 	private void createPersistenceXml(IProject project) {
-		PersistenceXmlResourceProvider modelProvider =
+		PersistenceXmlResourceProvider resourceProvider =
 			PersistenceXmlResourceProvider.getDefaultXmlResourceProvider(project);
 		try {
-			modelProvider.createResource();
+			resourceProvider.createFileAndResource();
 		}
-		catch (Exception e) {
+		catch (CoreException e) {
 			JptCorePlugin.log(e);
 		}
 	}
 
 	private void createOrmXml(IProject project) {
-		OrmXmlResourceProvider modelProvider =
+		OrmXmlResourceProvider resourceProvider =
 			OrmXmlResourceProvider.getDefaultXmlResourceProvider(project);
 		try {
-			modelProvider.createResource();
+			resourceProvider.createFileAndResource();
 		}
-		catch (Exception e) {
+		catch (CoreException e) {
 			JptCorePlugin.log(e);
 		}
 	}
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
index 2257993a0c..ccef5cf1d4 100644
--- 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
@@ -9,902 +9,20 @@
  ******************************************************************************/
 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.core.runtime.content.IContentType;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.IAnnotatable;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-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.JpaResourceModelListener;
-import org.eclipse.jpt.core.JptCorePlugin;
-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.JavaResourceCompilationUnit;
-import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.db.Catalog;
-import org.eclipse.jpt.db.ConnectionProfile;
-import org.eclipse.jpt.db.Database;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.db.SchemaContainer;
-import org.eclipse.jpt.utility.CommandExecutor;
-import org.eclipse.jpt.utility.internal.BitTools;
-import org.eclipse.jpt.utility.internal.StringTools;
-import org.eclipse.jpt.utility.internal.ThreadLocalCommandExecutor;
-import org.eclipse.jpt.utility.internal.iterators.CloneIterator;
-import org.eclipse.jpt.utility.internal.iterators.CompositeIterator;
-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 GenericJpaProject
-	extends AbstractJpaNode
-	implements JpaProject
+	extends AbstractJpaProject
 {
-	/**
-	 * 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 JPA files associated with the JPA project:
-	 *     persistence.xml
-	 *     orm.xml
-	 *     java
-	 */
-	protected final Vector<JpaFile> jpaFiles;
-
-	/**
-	 * Resource models notify this listener when they change. A project update
-	 * should occur any time a resource model changes.
-	 */
-	protected final JpaResourceModelListener resourceModelListener;
-
-	/**
-	 * The root of the model representing the collated resources associated with 
-	 * the JPA project.
-	 */
-	protected final JpaRootContextNode rootContextNode;
-
-	/**
-	 * A pluggable updater that can be used to "update" the JPA project either
-	 * synchronously or asynchronously (or not at all). A synchronous updater
-	 * is the default, allowing a newly-constructed JPA project to be "updated"
-	 * upon return from the constructor. For performance reasons, a UI should
-	 * immediately change this to an asynchronous updater. A synchronous
-	 * updater can be used when the project is being manipulated by a "batch"
-	 * (or non-UI) client (e.g. when testing the "update" behavior). A null
-	 * updater can used during tests that do not care whether "updates" occur.
-	 * Clients will need to explicitly configure the updater if they require
-	 * something other than a synchronous updater.
-	 */
-	protected Updater updater;
-
-	/**
-	 * The data source that wraps the DTP model.
-	 */
-	protected final JpaDataSource dataSource;
-	
-	/**
-	 * A catalog name used to override the connection's default catalog.
-	 */
-	protected String userOverrideDefaultCatalog;
-
-	/**
-	 * A schema name used to override the connection's default schema.
-	 */
-	protected String userOverrideDefaultSchema;
-
-	/**
-	 * 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;
-
-	/**
-	 * Support for modifying documents shared with the UI.
-	 */
-	protected final ThreadLocalCommandExecutor modifySharedDocumentCommandExecutor;
 
 
 	// ********** constructor/initialization **********
 
 	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.userOverrideDefaultCatalog = config.getUserOverrideDefaultCatalog();
-		this.userOverrideDefaultSchema = config.getUserOverrideDefaultSchema();
-		this.discoversAnnotatedClasses = config.discoverAnnotatedClasses();
-		this.jpaFiles = this.buildEmptyJpaFiles();
-
-		this.modifySharedDocumentCommandExecutor = this.buildModifySharedDocumentCommandExecutor();
-
-		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();
-
-		// "update" the project before returning
-		this.setUpdater_(new SynchronousJpaProjectUpdater(this));
-	}
-
-	@Override
-	protected boolean requiresParent() {
-		return false;
-	}
-	
-	@Override
-	public IResource getResource() {
-		return this.project;
-	}
-
-	protected Vector<JpaFile> buildEmptyJpaFiles() {
-		return new Vector<JpaFile>();
-	}
-
-	protected ThreadLocalCommandExecutor buildModifySharedDocumentCommandExecutor() {
-		return new ThreadLocalCommandExecutor();
-	}
-
-	protected JpaResourceModelListener buildResourceModelListener() {
-		return new DefaultResourceModelListener();
-	}
-
-	protected IResourceProxyVisitor buildInitialResourceProxyVisitor() {
-		return new InitialResourceProxyVisitor();
-	}
-
-	protected JpaRootContextNode buildRootContextNode() {
-		return this.getJpaFactory().buildRootContextNode(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.addJpaFile_((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;
-	}
-
-
-	// ********** database **********
-
-	@Override
-	public JpaDataSource getDataSource() {
-		return this.dataSource;
-	}
-
-	public ConnectionProfile getConnectionProfile() {
-		return this.dataSource.getConnectionProfile();
-	}
-
-	public Catalog getDefaultDbCatalog() {
-		String catalog = this.getDefaultCatalog();
-		return (catalog == null) ? null : this.getDbCatalog(catalog);
-	}
-
-	public String getDefaultCatalog() {
-		String catalog = this.getUserOverrideDefaultCatalog();
-		return (catalog != null) ? catalog : this.getDatabaseDefaultCatalog();
-	}
-
-	protected String getDatabaseDefaultCatalog() {
-		Catalog dbCatalog = this.getDatabaseDefaultDbCatalog();
-		return (dbCatalog == null ) ? null : dbCatalog.getIdentifier();
-	}
-
-	protected Catalog getDatabaseDefaultDbCatalog() {
-		Database db = this.getDatabase();
-		return (db == null ) ? null : db.getDefaultCatalog();
-	}
-
-	/**
-	 * If we don't have a catalog (i.e. we don't even have a *default* catalog),
-	 * then the database probably does not support catalogs; and we need to
-	 * get the schema directly from the database.
-	 */
-	public SchemaContainer getDefaultDbSchemaContainer() {
-		String catalog = this.getDefaultCatalog();
-		return (catalog != null) ? this.getDbCatalog(catalog) : this.getDatabase();
-	}
-
-	public Schema getDefaultDbSchema() {
-		SchemaContainer sc = this.getDefaultDbSchemaContainer();
-		return (sc == null) ? null : sc.getSchemaForIdentifier(this.getDefaultSchema());
-	}
-
-	public String getDefaultSchema() {
-		String schema = this.getUserOverrideDefaultSchema();
-		if (schema != null) {
-			return schema;
-		}
-		String catalog = this.getDefaultCatalog();
-		if (catalog != null) {
-			Catalog dbCatalog = this.getDbCatalog(catalog);
-			if (dbCatalog != null) {
-				Schema dbSchema = dbCatalog.getDefaultSchema();
-				if (dbSchema != null) {
-					return dbSchema.getIdentifier();
-				}
-			}
-		}
-		// if there is no default catalog,
-		// the database probably does not support catalogs;
-		// return the database's default schema
-		return this.getDatabaseDefaultSchema();
-	}
-
-	protected String getDatabaseDefaultSchema() {
-		Schema schema = this.getDatabaseDefaultDbSchema();
-		return (schema == null ) ? null : schema.getIdentifier();
-	}
-
-	protected Schema getDatabaseDefaultDbSchema() {
-		Database db = this.getDatabase();
-		return (db == null ) ? null : db.getDefaultSchema();
-	}
-
-
-	// **************** user override default catalog **********************
-	
-	public String getUserOverrideDefaultCatalog() {
-		return this.userOverrideDefaultCatalog;
-	}
-	
-	public void setUserOverrideDefaultCatalog(String catalog) {
-		String old = this.userOverrideDefaultCatalog;
-		this.userOverrideDefaultCatalog = catalog;
-		this.firePropertyChanged(USER_OVERRIDE_DEFAULT_CATALOG_PROPERTY, old, catalog);
-	}
-	
-	
-	// **************** user override default schema **********************
-	
-	public String getUserOverrideDefaultSchema() {
-		return this.userOverrideDefaultSchema;
-	}
-	
-	public void setUserOverrideDefaultSchema(String schema) {
-		String old = this.userOverrideDefaultSchema;
-		this.userOverrideDefaultSchema = schema;
-		this.firePropertyChanged(USER_OVERRIDE_DEFAULT_SCHEMA_PROPERTY, old, schema);
-	}
-	
-	
-	// **************** 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();
-	}
-
-	protected Iterator<JpaFile> jpaFiles(final IContentType contentType) {
-		return new FilteringIterator<JpaFile, JpaFile>(this.jpaFiles()) {
-			@Override
-			protected boolean accept(JpaFile jpaFile) {
-				return jpaFile.getContentType().isKindOf(contentType);
-			}
-		};
-	}
-
-	@Override
-	public JpaFile getJpaFile(IFile file) {
-		synchronized (this.jpaFiles) {
-			for (JpaFile jpaFile : this.jpaFiles) {
-				if (jpaFile.getFile().equals(file)) {
-					return jpaFile;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * 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.addJpaFile_(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 addJpaFile_(IFile file) {
-		if ( ! this.getJavaProject().isOnClasspath(file)) {
-			return null;  // the file must be on the Java classpath
-		}
-
-		JpaFile jpaFile = this.getJpaPlatform().buildJpaFile(this, file);
-		if (jpaFile == null) {
-			return null;
-		}
-		jpaFile.getResourceModel().addResourceModelListener(this.resourceModelListener);
-		this.jpaFiles.add(jpaFile);
-		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) {
-		synchronized (this.jpaFiles) {
-			JpaFile jpaFile = this.getJpaFile(file);
-			if (jpaFile != null) {  // a JpaFile is not added for every IFile
-				this.removeJpaFile(jpaFile);
-				return true;
-			}
-			return false;
-		}
-	}
-	
-	/**
-	 * Remove the JPA file and dispose of it
-	 */
-	protected void removeJpaFile(JpaFile jpaFile) {
-		jpaFile.getResourceModel().removeResourceModelListener(this.resourceModelListener);
-		if ( ! this.removeItemFromCollection(jpaFile, this.jpaFiles, JPA_FILES_COLLECTION)) {
-			throw new IllegalArgumentException(jpaFile.toString());
-		}
-	}
-
-
-	// ********** context model **********
-
-	public JpaRootContextNode getRootContextNode() {
-		return this.rootContextNode;
-	}
-
-
-	// ********** more queries **********
-
-	protected Iterator<JpaFile> javaJpaFiles() {
-		return this.jpaFiles(JptCorePlugin.JAVA_SOURCE_CONTENT_TYPE);
-	}
-
-	protected Iterator<JavaResourceCompilationUnit> javaResourceCompilationUnits() {
-		return new TransformationIterator<JpaFile, JavaResourceCompilationUnit>(this.javaJpaFiles()) {
-			@Override
-			protected JavaResourceCompilationUnit transform(JpaFile jpaFile) {
-				return (JavaResourceCompilationUnit) jpaFile.getResourceModel();
-			}
-		};
-	}
-
-	public Iterator<String> annotatedClassNames() {
-		return new TransformationIterator<JavaResourcePersistentType, String>(this.persistedJavaResourcePersistentTypes()) {
-			@Override
-			protected String transform(JavaResourcePersistentType jrpt) {
-				return jrpt.getQualifiedName();
-			}
-		};
-	}
-	
-	protected Iterator<JavaResourcePersistentType> persistedJavaResourcePersistentTypes() {
-		return new FilteringIterator<JavaResourcePersistentType, JavaResourcePersistentType>(this.persistableJavaResourcePersistentTypes()) {
-			@Override
-			protected boolean accept(JavaResourcePersistentType jrpt) {
-				return jrpt.isPersisted();
-			}
-		};
-	}
-	
-	protected Iterator<JavaResourcePersistentType> persistableJavaResourcePersistentTypes() {
-		return new CompositeIterator<JavaResourcePersistentType>(this.persistableJavaResourcePersistentTypeIterators());
-	}
-
-	protected Iterator<Iterator<JavaResourcePersistentType>> persistableJavaResourcePersistentTypeIterators() {
-		return new TransformationIterator<JavaResourceCompilationUnit, Iterator<JavaResourcePersistentType>>(this.javaResourceCompilationUnits()) {
-			@Override
-			protected Iterator<JavaResourcePersistentType> transform(JavaResourceCompilationUnit compilationUnit) {
-				return compilationUnit.persistableTypes();
-			}
-		};
-	}
-
-	public JavaResourcePersistentType getJavaResourcePersistentType(String typeName) {
-		for (Iterator<JavaResourcePersistentType> stream = this.persistableJavaResourcePersistentTypes(); stream.hasNext(); ) {
-			JavaResourcePersistentType pt =  stream.next();
-			if (pt.getQualifiedName().equals(typeName)) {
-				return pt;
-			}
-		}
-//		this.javaProject().findType(typeName);
-		return null;
-	}
-
-
-	// ********** Java change **********
-
-	public void javaElementChanged(ElementChangedEvent event) {
-		this.synchWithJavaDelta(event.getDelta());
-	}
-
-	/**
-	 * We recurse back here when processing 'affectedChildren'.
-	 */
-	protected void synchWithJavaDelta(IJavaElementDelta delta) {
-		switch (delta.getElement().getElementType()) {
-			case IJavaElement.JAVA_MODEL :
-				this.javaModelChanged(delta);
-				break;
-			case IJavaElement.JAVA_PROJECT :
-				this.javaProjectChanged(delta);
-				break;
-			case IJavaElement.PACKAGE_FRAGMENT_ROOT :
-				this.javaPackageFragmentRootChanged(delta);
-				break;
-			case IJavaElement.PACKAGE_FRAGMENT :
-				this.javaPackageFragmentChanged(delta);
-				break;
-			case IJavaElement.COMPILATION_UNIT :
-				this.javaCompilationUnitChanged(delta);
-				break;
-			default :
-				break; // ignore the elements inside a compilation unit
-		}
-	}
-
-	// ***** model
-	protected void javaModelChanged(IJavaElementDelta delta) {
-		// process the java model's projects
-		this.synchWithJavaDeltaChildren(delta);
-	}
-
-	protected void synchWithJavaDeltaChildren(IJavaElementDelta delta) {
-		for (IJavaElementDelta child : delta.getAffectedChildren()) {
-			this.synchWithJavaDelta(child); // recurse
-		}
-	}
-
-	// ***** project
-	protected void javaProjectChanged(IJavaElementDelta delta) {
-		if ( ! delta.getElement().equals(this.getJavaProject())) {
-			return;  // ignore
-		}
-
-		// process the java project's package fragment roots
-		this.synchWithJavaDeltaChildren(delta);
-
-		if (this.classpathHasChanged(delta)) {
-			// the jars were processed above, now force all the JPA files to update
-			this.updateFromJava();
-		}
-	}
-
-	protected boolean classpathHasChanged(IJavaElementDelta delta) {
-		return BitTools.flagIsSet(delta.getFlags(), IJavaElementDelta.F_RESOLVED_CLASSPATH_CHANGED);
-	}
-
-	protected void updateFromJava() {
-		for (Iterator<JavaResourceCompilationUnit> stream = this.javaResourceCompilationUnits(); stream.hasNext(); ) {
-			stream.next().update();
-		}
-	}
-
-	// ***** package fragment root
-	protected void javaPackageFragmentRootChanged(IJavaElementDelta delta) {
-		// process the java package fragment root's package fragments
-		this.synchWithJavaDeltaChildren(delta);
-
-		if (this.classpathEntryHasBeenAdded(delta)) {
-			this.dump(delta);
-		} else if (this.classpathEntryHasBeenRemoved(delta)) {  // should be mutually-exclusive w/added (?)
-			
-		}
-	}
-
-	protected void dump(IJavaElementDelta delta) {
-//		try {
-//			this.dump_(delta);
-//		} catch (JavaModelException ex) {
-//			throw new RuntimeException(ex);
-//		}
-	}
-
-//	protected void remove() {
-//		removeDump_();
-//	}
-//	@SuppressWarnings("nls")
-//	protected void dump_(IJavaElementDelta delta) throws JavaModelException {
-//		System.out.println(delta);
-//		IPackageFragmentRoot pfr = (IPackageFragmentRoot) delta.getElement();
-//			IFile file = (IFile) pfr.getResource();
-//			System.out.println("file: " + file.getFullPath());
-//			System.out.println("content type: " + PlatformTools.getContentType(file));
-//		System.out.println("kind: " + this.getKindString(pfr));
-//		System.out.println("archive: " + pfr.isArchive());
-//		System.out.println("external: " + pfr.isExternal());
-//		for (IJavaElement pf : pfr.getChildren()) {
-//			System.out.println("\tpackage fragment: " + pf);
-//			for (IJavaElement classFile : ((IPackageFragment) pf).getChildren()) {
-//				System.out.println("\t\tclass file: " + classFile);
-//				IType type = ((IClassFile) classFile).getType();
-//				System.out.println("\t\t\ttype: " + type);
-//				this.dumpAnnotations(type);
-//				for (IField field : type.getFields()) {
-//					System.out.println("\t\t\t\tfield: " + field);
-//					this.dumpAnnotations(field);
-//				}
-//				for (IMethod method : type.getMethods()) {
-//					System.out.println("\t\t\t\tmethod: " + method);
-//					this.dumpAnnotations(method);
-//				}
-//			}
-//		}
-//		System.out.flush();
-//	}
-//
-	@SuppressWarnings("nls")
-	protected String getKindString(IPackageFragmentRoot pfr) throws JavaModelException {
-		switch (pfr.getKind()) {
-			case IPackageFragmentRoot.K_BINARY:
-				return "BINARY";
-			case IPackageFragmentRoot.K_SOURCE:
-				return "SOURCE";
-			default:
-				return "[UNKNOWN]";
-		}
-	}
-
-	@SuppressWarnings("nls")
-	protected void dumpAnnotations(IAnnotatable annotatable) throws JavaModelException {
-		for (IAnnotation annotation : annotatable.getAnnotations()) {
-			System.out.println("\t\t\t\t\tannotation: " + annotation);
-		}
-	}
-
-	protected boolean classpathEntryHasBeenAdded(IJavaElementDelta delta) {
-		return BitTools.flagIsSet(delta.getFlags(), IJavaElementDelta.F_ADDED_TO_CLASSPATH);
-	}
-
-	protected boolean classpathEntryHasBeenRemoved(IJavaElementDelta delta) {
-		return BitTools.flagIsSet(delta.getFlags(), IJavaElementDelta.F_REMOVED_FROM_CLASSPATH);
-	}
-
-	// ***** package fragment
-	protected void javaPackageFragmentChanged(IJavaElementDelta delta) {
-		// process the java package fragment's compilation units
-		this.synchWithJavaDeltaChildren(delta);
+		super(config);
 	}
-
-	// ***** compilation unit
-	protected void javaCompilationUnitChanged(IJavaElementDelta delta) {
-		if (this.javaCompilationUnitDeltaIsRelevant(delta)) {
-			ICompilationUnit compilationUnit = (ICompilationUnit) delta.getElement();
-			for (Iterator<JavaResourceCompilationUnit> stream = this.javaResourceCompilationUnits(); stream.hasNext(); ) {
-				JavaResourceCompilationUnit jrcu = stream.next();
-				if (jrcu.getCompilationUnit().equals(compilationUnit)) {
-					jrcu.update();
-					break;  // there *shouldn't* be any more...
-				}
-			}
-		}
-		// ignore the java compilation unit's children
-	}
-
-	protected boolean javaCompilationUnitDeltaIsRelevant(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 false;
-		}
-
-		// ignore java notification for ADDED or REMOVED;
-		// these are handled via resource notification
-		return delta.getKind() == IJavaElementDelta.CHANGED;
-	}
-
-
-	// ********** validation **********
-	
-	public Iterator<IMessage> validationMessages() {
-		List<IMessage> messages = new ArrayList<IMessage>();
-		this.validate(messages);
-		return messages.iterator();
-	}
-	
-	protected void validate(List<IMessage> messages) {
-		this.validateConnection(messages);
-		this.rootContextNode.validate(messages);
-	}
-
-	protected void validateConnection(List<IMessage> messages) {
-		String cpName = this.dataSource.getConnectionProfileName();
-		if (StringTools.stringIsEmpty(cpName)) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.NORMAL_SEVERITY,
-					JpaValidationMessages.PROJECT_NO_CONNECTION,
-					this
-				)
-			);
-			return;
-		}
-		ConnectionProfile cp = this.dataSource.getConnectionProfile();
-		if (cp == null) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.NORMAL_SEVERITY,
-					JpaValidationMessages.PROJECT_INVALID_CONNECTION,
-					new String[] {cpName},
-					this
-				)
-			);
-			return;
-		}
-		if (cp.isInactive()) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.NORMAL_SEVERITY,
-					JpaValidationMessages.PROJECT_INACTIVE_CONNECTION,
-					new String[] {cpName},
-					this
-				)
-			);
-		}
-	}
-	
-	
-	// ********** dispose **********
-
-	public void dispose() {
-		this.updater.stop();
-		this.dataSource.dispose();
-	}
-
-
-	// ********** resource model listener **********
-
-	protected class DefaultResourceModelListener implements JpaResourceModelListener {
-		protected DefaultResourceModelListener() {
-			super();
-		}
-		public void resourceModelChanged() {
-			GenericJpaProject.this.update();
-		}
-	}
-
-
-	// ********** handling resource deltas **********
-
-	public void projectChanged(IResourceDelta delta) throws CoreException {
-		ResourceDeltaVisitor resourceDeltaVisitor = this.buildResourceDeltaVisitor();
-		delta.accept(resourceDeltaVisitor);
-		if (resourceDeltaVisitor.jpaFilesChanged()) {
-			for (Iterator<JavaResourceCompilationUnit> stream = this.javaResourceCompilationUnits(); stream.hasNext(); ) {
-				stream.next().resolveTypes();
-			}
-		}
-	}
-
-	protected ResourceDeltaVisitor buildResourceDeltaVisitor() {
-		return new ResourceDeltaVisitor();
-	}
-
-	/**
-	 * 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 or remove 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
-			}
-		}
-
-		/**
-		 * Return whether the collection of JPA files was modified while
-		 * traversing the IResourceDelta (i.e. a JPA file was added or removed).
-		 */
-		protected boolean jpaFilesChanged() {
-			return this.jpaFilesChanged;
-		}
-
-	}
-
-
-	// ********** support for modifying documents shared with the UI **********
-
-	public void setThreadLocalModifySharedDocumentCommandExecutor(CommandExecutor commandExecutor) {
-		this.modifySharedDocumentCommandExecutor.set(commandExecutor);
-	}
-
-	public CommandExecutor getModifySharedDocumentCommandExecutor() {
-		return this.modifySharedDocumentCommandExecutor;
-	}
-
-
-	// ********** project "update" **********
-
-	public Updater getUpdater() {
-		return this.updater;
-	}
-
-	public void setUpdater(Updater updater) {
-		if (updater == null) {
-			throw new NullPointerException();
-		}
-		this.updater.stop();
-		this.setUpdater_(updater);
-	}
-
-	protected void setUpdater_(Updater updater) {
-		this.updater = updater;
-		this.updater.start();
-	}
-
-	/**
-	 * Delegate to the updater so clients can configure how updates occur.
-	 */
-	public void update() {
-		this.updater.update();
-	}
-
-	/**
-	 * Called by the updater.
-	 */
-	public IStatus update(IProgressMonitor monitor) {
-		try {
-			this.rootContextNode.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/JavaResourceModelProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JavaResourceModelProvider.java
index 7d5297c816..b518dcf50b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JavaResourceModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JavaResourceModelProvider.java
@@ -13,10 +13,10 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.JpaResourceModel;
 import org.eclipse.jpt.core.JpaResourceModelProvider;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.internal.resource.java.JavaResourceCompilationUnitImpl;
+import org.eclipse.jpt.core.resource.java.JavaResourceCompilationUnit;
 
 /**
  * Java source code
@@ -45,7 +45,7 @@ public class JavaResourceModelProvider
 		return JptCorePlugin.JAVA_SOURCE_CONTENT_TYPE;
 	}
 
-	public JpaResourceModel buildResourceModel(JpaProject jpaProject, IFile file) {
+	public JavaResourceCompilationUnit buildResourceModel(JpaProject jpaProject, IFile file) {
 		return new JavaResourceCompilationUnitImpl(
 					JavaCore.createCompilationUnitFrom(file),
 					jpaProject.getJpaPlatform().getAnnotationProvider(),
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/OrmResourceModelProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/OrmResourceModelProvider.java
index fe4faddac0..43029bd148 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/OrmResourceModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/OrmResourceModelProvider.java
@@ -12,10 +12,10 @@ package org.eclipse.jpt.core.internal;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.JpaResourceModel;
 import org.eclipse.jpt.core.JpaResourceModelProvider;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.internal.resource.orm.OrmXmlResourceProvider;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 
 /**
  * orm.xml
@@ -44,7 +44,7 @@ public class OrmResourceModelProvider
 		return JptCorePlugin.ORM_XML_CONTENT_TYPE;
 	}
 
-	public JpaResourceModel buildResourceModel(JpaProject jpaProject, IFile file) {
+	public JpaXmlResource buildResourceModel(JpaProject jpaProject, IFile file) {
 		return OrmXmlResourceProvider.getXmlResourceProvider(file).getXmlResource();
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/PersistenceResourceModelProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/PersistenceResourceModelProvider.java
index 5f3fed1b29..68ab617d7d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/PersistenceResourceModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/PersistenceResourceModelProvider.java
@@ -12,10 +12,10 @@ package org.eclipse.jpt.core.internal;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.JpaResourceModel;
 import org.eclipse.jpt.core.JpaResourceModelProvider;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.internal.resource.persistence.PersistenceXmlResourceProvider;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 
 /**
  * persistence.xml
@@ -44,7 +44,7 @@ public class PersistenceResourceModelProvider
 		return JptCorePlugin.PERSISTENCE_XML_CONTENT_TYPE;
 	}
 
-	public JpaResourceModel buildResourceModel(JpaProject jpaProject, IFile file) {
+	public JpaXmlResource buildResourceModel(JpaProject jpaProject, IFile file) {
 		return PersistenceXmlResourceProvider.getXmlResourceProvider(file).getXmlResource();
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/GenericMappingFileProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/GenericMappingFileProvider.java
index 6566d5d9e2..1c9ee96d4d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/GenericMappingFileProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/GenericMappingFileProvider.java
@@ -9,11 +9,13 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.internal.context;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
+import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.context.MappingFile;
 import org.eclipse.jpt.core.context.MappingFileProvider;
 import org.eclipse.jpt.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 
 public class GenericMappingFileProvider
 	implements MappingFileProvider
@@ -35,11 +37,11 @@ public class GenericMappingFileProvider
 		super();
 	}
 
-	public String getResourceType() {
-		return OrmXmlResource.TYPE;
+	public IContentType getContentType() {
+		return JptCorePlugin.ORM_XML_CONTENT_TYPE;
 	}
 
-	public MappingFile buildMappingFile(MappingFileRef parent, OrmXmlResource resource, JpaFactory factory) {
+	public MappingFile buildMappingFile(MappingFileRef parent, JpaXmlResource resource, JpaFactory factory) {
 		return factory.buildMappingFile(parent, resource);
 	}
 
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
index 91c5bf79dd..4921f0c246 100644
--- 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
@@ -10,10 +10,9 @@
 package org.eclipse.jpt.core.internal.context;
 
 import java.util.List;
-
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 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;
@@ -22,15 +21,13 @@ import org.eclipse.jpt.core.context.MappingFileRoot;
 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.resource.persistence.PersistenceXmlResourceProvider;
 import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
 import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.java.JavaResourceCompilationUnit;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.resource.persistence.PersistenceXmlResource;
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.jpt.utility.internal.HashBag;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 
 public class GenericRootContextNode
@@ -50,15 +47,12 @@ public class GenericRootContextNode
 			throw new NullPointerException();
 		}
 		this.jpaProject = jpaProject;
-		
-		PersistenceXmlResourceProvider modelProvider =
-			PersistenceXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
-		PersistenceXmlResource resource = modelProvider.getXmlResource();
-		if (resource.exists()) {
-			this.persistenceXml = this.buildPersistenceXml(resource);
+		JpaXmlResource resource = getPersistenceXmlResource();
+		if (resource != null) {
+			this.persistenceXml = buildPersistenceXml(resource);
 		}
 	}
-	
+
 	@Override
 	protected boolean requiresParent() {
 		return false;
@@ -109,52 +103,13 @@ public class GenericRootContextNode
 		this.firePropertyChanged(PERSISTENCE_XML_PROPERTY, old, persistenceXml);
 	}
 	
-	public PersistenceXml addPersistenceXml() {
-		if (this.persistenceXml != null) {
-			throw new IllegalStateException();
-		}
-		PersistenceXmlResourceProvider modelProvider =
-			PersistenceXmlResourceProvider.getDefaultXmlResourceProvider(this.getProject());
-		PersistenceXmlResource resource = modelProvider.getXmlResource();
-		modelProvider.modify(new Runnable() {
-				public void run() {
-					// any modification will save file
-				}
-			});
-		PersistenceXml px = this.buildPersistenceXml(resource);
-		this.setPersistenceXml(px);
-		return px;
-	}
-	
-	public void removePersistenceXml() {
-		if (this.persistenceXml == null) {
-			throw new IllegalStateException();
-		}
-		this.persistenceXml.dispose();
-		PersistenceXmlResourceProvider modelProvider =
-			PersistenceXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
-		PersistenceXmlResource resource = modelProvider.getXmlResource();
-		try {
-			WorkbenchResourceHelper.deleteResource(resource);
-		}
-		catch (CoreException ce) {
-			JptCorePlugin.log(ce);
-		}
-		
-		if (! resource.exists()) {
-			setPersistenceXml(null);
-		}
-	}
-	
 	
 	// **************** updating ***********************************************
 	
 	public void update(IProgressMonitor monitor) {
-		PersistenceXmlResourceProvider modelProvider =
-			PersistenceXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
-		PersistenceXmlResource resource = modelProvider.getXmlResource();
+		JpaXmlResource resource = getPersistenceXmlResource();
 		
-		if (resource.exists()) {
+		if (resource != null) {
 			if (this.persistenceXml == null) {
 				this.setPersistenceXml(this.buildPersistenceXml(resource));
 			} else {
@@ -164,9 +119,17 @@ public class GenericRootContextNode
 			this.setPersistenceXml(null);
 		}
 	}
-
-	protected PersistenceXml buildPersistenceXml(PersistenceXmlResource persistenceResource) {
-		return this.getJpaFactory().buildPersistenceXml(this, persistenceResource);
+	
+	protected JpaXmlResource getPersistenceXmlResource() {
+		return this.jpaProject.getPersistenceXmlResource();
+	}
+	
+	protected IFile getPlatformFile() {
+		return JptCorePlugin.getPlatformFile(this.jpaProject.getProject(), JptCorePlugin.DEFAULT_PERSISTENCE_XML_FILE_PATH);
+	}
+	
+	protected PersistenceXml buildPersistenceXml(JpaXmlResource resource) {
+		return this.getJpaFactory().buildPersistenceXml(this, resource);
 	}
 	
 	
@@ -174,10 +137,16 @@ public class GenericRootContextNode
 	
 	public void validate(List<IMessage> messages) {
 		if (this.persistenceXml == null) {
+			IFile platformFile = this.getPlatformFile();
+			String msgID = platformFile.exists() ?
+					JpaValidationMessages.PERSISTENCE_XML_INVALID_CONTENT
+				:
+					JpaValidationMessages.PROJECT_NO_PERSISTENCE_XML;
+
 			messages.add(
 				DefaultJpaValidationMessages.buildMessage(
 					IMessage.HIGH_SEVERITY, 
-					JpaValidationMessages.PROJECT_NO_PERSISTENCE_XML,
+					msgID,
 					this
 				)
 			);
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractEntityMappings.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractEntityMappings.java
new file mode 100644
index 0000000000..ae60dad2f5
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractEntityMappings.java
@@ -0,0 +1,938 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2009 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.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.core.runtime.content.IContentType;
+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.MappingFileRoot;
+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.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.OrmPersistenceUnitDefaults;
+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.OrmTableGenerator;
+import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
+import org.eclipse.jpt.core.context.orm.OrmXml;
+import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata;
+import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
+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.XmlEntityMappings;
+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.resource.orm.XmlTypeMapping;
+import org.eclipse.jpt.core.utility.TextRange;
+import org.eclipse.jpt.db.Catalog;
+import org.eclipse.jpt.db.Schema;
+import org.eclipse.jpt.db.SchemaContainer;
+import org.eclipse.jpt.utility.internal.CollectionTools;
+import org.eclipse.jpt.utility.internal.iterators.CloneIterator;
+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 abstract class AbstractEntityMappings
+	extends AbstractXmlContextNode
+	implements EntityMappings
+{
+	protected XmlEntityMappings xmlEntityMappings;
+	
+	protected String description;
+
+	protected String package_;
+
+	protected AccessType specifiedAccess;
+	protected AccessType defaultAccess;
+		
+	protected String specifiedCatalog;
+	protected String defaultCatalog;
+
+	protected String specifiedSchema;
+	protected String defaultSchema;
+
+	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;
+
+
+	protected AbstractEntityMappings(OrmXml parent) {
+		super(parent);
+		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>();
+	}
+	
+	
+	// **************** JpaNode impl *******************************************
+	
+	@Override
+	public OrmXml getParent() {
+		return (OrmXml) super.getParent();
+	}
+
+	protected OrmXml getOrmXml() {
+		return this.getParent();
+	}
+	
+	
+	// **************** JpaContextNode impl ************************************
+	
+	@Override
+	public MappingFileRoot getMappingFileRoot() {
+		return this;
+	}
+	
+	
+	// **************** JpaStructureNode impl **********************************
+	
+	public String getId() {
+		return ENTITY_MAPPINGS_ID;
+	}
+	
+	
+	// ********** PersistentType.Owner implementation **********
+
+	public AccessType getOverridePersistentTypeAccess() {
+		return this.isXmlMappingMetadataComplete() ? this.getSpecifiedAccess() : null;
+	}
+
+	public AccessType getDefaultPersistentTypeAccess() {
+		return getAccess();
+	}
+	
+	public String getDefaultPersistentTypePackage() {
+		return getPackage();
+	}
+	
+	protected boolean isXmlMappingMetadataComplete() {
+		return this.getPersistenceUnitMetadata().isXmlMappingMetadataComplete();
+	}
+	
+	public boolean isDefaultPersistentTypeMetadataComplete() {
+		return this.isXmlMappingMetadataComplete();
+	}
+	
+	
+	// **************** EntityMappings impl ************************************
+	
+	public XmlEntityMappings getXmlEntityMappings() {
+		return this.xmlEntityMappings;
+	}
+	
+	public void changeMapping(OrmPersistentType ormPersistentType, OrmTypeMapping oldMapping, OrmTypeMapping newMapping) {
+		AccessType specifiedAccess = ormPersistentType.getSpecifiedAccess();
+		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);
+		//not sure where else to put this, need to set the access on the resource model
+		ormPersistentType.setSpecifiedAccess(specifiedAccess);
+		fireItemMoved(PERSISTENT_TYPES_LIST, targetIndex, sourceIndex);
+	}
+	
+	public OrmPersistentType getPersistentType(String fullyQualifiedTypeName) {
+		for (OrmPersistentType ormPersistentType : CollectionTools.iterable(persistentTypes())) {
+			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.xmlEntityMappings.getVersion();
+	}
+
+	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);
+	}
+
+
+	// ********** access **********
+
+	public AccessType getAccess() {
+		return (this.specifiedAccess != null) ? this.specifiedAccess : this.defaultAccess;
+	}
+
+	public AccessType getSpecifiedAccess() {
+		return this.specifiedAccess;
+	}
+
+	public void setSpecifiedAccess(AccessType access) {
+		AccessType old = this.specifiedAccess;
+		this.specifiedAccess = access;
+		this.xmlEntityMappings.setAccess(AccessType.toXmlResourceModel(access));
+		this.firePropertyChanged(SPECIFIED_ACCESS_PROPERTY, old, access);
+	}
+
+	public AccessType getDefaultAccess() {
+		return this.defaultAccess;
+	}
+
+	protected void setDefaultAccess(AccessType access) {
+		AccessType old = this.defaultAccess;
+		this.defaultAccess = access;
+		this.firePropertyChanged(DEFAULT_ACCESS_PROPERTY, old, access);
+	}
+
+
+	// ********** schema **********
+
+	public String getSchema() {
+		return (this.specifiedSchema != null) ? this.specifiedSchema : this.defaultSchema;
+	}
+
+	public String getSpecifiedSchema() {
+		return this.specifiedSchema;
+	}
+
+	public void setSpecifiedSchema(String schema) {
+		String old = this.specifiedSchema;
+		this.specifiedSchema = schema;
+		this.xmlEntityMappings.setSchema(schema);
+		this.firePropertyChanged(SPECIFIED_SCHEMA_PROPERTY, old, schema);
+	}
+
+	public String getDefaultSchema() {
+		return this.defaultSchema;
+	}
+
+	protected void setDefaultSchema(String schema) {
+		String old = this.defaultSchema;
+		this.defaultSchema = schema;
+		this.firePropertyChanged(DEFAULT_SCHEMA_PROPERTY, old, schema);
+	}
+
+	public Schema getDbSchema() {
+		SchemaContainer dbSchemaContainer = this.getDbSchemaContainer();
+		return (dbSchemaContainer == null) ? null : dbSchemaContainer.getSchemaForIdentifier(this.getSchema());
+	}
+
+
+	// ********** catalog **********
+
+	public String getCatalog() {
+		return (this.specifiedCatalog != null) ? this.specifiedCatalog : this.defaultCatalog;
+	}
+	
+	public String getSpecifiedCatalog() {
+		return this.specifiedCatalog;
+	}
+
+	public void setSpecifiedCatalog(String catalog) {
+		String old = this.specifiedCatalog;
+		this.specifiedCatalog = catalog;
+		this.xmlEntityMappings.setCatalog(catalog);
+		this.firePropertyChanged(SPECIFIED_CATALOG_PROPERTY, old, catalog);
+	}
+
+	public String getDefaultCatalog() {
+		return this.defaultCatalog;
+	}
+
+	protected void setDefaultCatalog(String catalog) {
+		String old = this.defaultCatalog;
+		this.defaultCatalog = catalog;
+		this.firePropertyChanged(DEFAULT_CATALOG_PROPERTY, old, catalog);
+	}
+
+	public Catalog getDbCatalog() {
+		String catalog = this.getCatalog();
+		if (catalog == null) {
+			return null;  // not even a default catalog (i.e. database probably does not support catalogs)
+		}
+		return this.getDbCatalog(catalog);
+	}
+
+
+	// ********** schema container **********
+
+	/**
+	 * If we don't have a catalog (i.e. we don't even have a *default* catalog),
+	 * then the database probably does not support catalogs; and we need to
+	 * get the schema directly from the database.
+	 */
+	public SchemaContainer getDbSchemaContainer() {
+		String catalog = this.getCatalog();
+		return (catalog != null) ? this.getDbCatalog(catalog) : this.getDatabase();
+	}
+
+
+	// ********** ORM persistent types **********
+
+	public ListIterator<OrmPersistentType> persistentTypes() {
+		return new CloneListIterator<OrmPersistentType>(this.persistentTypes);
+	}
+	
+	public int persistentTypesSize() {
+		return this.persistentTypes.size();
+	}
+	
+	public OrmPersistentType addPersistentType(String mappingKey, String className) {
+		OrmPersistentType persistentType = buildPersistentType(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);
+		}
+		XmlTypeMapping typeMapping = persistentType.getMapping().addToResourceModel(this.xmlEntityMappings);
+		typeMapping.setClassName(className);
+		fireItemAdded(PERSISTENT_TYPES_LIST, index, persistentType);
+		return persistentType;
+	}
+	
+	protected abstract OrmPersistentType buildPersistentType(String mappingKey);
+
+	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 removePersistentType(int index) {
+		OrmPersistentType persistentType = this.persistentTypes.get(index);
+		persistentType.dispose();
+		this.persistentTypes.remove(index);
+		persistentType.getMapping().removeFromResourceModel(this.xmlEntityMappings);
+		fireItemRemoved(PERSISTENT_TYPES_LIST, index, persistentType);		
+	}
+	
+	public void removePersistentType(OrmPersistentType persistentType) {
+		removePersistentType(this.persistentTypes.indexOf(persistentType));	
+	}
+	
+	protected void removePersistentType_(OrmPersistentType persistentType) {
+		persistentType.dispose();
+		removeItemFromList(persistentType, this.persistentTypes, PERSISTENT_TYPES_LIST);
+	}
+	
+	protected void movePersistentType_(int index, OrmPersistentType persistentType) {
+		moveItemInList(index, this.persistentTypes.indexOf(persistentType), this.persistentTypes, PERSISTENT_TYPES_LIST);
+	}
+
+
+	// ********** sequence generators **********
+
+	public ListIterator<OrmSequenceGenerator> sequenceGenerators() {
+		return new CloneListIterator<OrmSequenceGenerator>(this.sequenceGenerators);
+	}
+	
+	public int sequenceGeneratorsSize() {
+		return this.sequenceGenerators.size();
+	}
+	
+	public OrmSequenceGenerator addSequenceGenerator(int index) {
+		XmlSequenceGenerator resourceSequenceGenerator = OrmFactory.eINSTANCE.createXmlSequenceGeneratorImpl();
+		OrmSequenceGenerator contextSequenceGenerator =  buildSequenceGenerator(resourceSequenceGenerator);
+		this.sequenceGenerators.add(index, contextSequenceGenerator);
+		this.xmlEntityMappings.getSequenceGenerators().add(index, resourceSequenceGenerator);
+		fireItemAdded(SEQUENCE_GENERATORS_LIST, index, contextSequenceGenerator);
+		return contextSequenceGenerator;
+	}
+
+	protected void addSequenceGenerator(int index, OrmSequenceGenerator sequenceGenerator) {
+		addItemToList(index, sequenceGenerator, this.sequenceGenerators, EntityMappings.SEQUENCE_GENERATORS_LIST);
+	}
+
+	protected void addSequenceGenerator(OrmSequenceGenerator sequenceGenerator) {
+		this.addSequenceGenerator(this.sequenceGenerators.size(), sequenceGenerator);
+	}
+
+	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);	
+	}
+	
+
+	// ********** table generators **********
+
+	public ListIterator<OrmTableGenerator> tableGenerators() {
+		return new CloneListIterator<OrmTableGenerator>(this.tableGenerators);
+	}
+
+	public int tableGeneratorsSize() {
+		return this.tableGenerators.size();
+	}
+	
+	public OrmTableGenerator addTableGenerator(int index) {
+		XmlTableGenerator resourceTableGenerator = OrmFactory.eINSTANCE.createXmlTableGeneratorImpl();
+		OrmTableGenerator contextTableGenerator = buildTableGenerator(resourceTableGenerator);
+		this.tableGenerators.add(index, contextTableGenerator);
+		this.xmlEntityMappings.getTableGenerators().add(index, resourceTableGenerator);
+		fireItemAdded(TABLE_GENERATORS_LIST, index, contextTableGenerator);
+		return contextTableGenerator;
+	}
+	
+	protected void addTableGenerator(int index, OrmTableGenerator tableGenerator) {
+		addItemToList(index, tableGenerator, this.tableGenerators, EntityMappings.TABLE_GENERATORS_LIST);
+	}
+
+	protected void addTableGenerator(OrmTableGenerator tableGenerator) {
+		this.addTableGenerator(this.tableGenerators.size(), tableGenerator);
+	}
+
+	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);	
+	}
+
+
+	// ********** named queries **********
+
+	public ListIterator<OrmNamedQuery> namedQueries() {
+		return new CloneListIterator<OrmNamedQuery>(this.namedQueries);
+	}
+	
+	public int namedQueriesSize() {
+		return this.namedQueries.size();
+	}
+	
+	public OrmNamedQuery addNamedQuery(int index) {
+		XmlNamedQuery resourceNamedQuery = OrmFactory.eINSTANCE.createXmlNamedQuery();
+		OrmNamedQuery contextNamedQuery = buildNamedQuery(resourceNamedQuery);
+		this.namedQueries.add(index, contextNamedQuery);
+		this.xmlEntityMappings.getNamedQueries().add(index, resourceNamedQuery);
+		this.fireItemAdded(NAMED_QUERIES_LIST, index, contextNamedQuery);
+		return contextNamedQuery;
+	}
+	
+	protected void addNamedQuery(int index, OrmNamedQuery namedQuery) {
+		addItemToList(index, namedQuery, this.namedQueries, NAMED_QUERIES_LIST);
+	}
+	
+	protected void addNamedQuery(OrmNamedQuery namedQuery) {
+		this.addNamedQuery(this.namedQueries.size(), namedQuery);
+	}
+	
+	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(NAMED_QUERIES_LIST, index, namedQuery);
+	}
+
+	protected void removeNamedQuery_(OrmNamedQuery namedQuery) {
+		removeItemFromList(namedQuery, this.namedQueries, NAMED_QUERIES_LIST);
+	}
+	
+	public void moveNamedQuery(int targetIndex, int sourceIndex) {
+		this.xmlEntityMappings.getNamedQueries().move(targetIndex, sourceIndex);
+		moveItemInList(targetIndex, sourceIndex, this.namedQueries, NAMED_QUERIES_LIST);		
+	}
+	
+
+	// ********** named native queries **********
+
+	public ListIterator<OrmNamedNativeQuery> namedNativeQueries() {
+		return new CloneListIterator<OrmNamedNativeQuery>(this.namedNativeQueries);
+	}
+	
+	public int namedNativeQueriesSize() {
+		return this.namedNativeQueries.size();
+	}
+	
+	public OrmNamedNativeQuery addNamedNativeQuery(int index) {
+		XmlNamedNativeQuery resourceNamedNativeQuery = OrmFactory.eINSTANCE.createXmlNamedNativeQuery();
+		OrmNamedNativeQuery namedNativeQuery = buildNamedNativeQuery(resourceNamedNativeQuery);
+		this.namedNativeQueries.add(index, namedNativeQuery);
+		this.xmlEntityMappings.getNamedNativeQueries().add(index, resourceNamedNativeQuery);
+		this.fireItemAdded(NAMED_NATIVE_QUERIES_LIST, index, namedNativeQuery);
+		return namedNativeQuery;
+	}
+	
+	protected void addNamedNativeQuery(int index, OrmNamedNativeQuery namedNativeQuery) {
+		addItemToList(index, namedNativeQuery, this.namedNativeQueries, NAMED_NATIVE_QUERIES_LIST);
+	}
+	
+	protected void addNamedNativeQuery(OrmNamedNativeQuery namedNativeQuery) {
+		this.addNamedNativeQuery(this.namedNativeQueries.size(), namedNativeQuery);
+	}
+	
+	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(NAMED_NATIVE_QUERIES_LIST, index, namedNativeQuery);
+	}
+
+	protected void removeNamedNativeQuery_(OrmNamedNativeQuery namedNativeQuery) {
+		removeItemFromList(namedNativeQuery, this.namedNativeQueries, NAMED_NATIVE_QUERIES_LIST);
+	}
+	
+	public void moveNamedNativeQuery(int targetIndex, int sourceIndex) {
+		this.xmlEntityMappings.getNamedNativeQueries().move(targetIndex, sourceIndex);
+		moveItemInList(targetIndex, sourceIndex, this.namedNativeQueries, NAMED_NATIVE_QUERIES_LIST);		
+	}
+
+
+	// ********** misc **********
+
+	//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(persistentTypes())) {
+			if (persistentType.getName().equals(className)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public OrmPersistenceUnitDefaults getPersistenceUnitDefaults() {
+		return getPersistenceUnitMetadata().getPersistenceUnitDefaults();
+	}
+
+	public IContentType getContentType() {
+		return this.getOrmXml().getContentType();
+	}
+	
+
+	// ********** initialization **********
+
+	public void initialize(XmlEntityMappings entityMappings) {
+		this.xmlEntityMappings = entityMappings;
+		this.initialize();
+	}
+	
+	protected void initialize() {
+		this.persistenceUnitMetadata = getJpaFactory().buildPersistenceUnitMetadata(this, this.xmlEntityMappings);
+		this.description = this.xmlEntityMappings.getDescription();
+		this.package_ = this.xmlEntityMappings.getPackage();
+
+		this.defaultAccess = this.getPersistenceUnit().getDefaultAccess();
+		this.specifiedAccess = this.getResourceAccess();
+
+		this.defaultCatalog = this.getPersistenceUnit().getDefaultCatalog();
+		this.specifiedCatalog = this.xmlEntityMappings.getCatalog();
+
+		this.defaultSchema = this.getPersistenceUnit().getDefaultSchema();
+		this.specifiedSchema = this.xmlEntityMappings.getSchema();
+
+		this.initializePersistentTypes();
+		this.initializeTableGenerators();
+		this.initializeSequenceGenerators();
+		this.initializeNamedQueries();
+		this.initializeNamedNativeQueries();
+	}
+	
+	protected void initializePersistentTypes() {
+		for (XmlTypeMapping typeMapping : this.xmlEntityMappings.getTypeMappings()) {
+			addPersistentType(typeMapping);
+		}	
+	}
+	
+	protected void initializeTableGenerators() {
+		for (XmlTableGenerator tableGenerator : this.xmlEntityMappings.getTableGenerators()) {
+			this.tableGenerators.add(buildTableGenerator(tableGenerator));
+		}
+	}
+	
+	protected void initializeSequenceGenerators() {
+		for (XmlSequenceGenerator sequenceGenerator : this.xmlEntityMappings.getSequenceGenerators()) {
+			this.sequenceGenerators.add(buildSequenceGenerator(sequenceGenerator));
+		}
+	}
+	
+	protected void initializeNamedQueries() {
+		for (XmlNamedQuery namedQuery : this.xmlEntityMappings.getNamedQueries()) {
+			this.namedQueries.add(buildNamedQuery(namedQuery));
+		}
+	}
+	
+	protected void initializeNamedNativeQueries() {
+		for (XmlNamedNativeQuery namedNativeQuery : this.xmlEntityMappings.getNamedNativeQueries()) {
+			this.namedNativeQueries.add(buildNamedNativeQuery(namedNativeQuery));
+		}
+	}
+
+
+	// ********** update **********
+
+	public void update() {
+		this.setDescription(this.xmlEntityMappings.getDescription());
+		this.setPackage(this.xmlEntityMappings.getPackage());
+
+		this.setDefaultAccess(this.getPersistenceUnit().getDefaultAccess());
+		this.setSpecifiedAccess(this.getResourceAccess());
+
+		this.setDefaultCatalog(this.getPersistenceUnit().getDefaultCatalog());
+		this.setSpecifiedCatalog(this.xmlEntityMappings.getCatalog());
+
+		this.setDefaultSchema(this.getPersistenceUnit().getDefaultSchema());
+		this.setSpecifiedSchema(this.xmlEntityMappings.getSchema());
+
+		this.persistenceUnitMetadata.update();
+		this.updatePersistentTypes();
+		this.updateTableGenerators();
+		this.updateSequenceGenerators();
+		this.updateNamedQueries();
+		this.updateNamedNativeQueries();
+	}
+	
+	protected AccessType getResourceAccess() {
+		return AccessType.fromXmlResourceModel(this.xmlEntityMappings.getAccess());
+	}
+
+	protected void updatePersistentTypes() {
+		Collection<OrmPersistentType> contextTypesToRemove = CollectionTools.collection(persistentTypes());
+		Collection<OrmPersistentType> contextTypesToUpdate = new ArrayList<OrmPersistentType>();
+		int resourceIndex = 0;
+		
+		List<XmlTypeMapping> xmlTypeMappings = this.xmlEntityMappings.getTypeMappings();
+		for (XmlTypeMapping xmlTypeMapping : xmlTypeMappings.toArray(new XmlTypeMapping[xmlTypeMappings.size()])) {
+			boolean contextAttributeFound = false;
+			for (OrmPersistentType contextType : contextTypesToRemove) {
+				if (contextType.getMapping().getResourceTypeMapping() == xmlTypeMapping) {
+					movePersistentType_(resourceIndex, contextType);
+					contextTypesToRemove.remove(contextType);
+					contextTypesToUpdate.add(contextType);
+					contextAttributeFound = true;
+					break;
+				}
+			}
+			if (!contextAttributeFound) {
+				OrmPersistentType ormPersistentType = addPersistentType(xmlTypeMapping);
+				fireItemAdded(PERSISTENT_TYPES_LIST, persistentTypesSize(), ormPersistentType);
+			}
+			resourceIndex++;
+		}
+		for (OrmPersistentType contextType : contextTypesToRemove) {
+			removePersistentType_(contextType);
+		}
+		//first handle adding/removing of the persistent types, then update the others last, 
+		//this causes less churn in the update process
+		for (OrmPersistentType contextType : contextTypesToUpdate) {
+			contextType.update();
+		}	
+	}
+	
+	//not firing change notification so this can be reused in initialize and update
+	protected OrmPersistentType addPersistentType(XmlTypeMapping resourceMapping) {
+		OrmPersistentType ormPersistentType = buildPersistentType(resourceMapping.getMappingKey());
+		this.persistentTypes.add(ormPersistentType);
+		ormPersistentType.initialize(resourceMapping);
+		return ormPersistentType;
+	}
+	
+	protected void updateTableGenerators() {
+		// make a copy of the XML generators (to prevent ConcurrentModificationException)
+		Iterator<XmlTableGenerator> xmlGenerators = new CloneIterator<XmlTableGenerator>(this.xmlEntityMappings.getTableGenerators());
+
+		for (Iterator<OrmTableGenerator> contextGenerators = this.tableGenerators(); contextGenerators.hasNext(); ) {
+			OrmTableGenerator contextGenerator = contextGenerators.next();
+			if (xmlGenerators.hasNext()) {
+				contextGenerator.update(xmlGenerators.next());
+			}
+			else {
+				removeTableGenerator_(contextGenerator);
+			}
+		}
+		
+		while (xmlGenerators.hasNext()) {
+			addTableGenerator(buildTableGenerator(xmlGenerators.next()));
+		}
+	}
+
+	protected OrmTableGenerator buildTableGenerator(XmlTableGenerator resourceTableGenerator) {
+		return getJpaFactory().buildOrmTableGenerator(this, resourceTableGenerator);
+	}
+
+	protected void updateSequenceGenerators() {
+		// make a copy of the XML sequence generators (to prevent ConcurrentModificationException)
+		Iterator<XmlSequenceGenerator> xmlSequenceGenerators = new CloneIterator<XmlSequenceGenerator>(this.xmlEntityMappings.getSequenceGenerators());//prevent ConcurrentModificiationException
+
+		for (Iterator<OrmSequenceGenerator> contextSequenceGenerators = this.sequenceGenerators(); contextSequenceGenerators.hasNext(); ) {
+			OrmSequenceGenerator contextSequenceGenerator = contextSequenceGenerators.next();
+			if (xmlSequenceGenerators.hasNext()) {
+				contextSequenceGenerator.update(xmlSequenceGenerators.next());
+			}
+			else {
+				removeSequenceGenerator_(contextSequenceGenerator);
+			}
+		}
+		
+		while (xmlSequenceGenerators.hasNext()) {
+			addSequenceGenerator(buildSequenceGenerator(xmlSequenceGenerators.next()));
+		}
+	}
+
+	protected OrmSequenceGenerator buildSequenceGenerator(XmlSequenceGenerator resourceSequenceGenerator) {
+		return getJpaFactory().buildOrmSequenceGenerator(this, resourceSequenceGenerator);
+	}
+	
+	protected void updateNamedQueries() {
+		// make a copy of the XML queries (to prevent ConcurrentModificationException)
+		Iterator<XmlNamedQuery> xmlQueries = new CloneIterator<XmlNamedQuery>(this.xmlEntityMappings.getNamedQueries());
+		
+		for (Iterator<OrmNamedQuery> contextQueries = this.namedQueries(); contextQueries.hasNext(); ) {
+			OrmNamedQuery contextQuery = contextQueries.next();
+			if (xmlQueries.hasNext()) {
+				contextQuery.update(xmlQueries.next());
+			}
+			else {
+				removeNamedQuery_(contextQuery);
+			}
+		}
+		
+		while (xmlQueries.hasNext()) {
+			addNamedQuery(buildNamedQuery(xmlQueries.next()));
+		}
+	}
+
+	protected OrmNamedQuery buildNamedQuery(XmlNamedQuery resourceNamedQuery) {
+		return getJpaFactory().buildOrmNamedQuery(this, resourceNamedQuery);
+	}
+
+	protected void updateNamedNativeQueries() {
+		// make a copy of the XML queries (to prevent ConcurrentModificationException)
+		Iterator<XmlNamedNativeQuery> xmlQueries = new CloneIterator<XmlNamedNativeQuery>(this.xmlEntityMappings.getNamedNativeQueries());
+		
+		for (Iterator<OrmNamedNativeQuery> contextQueries = this.namedNativeQueries(); contextQueries.hasNext(); ) {
+			OrmNamedNativeQuery contextQuery = contextQueries.next();
+			if (xmlQueries.hasNext()) {
+				contextQuery.update(xmlQueries.next());
+			}
+			else {
+				removeNamedNativeQuery_(contextQuery);
+			}
+		}
+		
+		while (xmlQueries.hasNext()) {
+			addNamedNativeQuery(buildNamedNativeQuery(xmlQueries.next()));
+		}
+	}
+
+	protected OrmNamedNativeQuery buildNamedNativeQuery(XmlNamedNativeQuery resourceNamedQuery) {
+		return getJpaFactory().buildOrmNamedNativeQuery(this, resourceNamedQuery);
+	}
+
+
+	// ********** text **********
+
+	public JpaStructureNode getStructureNode(int textOffset) {
+		for (OrmPersistentType persistentType: CollectionTools.iterable(persistentTypes())) {
+			if (persistentType.contains(textOffset)) {
+				return persistentType.getStructureNode(textOffset);
+			}
+		}
+		return this;
+	}
+	
+	public boolean containsOffset(int textOffset) {
+		return (this.xmlEntityMappings != null) && this.xmlEntityMappings.containsOffset(textOffset);
+	}
+	
+	public TextRange getSelectionTextRange() {
+		return this.xmlEntityMappings.getSelectionTextRange();
+	}
+	
+	public TextRange getValidationTextRange() {
+		return null;
+	}
+	
+	
+	// ********** validation **********
+	
+	@Override
+	public void validate(List<IMessage> messages) {
+		super.validate(messages);
+		this.validateGenerators(messages);
+		this.validateQueries(messages);
+		for (Iterator<OrmPersistentType> stream = this.persistentTypes(); stream.hasNext(); ) {
+			this.validatePersistentType(stream.next(), messages);
+		}
+	}
+	
+	protected void validateGenerators(List<IMessage> messages) {
+		for (Iterator<OrmGenerator> localGenerators = this.generators(); localGenerators.hasNext(); ) {
+			OrmGenerator localGenerator = localGenerators.next();
+			for (Iterator<Generator> globalGenerators = this.getPersistenceUnit().generators(); globalGenerators.hasNext(); ) {
+				if (localGenerator.duplicates(globalGenerators.next())) {
+					messages.add(
+						DefaultJpaValidationMessages.buildMessage(
+							IMessage.HIGH_SEVERITY,
+							JpaValidationMessages.GENERATOR_DUPLICATE_NAME,
+							new String[] {localGenerator.getName()},
+							localGenerator,
+							localGenerator.getNameTextRange()
+						)
+					);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Return all the generators, table and sequence.
+	 */
+	@SuppressWarnings("unchecked")
+	public Iterator<OrmGenerator> generators() {
+		return new CompositeIterator<OrmGenerator>(
+						this.tableGenerators(),
+						this.sequenceGenerators()
+				);
+	}
+
+	protected void validateQueries(List<IMessage> messages) {
+		for (Iterator<OrmQuery> localQueries = this.queries(); localQueries.hasNext(); ) {
+			OrmQuery localQuery = localQueries.next();
+			for (Iterator<Query> globalQueries = this.getPersistenceUnit().queries(); globalQueries.hasNext(); ) {
+				if (localQuery.duplicates(globalQueries.next())) {
+					messages.add(
+						DefaultJpaValidationMessages.buildMessage(
+							IMessage.HIGH_SEVERITY,
+							JpaValidationMessages.QUERY_DUPLICATE_NAME,
+							new String[] {localQuery.getName()},
+							localQuery,
+							localQuery.getNameTextRange()
+						)
+					);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Return all the queries, named and named native.
+	 */
+	@SuppressWarnings("unchecked")
+	protected Iterator<OrmQuery> queries() {
+		return new CompositeIterator<OrmQuery>(
+						this.namedQueries(),
+						this.namedNativeQueries()
+				);
+	}
+
+	protected void validatePersistentType(OrmPersistentType persistentType, List<IMessage> messages) {
+		try {
+			persistentType.validate(messages);
+		} catch (Throwable exception) {
+			JptCorePlugin.log(exception);			
+		}
+	}
+
+
+	// ********** dispose **********
+
+	public void dispose() {
+		for (OrmPersistentType  ormPersistentType : CollectionTools.iterable(persistentTypes())) {
+			ormPersistentType.dispose();
+		}
+	}
+
+}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmPersistentType.java
index f76184ae2d..ae30c0933f 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmPersistentType.java
@@ -16,6 +16,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaStructureNode;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.MappingKeys;
@@ -89,8 +90,8 @@ public abstract class AbstractOrmPersistentType
 		return this.getParent();
 	}
 
-	public String getOrmType() {
-		return this.getEntityMappings().getOrmType();
+	public IContentType getContentType() {
+		return this.getEntityMappings().getContentType();
 	}
 
 	public String getDefaultPackage() {
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
index 67abda2777..9065d7369f 100644
--- 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
@@ -12,6 +12,7 @@ package org.eclipse.jpt.core.internal.context.orm;
 import java.util.Iterator;
 import java.util.List;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaStructureNode;
 import org.eclipse.jpt.core.context.PersistentAttribute;
 import org.eclipse.jpt.core.context.java.JavaPersistentType;
@@ -202,8 +203,8 @@ public abstract class AbstractOrmTypeMapping<T extends XmlTypeMapping>
 		return this.resourceTypeMapping.getMetadataComplete();
 	}
 	
-	public String getOrmType() {
-		return this.getPersistentType().getOrmType();
+	public IContentType getContentType() {
+		return this.getPersistentType().getContentType();
 	}
 
 	
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXml.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXml.java
new file mode 100644
index 0000000000..e22f64eacd
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXml.java
@@ -0,0 +1,215 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.core.internal.context.orm;
+
+import java.util.List;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jpt.core.JpaStructureNode;
+import org.eclipse.jpt.core.JptCorePlugin;
+import org.eclipse.jpt.core.context.MappingFileRoot;
+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.persistence.MappingFileRef;
+import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
+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 abstract class AbstractOrmXml
+	extends AbstractXmlContextNode
+	implements OrmXml
+{
+	protected JpaXmlResource xmlResource;
+	
+	protected EntityMappings entityMappings;
+	
+	
+	public AbstractOrmXml(MappingFileRef parent, JpaXmlResource resource) {
+		super(parent);
+		if (!resource.getContentType().isKindOf(JptCorePlugin.MAPPING_FILE_CONTENT_TYPE)) {
+			throw new IllegalArgumentException(resource + " does not have mapping file content type"); //$NON-NLS-1$
+		}
+		this.xmlResource = resource;
+		XmlEntityMappings xmlEntityMappings = (XmlEntityMappings) this.xmlResource.getRootObject();
+		if (xmlEntityMappings != null) {
+			this.entityMappings = this.buildEntityMappings(xmlEntityMappings);
+		}
+	}
+
+	
+	// ********** overrides **********
+	
+	@Override
+	public MappingFileRef getParent() {
+		return (MappingFileRef) super.getParent();
+	}
+	
+	@Override
+	public IResource getResource() {
+		return this.xmlResource.getFile();
+	}
+	
+	@Override
+	public MappingFileRoot getMappingFileRoot() {
+		return getEntityMappings();
+	}
+	
+	
+	// ********** JpaStructureNode implementation **********
+	
+	public String getId() {
+		// isn't actually displayed, so needs no details page
+		return null;
+	}
+
+	public IContentType getContentType() {
+		return this.xmlResource.getContentType();
+	}
+	
+	
+	// ********** MappingFile implementation **********
+	
+	public JpaXmlResource getXmlResource() {
+		return this.xmlResource;
+	}
+	
+	public MappingFileRoot getRoot() {
+		return getEntityMappings();
+	}
+	
+	public OrmPersistentType getPersistentType(String fullyQualifiedTypeName) {
+		return (this.entityMappings == null) ? null : this.entityMappings.getPersistentType(fullyQualifiedTypeName);
+	}
+
+	
+	// ********** entity mappings **********
+	
+	public EntityMappings getEntityMappings() {
+		return this.entityMappings;
+	}
+	
+	protected void setEntityMappings(EntityMappings entityMappings) {
+		EntityMappings old = this.entityMappings;
+		this.entityMappings = entityMappings;
+		this.firePropertyChanged(ENTITY_MAPPINGS_PROPERTY, old, entityMappings);
+	}
+
+	public EntityMappings addEntityMappings() {
+		if (this.entityMappings != null) {
+			throw new IllegalStateException();
+		}
+		
+		XmlEntityMappings xmlEntityMappings = this.buildEntityMappingsResource();
+		this.entityMappings = this.buildEntityMappings(xmlEntityMappings);
+		this.xmlResource.getContents().add(xmlEntityMappings);
+		this.firePropertyChanged(ENTITY_MAPPINGS_PROPERTY, null, this.entityMappings);
+		return this.entityMappings;
+	}
+	
+	protected abstract XmlEntityMappings buildEntityMappingsResource();
+	
+	public void removeEntityMappings() {
+		if (this.entityMappings == null) {
+			throw new IllegalStateException();
+		}
+		this.getJpaFile(this.xmlResource.getFile()).removeRootStructureNode(this.xmlResource);
+		this.entityMappings.dispose();
+		EntityMappings old = this.entityMappings;
+		
+		this.entityMappings = null;
+		EObject xmlEntityMappings = this.xmlResource.getRootObject(); //TODO helper removeEntityMappings method on ormResource??
+		this.xmlResource.getContents().remove(xmlEntityMappings);
+		firePropertyChanged(ENTITY_MAPPINGS_PROPERTY, old, null);
+	}
+	
+	
+	// ********** updating **********
+	
+	public void update(JpaXmlResource resource) {		
+		if (!resource.getContentType().isKindOf(JptCorePlugin.MAPPING_FILE_CONTENT_TYPE)) {
+			throw new IllegalArgumentException(resource + " does not have mapping file content type"); //$NON-NLS-1$
+		}
+		this.xmlResource = resource;
+		this.update();
+	}
+	
+	protected void update() {		
+		XmlEntityMappings oldXmlEntityMappings = 
+			(this.entityMappings == null) ? null : this.entityMappings.getXmlEntityMappings();
+		XmlEntityMappings newXmlEntityMappings = (XmlEntityMappings) this.xmlResource.getRootObject();
+
+		// if the old and new xml entity mappings are different instances,
+		// we scrap the old and rebuild.  this can happen when the resource
+		// model drastically changes, such as a cvs checkout or an edit reversion
+		if (oldXmlEntityMappings != newXmlEntityMappings) {
+			if (this.entityMappings != null) {
+				this.getJpaFile(this.xmlResource.getFile()).removeRootStructureNode(this.xmlResource);
+				this.entityMappings.dispose();
+				this.setEntityMappings(null);
+			}
+		}
+		
+		if (newXmlEntityMappings != null) {
+			if (this.entityMappings != null) {
+				this.getJpaFile(this.xmlResource.getFile()).addRootStructureNode(this.xmlResource, this.entityMappings);
+				this.entityMappings.update();
+			} else {
+				this.setEntityMappings(this.buildEntityMappings(newXmlEntityMappings));
+			}
+		}
+	}
+	
+	protected abstract EntityMappings buildEntityMappings(XmlEntityMappings xmlEntityMappings);
+	
+	
+	// ********** text **********
+	
+	public JpaStructureNode getStructureNode(int textOffset) {
+		if (this.entityMappings.containsOffset(textOffset)) {
+			return this.entityMappings.getStructureNode(textOffset);
+		}
+		return this;
+	}
+	
+	// never actually selected
+	public TextRange getSelectionTextRange() {
+		return TextRange.Empty.instance();
+	}
+	
+	public TextRange getValidationTextRange() {
+		return TextRange.Empty.instance();
+	}
+	
+	
+	// ********** validation **********
+	
+	@Override
+	public void validate(List<IMessage> messages) {
+		super.validate(messages);
+		if (this.entityMappings != null) {
+			this.entityMappings.validate(messages);
+		}
+	}
+	
+	
+	// ********** dispose **********
+	
+	public void dispose() {
+		if (this.entityMappings != null) {
+			this.entityMappings.dispose();
+		}
+	}
+
+}
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
index 921aa53d9e..8f528aa0a2 100644
--- 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
@@ -9,931 +9,19 @@
  ******************************************************************************/
 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.context.AccessType;
-import org.eclipse.jpt.core.context.Generator;
-import org.eclipse.jpt.core.context.MappingFileRoot;
-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.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.OrmPersistenceUnitDefaults;
 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.OrmTableGenerator;
-import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.context.orm.OrmXml;
-import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata;
-import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
-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.XmlEntityMappings;
-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.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.db.Catalog;
-import org.eclipse.jpt.db.Schema;
-import org.eclipse.jpt.db.SchemaContainer;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CloneIterator;
-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 AbstractXmlContextNode
-	implements EntityMappings
+	extends AbstractEntityMappings
 {
-	protected XmlEntityMappings xmlEntityMappings;
-	
-	protected String description;
-
-	protected String package_;
-
-	protected AccessType specifiedAccess;
-	protected AccessType defaultAccess;
-		
-	protected String specifiedCatalog;
-	protected String defaultCatalog;
-
-	protected String specifiedSchema;
-	protected String defaultSchema;
-
-	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) {
 		super(parent);
-		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>();
-	}
-	
-	
-	// **************** JpaNode impl *******************************************
-	
-	@Override
-	public OrmXml getParent() {
-		return (OrmXml) super.getParent();
 	}
 
-	protected OrmXml getOrmXml() {
-		return this.getParent();
-	}
-	
-	
-	// **************** JpaContextNode impl ************************************
-	
 	@Override
-	public MappingFileRoot getMappingFileRoot() {
-		return this;
-	}
-	
-	
-	// **************** JpaStructureNode impl **********************************
-	
-	public String getId() {
-		return ENTITY_MAPPINGS_ID;
-	}
-	
-	
-	// ********** PersistentType.Owner implementation **********
-
-	public AccessType getOverridePersistentTypeAccess() {
-		return this.isXmlMappingMetadataComplete() ? this.getSpecifiedAccess() : null;
-	}
-
-	public AccessType getDefaultPersistentTypeAccess() {
-		return getAccess();
-	}
-	
-	public String getDefaultPersistentTypePackage() {
-		return getPackage();
-	}
-	
-	protected boolean isXmlMappingMetadataComplete() {
-		return this.getPersistenceUnitMetadata().isXmlMappingMetadataComplete();
-	}
-	
-	public boolean isDefaultPersistentTypeMetadataComplete() {
-		return this.isXmlMappingMetadataComplete();
-	}
-	
-	
-	// **************** EntityMappings impl ************************************
-	
-	public XmlEntityMappings getXmlEntityMappings() {
-		return this.xmlEntityMappings;
-	}
-	
-	public void changeMapping(OrmPersistentType ormPersistentType, OrmTypeMapping oldMapping, OrmTypeMapping newMapping) {
-		AccessType specifiedAccess = ormPersistentType.getSpecifiedAccess();
-		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);
-		//not sure where else to put this, need to set the access on the resource model
-		ormPersistentType.setSpecifiedAccess(specifiedAccess);
-		fireItemMoved(PERSISTENT_TYPES_LIST, targetIndex, sourceIndex);
-	}
-	
-	public OrmPersistentType getPersistentType(String fullyQualifiedTypeName) {
-		for (OrmPersistentType ormPersistentType : CollectionTools.iterable(persistentTypes())) {
-			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.xmlEntityMappings.getVersion();
-	}
-
-	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);
-	}
-
-
-	// ********** access **********
-
-	public AccessType getAccess() {
-		return (this.specifiedAccess != null) ? this.specifiedAccess : this.defaultAccess;
-	}
-
-	public AccessType getSpecifiedAccess() {
-		return this.specifiedAccess;
-	}
-
-	public void setSpecifiedAccess(AccessType access) {
-		AccessType old = this.specifiedAccess;
-		this.specifiedAccess = access;
-		this.xmlEntityMappings.setAccess(AccessType.toXmlResourceModel(access));
-		this.firePropertyChanged(SPECIFIED_ACCESS_PROPERTY, old, access);
-	}
-
-	public AccessType getDefaultAccess() {
-		return this.defaultAccess;
-	}
-
-	protected void setDefaultAccess(AccessType access) {
-		AccessType old = this.defaultAccess;
-		this.defaultAccess = access;
-		this.firePropertyChanged(DEFAULT_ACCESS_PROPERTY, old, access);
-	}
-
-
-	// ********** schema **********
-
-	public String getSchema() {
-		return (this.specifiedSchema != null) ? this.specifiedSchema : this.defaultSchema;
-	}
-
-	public String getSpecifiedSchema() {
-		return this.specifiedSchema;
-	}
-
-	public void setSpecifiedSchema(String schema) {
-		String old = this.specifiedSchema;
-		this.specifiedSchema = schema;
-		this.xmlEntityMappings.setSchema(schema);
-		this.firePropertyChanged(SPECIFIED_SCHEMA_PROPERTY, old, schema);
-	}
-
-	public String getDefaultSchema() {
-		return this.defaultSchema;
-	}
-
-	protected void setDefaultSchema(String schema) {
-		String old = this.defaultSchema;
-		this.defaultSchema = schema;
-		this.firePropertyChanged(DEFAULT_SCHEMA_PROPERTY, old, schema);
-	}
-
-	public Schema getDbSchema() {
-		SchemaContainer dbSchemaContainer = this.getDbSchemaContainer();
-		return (dbSchemaContainer == null) ? null : dbSchemaContainer.getSchemaForIdentifier(this.getSchema());
-	}
-
-
-	// ********** catalog **********
-
-	public String getCatalog() {
-		return (this.specifiedCatalog != null) ? this.specifiedCatalog : this.defaultCatalog;
-	}
-	
-	public String getSpecifiedCatalog() {
-		return this.specifiedCatalog;
-	}
-
-	public void setSpecifiedCatalog(String catalog) {
-		String old = this.specifiedCatalog;
-		this.specifiedCatalog = catalog;
-		this.xmlEntityMappings.setCatalog(catalog);
-		this.firePropertyChanged(SPECIFIED_CATALOG_PROPERTY, old, catalog);
-	}
-
-	public String getDefaultCatalog() {
-		return this.defaultCatalog;
-	}
-
-	protected void setDefaultCatalog(String catalog) {
-		String old = this.defaultCatalog;
-		this.defaultCatalog = catalog;
-		this.firePropertyChanged(DEFAULT_CATALOG_PROPERTY, old, catalog);
-	}
-
-	public Catalog getDbCatalog() {
-		String catalog = this.getCatalog();
-		if (catalog == null) {
-			return null;  // not even a default catalog (i.e. database probably does not support catalogs)
-		}
-		return this.getDbCatalog(catalog);
-	}
-
-
-	// ********** schema container **********
-
-	/**
-	 * If we don't have a catalog (i.e. we don't even have a *default* catalog),
-	 * then the database probably does not support catalogs; and we need to
-	 * get the schema directly from the database.
-	 */
-	public SchemaContainer getDbSchemaContainer() {
-		String catalog = this.getCatalog();
-		return (catalog != null) ? this.getDbCatalog(catalog) : this.getDatabase();
-	}
-
-
-	// ********** ORM persistent types **********
-
-	public ListIterator<OrmPersistentType> persistentTypes() {
-		return new CloneListIterator<OrmPersistentType>(this.persistentTypes);
-	}
-	
-	public int persistentTypesSize() {
-		return this.persistentTypes.size();
-	}
-	
-	public OrmPersistentType addPersistentType(String mappingKey, String className) {
-		OrmPersistentType persistentType = buildPersistentType(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);
-		}
-		XmlTypeMapping typeMapping = persistentType.getMapping().addToResourceModel(this.xmlEntityMappings);
-		typeMapping.setClassName(className);
-		fireItemAdded(PERSISTENT_TYPES_LIST, index, persistentType);
-		return persistentType;
-	}
-	
 	protected OrmPersistentType buildPersistentType(String mappingKey) {
 		return getJpaFactory().buildOrmPersistentType(this, mappingKey);
 	}
-
-	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 removePersistentType(int index) {
-		OrmPersistentType persistentType = this.persistentTypes.get(index);
-		persistentType.dispose();
-		this.persistentTypes.remove(index);
-		persistentType.getMapping().removeFromResourceModel(this.xmlEntityMappings);
-		fireItemRemoved(PERSISTENT_TYPES_LIST, index, persistentType);		
-	}
-	
-	public void removePersistentType(OrmPersistentType persistentType) {
-		removePersistentType(this.persistentTypes.indexOf(persistentType));	
-	}
-	
-	protected void removePersistentType_(OrmPersistentType persistentType) {
-		persistentType.dispose();
-		removeItemFromList(persistentType, this.persistentTypes, PERSISTENT_TYPES_LIST);
-	}
-	
-	protected void movePersistentType_(int index, OrmPersistentType persistentType) {
-		moveItemInList(index, this.persistentTypes.indexOf(persistentType), this.persistentTypes, PERSISTENT_TYPES_LIST);
-	}
-
-
-	// ********** sequence generators **********
-
-	public ListIterator<OrmSequenceGenerator> sequenceGenerators() {
-		return new CloneListIterator<OrmSequenceGenerator>(this.sequenceGenerators);
-	}
-	
-	public int sequenceGeneratorsSize() {
-		return this.sequenceGenerators.size();
-	}
-	
-	public OrmSequenceGenerator addSequenceGenerator(int index) {
-		XmlSequenceGenerator resourceSequenceGenerator = OrmFactory.eINSTANCE.createXmlSequenceGeneratorImpl();
-		OrmSequenceGenerator contextSequenceGenerator =  buildSequenceGenerator(resourceSequenceGenerator);
-		this.sequenceGenerators.add(index, contextSequenceGenerator);
-		this.xmlEntityMappings.getSequenceGenerators().add(index, resourceSequenceGenerator);
-		fireItemAdded(SEQUENCE_GENERATORS_LIST, index, contextSequenceGenerator);
-		return contextSequenceGenerator;
-	}
-
-	protected void addSequenceGenerator(int index, OrmSequenceGenerator sequenceGenerator) {
-		addItemToList(index, sequenceGenerator, this.sequenceGenerators, EntityMappings.SEQUENCE_GENERATORS_LIST);
-	}
-
-	protected void addSequenceGenerator(OrmSequenceGenerator sequenceGenerator) {
-		this.addSequenceGenerator(this.sequenceGenerators.size(), sequenceGenerator);
-	}
-
-	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);	
-	}
-	
-
-	// ********** table generators **********
-
-	public ListIterator<OrmTableGenerator> tableGenerators() {
-		return new CloneListIterator<OrmTableGenerator>(this.tableGenerators);
-	}
-
-	public int tableGeneratorsSize() {
-		return this.tableGenerators.size();
-	}
-	
-	public OrmTableGenerator addTableGenerator(int index) {
-		XmlTableGenerator resourceTableGenerator = OrmFactory.eINSTANCE.createXmlTableGeneratorImpl();
-		OrmTableGenerator contextTableGenerator = buildTableGenerator(resourceTableGenerator);
-		this.tableGenerators.add(index, contextTableGenerator);
-		this.xmlEntityMappings.getTableGenerators().add(index, resourceTableGenerator);
-		fireItemAdded(TABLE_GENERATORS_LIST, index, contextTableGenerator);
-		return contextTableGenerator;
-	}
-	
-	protected void addTableGenerator(int index, OrmTableGenerator tableGenerator) {
-		addItemToList(index, tableGenerator, this.tableGenerators, EntityMappings.TABLE_GENERATORS_LIST);
-	}
-
-	protected void addTableGenerator(OrmTableGenerator tableGenerator) {
-		this.addTableGenerator(this.tableGenerators.size(), tableGenerator);
-	}
-
-	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);	
-	}
-
-
-	// ********** named queries **********
-
-	public ListIterator<OrmNamedQuery> namedQueries() {
-		return new CloneListIterator<OrmNamedQuery>(this.namedQueries);
-	}
-	
-	public int namedQueriesSize() {
-		return this.namedQueries.size();
-	}
-	
-	public OrmNamedQuery addNamedQuery(int index) {
-		XmlNamedQuery resourceNamedQuery = OrmFactory.eINSTANCE.createXmlNamedQuery();
-		OrmNamedQuery contextNamedQuery = buildNamedQuery(resourceNamedQuery);
-		this.namedQueries.add(index, contextNamedQuery);
-		this.xmlEntityMappings.getNamedQueries().add(index, resourceNamedQuery);
-		this.fireItemAdded(NAMED_QUERIES_LIST, index, contextNamedQuery);
-		return contextNamedQuery;
-	}
-	
-	protected void addNamedQuery(int index, OrmNamedQuery namedQuery) {
-		addItemToList(index, namedQuery, this.namedQueries, NAMED_QUERIES_LIST);
-	}
-	
-	protected void addNamedQuery(OrmNamedQuery namedQuery) {
-		this.addNamedQuery(this.namedQueries.size(), namedQuery);
-	}
-	
-	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(NAMED_QUERIES_LIST, index, namedQuery);
-	}
-
-	protected void removeNamedQuery_(OrmNamedQuery namedQuery) {
-		removeItemFromList(namedQuery, this.namedQueries, NAMED_QUERIES_LIST);
-	}
-	
-	public void moveNamedQuery(int targetIndex, int sourceIndex) {
-		this.xmlEntityMappings.getNamedQueries().move(targetIndex, sourceIndex);
-		moveItemInList(targetIndex, sourceIndex, this.namedQueries, NAMED_QUERIES_LIST);		
-	}
-	
-
-	// ********** named native queries **********
-
-	public ListIterator<OrmNamedNativeQuery> namedNativeQueries() {
-		return new CloneListIterator<OrmNamedNativeQuery>(this.namedNativeQueries);
-	}
-	
-	public int namedNativeQueriesSize() {
-		return this.namedNativeQueries.size();
-	}
-	
-	public OrmNamedNativeQuery addNamedNativeQuery(int index) {
-		XmlNamedNativeQuery resourceNamedNativeQuery = OrmFactory.eINSTANCE.createXmlNamedNativeQuery();
-		OrmNamedNativeQuery namedNativeQuery = buildNamedNativeQuery(resourceNamedNativeQuery);
-		this.namedNativeQueries.add(index, namedNativeQuery);
-		this.xmlEntityMappings.getNamedNativeQueries().add(index, resourceNamedNativeQuery);
-		this.fireItemAdded(NAMED_NATIVE_QUERIES_LIST, index, namedNativeQuery);
-		return namedNativeQuery;
-	}
-	
-	protected void addNamedNativeQuery(int index, OrmNamedNativeQuery namedNativeQuery) {
-		addItemToList(index, namedNativeQuery, this.namedNativeQueries, NAMED_NATIVE_QUERIES_LIST);
-	}
-	
-	protected void addNamedNativeQuery(OrmNamedNativeQuery namedNativeQuery) {
-		this.addNamedNativeQuery(this.namedNativeQueries.size(), namedNativeQuery);
-	}
-	
-	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(NAMED_NATIVE_QUERIES_LIST, index, namedNativeQuery);
-	}
-
-	protected void removeNamedNativeQuery_(OrmNamedNativeQuery namedNativeQuery) {
-		removeItemFromList(namedNativeQuery, this.namedNativeQueries, NAMED_NATIVE_QUERIES_LIST);
-	}
-	
-	public void moveNamedNativeQuery(int targetIndex, int sourceIndex) {
-		this.xmlEntityMappings.getNamedNativeQueries().move(targetIndex, sourceIndex);
-		moveItemInList(targetIndex, sourceIndex, this.namedNativeQueries, NAMED_NATIVE_QUERIES_LIST);		
-	}
-
-
-	// ********** misc **********
-
-	//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(persistentTypes())) {
-			if (persistentType.getName().equals(className)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public OrmPersistenceUnitDefaults getPersistenceUnitDefaults() {
-		return getPersistenceUnitMetadata().getPersistenceUnitDefaults();
-	}
-
-	public String getOrmType() {
-		return this.getOrmXml().getType();
-	}
-	
-
-	// ********** initialization **********
-
-	public void initialize(XmlEntityMappings entityMappings) {
-		this.xmlEntityMappings = entityMappings;
-		this.initialize();
-	}
-	
-	protected void initialize() {
-		this.persistenceUnitMetadata = getJpaFactory().buildPersistenceUnitMetadata(this, this.xmlEntityMappings);
-		this.description = this.xmlEntityMappings.getDescription();
-		this.package_ = this.xmlEntityMappings.getPackage();
-
-		this.defaultAccess = this.getPersistenceUnit().getDefaultAccess();
-		this.specifiedAccess = this.getResourceAccess();
-
-		this.defaultCatalog = this.getPersistenceUnit().getDefaultCatalog();
-		this.specifiedCatalog = this.xmlEntityMappings.getCatalog();
-
-		this.defaultSchema = this.getPersistenceUnit().getDefaultSchema();
-		this.specifiedSchema = this.xmlEntityMappings.getSchema();
-
-		this.initializePersistentTypes();
-		this.initializeTableGenerators();
-		this.initializeSequenceGenerators();
-		this.initializeNamedQueries();
-		this.initializeNamedNativeQueries();
-	}
-	
-	protected void initializePersistentTypes() {
-		for (XmlTypeMapping typeMapping : this.xmlEntityMappings.getTypeMappings()) {
-			addPersistentType(typeMapping);
-		}	
-	}
-	
-	protected void initializeTableGenerators() {
-		for (XmlTableGenerator tableGenerator : this.xmlEntityMappings.getTableGenerators()) {
-			this.tableGenerators.add(buildTableGenerator(tableGenerator));
-		}
-	}
-	
-	protected void initializeSequenceGenerators() {
-		for (XmlSequenceGenerator sequenceGenerator : this.xmlEntityMappings.getSequenceGenerators()) {
-			this.sequenceGenerators.add(buildSequenceGenerator(sequenceGenerator));
-		}
-	}
-	
-	protected void initializeNamedQueries() {
-		for (XmlNamedQuery namedQuery : this.xmlEntityMappings.getNamedQueries()) {
-			this.namedQueries.add(buildNamedQuery(namedQuery));
-		}
-	}
-	
-	protected void initializeNamedNativeQueries() {
-		for (XmlNamedNativeQuery namedNativeQuery : this.xmlEntityMappings.getNamedNativeQueries()) {
-			this.namedNativeQueries.add(buildNamedNativeQuery(namedNativeQuery));
-		}
-	}
-
-
-	// ********** update **********
-
-	public void update() {
-		this.setDescription(this.xmlEntityMappings.getDescription());
-		this.setPackage(this.xmlEntityMappings.getPackage());
-
-		this.setDefaultAccess(this.getPersistenceUnit().getDefaultAccess());
-		this.setSpecifiedAccess(this.getResourceAccess());
-
-		this.setDefaultCatalog(this.getPersistenceUnit().getDefaultCatalog());
-		this.setSpecifiedCatalog(this.xmlEntityMappings.getCatalog());
-
-		this.setDefaultSchema(this.getPersistenceUnit().getDefaultSchema());
-		this.setSpecifiedSchema(this.xmlEntityMappings.getSchema());
-
-		this.persistenceUnitMetadata.update();
-		this.updatePersistentTypes();
-		this.updateTableGenerators();
-		this.updateSequenceGenerators();
-		this.updateNamedQueries();
-		this.updateNamedNativeQueries();
-	}
-	
-	protected AccessType getResourceAccess() {
-		return AccessType.fromXmlResourceModel(this.xmlEntityMappings.getAccess());
-	}
-
-	protected void updatePersistentTypes() {
-		Collection<OrmPersistentType> contextTypesToRemove = CollectionTools.collection(persistentTypes());
-		Collection<OrmPersistentType> contextTypesToUpdate = new ArrayList<OrmPersistentType>();
-		int resourceIndex = 0;
-		
-		List<XmlTypeMapping> xmlTypeMappings = this.xmlEntityMappings.getTypeMappings();
-		for (XmlTypeMapping xmlTypeMapping : xmlTypeMappings.toArray(new XmlTypeMapping[xmlTypeMappings.size()])) {
-			boolean contextAttributeFound = false;
-			for (OrmPersistentType contextType : contextTypesToRemove) {
-				if (contextType.getMapping().getResourceTypeMapping() == xmlTypeMapping) {
-					movePersistentType_(resourceIndex, contextType);
-					contextTypesToRemove.remove(contextType);
-					contextTypesToUpdate.add(contextType);
-					contextAttributeFound = true;
-					break;
-				}
-			}
-			if (!contextAttributeFound) {
-				OrmPersistentType ormPersistentType = addPersistentType(xmlTypeMapping);
-				fireItemAdded(PERSISTENT_TYPES_LIST, persistentTypesSize(), ormPersistentType);
-			}
-			resourceIndex++;
-		}
-		for (OrmPersistentType contextType : contextTypesToRemove) {
-			removePersistentType_(contextType);
-		}
-		//first handle adding/removing of the persistent types, then update the others last, 
-		//this causes less churn in the update process
-		for (OrmPersistentType contextType : contextTypesToUpdate) {
-			contextType.update();
-		}	
-	}
-	
-	//not firing change notification so this can be reused in initialize and update
-	protected OrmPersistentType addPersistentType(XmlTypeMapping resourceMapping) {
-		OrmPersistentType ormPersistentType = buildPersistentType(resourceMapping.getMappingKey());
-		this.persistentTypes.add(ormPersistentType);
-		ormPersistentType.initialize(resourceMapping);
-		return ormPersistentType;
-	}
-	
-	protected void updateTableGenerators() {
-		// make a copy of the XML generators (to prevent ConcurrentModificationException)
-		Iterator<XmlTableGenerator> xmlGenerators = new CloneIterator<XmlTableGenerator>(this.xmlEntityMappings.getTableGenerators());
-
-		for (Iterator<OrmTableGenerator> contextGenerators = this.tableGenerators(); contextGenerators.hasNext(); ) {
-			OrmTableGenerator contextGenerator = contextGenerators.next();
-			if (xmlGenerators.hasNext()) {
-				contextGenerator.update(xmlGenerators.next());
-			}
-			else {
-				removeTableGenerator_(contextGenerator);
-			}
-		}
-		
-		while (xmlGenerators.hasNext()) {
-			addTableGenerator(buildTableGenerator(xmlGenerators.next()));
-		}
-	}
-
-	protected OrmTableGenerator buildTableGenerator(XmlTableGenerator resourceTableGenerator) {
-		return getJpaFactory().buildOrmTableGenerator(this, resourceTableGenerator);
-	}
-
-	protected void updateSequenceGenerators() {
-		// make a copy of the XML sequence generators (to prevent ConcurrentModificationException)
-		Iterator<XmlSequenceGenerator> xmlSequenceGenerators = new CloneIterator<XmlSequenceGenerator>(this.xmlEntityMappings.getSequenceGenerators());//prevent ConcurrentModificiationException
-
-		for (Iterator<OrmSequenceGenerator> contextSequenceGenerators = this.sequenceGenerators(); contextSequenceGenerators.hasNext(); ) {
-			OrmSequenceGenerator contextSequenceGenerator = contextSequenceGenerators.next();
-			if (xmlSequenceGenerators.hasNext()) {
-				contextSequenceGenerator.update(xmlSequenceGenerators.next());
-			}
-			else {
-				removeSequenceGenerator_(contextSequenceGenerator);
-			}
-		}
-		
-		while (xmlSequenceGenerators.hasNext()) {
-			addSequenceGenerator(buildSequenceGenerator(xmlSequenceGenerators.next()));
-		}
-	}
-
-	protected OrmSequenceGenerator buildSequenceGenerator(XmlSequenceGenerator resourceSequenceGenerator) {
-		return getJpaFactory().buildOrmSequenceGenerator(this, resourceSequenceGenerator);
-	}
-	
-	protected void updateNamedQueries() {
-		// make a copy of the XML queries (to prevent ConcurrentModificationException)
-		Iterator<XmlNamedQuery> xmlQueries = new CloneIterator<XmlNamedQuery>(this.xmlEntityMappings.getNamedQueries());
-		
-		for (Iterator<OrmNamedQuery> contextQueries = this.namedQueries(); contextQueries.hasNext(); ) {
-			OrmNamedQuery contextQuery = contextQueries.next();
-			if (xmlQueries.hasNext()) {
-				contextQuery.update(xmlQueries.next());
-			}
-			else {
-				removeNamedQuery_(contextQuery);
-			}
-		}
-		
-		while (xmlQueries.hasNext()) {
-			addNamedQuery(buildNamedQuery(xmlQueries.next()));
-		}
-	}
-
-	protected OrmNamedQuery buildNamedQuery(XmlNamedQuery resourceNamedQuery) {
-		return getJpaFactory().buildOrmNamedQuery(this, resourceNamedQuery);
-	}
-
-	protected void updateNamedNativeQueries() {
-		// make a copy of the XML queries (to prevent ConcurrentModificationException)
-		Iterator<XmlNamedNativeQuery> xmlQueries = new CloneIterator<XmlNamedNativeQuery>(this.xmlEntityMappings.getNamedNativeQueries());
-		
-		for (Iterator<OrmNamedNativeQuery> contextQueries = this.namedNativeQueries(); contextQueries.hasNext(); ) {
-			OrmNamedNativeQuery contextQuery = contextQueries.next();
-			if (xmlQueries.hasNext()) {
-				contextQuery.update(xmlQueries.next());
-			}
-			else {
-				removeNamedNativeQuery_(contextQuery);
-			}
-		}
-		
-		while (xmlQueries.hasNext()) {
-			addNamedNativeQuery(buildNamedNativeQuery(xmlQueries.next()));
-		}
-	}
-
-	protected OrmNamedNativeQuery buildNamedNativeQuery(XmlNamedNativeQuery resourceNamedQuery) {
-		return getJpaFactory().buildOrmNamedNativeQuery(this, resourceNamedQuery);
-	}
-
-
-	// ********** text **********
-
-	public JpaStructureNode getStructureNode(int textOffset) {
-		for (OrmPersistentType persistentType: CollectionTools.iterable(persistentTypes())) {
-			if (persistentType.contains(textOffset)) {
-				return persistentType.getStructureNode(textOffset);
-			}
-		}
-		return this;
-	}
-	
-	public boolean containsOffset(int textOffset) {
-		return (this.xmlEntityMappings != null) && this.xmlEntityMappings.containsOffset(textOffset);
-	}
-	
-	public TextRange getSelectionTextRange() {
-		return this.xmlEntityMappings.getSelectionTextRange();
-	}
-	
-	public TextRange getValidationTextRange() {
-		return null;
-	}
-	
-	
-	// ********** validation **********
-	
-	@Override
-	public void validate(List<IMessage> messages) {
-		super.validate(messages);
-		this.validateGenerators(messages);
-		this.validateQueries(messages);
-		for (Iterator<OrmPersistentType> stream = this.persistentTypes(); stream.hasNext(); ) {
-			this.validatePersistentType(stream.next(), messages);
-		}
-	}
-	
-	protected void validateGenerators(List<IMessage> messages) {
-		for (Iterator<OrmGenerator> localGenerators = this.generators(); localGenerators.hasNext(); ) {
-			OrmGenerator localGenerator = localGenerators.next();
-			for (Iterator<Generator> globalGenerators = this.getPersistenceUnit().generators(); globalGenerators.hasNext(); ) {
-				if (localGenerator.duplicates(globalGenerators.next())) {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.GENERATOR_DUPLICATE_NAME,
-							new String[] {localGenerator.getName()},
-							localGenerator,
-							localGenerator.getNameTextRange()
-						)
-					);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Return all the generators, table and sequence.
-	 */
-	@SuppressWarnings("unchecked")
-	public Iterator<OrmGenerator> generators() {
-		return new CompositeIterator<OrmGenerator>(
-						this.tableGenerators(),
-						this.sequenceGenerators()
-				);
-	}
-
-	protected void validateQueries(List<IMessage> messages) {
-		for (Iterator<OrmQuery> localQueries = this.queries(); localQueries.hasNext(); ) {
-			OrmQuery localQuery = localQueries.next();
-			for (Iterator<Query> globalQueries = this.getPersistenceUnit().queries(); globalQueries.hasNext(); ) {
-				if (localQuery.duplicates(globalQueries.next())) {
-					messages.add(
-						DefaultJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							JpaValidationMessages.QUERY_DUPLICATE_NAME,
-							new String[] {localQuery.getName()},
-							localQuery,
-							localQuery.getNameTextRange()
-						)
-					);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Return all the queries, named and named native.
-	 */
-	@SuppressWarnings("unchecked")
-	protected Iterator<OrmQuery> queries() {
-		return new CompositeIterator<OrmQuery>(
-						this.namedQueries(),
-						this.namedNativeQueries()
-				);
-	}
-
-	protected void validatePersistentType(OrmPersistentType persistentType, List<IMessage> messages) {
-		try {
-			persistentType.validate(messages);
-		} catch (Throwable exception) {
-			JptCorePlugin.log(exception);			
-		}
-	}
-
-
-	// ********** dispose **********
-
-	public void dispose() {
-		for (OrmPersistentType  ormPersistentType : CollectionTools.iterable(persistentTypes())) {
-			ormPersistentType.dispose();
-		}
-	}
-
 }
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
index 41a0d8324d..2c6c93f873 100644
--- 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
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.core.internal.context.orm;
 
 import java.util.List;
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaStructureNode;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
@@ -178,8 +179,8 @@ public class GenericOrmPersistentAttribute extends AbstractXmlContextNode
 		return this;
 	}
 
-	public String getOrmType() {
-		return this.getPersistentType().getOrmType();
+	public IContentType getContentType() {
+		return this.getPersistentType().getContentType();
 	}
 
 	public boolean contains(int textOffset) {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmXml.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmXml.java
index d785c259ad..4df08b42b1 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmXml.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmXml.java
@@ -9,215 +9,43 @@
  ******************************************************************************/
 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.MappingFileRoot;
+import org.eclipse.jpt.core.JptCorePlugin;
 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.persistence.MappingFileRef;
-import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
 import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
 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 GenericOrmXml
-	extends AbstractXmlContextNode
-	implements OrmXml
-{
-	protected OrmXmlResource ormResource;
-	
-	protected EntityMappings entityMappings;
-	
-	
-	public GenericOrmXml(MappingFileRef parent) {
-		super(parent);
-	}
-
-	
-	// ********** overrides **********
-	
-	@Override
-	public MappingFileRef getParent() {
-		return (MappingFileRef) super.getParent();
-	}
-	
-	@Override
-	public IResource getResource() {
-		return this.ormResource.getFile();
-	}
-	
-	@Override
-	public MappingFileRoot getMappingFileRoot() {
-		return getEntityMappings();
-	}
-	
-	
-	// ********** JpaStructureNode implementation **********
-	
-	public String getId() {
-		// isn't actually displayed, so needs no details page
-		return null;
-	}
-
-	public String getType() {
-		return this.ormResource.getType();
-	}
-	
-	
-	// ********** MappingFile implementation **********
+	extends AbstractOrmXml
+{	
 	
-	public JpaXmlResource getXmlResource() {
-		return this.ormResource;
-	}
-	
-	public MappingFileRoot getRoot() {
-		return getEntityMappings();
-	}
-	
-	public OrmPersistentType getPersistentType(String fullyQualifiedTypeName) {
-		return (this.entityMappings == null) ? null : this.entityMappings.getPersistentType(fullyQualifiedTypeName);
-	}
-
-	
-	// ********** entity mappings **********
-	
-	public EntityMappings getEntityMappings() {
-		return this.entityMappings;
-	}
-	
-	protected void setEntityMappings(EntityMappings entityMappings) {
-		EntityMappings old = this.entityMappings;
-		this.entityMappings = entityMappings;
-		this.firePropertyChanged(ENTITY_MAPPINGS_PROPERTY, old, entityMappings);
-	}
-
-	public EntityMappings addEntityMappings() {
-		if (this.entityMappings != null) {
-			throw new IllegalStateException();
+	public GenericOrmXml(MappingFileRef parent, JpaXmlResource resource) {
+		super(parent, resource);
+		if (!resource.getContentType().isKindOf(JptCorePlugin.ORM_XML_CONTENT_TYPE)) {
+			throw new IllegalArgumentException(resource + " does not have orm xml content type"); //$NON-NLS-1$
 		}
-		
-		XmlEntityMappings xmlEntityMappings = this.buildEntityMappingsResource();
-		this.entityMappings = this.buildEntityMappings(xmlEntityMappings);
-		this.ormResource.getContents().add(xmlEntityMappings);
-		this.firePropertyChanged(ENTITY_MAPPINGS_PROPERTY, null, this.entityMappings);
-		return this.entityMappings;
 	}
 	
+	@Override
 	protected XmlEntityMappings buildEntityMappingsResource() {
 		return OrmFactory.eINSTANCE.createXmlEntityMappings();
 	}
 	
-	public void removeEntityMappings() {
-		if (this.entityMappings == null) {
-			throw new IllegalStateException();
-		}
-		this.getJpaFile(this.ormResource.getFile()).removeRootStructureNode(this.ormResource);
-		this.entityMappings.dispose();
-		EntityMappings old = 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, old, null);
-	}
-	
-	
-	// ********** updating **********
-	
-	public void initialize(JpaXmlResource resource) {
-		this.ormResource = (OrmXmlResource) resource;
-		this.initialize();
-	}
-	
-	protected void initialize() {
-		XmlEntityMappings xmlEntityMappings = this.ormResource.getEntityMappings();
-		if (xmlEntityMappings != null) {
-			this.entityMappings = this.buildEntityMappings(xmlEntityMappings);
-		}
-	}
-	
-	public void update(JpaXmlResource resource) {
-		OrmXmlResource newOrmResource;
-		try {
-			newOrmResource = (OrmXmlResource) resource;
-		} catch (ClassCastException ex) {
-			throw new IllegalArgumentException(resource.toString(), ex);
-		}
-		
-		XmlEntityMappings oldXmlEntityMappings = 
-			(this.entityMappings == null) ? null : this.entityMappings.getXmlEntityMappings();
-		XmlEntityMappings newXmlEntityMappings = newOrmResource.getEntityMappings();
-		
-		this.ormResource = newOrmResource;
-
-		// if the old and new xml entity mappings are different instances,
-		// we scrap the old and rebuild.  this can happen when the resource
-		// model drastically changes, such as a cvs checkout or an edit reversion
-		if (oldXmlEntityMappings != newXmlEntityMappings) {
-			if (this.entityMappings != null) {
-				this.getJpaFile(this.ormResource.getFile()).removeRootStructureNode(this.ormResource);
-				this.entityMappings.dispose();
-				this.setEntityMappings(null);
-			}
-		}
-		
-		if (newXmlEntityMappings != null) {
-			if (this.entityMappings != null) {
-				this.getJpaFile(this.ormResource.getFile()).addRootStructureNode(this.ormResource, this.entityMappings);
-				this.entityMappings.update();
-			} else {
-				this.setEntityMappings(this.buildEntityMappings(newXmlEntityMappings));
-			}
-		}
-	}
-	
+	@Override
 	protected EntityMappings buildEntityMappings(XmlEntityMappings xmlEntityMappings) {
 		return getJpaFactory().buildEntityMappings(this, xmlEntityMappings);
-	}
+	}	
 	
-	
-	// ********** text **********
-	
-	public JpaStructureNode getStructureNode(int textOffset) {
-		if (this.entityMappings.containsOffset(textOffset)) {
-			return this.entityMappings.getStructureNode(textOffset);
-		}
-		return this;
-	}
-	
-	// never actually selected
-	public TextRange getSelectionTextRange() {
-		return TextRange.Empty.instance();
-	}
-	
-	public TextRange getValidationTextRange() {
-		return TextRange.Empty.instance();
-	}
-	
-	
-	// ********** validation **********
+	// ********** updating **********
 	
 	@Override
-	public void validate(List<IMessage> messages) {
-		super.validate(messages);
-		if (this.entityMappings != null) {
-			this.entityMappings.validate(messages);
-		}
-	}
-	
-	
-	// ********** dispose **********
-	
-	public void dispose() {
-		if (this.entityMappings != null) {
-			this.entityMappings.dispose();
+	public void update(JpaXmlResource resource) {
+		if (!resource.getContentType().isKindOf(JptCorePlugin.ORM_XML_CONTENT_TYPE)) {
+			throw new IllegalArgumentException(resource + " does not have orm xml content type"); //$NON-NLS-1$
 		}
+		super.update(resource);
 	}
 
+
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/AbstractMappingFileRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/AbstractMappingFileRef.java
new file mode 100644
index 0000000000..40ef3adaa9
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/AbstractMappingFileRef.java
@@ -0,0 +1,224 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.core.internal.context.persistence;
+
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.jpt.core.JpaStructureNode;
+import org.eclipse.jpt.core.JptCorePlugin;
+import org.eclipse.jpt.core.context.MappingFile;
+import org.eclipse.jpt.core.context.MappingFilePersistenceUnitDefaults;
+import org.eclipse.jpt.core.context.MappingFileRoot;
+import org.eclipse.jpt.core.context.PersistentType;
+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.context.AbstractXmlContextNode;
+import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
+import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
+import org.eclipse.jpt.utility.internal.StringTools;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+
+public abstract class AbstractMappingFileRef
+	extends AbstractXmlContextNode
+	implements MappingFileRef
+{
+
+	protected String fileName;
+
+	protected MappingFile mappingFile;
+
+
+	// ********** construction/initialization **********
+
+	protected AbstractMappingFileRef(PersistenceUnit parent, String resourceFileName) {
+		super(parent);
+		this.fileName = resourceFileName;
+		this.initializeMappingFile();
+	}
+
+	protected void initializeMappingFile() {
+		JpaXmlResource xmlResource = this.getXmlResource();
+		if (xmlResource != null) {
+			this.mappingFile = this.buildMappingFile(xmlResource);
+		}
+	}
+	/**
+	 * The XmlMappingFileRef resource is the Persistence xml resource.
+	 * This returns the resource of the mapping file itself.
+	 */
+	protected JpaXmlResource getXmlResource() {
+		return getJpaProject().getMappingFileResource(this.fileName);
+	}
+	
+	protected IFile getPlatformFile() {
+		return JptCorePlugin.getPlatformFile(this.getJpaProject().getProject(), this.fileName);
+	}
+
+	// ********** JpaStructureNode implementation **********
+
+	public String getId() {
+		return PersistenceStructureNodes.MAPPING_FILE_REF_ID;
+	}
+
+	public JpaStructureNode getStructureNode(int textOffset) {
+		return this;
+	}
+
+	public void dispose() {
+		if (this.mappingFile != null) {
+			this.mappingFile.dispose();
+		}
+	}
+
+
+	// ********** queries **********
+
+	public MappingFilePersistenceUnitDefaults getPersistenceUnitDefaults() {
+		MappingFileRoot root = this.getMappingFileRoot_();
+		return (root == null) ? null : root.getPersistenceUnitDefaults();
+	}
+
+	/**
+	 * #getMappingFileRoot() is already defined by JpaContextNode for the
+	 * descendants of a "mapping file root" - we want something slightly
+	 * different here...
+	 */
+	protected MappingFileRoot getMappingFileRoot_() {
+		return (this.mappingFile == null) ? null : this.mappingFile.getRoot();
+	}
+
+	public boolean persistenceUnitDefaultsExists() {
+		MappingFilePersistenceUnitDefaults defaults = this.getPersistenceUnitDefaults();
+		return (defaults != null) && defaults.resourceExists();
+	}
+
+	public PersistentType getPersistentType(String typeName) {
+		return (this.mappingFile == null) ? null : this.mappingFile.getPersistentType(typeName);
+	}
+
+
+	// ********** file name **********
+
+	public String getFileName() {
+		return this.fileName;
+	}
+
+
+	// ********** mapping file **********
+
+	public MappingFile getMappingFile() {
+		return this.mappingFile;
+	}
+
+	protected void setMappingFile(MappingFile mappingFile) {
+		MappingFile old = this.mappingFile;
+		this.mappingFile = mappingFile;
+		this.firePropertyChanged(MAPPING_FILE_PROPERTY, old, mappingFile);
+	}
+
+
+	// ********** updating **********
+
+	protected void update() {
+		this.updateMappingFile();
+	}
+
+	protected void updateMappingFile() {
+		JpaXmlResource xmlResource = this.getXmlResource();
+		if (xmlResource != null) {
+			if (this.mappingFile == null) {
+				this.setMappingFile(this.buildMappingFile(xmlResource));
+			} else {
+				// if the resource type has changed, rebuild the mapping file
+				if (this.mappingFile.getXmlResource() != xmlResource) {
+					this.mappingFile.dispose();
+					this.setMappingFile(this.buildMappingFile(xmlResource));
+				}
+				else {
+					this.mappingFile.update(xmlResource);
+				}
+			}
+		} else {
+			if (this.mappingFile != null) {
+				this.mappingFile.dispose();
+				this.setMappingFile(null);
+			}
+		}
+	}
+
+	protected MappingFile buildMappingFile(JpaXmlResource resource) {
+		return this.getJpaPlatform().buildMappingFile(this, resource);
+	}
+
+
+	// ********** validation **********
+
+	@Override
+	public void validate(List<IMessage> messages) {
+		super.validate(messages);
+
+		if (StringTools.stringIsEmpty(this.fileName)) {
+			messages.add(
+				DefaultJpaValidationMessages.buildMessage(
+					IMessage.HIGH_SEVERITY,
+					JpaValidationMessages.PERSISTENCE_UNIT_UNSPECIFIED_MAPPING_FILE,
+					this,
+					this.getValidationTextRange()
+				)
+			);
+			return;
+		}
+
+		if (this.mappingFile == null) {
+			IFile platformFile = this.getPlatformFile();
+			String msgID = platformFile.exists() ?
+					JpaValidationMessages.PERSISTENCE_UNIT_UNSUPPORTED_MAPPING_FILE_CONTENT
+				:
+					JpaValidationMessages.PERSISTENCE_UNIT_NONEXISTENT_MAPPING_FILE;
+			messages.add(
+				DefaultJpaValidationMessages.buildMessage(
+					IMessage.HIGH_SEVERITY,
+					msgID,
+					new String[] {this.fileName},
+					this,
+					this.getValidationTextRange()
+				)
+			);
+			return;
+		}
+
+		if (this.mappingFile.getRoot() == null) {
+			messages.add(
+				DefaultJpaValidationMessages.buildMessage(
+					IMessage.HIGH_SEVERITY,
+					JpaValidationMessages.PERSISTENCE_UNIT_INVALID_MAPPING_FILE,
+					new String[] {this.fileName},
+					this,
+					this.getValidationTextRange()
+				)
+			);
+		}
+
+		this.mappingFile.validate(messages);
+	}
+
+
+	// ********** misc **********
+
+	@Override
+	public void toString(StringBuilder sb) {
+		super.toString(sb);
+		sb.append(this.fileName);
+	}
+
+}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/AbstractPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/AbstractPersistenceUnit.java
index aebfbe4e5c..a22b7825bb 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/AbstractPersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/AbstractPersistenceUnit.java
@@ -33,10 +33,8 @@ 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.internal.context.AbstractXmlContextNode;
-import org.eclipse.jpt.core.internal.resource.orm.OrmXmlResourceProvider;
 import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
 import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
 import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
@@ -102,37 +100,22 @@ public abstract class AbstractPersistenceUnit
 
 	// ********** construction/initialization **********
 
-	protected AbstractPersistenceUnit(Persistence parent) {
-		super(parent);
-	}
-
-	/**
-	 * These lists are just copies of what is distributed across the context
-	 * model; so, if they have (virtually) changed, the resulting update has
-	 * already been triggered. We don't need to trigger another one here.
-	 */
-	@Override
-	protected void addNonUpdateAspectNamesTo(Set<String> nonUpdateAspectNames) {
-		super.addNonUpdateAspectNamesTo(nonUpdateAspectNames);
-		nonUpdateAspectNames.add(GENERATORS_LIST);
-		nonUpdateAspectNames.add(QUERIES_LIST);
-	}
-
 	/**
-	 * NB: Be careful changing the order of the statements in this method
+	 * NB: Be careful changing the order of initialization
 	 * (bug 258701 is one reason).
 	 */
-	public void initialize(XmlPersistenceUnit xpu) {
-		this.xmlPersistenceUnit = xpu;
-		this.name = xpu.getName();
-		this.specifiedExcludeUnlistedClasses = xpu.getExcludeUnlistedClasses();
+	protected AbstractPersistenceUnit(Persistence parent, XmlPersistenceUnit xmlPersistenceUnit) {
+		super(parent);
+		this.xmlPersistenceUnit = xmlPersistenceUnit;
+		this.name = this.xmlPersistenceUnit.getName();
+		this.specifiedExcludeUnlistedClasses = this.xmlPersistenceUnit.getExcludeUnlistedClasses();
 		this.specifiedTransactionType = this.buildSpecifiedTransactionType();
 		this.defaultTransactionType = this.buildDefaultTransactionType();
-		this.description = xpu.getDescription();
-		this.provider = xpu.getProvider();
-		this.jtaDataSource = xpu.getJtaDataSource();
-		this.nonJtaDataSource = xpu.getNonJtaDataSource();
-		this.specifiedExcludeUnlistedClasses = xpu.getExcludeUnlistedClasses();
+		this.description = this.xmlPersistenceUnit.getDescription();
+		this.provider = this.xmlPersistenceUnit.getProvider();
+		this.jtaDataSource = this.xmlPersistenceUnit.getJtaDataSource();
+		this.nonJtaDataSource = this.xmlPersistenceUnit.getNonJtaDataSource();
+		this.specifiedExcludeUnlistedClasses = this.xmlPersistenceUnit.getExcludeUnlistedClasses();
 
 		this.initializeJarFiles();
 
@@ -149,6 +132,18 @@ public abstract class AbstractPersistenceUnit
 		this.initializePersistenceUnitDefaults();
 	}
 
+	/**
+	 * These lists are just copies of what is distributed across the context
+	 * model; so, if they have (virtually) changed, the resulting update has
+	 * already been triggered. We don't need to trigger another one here.
+	 */
+	@Override
+	protected void addNonUpdateAspectNamesTo(Set<String> nonUpdateAspectNames) {
+		super.addNonUpdateAspectNamesTo(nonUpdateAspectNames);
+		nonUpdateAspectNames.add(GENERATORS_LIST);
+		nonUpdateAspectNames.add(QUERIES_LIST);
+	}
+
 	protected void initializeJarFiles() {
 		for (String jarFile : this.xmlPersistenceUnit.getJarFiles()) {
 			this.jarFiles.add(jarFile);
@@ -224,7 +219,7 @@ public abstract class AbstractPersistenceUnit
 	}
 
 	public TextRange getSelectionTextRange() {
-		return xmlPersistenceUnit.getSelectionTextRange();
+		return this.xmlPersistenceUnit.getSelectionTextRange();
 	}
 
 	public void dispose() {
@@ -424,7 +419,7 @@ public abstract class AbstractPersistenceUnit
 	}
 
 	protected MappingFileRef buildImpliedMappingFileRef() {
-		return this.buildMappingFileRef(null);
+		return getJpaFactory().buildImpliedMappingFileRef(this);
 	}
 
 	protected void unsetImpliedMappingFileRef() {
@@ -997,9 +992,7 @@ public abstract class AbstractPersistenceUnit
 	}
 
 	protected boolean impliedMappingFileExists() {
-		OrmXmlResourceProvider xmlResourceProvider = OrmXmlResourceProvider.getDefaultXmlResourceProvider(this.getJpaProject().getProject());
-		OrmXmlResource xmlResource = xmlResourceProvider.getXmlResource();
-		return (xmlResource != null) && xmlResource.exists();
+		return getJpaProject().getDefaultOrmXmlResource() != null;
 	}
 
 	protected void updateJarFiles() {
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
index 2418a7f700..b2213a637e 100644
--- 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
@@ -9,156 +9,43 @@
  *******************************************************************************/
 package org.eclipse.jpt.core.internal.context.persistence;
 
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jpt.core.JpaStructureNode;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.context.MappingFile;
-import org.eclipse.jpt.core.context.MappingFilePersistenceUnitDefaults;
-import org.eclipse.jpt.core.context.MappingFileRoot;
-import org.eclipse.jpt.core.context.PersistentType;
-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.context.AbstractXmlContextNode;
-import org.eclipse.jpt.core.internal.resource.JpaXmlResourceProviderManager;
-import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.core.resource.JpaXmlResourceProvider;
-import org.eclipse.jpt.core.resource.common.JpaXmlResource;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
 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.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 
 public class GenericMappingFileRef
-	extends AbstractXmlContextNode
-	implements MappingFileRef
+	extends AbstractMappingFileRef
 {
-	// this is null for an "implied" mapping file ref
 	protected XmlMappingFileRef xmlMappingFileRef;
 
-	protected String fileName;
-
-	protected MappingFile mappingFile;
-
-
 	// ********** construction/initialization **********
 
 	public GenericMappingFileRef(PersistenceUnit parent, XmlMappingFileRef xmlMappingFileRef) {
-		super(parent);
-		this.initialize(xmlMappingFileRef);
-	}
-
-	protected void initialize(XmlMappingFileRef fileRef) {
-		this.xmlMappingFileRef = fileRef;
-		this.fileName = this.buildFileName();
-		this.initializeMappingFile();
-	}
-
-	protected void initializeMappingFile() {
-		JpaXmlResource xmlResource = this.getXmlResource();
-		if (exists(xmlResource)) {
-			this.mappingFile = this.buildMappingFile(xmlResource);
-		}
-	}
-
-	protected JpaXmlResource getXmlResource() {
-		JpaXmlResourceProvider xmlResourceProvider = this.getXmlResourceProvider();
-		return (xmlResourceProvider == null) ? null : xmlResourceProvider.getXmlResource();
-	}
-
-	protected JpaXmlResourceProvider getXmlResourceProvider() {
-		IFile platformFile = this.getPlatformFile();
-		return exists(platformFile) ? getXmlResourceProvider(platformFile) : null;
-	}
-
-	protected IFile getPlatformFile() {
-		if (this.fileName == null) {
-			return null;
-		}
-		IProject project = this.getJpaProject().getProject();
-		IPath deploymentPath = new Path(JptCorePlugin.getDeploymentURI(project, this.fileName));
-		IVirtualFile vFile = ComponentCore.createFile(project, deploymentPath);
-		return vFile.getUnderlyingFile();
-	}
-
-	protected static JpaXmlResourceProvider getXmlResourceProvider(IFile file) {
-		return JpaXmlResourceProviderManager.instance().getXmlResourceProvider(file);
-	}
-
-
-	// ********** JpaStructureNode implementation **********
-
-	public String getId() {
-		return PersistenceStructureNodes.MAPPING_FILE_REF_ID;
+		super(parent, xmlMappingFileRef.getFileName());
+		this.xmlMappingFileRef = xmlMappingFileRef;
 	}
 
-	public JpaStructureNode getStructureNode(int textOffset) {
-		return this;
-	}
-
-	public TextRange getSelectionTextRange() {
-		return this.isVirtual() ? null : this.xmlMappingFileRef.getSelectionTextRange();
-	}
-
-	public void dispose() {
-		if (this.mappingFile != null) {
-			this.mappingFile.dispose();
-		}
-	}
-
-
-	// ********** queries **********
-
 	public boolean isVirtual() {
-		return this.xmlMappingFileRef == null;
-	}
-
-	public MappingFilePersistenceUnitDefaults getPersistenceUnitDefaults() {
-		MappingFileRoot root = this.getMappingFileRoot_();
-		return (root == null) ? null : root.getPersistenceUnitDefaults();
-	}
-
-	/**
-	 * #getMappingFileRoot() is already defined by JpaContextNode for the
-	 * descendants of a "mapping file root" - we want something slightly
-	 * different here...
-	 */
-	protected MappingFileRoot getMappingFileRoot_() {
-		return (this.mappingFile == null) ? null : this.mappingFile.getRoot();
+		return false;
 	}
 
-	public boolean persistenceUnitDefaultsExists() {
-		MappingFilePersistenceUnitDefaults defaults = this.getPersistenceUnitDefaults();
-		return (defaults != null) && defaults.resourceExists();
+	public TextRange getSelectionTextRange() {
+		return this.xmlMappingFileRef.getSelectionTextRange();
 	}
-
-	public PersistentType getPersistentType(String typeName) {
-		return (this.mappingFile == null) ? null : this.mappingFile.getPersistentType(typeName);
+	
+	public TextRange getValidationTextRange() {
+		return this.xmlMappingFileRef.getValidationTextRange();
 	}
 
 	public boolean containsOffset(int textOffset) {
-		return (this.xmlMappingFileRef != null) && this.xmlMappingFileRef.containsOffset(textOffset);
-	}
-
-
-	// ********** file name **********
-
-	public String getFileName() {
-		return this.fileName;
+		return this.xmlMappingFileRef.containsOffset(textOffset);
 	}
 
-	public void setFileName(String fileName) {
-		this.xmlMappingFileRef.setFileName(fileName);
-		this.setFileName_(fileName);
+	public void setFileName(String newFileName) {
+		String old = this.fileName;
+		this.fileName = newFileName;
+		this.xmlMappingFileRef.setFileName(newFileName);
+		this.firePropertyChanged(FILE_NAME_PROPERTY, old, newFileName);
 	}
 
 	protected void setFileName_(String newFileName) {
@@ -166,139 +53,14 @@ public class GenericMappingFileRef
 		this.fileName = newFileName;
 		this.firePropertyChanged(FILE_NAME_PROPERTY, old, newFileName);
 	}
-
-
-	// ********** mapping file **********
-
-	public MappingFile getMappingFile() {
-		return this.mappingFile;
-	}
-
-	protected void setMappingFile(MappingFile mappingFile) {
-		MappingFile old = this.mappingFile;
-		this.mappingFile = mappingFile;
-		this.firePropertyChanged(MAPPING_FILE_PROPERTY, old, mappingFile);
+	
+	protected String getResourceFileName() {
+		return this.xmlMappingFileRef.getFileName();
 	}
-
-
-	// ********** updating **********
-
+	
 	public void update(XmlMappingFileRef mappingFileRef) {
 		this.xmlMappingFileRef = mappingFileRef;
-		this.setFileName_(this.buildFileName());
-		this.updateMappingFile();
-	}
-
-	protected String buildFileName() {
-		return this.isVirtual() ? JptCorePlugin.DEFAULT_ORM_XML_FILE_PATH
-						: this.xmlMappingFileRef.getFileName();
-	}
-
-	protected void updateMappingFile() {
-		JpaXmlResource xmlResource = this.getXmlResource();
-		if (exists(xmlResource)) {
-			if (this.mappingFile == null) {
-				this.setMappingFile(this.buildMappingFile(xmlResource));
-			} else {
-				// if the resource type has changed, rebuild the mapping file
-				if (this.mappingFile.getXmlResource() != xmlResource) {
-					this.mappingFile.dispose();
-				}
-				this.mappingFile.update(xmlResource);
-			}
-		} else {
-			if (this.mappingFile != null) {
-				this.mappingFile.dispose();
-				this.setMappingFile(null);
-			}
-		}
+		this.setFileName_(this.getResourceFileName());
+		super.update();
 	}
-
-	protected MappingFile buildMappingFile(JpaXmlResource resource) {
-		return this.getJpaPlatform().buildMappingFile(this, (OrmXmlResource) resource);
-	}
-
-
-	// ********** XmlContextNode implementation **********
-
-	public TextRange getValidationTextRange() {
-		return this.isVirtual() ? this.getPersistenceUnit().getValidationTextRange() :
-		this.xmlMappingFileRef.getValidationTextRange();
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages) {
-		super.validate(messages);
-
-		if (StringTools.stringIsEmpty(this.fileName)) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					JpaValidationMessages.PERSISTENCE_UNIT_UNSPECIFIED_MAPPING_FILE,
-					this,
-					this.getValidationTextRange()
-				)
-			);
-			return;
-		}
-
-		if (this.mappingFile == null) {
-			IFile platformFile = this.getPlatformFile();
-			String msgID = exists(platformFile) ?
-					JpaValidationMessages.PERSISTENCE_UNIT_UNSUPPORTED_MAPPING_FILE_CONTENT
-				:
-					JpaValidationMessages.PERSISTENCE_UNIT_NONEXISTENT_MAPPING_FILE;
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					msgID,
-					new String[] {this.fileName},
-					this,
-					this.getValidationTextRange()
-				)
-			);
-			return;
-		}
-
-		if (this.mappingFile.getRoot() == null) {
-			messages.add(
-				DefaultJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					JpaValidationMessages.PERSISTENCE_UNIT_INVALID_MAPPING_FILE,
-					new String[] {this.fileName},
-					this,
-					this.getValidationTextRange()
-				)
-			);
-		}
-
-		this.mappingFile.validate(messages);
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public void toString(StringBuilder sb) {
-		super.toString(sb);
-		sb.append(this.fileName);
-	}
-
-	/**
-	 * convenience method - null check
-	 */
-	protected static boolean exists(IFile file) {
-		return (file != null) && file.exists();
-	}
-
-	/**
-	 * convenience method - null check
-	 */
-	protected static boolean exists(JpaXmlResource xmlResource) {
-		return (xmlResource != null) && xmlResource.exists();
-	}
-
 }
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
index 5ab7e1e36c..c27f814edc 100644
--- 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
@@ -40,7 +40,8 @@ public class GenericPersistence extends AbstractXmlContextNode
 
 	public GenericPersistence(PersistenceXml parent, XmlPersistence xmlPersistence) {
 		super(parent);
-		this.initialize(xmlPersistence);
+		this.xmlPersistence = xmlPersistence;
+		this.initializePersistenceUnits();
 	}
 	
 	public String getId() {
@@ -117,15 +118,10 @@ public class GenericPersistence extends AbstractXmlContextNode
 	
 	// **************** updating ***********************************************
 	
-	protected void initialize(XmlPersistence persistence) {
-		this.xmlPersistence = persistence;
-		initializePersistenceUnits(persistence);
-	}
-	
-	protected void initializePersistenceUnits(XmlPersistence persistence) {
+	protected void initializePersistenceUnits() {
 		// only adding one here, until we support multiple persistence units
 		if (this.xmlPersistence.getPersistenceUnits().size() > 0) {
-			this.persistenceUnit = createPersistenceUnit(persistence.getPersistenceUnits().get(0));
+			this.persistenceUnit = createPersistenceUnit(this.xmlPersistence.getPersistenceUnits().get(0));
 		}
 	}
 	
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
index 5b05795db4..18fec8e3cc 100644
--- 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
@@ -10,13 +10,14 @@
 package org.eclipse.jpt.core.internal.context.persistence;
 
 import org.eclipse.jpt.core.context.persistence.Persistence;
+import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
 
 public class GenericPersistenceUnit
 	extends AbstractPersistenceUnit
 {
 	
-	public GenericPersistenceUnit(Persistence parent) {
-		super(parent);
+	public GenericPersistenceUnit(Persistence parent, XmlPersistenceUnit xmlPersistenceUnit) {
+		super(parent, xmlPersistenceUnit);
 	}
 
 }
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
index fb8ab15d11..848bf5d561 100644
--- 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
@@ -13,6 +13,7 @@ import java.util.List;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.jpt.core.JpaStructureNode;
+import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.context.JpaRootContextNode;
 import org.eclipse.jpt.core.context.persistence.Persistence;
 import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
@@ -20,8 +21,8 @@ import org.eclipse.jpt.core.context.persistence.PersistenceXml;
 import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
 import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
 import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
-import org.eclipse.jpt.core.resource.persistence.PersistenceXmlResource;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistence;
 import org.eclipse.jpt.core.utility.TextRange;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
@@ -33,16 +34,25 @@ public class GenericPersistenceXml
 	extends AbstractXmlContextNode
 	implements PersistenceXml
 {
-	protected PersistenceXmlResource persistenceXmlResource;
+	protected JpaXmlResource persistenceXmlResource;
 	
 	protected Persistence persistence;
 	
 	
-	public GenericPersistenceXml(JpaRootContextNode parent, PersistenceXmlResource persistenceResource) {
+	public GenericPersistenceXml(JpaRootContextNode parent, JpaXmlResource resource) {
 		super(parent);
-		this.initialize(persistenceResource);
+		if (!resource.getContentType().isKindOf(JptCorePlugin.PERSISTENCE_XML_CONTENT_TYPE)) {
+			throw new IllegalArgumentException("Resource " + resource + " must have persistence xml content type"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		this.persistenceXmlResource = resource;
+		if (resource.getRootObject() != null) {
+			this.persistence = buildPersistence((XmlPersistence) resource.getRootObject());
+		}
 	}
 	
+	public JpaXmlResource getXmlResource() {
+		return this.persistenceXmlResource;
+	}
 	
 	// **************** JpaNode impl *******************************************
 	
@@ -86,7 +96,7 @@ public class GenericPersistenceXml
 		this.persistence.dispose();
 		Persistence oldPersistence = this.persistence;
 		this.persistence = null;
-		XmlPersistence xmlPersistence = this.persistenceXmlResource.getPersistence();
+		XmlPersistence xmlPersistence = (XmlPersistence) this.persistenceXmlResource.getRootObject();
 		this.persistenceXmlResource.getContents().remove(xmlPersistence);
 		firePropertyChanged(PERSISTENCE_PROPERTY, oldPersistence, null);
 	}
@@ -99,18 +109,14 @@ public class GenericPersistenceXml
 	
 	
 	// **************** updating ***********************************************
-	
-	protected void initialize(PersistenceXmlResource pr) {
-		this.persistenceXmlResource = pr;
-		if (pr.getPersistence() != null) {
-			this.persistence = buildPersistence(pr.getPersistence());
-		}
-	}
 
-	public void update(PersistenceXmlResource persistenceResource) {
+	//TODO I haven't yet figured out if we do not need the resource object passed in now.
+	//I don't think we will even build GenericPersistenceXml if the resource object is null
+	//I'm pretty sure this won't change now, but need to investigate - KFB
+	public void update(JpaXmlResource persistenceResource) {
 		XmlPersistence oldXmlPersistence = 
 			(this.persistence == null) ? null : this.persistence.getXmlPersistence();
-		XmlPersistence newXmlPersistence = persistenceResource.getPersistence();
+		XmlPersistence newXmlPersistence = (XmlPersistence) persistenceResource.getRootObject();
 		
 		this.persistenceXmlResource = persistenceResource;
 		
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/ImpliedMappingFileRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/ImpliedMappingFileRef.java
new file mode 100644
index 0000000000..0d22a3c80f
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/ImpliedMappingFileRef.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.core.internal.context.persistence;
+
+import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
+import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
+import org.eclipse.jpt.core.utility.TextRange;
+
+public class ImpliedMappingFileRef
+	extends AbstractMappingFileRef
+{
+
+	
+	// ********** construction/initialization **********
+
+	public ImpliedMappingFileRef(PersistenceUnit parent, String resourceFileName) {
+		super(parent, resourceFileName);
+	}
+		
+	public boolean isVirtual() {
+		return true;
+	}
+
+	public void setFileName(String fileName) {
+		throw new UnsupportedOperationException("Can not set a fileName on a implied mapping file ref"); //$NON-NLS-1$
+	}
+
+	public TextRange getSelectionTextRange() {
+		return null;
+	}
+	
+	public TextRange getValidationTextRange() {
+		return this.getPersistenceUnit().getValidationTextRange();
+	}
+	
+	public boolean containsOffset(int textOffset) {
+		return false;
+	}
+	
+	public void update(XmlMappingFileRef mappingFileRef) {
+		if (mappingFileRef != null) {
+			throw new IllegalArgumentException("mappingFileRef should be null for an implied mapping file"); //$NON-NLS-1$
+		}
+		super.update();
+	}
+}
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
index f16bde8ecf..3553c3401a 100644
--- 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
@@ -27,10 +27,10 @@ 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.resource.orm.OrmXmlResourceProvider;
-import org.eclipse.jpt.core.internal.resource.persistence.PersistenceXmlResourceProvider;
+import org.eclipse.jpt.core.resource.AbstractXmlResourceProvider;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.orm.AccessType;
 import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
 import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
 import org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults;
 import org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata;
@@ -50,9 +50,9 @@ public class OrmFileCreationOperation extends AbstractDataModelOperation
 		// Create source folder if it does not exist
 		IFolder folder = createSourceFolder();
 		// Create orm file
-		createMappingFile(folder);
+		IFile file = createMappingFile(folder);
 		// Add orm file to persistence unit if specified
-		addMappingFileToPersistenceXml();
+		addMappingFileToPersistenceXml(file);
 		return OK_STATUS;
 	}
 	
@@ -118,53 +118,57 @@ public class OrmFileCreationOperation extends AbstractDataModelOperation
 		return folder;
 	}
 	
-	@SuppressWarnings("unchecked")
-	protected void createMappingFile(IFolder folder) {
+	protected IFile createMappingFile(IFolder folder) {
 		String filePath = getDataModel().getStringProperty(FILE_PATH);
 		IFile file = folder.getFile(new Path(filePath));
-		final OrmXmlResourceProvider modelProvider =
-			OrmXmlResourceProvider.getXmlResourceProvider(file);
-		
-		modelProvider.modify(new Runnable() {
+		final AbstractXmlResourceProvider resourceProvider = getXmlResourceProvider(file);
+		final JpaXmlResource xmlResource;
+		try {
+			xmlResource = resourceProvider.createFileAndResource();
+		}
+		catch (CoreException e) {
+			JptCorePlugin.log(e);
+			return null;
+		}
+		xmlResource.modify(new Runnable() {
 				public void run() {
-					OrmXmlResource ormResource = modelProvider.getXmlResource();
-					
-					XmlEntityMappings entityMappings = OrmFactory.eINSTANCE.createXmlEntityMappings();
-					entityMappings.setVersion("1.0"); //$NON-NLS-1$
-					ormResource.getContents().add(entityMappings);
-					
 					AccessType defaultAccess = (AccessType) getDataModel().getProperty(DEFAULT_ACCESS); 
 					if (defaultAccess != null) {
 						XmlPersistenceUnitMetadata puMetadata = OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata();
-						entityMappings.setPersistenceUnitMetadata(puMetadata);
+						((XmlEntityMappings) xmlResource.getRootObject()).setPersistenceUnitMetadata(puMetadata);
 						XmlPersistenceUnitDefaults puDefaults = OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults();
 						puMetadata.setPersistenceUnitDefaults(puDefaults);
 						puDefaults.setAccess(defaultAccess);
 					}
 				}
 			});
+		return file;
 	}
 	
-	protected void addMappingFileToPersistenceXml() throws ExecutionException {
+	protected AbstractXmlResourceProvider getXmlResourceProvider(IFile file) {
+		return OrmXmlResourceProvider.getXmlResourceProvider(file);
+	}
+	
+	protected void addMappingFileToPersistenceXml(IFile file) throws ExecutionException {
 		if (! getDataModel().getBooleanProperty(ADD_TO_PERSISTENCE_UNIT)) {
 			return;
 		}
-		
-		PersistenceXmlResourceProvider modelProvider =
-			PersistenceXmlResourceProvider.getDefaultXmlResourceProvider(getProject());
+		JpaProject jpaProject = JptCorePlugin.getJpaProject(file.getProject());
+		JpaXmlResource resource = jpaProject.getPersistenceXmlResource();
+	
 		final PersistenceUnit pUnit = getPersistenceUnit();
-		modelProvider.modify(new Runnable() {
-				public void run() {
-					String filePath = getDataModel().getStringProperty(FILE_PATH);
-					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());
 		
+		resource.modify(new Runnable() {
+			public void run() {
+				String filePath = getDataModel().getStringProperty(FILE_PATH);
+				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());
+			}
+		});
 	}
 }
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
index dcf2017489..354762a02c 100644
--- 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
@@ -17,6 +17,7 @@ import org.eclipse.jpt.core.JpaFactory;
 import org.eclipse.jpt.core.JpaFile;
 import org.eclipse.jpt.core.JpaProject;
 import org.eclipse.jpt.core.JpaResourceModel;
+import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.context.AssociationOverride;
 import org.eclipse.jpt.core.context.AttributeOverride;
 import org.eclipse.jpt.core.context.JpaRootContextNode;
@@ -204,9 +205,10 @@ 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.context.persistence.ImpliedMappingFileRef;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
 import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
 import org.eclipse.jpt.core.resource.orm.XmlBasic;
@@ -231,7 +233,6 @@ import org.eclipse.jpt.core.resource.orm.XmlTableGenerator;
 import org.eclipse.jpt.core.resource.orm.XmlTransient;
 import org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint;
 import org.eclipse.jpt.core.resource.orm.XmlVersion;
-import org.eclipse.jpt.core.resource.persistence.PersistenceXmlResource;
 import org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistence;
@@ -271,15 +272,15 @@ public class GenericJpaFactory
 		return new GenericRootContextNode(parent);
 	}
 	
-	public MappingFile buildMappingFile(MappingFileRef parent, OrmXmlResource ormXmlresource) {
-		return this.buildOrmXml(parent, ormXmlresource);
+	public MappingFile buildMappingFile(MappingFileRef parent, JpaXmlResource resource) {
+		return this.buildOrmXml(parent, resource);
 	}
 	
 
 	// ********** Persistence Context Model **********
 	
-	public PersistenceXml buildPersistenceXml(JpaRootContextNode parent, PersistenceXmlResource persistenceXmlResource) {
-		return new GenericPersistenceXml(parent, persistenceXmlResource);
+	public PersistenceXml buildPersistenceXml(JpaRootContextNode parent, JpaXmlResource resource) {
+		return new GenericPersistenceXml(parent, resource);
 	}
 	
 	public Persistence buildPersistence(PersistenceXml parent, XmlPersistence xmlPersistence) {
@@ -287,15 +288,17 @@ public class GenericJpaFactory
 	}
 	
 	public PersistenceUnit buildPersistenceUnit(Persistence parent, XmlPersistenceUnit xmlPersistenceUnit) {
-		PersistenceUnit persistenceUnit = new GenericPersistenceUnit(parent);
-		persistenceUnit.initialize(xmlPersistenceUnit);
-		return persistenceUnit;
+		return new GenericPersistenceUnit(parent, xmlPersistenceUnit);
 	}
 	
 	public MappingFileRef buildMappingFileRef(PersistenceUnit parent, XmlMappingFileRef xmlMappingFileRef) {
 		return new GenericMappingFileRef(parent, xmlMappingFileRef);
 	}
 	
+	public MappingFileRef buildImpliedMappingFileRef(PersistenceUnit parent) {
+		return new ImpliedMappingFileRef(parent,JptCorePlugin.DEFAULT_ORM_XML_FILE_PATH );
+	}
+	
 	public ClassRef buildClassRef(PersistenceUnit parent, XmlJavaClassRef classRef) {
 		return new GenericClassRef(parent, classRef);
 	}
@@ -311,10 +314,8 @@ public class GenericJpaFactory
 
 	// ********** ORM Context Model **********
 	
-	public OrmXml buildOrmXml(MappingFileRef parent, OrmXmlResource ormXmlResource) {
-		OrmXml ormXml = new GenericOrmXml(parent);
-		ormXml.initialize(ormXmlResource);
-		return ormXml;
+	public OrmXml buildOrmXml(MappingFileRef parent, JpaXmlResource xmlResource) {
+		return new GenericOrmXml(parent, xmlResource);
 	}
 	
 	public EntityMappings buildEntityMappings(OrmXml parent, XmlEntityMappings xmlEntityMappings) {
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
index 36e837ab96..d1598840de 100644
--- 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
@@ -44,7 +44,7 @@ import org.eclipse.jpt.core.internal.context.java.JavaNullAttributeMappingProvid
 import org.eclipse.jpt.core.internal.context.orm.OrmNullAttributeMappingProvider;
 import org.eclipse.jpt.core.internal.utility.PlatformTools;
 import org.eclipse.jpt.core.internal.utility.jdt.DefaultAnnotationEditFormatter;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.core.utility.jdt.AnnotationEditFormatter;
 import org.eclipse.jpt.db.ConnectionProfileFactory;
@@ -123,7 +123,7 @@ public class GenericJpaPlatform
 	 */
 	protected JpaResourceModelProvider getResourceModelProvider(IContentType contentType) {
 		for (JpaResourceModelProvider provider : CollectionTools.iterable(resourceModelProviders())) {
-			if (provider.getContentType().isKindOf(contentType)) {
+			if (contentType.isKindOf(provider.getContentType())) {
 				return provider;
 			}
 		}
@@ -272,17 +272,17 @@ public class GenericJpaPlatform
 
 	// ********** Mapping File **********
 
-	public MappingFile buildMappingFile(MappingFileRef parent, OrmXmlResource resource) {
-		return this.getMappingFileProviderForResourceType(resource.getType()).buildMappingFile(parent, resource, this.jpaFactory);
+	public MappingFile buildMappingFile(MappingFileRef parent, JpaXmlResource resource) {
+		return this.getMappingFileProviderForResourceType(resource.getContentType()).buildMappingFile(parent, resource, this.jpaFactory);
 	}
 
-	protected MappingFileProvider getMappingFileProviderForResourceType(String resourceType) {
+	protected MappingFileProvider getMappingFileProviderForResourceType(IContentType contentType) {
 		for (MappingFileProvider provider : CollectionTools.iterable(this.mappingFileProviders())) {
-			if (provider.getResourceType() == resourceType) {
+			if (provider.getContentType().equals(contentType)) {
 				return provider;
 			}
 		}
-		throw new IllegalArgumentException("Illegal mapping file resource type: " + resourceType); //$NON-NLS-1$
+		throw new IllegalArgumentException("Illegal mapping file content type: " + contentType); //$NON-NLS-1$
 	}
 	
 	protected ListIterator<MappingFileProvider> mappingFileProviders() {
@@ -300,12 +300,12 @@ public class GenericJpaPlatform
 	// ********** extended ORM type mappings **********
 
 	public OrmTypeMapping buildOrmTypeMappingFromMappingKey(String key, OrmPersistentType type) {
-		return this.getOrmTypeMappingProviderForMappingKey(type.getOrmType(), key).buildMapping(type, this.jpaFactory);
+		return this.getOrmTypeMappingProviderForMappingKey(type.getContentType(), key).buildMapping(type, this.jpaFactory);
 	}
 
-	protected OrmTypeMappingProvider getOrmTypeMappingProviderForMappingKey(String ormType, String key) {
+	protected OrmTypeMappingProvider getOrmTypeMappingProviderForMappingKey(IContentType contentType, String key) {
 		for (ExtendedOrmTypeMappingProvider provider : CollectionTools.iterable(this.extendedOrmTypeMappingProviders())) {
-			if ((provider.getOrmType() == ormType) && (provider.getKey() == key)) {
+			if ((provider.getContentType().equals(contentType)) && (provider.getKey() == key)) {
 				return provider;
 			}
 		}
@@ -350,16 +350,16 @@ public class GenericJpaPlatform
 	// ********** extended ORM attribute mappings **********
 
 	public OrmAttributeMapping buildOrmAttributeMappingFromMappingKey(String key, OrmPersistentAttribute attribute) {
-		return this.getOrmAttributeMappingProviderForMappingKey(attribute.getOrmType(), key).buildMapping(attribute, this.jpaFactory);
+		return this.getOrmAttributeMappingProviderForMappingKey(attribute.getContentType(), key).buildMapping(attribute, this.jpaFactory);
 	}
 
 	public XmlAttributeMapping buildVirtualOrmResourceMappingFromMappingKey(String key, OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping) {
-		return this.getOrmAttributeMappingProviderForMappingKey(ormTypeMapping.getOrmType(), key).buildVirtualResourceMapping(ormTypeMapping, javaAttributeMapping, this.jpaFactory);
+		return this.getOrmAttributeMappingProviderForMappingKey(ormTypeMapping.getContentType(), key).buildVirtualResourceMapping(ormTypeMapping, javaAttributeMapping, this.jpaFactory);
 	}
 
-	protected OrmAttributeMappingProvider getOrmAttributeMappingProviderForMappingKey(String ormType, String key) {
+	protected OrmAttributeMappingProvider getOrmAttributeMappingProviderForMappingKey(IContentType contentType, String key) {
 		for (ExtendedOrmAttributeMappingProvider provider : CollectionTools.iterable(this.extendedOrmAttributeMappingProviders())) {
-			if ((provider.getOrmType() == ormType) && (provider.getKey() == key)) {
+			if ((provider.getContentType().equals(contentType)) && (provider.getKey() == key)) {
 				return provider;
 			}
 		}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/JpaXmlResourceProviderManager.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/JpaXmlResourceProviderManager.java
deleted file mode 100644
index 52e10c6ce6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/JpaXmlResourceProviderManager.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.core.internal.resource;
-
-import java.util.HashMap;
-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.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.internal.JptCoreMessages;
-import org.eclipse.jpt.core.internal.utility.PlatformTools;
-import org.eclipse.jpt.core.resource.JpaXmlResourceProvider;
-import org.eclipse.jpt.core.resource.JpaXmlResourceProviderFactory;
-import org.eclipse.jpt.utility.internal.CollectionTools;
-import org.eclipse.jpt.utility.internal.iterators.CompositeIterator;
-import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Cache the resource model provider factories as they are requested.
- */
-public class JpaXmlResourceProviderManager {
-
-	/**
-	 * key: file content type
-	 * value: resource model provider factory provider(!)
-	 */
-	private final HashMap<String, FactoryProvider> factoryProviders;
-
-	private static final String EXTENSION_ID = "resourceModelProviders"; //$NON-NLS-1$
-	private static final String EL_MODEL_PROVIDER = "modelProvider"; //$NON-NLS-1$
-	private static final String AT_FILE_CONTENT_TYPE = "fileContentType"; //$NON-NLS-1$
-	private static final String AT_FACTORY_CLASS = "factoryClass"; //$NON-NLS-1$
-
-
-	// singleton
-	private static final JpaXmlResourceProviderManager INSTANCE = new JpaXmlResourceProviderManager();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JpaXmlResourceProviderManager instance() {
-		return INSTANCE;
-	}
-
-
-	// ********** construction **********
-
-	private JpaXmlResourceProviderManager() {
-		super();
-		this.factoryProviders = this.buildFactoryProviders();
-	}
-
-	private HashMap<String, FactoryProvider> buildFactoryProviders() {
-		HashMap<String, FactoryProvider> providers = new HashMap<String, FactoryProvider>();
-		for (Iterator<IConfigurationElement> stream = this.configElements(); stream.hasNext(); ) {
-			this.addFactoryProviderTo(stream.next(), providers);
-		}
-		return providers;
-	}
-	
-	/**
-	 * Return the configuration elements from the Eclipse platform extension
-	 * registry.
-	 */
-	private Iterator<IConfigurationElement> configElements() {
-		return new CompositeIterator<IConfigurationElement>(this.configElementIterators());
-	}
-	
-	private Iterator<Iterator<IConfigurationElement>> configElementIterators() {
-		return 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.getExtensionPoint().getExtensions());
-	}
-
-	private IExtensionPoint getExtensionPoint() {
-		return Platform.getExtensionRegistry().getExtensionPoint(JptCorePlugin.PLUGIN_ID, EXTENSION_ID);
-	}
-
-	/**
-	 * check *all* attributes before returning;
-	 * log errors, but keep on truckin'
-	 */
-	private void addFactoryProviderTo(IConfigurationElement configElement, HashMap<String, FactoryProvider> providers) {
-		if ( ! configElement.getName().equals(EL_MODEL_PROVIDER)) {
-			return;
-		}
-		boolean missingAttribute = false;
-		String fileContentType = configElement.getAttribute(AT_FILE_CONTENT_TYPE);
-		if (fileContentType == null) {
-			logMissingAttribute(configElement, AT_FILE_CONTENT_TYPE);
-			missingAttribute = false;
-		}
-		if (configElement.getAttribute(AT_FACTORY_CLASS) == null) {
-			logMissingAttribute(configElement, AT_FACTORY_CLASS);
-			missingAttribute = false;
-		}
-		if (missingAttribute) {
-			return;
-		}
-		FactoryProvider prev = providers.get(fileContentType);
-		if (prev == null) {
-			providers.put(fileContentType, new FactoryProvider(configElement));
-		} else {
-			// first config element wins - ignore later elements
-			logDuplicateFileContentType(prev.getConfigurationElement(), configElement);
-		}
-	}
-
-
-	// ********** public API **********
-
-	/**
-	 * Returns a resource model provider for the specified file, based on its
-	 * content type, if there is one registered for that content type, or one
-	 * of its base content types if no resource model provider is registered
-	 * for that content type.
-	 * 
-	 * @param file the file the resource model represents
-	 * @return the resource model provider for the file
-	 */
-	public JpaXmlResourceProvider getXmlResourceProvider(IFile file) {
-		IProject project = file.getProject();
-		IPath path = file.getFullPath();
-
-		IContentType contentType = PlatformTools.getContentType(file);
-		while (contentType != null) {
-			JpaXmlResourceProvider modelProvider = this.getXmlResourceProvider(project, path, contentType);
-			if (modelProvider != null) {
-				return modelProvider;
-			}
-			contentType = contentType.getBaseType();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Returns a resource model provider for the specified file path of the given content type
-	 * in the given project.
-	 * @param project the project in which the file path exists
-	 * @param filePath the path of the file for which the model provider should
-	 * 	be created
-	 * @param contentType the content type for which to create a model provider
-	 * @return the model provider for the file
-	 */
-	public JpaXmlResourceProvider getXmlResourceProvider(IProject project, IPath filePath, IContentType fileContentType) {
-		JpaXmlResourceProviderFactory factory = this.getFactory(fileContentType);
-		return (factory == null) ? null : factory.create(project, filePath);
-	}
-
-	private JpaXmlResourceProviderFactory getFactory(IContentType fileContentType) {
-		FactoryProvider fp = this.factoryProviders.get(fileContentType.getId());
-		return (fp == null) ? null : fp.getFactory();
-	}
-
-
-	// ********** errors **********
-
-	private static void logMissingAttribute(IConfigurationElement configElement, String attributeName) {
-		JptCorePlugin.log(
-			NLS.bind(
-				JptCoreMessages.RESOURCE_MODEL_PROVIDER_REGISTRY_MISSING_ATTRIBUTE, 
-				new String[] {
-						configElement.getName(),
-						configElement.getContributor().getName(),
-						attributeName
-				}
-			)
-		);
-	}
-
-	private static void logDuplicateFileContentType(IConfigurationElement configElement1, IConfigurationElement configElement2) {
-		JptCorePlugin.log(
-			NLS.bind(
-				JptCoreMessages.RESOURCE_MODEL_PROVIDER_REGISTRY_DUPLICATE_FILE_CONTENT_TYPE, 
-				new String[] {
-						configElement1.getContributor().getName(),
-						configElement2.getContributor().getName(),
-						AT_FILE_CONTENT_TYPE,
-						EL_MODEL_PROVIDER,
-						configElement1.getAttribute(AT_FILE_CONTENT_TYPE)
-				}
-			)
-		);
-	}
-
-
-	// ********** factory provider **********
-
-	private static class FactoryProvider {
-		private final IConfigurationElement configurationElement;
-		private JpaXmlResourceProviderFactory factory;
-		private boolean factoryBuilt;  // factory can be null, so use flag
-
-		FactoryProvider(IConfigurationElement configurationElement) {
-			super();
-			this.configurationElement = configurationElement;
-			this.factoryBuilt = false;
-		}
-
-		IConfigurationElement getConfigurationElement() {
-			return this.configurationElement;
-		}
-
-		synchronized JpaXmlResourceProviderFactory getFactory() {
-			if ( ! this.factoryBuilt) {
-				this.factoryBuilt = true;
-				this.factory = this.buildFactory();
-			}
-			return this.factory;
-		}
-
-		private JpaXmlResourceProviderFactory buildFactory() {
-			try {
-				return (JpaXmlResourceProviderFactory) this.configurationElement.createExecutableExtension(AT_FACTORY_CLASS);
-			} catch (CoreException ex) {
-				this.logFailedInstantiation(ex);
-				return null;  // returning null seems to be expected
-			}
-		}
-
-		private void logFailedInstantiation(CoreException ex) {
-			JptCorePlugin.log(ex);
-			JptCorePlugin.log(
-				NLS.bind(
-					JptCoreMessages.RESOURCE_MODEL_PROVIDER_REGISTRY_FAILED_INSTANTIATION, 
-					new String[] {
-							this.configurationElement.getAttribute(AT_FACTORY_CLASS),
-							this.configurationElement.getName(),
-							this.configurationElement.getContributor().getName()
-					}
-				)
-			);
-		}
-
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmXmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmXmlResourceProvider.java
index 7f59022881..72fd3bfa11 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmXmlResourceProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmXmlResourceProvider.java
@@ -13,19 +13,15 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.internal.JpaConstants;
-import org.eclipse.jpt.core.internal.resource.JpaXmlResourceProviderManager;
 import org.eclipse.jpt.core.resource.AbstractXmlResourceProvider;
 import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
 import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
 
 public class OrmXmlResourceProvider
-	extends AbstractXmlResourceProvider<OrmXmlResource>
+	extends AbstractXmlResourceProvider
 {
 	/**
 	 * (Convenience method) Returns an ORM resource model provider for 
@@ -52,10 +48,7 @@ public class OrmXmlResourceProvider
 	}
 	
 	private static OrmXmlResourceProvider getXmlResourceProvider_(IProject project, String location) {
-		return (OrmXmlResourceProvider) JpaXmlResourceProviderManager.instance().getXmlResourceProvider(
-			project, 
-			new Path(location),
-			JptCorePlugin.ORM_XML_CONTENT_TYPE);
+		return new OrmXmlResourceProvider(project, new Path(location));
 	}
 	
 	
@@ -64,24 +57,13 @@ public class OrmXmlResourceProvider
 	}
 	
 	public OrmXmlResourceProvider(IProject project, IPath filePath) {
-		super(project, filePath);
-	}
-	
-	
-	@Override
-	protected IContentType getContentType() {
-		return JptCorePlugin.ORM_XML_CONTENT_TYPE;
+		super(project, filePath, JptCorePlugin.ORM_XML_CONTENT_TYPE);
 	}
 	
 	@Override
-	protected void populateRoot(JpaXmlResource resource) {
+	protected void populateRoot() {
 		XmlEntityMappings entityMappings = OrmFactory.eINSTANCE.createXmlEntityMappings();
 		entityMappings.setVersion(JpaConstants.VERSION_1_0_TEXT);
-		getResourceContents(resource).add(entityMappings);
-	}
-	
-	@Override
-	protected OrmXmlResource ensureCorrectType(Resource resource) throws ClassCastException {
-		return (OrmXmlResource) resource;
+		getResourceContents().add(entityMappings);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmXmlResourceProviderFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmXmlResourceProviderFactory.java
deleted file mode 100644
index 57620a704c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmXmlResourceProviderFactory.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.core.internal.resource.orm;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jpt.core.resource.JpaXmlResourceProvider;
-import org.eclipse.jpt.core.resource.JpaXmlResourceProviderFactory;
-
-public class OrmXmlResourceProviderFactory implements JpaXmlResourceProviderFactory
-{
-	public JpaXmlResourceProvider create(IProject project, IPath filePath) {
-		return new OrmXmlResourceProvider(project, filePath);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceXmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceXmlResourceProvider.java
index 1031d6ee69..275f77ea61 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceXmlResourceProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceXmlResourceProvider.java
@@ -13,20 +13,15 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.internal.JpaConstants;
-import org.eclipse.jpt.core.internal.resource.JpaXmlResourceProviderManager;
 import org.eclipse.jpt.core.resource.AbstractXmlResourceProvider;
-import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
-import org.eclipse.jpt.core.resource.persistence.PersistenceXmlResource;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistence;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
 
 public class PersistenceXmlResourceProvider
-	extends AbstractXmlResourceProvider<PersistenceXmlResource>
+	extends AbstractXmlResourceProvider
 {
 	/**
 	 * (Convenience method) Returns a persistence resource model provider for 
@@ -53,10 +48,7 @@ public class PersistenceXmlResourceProvider
 	}
 	
 	private static PersistenceXmlResourceProvider getXmlResourceProvider_(IProject project, String location) {
-		return (PersistenceXmlResourceProvider) JpaXmlResourceProviderManager.instance().getXmlResourceProvider(
-			project, 
-			new Path(location),
-			JptCorePlugin.PERSISTENCE_XML_CONTENT_TYPE);
+		return new PersistenceXmlResourceProvider(project, new Path(location));
 	}
 	
 	
@@ -65,27 +57,16 @@ public class PersistenceXmlResourceProvider
 	}
 		
 	public PersistenceXmlResourceProvider(IProject project, IPath filePath) {
-		super(project, filePath);
-	}
-	
-	
-	@Override
-	protected IContentType getContentType() {
-		return JptCorePlugin.PERSISTENCE_XML_CONTENT_TYPE;
+		super(project, filePath, JptCorePlugin.PERSISTENCE_XML_CONTENT_TYPE);
 	}
 	
 	@Override
-	protected void populateRoot(JpaXmlResource resource) {
+	protected void populateRoot() {
 		XmlPersistence persistence = PersistenceFactory.eINSTANCE.createXmlPersistence();
 		persistence.setVersion(JpaConstants.VERSION_1_0_TEXT);
 		XmlPersistenceUnit persistenceUnit = PersistenceFactory.eINSTANCE.createXmlPersistenceUnit();
 		persistenceUnit.setName(getProject().getName());
 		persistence.getPersistenceUnits().add(persistenceUnit);
-		getResourceContents(resource).add(persistence);
-	}
-	
-	@Override
-	protected PersistenceXmlResource ensureCorrectType(Resource resource) throws ClassCastException {
-		return (PersistenceXmlResource) resource;
+		getResourceContents().add(persistence);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceXmlResourceProviderFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceXmlResourceProviderFactory.java
deleted file mode 100644
index 33823bf3ee..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceXmlResourceProviderFactory.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.core.internal.resource.persistence;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jpt.core.resource.JpaXmlResourceProvider;
-import org.eclipse.jpt.core.resource.JpaXmlResourceProviderFactory;
-
-public class PersistenceXmlResourceProviderFactory implements JpaXmlResourceProviderFactory
-{
-	public JpaXmlResourceProvider create(IProject project, IPath filePath) {
-		return new PersistenceXmlResourceProvider(project, filePath);
-	}
-}
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
index 37ad2fe7f0..f583bd8596 100644
--- 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
@@ -12,7 +12,6 @@ package org.eclipse.jpt.core.internal.synch;
 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;
@@ -23,9 +22,8 @@ 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.internal.resource.persistence.PersistenceXmlResourceProvider;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
-import org.eclipse.jpt.core.resource.persistence.PersistenceXmlResource;
 import org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistence;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
@@ -47,7 +45,7 @@ public class SynchronizeClassesJob extends WorkspaceJob
 	}
 	
 	@Override
-	public IStatus runInWorkspace(final IProgressMonitor monitor) throws CoreException {
+	public IStatus runInWorkspace(final IProgressMonitor monitor) {
 		monitor.beginTask(JptCoreMessages.SYNCHRONIZING_CLASSES_TASK, 200);
 		
 		if (monitor.isCanceled()) {
@@ -55,16 +53,17 @@ public class SynchronizeClassesJob extends WorkspaceJob
 		}
 		
 		final JpaProject jpaProject = JptCorePlugin.getJpaProject(this.persistenceXmlFile.getProject());
-		
-		PersistenceXmlResourceProvider modelProvider =
-			PersistenceXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
-		final PersistenceXmlResource resource = modelProvider.getXmlResource();
+		final JpaXmlResource resource = jpaProject.getPersistenceXmlResource();
+		if (resource == null) {
+			//the resource would only be null if the persistence.xml file had an invalid content type
+			return Status.OK_STATUS;
+		}
 		
 		monitor.worked(25);
 		
-		modelProvider.modify(new Runnable() {
+		resource.modify(new Runnable() {
 				public void run() {
-					XmlPersistence persistence = resource.getPersistence();
+					XmlPersistence persistence = (XmlPersistence) resource.getRootObject();
 					
 					if (persistence == null) {
 						persistence = PersistenceFactory.eINSTANCE.createXmlPersistence();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/AbstractXmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/AbstractXmlResourceProvider.java
index 58c9992a7b..a2b60f7214 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/AbstractXmlResourceProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/AbstractXmlResourceProvider.java
@@ -25,10 +25,8 @@ import org.eclipse.core.runtime.ISafeRunnable;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.SafeRunner;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.content.IContentDescription;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
@@ -59,14 +57,16 @@ import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateVa
  * 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 AbstractXmlResourceProvider<R extends JpaXmlResource> 
+public abstract class AbstractXmlResourceProvider
 	implements JpaXmlResourceProvider, ResourceStateInputProvider, ResourceStateValidator
 {
 	protected IProject project;
 	
 	protected URI fileUri;
 	
-	protected R resource;
+	protected JpaXmlResource resource;
+	
+	protected IContentType contentType;
 	
 	protected final ResourceAdapter resourceAdapter = new ResourceAdapter();
 	
@@ -83,13 +83,13 @@ public abstract class AbstractXmlResourceProvider<R extends JpaXmlResource>
 	 * {@link #buildFileUri(IPath)} will attempt to build an absolutely pathed 
 	 * URI for the given path.
 	 */
-	public AbstractXmlResourceProvider(IProject project, IPath resourcePath) {
+	public AbstractXmlResourceProvider(IProject project, IPath resourcePath, IContentType contentType) {
 		super();
 		this.project = project;
 		this.fileUri = buildFileUri(resourcePath);
+		this.contentType = contentType;
 	}
 	
-	
 	protected URI buildFileUri(IPath resourcePath) {
 		URI resourceUri = null;
 		
@@ -109,42 +109,68 @@ public abstract class AbstractXmlResourceProvider<R extends JpaXmlResource>
 	 * this will return a stub resource.  You must call #createResource() to 
 	 * create the file on the file system.
 	 */
-	public R getXmlResource() {
+	public JpaXmlResource getXmlResource() {
 		if (this.resource == null) {
-			try {
-				this.resource = ensureCorrectType(WorkbenchResourceHelper.getOrCreateResource(this.fileUri, getResourceSet()));
+			JpaXmlResource newResource = (JpaXmlResource) WorkbenchResourceHelper.getOrCreateResource(this.fileUri, getResourceSet());
+			//EMF caches resources based on URI.  If the resource has changed content types (say the schema was changed
+			//from orm to eclipselink-orm), then the resource will be of the wrong type and we need to create a new one.
+			if (newResource.getContentType().equals(this.contentType)) {
+				this.resource = newResource;
 			}
-			catch (ClassCastException cce) {
-				Resource.Factory resourceFactory = 
-					WTPResourceFactoryRegistry.INSTANCE.getFactory(fileUri, this.getContentType().getDefaultDescription());
-				this.resource = 
-					(R)((FlexibleProjectResourceSet) getResourceSet()).createResource(fileUri, resourceFactory);
+			else {
+				this.createResourceAndLoad();
 			}
 		}
 		return this.resource;
 	}
 	
+	protected JpaXmlResource createResourceAndLoad() {
+		this.resource = createResource();
+		this.loadResource();
+		return this.resource;
+	}
+	
+	protected JpaXmlResource createResource() {
+		Resource.Factory resourceFactory = 
+			WTPResourceFactoryRegistry.INSTANCE.getFactory(this.fileUri, this.contentType.getDefaultDescription());
+		return (JpaXmlResource) ((FlexibleProjectResourceSet) getResourceSet()).createResource(this.fileUri, resourceFactory);		
+	}
+	
+	protected void loadResource() {
+		try {
+			this.resource.load(((FlexibleProjectResourceSet) getResourceSet()).getLoadOptions());
+		}
+		catch (IOException e) {
+			JptCorePlugin.log(e);
+		}
+	}
+	
+	protected void createResourceAndUnderlyingFile() {
+		this.resource = createResource();
+		if (this.resource.fileExists()) { //always possible that the file already exists when the jpa facet is added
+			loadResource();
+		}
+		else {
+			populateRoot();
+			try {
+				this.resource.saveIfNecessary(); //this writes out the file
+			}
+			catch (Exception e) {
+				JptCorePlugin.log(e);
+			}
+		}
+	}
+	
+	
 	/**
-	 * Ensure that the given resource is of the expected type for this resource
-	 * model provider.
-	 * Return it if so, throw a ClassCastException otherwise.
+	 * This will actually create the underlying file and the JpaXmlResource that corresponds to it.
+	 * It also populates the root of the file.
 	 */
-	protected abstract R ensureCorrectType(Resource r) throws ClassCastException;
-	
-	public R createResource() throws CoreException {
+	public JpaXmlResource createFileAndResource() throws CoreException {
 		IWorkspace workspace = ResourcesPlugin.getWorkspace();
 		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				JpaXmlResource aResource = getXmlResource();
-				if (! aResource.exists() && aResource.getContents().isEmpty()) {
-					populateRoot(aResource);
-					try {
-						aResource.saveIfNecessary();
-					}
-					catch (Exception e) {
-						JptCorePlugin.log(e);
-					}
-				}
+			public void run(IProgressMonitor monitor) {
+				createResourceAndUnderlyingFile();
 			}
 		};
 		workspace.run(runnable, workspace.getRoot(), IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
@@ -152,30 +178,26 @@ public abstract class AbstractXmlResourceProvider<R extends JpaXmlResource>
 	}
 	
 	protected URI getModuleURI(URI uri) {
-		URI moduleuri = ModuleURIUtil.fullyQualifyURI(project);
+		URI moduleuri = ModuleURIUtil.fullyQualifyURI(this.project);
 		IPath requestPath = new Path(moduleuri.path()).append(new Path(uri.path()));
 		URI resourceURI = URI.createURI(PlatformURLModuleConnection.MODULE_PROTOCOL + requestPath.toString());
 		return resourceURI;
 	}
 	
 	/**
-	 * Used to optionally define an associated content type for XML file creation
-	 */
-	protected abstract IContentType getContentType();
-	
-	/**
 	 * Used to optionally fill in the root information of a resource if it does not 
 	 * exist as a file
 	 */
-	protected void populateRoot(JpaXmlResource resource) {}
+	protected void populateRoot() {
+		//TODO potentially call resource.populateRoot() instead of the resourceProvider doing this
+	}
 	
 
 	/**
 	 * minimize the scope of the suppressed warnings
 	 */
-	@SuppressWarnings("unchecked")
-	protected EList<EObject> getResourceContents(JpaXmlResource resource) {
-		return resource.getContents();
+	protected EList<EObject> getResourceContents() {
+		return this.resource.getContents();
 	}
 
 	public void addListener(JpaXmlResourceProviderListener listener) {
@@ -186,7 +208,7 @@ public abstract class AbstractXmlResourceProvider<R extends JpaXmlResource>
 	}
 	
 	public void removeListener(JpaXmlResourceProviderListener listener) {
-		listenerList.remove(listener);
+		this.listenerList.remove(listener);
 		if (this.listenerList.isEmpty()) {
 			disengageResource();
 		}
@@ -238,34 +260,16 @@ public abstract class AbstractXmlResourceProvider<R extends JpaXmlResource>
 			}
 			return work.validateEdit(files, context);
 		} 
-		else {
-			return Status.OK_STATUS;
-		}
-	}
-	
-	public void modify(Runnable runnable) {
-		try {
-			runnable.run();
-			try {
-				if (resource != null) {
-					resource.save(Collections.EMPTY_MAP);
-				}
-			} catch (IOException ioe) {
-				JptCorePlugin.log(ioe);
-			}
-		} catch (Exception e) {
-			JptCorePlugin.log(e);
-		}
-	}
-	
+		return Status.OK_STATUS;
+	}	
 	
 	// **************** ResourceStateValidator impl ****************************
 	
 	public ResourceStateValidator getStateValidator() {
-		if (stateValidator == null) {
-			stateValidator = createStateValidator();
+		if (this.stateValidator == null) {
+			this.stateValidator = createStateValidator();
 		}
-		return stateValidator;
+		return this.stateValidator;
 	}
 	
 	private ResourceStateValidator createStateValidator() {
@@ -299,21 +303,25 @@ public abstract class AbstractXmlResourceProvider<R extends JpaXmlResource>
 	// **************** ResourceStateInputProvider impl ************************
 	
 	public boolean isDirty() {	
-		return resource.isModified();
+		return this.resource.isModified();
 	}
 	
+	@SuppressWarnings("unchecked")
 	public List getNonResourceFiles() {
 		return Collections.emptyList();
 	}
 	
+	@SuppressWarnings("unchecked")
 	public List getNonResourceInconsistentFiles() {
 		return Collections.emptyList();
 	}
 	
+	@SuppressWarnings("unchecked")
 	public List getResources() {
 		return Collections.singletonList(getXmlResource());
 	}
 	
+	@SuppressWarnings("unchecked")
 	public void cacheNonResourceValidateState(List roNonResourceFiles) {
 		// do nothing
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/JpaXmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/JpaXmlResourceProvider.java
index b096cf9f34..1835d22659 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/JpaXmlResourceProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/JpaXmlResourceProvider.java
@@ -24,6 +24,4 @@ public interface JpaXmlResourceProvider
 	JpaXmlResource getXmlResource();
 	
 	IStatus validateEdit(Object context);
-	
-	void modify(Runnable runnable);
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/JpaXmlResourceProviderFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/JpaXmlResourceProviderFactory.java
deleted file mode 100644
index 51aa37a545..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/JpaXmlResourceProviderFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.core.resource;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-
-/**
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- */
-public interface JpaXmlResourceProviderFactory
-{
-	JpaXmlResourceProvider create(IProject project, IPath filePath);
-}
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/JpaXmlResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaXmlResource.java
index de55212ea6..69348a8fef 100644
--- 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
@@ -9,9 +9,12 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.resource.common;
 
+import java.io.IOException;
+import java.util.Collections;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.EList;
@@ -21,9 +24,11 @@ import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
 import org.eclipse.jem.util.plugin.JEMUtilPlugin;
 import org.eclipse.jpt.core.JpaResourceModel;
 import org.eclipse.jpt.core.JpaResourceModelListener;
+import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.utility.internal.ListenerList;
 import org.eclipse.jpt.utility.internal.StringTools;
 import org.eclipse.wst.common.internal.emf.resource.Renderer;
+import org.eclipse.wst.common.internal.emf.resource.Translator;
 import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceImpl;
 
 /**
@@ -33,20 +38,28 @@ import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceImpl;
  * 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
+public class JpaXmlResource
 	extends TranslatorResourceImpl
 	implements JpaResourceModel
 {
 	protected final ListenerList<JpaResourceModelListener> resourceModelListenerList;
 
-
+	protected final IContentType contentType;
+	
+	protected final Translator rootTranslator;
+	
 	// ********** constructor **********
 
-	protected JpaXmlResource(URI uri, Renderer renderer) {
+	public JpaXmlResource(URI uri, Renderer renderer, IContentType contentType, Translator rootTranslator) {
 		super(uri, renderer);
 		this.resourceModelListenerList = new ListenerList<JpaResourceModelListener>(JpaResourceModelListener.class);
+		this.contentType = contentType;
+		this.rootTranslator = rootTranslator;
 	}
 
+	public IContentType getContentType() {
+		return this.contentType;
+	}
 
 	// ********** BasicNotifierImpl override **********
 
@@ -61,8 +74,15 @@ public abstract class JpaXmlResource
 			this.resourceModelChanged();
 		}
 	}
+	
+	
+	// ********** TranslatorResource implementation **********
 
+	public Translator getRootTranslator() {
+		return this.rootTranslator;
+	}
 
+	
 	// ********** TranslatorResourceImpl implementation **********
 
 	/**
@@ -103,7 +123,7 @@ public abstract class JpaXmlResource
 
 	// ********** convenience methods **********
 
-	public boolean exists() {
+	public boolean fileExists() {
 		return this.getFile().exists();
 	}
 
@@ -132,6 +152,19 @@ public abstract class JpaXmlResource
 		String fileName = URI.decode(uri.path()).substring(JEMUtilPlugin.PLATFORM_RESOURCE.length() + 1);
 		return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fileName));
 	}
+	
+	public void modify(Runnable runnable) {
+		try {
+			runnable.run();
+			try {
+				save(Collections.EMPTY_MAP);
+			} catch (IOException ioe) {
+				JptCorePlugin.log(ioe);
+			}
+		} catch (Exception e) {
+			JptCorePlugin.log(e);
+		}
+	}
 
 	@Override
 	public String toString() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmXmlResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmXmlResource.java
deleted file mode 100644
index 55c7cb90de..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmXmlResource.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.core.resource.orm;
-
-import org.eclipse.emf.common.util.URI;
-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 OrmXmlResource
-	extends JpaXmlResource 
-{
-	public static final String TYPE = "generic"; //$NON-NLS-1$
-
-	public OrmXmlResource(URI uri, Renderer renderer) {
-		super(uri, renderer);
-	}
-
-	public XmlEntityMappings getEntityMappings() {
-		return (XmlEntityMappings) this.getRootObject();
-	}
-
-	public Translator getRootTranslator() {
-		return EntityMappingsTranslator.INSTANCE;
-	}
-
-	public String getType() {
-		return TYPE;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmXmlResourceFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmXmlResourceFactory.java
index e6d5ebda34..a146e60a9e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmXmlResourceFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmXmlResourceFactory.java
@@ -10,6 +10,9 @@
 package org.eclipse.jpt.core.resource.orm;
 
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.jpt.core.JptCorePlugin;
+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.RendererFactory;
 import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
@@ -41,7 +44,7 @@ public class OrmXmlResourceFactory
 	
 	@Override
 	protected TranslatorResource createResource(URI uri, Renderer renderer) {
-		return new OrmXmlResource(uri, renderer);
+		return new JpaXmlResource(uri, renderer, JptCorePlugin.ORM_XML_CONTENT_TYPE, EntityMappingsTranslator.INSTANCE);
 	}
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceXmlResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceXmlResource.java
deleted file mode 100644
index b98f9d6a32..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceXmlResource.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.core.resource.persistence;
-
-import org.eclipse.emf.common.util.URI;
-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 PersistenceXmlResource
-	extends JpaXmlResource
-{
-	public PersistenceXmlResource(URI uri, Renderer renderer) {
-		super(uri, renderer);
-	}
-
-	public XmlPersistence getPersistence() {
-		return (XmlPersistence) this.getRootObject();
-	}
-
-	public Translator getRootTranslator() {
-		return PersistenceTranslator.INSTANCE;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceXmlResourceFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceXmlResourceFactory.java
index c4cc2a003c..db2556f08f 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceXmlResourceFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceXmlResourceFactory.java
@@ -10,6 +10,9 @@
 package org.eclipse.jpt.core.resource.persistence;
 
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.jpt.core.JptCorePlugin;
+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.RendererFactory;
 import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
@@ -42,7 +45,8 @@ public class PersistenceXmlResourceFactory extends TranslatorResourceFactory
 	/**
 	 * @see TranslatorResourceFactory#createResource(URI, Renderer)
 	 */
+	@Override
 	protected TranslatorResource createResource(URI uri, Renderer renderer) {
-		return new PersistenceXmlResource(uri, renderer);
+		return new JpaXmlResource(uri, renderer, JptCorePlugin.PERSISTENCE_XML_CONTENT_TYPE, PersistenceTranslator.INSTANCE);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml b/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml
index da4d98fce2..f327424cb5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml
@@ -8,7 +8,7 @@
 		<content-type
 			id="org.eclipse.jpt.eclipselink.core.content.orm"
 			name="%ECLIPSELINK_ORM_XML_CONTENT"
-			base-type="org.eclipse.jpt.core.content.baseJpaContent">
+			base-type="org.eclipse.jpt.core.content.mappingFile">
 			<describer
 				class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber2">
 				<parameter 
@@ -37,14 +37,6 @@
 	</extension>
 	
 	
-	<extension
-		point="org.eclipse.jpt.core.resourceModelProviders">
-		
-		<modelProvider
-			fileContentType="org.eclipse.jpt.eclipselink.core.content.orm"
-			factoryClass="org.eclipse.jpt.eclipselink.core.internal.resource.orm.EclipseLinkOrmXmlResourceProviderFactory"/>
-		
-	</extension>
 	
 	
 	<!--
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/EclipseLinkJpaProject.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/EclipseLinkJpaProject.java
new file mode 100644
index 0000000000..7fd5334bd7
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/EclipseLinkJpaProject.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.eclipselink.core;
+
+import org.eclipse.jpt.core.JpaProject;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
+
+/**
+ * A JPA project is associated with an Eclipse project (and its corresponding
+ * Java project). It holds the "resource" model that corresponds to the various
+ * JPA-related resources (the persistence.xml file, its mapping files [orm.xml],
+ * and the Java source files). It also holds the "context" model that represents
+ * the JPA metadata, as derived from spec-defined defaults, Java source code
+ * annotations, and XML descriptors.
+ * 
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ */
+public interface EclipseLinkJpaProject
+	extends JpaProject
+{
+
+	/**
+	 * Return the resource model object that corresponds to the file
+	 * 'META-INF/eclipselink-orm.xml' if that file has the eclipselink ContentType
+	 * 
+	 * @see JptEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_FILE_PATH
+	 */
+	JpaXmlResource getDefaultEclipseLinkOrmXmlResource();
+	
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaFactory.java
index 04b8f6480e..63ecf69ea3 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaFactory.java
@@ -9,6 +9,8 @@
  *******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.internal;
 
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jpt.core.JpaProject;
 import org.eclipse.jpt.core.context.MappingFile;
 import org.eclipse.jpt.core.context.java.JavaBasicMapping;
 import org.eclipse.jpt.core.context.java.JavaEmbeddable;
@@ -42,6 +44,7 @@ import org.eclipse.jpt.core.context.persistence.MappingFileRef;
 import org.eclipse.jpt.core.context.persistence.Persistence;
 import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.core.internal.platform.GenericJpaFactory;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.orm.XmlBasic;
 import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
 import org.eclipse.jpt.core.resource.orm.XmlId;
@@ -51,6 +54,7 @@ import org.eclipse.jpt.core.resource.orm.XmlOneToMany;
 import org.eclipse.jpt.core.resource.orm.XmlOneToOne;
 import org.eclipse.jpt.core.resource.orm.XmlVersion;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
+import org.eclipse.jpt.eclipselink.core.EclipseLinkJpaProject;
 import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaEntity;
 import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaMappedSuperclass;
 import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaBasicMappingImpl;
@@ -101,7 +105,6 @@ import org.eclipse.jpt.eclipselink.core.internal.context.orm.VirtualXmlBasicMap;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.VirtualXmlTransformation;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.VirtualXmlVariableOneToOne;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded;
@@ -116,17 +119,22 @@ public class EclipseLinkJpaFactory
 		super();
 	}
 		
+	// ********** Core Model **********
+	
+	@Override
+	public EclipseLinkJpaProject buildJpaProject(JpaProject.Config config) throws CoreException {
+		return new EclipseLinkJpaProjectImpl(config);
+	}
+	
 	
 	// ********** Context Nodes **********
 	
-	public MappingFile buildEclipseLinkMappingFile(MappingFileRef parent, EclipseLinkOrmXmlResource resource) {
+	public MappingFile buildEclipseLinkMappingFile(MappingFileRef parent, JpaXmlResource resource) {
 		return this.buildEclipseLinkOrmXml(parent, resource);
 	}
 	
-	protected EclipseLinkOrmXml buildEclipseLinkOrmXml(MappingFileRef parent, EclipseLinkOrmXmlResource resource) {
-		EclipseLinkOrmXml eclipseLinkOrmXml = new EclipseLinkOrmXml(parent);
-		eclipseLinkOrmXml.initialize(resource);
-		return eclipseLinkOrmXml;
+	protected EclipseLinkOrmXml buildEclipseLinkOrmXml(MappingFileRef parent, JpaXmlResource resource) {
+		return new EclipseLinkOrmXml(parent, resource);
 	}
 	
 	
@@ -134,9 +142,7 @@ public class EclipseLinkJpaFactory
 	
 	@Override
 	public PersistenceUnit buildPersistenceUnit(Persistence parent, XmlPersistenceUnit xmlPersistenceUnit) {
-		PersistenceUnit persistenceUnit =  new EclipseLinkPersistenceUnit(parent);
-		persistenceUnit.initialize(xmlPersistenceUnit);
-		return persistenceUnit;
+		return new EclipseLinkPersistenceUnit(parent, xmlPersistenceUnit);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaProjectImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaProjectImpl.java
new file mode 100644
index 0000000000..ca49cd4d49
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaProjectImpl.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.eclipselink.core.internal;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jpt.core.JpaProject;
+import org.eclipse.jpt.core.internal.AbstractJpaProject;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
+import org.eclipse.jpt.eclipselink.core.EclipseLinkJpaProject;
+
+/**
+ * 
+ */
+public class EclipseLinkJpaProjectImpl
+	extends AbstractJpaProject
+	implements EclipseLinkJpaProject
+{
+
+
+	// ********** constructor/initialization **********
+
+	public EclipseLinkJpaProjectImpl(JpaProject.Config config) throws CoreException {
+		super(config);
+	}
+	
+	public JpaXmlResource getDefaultEclipseLinkOrmXmlResource() {
+		return getMappingFileResource(JptEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_FILE_PATH, JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE);
+	}
+
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkOrmResourceModelProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkOrmResourceModelProvider.java
index 04bf176ca8..5cc4ddcfb9 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkOrmResourceModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkOrmResourceModelProvider.java
@@ -12,8 +12,8 @@ package org.eclipse.jpt.eclipselink.core.internal;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.core.JpaResourceModel;
 import org.eclipse.jpt.core.JpaResourceModelProvider;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.eclipselink.core.internal.resource.orm.EclipseLinkOrmXmlResourceProvider;
 
 /**
@@ -43,7 +43,7 @@ public class EclipseLinkOrmResourceModelProvider
 		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
 	}
 
-	public JpaResourceModel buildResourceModel(JpaProject jpaProject, IFile file) {
+	public JpaXmlResource buildResourceModel(JpaProject jpaProject, IFile file) {
 		return EclipseLinkOrmXmlResourceProvider.getXmlResourceProvider(file).getXmlResource();
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/EclipseLinkMappingFileProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/EclipseLinkMappingFileProvider.java
index 96d6e37e7e..e330c7caa5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/EclipseLinkMappingFileProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/EclipseLinkMappingFileProvider.java
@@ -9,13 +9,14 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.internal.context;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
 import org.eclipse.jpt.core.context.MappingFile;
 import org.eclipse.jpt.core.context.MappingFileProvider;
 import org.eclipse.jpt.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
+import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 
 public class EclipseLinkMappingFileProvider
 	implements MappingFileProvider
@@ -37,12 +38,12 @@ public class EclipseLinkMappingFileProvider
 		super();
 	}
 
-	public String getResourceType() {
-		return EclipseLinkOrmXmlResource.TYPE;
+	public IContentType getContentType() {
+		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
 	}
 
-	public MappingFile buildMappingFile(MappingFileRef parent, OrmXmlResource resource, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkMappingFile(parent, (EclipseLinkOrmXmlResource) resource);
+	public MappingFile buildMappingFile(MappingFileRef parent, JpaXmlResource resource, JpaFactory factory) {
+		return ((EclipseLinkJpaFactory) factory).buildEclipseLinkMappingFile(parent, resource);
 	}
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java
index 27c7fc0ce5..4ce0062a8e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java
@@ -11,13 +11,13 @@ package org.eclipse.jpt.eclipselink.core.internal.context.orm;
 
 import java.util.List;
 import org.eclipse.jpt.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.core.internal.context.orm.GenericEntityMappings;
+import org.eclipse.jpt.core.internal.context.orm.AbstractEntityMappings;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 
 public class EclipseLinkEntityMappingsImpl
-	extends GenericEntityMappings
+	extends AbstractEntityMappings
 	implements EclipseLinkEntityMappings
 {
 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMappingProvider.java
index a3e9bd246c..a4d3350b31 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMappingProvider.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.internal.context.orm;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
@@ -19,7 +20,7 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
+import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 
 public class EclipseLinkOrmBasicMappingProvider
 	implements ExtendedOrmAttributeMappingProvider
@@ -41,8 +42,8 @@ public class EclipseLinkOrmBasicMappingProvider
 		super();
 	}
 
-	public String getOrmType() {
-		return EclipseLinkOrmXmlResource.TYPE;
+	public IContentType getContentType() {
+		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
 	}
 
 	public String getKey() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableProvider.java
index 206f9ddd8a..a291f324b5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableProvider.java
@@ -9,13 +9,14 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.internal.context.orm;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.orm.ExtendedOrmTypeMappingProvider;
 import org.eclipse.jpt.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
+import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 
 /**
  * EclipseLink ORM Embeddable provider
@@ -42,8 +43,8 @@ public class EclipseLinkOrmEmbeddableProvider
 		super();
 	}
 
-	public String getOrmType() {
-		return EclipseLinkOrmXmlResource.TYPE;
+	public IContentType getContentType() {
+		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
 	}
 
 	public OrmTypeMapping buildMapping(OrmPersistentType parent, JpaFactory factory) {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddedIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddedIdMappingProvider.java
index cfbf9e534e..28c95b96dd 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddedIdMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddedIdMappingProvider.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.internal.context.orm;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
@@ -19,7 +20,7 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
+import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 
 public class EclipseLinkOrmEmbeddedIdMappingProvider
 	implements ExtendedOrmAttributeMappingProvider
@@ -41,8 +42,8 @@ public class EclipseLinkOrmEmbeddedIdMappingProvider
 		super();
 	}
 
-	public String getOrmType() {
-		return EclipseLinkOrmXmlResource.TYPE;
+	public IContentType getContentType() {
+		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
 	}
 
 	public String getKey() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddedMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddedMappingProvider.java
index d8821ba23a..7caa2532fd 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddedMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddedMappingProvider.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.internal.context.orm;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
@@ -19,7 +20,7 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
+import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 
 public class EclipseLinkOrmEmbeddedMappingProvider
 	implements ExtendedOrmAttributeMappingProvider
@@ -41,8 +42,8 @@ public class EclipseLinkOrmEmbeddedMappingProvider
 		super();
 	}
 
-	public String getOrmType() {
-		return EclipseLinkOrmXmlResource.TYPE;
+	public IContentType getContentType() {
+		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
 	}
 
 	public String getKey() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEntityProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEntityProvider.java
index 0d4e734227..2111b23434 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEntityProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEntityProvider.java
@@ -9,13 +9,14 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.internal.context.orm;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.orm.ExtendedOrmTypeMappingProvider;
 import org.eclipse.jpt.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
+import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 
 /**
  * EclipseLink ORM Entity provider
@@ -41,8 +42,8 @@ public class EclipseLinkOrmEntityProvider
 		super();
 	}
 
-	public String getOrmType() {
-		return EclipseLinkOrmXmlResource.TYPE;
+	public IContentType getContentType() {
+		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
 	}
 
 	public OrmTypeMapping buildMapping(OrmPersistentType parent, JpaFactory factory) {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMappingProvider.java
index 24bab669cd..7f62ced736 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMappingProvider.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.internal.context.orm;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
@@ -19,7 +20,7 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
+import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 
 public class EclipseLinkOrmIdMappingProvider
 	implements ExtendedOrmAttributeMappingProvider
@@ -41,8 +42,8 @@ public class EclipseLinkOrmIdMappingProvider
 		super();
 	}
 
-	public String getOrmType() {
-		return EclipseLinkOrmXmlResource.TYPE;
+	public IContentType getContentType() {
+		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
 	}
 
 	public String getKey() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToManyMappingProvider.java
index 85f4175f7b..0e4d62a253 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToManyMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToManyMappingProvider.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.internal.context.orm;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
@@ -19,7 +20,7 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
+import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 
 public class EclipseLinkOrmManyToManyMappingProvider
 	implements ExtendedOrmAttributeMappingProvider
@@ -41,8 +42,8 @@ public class EclipseLinkOrmManyToManyMappingProvider
 		super();
 	}
 
-	public String getOrmType() {
-		return EclipseLinkOrmXmlResource.TYPE;
+	public IContentType getContentType() {
+		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
 	}
 
 	public String getKey() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToOneMappingProvider.java
index f8ba6a5084..bff648dcd0 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToOneMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToOneMappingProvider.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.internal.context.orm;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
@@ -19,7 +20,7 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
+import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 
 public class EclipseLinkOrmManyToOneMappingProvider
 	implements ExtendedOrmAttributeMappingProvider
@@ -41,8 +42,8 @@ public class EclipseLinkOrmManyToOneMappingProvider
 		super();
 	}
 
-	public String getOrmType() {
-		return EclipseLinkOrmXmlResource.TYPE;
+	public IContentType getContentType() {
+		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
 	}
 
 	public String getKey() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmMappedSuperclassProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmMappedSuperclassProvider.java
index 6a03fcff5b..ebf9f5aba7 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmMappedSuperclassProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmMappedSuperclassProvider.java
@@ -9,13 +9,14 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.internal.context.orm;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.orm.ExtendedOrmTypeMappingProvider;
 import org.eclipse.jpt.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
+import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 
 /**
  * EclipseLink ORM Mapped Superclass provider
@@ -41,8 +42,8 @@ public class EclipseLinkOrmMappedSuperclassProvider
 		super();
 	}
 
-	public String getOrmType() {
-		return EclipseLinkOrmXmlResource.TYPE;
+	public IContentType getContentType() {
+		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
 	}
 
 	public OrmTypeMapping buildMapping(OrmPersistentType parent, JpaFactory factory) {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyMappingProvider.java
index a3e6965e76..103e6d6284 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyMappingProvider.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.internal.context.orm;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
@@ -19,7 +20,7 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
+import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 
 public class EclipseLinkOrmOneToManyMappingProvider
 	implements ExtendedOrmAttributeMappingProvider
@@ -41,8 +42,8 @@ public class EclipseLinkOrmOneToManyMappingProvider
 		super();
 	}
 
-	public String getOrmType() {
-		return EclipseLinkOrmXmlResource.TYPE;
+	public IContentType getContentType() {
+		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
 	}
 
 	public String getKey() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToOneMappingProvider.java
index 58a652a4b7..e5470f5dff 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToOneMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToOneMappingProvider.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.internal.context.orm;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
@@ -19,7 +20,7 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
+import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 
 public class EclipseLinkOrmOneToOneMappingProvider
 	implements ExtendedOrmAttributeMappingProvider
@@ -41,8 +42,8 @@ public class EclipseLinkOrmOneToOneMappingProvider
 		super();
 	}
 
-	public String getOrmType() {
-		return EclipseLinkOrmXmlResource.TYPE;
+	public IContentType getContentType() {
+		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
 	}
 
 	public String getKey() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMappingProvider.java
index 8bd7d16522..513fdc0c5f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMappingProvider.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.internal.context.orm;
 
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
@@ -19,7 +20,7 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
+import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 
 public class EclipseLinkOrmVersionMappingProvider
 	implements ExtendedOrmAttributeMappingProvider
@@ -41,8 +42,8 @@ public class EclipseLinkOrmVersionMappingProvider
 		super();
 	}
 
-	public String getOrmType() {
-		return EclipseLinkOrmXmlResource.TYPE;
+	public IContentType getContentType() {
+		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
 	}
 
 	public String getKey() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmXml.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmXml.java
index 81a4984892..090bbf11fb 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmXml.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmXml.java
@@ -11,15 +11,20 @@ package org.eclipse.jpt.eclipselink.core.internal.context.orm;
 
 import org.eclipse.jpt.core.context.orm.EntityMappings;
 import org.eclipse.jpt.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.core.internal.context.orm.GenericOrmXml;
+import org.eclipse.jpt.core.internal.context.orm.AbstractOrmXml;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory;
+import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
 
-public class EclipseLinkOrmXml extends GenericOrmXml
+public class EclipseLinkOrmXml extends AbstractOrmXml
 {
-	public EclipseLinkOrmXml(MappingFileRef parent) {
-		super(parent);
+	public EclipseLinkOrmXml(MappingFileRef parent, JpaXmlResource resource) {
+		super(parent, resource);
+		if (!resource.getContentType().isKindOf(JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE)) {
+			throw new IllegalArgumentException(resource + " does not have eclipselink orm xml content type"); //$NON-NLS-1$ 
+		}
 	}
 	
 	@Override
@@ -35,7 +40,18 @@ public class EclipseLinkOrmXml extends GenericOrmXml
 	
 	@Override
 	protected EntityMappings buildEntityMappings(XmlEntityMappings xmlEntityMappings) {
-		return getJpaFactory().buildEclipseLinkEntityMappings(this, (org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings) xmlEntityMappings);
+		return getJpaFactory().buildEclipseLinkEntityMappings(this, xmlEntityMappings);
+	}
+	
+	
+	// ********** updating **********
+	
+	@Override
+	public void update(JpaXmlResource resource) {
+		if (!resource.getContentType().isKindOf(JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE)) {
+			throw new IllegalArgumentException(resource + " does not have eclipselink orm xml content type"); //$NON-NLS-1$ 
+		}
+		super.update(resource);
 	}
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkImpliedMappingFileRef.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkImpliedMappingFileRef.java
deleted file mode 100644
index e47e8c4e81..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkImpliedMappingFileRef.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.context.persistence;
-
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.core.internal.context.persistence.GenericMappingFileRef;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-
-/**
- * Currently, this class is only used for implied eclipselink mapping files
- */	
-public class EclipseLinkImpliedMappingFileRef
-	extends GenericMappingFileRef
-{
-	public EclipseLinkImpliedMappingFileRef(PersistenceUnit parent) {
-		super(parent, null);
-	}
-
-	@Override
-	protected String buildFileName() {
-		return JptEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_FILE_PATH;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java
index 14bd567e54..05ba4141a0 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java
@@ -19,7 +19,9 @@ import org.eclipse.jpt.core.context.persistence.MappingFileRef;
 import org.eclipse.jpt.core.context.persistence.Persistence;
 import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.core.internal.context.persistence.AbstractPersistenceUnit;
+import org.eclipse.jpt.core.internal.context.persistence.ImpliedMappingFileRef;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
+import org.eclipse.jpt.eclipselink.core.EclipseLinkJpaProject;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
@@ -36,8 +38,6 @@ import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.Ecl
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.Options;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.EclipseLinkSchemaGeneration;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.SchemaGeneration;
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.EclipseLinkOrmXmlResourceProvider;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
 import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
@@ -67,8 +67,8 @@ public class EclipseLinkPersistenceUnit
 	protected final List<EclipseLinkConverter> converters = new ArrayList<EclipseLinkConverter>();
 
 
-	public EclipseLinkPersistenceUnit(Persistence parent) {
-		super(parent);
+	public EclipseLinkPersistenceUnit(Persistence parent, XmlPersistenceUnit xmlPersistenceUnit) {
+		super(parent, xmlPersistenceUnit);
 	}
 
 	@Override
@@ -113,16 +113,16 @@ public class EclipseLinkPersistenceUnit
 
 	@Override
 	public ListIterator<MappingFileRef> mappingFileRefs() {
-		if (impliedEclipseLinkMappingFileRef == null) {
+		if (this.impliedEclipseLinkMappingFileRef == null) {
 			return super.mappingFileRefs();
 		}
 		return new ReadOnlyCompositeListIterator<MappingFileRef>(
-			super.mappingFileRefs(), impliedEclipseLinkMappingFileRef);
+			super.mappingFileRefs(), this.impliedEclipseLinkMappingFileRef);
 	}
 
 	@Override
 	public int mappingFileRefsSize() {
-		if (impliedEclipseLinkMappingFileRef == null) {
+		if (this.impliedEclipseLinkMappingFileRef == null) {
 			return super.mappingFileRefsSize();
 		}
 		return 1 + super.mappingFileRefsSize();
@@ -138,26 +138,26 @@ public class EclipseLinkPersistenceUnit
 
 
 	public MappingFileRef getImpliedEclipseLinkMappingFileRef() {
-		return impliedEclipseLinkMappingFileRef;
+		return this.impliedEclipseLinkMappingFileRef;
 	}
 
 	protected MappingFileRef setImpliedEclipseLinkMappingFileRef() {
-		if (impliedEclipseLinkMappingFileRef != null) {
+		if (this.impliedEclipseLinkMappingFileRef != null) {
 			throw new IllegalStateException("The implied eclipselink mapping file ref is already set."); //$NON-NLS-1$
 		}
-		MappingFileRef mappingFileRef = new EclipseLinkImpliedMappingFileRef(this);
-		impliedEclipseLinkMappingFileRef = mappingFileRef;
+		MappingFileRef mappingFileRef = buildEclipseLinkImpliedMappingFileRef();
+		this.impliedEclipseLinkMappingFileRef = mappingFileRef;
 		firePropertyChanged(IMPLIED_ECLIPSELINK_MAPPING_FILE_REF_PROPERTY, null, mappingFileRef);
 		return mappingFileRef;
 	}
 
 	protected void unsetImpliedEclipseLinkMappingFileRef() {
-		if (impliedEclipseLinkMappingFileRef == null) {
+		if (this.impliedEclipseLinkMappingFileRef == null) {
 			throw new IllegalStateException("The implied eclipselink mapping file ref is already unset."); //$NON-NLS-1$
 		}
-		MappingFileRef mappingFileRef = impliedEclipseLinkMappingFileRef;
-		impliedEclipseLinkMappingFileRef.dispose();
-		impliedEclipseLinkMappingFileRef = null;
+		MappingFileRef mappingFileRef = this.impliedEclipseLinkMappingFileRef;
+		this.impliedEclipseLinkMappingFileRef.dispose();
+		this.impliedEclipseLinkMappingFileRef = null;
 		firePropertyChanged(IMPLIED_ECLIPSELINK_MAPPING_FILE_REF_PROPERTY, mappingFileRef, null);
 	}
 
@@ -270,10 +270,14 @@ public class EclipseLinkPersistenceUnit
 				&& ! impliedEclipseLinkMappingFileIsSpecified()
 				&& impliedEclipseLinkMappingFileExists()) {
 
-			impliedEclipseLinkMappingFileRef = new EclipseLinkImpliedMappingFileRef(this);
+			this.impliedEclipseLinkMappingFileRef = buildEclipseLinkImpliedMappingFileRef();
 		}
 	}
 
+	private ImpliedMappingFileRef buildEclipseLinkImpliedMappingFileRef() {
+		return new ImpliedMappingFileRef(this, JptEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_FILE_PATH);
+	}
+
 	@Override
 	protected void updateMappingFileRefs() {
 		super.updateMappingFileRefs();
@@ -286,12 +290,12 @@ public class EclipseLinkPersistenceUnit
 				&& ! impliedEclipseLinkMappingFileIsSpecified()
 				&& impliedEclipseLinkMappingFileExists()) {
 
-			if (impliedEclipseLinkMappingFileRef == null) {
+			if (this.impliedEclipseLinkMappingFileRef == null) {
 				setImpliedEclipseLinkMappingFileRef();
 			}
 			getImpliedEclipseLinkMappingFileRef().update(null);
 		}
-		else if (impliedEclipseLinkMappingFileRef != null) {
+		else if (this.impliedEclipseLinkMappingFileRef != null) {
 			unsetImpliedEclipseLinkMappingFileRef();
 		}
 	}
@@ -310,11 +314,13 @@ public class EclipseLinkPersistenceUnit
 		return false;
 	}
 
+	@Override
+	public EclipseLinkJpaProject getJpaProject() {
+		return (EclipseLinkJpaProject) super.getJpaProject();
+	}
+	
 	protected boolean impliedEclipseLinkMappingFileExists() {
-		EclipseLinkOrmXmlResourceProvider modelProvider = 
-			EclipseLinkOrmXmlResourceProvider.getDefaultXmlResourceProvider(getJpaProject().getProject());
-		EclipseLinkOrmXmlResource resource = modelProvider.getXmlResource();
-		return resource != null && resource.exists();
+		return getJpaProject().getDefaultEclipseLinkOrmXmlResource() != null;
 	}
 
 	// This is called after the persistence unit has been updated to ensure
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationOperation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationOperation.java
index 41dca0d7e7..ae73c0ded9 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationOperation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationOperation.java
@@ -10,17 +10,9 @@
 package org.eclipse.jpt.eclipselink.core.internal.operations;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.jpt.core.internal.operations.OrmFileCreationOperation;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults;
-import org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata;
+import org.eclipse.jpt.core.resource.AbstractXmlResourceProvider;
 import org.eclipse.jpt.eclipselink.core.internal.resource.orm.EclipseLinkOrmXmlResourceProvider;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
-import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 
 public class EclipseLinkOrmFileCreationOperation extends OrmFileCreationOperation
@@ -29,31 +21,8 @@ public class EclipseLinkOrmFileCreationOperation extends OrmFileCreationOperatio
 		super(dataModel);
 	}
 	
-	
 	@Override
-	protected void createMappingFile(IFolder folder) {
-		String filePath = getDataModel().getStringProperty(FILE_PATH);
-		IFile file = folder.getFile(new Path(filePath));
-		final EclipseLinkOrmXmlResourceProvider modelProvider =
-			EclipseLinkOrmXmlResourceProvider.getXmlResourceProvider(file);
-		
-		modelProvider.modify(new Runnable() {
-				public void run() {
-					EclipseLinkOrmXmlResource ormResource = modelProvider.getXmlResource();
-					
-					XmlEntityMappings entityMappings = EclipseLinkOrmFactory.eINSTANCE.createXmlEntityMappings();
-					entityMappings.setVersion("1.0"); //$NON-NLS-1$
-					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);
-					}
-				}
-			});
+	protected AbstractXmlResourceProvider getXmlResourceProvider(IFile file) {
+		return EclipseLinkOrmXmlResourceProvider.getXmlResourceProvider(file);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java
index 980f2678cb..10aa5d8254 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java
@@ -13,20 +13,15 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.internal.resource.JpaXmlResourceProviderManager;
 import org.eclipse.jpt.core.resource.AbstractXmlResourceProvider;
-import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkConstants;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
 
 public class EclipseLinkOrmXmlResourceProvider
-	extends AbstractXmlResourceProvider<EclipseLinkOrmXmlResource>
+	extends AbstractXmlResourceProvider
 {
 	/**
 	 * (Convenience method) Returns an EclipseLink ORM resource model provider for 
@@ -54,10 +49,7 @@ public class EclipseLinkOrmXmlResourceProvider
 	}
 	
 	private static EclipseLinkOrmXmlResourceProvider getXmlResourceProvider_(IProject project, String location) {
-		return (EclipseLinkOrmXmlResourceProvider) JpaXmlResourceProviderManager.instance().getXmlResourceProvider(
-			project, 
-			new Path(location),
-			JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE);
+		return new EclipseLinkOrmXmlResourceProvider(project, new Path(location));
 	}
 	
 	
@@ -66,23 +58,13 @@ public class EclipseLinkOrmXmlResourceProvider
 	}
 	
 	public EclipseLinkOrmXmlResourceProvider(IProject project, IPath filePath) {
-		super(project, filePath);
+		super(project, filePath, JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE);
 	}
 	
 	@Override
-	protected IContentType getContentType() {
-		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-	
-	@Override
-	protected void populateRoot(JpaXmlResource xmlResource) {
+	protected void populateRoot() {
 		XmlEntityMappings entityMappings = EclipseLinkOrmFactory.eINSTANCE.createXmlEntityMappings();
 		entityMappings.setVersion(EclipseLinkConstants.VERSION_1_0_TEXT);
-		getResourceContents(xmlResource).add(entityMappings);
-	}
-	
-	@Override
-	protected EclipseLinkOrmXmlResource ensureCorrectType(Resource r) throws ClassCastException {
-		return (EclipseLinkOrmXmlResource) r;
+		getResourceContents().add(entityMappings);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProviderFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProviderFactory.java
deleted file mode 100644
index d77fe59427..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProviderFactory.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.orm;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jpt.core.resource.JpaXmlResourceProvider;
-import org.eclipse.jpt.core.resource.JpaXmlResourceProviderFactory;
-
-public class EclipseLinkOrmXmlResourceProviderFactory 
-	implements JpaXmlResourceProviderFactory
-{
-	public JpaXmlResourceProvider create(IProject project, IPath filePath) {
-		return new EclipseLinkOrmXmlResourceProvider(project, filePath);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmXmlResource.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmXmlResource.java
deleted file mode 100644
index 96555b166d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmXmlResource.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkEntityMappingsTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public class EclipseLinkOrmXmlResource
-	extends OrmXmlResource
-{
-	public static final String TYPE = "eclipselink";
-
-	public EclipseLinkOrmXmlResource(URI uri, Renderer renderer) {
-		super(uri, renderer);
-	}
-
-	@Override
-	public XmlEntityMappings getEntityMappings() {
-		return (XmlEntityMappings) super.getEntityMappings();
-	}
-	
-	@Override
-	public Translator getRootTranslator() {
-		return EclipseLinkEntityMappingsTranslator.INSTANCE;
-	}
-
-	@Override
-	public String getType() {
-		return TYPE;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmXmlResourceFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmXmlResourceFactory.java
index 41542600d0..d90920d11c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmXmlResourceFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmXmlResourceFactory.java
@@ -10,6 +10,9 @@
 package org.eclipse.jpt.eclipselink.core.resource.orm;
 
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
+import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
+import org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkEntityMappingsTranslator;
 import org.eclipse.wst.common.internal.emf.resource.Renderer;
 import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
 import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
@@ -45,6 +48,6 @@ public class EclipseLinkOrmXmlResourceFactory extends TranslatorResourceFactory
 	 */
 	@Override
 	protected TranslatorResource createResource(URI uri, Renderer renderer) {
-		return new EclipseLinkOrmXmlResource(uri, renderer);
+		return new JpaXmlResource(uri, renderer, JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE, EclipseLinkEntityMappingsTranslator.INSTANCE);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java
index 077933e820..5a1d66c4f8 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java
@@ -9,9 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.ui.internal.persistence.general;
 
-import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.general.GeneralProperties;
 import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
@@ -55,12 +53,6 @@ public class EclipseLinkPersistenceUnitMappingFilesComposite extends Persistence
 
 		super(parentPane, parent);
 	}
-	
-	@Override
-	protected boolean isMappingFile(IContentType contentType) {
-		return super.isMappingFile(contentType) ||
-					contentType.isKindOf(JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE);
-	}
 
 	@Override
 	protected void initializeLayout(Composite container) {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/platform/EclipseLinkJpaPlatformUi.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/platform/EclipseLinkJpaPlatformUi.java
index 236e5dde51..022eec6548 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/platform/EclipseLinkJpaPlatformUi.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/platform/EclipseLinkJpaPlatformUi.java
@@ -21,7 +21,7 @@ import org.eclipse.jpt.core.context.PersistentAttribute;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmStructureNode;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
+import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkJpaUiFactory;
 import org.eclipse.jpt.eclipselink.ui.internal.ddlgen.EclipseLinkDDLGeneratorUi;
 import org.eclipse.jpt.eclipselink.ui.internal.java.details.DefaultOneToManyMappingUiProvider;
@@ -101,7 +101,7 @@ public class EclipseLinkJpaPlatformUi
 		// TODO - overhaul this class hierarchy!
 		//it's getting better, but still an instanceof here - KFB
 		if (structureNode instanceof OrmStructureNode) {
-			if (((OrmStructureNode) structureNode).getOrmType() == EclipseLinkOrmXmlResource.TYPE) {
+			if (((OrmStructureNode) structureNode).getContentType().equals(JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE)) {
 				return getEclipseLinkDetailsProviders();
 			}
 		}
@@ -191,7 +191,7 @@ public class EclipseLinkJpaPlatformUi
 	@Override
 	public Iterator<AttributeMappingUiProvider<? extends AttributeMapping>> attributeMappingUiProviders(PersistentAttribute attribute) {
 		if ((attribute instanceof OrmPersistentAttribute)
-				&& ((OrmPersistentAttribute) attribute).getOrmType() == EclipseLinkOrmXmlResource.TYPE) {
+				&& ((OrmPersistentAttribute) attribute).getContentType().equals(JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE)) {
 			return eclipseLinkOrmAttributeMappingUiProviders();
 		}
 		return super.attributeMappingUiProviders(attribute);
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/XmlMappingFileViewerFilter.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/XmlMappingFileViewerFilter.java
new file mode 100644
index 0000000000..2242e56cea
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/XmlMappingFileViewerFilter.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.ui.internal;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.jpt.core.JpaFile;
+import org.eclipse.jpt.core.JpaProject;
+import org.eclipse.jpt.core.JptCorePlugin;
+import org.eclipse.jpt.ui.JptUiPlugin;
+
+/**
+ * This filter will deny showing any file that are not XML mapping files or folders
+ * that don't contain any XML mapping files in its sub-hierarchy. An XML mapping
+ * file is one that has a corresponding JpaFile in the project with a mapping file
+ * content type.
+ * @see JptCorePlugin.MAPPING_FILE_CONTENT_TYPE
+ */
+public class XmlMappingFileViewerFilter extends ViewerFilter {
+
+	private final IJavaProject javaProject;
+
+	private final JpaProject jpaProject;
+	
+	public XmlMappingFileViewerFilter(JpaProject jpaProject) {
+		super();
+		this.jpaProject = jpaProject;
+		this.javaProject = jpaProject.getJavaProject();
+	}
+
+	/**
+	 * Determines whether the given file (an XML file) is a JPA mapping
+	 * descriptor file. 
+	 */
+	private boolean isMappingFile(IFile file) {
+		JpaFile jpaFile = this.jpaProject.getJpaFile(file);
+		return jpaFile != null ? jpaFile.getContentType().isKindOf(JptCorePlugin.MAPPING_FILE_CONTENT_TYPE): false;
+	}
+
+	@Override
+	public boolean select(Viewer viewer,
+	                      Object parentElement,
+	                      Object element) {
+
+		if (element instanceof IFile) {
+			return isMappingFile((IFile) element);
+		}
+		else if (element instanceof IFolder) {
+			IFolder folder = (IFolder) element;
+
+			try {
+				for (IClasspathEntry entry : this.javaProject.getRawClasspath()) {
+					if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
+						if (entry.getPath().isPrefixOf(folder.getFullPath().makeRelative())) {
+							for (IResource resource : folder.members()) {
+								if (select(viewer, folder, resource)) {
+									return true;
+								}
+							}
+						}
+					}
+				}
+			}
+			catch (JavaModelException e) {
+				JptUiPlugin.log(e.getStatus());
+			}
+			catch (CoreException e) {
+				JptUiPlugin.log(e.getStatus());
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitMappingFilesComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitMappingFilesComposite.java
index 6b217b6202..dad548ffad 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitMappingFilesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitMappingFilesComposite.java
@@ -15,26 +15,20 @@ import java.util.ListIterator;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.context.persistence.MappingFileRef;
 import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.core.internal.utility.PlatformTools;
 import org.eclipse.jpt.ui.JptUiPlugin;
 import org.eclipse.jpt.ui.internal.JptUiIcons;
+import org.eclipse.jpt.ui.internal.XmlMappingFileViewerFilter;
 import org.eclipse.jpt.ui.internal.persistence.JptUiPersistenceMessages;
 import org.eclipse.jpt.ui.internal.util.SWTUtil;
 import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
@@ -141,7 +135,7 @@ public abstract class PersistenceUnitMappingFilesComposite extends Pane<Persiste
 		dialog.setValidator(buildValidator());
 		dialog.setTitle(JptUiPersistenceMessages.PersistenceUnitMappingFilesComposite_mappingFileDialog_title);
 		dialog.setMessage(JptUiPersistenceMessages.PersistenceUnitMappingFilesComposite_mappingFileDialog_message);
-		dialog.addFilter(new XmlFileViewerFilter(getSubject().getJpaProject().getJavaProject()));
+		dialog.addFilter(new XmlMappingFileViewerFilter(getSubject().getJpaProject()));
 		dialog.setInput(project);
 		dialog.setComparator(new ResourceComparator(ResourceComparator.NAME));
 
@@ -363,72 +357,4 @@ public abstract class PersistenceUnitMappingFilesComposite extends Pane<Persiste
 			throw new SAXException();
 		}
 	}
-
-	protected boolean isMappingFile(IContentType contentType) {
-		return contentType.isKindOf(JptCorePlugin.ORM_XML_CONTENT_TYPE);
-	}
-	
-	/**
-	 * This filter will deny showing any file that are not XML files or folders
-	 * that don't contain any XML files in its sub-hierarchy. The XML files are
-	 * partially parsed to only accept JPA mapping descriptors.
-	 */
-	private class XmlFileViewerFilter extends ViewerFilter {
-
-		private final IJavaProject javaProject;
-
-		XmlFileViewerFilter(IJavaProject javaProject) {
-			super();
-			this.javaProject = javaProject;
-		}
-
-		/**
-		 * Determines whether the given file (an XML file) is a JPA mapping
-		 * descriptor file. 
-		 */
-		private boolean isMappingFile(IFile file) {
-			IContentType contentType = PlatformTools.getContentType(file);
-			return (contentType != null) && PersistenceUnitMappingFilesComposite.this.isMappingFile(contentType);
-		}
-
-		private boolean isXmlFile(IFile file) {
-			return "xml".equalsIgnoreCase(file.getFileExtension());
-		}
-
-		@Override
-		public boolean select(Viewer viewer,
-		                      Object parentElement,
-		                      Object element) {
-
-			if (element instanceof IFile) {
-				IFile file = (IFile) element;
-				return isXmlFile(file) && isMappingFile(file);
-			}
-			else if (element instanceof IFolder) {
-				IFolder folder = (IFolder) element;
-
-				try {
-					for (IClasspathEntry entry : this.javaProject.getRawClasspath()) {
-						if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-							if (entry.getPath().isPrefixOf(folder.getFullPath().makeRelative())) {
-								for (IResource resource : folder.members()) {
-									if (select(viewer, folder, resource)) {
-										return true;
-									}
-								}
-							}
-						}
-					}
-				}
-				catch (JavaModelException e) {
-					JptUiPlugin.log(e.getStatus());
-				}
-				catch (CoreException e) {
-					JptUiPlugin.log(e.getStatus());
-				}
-			}
-
-			return false;
-		}
-	}
 }
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityClassWizardPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityClassWizardPage.java
index c8961a1a74..4bbb764477 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityClassWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityClassWizardPage.java
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf. 
+ * Copyright (c) 2008, 2009 by SAP AG, Walldorf. 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,27 +14,24 @@ package org.eclipse.jpt.ui.internal.wizards.entity;
 import java.io.File;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jface.window.Window;
+import org.eclipse.jpt.core.JpaProject;
 import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.internal.resource.JpaXmlResourceProviderManager;
-import org.eclipse.jpt.core.internal.resource.orm.OrmXmlResourceProvider;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.ui.JptUiPlugin;
+import org.eclipse.jpt.ui.internal.XmlMappingFileViewerFilter;
 import org.eclipse.jpt.ui.internal.wizards.entity.data.model.IEntityDataModelProperties;
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
 import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassWizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -49,7 +46,6 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
 import org.eclipse.ui.model.WorkbenchContentProvider;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
@@ -63,7 +59,7 @@ public class EntityClassWizardPage extends NewJavaClassWizardPage{
 	private static final String JPA_FACET = "jpt.jpa";//$NON-NLS-1$
 	private static final String META_INF = "META-INF";//$NON-NLS-1$
 	private static final String EMPTY = "";//$NON-NLS-1$
-	private static final char SLASH = '/'; //$NON-NLS-1$
+	private static final char SLASH = '/';
 	private static final String SINGLE_TABLE = "SINGLE_TABLE";//$NON-NLS-1$
 	private static final String TABLE_PER_CLASS = "TABLE_PER_CLASS";//$NON-NLS-1$
 	private static final String JOINED = "JOINED";//$NON-NLS-1$
@@ -268,22 +264,26 @@ public class EntityClassWizardPage extends NewJavaClassWizardPage{
 		if (project == null) {
 			return;
 		}
-		ViewerFilter filter = getDialogViewerFilter();
+		JpaProject jpaProject = JptCorePlugin.getJpaProject(project);
+		ViewerFilter filter = getDialogViewerFilter(jpaProject);
 		ITreeContentProvider contentProvider = new WorkbenchContentProvider();
-		ILabelProvider labelProvider = new DecoratingLabelProvider(new WorkbenchLabelProvider(), PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator());
+		ILabelProvider labelProvider = new WorkbenchLabelProvider();
 		SelectMappingXMLDialog dialog = new SelectMappingXMLDialog(getShell(), labelProvider, contentProvider);
 		dialog.setTitle(EntityWizardMsg.MAPPING_XML_TITLE);
 		dialog.setMessage(EntityWizardMsg.CHOOSE_MAPPING_XML_MESSAGE);
 		dialog.addFilter(filter);
-				
-		IFile rootFolder = project.getFile(J2EEProjectUtilities.getSourceContainers(project)[0].getResource().getName() + SLASH + ormXmlName.getText().trim());//TODO 
-		dialog.setInput(J2EEProjectUtilities.getManifestFile(project).getParent().getParent());
+			
+		String ormFileName = this.ormXmlName.getText();
+		JpaXmlResource resource = jpaProject.getMappingFileResource(ormFileName);
+		IFile initialSelection = (resource != null) ? resource.getFile() : null;
+		dialog.setInput(project);
 
-		if (project != null)
-			dialog.setInitialSelection(rootFolder);
+		if (initialSelection != null) {
+			dialog.setInitialSelection(initialSelection);
+		}
 		if (dialog.open() == Window.OK) {
-			ormXmlName.setText(dialog.getChosenName());
-			model.validateProperty(IEntityDataModelProperties.XML_NAME);
+			this.ormXmlName.setText(dialog.getChosenName());
+			this.model.validateProperty(IEntityDataModelProperties.XML_NAME);
 		}		
 	}
 	
@@ -291,26 +291,8 @@ public class EntityClassWizardPage extends NewJavaClassWizardPage{
 	 * This method create filter for the browse/add alternative mapping XML 
 	 * @return new instance of viewer filter for the SelectMappingXMLDialog
 	 */
-	protected ViewerFilter getDialogViewerFilter() {
-		return new ViewerFilter() {
-			@Override
-			public boolean select(Viewer viewer, Object parent, Object element) {
-				if (element instanceof IFolder) {
-					IProject project = (IProject) getDataModel().getProperty(INewJavaClassDataModelProperties.PROJECT);
-					IFolder folder = (IFolder)element;
-					if (folder.contains(J2EEProjectUtilities.getManifestFile(project))) {
-						return true;
-					}
-					return false;
-				} else if (element instanceof IFile) {
-					IFile file = (IFile) element;
-					if (JpaXmlResourceProviderManager.instance().getXmlResourceProvider(file) instanceof OrmXmlResourceProvider) {
-						return true;
-					}
-				}
-				return false;
-			}
-		};
+	protected ViewerFilter getDialogViewerFilter(JpaProject jpaProject) {
+		return new XmlMappingFileViewerFilter(jpaProject);
 	}
 	
 	private void enableMappingXMLChooseGroup(boolean enabled) {
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/data/model/EntityDataModelProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/data/model/EntityDataModelProvider.java
index 96908780f7..fa7714b06f 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/data/model/EntityDataModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/data/model/EntityDataModelProvider.java
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf. 
+ * Copyright (c) 2008, 2009 by SAP AG, Walldorf. 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,8 +18,8 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jdt.core.JavaConventions;
 import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jpt.core.internal.resource.orm.OrmXmlResourceProvider;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
+import org.eclipse.jpt.core.JpaFile;
+import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.ui.JptUiPlugin;
 import org.eclipse.jpt.ui.internal.wizards.entity.EntityWizardMsg;
 import org.eclipse.jpt.ui.internal.wizards.entity.data.operation.NewEntityClassOperation;
@@ -178,9 +178,9 @@ public class EntityDataModelProvider extends NewJavaClassDataModelProvider imple
 			String projectName = model.getStringProperty(PROJECT_NAME);
 			IProject project = ProjectUtilities.getProject(projectName);
 			if (project != null) {
-				OrmXmlResourceProvider modelProvider = OrmXmlResourceProvider.getXmlResourceProvider(project, xmlName);
-				OrmXmlResource ormResource = modelProvider.getXmlResource();
-				if (!ormResource.exists()) {
+				//TODO need to check content type as well since user can type in a file name, should have a different error message for invalid content type
+				JpaFile jpaFile = JptCorePlugin.getJpaFile(project, xmlName);
+				if (jpaFile == null) {
 					return new Status(
 						IStatus.ERROR, JptUiPlugin.PLUGIN_ID,
 							EntityWizardMsg.INVALID_XML_NAME);
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/data/operation/NewEntityClassOperation.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/data/operation/NewEntityClassOperation.java
index 359931186d..ce1b56f65f 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/data/operation/NewEntityClassOperation.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/data/operation/NewEntityClassOperation.java
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf. 
+ * Copyright (c) 2008, 2009 by SAP AG, Walldorf. 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,8 +14,6 @@ package org.eclipse.jpt.ui.internal.wizards.entity.data.operation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -34,7 +32,6 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Preferences;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.codegen.jet.JETEmitter;
 import org.eclipse.emf.codegen.jet.JETException;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jdt.core.ICompilationUnit;
@@ -44,26 +41,19 @@ import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
 import org.eclipse.jem.util.logger.proxy.Logger;
+import org.eclipse.jpt.core.JpaProject;
 import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.internal.resource.orm.OrmXmlResourceProvider;
-import org.eclipse.jpt.core.internal.resource.persistence.PersistenceXmlResourceProvider;
-import org.eclipse.jpt.core.resource.orm.AccessType;
-import org.eclipse.jpt.core.resource.orm.Attributes;
-import org.eclipse.jpt.core.resource.orm.Inheritance;
-import org.eclipse.jpt.core.resource.orm.InheritanceType;
+import org.eclipse.jpt.core.MappingKeys;
+import org.eclipse.jpt.core.context.AccessType;
+import org.eclipse.jpt.core.context.Entity;
+import org.eclipse.jpt.core.context.InheritanceType;
+import org.eclipse.jpt.core.context.MappedSuperclass;
+import org.eclipse.jpt.core.context.orm.EntityMappings;
+import org.eclipse.jpt.core.context.orm.OrmPersistentType;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
-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.XmlIdImpl;
-import org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass;
-import org.eclipse.jpt.core.resource.orm.XmlTable;
 import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
-import org.eclipse.jpt.core.resource.persistence.PersistenceXmlResource;
 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.ui.JptUiPlugin;
@@ -77,7 +67,6 @@ import org.eclipse.jst.common.internal.annotations.controller.AnnotationsControl
 import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
 import org.eclipse.jst.j2ee.internal.project.WTPJETEmitter;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
 import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
 import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
@@ -269,8 +258,8 @@ public class NewEntityClassOperation extends AbstractDataModelOperation {
         		addEntityToXML(tempModel, project).schedule();
         	}
         }
-        if (!tempModel.isMappingXMLDefault() || !JptCorePlugin.discoverAnnotatedClasses(project)) {
-        	registerMappingXML(tempModel, project).schedule();
+        if (tempModel.isArtifactsAnnotated() && !JptCorePlugin.discoverAnnotatedClasses(project)) {
+        	registerClassInPersistenceXml(tempModel, project).schedule();
         }
 	}
 
@@ -399,79 +388,48 @@ public class NewEntityClassOperation extends AbstractDataModelOperation {
 		Job job = new Job(EntityWizardMsg.ADD_ENTITY_TO_XML) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
-				final OrmXmlResourceProvider modelProvider;
-				if (model.isMappingXMLDefault()) {
-					modelProvider = OrmXmlResourceProvider.getDefaultXmlResourceProvider(project);
+				final JpaXmlResource xmlResource = getOrmXmlResource(model, project);
+				EntityMappings entityMappings = (EntityMappings) JptCorePlugin.getJpaProject(project).getJpaFile(xmlResource.getFile()).rootStructureNodes().next();
+				OrmPersistentType persistentType = entityMappings.addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, model.getQualifiedJavaClassName());
+				Entity entity = (Entity) persistentType.getMapping();
+				if (model.isInheritanceSet()) {
+					entity.setSpecifiedInheritanceStrategy(getModelInheritanceType(model));
 				}
-				else {
-					modelProvider = OrmXmlResourceProvider.getXmlResourceProvider(project, model.getMappingXMLName());
+				
+				if (model.isEntityNameSet()) {
+					entity.setSpecifiedName(model.getEntityName());
+				}
+				if (model.isTableNameSet()) {
+					entity.getTable().setSpecifiedName(model.getTableName());
+				}
+				if (model.isCompositePK()) {
+					entity.setIdClass(model.getIdClassName());
+				}
+				for (String fieldName : model.getPKFields()) {
+					persistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, fieldName);
+				}
+
+				persistentType.setSpecifiedAccess(getModelAccessType(model));
+				
+				try {
+					xmlResource.saveIfNecessary();
+				}
+				catch (Exception e) {
+					JptUiPlugin.log(e);
 				}
-				modelProvider.modify(new Runnable() {
-					public void run() {
-						OrmXmlResource resource = modelProvider.getXmlResource();
-						
-						XmlEntityMappings entityMappings = resource.getEntityMappings();
-						if (entityMappings == null) {
-							entityMappings = OrmFactory.eINSTANCE.createXmlEntityMappings();
-							entityMappings.setVersion(VERSION_STRING);
-						}
-	
-						XmlEntity xmlEntity = OrmFactory.eINSTANCE.createXmlEntity();
-						xmlEntity.setClassName(model.getQualifiedJavaClassName());
-						if (model.isInheritanceSet()) {
-							Inheritance inheritance = OrmFactory.eINSTANCE.createInheritance();
-							String inheritanceStrategy = model.getInheritanceStrategyName();
-							if (inheritanceStrategy.equals(EMPTY_STRING)) {
-								inheritanceStrategy = SINGLE_TABLE;
-							}
-							InheritanceType inheritanceType = OrmFactory.eINSTANCE.createInheritanceTypeFromString(null, inheritanceStrategy);// TODO
-							inheritance.setStrategy(inheritanceType);
-							xmlEntity.setInheritance(inheritance);
-						}
-	
-						if (model.isEntityNameSet()) {
-							xmlEntity.setName(model.getEntityName());
-						}
-						if (model.isTableNameSet()) {
-							XmlTable xmlTable = OrmFactory.eINSTANCE.createXmlTable();
-							xmlTable.setName(model.getTableName());
-							xmlEntity.setTable(xmlTable);
-						}
-						if (model.isCompositePK()) {
-							XmlIdClass idClass = OrmFactory.eINSTANCE.createXmlIdClass();
-							idClass.setClassName(model.getIdClassName());
-							xmlEntity.setIdClass(idClass);
-						}
-						List<String> pkFields = model.getPKFields();
-						if (pkFields.size() > 0) {
-							Attributes entityAttributes = OrmFactory.eINSTANCE.createAttributes();
-							List<XmlIdImpl> ids = new ArrayList<XmlIdImpl>();
-							for (String fieldName : pkFields) {
-								XmlIdImpl idImpl = OrmFactory.eINSTANCE.createXmlIdImpl();
-								idImpl.setName(fieldName);
-								ids.add(idImpl);
-							}
-							entityAttributes.eSet(OrmPackage.ATTRIBUTES__IDS, ids);
-							xmlEntity.setAttributes(entityAttributes);
-						}
-	
-						String accessTypeString = FIELD;
-						if (!model.isFieldAccess()) {
-							accessTypeString = PROPERTY;
-						}
-						AccessType accessType = OrmFactory.eINSTANCE.createAccessTypeFromString(null, accessTypeString);// TODO
-						xmlEntity.setAccess(accessType);
-						EList<XmlEntity> entities = entityMappings.getEntities();
-						entities.add(xmlEntity);
-						resource.getContents().add(entityMappings);
-					}
-				});
 				return Status.OK_STATUS;
 			}
 		};
 		return job;
 	}
 
+	protected JpaXmlResource getOrmXmlResource(CreateEntityTemplateModel model, IProject project) {
+		if (model.isMappingXMLDefault()) {
+			return JptCorePlugin.getJpaProject(project).getDefaultOrmXmlResource();
+		}
+		return JptCorePlugin.getJpaProject(project).getMappingFileResource(model.getMappingXMLName());
+	}
+	
 	/**
 	 * Adds mapped superclass to ORM XML in separate job
 	 * 
@@ -483,102 +441,73 @@ public class NewEntityClassOperation extends AbstractDataModelOperation {
 		Job job = new Job(EntityWizardMsg.ADD_MAPPED_SUPERCLASS_TO_XML) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
-				final OrmXmlResourceProvider modelProvider;
-				if (model.isMappingXMLDefault()) {
-					modelProvider = OrmXmlResourceProvider.getDefaultXmlResourceProvider(project);
+				final JpaXmlResource xmlResource = getOrmXmlResource(model, project);
+				EntityMappings entityMappings = (EntityMappings) JptCorePlugin.getJpaProject(project).getJpaFile(xmlResource.getFile()).rootStructureNodes().next();
+				OrmPersistentType persistentType = entityMappings.addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, model.getQualifiedJavaClassName());
+				MappedSuperclass mappedSuperclass = (MappedSuperclass) persistentType.getMapping();
+				
+				if (model.isCompositePK()) {
+					mappedSuperclass.setIdClass(model.getIdClassName());
 				}
-				else {
-					modelProvider = OrmXmlResourceProvider.getXmlResourceProvider(project, model.getMappingXMLName());
+				
+				for (String fieldName : model.getPKFields()) {
+					persistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, fieldName);
+				}
+
+				persistentType.setSpecifiedAccess(getModelAccessType(model));
+				
+				try {
+					xmlResource.saveIfNecessary();
+				}
+				catch (Exception e) {
+					JptUiPlugin.log(e);
 				}
-				modelProvider.modify(new Runnable() {
-					public void run() {
-						OrmXmlResource resource = modelProvider.getXmlResource();
-						XmlEntityMappings entityMappings = resource.getEntityMappings();
-						if (entityMappings == null) {
-							entityMappings = OrmFactory.eINSTANCE.createXmlEntityMappings();
-							entityMappings.setVersion(VERSION_STRING);
-						}
-	
-						XmlMappedSuperclass xmlMappedSuperclass = OrmFactory.eINSTANCE.createXmlMappedSuperclass();
-						xmlMappedSuperclass.setClassName(model.getQualifiedJavaClassName());
-						
-						if (model.isCompositePK()) {
-							XmlIdClass idClass = OrmFactory.eINSTANCE.createXmlIdClass();
-							idClass.setClassName(model.getIdClassName());
-							xmlMappedSuperclass.setIdClass(idClass);
-						}
-						
-						List<String> pkFields = model.getPKFields();
-						if (pkFields.size() > 0) {
-							Attributes entityAttributes = OrmFactory.eINSTANCE.createAttributes();
-							List<XmlIdImpl> ids = new ArrayList<XmlIdImpl>();
-							for (String fieldName : pkFields) {
-								XmlIdImpl idImpl = OrmFactory.eINSTANCE.createXmlIdImpl();
-								idImpl.setName(fieldName);
-								ids.add(idImpl);
-							}
-							entityAttributes.eSet(OrmPackage.ATTRIBUTES__IDS, ids);
-							xmlMappedSuperclass.setAttributes(entityAttributes);
-						}
-	
-						String accessTypeString = FIELD;
-						if (!model.isFieldAccess()) {
-							accessTypeString = PROPERTY;
-						}
-						AccessType accessType = OrmFactory.eINSTANCE.createAccessTypeFromString(null, accessTypeString);
-						xmlMappedSuperclass.setAccess(accessType);
-						entityMappings.getMappedSuperclasses().add(xmlMappedSuperclass);
-						
-						resource.getContents().add(entityMappings);
-					}
-				});
 				return Status.OK_STATUS;
 			}
 		};
 		return job;		
 	}
 	
+	protected AccessType getModelAccessType(CreateEntityTemplateModel model) {
+		String accessTypeString = FIELD;
+		if (!model.isFieldAccess()) {
+			accessTypeString = PROPERTY;
+		}
+		return AccessType.fromXmlResourceModel(OrmFactory.eINSTANCE.createAccessTypeFromString(null, accessTypeString));// TODO
+	}
+
+	protected InheritanceType getModelInheritanceType(CreateEntityTemplateModel model) {
+		String inheritanceStrategy = model.getInheritanceStrategyName();
+		if (inheritanceStrategy.equals(EMPTY_STRING)) {
+			inheritanceStrategy = SINGLE_TABLE;
+		}
+		return InheritanceType.fromOrmResourceModel(OrmFactory.eINSTANCE.createInheritanceTypeFromString(null, inheritanceStrategy));//TODO
+	}
+
 	/**
-	 * Register alternative mapping XML and/or classes in the persistence.xml
+	 * Regist the class in the persistence.xml
 	 * 
 	 * @param model entity data model
 	 * @param project JPA project in which the entity will be created
 	 * @return the created job
 	 */
-	private Job registerMappingXML(final CreateEntityTemplateModel model, final IProject project) {
+	private Job registerClassInPersistenceXml(final CreateEntityTemplateModel model, final IProject project) {
 		Job job = new Job(EntityWizardMsg.APPLY_CHANGES_TO_PERSISTENCE_XML) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
-				final PersistenceXmlResourceProvider pmp = 
-					PersistenceXmlResourceProvider.getDefaultXmlResourceProvider(project);
-				pmp.modify(new Runnable() {
+				final JpaProject jpaProject = JptCorePlugin.getJpaProject(project);
+				final JpaXmlResource resource = jpaProject.getPersistenceXmlResource();
+				resource.modify(new Runnable() {
 						public void run() {
-							String fileName = getLastSegment(model.getMappingXMLName());
-							PersistenceXmlResource persistenceResource = pmp.getXmlResource();
-							XmlPersistence xmlPersistence = persistenceResource.getPersistence();
+							XmlPersistence xmlPersistence = (XmlPersistence) resource.getRootObject();
 							EList<XmlPersistenceUnit> persistenceUnits = xmlPersistence.getPersistenceUnits();
 							XmlPersistenceUnit persistenceUnit = persistenceUnits.get(0);// Multiply persistence unit support
-							if (!model.isMappingXMLDefault()) {
-								boolean newXmlMappingFile = true;
-								EList<XmlMappingFileRef> xmlMappingFiles = persistenceUnit.getMappingFiles();
-								for (XmlMappingFileRef fileRef : xmlMappingFiles) {
-									if (fileName.equals(fileRef.getFileName())) {
-										newXmlMappingFile = false;
-										break;
-									}
-								}						
-								if (newXmlMappingFile) {
-									XmlMappingFileRef xmlMappingFileRef = PersistenceFactory.eINSTANCE.createXmlMappingFileRef();
-									xmlMappingFileRef.setFileName(fileName);
-									persistenceUnit.getMappingFiles().add(xmlMappingFileRef);
-								}
-							}
-							if (!model.isNonEntitySuperclass() && !JptCorePlugin.discoverAnnotatedClasses(project)) {
+							
+							if (!model.isNonEntitySuperclass()) {
 								XmlJavaClassRef classRef = PersistenceFactory.eINSTANCE.createXmlJavaClassRef();
 								classRef.setJavaClass(model.getQualifiedJavaClassName());
 								persistenceUnit.getClasses().add(classRef);
 							}
-							persistenceResource.getContents().add(xmlPersistence);
 						}
 					});
 				
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/orm/MappingFileWizardPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/orm/MappingFileWizardPage.java
index f75259c241..b98f89aa3b 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/orm/MappingFileWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/orm/MappingFileWizardPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2008  Oracle. 
+ *  Copyright (c) 2008, 2009 Oracle. 
  *  All rights reserved.  This program and the accompanying materials are 
  *  made available under the terms of the Eclipse Public License v1.0 which 
  *  accompanies this distribution, and is available at 
@@ -19,7 +19,6 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
 import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -204,9 +203,7 @@ public class MappingFileWizardPage extends DataModelWizardPage
 		ISelectionStatusValidator validator = getSourceFolderDialogSelectionValidator();
 		ViewerFilter filter = getSourceFolderDialogViewerFilter();
 		ITreeContentProvider contentProvider = new WorkbenchContentProvider();
-		ILabelProvider labelProvider = new DecoratingLabelProvider(
-				new WorkbenchLabelProvider(), 
-				PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator());
+		ILabelProvider labelProvider = new WorkbenchLabelProvider();
 		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), labelProvider, contentProvider);
 		dialog.setValidator(validator);
 		dialog.setTitle(JptUiMessages.MappingFileWizardPage_accessLabel_sourceFolderDialogTitle);
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/ContextModelTestCase.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/ContextModelTestCase.java
index bf937b7882..51cd462d8f 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/ContextModelTestCase.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/ContextModelTestCase.java
@@ -24,11 +24,9 @@ import org.eclipse.jpt.core.context.java.JavaPersistentType;
 import org.eclipse.jpt.core.context.orm.EntityMappings;
 import org.eclipse.jpt.core.context.persistence.ClassRef;
 import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.core.internal.resource.orm.OrmXmlResourceProvider;
-import org.eclipse.jpt.core.internal.resource.persistence.PersistenceXmlResourceProvider;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
+import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
 import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
-import org.eclipse.jpt.core.resource.persistence.PersistenceXmlResource;
 import org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistence;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
@@ -38,13 +36,14 @@ import org.eclipse.jpt.core.tests.internal.utility.jdt.AnnotationTestCase;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
 
+@SuppressWarnings("nls")
 public abstract class ContextModelTestCase extends AnnotationTestCase
 {
 	protected static final String BASE_PROJECT_NAME = "ContextModelTestProject";
 	
-	protected PersistenceXmlResourceProvider persistenceResourceModelProvider;
+	protected JpaXmlResource persistenceXmlResource;
 	
-	protected OrmXmlResourceProvider ormResourceModelProvider;
+	protected JpaXmlResource ormXmlResource;
 	
 	
 	protected ContextModelTestCase(String name) {
@@ -54,17 +53,15 @@ public abstract class ContextModelTestCase extends AnnotationTestCase
 	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
-		this.persistenceResourceModelProvider = 
-			PersistenceXmlResourceProvider.getDefaultXmlResourceProvider(getJavaProject().getProject());
-		this.ormResourceModelProvider = 
-			OrmXmlResourceProvider.getDefaultXmlResourceProvider(getJavaProject().getProject());
+		this.persistenceXmlResource = getJpaProject().getPersistenceXmlResource();
+		this.ormXmlResource = getJpaProject().getDefaultOrmXmlResource();
 		waitForWorkspaceJobs();
 	}
 	
 	@Override
 	protected void tearDown() throws Exception {
-		this.persistenceResourceModelProvider = null;
-		this.ormResourceModelProvider = null;
+		this.persistenceXmlResource = null;
+		this.ormXmlResource = null;
 		super.tearDown();
 	}
 	
@@ -103,16 +100,20 @@ public abstract class ContextModelTestCase extends AnnotationTestCase
 		}
 	}
 	
-	protected PersistenceXmlResource getPersistenceXmlResource() {
-		return this.persistenceResourceModelProvider.getXmlResource();
+	protected JpaXmlResource getPersistenceXmlResource() {
+		return this.persistenceXmlResource;
 	}
 	
-	protected OrmXmlResource getOrmXmlResource() {
-		return this.ormResourceModelProvider.getXmlResource();
+	protected JpaXmlResource getOrmXmlResource() {
+		return this.ormXmlResource;
+	}
+	
+	protected XmlEntityMappings getXmlEntityMappings() {
+		return (XmlEntityMappings) getOrmXmlResource().getRootObject();
 	}
 	
 	protected XmlPersistence getXmlPersistence() {
-		return getPersistenceXmlResource().getPersistence();
+		return (XmlPersistence) getPersistenceXmlResource().getRootObject();
 	}
 	
 	protected EntityMappings getEntityMappings() {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/JpaFileTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/JpaFileTests.java
index 9519cff4b8..658b85f36b 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/JpaFileTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/JpaFileTests.java
@@ -113,7 +113,7 @@ public class JpaFileTests extends ContextModelTestCase
 		JpaFile ormXmlJpaFile = JptCorePlugin.getJpaFile(file);
 		assertEquals(getEntityMappings(), ormXmlJpaFile.rootStructureNodes().next());
 		
-		getOrmXmlResource().getContents().remove(getOrmXmlResource().getEntityMappings());
+		getOrmXmlResource().getContents().remove(getOrmXmlResource().getRootObject());
 		
 		assertFalse(ormXmlJpaFile.rootStructureNodes().hasNext());
 	}
@@ -157,7 +157,7 @@ public class JpaFileTests extends ContextModelTestCase
 		getRootContextNode().getPersistenceXml().getPersistence();
 		assertEquals(getRootContextNode().getPersistenceXml().getPersistence(), persistenceXmlJpaFile.rootStructureNodes().next());
 		
-		getPersistenceXmlResource().getContents().remove(getPersistenceXmlResource().getPersistence());
+		getPersistenceXmlResource().getContents().remove(getXmlPersistence());
 		
 		assertFalse(persistenceXmlJpaFile.rootStructureNodes().hasNext());
 	}
@@ -170,7 +170,7 @@ public class JpaFileTests extends ContextModelTestCase
 		
 		assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.rootStructureNodes().next());
 		
-		getRootContextNode().removePersistenceXml();
+		getPersistenceXmlResource().getContents().remove(getXmlPersistence());
 		assertFalse(javaJpaFile.rootStructureNodes().hasNext());
 	}
 	
@@ -182,7 +182,7 @@ public class JpaFileTests extends ContextModelTestCase
 		
 		assertEquals(getJavaPersistentType(), javaJpaFile.rootStructureNodes().next());
 		
-		getRootContextNode().removePersistenceXml();
+		getPersistenceXmlResource().getContents().remove(getXmlPersistence());
 		assertFalse(javaJpaFile.rootStructureNodes().hasNext());
 	}
 	
@@ -213,7 +213,7 @@ public class JpaFileTests extends ContextModelTestCase
 		assertEquals(javaPersistentType, javaJpaFile.rootStructureNodes().next());
 		assertTrue(javaJpaFile.rootStructureNodes().next().getParent() instanceof OrmPersistentType);
 		
-		getOrmXmlResource().getEntityMappings().getEntities().remove(0);
+		getXmlEntityMappings().getEntities().remove(0);
 		
 		assertEquals(1, javaJpaFile.rootStructureNodesSize());
 		assertTrue(javaJpaFile.rootStructureNodes().next().getParent() instanceof ClassRef);
@@ -273,7 +273,7 @@ public class JpaFileTests extends ContextModelTestCase
 		JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType();
 		assertEquals(javaPersistentType, javaJpaFile.rootStructureNodes().next());
 		
-		getOrmXmlResource().getContents().remove(getOrmXmlResource().getEntityMappings());
+		getOrmXmlResource().getContents().remove(getXmlEntityMappings());
 		assertNotSame(javaPersistentType, javaJpaFile.rootStructureNodes().next());
 		assertEquals(1, javaJpaFile.rootStructureNodesSize());
 		assertEquals(getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.rootStructureNodes().next().getParent());
@@ -288,7 +288,7 @@ public class JpaFileTests extends ContextModelTestCase
 		JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType();
 		assertEquals(javaPersistentType, javaJpaFile.rootStructureNodes().next());
 		
-		getPersistenceXmlResource().getPersistence().getPersistenceUnits().remove(0);
+		getXmlPersistence().getPersistenceUnits().remove(0);
 
 		assertFalse(javaJpaFile.rootStructureNodes().hasNext());
 		assertEquals(0, javaJpaFile.rootStructureNodesSize());
@@ -394,6 +394,5 @@ public class JpaFileTests extends ContextModelTestCase
 		assertEquals(1, javaJpaFile.rootStructureNodesSize());
 		assertEquals(getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.rootStructureNodes().next().getParent());
 	}
-	
 	//TODO test rootStructureNodes with a static inner class
 }
\ No newline at end of file
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/JpaProjectTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/JpaProjectTests.java
new file mode 100644
index 0000000000..9d9e8e5581
--- /dev/null
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/JpaProjectTests.java
@@ -0,0 +1,181 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.core.tests.internal.context;
+
+import junit.framework.TestCase;
+import org.eclipse.jpt.core.JpaProject;
+import org.eclipse.jpt.core.JptCorePlugin;
+import org.eclipse.jpt.core.internal.resource.orm.OrmXmlResourceProvider;
+import org.eclipse.jpt.core.internal.resource.persistence.PersistenceXmlResourceProvider;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
+import org.eclipse.jpt.core.tests.internal.projects.TestJpaProject;
+
+@SuppressWarnings("nls")
+public class JpaProjectTests extends TestCase
+{
+	static final String BASE_PROJECT_NAME = JpaProjectTests.class.getSimpleName();
+	
+	TestJpaProject jpaProject;
+
+	
+	public JpaProjectTests(String name) {
+		super(name);
+	}
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+		this.jpaProject = TestJpaProject.buildJpaProject(BASE_PROJECT_NAME, false); // false = no auto-build
+	}
+	
+	@Override
+	protected void tearDown() throws Exception {
+		this.jpaProject.getProject().delete(true, true, null);
+		this.jpaProject = null;
+		super.tearDown();
+	}
+	
+	protected JpaProject getJpaProject() {
+		return this.jpaProject.getJpaProject();
+	}
+	
+	public void testGetPersistenceXmlResource() throws Exception {
+		JpaXmlResource resource = this.getJpaProject().getPersistenceXmlResource();
+		assertNotNull(resource);
+		assertEquals(JptCorePlugin.PERSISTENCE_XML_CONTENT_TYPE, resource.getContentType());
+		assertEquals("src/META-INF/persistence.xml", resource.getFile().getProjectRelativePath().toString());
+		
+		//delete the persistence.xml file and verify it is not returned from getPersistenceXmlResource()
+		resource.delete(null);
+		resource = this.getJpaProject().getPersistenceXmlResource();
+		assertNull(resource);
+		
+		//add the persistence.xml file back
+		createPersistenceXmlFile();
+		resource = this.getJpaProject().getPersistenceXmlResource();
+		assertNotNull(resource);
+		assertEquals(JptCorePlugin.PERSISTENCE_XML_CONTENT_TYPE, resource.getContentType());
+		assertEquals("src/META-INF/persistence.xml", resource.getFile().getProjectRelativePath().toString());
+	}
+	
+	private void createPersistenceXmlFile() throws Exception {
+		PersistenceXmlResourceProvider resourceProvider = 
+			PersistenceXmlResourceProvider.getDefaultXmlResourceProvider(this.jpaProject.getProject());
+		resourceProvider.createFileAndResource();
+	}
+
+	public void testGetDefaultOrmXmlResource() throws Exception {
+		JpaXmlResource resource = this.getJpaProject().getDefaultOrmXmlResource();
+		assertNotNull(resource);
+		assertEquals(JptCorePlugin.ORM_XML_CONTENT_TYPE, resource.getContentType());
+		assertEquals("src/META-INF/orm.xml", resource.getFile().getProjectRelativePath().toString());
+		
+		//delete the orm.xml file and verify it is not returned from getDefaultOrmXmlResource()
+		resource.delete(null);
+		resource = this.getJpaProject().getDefaultOrmXmlResource();
+		assertNull(resource);
+		
+		//add the default orm.xml file back
+		createDefaultOrmXmlFile();
+		resource = this.getJpaProject().getDefaultOrmXmlResource();
+		assertNotNull(resource);
+		assertEquals(JptCorePlugin.ORM_XML_CONTENT_TYPE, resource.getContentType());
+		assertEquals("src/META-INF/orm.xml", resource.getFile().getProjectRelativePath().toString());
+	}
+	
+	private void createDefaultOrmXmlFile() throws Exception {
+		OrmXmlResourceProvider resourceProvider = 
+			OrmXmlResourceProvider.getDefaultXmlResourceProvider(this.jpaProject.getProject());
+		resourceProvider.createFileAndResource();
+	}
+	
+	private void createOrmXmlFile(String filePath) throws Exception {
+		OrmXmlResourceProvider resourceProvider = 
+			OrmXmlResourceProvider.getXmlResourceProvider(this.jpaProject.getProject(), filePath);
+		resourceProvider.createFileAndResource();
+	}
+
+	public void testGetMappingFileResource() throws Exception {
+		JpaXmlResource resource = this.getJpaProject().getMappingFileResource(JptCorePlugin.DEFAULT_ORM_XML_FILE_PATH);
+		assertNotNull(resource);
+		assertEquals(JptCorePlugin.ORM_XML_CONTENT_TYPE, resource.getContentType());
+		assertEquals("src/META-INF/orm.xml", resource.getFile().getProjectRelativePath().toString());
+		
+		//delete the orm.xml file and verify it is not returned from getMappingFileResource()
+		resource.delete(null);
+		resource = this.getJpaProject().getMappingFileResource(JptCorePlugin.DEFAULT_ORM_XML_FILE_PATH);
+		assertNull(resource);
+		
+		//add the  orm.xml file back
+		createDefaultOrmXmlFile();
+		resource = this.getJpaProject().getMappingFileResource(JptCorePlugin.DEFAULT_ORM_XML_FILE_PATH);
+		assertNotNull(resource);
+		assertEquals(JptCorePlugin.ORM_XML_CONTENT_TYPE, resource.getContentType());
+		assertEquals("src/META-INF/orm.xml", resource.getFile().getProjectRelativePath().toString());
+	}
+	
+	public void testGetMappingFileResource2() throws Exception {
+		JpaXmlResource resource = this.getJpaProject().getMappingFileResource("META-INF/orm2.xml");
+		assertNull(resource);
+
+		//create the orm2.xml file
+		createOrmXmlFile("META-INF/orm2.xml");
+		resource = this.getJpaProject().getMappingFileResource("META-INF/orm2.xml");
+		assertNotNull(resource);
+		assertEquals(JptCorePlugin.ORM_XML_CONTENT_TYPE, resource.getContentType());
+		assertEquals("src/META-INF/orm2.xml", resource.getFile().getProjectRelativePath().toString());
+		
+		//delete the orm2.xml file and verify it is not returned from getMappingFileResource()
+		resource.delete(null);
+		resource = this.getJpaProject().getMappingFileResource("META-INF/orm2.xml");
+		assertNull(resource);
+		
+		//add the orm2.xml file back
+		createOrmXmlFile("META-INF/orm2.xml");
+		resource = this.getJpaProject().getMappingFileResource("META-INF/orm2.xml");
+		assertNotNull(resource);
+		assertEquals(JptCorePlugin.ORM_XML_CONTENT_TYPE, resource.getContentType());
+		assertEquals("src/META-INF/orm2.xml", resource.getFile().getProjectRelativePath().toString());
+	}
+//	public void testModelLoad() {
+//		OrmXmlResourceProvider modelProvider = 
+//			OrmXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
+//		assertNotNull(modelProvider);
+//		JpaXmlResource resource = modelProvider.getXmlResource();
+//		assertNotNull(resource);
+//	}
+//	
+//	public void testModelLoad2() {
+//		OrmXmlResourceProvider modelProvider = 
+//			OrmXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
+//		assertNotNull(modelProvider);
+//		JpaXmlResource resource = modelProvider.getXmlResource();
+//		assertNotNull(resource);
+//	}
+//	
+//	public void testModelLoadForDifferentlyNamedOrmXml() {
+//		OrmXmlResourceProvider modelProvider = 
+//			OrmXmlResourceProvider.getXmlResourceProvider(jpaProject.getProject(), "META-INF/orm2.xml");
+//		assertNotNull(modelProvider);
+//		JpaXmlResource resource = modelProvider.getXmlResource();
+//		assertNotNull(resource);
+//	}
+//	
+//	public void testCreateFile() throws CoreException {
+//		createFile();
+//		OrmXmlResourceProvider modelProvider = 
+//			OrmXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
+//		assertNotNull(modelProvider);
+//		JpaXmlResource resource = modelProvider.getXmlResource();
+//		assertNotNull(resource);
+//		assertTrue(resource.fileExists());
+//	}
+
+}
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/JptCoreContextModelTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/JptCoreContextModelTests.java
index 307e3051db..ba4c425481 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/JptCoreContextModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/JptCoreContextModelTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2007 Oracle. 
+ *  Copyright (c) 2007, 2009 Oracle. 
  *  All rights reserved.  This program and the accompanying materials 
  *  are made available under the terms of the Eclipse Public License v1.0 
  *  which accompanies this distribution, and is available at 
@@ -25,6 +25,7 @@ public class JptCoreContextModelTests extends TestCase
 	
 	public static Test suite(boolean all) {
 		TestSuite suite = new TestSuite(JptCoreContextModelTests.class.getName());
+		suite.addTestSuite(JpaProjectTests.class);
 		suite.addTestSuite(JpaFileTests.class);
 		suite.addTest(JptCorePersistenceContextModelTests.suite(all));
 		suite.addTest(JptCoreOrmContextModelTests.suite(all));
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/EntityMappingsTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/EntityMappingsTests.java
index d4e347f3de..bbd9f54878 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/EntityMappingsTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/EntityMappingsTests.java
@@ -28,8 +28,8 @@ import org.eclipse.jpt.core.resource.orm.XmlTableGenerator;
 import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
-import org.eclipse.jpt.utility.internal.CollectionTools;
 
+@SuppressWarnings("nls")
 public class EntityMappingsTests extends ContextModelTestCase
 {
 	public EntityMappingsTests(String name) {
@@ -51,397 +51,397 @@ public class EntityMappingsTests extends ContextModelTestCase
 	
 	public void testUpdateDescription() throws Exception {
 		assertNull(getEntityMappings().getDescription());
-		assertNull(getOrmXmlResource().getEntityMappings().getDescription());
+		assertNull(getXmlEntityMappings().getDescription());
 		
 		//set description in the resource model, verify context model updated
-		getOrmXmlResource().getEntityMappings().setDescription("newDescription");
+		getXmlEntityMappings().setDescription("newDescription");
 		assertEquals("newDescription", getEntityMappings().getDescription());
-		assertEquals("newDescription", getOrmXmlResource().getEntityMappings().getDescription());
+		assertEquals("newDescription", getXmlEntityMappings().getDescription());
 	
 		//set description to null in the resource model
-		getOrmXmlResource().getEntityMappings().setDescription(null);
+		getXmlEntityMappings().setDescription(null);
 		assertNull(getEntityMappings().getDescription());
-		assertNull(getOrmXmlResource().getEntityMappings().getDescription());
+		assertNull(getXmlEntityMappings().getDescription());
 	}
 	
 	public void testModifyDescription() throws Exception {
 		assertNull(getEntityMappings().getDescription());
-		assertNull(getOrmXmlResource().getEntityMappings().getDescription());
+		assertNull(getXmlEntityMappings().getDescription());
 		
 		//set description in the context model, verify resource model modified
 		getEntityMappings().setDescription("newDescription");
 		assertEquals("newDescription", getEntityMappings().getDescription());
-		assertEquals("newDescription", getOrmXmlResource().getEntityMappings().getDescription());
+		assertEquals("newDescription", getXmlEntityMappings().getDescription());
 		
 		//set description to null in the context model
 		getEntityMappings().setDescription(null);
 		assertNull(getEntityMappings().getDescription());
-		assertNull(getOrmXmlResource().getEntityMappings().getDescription());
+		assertNull(getXmlEntityMappings().getDescription());
 	}
 	
 	public void testUpdatePackage() throws Exception {
 		assertNull(getEntityMappings().getPackage());
-		assertNull(getOrmXmlResource().getEntityMappings().getPackage());
+		assertNull(getXmlEntityMappings().getPackage());
 		
 		//set package in the resource model, verify context model updated
-		getOrmXmlResource().getEntityMappings().setPackage("foo.model");
+		getXmlEntityMappings().setPackage("foo.model");
 		assertEquals("foo.model", getEntityMappings().getPackage());
-		assertEquals("foo.model", getOrmXmlResource().getEntityMappings().getPackage());
+		assertEquals("foo.model", getXmlEntityMappings().getPackage());
 		
 		//set package to null in the resource model
-		getOrmXmlResource().getEntityMappings().setPackage(null);
+		getXmlEntityMappings().setPackage(null);
 		assertNull(getEntityMappings().getPackage());
-		assertNull(getOrmXmlResource().getEntityMappings().getPackage());
+		assertNull(getXmlEntityMappings().getPackage());
 	}
 	
 	public void testModifyPackage() throws Exception {
 		assertNull(getEntityMappings().getPackage());
-		assertNull(getOrmXmlResource().getEntityMappings().getPackage());
+		assertNull(getXmlEntityMappings().getPackage());
 		
 		//set package in the context model, verify resource model modified
 		getEntityMappings().setPackage("foo.model");
 		assertEquals("foo.model", getEntityMappings().getPackage());
-		assertEquals("foo.model", getOrmXmlResource().getEntityMappings().getPackage());
+		assertEquals("foo.model", getXmlEntityMappings().getPackage());
 
 		//set package to null in the context model
 		getEntityMappings().setPackage(null);
 		assertNull(getEntityMappings().getPackage());
-		assertNull(getOrmXmlResource().getEntityMappings().getPackage());
+		assertNull(getXmlEntityMappings().getPackage());
 	}
 
 	public void testUpdateSpecifiedSchema() throws Exception {
 		assertNull(getEntityMappings().getSpecifiedSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getSchema());
+		assertNull(getXmlEntityMappings().getSchema());
 		
 		//set schema in the resource model, verify context model updated
-		getOrmXmlResource().getEntityMappings().setSchema("MY_SCHEMA");
+		getXmlEntityMappings().setSchema("MY_SCHEMA");
 		assertEquals("MY_SCHEMA", getEntityMappings().getSpecifiedSchema());
-		assertEquals("MY_SCHEMA", getOrmXmlResource().getEntityMappings().getSchema());
+		assertEquals("MY_SCHEMA", getXmlEntityMappings().getSchema());
 
 		//set schema to null in the resource model
-		getOrmXmlResource().getEntityMappings().setSchema(null);
+		getXmlEntityMappings().setSchema(null);
 		assertNull(getEntityMappings().getSpecifiedSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getSchema());
+		assertNull(getXmlEntityMappings().getSchema());
 	}
 	
 	public void testModifySpecifiedSchema() throws Exception {
 		assertNull(getEntityMappings().getSpecifiedSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getSchema());
+		assertNull(getXmlEntityMappings().getSchema());
 		
 		//set schema in the context model, verify resource model modified
 		getEntityMappings().setSpecifiedSchema("MY_SCHEMA");
 		assertEquals("MY_SCHEMA", getEntityMappings().getSpecifiedSchema());
-		assertEquals("MY_SCHEMA", getOrmXmlResource().getEntityMappings().getSchema());
+		assertEquals("MY_SCHEMA", getXmlEntityMappings().getSchema());
 
 		//set schema to null in the context model
 		getEntityMappings().setSpecifiedSchema(null);
 		assertNull(getEntityMappings().getSpecifiedSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getSchema());
+		assertNull(getXmlEntityMappings().getSchema());
 	}
 
 	public void testUpdateSpecifiedCatalog() throws Exception {
 		assertNull(getEntityMappings().getSpecifiedCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getCatalog());
+		assertNull(getXmlEntityMappings().getCatalog());
 		
 		//set catalog in the resource model, verify context model updated
-		getOrmXmlResource().getEntityMappings().setCatalog("MY_CATALOG");
+		getXmlEntityMappings().setCatalog("MY_CATALOG");
 		assertEquals("MY_CATALOG", getEntityMappings().getSpecifiedCatalog());
-		assertEquals("MY_CATALOG", getOrmXmlResource().getEntityMappings().getCatalog());
+		assertEquals("MY_CATALOG", getXmlEntityMappings().getCatalog());
 
 		//set catalog to null in the resource model
-		getOrmXmlResource().getEntityMappings().setCatalog(null);
+		getXmlEntityMappings().setCatalog(null);
 		assertNull(getEntityMappings().getSpecifiedCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getCatalog());
+		assertNull(getXmlEntityMappings().getCatalog());
 	}
 	
 	public void testUpdateDefaultSchema() throws Exception {
 		assertNull(getEntityMappings().getDefaultSchema());
 		assertNull(getEntityMappings().getSpecifiedSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getSchema());
+		assertNull(getXmlEntityMappings().getSchema());
 	
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
 		org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults persistenceUnitDefaults = OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults();
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setPersistenceUnitDefaults(persistenceUnitDefaults);
+		getXmlEntityMappings().getPersistenceUnitMetadata().setPersistenceUnitDefaults(persistenceUnitDefaults);
 		persistenceUnitDefaults.setSchema("MY_SCHEMA");
 		assertEquals("MY_SCHEMA", getEntityMappings().getDefaultSchema());
 		assertNull(getEntityMappings().getSpecifiedSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getSchema());
-		assertEquals("MY_SCHEMA", getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getSchema());
+		assertNull(getXmlEntityMappings().getSchema());
+		assertEquals("MY_SCHEMA", getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getSchema());
 	
 		persistenceUnitDefaults.setSchema(null);
 		assertNull(getEntityMappings().getDefaultSchema());
 		assertNull(getEntityMappings().getSpecifiedSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getSchema());
+		assertNull(getXmlEntityMappings().getSchema());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getSchema());
 	}
 	
 	public void testUpdateSchema() throws Exception {
 		assertNull(getEntityMappings().getDefaultSchema());
 		assertNull(getEntityMappings().getSchema());
 		assertNull(getEntityMappings().getSpecifiedSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getSchema());
+		assertNull(getXmlEntityMappings().getSchema());
 	
-		getOrmXmlResource().getEntityMappings().setSchema("MY_SCHEMA");
+		getXmlEntityMappings().setSchema("MY_SCHEMA");
 		assertNull(getEntityMappings().getDefaultSchema());
 		assertEquals("MY_SCHEMA", getEntityMappings().getSchema());
 		assertEquals("MY_SCHEMA", getEntityMappings().getSpecifiedSchema());
-		assertEquals("MY_SCHEMA", getOrmXmlResource().getEntityMappings().getSchema());
+		assertEquals("MY_SCHEMA", getXmlEntityMappings().getSchema());
 		
-		getOrmXmlResource().getEntityMappings().setSchema(null);
+		getXmlEntityMappings().setSchema(null);
 		assertNull(getEntityMappings().getDefaultSchema());
 		assertNull(getEntityMappings().getSchema());
 		assertNull(getEntityMappings().getSpecifiedSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getSchema());
+		assertNull(getXmlEntityMappings().getSchema());
 
 		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema("DEFAULT_SCHEMA");
 		assertEquals("DEFAULT_SCHEMA", getEntityMappings().getDefaultSchema());
 		assertEquals("DEFAULT_SCHEMA", getEntityMappings().getSchema());
 		assertNull(getEntityMappings().getSpecifiedSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getSchema());
+		assertNull(getXmlEntityMappings().getSchema());
 		
 		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema(null);
 		assertNull(getEntityMappings().getDefaultSchema());
 		assertNull(getEntityMappings().getSchema());
 		assertNull(getEntityMappings().getSpecifiedSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getSchema());
+		assertNull(getXmlEntityMappings().getSchema());
 	}	
 	
 	public void testModifySpecifiedCatalog() throws Exception {
 		assertNull(getEntityMappings().getSpecifiedCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getCatalog());
+		assertNull(getXmlEntityMappings().getCatalog());
 		
 		//set catalog in the context model, verify resource model modified
 		getEntityMappings().setSpecifiedCatalog("MY_CATALOG");
 		assertEquals("MY_CATALOG", getEntityMappings().getSpecifiedCatalog());
-		assertEquals("MY_CATALOG", getOrmXmlResource().getEntityMappings().getCatalog());
+		assertEquals("MY_CATALOG", getXmlEntityMappings().getCatalog());
 		
 		//set catalog to null in the context model
 		getEntityMappings().setSpecifiedCatalog(null);
 		assertNull(getEntityMappings().getSpecifiedCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getCatalog());
+		assertNull(getXmlEntityMappings().getCatalog());
 	}
 	
 	public void testUpdateDefaultCatalog() throws Exception {
 		assertNull(getEntityMappings().getDefaultCatalog());
 		assertNull(getEntityMappings().getSpecifiedCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getCatalog());
+		assertNull(getXmlEntityMappings().getCatalog());
 	
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
 		org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults persistenceUnitDefaults = OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults();
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setPersistenceUnitDefaults(persistenceUnitDefaults);
+		getXmlEntityMappings().getPersistenceUnitMetadata().setPersistenceUnitDefaults(persistenceUnitDefaults);
 		persistenceUnitDefaults.setCatalog("MY_CATALOG");
 		assertEquals("MY_CATALOG", getEntityMappings().getDefaultCatalog());
 		assertNull(getEntityMappings().getSpecifiedCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getCatalog());
-		assertEquals("MY_CATALOG", getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getCatalog());
+		assertNull(getXmlEntityMappings().getCatalog());
+		assertEquals("MY_CATALOG", getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getCatalog());
 	
 		persistenceUnitDefaults.setCatalog(null);
 		assertNull(getEntityMappings().getDefaultCatalog());
 		assertNull(getEntityMappings().getSpecifiedCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getCatalog());
+		assertNull(getXmlEntityMappings().getCatalog());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getCatalog());
 	}
 	
 	public void testUpdateCatalog() throws Exception {
 		assertNull(getEntityMappings().getDefaultCatalog());
 		assertNull(getEntityMappings().getCatalog());
 		assertNull(getEntityMappings().getSpecifiedCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getCatalog());
+		assertNull(getXmlEntityMappings().getCatalog());
 	
-		getOrmXmlResource().getEntityMappings().setCatalog("MY_CATALOG");
+		getXmlEntityMappings().setCatalog("MY_CATALOG");
 		assertNull(getEntityMappings().getDefaultCatalog());
 		assertEquals("MY_CATALOG", getEntityMappings().getCatalog());
 		assertEquals("MY_CATALOG", getEntityMappings().getSpecifiedCatalog());
-		assertEquals("MY_CATALOG", getOrmXmlResource().getEntityMappings().getCatalog());
+		assertEquals("MY_CATALOG", getXmlEntityMappings().getCatalog());
 		
-		getOrmXmlResource().getEntityMappings().setCatalog(null);
+		getXmlEntityMappings().setCatalog(null);
 		assertNull(getEntityMappings().getDefaultCatalog());
 		assertNull(getEntityMappings().getCatalog());
 		assertNull(getEntityMappings().getSpecifiedCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getCatalog());
+		assertNull(getXmlEntityMappings().getCatalog());
 
 		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog("DEFAULT_CATALOG");
 		assertEquals("DEFAULT_CATALOG", getEntityMappings().getDefaultCatalog());
 		assertEquals("DEFAULT_CATALOG", getEntityMappings().getCatalog());
 		assertNull(getEntityMappings().getSpecifiedCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getCatalog());
+		assertNull(getXmlEntityMappings().getCatalog());
 		
 		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog(null);
 		assertNull(getEntityMappings().getDefaultCatalog());
 		assertNull(getEntityMappings().getCatalog());
 		assertNull(getEntityMappings().getSpecifiedCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getCatalog());
+		assertNull(getXmlEntityMappings().getCatalog());
 	}	
 
 	public void testUpdateSpecifiedAccess() throws Exception {
 		assertNull(getEntityMappings().getSpecifiedAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getAccess());
+		assertNull(getXmlEntityMappings().getAccess());
 		
 		//set access in the resource model, verify context model updated
-		getOrmXmlResource().getEntityMappings().setAccess(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY);
+		getXmlEntityMappings().setAccess(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY);
 		assertEquals(AccessType.PROPERTY, getEntityMappings().getSpecifiedAccess());
-		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY, getOrmXmlResource().getEntityMappings().getAccess());
+		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY, getXmlEntityMappings().getAccess());
 		
 		//set access to null in the resource model
-		getOrmXmlResource().getEntityMappings().setAccess(null);
+		getXmlEntityMappings().setAccess(null);
 		assertNull(getEntityMappings().getSpecifiedAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getAccess());
+		assertNull(getXmlEntityMappings().getAccess());
 	}
 	
 	public void testModifySpecifiedAccess() throws Exception {
 		assertNull(getEntityMappings().getSpecifiedAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getAccess());
+		assertNull(getXmlEntityMappings().getAccess());
 		
 		//set access in the context model, verify resource model modified
 		getEntityMappings().setSpecifiedAccess(AccessType.PROPERTY);
 		assertEquals(AccessType.PROPERTY, getEntityMappings().getSpecifiedAccess());
-		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY, getOrmXmlResource().getEntityMappings().getAccess());
+		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY, getXmlEntityMappings().getAccess());
 		
 		//set access to null in the context model
 		getEntityMappings().setSpecifiedAccess(null);
 		assertNull(getEntityMappings().getSpecifiedAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getAccess());
+		assertNull(getXmlEntityMappings().getAccess());
 	}
 	
 	public void testUpdateDefaultAccess() throws Exception {
 		assertNull(getEntityMappings().getDefaultAccess());
 		assertNull(getEntityMappings().getSpecifiedAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getAccess());
+		assertNull(getXmlEntityMappings().getAccess());
 	
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
 		org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults persistenceUnitDefaults = OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults();
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setPersistenceUnitDefaults(persistenceUnitDefaults);
+		getXmlEntityMappings().getPersistenceUnitMetadata().setPersistenceUnitDefaults(persistenceUnitDefaults);
 		persistenceUnitDefaults.setAccess(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY);
 		assertEquals(AccessType.PROPERTY, getEntityMappings().getDefaultAccess());
 		assertNull(getEntityMappings().getSpecifiedAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getAccess());
+		assertNull(getXmlEntityMappings().getAccess());
 		
 		persistenceUnitDefaults.setAccess(org.eclipse.jpt.core.resource.orm.AccessType.FIELD);
 		assertEquals(AccessType.FIELD, getEntityMappings().getDefaultAccess());
 		assertNull(getEntityMappings().getSpecifiedAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getAccess());
+		assertNull(getXmlEntityMappings().getAccess());
 		
 		persistenceUnitDefaults.setAccess(null);
 		assertNull(getEntityMappings().getDefaultAccess());
 		assertNull(getEntityMappings().getSpecifiedAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getAccess());
+		assertNull(getXmlEntityMappings().getAccess());
 	}
 
 	public void testUpdateAccess() throws Exception {
 		assertNull(getEntityMappings().getAccess());
 		assertNull(getEntityMappings().getDefaultAccess());
 		assertNull(getEntityMappings().getSpecifiedAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getAccess());
+		assertNull(getXmlEntityMappings().getAccess());
 	
-		getOrmXmlResource().getEntityMappings().setAccess(org.eclipse.jpt.core.resource.orm.AccessType.FIELD);
+		getXmlEntityMappings().setAccess(org.eclipse.jpt.core.resource.orm.AccessType.FIELD);
 		assertNull(getEntityMappings().getDefaultAccess());
 		assertEquals(AccessType.FIELD, getEntityMappings().getAccess());
 		assertEquals(AccessType.FIELD, getEntityMappings().getSpecifiedAccess());
-		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.FIELD, getOrmXmlResource().getEntityMappings().getAccess());
+		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.FIELD, getXmlEntityMappings().getAccess());
 		
-		getOrmXmlResource().getEntityMappings().setAccess(null);
+		getXmlEntityMappings().setAccess(null);
 		assertNull(getEntityMappings().getAccess());
 		assertNull(getEntityMappings().getDefaultAccess());
 		assertNull(getEntityMappings().getSpecifiedAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getAccess());
+		assertNull(getXmlEntityMappings().getAccess());
 
 		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.FIELD);
 		assertEquals(AccessType.FIELD, getEntityMappings().getDefaultAccess());
 		assertEquals(AccessType.FIELD, getEntityMappings().getAccess());
 		assertNull(getEntityMappings().getSpecifiedAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getAccess());
+		assertNull(getXmlEntityMappings().getAccess());
 		
 		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(null);
 		assertNull(getEntityMappings().getDefaultAccess());
 		assertNull(getEntityMappings().getAccess());
 		assertNull(getEntityMappings().getSpecifiedAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getAccess());
+		assertNull(getXmlEntityMappings().getAccess());
 	}	
 
 	
 	public void testUpdateOrmPersistentTypes() throws Exception {
 		assertFalse(getEntityMappings().persistentTypes().hasNext());
-		assertTrue(getOrmXmlResource().getEntityMappings().getMappedSuperclasses().isEmpty());
-		assertTrue(getOrmXmlResource().getEntityMappings().getEntities().isEmpty());
-		assertTrue(getOrmXmlResource().getEntityMappings().getEmbeddables().isEmpty());
+		assertTrue(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
+		assertTrue(getXmlEntityMappings().getEntities().isEmpty());
+		assertTrue(getXmlEntityMappings().getEmbeddables().isEmpty());
 		
 		//add embeddable in the resource model, verify context model updated
 		XmlEmbeddable embeddable = OrmFactory.eINSTANCE.createXmlEmbeddable();
-		getOrmXmlResource().getEntityMappings().getEmbeddables().add(embeddable);
+		getXmlEntityMappings().getEmbeddables().add(embeddable);
 		embeddable.setClassName("model.Foo");
 		assertTrue(getEntityMappings().persistentTypes().hasNext());
 		assertEquals("model.Foo", getEntityMappings().persistentTypes().next().getMapping().getClass_());
-		assertTrue(getOrmXmlResource().getEntityMappings().getMappedSuperclasses().isEmpty());
-		assertTrue(getOrmXmlResource().getEntityMappings().getEntities().isEmpty());
-		assertFalse(getOrmXmlResource().getEntityMappings().getEmbeddables().isEmpty());
-		assertEquals("model.Foo", getOrmXmlResource().getEntityMappings().getEmbeddables().get(0).getClassName());
+		assertTrue(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
+		assertTrue(getXmlEntityMappings().getEntities().isEmpty());
+		assertFalse(getXmlEntityMappings().getEmbeddables().isEmpty());
+		assertEquals("model.Foo", getXmlEntityMappings().getEmbeddables().get(0).getClassName());
 		
 		//add entity in the resource model, verify context model updated
 		XmlEntity entity = OrmFactory.eINSTANCE.createXmlEntity();
-		getOrmXmlResource().getEntityMappings().getEntities().add(entity);
+		getXmlEntityMappings().getEntities().add(entity);
 		entity.setClassName("model.Foo2");
 		assertTrue(getEntityMappings().persistentTypes().hasNext());
 		assertEquals("model.Foo2", getEntityMappings().persistentTypes().next().getMapping().getClass_());
-		assertTrue(getOrmXmlResource().getEntityMappings().getMappedSuperclasses().isEmpty());
-		assertFalse(getOrmXmlResource().getEntityMappings().getEntities().isEmpty());
-		assertFalse(getOrmXmlResource().getEntityMappings().getEmbeddables().isEmpty());
-		assertEquals("model.Foo2", getOrmXmlResource().getEntityMappings().getEntities().get(0).getClassName());
+		assertTrue(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
+		assertFalse(getXmlEntityMappings().getEntities().isEmpty());
+		assertFalse(getXmlEntityMappings().getEmbeddables().isEmpty());
+		assertEquals("model.Foo2", getXmlEntityMappings().getEntities().get(0).getClassName());
 
 		//add mapped-superclass in the resource model, verify context model updated
 		XmlMappedSuperclass mappedSuperclass = OrmFactory.eINSTANCE.createXmlMappedSuperclass();
-		getOrmXmlResource().getEntityMappings().getMappedSuperclasses().add(mappedSuperclass);
+		getXmlEntityMappings().getMappedSuperclasses().add(mappedSuperclass);
 		mappedSuperclass.setClassName("model.Foo3");
 		assertTrue(getEntityMappings().persistentTypes().hasNext());
 		assertEquals("model.Foo3", getEntityMappings().persistentTypes().next().getMapping().getClass_());
-		assertFalse(getOrmXmlResource().getEntityMappings().getMappedSuperclasses().isEmpty());
-		assertFalse(getOrmXmlResource().getEntityMappings().getEntities().isEmpty());
-		assertFalse(getOrmXmlResource().getEntityMappings().getEmbeddables().isEmpty());
-		assertEquals("model.Foo3", getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0).getClassName());
+		assertFalse(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
+		assertFalse(getXmlEntityMappings().getEntities().isEmpty());
+		assertFalse(getXmlEntityMappings().getEmbeddables().isEmpty());
+		assertEquals("model.Foo3", getXmlEntityMappings().getMappedSuperclasses().get(0).getClassName());
 	}
 	
 	
 	public void testAddOrmPersistentType() throws Exception {
 		assertFalse(getEntityMappings().persistentTypes().hasNext());
-		assertTrue(getOrmXmlResource().getEntityMappings().getMappedSuperclasses().isEmpty());
-		assertTrue(getOrmXmlResource().getEntityMappings().getEntities().isEmpty());
-		assertTrue(getOrmXmlResource().getEntityMappings().getEmbeddables().isEmpty());
+		assertTrue(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
+		assertTrue(getXmlEntityMappings().getEntities().isEmpty());
+		assertTrue(getXmlEntityMappings().getEmbeddables().isEmpty());
 		
 		//add embeddable in the context model, verify resource model modified
 		getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, "model.Foo");
 		assertTrue(getEntityMappings().persistentTypes().hasNext());
 		assertEquals("model.Foo", getEntityMappings().persistentTypes().next().getMapping().getClass_());
 		assertEquals(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, getEntityMappings().persistentTypes().next().getMapping().getKey());
-		assertTrue(getOrmXmlResource().getEntityMappings().getMappedSuperclasses().isEmpty());
-		assertTrue(getOrmXmlResource().getEntityMappings().getEntities().isEmpty());
-		assertFalse(getOrmXmlResource().getEntityMappings().getEmbeddables().isEmpty());
-		assertEquals("model.Foo", getOrmXmlResource().getEntityMappings().getEmbeddables().get(0).getClassName());
+		assertTrue(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
+		assertTrue(getXmlEntityMappings().getEntities().isEmpty());
+		assertFalse(getXmlEntityMappings().getEmbeddables().isEmpty());
+		assertEquals("model.Foo", getXmlEntityMappings().getEmbeddables().get(0).getClassName());
 
 		//add entity in the context model, verify resource model modified
 		getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo2");
 		assertTrue(getEntityMappings().persistentTypes().hasNext());
 		assertEquals("model.Foo2", getEntityMappings().persistentTypes().next().getMapping().getClass_());
 		assertEquals(MappingKeys.ENTITY_TYPE_MAPPING_KEY, getEntityMappings().persistentTypes().next().getMapping().getKey());
-		assertTrue(getOrmXmlResource().getEntityMappings().getMappedSuperclasses().isEmpty());
-		assertFalse(getOrmXmlResource().getEntityMappings().getEntities().isEmpty());
-		assertFalse(getOrmXmlResource().getEntityMappings().getEmbeddables().isEmpty());
-		assertEquals("model.Foo2", getOrmXmlResource().getEntityMappings().getEntities().get(0).getClassName());
+		assertTrue(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
+		assertFalse(getXmlEntityMappings().getEntities().isEmpty());
+		assertFalse(getXmlEntityMappings().getEmbeddables().isEmpty());
+		assertEquals("model.Foo2", getXmlEntityMappings().getEntities().get(0).getClassName());
 
 		//add mapped-superclass in the context model, verify resource model modified
 		getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, "model.Foo3");
 		assertTrue(getEntityMappings().persistentTypes().hasNext());
 		assertEquals("model.Foo3", getEntityMappings().persistentTypes().next().getMapping().getClass_());
 		assertEquals(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, getEntityMappings().persistentTypes().next().getMapping().getKey());
-		assertFalse(getOrmXmlResource().getEntityMappings().getMappedSuperclasses().isEmpty());
-		assertFalse(getOrmXmlResource().getEntityMappings().getEntities().isEmpty());
-		assertFalse(getOrmXmlResource().getEntityMappings().getEmbeddables().isEmpty());
-		assertEquals("model.Foo3", getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0).getClassName());
+		assertFalse(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
+		assertFalse(getXmlEntityMappings().getEntities().isEmpty());
+		assertFalse(getXmlEntityMappings().getEmbeddables().isEmpty());
+		assertEquals("model.Foo3", getXmlEntityMappings().getMappedSuperclasses().get(0).getClassName());
 	}
 	
 	public void testRemoveOrmPersistentType() throws Exception {
 		assertFalse(getEntityMappings().persistentTypes().hasNext());
-		assertTrue(getOrmXmlResource().getEntityMappings().getMappedSuperclasses().isEmpty());
-		assertTrue(getOrmXmlResource().getEntityMappings().getEntities().isEmpty());
-		assertTrue(getOrmXmlResource().getEntityMappings().getEmbeddables().isEmpty());
+		assertTrue(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
+		assertTrue(getXmlEntityMappings().getEntities().isEmpty());
+		assertTrue(getXmlEntityMappings().getEmbeddables().isEmpty());
 		
 		getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, "model.Foo");
 		getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo2");
@@ -449,28 +449,28 @@ public class EntityMappingsTests extends ContextModelTestCase
 		
 		//remove ormPersistentType from the context model, verify resource model modified
 		getEntityMappings().removePersistentType(1);
-		assertFalse(getOrmXmlResource().getEntityMappings().getMappedSuperclasses().isEmpty());
-		assertTrue(getOrmXmlResource().getEntityMappings().getEntities().isEmpty());
-		assertFalse(getOrmXmlResource().getEntityMappings().getEmbeddables().isEmpty());
+		assertFalse(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
+		assertTrue(getXmlEntityMappings().getEntities().isEmpty());
+		assertFalse(getXmlEntityMappings().getEmbeddables().isEmpty());
 		
 		getEntityMappings().removePersistentType(1);
-		assertFalse(getOrmXmlResource().getEntityMappings().getMappedSuperclasses().isEmpty());
-		assertTrue(getOrmXmlResource().getEntityMappings().getEntities().isEmpty());
-		assertTrue(getOrmXmlResource().getEntityMappings().getEmbeddables().isEmpty());
+		assertFalse(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
+		assertTrue(getXmlEntityMappings().getEntities().isEmpty());
+		assertTrue(getXmlEntityMappings().getEmbeddables().isEmpty());
 		
 		getEntityMappings().removePersistentType(0);
-		assertTrue(getOrmXmlResource().getEntityMappings().getMappedSuperclasses().isEmpty());
-		assertTrue(getOrmXmlResource().getEntityMappings().getEntities().isEmpty());
-		assertTrue(getOrmXmlResource().getEntityMappings().getEmbeddables().isEmpty());
+		assertTrue(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
+		assertTrue(getXmlEntityMappings().getEntities().isEmpty());
+		assertTrue(getXmlEntityMappings().getEmbeddables().isEmpty());
 	}
 	
 	public void testUpdateTableGenerators() throws Exception {
 		assertEquals(0, getEntityMappings().tableGeneratorsSize());
-		assertEquals(0, getOrmXmlResource().getEntityMappings().getTableGenerators().size());
+		assertEquals(0, getXmlEntityMappings().getTableGenerators().size());
 		assertEquals(0, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
 		XmlTableGenerator tableGeneratorResource = OrmFactory.eINSTANCE.createXmlTableGeneratorImpl();
-		getOrmXmlResource().getEntityMappings().getTableGenerators().add(tableGeneratorResource);
+		getXmlEntityMappings().getTableGenerators().add(tableGeneratorResource);
 		tableGeneratorResource.setName("FOO");
 		
 		TableGenerator tableGenerator = getEntityMappings().tableGenerators().next();
@@ -478,7 +478,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertEquals(1, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
 		XmlTableGenerator tableGeneratorResource2 = OrmFactory.eINSTANCE.createXmlTableGeneratorImpl();
-		getOrmXmlResource().getEntityMappings().getTableGenerators().add(0, tableGeneratorResource2);
+		getXmlEntityMappings().getTableGenerators().add(0, tableGeneratorResource2);
 		tableGeneratorResource2.setName("BAR");
 		
 		ListIterator<OrmTableGenerator> tableGenerators = getEntityMappings().tableGenerators();
@@ -488,7 +488,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertEquals(2, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
 		XmlTableGenerator tableGeneratorResource3 = OrmFactory.eINSTANCE.createXmlTableGeneratorImpl();
-		getOrmXmlResource().getEntityMappings().getTableGenerators().add(1, tableGeneratorResource3);
+		getXmlEntityMappings().getTableGenerators().add(1, tableGeneratorResource3);
 		tableGeneratorResource3.setName("BAZ");
 		
 		tableGenerators = getEntityMappings().tableGenerators();
@@ -498,7 +498,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertFalse(tableGenerators.hasNext());
 		assertEquals(3, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
-		getOrmXmlResource().getEntityMappings().getTableGenerators().move(2, 0);
+		getXmlEntityMappings().getTableGenerators().move(2, 0);
 		tableGenerators = getEntityMappings().tableGenerators();
 		assertEquals("BAZ", tableGenerators.next().getName());
 		assertEquals("FOO", tableGenerators.next().getName());
@@ -506,20 +506,20 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertFalse(tableGenerators.hasNext());
 		assertEquals(3, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
-		getOrmXmlResource().getEntityMappings().getTableGenerators().remove(0);
+		getXmlEntityMappings().getTableGenerators().remove(0);
 		tableGenerators = getEntityMappings().tableGenerators();
 		assertEquals("FOO", tableGenerators.next().getName());
 		assertEquals("BAR", tableGenerators.next().getName());
 		assertFalse(tableGenerators.hasNext());
 		assertEquals(2, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
-		getOrmXmlResource().getEntityMappings().getTableGenerators().remove(1);
+		getXmlEntityMappings().getTableGenerators().remove(1);
 		tableGenerators = getEntityMappings().tableGenerators();
 		assertEquals("FOO", tableGenerators.next().getName());
 		assertFalse(tableGenerators.hasNext());
 		assertEquals(1, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
-		getOrmXmlResource().getEntityMappings().getTableGenerators().clear();
+		getXmlEntityMappings().getTableGenerators().clear();
 		tableGenerators = getEntityMappings().tableGenerators();
 		assertFalse(tableGenerators.hasNext());
 		assertEquals(0, getEntityMappings().getPersistenceUnit().generatorsSize());
@@ -527,15 +527,15 @@ public class EntityMappingsTests extends ContextModelTestCase
 	
 	public void testAddTableGenerator() throws Exception {
 		assertEquals(0, getEntityMappings().tableGeneratorsSize());
-		assertEquals(0, getOrmXmlResource().getEntityMappings().getTableGenerators().size());
+		assertEquals(0, getXmlEntityMappings().getTableGenerators().size());
 		getEntityMappings().addTableGenerator(0).setName("FOO");
 		
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getTableGenerators().get(0).getName());
+		assertEquals("FOO", getXmlEntityMappings().getTableGenerators().get(0).getName());
 		
 		getEntityMappings().addTableGenerator(0).setName("BAR");
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getTableGenerators().get(0).getName());
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getTableGenerators().get(1).getName());
-		assertEquals(2, getOrmXmlResource().getEntityMappings().getTableGenerators().size());
+		assertEquals("BAR", getXmlEntityMappings().getTableGenerators().get(0).getName());
+		assertEquals("FOO", getXmlEntityMappings().getTableGenerators().get(1).getName());
+		assertEquals(2, getXmlEntityMappings().getTableGenerators().size());
 		
 		ListIterator<OrmTableGenerator> tableGenerators = getEntityMappings().tableGenerators();
 		assertEquals("BAR", tableGenerators.next().getName());
@@ -545,7 +545,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 	
 	public void testRemoveTableGenerator() throws Exception {
 		assertEquals(0, getEntityMappings().tableGeneratorsSize());
-		assertEquals(0, getOrmXmlResource().getEntityMappings().getTableGenerators().size());
+		assertEquals(0, getXmlEntityMappings().getTableGenerators().size());
 		
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);
 		tableGenerator.setName("FOO");
@@ -553,14 +553,14 @@ public class EntityMappingsTests extends ContextModelTestCase
 		tableGenerator2.setName("BAR");
 		TableGenerator tableGenerator3 = getEntityMappings().addTableGenerator(2);
 		tableGenerator3.setName("BAZ");
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getTableGenerators().get(0).getName());
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getTableGenerators().get(1).getName());
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getTableGenerators().get(2).getName());
-		assertEquals(3, getOrmXmlResource().getEntityMappings().getTableGenerators().size());
+		assertEquals("FOO", getXmlEntityMappings().getTableGenerators().get(0).getName());
+		assertEquals("BAR", getXmlEntityMappings().getTableGenerators().get(1).getName());
+		assertEquals("BAZ", getXmlEntityMappings().getTableGenerators().get(2).getName());
+		assertEquals(3, getXmlEntityMappings().getTableGenerators().size());
 		
 		getEntityMappings().removeTableGenerator(0);
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getTableGenerators().get(0).getName());
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getTableGenerators().get(1).getName());
+		assertEquals("BAR", getXmlEntityMappings().getTableGenerators().get(0).getName());
+		assertEquals("BAZ", getXmlEntityMappings().getTableGenerators().get(1).getName());
 		
 		ListIterator<OrmTableGenerator> tableGenerators = getEntityMappings().tableGenerators();
 		OrmTableGenerator xmlTableGenerator = tableGenerators.next();
@@ -573,7 +573,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 
 		
 		getEntityMappings().removeTableGenerator(1);
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getTableGenerators().get(0).getName());
+		assertEquals("BAR", getXmlEntityMappings().getTableGenerators().get(0).getName());
 		tableGenerators = getEntityMappings().tableGenerators();
 		xmlTableGenerator = tableGenerators.next();
 		assertEquals("BAR", xmlTableGenerator.getName());
@@ -582,14 +582,14 @@ public class EntityMappingsTests extends ContextModelTestCase
 
 		
 		getEntityMappings().removeTableGenerator(0);
-		assertEquals(0, getOrmXmlResource().getEntityMappings().getTableGenerators().size());
+		assertEquals(0, getXmlEntityMappings().getTableGenerators().size());
 		tableGenerators = getEntityMappings().tableGenerators();
 		assertFalse(tableGenerators.hasNext());		
 	}
 	
 	public void testMoveTableGenerator() throws Exception {
 		assertEquals(0, getEntityMappings().tableGeneratorsSize());
-		assertEquals(0, getOrmXmlResource().getEntityMappings().getTableGenerators().size());
+		assertEquals(0, getXmlEntityMappings().getTableGenerators().size());
 		
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);
 		tableGenerator.setName("FOO");
@@ -597,27 +597,27 @@ public class EntityMappingsTests extends ContextModelTestCase
 		tableGenerator2.setName("BAR");
 		TableGenerator tableGenerator3 = getEntityMappings().addTableGenerator(2);
 		tableGenerator3.setName("BAZ");
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getTableGenerators().get(0).getName());
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getTableGenerators().get(1).getName());
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getTableGenerators().get(2).getName());
-		assertEquals(3, getOrmXmlResource().getEntityMappings().getTableGenerators().size());
+		assertEquals("FOO", getXmlEntityMappings().getTableGenerators().get(0).getName());
+		assertEquals("BAR", getXmlEntityMappings().getTableGenerators().get(1).getName());
+		assertEquals("BAZ", getXmlEntityMappings().getTableGenerators().get(2).getName());
+		assertEquals(3, getXmlEntityMappings().getTableGenerators().size());
 		
 		getEntityMappings().moveTableGenerator(2, 0);
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getTableGenerators().get(0).getName());
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getTableGenerators().get(1).getName());
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getTableGenerators().get(2).getName());
-		assertEquals(3, getOrmXmlResource().getEntityMappings().getTableGenerators().size());
+		assertEquals("BAR", getXmlEntityMappings().getTableGenerators().get(0).getName());
+		assertEquals("BAZ", getXmlEntityMappings().getTableGenerators().get(1).getName());
+		assertEquals("FOO", getXmlEntityMappings().getTableGenerators().get(2).getName());
+		assertEquals(3, getXmlEntityMappings().getTableGenerators().size());
 		
 		getEntityMappings().moveTableGenerator(0, 2);
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getTableGenerators().get(0).getName());
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getTableGenerators().get(1).getName());
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getTableGenerators().get(2).getName());
-		assertEquals(3, getOrmXmlResource().getEntityMappings().getTableGenerators().size());
+		assertEquals("FOO", getXmlEntityMappings().getTableGenerators().get(0).getName());
+		assertEquals("BAR", getXmlEntityMappings().getTableGenerators().get(1).getName());
+		assertEquals("BAZ", getXmlEntityMappings().getTableGenerators().get(2).getName());
+		assertEquals(3, getXmlEntityMappings().getTableGenerators().size());
 	}
 	
 	public void testTableGeneratorsSize() throws Exception {
 		assertEquals(0, getEntityMappings().tableGeneratorsSize());
-		assertEquals(0, getOrmXmlResource().getEntityMappings().getTableGenerators().size());
+		assertEquals(0, getXmlEntityMappings().getTableGenerators().size());
 		
 		
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);
@@ -629,17 +629,17 @@ public class EntityMappingsTests extends ContextModelTestCase
 	
 		assertEquals(3, getEntityMappings().tableGeneratorsSize());
 		
-		getOrmXmlResource().getEntityMappings().getTableGenerators().remove(0);
+		getXmlEntityMappings().getTableGenerators().remove(0);
 		assertEquals(2, getEntityMappings().tableGeneratorsSize());
 	}
 
 	public void testUpdateSequenceGenerators() throws Exception {
 		assertEquals(0, getEntityMappings().sequenceGeneratorsSize());
-		assertEquals(0, getOrmXmlResource().getEntityMappings().getSequenceGenerators().size());
+		assertEquals(0, getXmlEntityMappings().getSequenceGenerators().size());
 		assertEquals(0, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
 		XmlSequenceGenerator sequenceGeneratorResource = OrmFactory.eINSTANCE.createXmlSequenceGeneratorImpl();
-		getOrmXmlResource().getEntityMappings().getSequenceGenerators().add(sequenceGeneratorResource);
+		getXmlEntityMappings().getSequenceGenerators().add(sequenceGeneratorResource);
 		sequenceGeneratorResource.setName("FOO");
 		
 		SequenceGenerator sequenceGenerator = getEntityMappings().sequenceGenerators().next();
@@ -647,7 +647,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertEquals(1, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
 		XmlSequenceGenerator sequenceGeneratorResource2 = OrmFactory.eINSTANCE.createXmlSequenceGeneratorImpl();
-		getOrmXmlResource().getEntityMappings().getSequenceGenerators().add(0, sequenceGeneratorResource2);
+		getXmlEntityMappings().getSequenceGenerators().add(0, sequenceGeneratorResource2);
 		sequenceGeneratorResource2.setName("BAR");
 		
 		ListIterator<OrmSequenceGenerator> sequenceGenerators = getEntityMappings().sequenceGenerators();
@@ -657,7 +657,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertEquals(2, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
 		XmlSequenceGenerator sequenceGeneratorResource3 = OrmFactory.eINSTANCE.createXmlSequenceGeneratorImpl();
-		getOrmXmlResource().getEntityMappings().getSequenceGenerators().add(1, sequenceGeneratorResource3);
+		getXmlEntityMappings().getSequenceGenerators().add(1, sequenceGeneratorResource3);
 		sequenceGeneratorResource3.setName("BAZ");
 
 		sequenceGenerators = getEntityMappings().sequenceGenerators();
@@ -667,27 +667,27 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertFalse(sequenceGenerators.hasNext());
 		assertEquals(3, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
-		getOrmXmlResource().getEntityMappings().getSequenceGenerators().move(2, 0);
+		getXmlEntityMappings().getSequenceGenerators().move(2, 0);
 		sequenceGenerators = getEntityMappings().sequenceGenerators();
 		assertEquals("BAZ", sequenceGenerators.next().getName());
 		assertEquals("FOO", sequenceGenerators.next().getName());
 		assertEquals("BAR", sequenceGenerators.next().getName());
 		assertFalse(sequenceGenerators.hasNext());
 		
-		getOrmXmlResource().getEntityMappings().getSequenceGenerators().remove(0);
+		getXmlEntityMappings().getSequenceGenerators().remove(0);
 		sequenceGenerators = getEntityMappings().sequenceGenerators();
 		assertEquals("FOO", sequenceGenerators.next().getName());
 		assertEquals("BAR", sequenceGenerators.next().getName());
 		assertFalse(sequenceGenerators.hasNext());
 		assertEquals(2, getEntityMappings().getPersistenceUnit().generatorsSize());
 
-		getOrmXmlResource().getEntityMappings().getSequenceGenerators().remove(1);
+		getXmlEntityMappings().getSequenceGenerators().remove(1);
 		sequenceGenerators = getEntityMappings().sequenceGenerators();
 		assertEquals("FOO", sequenceGenerators.next().getName());
 		assertFalse(sequenceGenerators.hasNext());
 		assertEquals(1, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
-		getOrmXmlResource().getEntityMappings().getSequenceGenerators().clear();
+		getXmlEntityMappings().getSequenceGenerators().clear();
 		sequenceGenerators = getEntityMappings().sequenceGenerators();
 		assertFalse(sequenceGenerators.hasNext());
 		assertEquals(0, getEntityMappings().getPersistenceUnit().generatorsSize());
@@ -695,16 +695,16 @@ public class EntityMappingsTests extends ContextModelTestCase
 	
 	public void testAddSequenceGenerator() throws Exception {
 		assertEquals(0, getEntityMappings().sequenceGeneratorsSize());
-		assertEquals(0, getOrmXmlResource().getEntityMappings().getSequenceGenerators().size());
+		assertEquals(0, getXmlEntityMappings().getSequenceGenerators().size());
 		
 		getEntityMappings().addSequenceGenerator(0).setName("FOO");
 		
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(0).getName());
+		assertEquals("FOO", getXmlEntityMappings().getSequenceGenerators().get(0).getName());
 		
 		getEntityMappings().addSequenceGenerator(0).setName("BAR");
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(0).getName());
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(1).getName());
-		assertEquals(2, getOrmXmlResource().getEntityMappings().getSequenceGenerators().size());
+		assertEquals("BAR", getXmlEntityMappings().getSequenceGenerators().get(0).getName());
+		assertEquals("FOO", getXmlEntityMappings().getSequenceGenerators().get(1).getName());
+		assertEquals(2, getXmlEntityMappings().getSequenceGenerators().size());
 		
 		ListIterator<OrmSequenceGenerator> sequenceGenerators = getEntityMappings().sequenceGenerators();
 		assertEquals("BAR", sequenceGenerators.next().getName());
@@ -714,7 +714,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 	
 	public void testRemoveSequenceGenerator() throws Exception {
 		assertEquals(0, getEntityMappings().sequenceGeneratorsSize());
-		assertEquals(0, getOrmXmlResource().getEntityMappings().getSequenceGenerators().size());
+		assertEquals(0, getXmlEntityMappings().getSequenceGenerators().size());
 		
 		SequenceGenerator sequenceGenerator = getEntityMappings().addSequenceGenerator(0);
 		sequenceGenerator.setName("FOO");
@@ -722,14 +722,14 @@ public class EntityMappingsTests extends ContextModelTestCase
 		sequenceGenerator2.setName("BAR");
 		SequenceGenerator sequenceGenerator3 = getEntityMappings().addSequenceGenerator(2);
 		sequenceGenerator3.setName("BAZ");
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(0).getName());
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(1).getName());
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(2).getName());
-		assertEquals(3, getOrmXmlResource().getEntityMappings().getSequenceGenerators().size());
+		assertEquals("FOO", getXmlEntityMappings().getSequenceGenerators().get(0).getName());
+		assertEquals("BAR", getXmlEntityMappings().getSequenceGenerators().get(1).getName());
+		assertEquals("BAZ", getXmlEntityMappings().getSequenceGenerators().get(2).getName());
+		assertEquals(3, getXmlEntityMappings().getSequenceGenerators().size());
 		
 		getEntityMappings().removeSequenceGenerator(0);
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(0).getName());
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(1).getName());
+		assertEquals("BAR", getXmlEntityMappings().getSequenceGenerators().get(0).getName());
+		assertEquals("BAZ", getXmlEntityMappings().getSequenceGenerators().get(1).getName());
 		
 		ListIterator<OrmSequenceGenerator> sequenceGenerators = getEntityMappings().sequenceGenerators();
 		SequenceGenerator xmlSequenceGenerator = sequenceGenerators.next();
@@ -742,7 +742,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 
 		
 		getEntityMappings().removeSequenceGenerator(1);
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(0).getName());
+		assertEquals("BAR", getXmlEntityMappings().getSequenceGenerators().get(0).getName());
 		sequenceGenerators = getEntityMappings().sequenceGenerators();
 		xmlSequenceGenerator = sequenceGenerators.next();
 		assertEquals("BAR", xmlSequenceGenerator.getName());
@@ -751,14 +751,14 @@ public class EntityMappingsTests extends ContextModelTestCase
 
 		
 		getEntityMappings().removeSequenceGenerator(0);
-		assertEquals(0, getOrmXmlResource().getEntityMappings().getSequenceGenerators().size());
+		assertEquals(0, getXmlEntityMappings().getSequenceGenerators().size());
 		sequenceGenerators = getEntityMappings().sequenceGenerators();
 		assertFalse(sequenceGenerators.hasNext());		
 	}
 	
 	public void testMoveSequenceGenerator() throws Exception {
 		assertEquals(0, getEntityMappings().sequenceGeneratorsSize());
-		assertEquals(0, getOrmXmlResource().getEntityMappings().getSequenceGenerators().size());
+		assertEquals(0, getXmlEntityMappings().getSequenceGenerators().size());
 		
 		SequenceGenerator sequenceGenerator = getEntityMappings().addSequenceGenerator(0);
 		sequenceGenerator.setName("FOO");
@@ -766,28 +766,28 @@ public class EntityMappingsTests extends ContextModelTestCase
 		sequenceGenerator2.setName("BAR");
 		SequenceGenerator sequenceGenerator3 = getEntityMappings().addSequenceGenerator(2);
 		sequenceGenerator3.setName("BAZ");
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(0).getName());
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(1).getName());
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(2).getName());
-		assertEquals(3, getOrmXmlResource().getEntityMappings().getSequenceGenerators().size());
+		assertEquals("FOO", getXmlEntityMappings().getSequenceGenerators().get(0).getName());
+		assertEquals("BAR", getXmlEntityMappings().getSequenceGenerators().get(1).getName());
+		assertEquals("BAZ", getXmlEntityMappings().getSequenceGenerators().get(2).getName());
+		assertEquals(3, getXmlEntityMappings().getSequenceGenerators().size());
 		
 		getEntityMappings().moveSequenceGenerator(2, 0);
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(0).getName());
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(1).getName());
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(2).getName());
-		assertEquals(3, getOrmXmlResource().getEntityMappings().getSequenceGenerators().size());
+		assertEquals("BAR", getXmlEntityMappings().getSequenceGenerators().get(0).getName());
+		assertEquals("BAZ", getXmlEntityMappings().getSequenceGenerators().get(1).getName());
+		assertEquals("FOO", getXmlEntityMappings().getSequenceGenerators().get(2).getName());
+		assertEquals(3, getXmlEntityMappings().getSequenceGenerators().size());
 		
 		getEntityMappings().moveSequenceGenerator(0, 2);
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(0).getName());
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(1).getName());
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(2).getName());
-		assertEquals(3, getOrmXmlResource().getEntityMappings().getSequenceGenerators().size());
+		assertEquals("FOO", getXmlEntityMappings().getSequenceGenerators().get(0).getName());
+		assertEquals("BAR", getXmlEntityMappings().getSequenceGenerators().get(1).getName());
+		assertEquals("BAZ", getXmlEntityMappings().getSequenceGenerators().get(2).getName());
+		assertEquals(3, getXmlEntityMappings().getSequenceGenerators().size());
 		
 	}
 	
 	public void testSequenceGeneratorsSize() throws Exception {
 		assertEquals(0, getEntityMappings().sequenceGeneratorsSize());
-		assertEquals(0, getOrmXmlResource().getEntityMappings().getSequenceGenerators().size());
+		assertEquals(0, getXmlEntityMappings().getSequenceGenerators().size());
 		
 		
 		SequenceGenerator sequenceGenerator = getEntityMappings().addSequenceGenerator(0);
@@ -799,7 +799,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 	
 		assertEquals(3, getEntityMappings().sequenceGeneratorsSize());
 		
-		getOrmXmlResource().getEntityMappings().getSequenceGenerators().remove(0);
+		getXmlEntityMappings().getSequenceGenerators().remove(0);
 		assertEquals(2, getEntityMappings().sequenceGeneratorsSize());
 	}
 
@@ -808,20 +808,20 @@ public class EntityMappingsTests extends ContextModelTestCase
 		OrmNamedQuery namedQuery = getEntityMappings().addNamedQuery(0);
 		namedQuery.setName("FOO");
 				
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getNamedQueries().get(0).getName());
+		assertEquals("FOO", getXmlEntityMappings().getNamedQueries().get(0).getName());
 		
 		OrmNamedQuery namedQuery2 = getEntityMappings().addNamedQuery(0);
 		namedQuery2.setName("BAR");
 		
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getNamedQueries().get(0).getName());
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getNamedQueries().get(1).getName());
+		assertEquals("BAR", getXmlEntityMappings().getNamedQueries().get(0).getName());
+		assertEquals("FOO", getXmlEntityMappings().getNamedQueries().get(1).getName());
 		
 		OrmNamedQuery namedQuery3 = getEntityMappings().addNamedQuery(1);
 		namedQuery3.setName("BAZ");
 		
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getNamedQueries().get(0).getName());
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getNamedQueries().get(1).getName());
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getNamedQueries().get(2).getName());
+		assertEquals("BAR", getXmlEntityMappings().getNamedQueries().get(0).getName());
+		assertEquals("BAZ", getXmlEntityMappings().getNamedQueries().get(1).getName());
+		assertEquals("FOO", getXmlEntityMappings().getNamedQueries().get(2).getName());
 		
 		ListIterator<OrmNamedQuery> namedQueries = getEntityMappings().namedQueries();
 		assertEquals(namedQuery2, namedQueries.next());
@@ -839,19 +839,19 @@ public class EntityMappingsTests extends ContextModelTestCase
 		getEntityMappings().addNamedQuery(1).setName("BAR");
 		getEntityMappings().addNamedQuery(2).setName("BAZ");
 		
-		assertEquals(3, getOrmXmlResource().getEntityMappings().getNamedQueries().size());
+		assertEquals(3, getXmlEntityMappings().getNamedQueries().size());
 		
 		getEntityMappings().removeNamedQuery(0);
-		assertEquals(2, getOrmXmlResource().getEntityMappings().getNamedQueries().size());
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getNamedQueries().get(0).getName());
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getNamedQueries().get(1).getName());
+		assertEquals(2, getXmlEntityMappings().getNamedQueries().size());
+		assertEquals("BAR", getXmlEntityMappings().getNamedQueries().get(0).getName());
+		assertEquals("BAZ", getXmlEntityMappings().getNamedQueries().get(1).getName());
 
 		getEntityMappings().removeNamedQuery(0);
-		assertEquals(1, getOrmXmlResource().getEntityMappings().getNamedQueries().size());
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getNamedQueries().get(0).getName());
+		assertEquals(1, getXmlEntityMappings().getNamedQueries().size());
+		assertEquals("BAZ", getXmlEntityMappings().getNamedQueries().get(0).getName());
 		
 		getEntityMappings().removeNamedQuery(0);
-		assertEquals(0, getOrmXmlResource().getEntityMappings().getNamedQueries().size());
+		assertEquals(0, getXmlEntityMappings().getNamedQueries().size());
 	}
 	
 	public void testMoveNamedQuery() throws Exception {
@@ -859,7 +859,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 		getEntityMappings().addNamedQuery(1).setName("BAR");
 		getEntityMappings().addNamedQuery(2).setName("BAZ");
 		
-		assertEquals(3, getOrmXmlResource().getEntityMappings().getNamedQueries().size());
+		assertEquals(3, getXmlEntityMappings().getNamedQueries().size());
 		
 		
 		getEntityMappings().moveNamedQuery(2, 0);
@@ -868,9 +868,9 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertEquals("BAZ", namedQueries.next().getName());
 		assertEquals("FOO", namedQueries.next().getName());
 
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getNamedQueries().get(0).getName());
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getNamedQueries().get(1).getName());
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getNamedQueries().get(2).getName());
+		assertEquals("BAR", getXmlEntityMappings().getNamedQueries().get(0).getName());
+		assertEquals("BAZ", getXmlEntityMappings().getNamedQueries().get(1).getName());
+		assertEquals("FOO", getXmlEntityMappings().getNamedQueries().get(2).getName());
 
 
 		getEntityMappings().moveNamedQuery(0, 1);
@@ -879,21 +879,21 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertEquals("BAR", namedQueries.next().getName());
 		assertEquals("FOO", namedQueries.next().getName());
 
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getNamedQueries().get(0).getName());
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getNamedQueries().get(1).getName());
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getNamedQueries().get(2).getName());
+		assertEquals("BAZ", getXmlEntityMappings().getNamedQueries().get(0).getName());
+		assertEquals("BAR", getXmlEntityMappings().getNamedQueries().get(1).getName());
+		assertEquals("FOO", getXmlEntityMappings().getNamedQueries().get(2).getName());
 	}
 	
 	public void testUpdateNamedQueries() throws Exception {
 		assertEquals(0, getEntityMappings().getPersistenceUnit().queriesSize());
 		
-		getOrmXmlResource().getEntityMappings().getNamedQueries().add(OrmFactory.eINSTANCE.createXmlNamedQuery());
-		getOrmXmlResource().getEntityMappings().getNamedQueries().add(OrmFactory.eINSTANCE.createXmlNamedQuery());
-		getOrmXmlResource().getEntityMappings().getNamedQueries().add(OrmFactory.eINSTANCE.createXmlNamedQuery());
+		getXmlEntityMappings().getNamedQueries().add(OrmFactory.eINSTANCE.createXmlNamedQuery());
+		getXmlEntityMappings().getNamedQueries().add(OrmFactory.eINSTANCE.createXmlNamedQuery());
+		getXmlEntityMappings().getNamedQueries().add(OrmFactory.eINSTANCE.createXmlNamedQuery());
 		
-		getOrmXmlResource().getEntityMappings().getNamedQueries().get(0).setName("FOO");
-		getOrmXmlResource().getEntityMappings().getNamedQueries().get(1).setName("BAR");
-		getOrmXmlResource().getEntityMappings().getNamedQueries().get(2).setName("BAZ");
+		getXmlEntityMappings().getNamedQueries().get(0).setName("FOO");
+		getXmlEntityMappings().getNamedQueries().get(1).setName("BAR");
+		getXmlEntityMappings().getNamedQueries().get(2).setName("BAZ");
 		
 		ListIterator<OrmNamedQuery> namedQueries = getEntityMappings().namedQueries();
 		assertEquals("FOO", namedQueries.next().getName());
@@ -902,34 +902,34 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertFalse(namedQueries.hasNext());
 		assertEquals(3, getEntityMappings().getPersistenceUnit().queriesSize());
 		
-		getOrmXmlResource().getEntityMappings().getNamedQueries().move(2, 0);
+		getXmlEntityMappings().getNamedQueries().move(2, 0);
 		namedQueries = getEntityMappings().namedQueries();
 		assertEquals("BAR", namedQueries.next().getName());
 		assertEquals("BAZ", namedQueries.next().getName());
 		assertEquals("FOO", namedQueries.next().getName());
 		assertFalse(namedQueries.hasNext());
 		
-		getOrmXmlResource().getEntityMappings().getNamedQueries().move(0, 1);
+		getXmlEntityMappings().getNamedQueries().move(0, 1);
 		namedQueries = getEntityMappings().namedQueries();
 		assertEquals("BAZ", namedQueries.next().getName());
 		assertEquals("BAR", namedQueries.next().getName());
 		assertEquals("FOO", namedQueries.next().getName());
 		assertFalse(namedQueries.hasNext());
 		
-		getOrmXmlResource().getEntityMappings().getNamedQueries().remove(1);
+		getXmlEntityMappings().getNamedQueries().remove(1);
 		namedQueries = getEntityMappings().namedQueries();
 		assertEquals("BAZ", namedQueries.next().getName());
 		assertEquals("FOO", namedQueries.next().getName());
 		assertFalse(namedQueries.hasNext());
 		assertEquals(2, getEntityMappings().getPersistenceUnit().queriesSize());
 		
-		getOrmXmlResource().getEntityMappings().getNamedQueries().remove(1);
+		getXmlEntityMappings().getNamedQueries().remove(1);
 		namedQueries = getEntityMappings().namedQueries();
 		assertEquals("BAZ", namedQueries.next().getName());
 		assertFalse(namedQueries.hasNext());
 		assertEquals(1, getEntityMappings().getPersistenceUnit().queriesSize());
 		
-		getOrmXmlResource().getEntityMappings().getNamedQueries().remove(0);
+		getXmlEntityMappings().getNamedQueries().remove(0);
 		assertFalse(getEntityMappings().namedQueries().hasNext());
 		assertEquals(0, getEntityMappings().getPersistenceUnit().queriesSize());
 	}
@@ -938,20 +938,20 @@ public class EntityMappingsTests extends ContextModelTestCase
 		OrmNamedNativeQuery namedNativeQuery = getEntityMappings().addNamedNativeQuery(0);
 		namedNativeQuery.setName("FOO");
 				
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getNamedNativeQueries().get(0).getName());
+		assertEquals("FOO", getXmlEntityMappings().getNamedNativeQueries().get(0).getName());
 		
 		OrmNamedNativeQuery namedNativeQuery2 = getEntityMappings().addNamedNativeQuery(0);
 		namedNativeQuery2.setName("BAR");
 		
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getNamedNativeQueries().get(0).getName());
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getNamedNativeQueries().get(1).getName());
+		assertEquals("BAR", getXmlEntityMappings().getNamedNativeQueries().get(0).getName());
+		assertEquals("FOO", getXmlEntityMappings().getNamedNativeQueries().get(1).getName());
 		
 		OrmNamedNativeQuery namedNativeQuery3 = getEntityMappings().addNamedNativeQuery(1);
 		namedNativeQuery3.setName("BAZ");
 		
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getNamedNativeQueries().get(0).getName());
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getNamedNativeQueries().get(1).getName());
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getNamedNativeQueries().get(2).getName());
+		assertEquals("BAR", getXmlEntityMappings().getNamedNativeQueries().get(0).getName());
+		assertEquals("BAZ", getXmlEntityMappings().getNamedNativeQueries().get(1).getName());
+		assertEquals("FOO", getXmlEntityMappings().getNamedNativeQueries().get(2).getName());
 		
 		ListIterator<OrmNamedNativeQuery> namedNativeQueries = getEntityMappings().namedNativeQueries();
 		assertEquals(namedNativeQuery2, namedNativeQueries.next());
@@ -969,19 +969,19 @@ public class EntityMappingsTests extends ContextModelTestCase
 		getEntityMappings().addNamedNativeQuery(1).setName("BAR");
 		getEntityMappings().addNamedNativeQuery(2).setName("BAZ");
 		
-		assertEquals(3, getOrmXmlResource().getEntityMappings().getNamedNativeQueries().size());
+		assertEquals(3, getXmlEntityMappings().getNamedNativeQueries().size());
 		
 		getEntityMappings().removeNamedNativeQuery(0);
-		assertEquals(2, getOrmXmlResource().getEntityMappings().getNamedNativeQueries().size());
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getNamedNativeQueries().get(0).getName());
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getNamedNativeQueries().get(1).getName());
+		assertEquals(2, getXmlEntityMappings().getNamedNativeQueries().size());
+		assertEquals("BAR", getXmlEntityMappings().getNamedNativeQueries().get(0).getName());
+		assertEquals("BAZ", getXmlEntityMappings().getNamedNativeQueries().get(1).getName());
 
 		getEntityMappings().removeNamedNativeQuery(0);
-		assertEquals(1, getOrmXmlResource().getEntityMappings().getNamedNativeQueries().size());
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getNamedNativeQueries().get(0).getName());
+		assertEquals(1, getXmlEntityMappings().getNamedNativeQueries().size());
+		assertEquals("BAZ", getXmlEntityMappings().getNamedNativeQueries().get(0).getName());
 		
 		getEntityMappings().removeNamedNativeQuery(0);
-		assertEquals(0, getOrmXmlResource().getEntityMappings().getNamedNativeQueries().size());
+		assertEquals(0, getXmlEntityMappings().getNamedNativeQueries().size());
 	}
 	
 	public void testMoveNamedNativeQuery() throws Exception {
@@ -989,7 +989,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 		getEntityMappings().addNamedNativeQuery(1).setName("BAR");
 		getEntityMappings().addNamedNativeQuery(2).setName("BAZ");
 		
-		assertEquals(3, getOrmXmlResource().getEntityMappings().getNamedNativeQueries().size());
+		assertEquals(3, getXmlEntityMappings().getNamedNativeQueries().size());
 		
 		
 		getEntityMappings().moveNamedNativeQuery(2, 0);
@@ -998,9 +998,9 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertEquals("BAZ", namedNativeQueries.next().getName());
 		assertEquals("FOO", namedNativeQueries.next().getName());
 
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getNamedNativeQueries().get(0).getName());
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getNamedNativeQueries().get(1).getName());
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getNamedNativeQueries().get(2).getName());
+		assertEquals("BAR", getXmlEntityMappings().getNamedNativeQueries().get(0).getName());
+		assertEquals("BAZ", getXmlEntityMappings().getNamedNativeQueries().get(1).getName());
+		assertEquals("FOO", getXmlEntityMappings().getNamedNativeQueries().get(2).getName());
 
 
 		getEntityMappings().moveNamedNativeQuery(0, 1);
@@ -1009,21 +1009,21 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertEquals("BAR", namedNativeQueries.next().getName());
 		assertEquals("FOO", namedNativeQueries.next().getName());
 
-		assertEquals("BAZ", getOrmXmlResource().getEntityMappings().getNamedNativeQueries().get(0).getName());
-		assertEquals("BAR", getOrmXmlResource().getEntityMappings().getNamedNativeQueries().get(1).getName());
-		assertEquals("FOO", getOrmXmlResource().getEntityMappings().getNamedNativeQueries().get(2).getName());
+		assertEquals("BAZ", getXmlEntityMappings().getNamedNativeQueries().get(0).getName());
+		assertEquals("BAR", getXmlEntityMappings().getNamedNativeQueries().get(1).getName());
+		assertEquals("FOO", getXmlEntityMappings().getNamedNativeQueries().get(2).getName());
 	}
 	
 	public void testUpdateNamedNativeQueries() throws Exception {
 		assertEquals(0, getEntityMappings().getPersistenceUnit().queriesSize());
 		
-		getOrmXmlResource().getEntityMappings().getNamedNativeQueries().add(OrmFactory.eINSTANCE.createXmlNamedNativeQuery());
-		getOrmXmlResource().getEntityMappings().getNamedNativeQueries().add(OrmFactory.eINSTANCE.createXmlNamedNativeQuery());
-		getOrmXmlResource().getEntityMappings().getNamedNativeQueries().add(OrmFactory.eINSTANCE.createXmlNamedNativeQuery());
+		getXmlEntityMappings().getNamedNativeQueries().add(OrmFactory.eINSTANCE.createXmlNamedNativeQuery());
+		getXmlEntityMappings().getNamedNativeQueries().add(OrmFactory.eINSTANCE.createXmlNamedNativeQuery());
+		getXmlEntityMappings().getNamedNativeQueries().add(OrmFactory.eINSTANCE.createXmlNamedNativeQuery());
 		
-		getOrmXmlResource().getEntityMappings().getNamedNativeQueries().get(0).setName("FOO");
-		getOrmXmlResource().getEntityMappings().getNamedNativeQueries().get(1).setName("BAR");
-		getOrmXmlResource().getEntityMappings().getNamedNativeQueries().get(2).setName("BAZ");
+		getXmlEntityMappings().getNamedNativeQueries().get(0).setName("FOO");
+		getXmlEntityMappings().getNamedNativeQueries().get(1).setName("BAR");
+		getXmlEntityMappings().getNamedNativeQueries().get(2).setName("BAZ");
 		
 		ListIterator<OrmNamedNativeQuery> namedNativeQueries = getEntityMappings().namedNativeQueries();
 		assertEquals("FOO", namedNativeQueries.next().getName());
@@ -1032,34 +1032,34 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertFalse(namedNativeQueries.hasNext());
 		assertEquals(3, getEntityMappings().getPersistenceUnit().queriesSize());
 		
-		getOrmXmlResource().getEntityMappings().getNamedNativeQueries().move(2, 0);
+		getXmlEntityMappings().getNamedNativeQueries().move(2, 0);
 		namedNativeQueries = getEntityMappings().namedNativeQueries();
 		assertEquals("BAR", namedNativeQueries.next().getName());
 		assertEquals("BAZ", namedNativeQueries.next().getName());
 		assertEquals("FOO", namedNativeQueries.next().getName());
 		assertFalse(namedNativeQueries.hasNext());
 		
-		getOrmXmlResource().getEntityMappings().getNamedNativeQueries().move(0, 1);
+		getXmlEntityMappings().getNamedNativeQueries().move(0, 1);
 		namedNativeQueries = getEntityMappings().namedNativeQueries();
 		assertEquals("BAZ", namedNativeQueries.next().getName());
 		assertEquals("BAR", namedNativeQueries.next().getName());
 		assertEquals("FOO", namedNativeQueries.next().getName());
 		assertFalse(namedNativeQueries.hasNext());
 		
-		getOrmXmlResource().getEntityMappings().getNamedNativeQueries().remove(1);
+		getXmlEntityMappings().getNamedNativeQueries().remove(1);
 		namedNativeQueries = getEntityMappings().namedNativeQueries();
 		assertEquals("BAZ", namedNativeQueries.next().getName());
 		assertEquals("FOO", namedNativeQueries.next().getName());
 		assertFalse(namedNativeQueries.hasNext());
 		assertEquals(2, getEntityMappings().getPersistenceUnit().queriesSize());
 		
-		getOrmXmlResource().getEntityMappings().getNamedNativeQueries().remove(1);
+		getXmlEntityMappings().getNamedNativeQueries().remove(1);
 		namedNativeQueries = getEntityMappings().namedNativeQueries();
 		assertEquals("BAZ", namedNativeQueries.next().getName());
 		assertFalse(namedNativeQueries.hasNext());
 		assertEquals(1, getEntityMappings().getPersistenceUnit().queriesSize());
 		
-		getOrmXmlResource().getEntityMappings().getNamedNativeQueries().remove(0);
+		getXmlEntityMappings().getNamedNativeQueries().remove(0);
 		assertFalse(getEntityMappings().namedNativeQueries().hasNext());
 		assertEquals(0, getEntityMappings().getPersistenceUnit().queriesSize());
 	}
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmAssociationOverrideTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmAssociationOverrideTests.java
index 44e6030b98..43e3ee4cff 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmAssociationOverrideTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmAssociationOverrideTests.java
@@ -23,6 +23,7 @@ import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 
+@SuppressWarnings("nls")
 public class OrmAssociationOverrideTests extends ContextModelTestCase
 {
 	public OrmAssociationOverrideTests(String name) {
@@ -42,7 +43,7 @@ public class OrmAssociationOverrideTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverrideImpl());
 		XmlAssociationOverride xmlAssociationOverride = entityResource.getAssociationOverrides().get(0);
 		OrmAssociationOverride ormAssociationOverride = ormEntity.specifiedAssociationOverrides().next();
@@ -75,7 +76,7 @@ public class OrmAssociationOverrideTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverrideImpl());
 		XmlAssociationOverride xmlAssociationOverride = entityResource.getAssociationOverrides().get(0);
 		OrmAssociationOverride ormAssociationOverride = ormEntity.specifiedAssociationOverrides().next();
@@ -99,7 +100,7 @@ public class OrmAssociationOverrideTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverrideImpl());
 		OrmAssociationOverride ormAssociationOverride = ormEntity.specifiedAssociationOverrides().next();
 		
@@ -137,7 +138,7 @@ public class OrmAssociationOverrideTests extends ContextModelTestCase
 	public void testRemoveSpecifiedJoinColumn() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverrideImpl());
 		OrmAssociationOverride ormAssociationOverride = ormEntity.specifiedAssociationOverrides().next();
 		
@@ -165,7 +166,7 @@ public class OrmAssociationOverrideTests extends ContextModelTestCase
 	public void testMoveSpecifiedJoinColumn() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverrideImpl());
 		OrmAssociationOverride ormAssociationOverride = ormEntity.specifiedAssociationOverrides().next();
 		
@@ -203,7 +204,7 @@ public class OrmAssociationOverrideTests extends ContextModelTestCase
 	public void testUpdateJoinColumns() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverrideImpl());
 		OrmAssociationOverride ormAssociationOverride = ormEntity.specifiedAssociationOverrides().next();
 		
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmAttributeOverrideTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmAttributeOverrideTests.java
index 7e8e72b39d..fdb62a5fac 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmAttributeOverrideTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmAttributeOverrideTests.java
@@ -21,6 +21,7 @@ import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 
+@SuppressWarnings("nls")
 public class OrmAttributeOverrideTests extends ContextModelTestCase
 {
 	public OrmAttributeOverrideTests(String name) {
@@ -40,7 +41,7 @@ public class OrmAttributeOverrideTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		entityResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		XmlAttributeOverride attributeOverrideResource = entityResource.getAttributeOverrides().get(0);
 		OrmAttributeOverride ormAttributeOverride = ormEntity.specifiedAttributeOverrides().next();
@@ -73,7 +74,7 @@ public class OrmAttributeOverrideTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		entityResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		XmlAttributeOverride attributeOverrideResource = entityResource.getAttributeOverrides().get(0);
 		OrmAttributeOverride ormAttributeOverride = ormEntity.specifiedAttributeOverrides().next();
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmBasicMappingTests.java
index 06549b0f11..15a7d50781 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmBasicMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmBasicMappingTests.java
@@ -86,7 +86,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping");
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
-		XmlBasic basicResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
+		XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
 		
 		assertEquals("basicMapping", ormBasicMapping.getName());
 		assertEquals("basicMapping", basicResource.getName());
@@ -106,7 +106,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping");
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
-		XmlBasic basicResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
+		XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
 		
 		assertEquals("basicMapping", ormBasicMapping.getName());
 		assertEquals("basicMapping", basicResource.getName());
@@ -126,7 +126,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping");
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
-		XmlBasic basicResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
+		XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
 		
 		assertNull(ormBasicMapping.getSpecifiedFetch());
 		assertNull(basicResource.getFetch());
@@ -150,7 +150,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping");
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
-		XmlBasic basicResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
+		XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
 		
 		assertNull(ormBasicMapping.getSpecifiedFetch());
 		assertNull(basicResource.getFetch());
@@ -174,7 +174,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping");
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
-		XmlBasic basicResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
+		XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
 		
 		assertNull(ormBasicMapping.getSpecifiedConverter());
 		assertNull(basicResource.getEnumerated());
@@ -198,7 +198,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping");
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
-		XmlBasic basicResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
+		XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
 		
 		assertNull(ormBasicMapping.getSpecifiedConverter());
 		assertNull(basicResource.getEnumerated());
@@ -223,7 +223,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping");
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
-		XmlBasic basicResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
+		XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
 		
 		assertNull(ormBasicMapping.getSpecifiedOptional());
 		assertNull(basicResource.getOptional());
@@ -247,7 +247,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping");
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
-		XmlBasic basicResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
+		XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
 		
 		assertNull(ormBasicMapping.getSpecifiedOptional());
 		assertNull(basicResource.getOptional());
@@ -271,7 +271,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping");
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
-		XmlBasic basicResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
+		XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
 		
 		assertNull(ormBasicMapping.getSpecifiedConverter());
 		assertFalse(basicResource.isLob());
@@ -291,7 +291,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping");
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
-		XmlBasic basicResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
+		XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
 	
 		assertNull(ormBasicMapping.getSpecifiedConverter());
 		assertFalse(basicResource.isLob());
@@ -311,7 +311,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping");
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
-		XmlBasic basicResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
+		XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
 		
 		assertNull(ormBasicMapping.getSpecifiedConverter());
 		assertNull(basicResource.getTemporal());
@@ -339,7 +339,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping");
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
-		XmlBasic basicResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
+		XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
 		
 		assertNull(ormBasicMapping.getSpecifiedConverter());
 		assertNull(basicResource.getTemporal());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmCascadeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmCascadeTests.java
index d3b1e779cc..2ca8d45ad3 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmCascadeTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmCascadeTests.java
@@ -21,6 +21,7 @@ import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 
+@SuppressWarnings("nls")
 public class OrmCascadeTests extends ContextModelTestCase
 {
 	public OrmCascadeTests(String name) {
@@ -41,7 +42,7 @@ public class OrmCascadeTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		Cascade cascade = ormOneToOneMapping.getCascade();
 		
 		assertEquals(false, cascade.isAll());
@@ -67,7 +68,7 @@ public class OrmCascadeTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		
 		Cascade cascade = ormOneToOneMapping.getCascade();
 		
@@ -89,7 +90,7 @@ public class OrmCascadeTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		Cascade cascade = ormOneToOneMapping.getCascade();
 		
 		assertEquals(false, cascade.isPersist());
@@ -115,7 +116,7 @@ public class OrmCascadeTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		
 		Cascade cascade = ormOneToOneMapping.getCascade();
 		
@@ -137,7 +138,7 @@ public class OrmCascadeTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		Cascade cascade = ormOneToOneMapping.getCascade();
 		
 		assertEquals(false, cascade.isMerge());
@@ -163,7 +164,7 @@ public class OrmCascadeTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		
 		Cascade cascade = ormOneToOneMapping.getCascade();
 		
@@ -185,7 +186,7 @@ public class OrmCascadeTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		Cascade cascade = ormOneToOneMapping.getCascade();
 		
 		assertEquals(false, cascade.isRemove());
@@ -211,7 +212,7 @@ public class OrmCascadeTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		
 		Cascade cascade = ormOneToOneMapping.getCascade();
 		
@@ -233,7 +234,7 @@ public class OrmCascadeTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		Cascade cascade = ormOneToOneMapping.getCascade();
 		
 		assertEquals(false, cascade.isRefresh());
@@ -259,7 +260,7 @@ public class OrmCascadeTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		
 		Cascade cascade = ormOneToOneMapping.getCascade();
 		
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmColumnTests.java
index e57ce6d2e7..0c96fc8ec5 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmColumnTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmColumnTests.java
@@ -88,7 +88,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getSpecifiedName());
@@ -121,7 +121,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getSpecifiedName());
@@ -144,7 +144,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getColumnDefinition());
@@ -176,7 +176,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getColumnDefinition());
@@ -199,7 +199,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getSpecifiedTable());
@@ -231,7 +231,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getSpecifiedTable());
@@ -254,7 +254,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getSpecifiedNullable());
@@ -286,7 +286,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getSpecifiedNullable());
@@ -309,7 +309,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getSpecifiedUpdatable());
@@ -341,7 +341,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getSpecifiedUpdatable());
@@ -364,7 +364,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getSpecifiedInsertable());
@@ -396,7 +396,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getSpecifiedInsertable());
@@ -419,7 +419,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getSpecifiedUnique());
@@ -451,7 +451,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getSpecifiedUnique());
@@ -474,7 +474,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getSpecifiedLength());
@@ -506,7 +506,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getSpecifiedLength());
@@ -529,7 +529,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getSpecifiedLength());
@@ -561,7 +561,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getSpecifiedLength());
@@ -584,7 +584,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getSpecifiedLength());
@@ -616,7 +616,7 @@ public class OrmColumnTests extends ContextModelTestCase
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
 		OrmColumn ormColumn = ormBasicMapping.getColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entityResource.getAttributes().getBasics().get(0);
 
 		assertNull(ormColumn.getSpecifiedLength());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmDiscriminatorColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmDiscriminatorColumnTests.java
index 929ba174e3..dcc92dcf7d 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmDiscriminatorColumnTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmDiscriminatorColumnTests.java
@@ -82,7 +82,7 @@ public class OrmDiscriminatorColumnTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmDiscriminatorColumn ormColumn = ormEntity.getDiscriminatorColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 
 		assertNull(ormColumn.getSpecifiedName());
 		assertNull(entityResource.getDiscriminatorColumn());
@@ -112,7 +112,7 @@ public class OrmDiscriminatorColumnTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmDiscriminatorColumn ormColumn = ormEntity.getDiscriminatorColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 
 		assertNull(ormColumn.getSpecifiedName());
 		assertNull(entityResource.getDiscriminatorColumn());
@@ -189,7 +189,7 @@ public class OrmDiscriminatorColumnTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmDiscriminatorColumn ormColumn = ormEntity.getDiscriminatorColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 
 		assertNull(ormColumn.getSpecifiedLength());
 		assertNull(entityResource.getDiscriminatorColumn());
@@ -219,7 +219,7 @@ public class OrmDiscriminatorColumnTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmDiscriminatorColumn ormColumn = ormEntity.getDiscriminatorColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 
 		assertNull(ormColumn.getSpecifiedLength());
 		assertNull(entityResource.getDiscriminatorColumn());
@@ -240,7 +240,7 @@ public class OrmDiscriminatorColumnTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmDiscriminatorColumn ormColumn = ormEntity.getDiscriminatorColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 
 		assertNull(ormColumn.getColumnDefinition());
 		assertNull(entityResource.getDiscriminatorColumn());
@@ -270,7 +270,7 @@ public class OrmDiscriminatorColumnTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmDiscriminatorColumn ormColumn = ormEntity.getDiscriminatorColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 
 		assertNull(ormColumn.getColumnDefinition());
 		assertNull(entityResource.getDiscriminatorColumn());
@@ -291,7 +291,7 @@ public class OrmDiscriminatorColumnTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmDiscriminatorColumn ormColumn = ormEntity.getDiscriminatorColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 
 		assertNull(ormColumn.getSpecifiedDiscriminatorType());
 		assertNull(entityResource.getDiscriminatorColumn());
@@ -321,7 +321,7 @@ public class OrmDiscriminatorColumnTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmDiscriminatorColumn ormColumn = ormEntity.getDiscriminatorColumn();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 
 		assertNull(ormColumn.getSpecifiedDiscriminatorType());
 		assertNull(entityResource.getDiscriminatorColumn());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEmbeddableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEmbeddableTests.java
index 117261b8e9..90edce1588 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEmbeddableTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEmbeddableTests.java
@@ -45,7 +45,7 @@ public class OrmEmbeddableTests extends ContextModelTestCase
 	public void testUpdateClass() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEmbeddable ormEmbeddable = (OrmEmbeddable) ormPersistentType.getMapping();
-		XmlEmbeddable embeddableResource = getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable embeddableResource = getXmlEntityMappings().getEmbeddables().get(0);
 		assertEquals("model.Foo", ormEmbeddable.getClass_());
 		assertEquals("model.Foo", embeddableResource.getClassName());
 		
@@ -63,7 +63,7 @@ public class OrmEmbeddableTests extends ContextModelTestCase
 	public void testModifyClass() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEmbeddable ormEmbeddable = (OrmEmbeddable) ormPersistentType.getMapping();
-		XmlEmbeddable embeddableResource = getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable embeddableResource = getXmlEntityMappings().getEmbeddables().get(0);
 		assertEquals("model.Foo", ormEmbeddable.getClass_());
 		assertEquals("model.Foo", embeddableResource.getClassName());
 		
@@ -81,8 +81,7 @@ public class OrmEmbeddableTests extends ContextModelTestCase
 	
 	public void testUpdateSpecifiedAccess() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, "model.Foo");
-		OrmEmbeddable ormEmbeddable = (OrmEmbeddable) ormPersistentType.getMapping();
-		XmlEmbeddable embeddableResource = getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable embeddableResource = getXmlEntityMappings().getEmbeddables().get(0);
 		assertNull(ormPersistentType.getSpecifiedAccess());
 		assertNull(embeddableResource.getAccess());
 		
@@ -99,8 +98,7 @@ public class OrmEmbeddableTests extends ContextModelTestCase
 	
 	public void testModifySpecifiedAccess() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, "model.Foo");
-		OrmEmbeddable ormEmbeddable = (OrmEmbeddable) ormPersistentType.getMapping();
-		XmlEmbeddable embeddableResource = getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable embeddableResource = getXmlEntityMappings().getEmbeddables().get(0);
 		assertNull(ormPersistentType.getSpecifiedAccess());
 		assertNull(embeddableResource.getAccess());
 		
@@ -123,18 +121,18 @@ public class OrmEmbeddableTests extends ContextModelTestCase
 	public void testUpdateSpecifiedMetadataComplete() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEmbeddable ormEmbeddable = (OrmEmbeddable) ormPersistentType.getMapping();
-		XmlEmbeddable embeddableResource = getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable embeddableResource = getXmlEntityMappings().getEmbeddables().get(0);
 		assertNull(embeddableResource.getMetadataComplete());
 		
 		//set metadata-complete in the resource model, verify context model updated
-		embeddableResource.setMetadataComplete(true);
-		assertTrue(ormEmbeddable.getSpecifiedMetadataComplete());
-		assertTrue(embeddableResource.getMetadataComplete());
+		embeddableResource.setMetadataComplete(Boolean.TRUE);
+		assertEquals(Boolean.TRUE, ormEmbeddable.getSpecifiedMetadataComplete());
+		assertEquals(Boolean.TRUE, embeddableResource.getMetadataComplete());
 	
 		//set access to false in the resource model
-		embeddableResource.setMetadataComplete(false);
-		assertFalse(ormEmbeddable.getSpecifiedMetadataComplete());
-		assertFalse(embeddableResource.getMetadataComplete());
+		embeddableResource.setMetadataComplete(Boolean.FALSE);
+		assertEquals(Boolean.FALSE, ormEmbeddable.getSpecifiedMetadataComplete());
+		assertEquals(Boolean.FALSE, embeddableResource.getMetadataComplete());
 		
 		embeddableResource.setMetadataComplete(null);
 		assertNull(ormEmbeddable.getSpecifiedMetadataComplete());
@@ -144,18 +142,18 @@ public class OrmEmbeddableTests extends ContextModelTestCase
 	public void testModifySpecifiedMetadataComplete() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEmbeddable ormEmbeddable = (OrmEmbeddable) ormPersistentType.getMapping();
-		XmlEmbeddable embeddableResource = getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable embeddableResource = getXmlEntityMappings().getEmbeddables().get(0);
 		assertNull(embeddableResource.getMetadataComplete());
 		
 		//set access in the context model, verify resource model modified
 		ormEmbeddable.setSpecifiedMetadataComplete(Boolean.TRUE);
-		assertTrue(ormEmbeddable.getSpecifiedMetadataComplete());
-		assertTrue(embeddableResource.getMetadataComplete());
+		assertEquals(Boolean.TRUE, ormEmbeddable.getSpecifiedMetadataComplete());
+		assertEquals(Boolean.TRUE, embeddableResource.getMetadataComplete());
 		
 		//set access to null in the context model
 		ormEmbeddable.setSpecifiedMetadataComplete(Boolean.FALSE);
-		assertFalse(ormEmbeddable.getSpecifiedMetadataComplete());
-		assertFalse(embeddableResource.getMetadataComplete());
+		assertEquals(Boolean.FALSE, ormEmbeddable.getSpecifiedMetadataComplete());
+		assertEquals(Boolean.FALSE, embeddableResource.getMetadataComplete());
 		
 		ormEmbeddable.setSpecifiedMetadataComplete(null);
 		assertNull(ormEmbeddable.getSpecifiedMetadataComplete());
@@ -165,18 +163,18 @@ public class OrmEmbeddableTests extends ContextModelTestCase
 	public void testUpdateDefaultMetadataComplete() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEmbeddable ormEmbeddable = (OrmEmbeddable) ormPersistentType.getMapping();
-		XmlEmbeddable embeddableResource = getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable embeddableResource = getXmlEntityMappings().getEmbeddables().get(0);
 		assertNull(ormEmbeddable.getSpecifiedMetadataComplete());
 		assertFalse(ormEmbeddable.isDefaultMetadataComplete());
 		assertNull(embeddableResource.getMetadataComplete());
 		
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
 		assertTrue(ormEmbeddable.isDefaultMetadataComplete());
 		assertNull(ormEmbeddable.getSpecifiedMetadataComplete());
 		assertNull(embeddableResource.getMetadataComplete());
 		
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false);
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false);
 		assertNull(ormEmbeddable.getSpecifiedMetadataComplete());
 		assertFalse(ormEmbeddable.isDefaultMetadataComplete());
 		assertNull(embeddableResource.getMetadataComplete());
@@ -185,18 +183,18 @@ public class OrmEmbeddableTests extends ContextModelTestCase
 	public void testUpdateMetadataComplete() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEmbeddable ormEmbeddable = (OrmEmbeddable) ormPersistentType.getMapping();
-		XmlEmbeddable embeddableResource = getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable embeddableResource = getXmlEntityMappings().getEmbeddables().get(0);
 		assertNull(ormEmbeddable.getSpecifiedMetadataComplete());
 		assertFalse(ormEmbeddable.isMetadataComplete());
 		assertNull(embeddableResource.getMetadataComplete());
 		
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
 		assertTrue(ormEmbeddable.isMetadataComplete());
 		assertNull(ormEmbeddable.getSpecifiedMetadataComplete());
 		assertNull(embeddableResource.getMetadataComplete());
 		
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false);
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false);
 		assertFalse(ormEmbeddable.isMetadataComplete());
 		assertNull(ormEmbeddable.getSpecifiedMetadataComplete());
 		assertNull(embeddableResource.getMetadataComplete());
@@ -210,7 +208,7 @@ public class OrmEmbeddableTests extends ContextModelTestCase
 	
 		embeddablePersistentType.setMappingKey(MappingKeys.ENTITY_TYPE_MAPPING_KEY);
 		
-		XmlEntity entity = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entity = getXmlEntityMappings().getEntities().get(0);
 		assertEquals("model.Foo", entity.getClassName());
 		assertEquals(Boolean.TRUE, entity.getMetadataComplete());
 		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY, entity.getAccess());
@@ -233,7 +231,7 @@ public class OrmEmbeddableTests extends ContextModelTestCase
 	
 		embeddablePersistentType.setMappingKey(MappingKeys.ENTITY_TYPE_MAPPING_KEY);
 		
-		XmlEntity entity = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entity = getXmlEntityMappings().getEntities().get(0);
 		assertEquals("model.Foo", entity.getClassName());
 		assertEquals(Boolean.TRUE, entity.getMetadataComplete());
 		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY, entity.getAccess());
@@ -258,7 +256,7 @@ public class OrmEmbeddableTests extends ContextModelTestCase
 	
 		embeddablePersistentType.setMappingKey(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY);
 		
-		XmlMappedSuperclass  mappedSuperclass = getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass  mappedSuperclass = getXmlEntityMappings().getMappedSuperclasses().get(0);
 		assertEquals("model.Foo", mappedSuperclass.getClassName());
 		assertEquals(Boolean.TRUE, mappedSuperclass.getMetadataComplete());
 		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY, mappedSuperclass.getAccess());
@@ -279,7 +277,7 @@ public class OrmEmbeddableTests extends ContextModelTestCase
 	
 		embeddablePersistentType.setMappingKey(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY);
 		
-		XmlMappedSuperclass  mappedSuperclass = getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass  mappedSuperclass = getXmlEntityMappings().getMappedSuperclasses().get(0);
 		assertEquals("model.Foo", mappedSuperclass.getClassName());
 		assertEquals(Boolean.TRUE, mappedSuperclass.getMetadataComplete());
 		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY, mappedSuperclass.getAccess());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEmbeddedIdMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEmbeddedIdMappingTests.java
index 10327dbbca..65585888e5 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEmbeddedIdMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEmbeddedIdMappingTests.java
@@ -42,6 +42,7 @@ import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 import org.eclipse.jpt.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class OrmEmbeddedIdMappingTests extends ContextModelTestCase
 {
 	private static final String ATTRIBUTE_OVERRIDE_NAME = "city";
@@ -320,7 +321,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase
 		
 		EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) ormPersistentAttribute.getMapping();
 		assertFalse(embeddedIdMapping.isDefault());
-		XmlEmbeddedId embeddedIdResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+		XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
 		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		AttributeOverride attributeOverride = embeddedIdMapping.specifiedAttributeOverrides().next();
 		attributeOverride.setName("override");
@@ -341,7 +342,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase
 		
 		EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) ormPersistentAttribute.getMapping();
 		assertFalse(embeddedIdMapping.isDefault());
-		XmlEmbeddedId embeddedIdResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+		XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
 		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		AttributeOverride attributeOverride = embeddedIdMapping.specifiedAttributeOverrides().next();
 		attributeOverride.setName("override");
@@ -362,7 +363,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase
 		
 		EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) ormPersistentAttribute.getMapping();
 		assertFalse(embeddedIdMapping.isDefault());
-		XmlEmbeddedId embeddedIdResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+		XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
 		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		AttributeOverride attributeOverride = embeddedIdMapping.specifiedAttributeOverrides().next();
 		attributeOverride.setName("override");
@@ -383,7 +384,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase
 		
 		EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) ormPersistentAttribute.getMapping();
 		assertFalse(embeddedIdMapping.isDefault());
-		XmlEmbeddedId embeddedIdResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+		XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
 		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		AttributeOverride attributeOverride = embeddedIdMapping.specifiedAttributeOverrides().next();
 		attributeOverride.setName("override");
@@ -404,7 +405,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase
 		
 		EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) ormPersistentAttribute.getMapping();
 		assertFalse(embeddedIdMapping.isDefault());
-		XmlEmbeddedId embeddedIdResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+		XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
 		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		AttributeOverride attributeOverride = embeddedIdMapping.specifiedAttributeOverrides().next();
 		attributeOverride.setName("override");
@@ -428,7 +429,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase
 		
 		EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) ormPersistentAttribute.getMapping();
 		assertFalse(embeddedIdMapping.isDefault());
-		XmlEmbeddedId embeddedIdResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+		XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
 		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		AttributeOverride attributeOverride = embeddedIdMapping.specifiedAttributeOverrides().next();
 		attributeOverride.setName("override");
@@ -449,7 +450,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase
 		
 		EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) ormPersistentAttribute.getMapping();
 		assertFalse(embeddedIdMapping.isDefault());
-		XmlEmbeddedId embeddedIdResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+		XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
 		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		AttributeOverride attributeOverride = embeddedIdMapping.specifiedAttributeOverrides().next();
 		attributeOverride.setName("override");
@@ -470,7 +471,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase
 		
 		EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) ormPersistentAttribute.getMapping();
 		assertFalse(embeddedIdMapping.isDefault());
-		XmlEmbeddedId embeddedIdResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+		XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
 		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		AttributeOverride attributeOverride = embeddedIdMapping.specifiedAttributeOverrides().next();
 		attributeOverride.setName("override");
@@ -489,7 +490,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase
 		
 		EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) ormPersistentAttribute.getMapping();
 		assertFalse(embeddedIdMapping.isDefault());
-		XmlEmbeddedId embeddedIdResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+		XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
 		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		AttributeOverride attributeOverride = embeddedIdMapping.specifiedAttributeOverrides().next();
 		attributeOverride.setName("override");
@@ -507,7 +508,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedMapping");
 		OrmEmbeddedIdMapping ormEmbeddedMapping = (OrmEmbeddedIdMapping) ormPersistentAttribute.getMapping();
-		XmlEmbeddedId embeddedResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+		XmlEmbeddedId embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
 		
 		assertEquals("embeddedMapping", ormEmbeddedMapping.getName());
 		assertEquals("embeddedMapping", embeddedResource.getName());
@@ -527,7 +528,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedMapping");
 		OrmEmbeddedIdMapping ormEmbeddedMapping = (OrmEmbeddedIdMapping) ormPersistentAttribute.getMapping();
-		XmlEmbeddedId embeddedResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+		XmlEmbeddedId embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
 		
 		assertEquals("embeddedMapping", ormEmbeddedMapping.getName());
 		assertEquals("embeddedMapping", embeddedResource.getName());
@@ -547,7 +548,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedMapping");
 		OrmEmbeddedIdMapping ormEmbeddedIdMapping = (OrmEmbeddedIdMapping) ormPersistentAttribute.getMapping();
-		XmlEmbeddedId embeddedIdResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+		XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
 
 		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
@@ -585,7 +586,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedMapping");
 		OrmEmbeddedIdMapping ormEmbeddedIdMapping = (OrmEmbeddedIdMapping) ormPersistentAttribute.getMapping();
-		XmlEmbeddedId embeddedIdResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+		XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
 		
 		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEmbeddedMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEmbeddedMappingTests.java
index 40b4dff01f..6468772cf5 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEmbeddedMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEmbeddedMappingTests.java
@@ -41,6 +41,7 @@ import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 import org.eclipse.jpt.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class OrmEmbeddedMappingTests extends ContextModelTestCase
 {
 	private static final String ATTRIBUTE_OVERRIDE_NAME = "city";
@@ -126,7 +127,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, "embeddedMapping");
 		OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping();
-		XmlEmbedded embeddedResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
+		XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
 		
 		assertEquals("embeddedMapping", ormEmbeddedMapping.getName());
 		assertEquals("embeddedMapping", embeddedResource.getName());
@@ -146,7 +147,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, "embeddedMapping");
 		OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping();
-		XmlEmbedded embeddedResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
+		XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
 		
 		assertEquals("embeddedMapping", ormEmbeddedMapping.getName());
 		assertEquals("embeddedMapping", embeddedResource.getName());
@@ -226,7 +227,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, "embeddedMapping");
 		OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping();
-		XmlEmbedded embeddedResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
+		XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
 
 		embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
@@ -264,7 +265,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, "embeddedMapping");
 		OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping();
-		XmlEmbedded embeddedResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
+		XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
 		
 		embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
@@ -558,7 +559,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase
 		
 		EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping();
 		assertFalse(embeddedMapping.isDefault());
-		XmlEmbedded embeddedResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
+		XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
 		embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		AttributeOverride attributeOverride = embeddedMapping.specifiedAttributeOverrides().next();
 		attributeOverride.setName("override");
@@ -579,7 +580,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase
 		
 		EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping();
 		assertFalse(embeddedMapping.isDefault());
-		XmlEmbedded embeddedResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
+		XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
 		embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		AttributeOverride attributeOverride = embeddedMapping.specifiedAttributeOverrides().next();
 		attributeOverride.setName("override");
@@ -600,7 +601,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase
 		
 		EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping();
 		assertFalse(embeddedMapping.isDefault());
-		XmlEmbedded embeddedResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
+		XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
 		embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		AttributeOverride attributeOverride = embeddedMapping.specifiedAttributeOverrides().next();
 		attributeOverride.setName("override");
@@ -621,7 +622,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase
 		
 		EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping();
 		assertFalse(embeddedMapping.isDefault());
-		XmlEmbedded embeddedResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
+		XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
 		embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		AttributeOverride attributeOverride = embeddedMapping.specifiedAttributeOverrides().next();
 		attributeOverride.setName("override");
@@ -642,7 +643,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase
 		
 		EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping();
 		assertFalse(embeddedMapping.isDefault());
-		XmlEmbedded embeddedResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
+		XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
 		embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		AttributeOverride attributeOverride = embeddedMapping.specifiedAttributeOverrides().next();
 		attributeOverride.setName("override");
@@ -666,7 +667,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase
 		
 		EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping();
 		assertFalse(embeddedMapping.isDefault());
-		XmlEmbedded embeddedResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
+		XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
 		embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		AttributeOverride attributeOverride = embeddedMapping.specifiedAttributeOverrides().next();
 		attributeOverride.setName("override");
@@ -687,7 +688,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase
 		
 		EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping();
 		assertFalse(embeddedMapping.isDefault());
-		XmlEmbedded embeddedResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
+		XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
 		embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		AttributeOverride attributeOverride = embeddedMapping.specifiedAttributeOverrides().next();
 		attributeOverride.setName("override");
@@ -708,7 +709,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase
 		
 		EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping();
 		assertFalse(embeddedMapping.isDefault());
-		XmlEmbedded embeddedResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
+		XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
 		embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		AttributeOverride attributeOverride = embeddedMapping.specifiedAttributeOverrides().next();
 		attributeOverride.setName("override");
@@ -729,7 +730,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase
 		
 		EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping();
 		assertFalse(embeddedMapping.isDefault());
-		XmlEmbedded embeddedResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
+		XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0);
 		embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		AttributeOverride attributeOverride = embeddedMapping.specifiedAttributeOverrides().next();
 		attributeOverride.setName("override");
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEntityTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEntityTests.java
index 86a6e50b63..86471d4863 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEntityTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEntityTests.java
@@ -183,7 +183,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testUpdateSpecifiedName() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertNull(ormEntity.getSpecifiedName());
 		assertNull(entityResource.getName());
 		
@@ -201,7 +201,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testModifySpecifiedName() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertNull(ormEntity.getSpecifiedName());
 		assertNull(entityResource.getName());
 		
@@ -221,7 +221,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertEquals(TYPE_NAME, ormEntity.getDefaultName());
 		
 		ormEntity.getJavaEntity().setSpecifiedName("Foo");
@@ -251,7 +251,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testUpdateName() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertEquals("Foo", ormEntity.getName());
 		
 		//set class in the resource model, verify context model updated
@@ -272,7 +272,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testUpdateClass() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertEquals("model.Foo", ormEntity.getClass_());
 		assertEquals("model.Foo", entityResource.getClassName());
 		
@@ -290,7 +290,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testModifyClass() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertEquals("model.Foo", ormEntity.getClass_());
 		assertEquals("model.Foo", entityResource.getClassName());
 		
@@ -308,7 +308,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	
 	public void testUpdateSpecifiedAccess() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertNull(ormPersistentType.getSpecifiedAccess());
 		assertNull(entityResource.getAccess());
 		
@@ -325,7 +325,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	
 	public void testModifySpecifiedAccess() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertNull(ormPersistentType.getSpecifiedAccess());
 		assertNull(entityResource.getAccess());
 		
@@ -342,24 +342,24 @@ public class OrmEntityTests extends ContextModelTestCase
 	
 	public void testUpdateDefaultAccessFromPersistenceUnitDefaults() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertNull(ormPersistentType.getSpecifiedAccess());
 		assertNull(ormPersistentType.getDefaultAccess());
 		assertNull(entityResource.getAccess());
 		
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setPersistenceUnitDefaults(OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(org.eclipse.jpt.core.resource.orm.AccessType.FIELD);
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().getPersistenceUnitMetadata().setPersistenceUnitDefaults(OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults());
+		getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(org.eclipse.jpt.core.resource.orm.AccessType.FIELD);
 		assertEquals(AccessType.FIELD, ormPersistentType.getDefaultAccess());
 		assertNull(ormPersistentType.getSpecifiedAccess());
 		assertNull(entityResource.getAccess());
 		
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY);
+		getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY);
 		assertEquals(AccessType.PROPERTY, ormPersistentType.getDefaultAccess());
 		assertNull(ormPersistentType.getSpecifiedAccess());
 		assertNull(entityResource.getAccess());
 		
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(null);
+		getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(null);
 		assertNull(ormPersistentType.getSpecifiedAccess());
 		assertNull(ormPersistentType.getDefaultAccess());
 		assertNull(entityResource.getAccess());
@@ -450,7 +450,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testUpdateSpecifiedMetadataComplete() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertNull(ormEntity.getSpecifiedMetadataComplete());
 		assertNull(entityResource.getMetadataComplete());
 		
@@ -472,7 +472,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testModifySpecifiedMetadataComplete() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertNull(ormEntity.getSpecifiedMetadataComplete());
 		assertNull(entityResource.getMetadataComplete());
 		
@@ -494,23 +494,23 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testUpdateDefaultMetadataComplete() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertNull(ormEntity.getSpecifiedMetadataComplete());
 		assertFalse(ormEntity.isDefaultMetadataComplete());
 		assertNull(entityResource.getMetadataComplete());
 		
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
 		assertTrue(ormEntity.isDefaultMetadataComplete());
 		assertNull(ormEntity.getSpecifiedMetadataComplete());
 		assertNull(entityResource.getMetadataComplete());
 		
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false);
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false);
 		assertNull(ormEntity.getSpecifiedMetadataComplete());
 		assertFalse(ormEntity.isDefaultMetadataComplete());
 		assertNull(entityResource.getMetadataComplete());
 		
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
 		ormEntity.setSpecifiedMetadataComplete(Boolean.FALSE);
 		assertEquals(Boolean.FALSE, ormEntity.getSpecifiedMetadataComplete());
 		assertTrue(ormEntity.isDefaultMetadataComplete());
@@ -520,18 +520,18 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testUpdateMetadataComplete() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertNull(ormEntity.getSpecifiedMetadataComplete());
 		assertFalse(ormEntity.isMetadataComplete());
 		assertNull(entityResource.getMetadataComplete());
 		
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
 		assertTrue(ormEntity.isMetadataComplete());
 		assertNull(ormEntity.getSpecifiedMetadataComplete());
 		assertNull(entityResource.getMetadataComplete());
 		
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false);
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false);
 		assertFalse(ormEntity.isMetadataComplete());
 		assertNull(ormEntity.getSpecifiedMetadataComplete());
 		assertNull(entityResource.getMetadataComplete());
@@ -541,7 +541,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testUpdateInheritanceStrategy() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertEquals(InheritanceType.SINGLE_TABLE, ormEntity.getInheritanceStrategy());
 		assertNull(entityResource.getInheritance());
 
@@ -616,7 +616,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testUpdateSpecifiedInheritanceStrategy() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertNull(ormEntity.getSpecifiedInheritanceStrategy());
 		assertNull(entityResource.getInheritance());
 		
@@ -643,7 +643,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testModifySpecifiedInheritanceStrategy() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertNull(ormEntity.getSpecifiedInheritanceStrategy());
 		assertNull(entityResource.getInheritance());
 		
@@ -661,7 +661,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testAddSpecifiedSecondaryTable() throws Exception {
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 
 		OrmSecondaryTable secondaryTable = ormEntity.addSpecifiedSecondaryTable(0);
 		secondaryTable.setSpecifiedName("FOO");
@@ -700,7 +700,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		ormEntity.addSpecifiedSecondaryTable(1).setSpecifiedName("BAR");
 		ormEntity.addSpecifiedSecondaryTable(2).setSpecifiedName("BAZ");
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertEquals(3, entityResource.getSecondaryTables().size());
 		
 		ormEntity.removeSpecifiedSecondaryTable(0);
@@ -724,7 +724,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		ormEntity.addSpecifiedSecondaryTable(1).setSpecifiedName("BAR");
 		ormEntity.addSpecifiedSecondaryTable(2).setSpecifiedName("BAZ");
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertEquals(3, entityResource.getSecondaryTables().size());
 		
 		
@@ -754,7 +754,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		entityResource.getSecondaryTables().add(OrmFactory.eINSTANCE.createXmlSecondaryTableImpl());
 		entityResource.getSecondaryTables().add(OrmFactory.eINSTANCE.createXmlSecondaryTableImpl());
 		entityResource.getSecondaryTables().add(OrmFactory.eINSTANCE.createXmlSecondaryTableImpl());
@@ -906,7 +906,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	
 		entityPersistentType.setMappingKey(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY);
 		
-		XmlEmbeddable embeddable = getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable embeddable = getXmlEntityMappings().getEmbeddables().get(0);
 		assertEquals("model.Foo", embeddable.getClassName());
 		assertEquals(Boolean.TRUE, embeddable.getMetadataComplete());
 		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY, embeddable.getAccess());
@@ -931,7 +931,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	
 		entityPersistentType.setMappingKey(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY);
 		
-		XmlEmbeddable embeddable = getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable embeddable = getXmlEntityMappings().getEmbeddables().get(0);
 		assertEquals("model.Foo", embeddable.getClassName());
 		assertEquals(Boolean.TRUE, embeddable.getMetadataComplete());
 		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY, embeddable.getAccess());
@@ -955,7 +955,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	
 		entityPersistentType.setMappingKey(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY);
 		
-		XmlMappedSuperclass mappedSuperclass = getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass mappedSuperclass = getXmlEntityMappings().getMappedSuperclasses().get(0);
 		assertEquals("model.Foo", mappedSuperclass.getClassName());
 		assertEquals(Boolean.TRUE, mappedSuperclass.getMetadataComplete());
 		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY, mappedSuperclass.getAccess());
@@ -978,7 +978,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	
 		entityPersistentType.setMappingKey(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY);
 		
-		XmlMappedSuperclass mappedSuperclass = getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass mappedSuperclass = getXmlEntityMappings().getMappedSuperclasses().get(0);
 		assertEquals("model.Foo", mappedSuperclass.getClassName());
 		assertEquals(Boolean.TRUE, mappedSuperclass.getMetadataComplete());
 		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY, mappedSuperclass.getAccess());
@@ -993,7 +993,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testAddSequenceGenerator() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		
 		assertNull(ormEntity.getSequenceGenerator());
 		assertNull(entityResource.getSequenceGenerator());
@@ -1015,7 +1015,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testRemoveSequenceGenerator() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		
 		assertNull(ormEntity.getSequenceGenerator());
 		assertNull(entityResource.getSequenceGenerator());
@@ -1041,7 +1041,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testUpdateSequenceGenerator() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		
 		assertNull(ormEntity.getSequenceGenerator());
 		assertNull(entityResource.getSequenceGenerator());
@@ -1065,7 +1065,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testAddTableGenerator() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		
 		assertNull(ormEntity.getTableGenerator());
 		assertNull(entityResource.getTableGenerator());
@@ -1087,7 +1087,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testRemoveTableGenerator() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		
 		assertNull(ormEntity.getTableGenerator());
 		assertNull(entityResource.getTableGenerator());
@@ -1113,7 +1113,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testUpdateTableGenerator() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		
 		assertNull(ormEntity.getTableGenerator());
 		assertNull(entityResource.getTableGenerator());
@@ -1137,7 +1137,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testUpdateDiscriminatorColumn() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		
 		assertNotNull(ormEntity.getDiscriminatorColumn());
 
@@ -1160,7 +1160,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testUpdateDiscriminatorValue() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		
 		assertNull(ormEntity.getSpecifiedDiscriminatorValue());
 		assertNull(entityResource.getDiscriminatorValue());
@@ -1179,7 +1179,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testModifyDiscriminatorValue() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		
 		assertNull(ormEntity.getSpecifiedDiscriminatorValue());
 		assertNull(entityResource.getDiscriminatorValue());
@@ -1198,7 +1198,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testAddSpecifiedPrimaryKeyJoinColumn() throws Exception {
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 
 		OrmPrimaryKeyJoinColumn primaryKeyJoinColumn = ormEntity.addSpecifiedPrimaryKeyJoinColumn(0);
 		primaryKeyJoinColumn.setSpecifiedName("FOO");
@@ -1237,7 +1237,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		ormEntity.addSpecifiedPrimaryKeyJoinColumn(1).setSpecifiedName("BAR");
 		ormEntity.addSpecifiedPrimaryKeyJoinColumn(2).setSpecifiedName("BAZ");
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertEquals(3, entityResource.getPrimaryKeyJoinColumns().size());
 		
 		ormEntity.removeSpecifiedPrimaryKeyJoinColumn(0);
@@ -1261,7 +1261,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		ormEntity.addSpecifiedPrimaryKeyJoinColumn(1).setSpecifiedName("BAR");
 		ormEntity.addSpecifiedPrimaryKeyJoinColumn(2).setSpecifiedName("BAZ");
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertEquals(3, entityResource.getPrimaryKeyJoinColumns().size());
 		
 		
@@ -1291,7 +1291,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		entityResource.getPrimaryKeyJoinColumns().add(OrmFactory.eINSTANCE.createXmlPrimaryKeyJoinColumnImpl());
 		entityResource.getPrimaryKeyJoinColumns().add(OrmFactory.eINSTANCE.createXmlPrimaryKeyJoinColumnImpl());
 		entityResource.getPrimaryKeyJoinColumns().add(OrmFactory.eINSTANCE.createXmlPrimaryKeyJoinColumnImpl());
@@ -1497,7 +1497,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		entityResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		entityResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		entityResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
@@ -1535,7 +1535,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		entityResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		entityResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
 		entityResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverrideImpl());
@@ -1756,7 +1756,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverrideImpl());
 		entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverrideImpl());
 		entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverrideImpl());
@@ -1794,7 +1794,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverrideImpl());
 		entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverrideImpl());
 		entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverrideImpl());
@@ -1842,7 +1842,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testAddNamedQuery() throws Exception {
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 
 		OrmNamedQuery namedQuery = ormEntity.addNamedQuery(0);
 		namedQuery.setName("FOO");
@@ -1881,7 +1881,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		ormEntity.addNamedQuery(1).setName("BAR");
 		ormEntity.addNamedQuery(2).setName("BAZ");
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertEquals(3, entityResource.getNamedQueries().size());
 		
 		ormEntity.removeNamedQuery(0);
@@ -1905,7 +1905,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		ormEntity.addNamedQuery(1).setName("BAR");
 		ormEntity.addNamedQuery(2).setName("BAZ");
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertEquals(3, entityResource.getNamedQueries().size());
 		
 		
@@ -1937,7 +1937,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		
 		assertEquals(0, ormEntity.getPersistenceUnit().queriesSize());
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		entityResource.getNamedQueries().add(OrmFactory.eINSTANCE.createXmlNamedQuery());
 		entityResource.getNamedQueries().add(OrmFactory.eINSTANCE.createXmlNamedQuery());
 		entityResource.getNamedQueries().add(OrmFactory.eINSTANCE.createXmlNamedQuery());
@@ -1987,7 +1987,7 @@ public class OrmEntityTests extends ContextModelTestCase
 	public void testAddNamedNativeQuery() throws Exception {
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 
 		OrmNamedNativeQuery namedNativeQuery = ormEntity.addNamedNativeQuery(0);
 		namedNativeQuery.setName("FOO");
@@ -2026,7 +2026,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		ormEntity.addNamedNativeQuery(1).setName("BAR");
 		ormEntity.addNamedNativeQuery(2).setName("BAZ");
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertEquals(3, entityResource.getNamedNativeQueries().size());
 		
 		ormEntity.removeNamedNativeQuery(0);
@@ -2050,7 +2050,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		ormEntity.addNamedNativeQuery(1).setName("BAR");
 		ormEntity.addNamedNativeQuery(2).setName("BAZ");
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertEquals(3, entityResource.getNamedNativeQueries().size());
 		
 		
@@ -2082,7 +2082,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		
 		assertEquals(0, ormEntity.getPersistenceUnit().queriesSize());
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		entityResource.getNamedNativeQueries().add(OrmFactory.eINSTANCE.createXmlNamedNativeQuery());
 		entityResource.getNamedNativeQueries().add(OrmFactory.eINSTANCE.createXmlNamedNativeQuery());
 		entityResource.getNamedNativeQueries().add(OrmFactory.eINSTANCE.createXmlNamedNativeQuery());
@@ -2132,7 +2132,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 
 		assertNull(ormEntity.getIdClass());
 		assertNull(entityResource.getIdClass());
@@ -2164,7 +2164,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 
 		assertNull(ormEntity.getIdClass());
 		assertNull(entityResource.getIdClass());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmGeneratedValueTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmGeneratedValueTests.java
index 1d3ccd2c4e..43eeb0b5dd 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmGeneratedValueTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmGeneratedValueTests.java
@@ -29,7 +29,8 @@ import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 import org.eclipse.jpt.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
-public class OrmGeneratedValueTests extends ContextModelTestCase
+
+@SuppressWarnings("nls")public class OrmGeneratedValueTests extends ContextModelTestCase
 {
 	public OrmGeneratedValueTests(String name) {
 		super(name);
@@ -84,7 +85,7 @@ public class OrmGeneratedValueTests extends ContextModelTestCase
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "idMapping");
 		OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping();
 		OrmGeneratedValue ormGeneratedValue = ormIdMapping.addGeneratedValue();
-		XmlId idResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
+		XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
 		XmlGeneratedValue generatedValueResource = idResource.getGeneratedValue();
 		
 		//set generator in the resource model, verify context model updated
@@ -103,7 +104,7 @@ public class OrmGeneratedValueTests extends ContextModelTestCase
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "idMapping");
 		OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping();
 		OrmGeneratedValue ormGeneratedValue = ormIdMapping.addGeneratedValue();
-		XmlId idResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
+		XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
 		XmlGeneratedValue generatedValueResource = idResource.getGeneratedValue();
 		
 		//set name in the context model, verify resource model modified
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmIdMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmIdMappingTests.java
index 6652551b5a..4b51a812a2 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmIdMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmIdMappingTests.java
@@ -40,7 +40,6 @@ import org.eclipse.jpt.core.resource.orm.XmlId;
 import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
-import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
 @SuppressWarnings("nls")
@@ -92,7 +91,7 @@ public class OrmIdMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "idMapping");
 		OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping();
-		XmlId idResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
+		XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
 		
 		assertEquals("idMapping", ormIdMapping.getName());
 		assertEquals("idMapping", idResource.getName());
@@ -112,7 +111,7 @@ public class OrmIdMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "idMapping");
 		OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping();
-		XmlId idResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
+		XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
 		
 		assertEquals("idMapping", ormIdMapping.getName());
 		assertEquals("idMapping", idResource.getName());
@@ -132,7 +131,7 @@ public class OrmIdMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "idMapping");
 		OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping();
-		XmlId idResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
+		XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
 		
 		assertNull(ormIdMapping.getSpecifiedConverter());
 		assertNull(idResource.getTemporal());
@@ -160,7 +159,7 @@ public class OrmIdMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "idMapping");
 		OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping();
-		XmlId idResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
+		XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
 		
 		assertNull(ormIdMapping.getSpecifiedConverter());
 		assertNull(idResource.getTemporal());
@@ -193,7 +192,7 @@ public class OrmIdMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "idMapping");
 		OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping();
-		XmlId idResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
+		XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
 		
 		assertNull(ormIdMapping.getSequenceGenerator());
 		assertNull(idResource.getSequenceGenerator());
@@ -216,7 +215,7 @@ public class OrmIdMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "idMapping");
 		OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping();
-		XmlId idResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
+		XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
 		
 		assertNull(ormIdMapping.getSequenceGenerator());
 		assertNull(idResource.getSequenceGenerator());
@@ -243,7 +242,7 @@ public class OrmIdMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "idMapping");
 		OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping();
-		XmlId idResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
+		XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
 		
 		assertNull(ormIdMapping.getSequenceGenerator());
 		assertNull(idResource.getSequenceGenerator());
@@ -267,7 +266,7 @@ public class OrmIdMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "idMapping");
 		OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping();
-		XmlId idResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
+		XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
 		
 		assertNull(ormIdMapping.getTableGenerator());
 		assertNull(idResource.getTableGenerator());
@@ -290,7 +289,7 @@ public class OrmIdMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "idMapping");
 		OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping();
-		XmlId idResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
+		XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
 		
 		assertNull(ormIdMapping.getTableGenerator());
 		assertNull(idResource.getTableGenerator());
@@ -317,7 +316,7 @@ public class OrmIdMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "idMapping");
 		OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping();
-		XmlId idResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
+		XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
 		
 		assertNull(ormIdMapping.getTableGenerator());
 		assertNull(idResource.getTableGenerator());
@@ -341,7 +340,7 @@ public class OrmIdMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "idMapping");
 		OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping();
-		XmlId idResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
+		XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
 		
 		assertNull(ormIdMapping.getGeneratedValue());
 		assertNull(idResource.getGeneratedValue());
@@ -364,7 +363,7 @@ public class OrmIdMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "idMapping");
 		OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping();
-		XmlId idResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
+		XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
 		
 		assertNull(ormIdMapping.getGeneratedValue());
 		assertNull(idResource.getGeneratedValue());
@@ -391,7 +390,7 @@ public class OrmIdMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "idMapping");
 		OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping();
-		XmlId idResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
+		XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
 		
 		assertNull(ormIdMapping.getGeneratedValue());
 		assertNull(idResource.getGeneratedValue());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmJoinColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmJoinColumnTests.java
index 8beac6f5af..0c5f2375ea 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmJoinColumnTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmJoinColumnTests.java
@@ -23,6 +23,7 @@ import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 
+@SuppressWarnings("nls")
 public class OrmJoinColumnTests extends ContextModelTestCase
 {
 	public OrmJoinColumnTests(String name) {
@@ -42,7 +43,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();		
 		OrmJoinColumn joinColumn = ormJoinTable.addSpecifiedJoinColumn(0);
@@ -75,7 +76,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();		
 		OrmJoinColumn joinColumn = ormJoinTable.addSpecifiedJoinColumn(0);
@@ -100,7 +101,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();		
 		OrmJoinColumn joinColumn = ormJoinTable.addSpecifiedJoinColumn(0);
@@ -133,7 +134,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();		
 		OrmJoinColumn joinColumn = ormJoinTable.addSpecifiedJoinColumn(0);
@@ -158,7 +159,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();		
 		OrmJoinColumn joinColumn = ormJoinTable.addSpecifiedJoinColumn(0);
@@ -191,7 +192,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();		
 		OrmJoinColumn joinColumn = ormJoinTable.addSpecifiedJoinColumn(0);
@@ -216,7 +217,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();		
 		OrmJoinColumn ormJoinColumn = ormJoinTable.addSpecifiedJoinColumn(0);
@@ -249,7 +250,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();		
 		OrmJoinColumn ormJoinColumn = ormJoinTable.addSpecifiedJoinColumn(0);
@@ -274,7 +275,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();		
 		OrmJoinColumn ormJoinColumn = ormJoinTable.addSpecifiedJoinColumn(0);
@@ -307,7 +308,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();		
 		OrmJoinColumn ormJoinColumn = ormJoinTable.addSpecifiedJoinColumn(0);
@@ -332,7 +333,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();		
 		OrmJoinColumn ormJoinColumn = ormJoinTable.addSpecifiedJoinColumn(0);
@@ -365,7 +366,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();		
 		OrmJoinColumn ormJoinColumn = ormJoinTable.addSpecifiedJoinColumn(0);
@@ -390,7 +391,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();		
 		OrmJoinColumn ormJoinColumn = ormJoinTable.addSpecifiedJoinColumn(0);
@@ -423,7 +424,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();		
 		OrmJoinColumn ormJoinColumn = ormJoinTable.addSpecifiedJoinColumn(0);
@@ -448,7 +449,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();		
 		OrmJoinColumn ormJoinColumn = ormJoinTable.addSpecifiedJoinColumn(0);
@@ -481,7 +482,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();		
 		OrmJoinColumn ormJoinColumn = ormJoinTable.addSpecifiedJoinColumn(0);
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmJoinTableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmJoinTableTests.java
index b7013ebaf6..c74f017abd 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmJoinTableTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmJoinTableTests.java
@@ -101,7 +101,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 		
@@ -133,7 +133,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 		
@@ -265,7 +265,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 		
@@ -383,7 +383,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 		
@@ -405,7 +405,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 		
@@ -436,7 +436,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 		
@@ -568,7 +568,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 		
@@ -606,7 +606,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 
@@ -634,7 +634,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 
@@ -672,7 +672,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 		manyToMany.setJoinTable(OrmFactory.eINSTANCE.createXmlJoinTableImpl());
@@ -725,7 +725,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 		
@@ -763,7 +763,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 
@@ -791,7 +791,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 
@@ -829,7 +829,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 		manyToMany.setJoinTable(OrmFactory.eINSTANCE.createXmlJoinTableImpl());
@@ -883,7 +883,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 		manyToMany.setJoinTable(OrmFactory.eINSTANCE.createXmlJoinTableImpl());
@@ -911,7 +911,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 		manyToMany.setJoinTable(OrmFactory.eINSTANCE.createXmlJoinTableImpl());
@@ -934,7 +934,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 		manyToMany.setJoinTable(OrmFactory.eINSTANCE.createXmlJoinTableImpl());
@@ -956,7 +956,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 		manyToMany.setJoinTable(OrmFactory.eINSTANCE.createXmlJoinTableImpl());
@@ -978,7 +978,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 		manyToMany.setJoinTable(OrmFactory.eINSTANCE.createXmlJoinTableImpl());
@@ -1024,7 +1024,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 		manyToMany.setJoinTable(OrmFactory.eINSTANCE.createXmlJoinTableImpl());
@@ -1065,7 +1065,7 @@ public class OrmJoinTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 
 		OrmJoinTable ormJoinTable = ormManyToManyMapping.getJoinTable();
 		manyToMany.setJoinTable(OrmFactory.eINSTANCE.createXmlJoinTableImpl());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmManyToManyMappingTests.java
index d065830efe..e5c6dedc67 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmManyToManyMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmManyToManyMappingTests.java
@@ -33,6 +33,7 @@ import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 
+@SuppressWarnings("nls")
 public class OrmManyToManyMappingTests extends ContextModelTestCase
 {
 	public OrmManyToManyMappingTests(String name) {
@@ -53,7 +54,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 		
 		assertEquals("manyToManyMapping", ormManyToManyMapping.getName());
 		assertEquals("manyToManyMapping", manyToMany.getName());
@@ -73,7 +74,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 		
 		assertEquals("manyToManyMapping", ormManyToManyMapping.getName());
 		assertEquals("manyToManyMapping", manyToMany.getName());
@@ -93,7 +94,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 		
 		assertNull(ormManyToManyMapping.getSpecifiedTargetEntity());
 		assertNull(manyToMany.getTargetEntity());
@@ -113,7 +114,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 		
 		assertNull(ormManyToManyMapping.getSpecifiedTargetEntity());
 		assertNull(manyToMany.getTargetEntity());
@@ -133,7 +134,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToManyResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 		
 		assertNull(ormManyToManyMapping.getSpecifiedFetch());
 		assertNull(manyToManyResource.getFetch());
@@ -157,7 +158,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToManyResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 		
 		assertNull(ormManyToManyMapping.getSpecifiedFetch());
 		assertNull(manyToManyResource.getFetch());
@@ -181,7 +182,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 		
 		assertNull(ormManyToManyMapping.getMappedBy());
 		assertNull(manyToMany.getMappedBy());
@@ -201,7 +202,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 		
 		assertNull(ormManyToManyMapping.getMappedBy());
 		assertNull(manyToMany.getMappedBy());
@@ -221,7 +222,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 		
 		assertNull(ormManyToManyMapping.getMapKey());
 		assertNull(manyToMany.getMapKey());
@@ -251,7 +252,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 		
 		assertNull(ormManyToManyMapping.getMapKey());
 		assertNull(manyToMany.getMapKey());
@@ -271,7 +272,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 		
 		assertNull(ormManyToManyMapping.getOrderBy());
 		assertNull(manyToMany.getOrderBy());
@@ -291,7 +292,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY, "manyToManyMapping");
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		XmlManyToMany manyToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
+		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 		
 		assertNull(ormManyToManyMapping.getOrderBy());
 		assertNull(manyToMany.getOrderBy());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmManyToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmManyToOneMappingTests.java
index b2067b7780..f881430025 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmManyToOneMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmManyToOneMappingTests.java
@@ -106,7 +106,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY, "manyToOneMapping");
 		OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping();
-		XmlManyToOne manyToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
+		XmlManyToOne manyToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
 		
 		assertEquals("manyToOneMapping", ormManyToOneMapping.getName());
 		assertEquals("manyToOneMapping", manyToOne.getName());
@@ -126,7 +126,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY, "manyToOneMapping");
 		OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping();
-		XmlManyToOne manyToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
+		XmlManyToOne manyToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
 		
 		assertEquals("manyToOneMapping", ormManyToOneMapping.getName());
 		assertEquals("manyToOneMapping", manyToOne.getName());
@@ -146,7 +146,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY, "manyToOneMapping");
 		OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping();
-		XmlManyToOne manyToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
+		XmlManyToOne manyToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
 		
 		assertNull(ormManyToOneMapping.getSpecifiedTargetEntity());
 		assertNull(manyToOne.getTargetEntity());
@@ -166,7 +166,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY, "manyToOneMapping");
 		OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping();
-		XmlManyToOne manyToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
+		XmlManyToOne manyToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
 		
 		assertNull(ormManyToOneMapping.getSpecifiedTargetEntity());
 		assertNull(manyToOne.getTargetEntity());
@@ -186,7 +186,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY, "manyToOneMapping");
 		OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping();
-		XmlManyToOne manyToOneResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
+		XmlManyToOne manyToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
 		
 		assertNull(ormManyToOneMapping.getSpecifiedFetch());
 		assertNull(manyToOneResource.getFetch());
@@ -210,7 +210,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY, "manyToOneMapping");
 		OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping();
-		XmlManyToOne manyToOneResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
+		XmlManyToOne manyToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
 		
 		assertNull(ormManyToOneMapping.getSpecifiedFetch());
 		assertNull(manyToOneResource.getFetch());
@@ -234,7 +234,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY, "manyToOneMapping");
 		OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping();
-		XmlManyToOne manyToOneResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
+		XmlManyToOne manyToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
 		
 		assertNull(ormManyToOneMapping.getSpecifiedOptional());
 		assertNull(manyToOneResource.getOptional());
@@ -258,7 +258,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY, "manyToOneMapping");
 		OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping();
-		XmlManyToOne manyToOneResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
+		XmlManyToOne manyToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
 		
 		assertNull(ormManyToOneMapping.getSpecifiedOptional());
 		assertNull(manyToOneResource.getOptional());
@@ -282,7 +282,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY, "manyToOneMapping");
 		OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping();
-		XmlManyToOne manyToOneResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
+		XmlManyToOne manyToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
 		
 		OrmJoinColumn joinColumn = ormManyToOneMapping.addSpecifiedJoinColumn(0);
 		joinColumn.setSpecifiedName("FOO");
@@ -317,7 +317,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY, "manyToOneMapping");
 		OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping();
-		XmlManyToOne manyToOneResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
+		XmlManyToOne manyToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
 
 		ormManyToOneMapping.addSpecifiedJoinColumn(0).setSpecifiedName("FOO");
 		ormManyToOneMapping.addSpecifiedJoinColumn(1).setSpecifiedName("BAR");
@@ -342,7 +342,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY, "manyToOneMapping");
 		OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping();
-		XmlManyToOne manyToOneResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
+		XmlManyToOne manyToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0);
 
 		ormManyToOneMapping.addSpecifiedJoinColumn(0).setSpecifiedName("FOO");
 		ormManyToOneMapping.addSpecifiedJoinColumn(1).setSpecifiedName("BAR");
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmMappedSuperclassTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmMappedSuperclassTests.java
index decf0aa4a8..ba21405a0a 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmMappedSuperclassTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmMappedSuperclassTests.java
@@ -45,7 +45,7 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 	public void testUpdateClass() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, "model.Foo");
 		OrmMappedSuperclass ormMappedSuperclass = (OrmMappedSuperclass) ormPersistentType.getMapping();
-		XmlMappedSuperclass mappedSuperclassResource = getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass mappedSuperclassResource = getXmlEntityMappings().getMappedSuperclasses().get(0);
 		assertEquals("model.Foo", ormMappedSuperclass.getClass_());
 		assertEquals("model.Foo", mappedSuperclassResource.getClassName());
 		
@@ -63,7 +63,7 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 	public void testModifyClass() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, "model.Foo");
 		OrmMappedSuperclass ormMappedSuperclass = (OrmMappedSuperclass) ormPersistentType.getMapping();
-		XmlMappedSuperclass mappedSuperclassResource = getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass mappedSuperclassResource = getXmlEntityMappings().getMappedSuperclasses().get(0);
 		assertEquals("model.Foo", ormMappedSuperclass.getClass_());
 		assertEquals("model.Foo", mappedSuperclassResource.getClassName());
 		
@@ -81,7 +81,7 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 	
 	public void testUpdateSpecifiedAccess() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, "model.Foo");
-		XmlMappedSuperclass mappedSuperclassResource = getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass mappedSuperclassResource = getXmlEntityMappings().getMappedSuperclasses().get(0);
 		assertNull(ormPersistentType.getSpecifiedAccess());
 		assertNull(mappedSuperclassResource.getAccess());
 		
@@ -98,7 +98,7 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 	
 	public void testModifySpecifiedAccess() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, "model.Foo");
-		XmlMappedSuperclass mappedSuperclassResource = getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass mappedSuperclassResource = getXmlEntityMappings().getMappedSuperclasses().get(0);
 		assertNull(ormPersistentType.getSpecifiedAccess());
 		assertNull(mappedSuperclassResource.getAccess());
 		
@@ -121,7 +121,7 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 	public void testUpdateSpecifiedMetadataComplete() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, "model.Foo");
 		OrmMappedSuperclass ormMappedSuperclass = (OrmMappedSuperclass) ormPersistentType.getMapping();
-		XmlMappedSuperclass mappedSuperclassResource = getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass mappedSuperclassResource = getXmlEntityMappings().getMappedSuperclasses().get(0);
 		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
 		assertNull(mappedSuperclassResource.getMetadataComplete());
 		
@@ -143,7 +143,7 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 	public void testModifySpecifiedMetadataComplete() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, "model.Foo");
 		OrmMappedSuperclass ormMappedSuperclass = (OrmMappedSuperclass) ormPersistentType.getMapping();
-		XmlMappedSuperclass mappedSuperclassResource = getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
+		XmlMappedSuperclass mappedSuperclassResource = getXmlEntityMappings().getMappedSuperclasses().get(0);		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
 		assertNull(mappedSuperclassResource.getMetadataComplete());
 		
 		//set access in the context model, verify resource model modified
@@ -164,19 +164,19 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 	public void testUpdateDefaultMetadataComplete() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, "model.Foo");
 		OrmMappedSuperclass ormMappedSuperclass = (OrmMappedSuperclass) ormPersistentType.getMapping();
-		XmlMappedSuperclass mappedSuperclassResource = getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass mappedSuperclassResource = getXmlEntityMappings().getMappedSuperclasses().get(0);
 		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
 		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
 		assertFalse(ormMappedSuperclass.isDefaultMetadataComplete());
 		assertNull(mappedSuperclassResource.getMetadataComplete());
 		
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
 		assertTrue(ormMappedSuperclass.isDefaultMetadataComplete());
 		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
 		assertNull(mappedSuperclassResource.getMetadataComplete());
 		
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false);
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false);
 		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
 		assertFalse(ormMappedSuperclass.isDefaultMetadataComplete());
 		assertNull(mappedSuperclassResource.getMetadataComplete());
@@ -185,19 +185,19 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 	public void testUpdateMetadataComplete() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, "model.Foo");
 		OrmMappedSuperclass ormMappedSuperclass = (OrmMappedSuperclass) ormPersistentType.getMapping();
-		XmlMappedSuperclass mappedSuperclassResource = getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass mappedSuperclassResource = getXmlEntityMappings().getMappedSuperclasses().get(0);
 		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
 		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
 		assertFalse(ormMappedSuperclass.isMetadataComplete());
 		assertNull(mappedSuperclassResource.getMetadataComplete());
 		
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
 		assertTrue(ormMappedSuperclass.isMetadataComplete());
 		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
 		assertNull(mappedSuperclassResource.getMetadataComplete());
 		
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false);
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false);
 		assertFalse(ormMappedSuperclass.isMetadataComplete());
 		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
 		assertNull(mappedSuperclassResource.getMetadataComplete());
@@ -212,7 +212,7 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 	
 		mappedSuperclassPersistentType.setMappingKey(MappingKeys.ENTITY_TYPE_MAPPING_KEY);
 		
-		XmlEntity entity = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entity = getXmlEntityMappings().getEntities().get(0);
 		assertEquals("model.Foo", entity.getClassName());
 		assertEquals(Boolean.TRUE, entity.getMetadataComplete());
 		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY, entity.getAccess());
@@ -235,7 +235,7 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 	
 		mappedSuperclassPersistentType.setMappingKey(MappingKeys.ENTITY_TYPE_MAPPING_KEY);
 		
-		XmlEntity entity = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entity = getXmlEntityMappings().getEntities().get(0);
 		assertEquals("model.Foo", entity.getClassName());
 		assertEquals(Boolean.TRUE, entity.getMetadataComplete());
 		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY, entity.getAccess());
@@ -260,7 +260,7 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 	
 		mappedSuperclassPersistentType.setMappingKey(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY);
 		
-		XmlEmbeddable embeddable = getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable embeddable = getXmlEntityMappings().getEmbeddables().get(0);
 		assertEquals("model.Foo", embeddable.getClassName());
 		assertEquals(Boolean.TRUE, embeddable.getMetadataComplete());
 		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY, embeddable.getAccess());
@@ -280,7 +280,7 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 	
 		mappedSuperclassPersistentType.setMappingKey(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY);
 		
-		XmlEmbeddable embeddable = getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable embeddable = getXmlEntityMappings().getEmbeddables().get(0);
 		assertEquals("model.Foo", embeddable.getClassName());
 		assertEquals(Boolean.TRUE, embeddable.getMetadataComplete());
 		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY, embeddable.getAccess());
@@ -298,7 +298,7 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 	public void testUpdateIdClass() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, "model.Foo");
 		OrmMappedSuperclass ormMappedSuperclass = (OrmMappedSuperclass) ormPersistentType.getMapping();
-		XmlMappedSuperclass mappedSuperclassResource = getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
+		XmlMappedSuperclass mappedSuperclassResource = getXmlEntityMappings().getMappedSuperclasses().get(0);		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
 
 		assertNull(ormMappedSuperclass.getIdClass());
 		assertNull(mappedSuperclassResource.getIdClass());
@@ -329,7 +329,7 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 	public void testModifyIdClass() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, "model.Foo");
 		OrmMappedSuperclass ormMappedSuperclass = (OrmMappedSuperclass) ormPersistentType.getMapping();
-		XmlMappedSuperclass mappedSuperclassResource = getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
+		XmlMappedSuperclass mappedSuperclassResource = getXmlEntityMappings().getMappedSuperclasses().get(0);		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
 
 		assertNull(ormMappedSuperclass.getIdClass());
 		assertNull(mappedSuperclassResource.getIdClass());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmNamedNativeQueryTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmNamedNativeQueryTests.java
index c1f32e7e66..7715cf0398 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmNamedNativeQueryTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmNamedNativeQueryTests.java
@@ -22,6 +22,7 @@ import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 
+@SuppressWarnings("nls")
 public class OrmNamedNativeQueryTests extends ContextModelTestCase
 {
 	public OrmNamedNativeQueryTests(String name) {
@@ -43,7 +44,7 @@ public class OrmNamedNativeQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedNativeQuery ormNamedNativeQuery = ormEntity.addNamedNativeQuery(0);
 		
-		XmlNamedNativeQuery namedNativeQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
+		XmlNamedNativeQuery namedNativeQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
 		
 		assertNull(ormNamedNativeQuery.getName());
 		assertNull(namedNativeQueryResource.getName());
@@ -64,7 +65,7 @@ public class OrmNamedNativeQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedNativeQuery ormNamedNativeQuery = ormEntity.addNamedNativeQuery(0);
 		
-		XmlNamedNativeQuery namedNativeQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
+		XmlNamedNativeQuery namedNativeQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
 		
 		assertNull(ormNamedNativeQuery.getName());
 		assertNull(namedNativeQueryResource.getName());
@@ -85,7 +86,7 @@ public class OrmNamedNativeQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedNativeQuery ormNamedNativeQuery = ormEntity.addNamedNativeQuery(0);
 		
-		XmlNamedNativeQuery namedNativeQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
+		XmlNamedNativeQuery namedNativeQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
 		
 		assertNull(ormNamedNativeQuery.getQuery());
 		assertNull(namedNativeQueryResource.getQuery());
@@ -106,7 +107,7 @@ public class OrmNamedNativeQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedNativeQuery ormNamedNativeQuery = ormEntity.addNamedNativeQuery(0);
 		
-		XmlNamedNativeQuery namedNativeQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
+		XmlNamedNativeQuery namedNativeQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
 		
 		assertNull(ormNamedNativeQuery.getQuery());
 		assertNull(namedNativeQueryResource.getQuery());
@@ -127,7 +128,7 @@ public class OrmNamedNativeQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedNativeQuery ormNamedNativeQuery = ormEntity.addNamedNativeQuery(0);
 		
-		XmlNamedNativeQuery namedNativeQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
+		XmlNamedNativeQuery namedNativeQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
 
 		OrmQueryHint queryHint = ormNamedNativeQuery.addHint(0);
 		queryHint.setName("FOO");
@@ -163,7 +164,7 @@ public class OrmNamedNativeQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedNativeQuery ormNamedNativeQuery = ormEntity.addNamedNativeQuery(0);
 		
-		XmlNamedNativeQuery namedNativeQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
+		XmlNamedNativeQuery namedNativeQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
 
 		ormNamedNativeQuery.addHint(0).setName("FOO");
 		ormNamedNativeQuery.addHint(1).setName("BAR");
@@ -189,7 +190,7 @@ public class OrmNamedNativeQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedNativeQuery ormNamedNativeQuery = ormEntity.addNamedNativeQuery(0);
 		
-		XmlNamedNativeQuery namedNativeQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
+		XmlNamedNativeQuery namedNativeQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
 
 		ormNamedNativeQuery.addHint(0).setName("FOO");
 		ormNamedNativeQuery.addHint(1).setName("BAR");
@@ -225,7 +226,7 @@ public class OrmNamedNativeQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedNativeQuery ormNamedNativeQuery = ormEntity.addNamedNativeQuery(0);
 		
-		XmlNamedNativeQuery namedNativeQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
+		XmlNamedNativeQuery namedNativeQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
 
 		namedNativeQueryResource.getHints().add(OrmFactory.eINSTANCE.createXmlQueryHint());
 		namedNativeQueryResource.getHints().add(OrmFactory.eINSTANCE.createXmlQueryHint());
@@ -276,7 +277,7 @@ public class OrmNamedNativeQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedNativeQuery ormNamedNativeQuery = ormEntity.addNamedNativeQuery(0);
 		
-		XmlNamedNativeQuery namedNativeQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
+		XmlNamedNativeQuery namedNativeQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
 		
 		assertEquals(null, namedNativeQueryResource.getResultSetMapping());
 		assertEquals(null, ormNamedNativeQuery.getResultSetMapping());
@@ -297,7 +298,7 @@ public class OrmNamedNativeQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedNativeQuery ormNamedNativeQuery = ormEntity.addNamedNativeQuery(0);
 		
-		XmlNamedNativeQuery namedNativeQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
+		XmlNamedNativeQuery namedNativeQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
 		
 		assertEquals(null, namedNativeQueryResource.getResultSetMapping());
 		assertEquals(null, ormNamedNativeQuery.getResultSetMapping());
@@ -318,7 +319,7 @@ public class OrmNamedNativeQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedNativeQuery ormNamedNativeQuery = ormEntity.addNamedNativeQuery(0);
 		
-		XmlNamedNativeQuery namedNativeQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
+		XmlNamedNativeQuery namedNativeQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
 		
 		assertEquals(null, namedNativeQueryResource.getResultClass());
 		assertEquals(null, ormNamedNativeQuery.getResultClass());
@@ -339,7 +340,7 @@ public class OrmNamedNativeQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedNativeQuery ormNamedNativeQuery = ormEntity.addNamedNativeQuery(0);
 		
-		XmlNamedNativeQuery namedNativeQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
+		XmlNamedNativeQuery namedNativeQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedNativeQueries().get(0);
 		
 		assertEquals(null, namedNativeQueryResource.getResultClass());
 		assertEquals(null, ormNamedNativeQuery.getResultClass());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmNamedQueryTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmNamedQueryTests.java
index eec4b2e263..def6b911de 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmNamedQueryTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmNamedQueryTests.java
@@ -22,6 +22,7 @@ import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 
+@SuppressWarnings("nls")
 public class OrmNamedQueryTests extends ContextModelTestCase
 {
 	public OrmNamedQueryTests(String name) {
@@ -43,7 +44,7 @@ public class OrmNamedQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedQuery ormNamedQuery = ormEntity.addNamedQuery(0);
 		
-		XmlNamedQuery namedQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedQueries().get(0);
+		XmlNamedQuery namedQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedQueries().get(0);
 		
 		assertNull(ormNamedQuery.getName());
 		assertNull(namedQueryResource.getName());
@@ -64,7 +65,7 @@ public class OrmNamedQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedQuery ormNamedQuery = ormEntity.addNamedQuery(0);
 		
-		XmlNamedQuery namedQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedQueries().get(0);
+		XmlNamedQuery namedQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedQueries().get(0);
 		
 		assertNull(ormNamedQuery.getName());
 		assertNull(namedQueryResource.getName());
@@ -85,7 +86,7 @@ public class OrmNamedQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedQuery ormNamedQuery = ormEntity.addNamedQuery(0);
 		
-		XmlNamedQuery namedQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedQueries().get(0);
+		XmlNamedQuery namedQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedQueries().get(0);
 		
 		assertNull(ormNamedQuery.getQuery());
 		assertNull(namedQueryResource.getQuery());
@@ -106,7 +107,7 @@ public class OrmNamedQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedQuery ormNamedQuery = ormEntity.addNamedQuery(0);
 		
-		XmlNamedQuery namedQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedQueries().get(0);
+		XmlNamedQuery namedQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedQueries().get(0);
 		
 		assertNull(ormNamedQuery.getQuery());
 		assertNull(namedQueryResource.getQuery());
@@ -127,7 +128,7 @@ public class OrmNamedQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedQuery ormNamedQuery = ormEntity.addNamedQuery(0);
 		
-		XmlNamedQuery namedQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedQueries().get(0);
+		XmlNamedQuery namedQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedQueries().get(0);
 
 		OrmQueryHint queryHint = ormNamedQuery.addHint(0);
 		queryHint.setName("FOO");
@@ -163,7 +164,7 @@ public class OrmNamedQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedQuery ormNamedQuery = ormEntity.addNamedQuery(0);
 		
-		XmlNamedQuery namedQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedQueries().get(0);
+		XmlNamedQuery namedQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedQueries().get(0);
 
 		ormNamedQuery.addHint(0).setName("FOO");
 		ormNamedQuery.addHint(1).setName("BAR");
@@ -189,7 +190,7 @@ public class OrmNamedQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedQuery ormNamedQuery = ormEntity.addNamedQuery(0);
 		
-		XmlNamedQuery namedQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedQueries().get(0);
+		XmlNamedQuery namedQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedQueries().get(0);
 
 		ormNamedQuery.addHint(0).setName("FOO");
 		ormNamedQuery.addHint(1).setName("BAR");
@@ -225,7 +226,7 @@ public class OrmNamedQueryTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmNamedQuery ormNamedQuery = ormEntity.addNamedQuery(0);
 		
-		XmlNamedQuery namedQueryResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedQueries().get(0);
+		XmlNamedQuery namedQueryResource = getXmlEntityMappings().getEntities().get(0).getNamedQueries().get(0);
 
 		namedQueryResource.getHints().add(OrmFactory.eINSTANCE.createXmlQueryHint());
 		namedQueryResource.getHints().add(OrmFactory.eINSTANCE.createXmlQueryHint());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmOneToManyMappingTests.java
index 663b98c568..d433555f11 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmOneToManyMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmOneToManyMappingTests.java
@@ -33,6 +33,7 @@ import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 
+@SuppressWarnings("nls")
 public class OrmOneToManyMappingTests extends ContextModelTestCase
 {
 	public OrmOneToManyMappingTests(String name) {
@@ -53,7 +54,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, "oneToManyMapping");
 		OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping();
-		XmlOneToMany oneToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
+		XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
 		
 		assertEquals("oneToManyMapping", ormOneToManyMapping.getName());
 		assertEquals("oneToManyMapping", oneToMany.getName());
@@ -73,7 +74,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, "oneToManyMapping");
 		OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping();
-		XmlOneToMany oneToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
+		XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
 		
 		assertEquals("oneToManyMapping", ormOneToManyMapping.getName());
 		assertEquals("oneToManyMapping", oneToMany.getName());
@@ -93,7 +94,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, "oneToManyMapping");
 		OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping();
-		XmlOneToMany oneToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
+		XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
 		
 		assertNull(ormOneToManyMapping.getSpecifiedTargetEntity());
 		assertNull(oneToMany.getTargetEntity());
@@ -113,7 +114,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, "oneToManyMapping");
 		OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping();
-		XmlOneToMany oneToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
+		XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
 		
 		assertNull(ormOneToManyMapping.getSpecifiedTargetEntity());
 		assertNull(oneToMany.getTargetEntity());
@@ -133,7 +134,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, "oneToManyMapping");
 		OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping();
-		XmlOneToMany oneToManyResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
+		XmlOneToMany oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
 		
 		assertNull(ormOneToManyMapping.getSpecifiedFetch());
 		assertNull(oneToManyResource.getFetch());
@@ -157,7 +158,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, "oneToManyMapping");
 		OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping();
-		XmlOneToMany oneToManyResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
+		XmlOneToMany oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
 		
 		assertNull(ormOneToManyMapping.getSpecifiedFetch());
 		assertNull(oneToManyResource.getFetch());
@@ -181,7 +182,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, "oneToManyMapping");
 		OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping();
-		XmlOneToMany oneToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
+		XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
 		
 		assertNull(ormOneToManyMapping.getMappedBy());
 		assertNull(oneToMany.getMappedBy());
@@ -201,7 +202,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, "oneToManyMapping");
 		OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping();
-		XmlOneToMany oneToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
+		XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
 		
 		assertNull(ormOneToManyMapping.getMappedBy());
 		assertNull(oneToMany.getMappedBy());
@@ -222,7 +223,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, "oneToManyMapping");
 		OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping();
-		XmlOneToMany oneToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
+		XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
 		
 		assertNull(ormOneToManyMapping.getMapKey());
 		assertNull(oneToMany.getMapKey());
@@ -252,7 +253,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, "oneToManyMapping");
 		OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping();
-		XmlOneToMany oneToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
+		XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
 		
 		assertNull(ormOneToManyMapping.getMapKey());
 		assertNull(oneToMany.getMapKey());
@@ -272,7 +273,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, "oneToManyMapping");
 		OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping();
-		XmlOneToMany oneToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
+		XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
 		
 		assertNull(ormOneToManyMapping.getOrderBy());
 		assertNull(oneToMany.getOrderBy());
@@ -292,7 +293,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, "oneToManyMapping");
 		OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping();
-		XmlOneToMany oneToMany = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
+		XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
 		
 		assertNull(ormOneToManyMapping.getOrderBy());
 		assertNull(oneToMany.getOrderBy());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmOneToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmOneToOneMappingTests.java
index 2131566d93..9de9aab574 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmOneToOneMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmOneToOneMappingTests.java
@@ -118,7 +118,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		
 		assertEquals("oneToOneMapping", ormOneToOneMapping.getName());
 		assertEquals("oneToOneMapping", oneToOne.getName());
@@ -138,7 +138,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		
 		assertEquals("oneToOneMapping", ormOneToOneMapping.getName());
 		assertEquals("oneToOneMapping", oneToOne.getName());
@@ -158,7 +158,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		
 		assertNull(ormOneToOneMapping.getSpecifiedTargetEntity());
 		assertNull(oneToOne.getTargetEntity());
@@ -178,7 +178,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		
 		assertNull(ormOneToOneMapping.getSpecifiedTargetEntity());
 		assertNull(oneToOne.getTargetEntity());
@@ -198,7 +198,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOneResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		
 		assertNull(ormOneToOneMapping.getSpecifiedFetch());
 		assertNull(oneToOneResource.getFetch());
@@ -222,7 +222,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOneResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		
 		assertNull(ormOneToOneMapping.getSpecifiedFetch());
 		assertNull(oneToOneResource.getFetch());
@@ -246,7 +246,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		
 		assertNull(ormOneToOneMapping.getMappedBy());
 		assertNull(oneToOne.getMappedBy());
@@ -266,7 +266,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOne = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		
 		assertNull(ormOneToOneMapping.getMappedBy());
 		assertNull(oneToOne.getMappedBy());
@@ -287,7 +287,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOneResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		
 		assertNull(ormOneToOneMapping.getSpecifiedOptional());
 		assertNull(oneToOneResource.getOptional());
@@ -311,7 +311,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOneResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		
 		assertNull(ormOneToOneMapping.getSpecifiedOptional());
 		assertNull(oneToOneResource.getOptional());
@@ -335,7 +335,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOneResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		
 		OrmJoinColumn joinColumn = ormOneToOneMapping.addSpecifiedJoinColumn(0);
 		joinColumn.setSpecifiedName("FOO");
@@ -370,7 +370,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOneResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 
 		ormOneToOneMapping.addSpecifiedJoinColumn(0).setSpecifiedName("FOO");
 		ormOneToOneMapping.addSpecifiedJoinColumn(1).setSpecifiedName("BAR");
@@ -395,7 +395,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOneResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 
 		ormOneToOneMapping.addSpecifiedJoinColumn(0).setSpecifiedName("FOO");
 		ormOneToOneMapping.addSpecifiedJoinColumn(1).setSpecifiedName("BAR");
@@ -862,7 +862,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOneResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 		
 		OrmPrimaryKeyJoinColumn joinColumn = ormOneToOneMapping.addPrimaryKeyJoinColumn(0);
 		joinColumn.setSpecifiedName("FOO");
@@ -897,7 +897,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOneResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 
 		ormOneToOneMapping.addPrimaryKeyJoinColumn(0).setSpecifiedName("FOO");
 		ormOneToOneMapping.addPrimaryKeyJoinColumn(1).setSpecifiedName("BAR");
@@ -922,7 +922,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "oneToOneMapping");
 		OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping();
-		XmlOneToOne oneToOneResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
+		XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0);
 
 		ormOneToOneMapping.addPrimaryKeyJoinColumn(0).setSpecifiedName("FOO");
 		ormOneToOneMapping.addPrimaryKeyJoinColumn(1).setSpecifiedName("BAR");
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmPersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmPersistentTypeTests.java
index 4017d0b651..6d55b9ba0b 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmPersistentTypeTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmPersistentTypeTests.java
@@ -36,6 +36,7 @@ import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 
+@SuppressWarnings("nls")
 public class OrmPersistentTypeTests extends ContextModelTestCase
 {
 	public OrmPersistentTypeTests(String name) {
@@ -95,9 +96,9 @@ public class OrmPersistentTypeTests extends ContextModelTestCase
 	
 	public void testMorphXmlTypeMapping() throws Exception {
 		assertFalse(getEntityMappings().persistentTypes().hasNext());
-		assertTrue(getOrmXmlResource().getEntityMappings().getMappedSuperclasses().isEmpty());
-		assertTrue(getOrmXmlResource().getEntityMappings().getEntities().isEmpty());
-		assertTrue(getOrmXmlResource().getEntityMappings().getEmbeddables().isEmpty());
+		assertTrue(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
+		assertTrue(getXmlEntityMappings().getEntities().isEmpty());
+		assertTrue(getXmlEntityMappings().getEmbeddables().isEmpty());
 		
 		OrmPersistentType embeddablePersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentType entityPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo2");
@@ -108,9 +109,9 @@ public class OrmPersistentTypeTests extends ContextModelTestCase
 		assertEquals(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, ormPersistentType.getMapping().getKey());
 	
 		ormPersistentType.setMappingKey(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY);
-		assertEquals(0, getOrmXmlResource().getEntityMappings().getMappedSuperclasses().size());
-		assertEquals(1, getOrmXmlResource().getEntityMappings().getEntities().size());
-		assertEquals(2, getOrmXmlResource().getEntityMappings().getEmbeddables().size());
+		assertEquals(0, getXmlEntityMappings().getMappedSuperclasses().size());
+		assertEquals(1, getXmlEntityMappings().getEntities().size());
+		assertEquals(2, getXmlEntityMappings().getEmbeddables().size());
 		
 		Iterator<OrmPersistentType> ormPersistentTypes = getEntityMappings().persistentTypes();
 		//the same OrmPersistentTypes should still be in the context model
@@ -118,8 +119,8 @@ public class OrmPersistentTypeTests extends ContextModelTestCase
 		assertEquals(ormPersistentTypes.next(), embeddablePersistentType);
 		assertEquals(ormPersistentTypes.next(), mappedSuperclassPersistentType);
 		
-		assertEquals("model.Foo", getOrmXmlResource().getEntityMappings().getEmbeddables().get(0).getClassName());
-		assertEquals("model.Foo3", getOrmXmlResource().getEntityMappings().getEmbeddables().get(1).getClassName());
+		assertEquals("model.Foo", getXmlEntityMappings().getEmbeddables().get(0).getClassName());
+		assertEquals("model.Foo3", getXmlEntityMappings().getEmbeddables().get(1).getClassName());
 	}
 	
 	public void testAddSpecifiedPersistentAttribute() throws Exception {
@@ -127,7 +128,7 @@ public class OrmPersistentTypeTests extends ContextModelTestCase
 		
 		entityPersistentType.addSpecifiedPersistentAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicAttribute");
 	
-		XmlEntity entity = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entity = getXmlEntityMappings().getEntities().get(0);
 		XmlBasic basic = entity.getAttributes().getBasics().get(0);
 		assertEquals("basicAttribute", basic.getName());
 		
@@ -170,7 +171,7 @@ public class OrmPersistentTypeTests extends ContextModelTestCase
 		entityPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "idAttribute");
 		entityPersistentType.addSpecifiedPersistentAttribute(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY, "transientAttribute");
 	
-		XmlEntity entity = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entity = getXmlEntityMappings().getEntities().get(0);
 		assertEquals("basicAttribute",  entity.getAttributes().getBasics().get(0).getName());
 		assertEquals("embeddedAttribute",  entity.getAttributes().getEmbeddeds().get(0).getName());
 		assertEquals("versionAttribute",  entity.getAttributes().getVersions().get(0).getName());
@@ -201,7 +202,7 @@ public class OrmPersistentTypeTests extends ContextModelTestCase
 	
 	public void testRemoveId() throws Exception {
 		OrmPersistentType entityPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo2");
-		XmlEntity entity = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entity = getXmlEntityMappings().getEntities().get(0);
 		
 		entityPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "idAttribute");
 		assertEquals("idAttribute",  entity.getAttributes().getIds().get(0).getName());
@@ -212,7 +213,7 @@ public class OrmPersistentTypeTests extends ContextModelTestCase
 	
 	public void testRemoveBasic() throws Exception {
 		OrmPersistentType entityPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo2");
-		XmlEntity entity = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entity = getXmlEntityMappings().getEntities().get(0);
 		
 		entityPersistentType.addSpecifiedPersistentAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicAttribute");
 		assertEquals("basicAttribute",  entity.getAttributes().getBasics().get(0).getName());
@@ -223,7 +224,7 @@ public class OrmPersistentTypeTests extends ContextModelTestCase
 	
 	public void testRemoveVersion() throws Exception {
 		OrmPersistentType entityPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo2");
-		XmlEntity entity = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entity = getXmlEntityMappings().getEntities().get(0);
 		
 		entityPersistentType.addSpecifiedPersistentAttribute(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY, "versionAttribute");
 		assertEquals("versionAttribute",  entity.getAttributes().getVersions().get(0).getName());
@@ -234,7 +235,7 @@ public class OrmPersistentTypeTests extends ContextModelTestCase
 	
 	public void testRemoveEmbedded() throws Exception {
 		OrmPersistentType entityPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo2");
-		XmlEntity entity = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entity = getXmlEntityMappings().getEntities().get(0);
 		
 		entityPersistentType.addSpecifiedPersistentAttribute(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, "embeddedAttribute");
 		assertEquals("embeddedAttribute",  entity.getAttributes().getEmbeddeds().get(0).getName());
@@ -245,7 +246,7 @@ public class OrmPersistentTypeTests extends ContextModelTestCase
 	
 	public void testRemoveTransient() throws Exception {
 		OrmPersistentType entityPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo2");
-		XmlEntity entity = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entity = getXmlEntityMappings().getEntities().get(0);
 		
 		entityPersistentType.addSpecifiedPersistentAttribute(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY, "transientAttribute");
 		assertEquals("transientAttribute",  entity.getAttributes().getTransients().get(0).getName());
@@ -256,7 +257,7 @@ public class OrmPersistentTypeTests extends ContextModelTestCase
 
 	public void testUpdateSpecifiedPersistentAttributes() throws Exception {
 		OrmPersistentType entityPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo2");
-		XmlEntity entity = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entity = getXmlEntityMappings().getEntities().get(0);
 
 		entity.setAttributes(OrmFactory.eINSTANCE.createAttributes());
 		XmlBasicImpl basic = OrmFactory.eINSTANCE.createXmlBasicImpl();
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmPrimaryKeyJoinColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmPrimaryKeyJoinColumnTests.java
index 3779b340b2..c7eb81970f 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmPrimaryKeyJoinColumnTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmPrimaryKeyJoinColumnTests.java
@@ -25,6 +25,7 @@ import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 import org.eclipse.jpt.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class OrmPrimaryKeyJoinColumnTests extends ContextModelTestCase
 {
 	public OrmPrimaryKeyJoinColumnTests(String name) {
@@ -80,7 +81,7 @@ public class OrmPrimaryKeyJoinColumnTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmPrimaryKeyJoinColumn ormPrimaryKeyJoinColumn = ormEntity.addSpecifiedPrimaryKeyJoinColumn(0);
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlPrimaryKeyJoinColumn primaryKeyJoinColumnResource = entityResource.getPrimaryKeyJoinColumns().get(0);
 		
 		assertNull(ormPrimaryKeyJoinColumn.getSpecifiedName());
@@ -110,7 +111,7 @@ public class OrmPrimaryKeyJoinColumnTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmPrimaryKeyJoinColumn ormPrimaryKeyJoinColumn = ormEntity.addSpecifiedPrimaryKeyJoinColumn(0);
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlPrimaryKeyJoinColumn primaryKeyJoinColumnResource = entityResource.getPrimaryKeyJoinColumns().get(0);
 
 		assertNull(ormPrimaryKeyJoinColumn.getSpecifiedName());
@@ -132,7 +133,7 @@ public class OrmPrimaryKeyJoinColumnTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmPrimaryKeyJoinColumn ormPrimaryKeyJoinColumn = ormEntity.addSpecifiedPrimaryKeyJoinColumn(0);
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlPrimaryKeyJoinColumn primaryKeyJoinColumnResource = entityResource.getPrimaryKeyJoinColumns().get(0);
 		
 		assertNull(ormPrimaryKeyJoinColumn.getSpecifiedReferencedColumnName());
@@ -162,7 +163,7 @@ public class OrmPrimaryKeyJoinColumnTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmPrimaryKeyJoinColumn ormPrimaryKeyJoinColumn = ormEntity.addSpecifiedPrimaryKeyJoinColumn(0);
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlPrimaryKeyJoinColumn primaryKeyJoinColumnResource = entityResource.getPrimaryKeyJoinColumns().get(0);
 
 		assertNull(ormPrimaryKeyJoinColumn.getSpecifiedReferencedColumnName());
@@ -241,7 +242,7 @@ public class OrmPrimaryKeyJoinColumnTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmPrimaryKeyJoinColumn ormPrimaryKeyJoinColumn = ormEntity.addSpecifiedPrimaryKeyJoinColumn(0);
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlPrimaryKeyJoinColumn primaryKeyJoinColumnResource = entityResource.getPrimaryKeyJoinColumns().get(0);
 		
 		assertNull(ormPrimaryKeyJoinColumn.getColumnDefinition());
@@ -271,7 +272,7 @@ public class OrmPrimaryKeyJoinColumnTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmPrimaryKeyJoinColumn ormPrimaryKeyJoinColumn = ormEntity.addSpecifiedPrimaryKeyJoinColumn(0);
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlPrimaryKeyJoinColumn primaryKeyJoinColumnResource = entityResource.getPrimaryKeyJoinColumns().get(0);
 
 		assertNull(ormPrimaryKeyJoinColumn.getColumnDefinition());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmQueryHintTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmQueryHintTests.java
index 636ee7899f..de776a32a1 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmQueryHintTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmQueryHintTests.java
@@ -19,6 +19,7 @@ import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 
+@SuppressWarnings("nls")
 public class OrmQueryHintTests extends ContextModelTestCase
 {
 	public OrmQueryHintTests(String name) {
@@ -40,7 +41,7 @@ public class OrmQueryHintTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmQueryHint ormQueryHint = ormEntity.addNamedQuery(0).addHint(0);
 		
-		XmlQueryHint queryHintResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedQueries().get(0).getHints().get(0);
+		XmlQueryHint queryHintResource = getXmlEntityMappings().getEntities().get(0).getNamedQueries().get(0).getHints().get(0);
 		
 		assertNull(ormQueryHint.getName());
 		assertNull(queryHintResource.getName());
@@ -61,7 +62,7 @@ public class OrmQueryHintTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmQueryHint ormQueryHint = ormEntity.addNamedQuery(0).addHint(0);
 		
-		XmlQueryHint queryHintResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedQueries().get(0).getHints().get(0);
+		XmlQueryHint queryHintResource = getXmlEntityMappings().getEntities().get(0).getNamedQueries().get(0).getHints().get(0);
 		
 		assertNull(ormQueryHint.getName());
 		assertNull(queryHintResource.getName());
@@ -82,7 +83,7 @@ public class OrmQueryHintTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmQueryHint ormQueryHint = ormEntity.addNamedQuery(0).addHint(0);
 		
-		XmlQueryHint queryHintResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedQueries().get(0).getHints().get(0);
+		XmlQueryHint queryHintResource = getXmlEntityMappings().getEntities().get(0).getNamedQueries().get(0).getHints().get(0);
 		
 		assertNull(ormQueryHint.getValue());
 		assertNull(queryHintResource.getValue());
@@ -103,7 +104,7 @@ public class OrmQueryHintTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmQueryHint ormQueryHint = ormEntity.addNamedQuery(0).addHint(0);
 		
-		XmlQueryHint queryHintResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getNamedQueries().get(0).getHints().get(0);
+		XmlQueryHint queryHintResource = getXmlEntityMappings().getEntities().get(0).getNamedQueries().get(0).getHints().get(0);
 		
 		assertNull(ormQueryHint.getValue());
 		assertNull(queryHintResource.getValue());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmSecondaryTableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmSecondaryTableTests.java
index 84d7798676..82135c3ba0 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmSecondaryTableTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmSecondaryTableTests.java
@@ -34,6 +34,7 @@ import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 import org.eclipse.jpt.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class OrmSecondaryTableTests extends ContextModelTestCase
 {
 	public OrmSecondaryTableTests(String name) {
@@ -87,7 +88,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 	public void testUpdateSpecifiedName() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 				
 		//set name in the resource model, verify context model updated
 		entityResource.getSecondaryTables().add(OrmFactory.eINSTANCE.createXmlSecondaryTableImpl());
@@ -109,7 +110,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 	public void testModifySpecifiedName() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		
 		//set name in the context model, verify resource model modified
 		OrmSecondaryTable secondaryTable = ormEntity.addSpecifiedSecondaryTable(0);
@@ -151,7 +152,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 	public void testUpdateSpecifiedSchema() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 				
 		//set schema in the resource model, verify context model updated
 		entityResource.getSecondaryTables().add(OrmFactory.eINSTANCE.createXmlSecondaryTableImpl());
@@ -173,7 +174,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 	public void testModifySpecifiedSchema() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		
 		//set schema in the context model, verify resource model modified
 		OrmSecondaryTable secondaryTable = ormEntity.addSpecifiedSecondaryTable(0);
@@ -266,7 +267,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 	public void testUpdateSpecifiedCatalog() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 				
 		//set catalog in the resource model, verify context model updated
 		entityResource.getSecondaryTables().add(OrmFactory.eINSTANCE.createXmlSecondaryTableImpl());
@@ -288,7 +289,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 	public void testModifySpecifiedCatalog() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		
 		//set catalog in the context model, verify resource model modified
 		OrmSecondaryTable secondaryTable = ormEntity.addSpecifiedSecondaryTable(0);
@@ -360,7 +361,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 		OrmSecondaryTable ormSecondaryTable = ormEntity.addSpecifiedSecondaryTable(0);
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlSecondaryTable secondaryTableResource = entityResource.getSecondaryTables().get(0);
 		
 		OrmPrimaryKeyJoinColumn primaryKeyJoinColumn = ormSecondaryTable.addSpecifiedPrimaryKeyJoinColumn(0);
@@ -396,7 +397,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 		OrmSecondaryTable ormSecondaryTable = ormEntity.addSpecifiedSecondaryTable(0);
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlSecondaryTable secondaryTableResource = entityResource.getSecondaryTables().get(0);
 
 		ormSecondaryTable.addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("FOO");
@@ -422,7 +423,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 		OrmSecondaryTable ormSecondaryTable = ormEntity.addSpecifiedSecondaryTable(0);
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlSecondaryTable secondaryTableResource = entityResource.getSecondaryTables().get(0);
 
 		ormSecondaryTable.addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("FOO");
@@ -458,7 +459,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 		OrmSecondaryTable ormSecondaryTable = ormEntity.addSpecifiedSecondaryTable(0);
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlSecondaryTable secondaryTableResource = entityResource.getSecondaryTables().get(0);
 		
 		secondaryTableResource.getPrimaryKeyJoinColumns().add(OrmFactory.eINSTANCE.createXmlPrimaryKeyJoinColumnImpl());
@@ -509,7 +510,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 		OrmSecondaryTable ormSecondaryTable = ormEntity.addSpecifiedSecondaryTable(0);
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlSecondaryTable secondaryTableResource = entityResource.getSecondaryTables().get(0);
 		
 		ListIterator<OrmUniqueConstraint> uniqueConstraints = ormSecondaryTable.uniqueConstraints();
@@ -534,7 +535,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 		OrmSecondaryTable ormSecondaryTable = ormEntity.addSpecifiedSecondaryTable(0);
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlSecondaryTable secondaryTableResource = entityResource.getSecondaryTables().get(0);
 		
 		assertEquals(0,  ormSecondaryTable.uniqueConstraintsSize());
@@ -554,7 +555,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 		OrmSecondaryTable ormSecondaryTable = ormEntity.addSpecifiedSecondaryTable(0);
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlSecondaryTable secondaryTableResource = entityResource.getSecondaryTables().get(0);
 		
 		ormSecondaryTable.addUniqueConstraint(0).addColumnName(0, "FOO");
@@ -573,7 +574,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 		OrmSecondaryTable ormSecondaryTable = ormEntity.addSpecifiedSecondaryTable(0);
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlSecondaryTable secondaryTableResource = entityResource.getSecondaryTables().get(0);
 		
 		ormSecondaryTable.addUniqueConstraint(0).addColumnName(0, "FOO");
@@ -592,7 +593,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 		OrmSecondaryTable ormSecondaryTable = ormEntity.addSpecifiedSecondaryTable(0);
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlSecondaryTable secondaryTableResource = entityResource.getSecondaryTables().get(0);
 		
 		ormSecondaryTable.addUniqueConstraint(0).addColumnName(0, "FOO");
@@ -635,7 +636,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 		OrmSecondaryTable ormSecondaryTable = ormEntity.addSpecifiedSecondaryTable(0);
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlSecondaryTable secondaryTableResource = entityResource.getSecondaryTables().get(0);
 		
 		ormSecondaryTable.addUniqueConstraint(0).addColumnName(0, "FOO");
@@ -673,7 +674,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 		OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmEntity ormEntity = (OrmEntity) persistentType.getMapping();
 		OrmSecondaryTable ormSecondaryTable = ormEntity.addSpecifiedSecondaryTable(0);
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlSecondaryTable secondaryTableResource = entityResource.getSecondaryTables().get(0);
 	
 		XmlUniqueConstraint uniqueConstraintResource = OrmFactory.eINSTANCE.createXmlUniqueConstraintImpl();
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmSequenceGeneratorTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmSequenceGeneratorTests.java
index 37767a3207..0da65394c6 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmSequenceGeneratorTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmSequenceGeneratorTests.java
@@ -21,6 +21,7 @@ import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 import org.eclipse.jpt.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class OrmSequenceGeneratorTests extends ContextModelTestCase
 {
 	public OrmSequenceGeneratorTests(String name) {
@@ -73,7 +74,7 @@ public class OrmSequenceGeneratorTests extends ContextModelTestCase
 	
 	public void testUpdateSpecifiedName() throws Exception {
 		SequenceGenerator sequenceGenerator = getEntityMappings().addSequenceGenerator(0);		
-		XmlSequenceGenerator sequenceGeneratorResource = getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(0);
+		XmlSequenceGenerator sequenceGeneratorResource = getXmlEntityMappings().getSequenceGenerators().get(0);
 		
 		//set name in the resource model, verify context model updated
 		sequenceGeneratorResource.setName("FOO");
@@ -88,7 +89,7 @@ public class OrmSequenceGeneratorTests extends ContextModelTestCase
 	
 	public void testModifySpecifiedName() throws Exception {
 		SequenceGenerator sequenceGenerator = getEntityMappings().addSequenceGenerator(0);		
-		XmlSequenceGenerator sequenceGeneratorResource = getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(0);
+		XmlSequenceGenerator sequenceGeneratorResource = getXmlEntityMappings().getSequenceGenerators().get(0);
 		
 		//set name in the context model, verify resource model modified
 		sequenceGenerator.setName("FOO");
@@ -103,7 +104,7 @@ public class OrmSequenceGeneratorTests extends ContextModelTestCase
 	
 	public void testUpdateSpecifiedSequenceName() throws Exception {
 		SequenceGenerator sequenceGenerator = getEntityMappings().addSequenceGenerator(0);		
-		XmlSequenceGenerator sequenceGeneratorResource = getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(0);
+		XmlSequenceGenerator sequenceGeneratorResource = getXmlEntityMappings().getSequenceGenerators().get(0);
 		
 		//set name in the resource model, verify context model updated
 		sequenceGeneratorResource.setSequenceName("FOO");
@@ -118,7 +119,7 @@ public class OrmSequenceGeneratorTests extends ContextModelTestCase
 	
 	public void testModifySpecifiedSequenceName() throws Exception {
 		SequenceGenerator sequenceGenerator = getEntityMappings().addSequenceGenerator(0);		
-		XmlSequenceGenerator sequenceGeneratorResource = getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(0);
+		XmlSequenceGenerator sequenceGeneratorResource = getXmlEntityMappings().getSequenceGenerators().get(0);
 		
 		//set name in the context model, verify resource model modified
 		sequenceGenerator.setSpecifiedSequenceName("FOO");
@@ -133,7 +134,7 @@ public class OrmSequenceGeneratorTests extends ContextModelTestCase
 
 	public void testUpdateSpecifiedInitialValue() throws Exception {
 		SequenceGenerator sequenceGenerator = getEntityMappings().addSequenceGenerator(0);		
-		XmlSequenceGenerator sequenceGeneratorResource = getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(0);
+		XmlSequenceGenerator sequenceGeneratorResource = getXmlEntityMappings().getSequenceGenerators().get(0);
 		
 		//set initial value in the resource model, verify context model updated
 		sequenceGeneratorResource.setInitialValue(Integer.valueOf(10));
@@ -153,7 +154,7 @@ public class OrmSequenceGeneratorTests extends ContextModelTestCase
 	
 	public void testModifySpecifiedInitialValue() throws Exception {
 		SequenceGenerator sequenceGenerator = getEntityMappings().addSequenceGenerator(0);		
-		XmlSequenceGenerator sequenceGeneratorResource = getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(0);
+		XmlSequenceGenerator sequenceGeneratorResource = getXmlEntityMappings().getSequenceGenerators().get(0);
 		
 		//set initial value in the context model, verify resource model modified
 		sequenceGenerator.setSpecifiedInitialValue(Integer.valueOf(10));
@@ -172,7 +173,7 @@ public class OrmSequenceGeneratorTests extends ContextModelTestCase
 	
 	public void testUpdateSpecifiedAllocationSize() throws Exception {
 		SequenceGenerator sequenceGenerator = getEntityMappings().addSequenceGenerator(0);		
-		XmlSequenceGenerator sequenceGeneratorResource = getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(0);
+		XmlSequenceGenerator sequenceGeneratorResource = getXmlEntityMappings().getSequenceGenerators().get(0);
 		
 		//set allocation size in the resource model, verify context model updated
 		sequenceGeneratorResource.setAllocationSize(Integer.valueOf(10));
@@ -192,7 +193,7 @@ public class OrmSequenceGeneratorTests extends ContextModelTestCase
 	
 	public void testModifySpecifiedAllocationSize() throws Exception {
 		SequenceGenerator sequenceGenerator = getEntityMappings().addSequenceGenerator(0);		
-		XmlSequenceGenerator sequenceGeneratorResource = getOrmXmlResource().getEntityMappings().getSequenceGenerators().get(0);
+		XmlSequenceGenerator sequenceGeneratorResource = getXmlEntityMappings().getSequenceGenerators().get(0);
 		
 		//set allocation size in the context model, verify resource model modified
 		sequenceGenerator.setSpecifiedAllocationSize(Integer.valueOf(10));
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTableGeneratorTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTableGeneratorTests.java
index 6bb8efec1e..2c58435968 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTableGeneratorTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTableGeneratorTests.java
@@ -32,6 +32,7 @@ import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 import org.eclipse.jpt.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class OrmTableGeneratorTests extends ContextModelTestCase
 {
 	public OrmTableGeneratorTests(String name) {
@@ -84,7 +85,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testUpdateSpecifiedName() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		//set name in the resource model, verify context model updated
 		tableGeneratorResource.setName("FOO");
@@ -99,7 +100,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testModifySpecifiedName() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		//set name in the context model, verify resource model modified
 		tableGenerator.setName("FOO");
@@ -114,7 +115,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 
 	public void testUpdateSpecifiedInitialValue() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		//set initial value in the resource model, verify context model updated
 		tableGeneratorResource.setInitialValue(Integer.valueOf(10));
@@ -134,7 +135,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testModifySpecifiedInitialValue() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		//set initial value in the context model, verify resource model modified
 		tableGenerator.setSpecifiedInitialValue(Integer.valueOf(10));
@@ -153,7 +154,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testUpdateSpecifiedAllocationSize() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		//set allocation size in the resource model, verify context model updated
 		tableGeneratorResource.setAllocationSize(Integer.valueOf(10));
@@ -173,7 +174,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testModifySpecifiedAllocationSize() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		//set allocation size in the context model, verify resource model modified
 		tableGenerator.setSpecifiedAllocationSize(Integer.valueOf(10));
@@ -192,7 +193,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testUpdateSpecifiedTable() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		//set name in the resource model, verify context model updated
 		tableGeneratorResource.setTable("FOO");
@@ -207,7 +208,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testModifySpecifiedTable() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		//set name in the context model, verify resource model modified
 		tableGenerator.setSpecifiedTable("FOO");
@@ -222,7 +223,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 
 	public void testUpdateSpecifiedSchema() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		//set name in the resource model, verify context model updated
 		tableGeneratorResource.setSchema("FOO");
@@ -237,7 +238,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testModifySpecifiedSchema() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		//set name in the context model, verify resource model modified
 		tableGenerator.setSpecifiedSchema("FOO");
@@ -264,7 +265,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 
 	public void testUpdateSpecifiedCatalog() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		//set name in the resource model, verify context model updated
 		tableGeneratorResource.setCatalog("FOO");
@@ -279,7 +280,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testModifySpecifiedCatalog() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		//set name in the context model, verify resource model modified
 		tableGenerator.setSpecifiedCatalog("FOO");
@@ -294,7 +295,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testUpdateSpecifiedPkColumnName() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		//set name in the resource model, verify context model updated
 		tableGeneratorResource.setPkColumnName("FOO");
@@ -309,7 +310,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testModifySpecifiedPkColumnName() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		//set name in the context model, verify resource model modified
 		tableGenerator.setSpecifiedPkColumnName("FOO");
@@ -324,7 +325,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testUpdateSpecifiedValueColumnName() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		//set name in the resource model, verify context model updated
 		tableGeneratorResource.setValueColumnName("FOO");
@@ -339,7 +340,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testModifySpecifiedValueColumnName() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		//set name in the context model, verify resource model modified
 		tableGenerator.setSpecifiedValueColumnName("FOO");
@@ -354,7 +355,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testUpdateSpecifiedPkColumnValue() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		//set name in the resource model, verify context model updated
 		tableGeneratorResource.setPkColumnValue("FOO");
@@ -369,7 +370,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testModifySpecifiedPkColumnValue() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		//set name in the context model, verify resource model modified
 		tableGenerator.setSpecifiedPkColumnValue("FOO");
@@ -385,7 +386,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 
 	public void testUniqueConstraints() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		ListIterator<OrmUniqueConstraint> uniqueConstraints = tableGenerator.uniqueConstraints();
 		assertFalse(uniqueConstraints.hasNext());
@@ -407,7 +408,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testUniqueConstraintsSize() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		assertEquals(0,  tableGenerator.uniqueConstraintsSize());
 		
@@ -424,7 +425,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 
 	public void testAddUniqueConstraint() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		tableGenerator.addUniqueConstraint(0).addColumnName(0, "FOO");
 		tableGenerator.addUniqueConstraint(0).addColumnName(0, "BAR");
@@ -440,7 +441,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testAddUniqueConstraint2() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 		
 		tableGenerator.addUniqueConstraint(0).addColumnName(0, "FOO");
 		tableGenerator.addUniqueConstraint(1).addColumnName(0, "BAR");
@@ -456,7 +457,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testRemoveUniqueConstraint() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 
 		tableGenerator.addUniqueConstraint(0).addColumnName(0, "FOO");
 		tableGenerator.addUniqueConstraint(1).addColumnName(0, "BAR");
@@ -496,7 +497,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testMoveUniqueConstraint() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 
 		tableGenerator.addUniqueConstraint(0).addColumnName(0, "FOO");
 		tableGenerator.addUniqueConstraint(1).addColumnName(0, "BAR");
@@ -531,7 +532,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 	
 	public void testUpdateUniqueConstraints() throws Exception {
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);		
-		XmlTableGenerator tableGeneratorResource = getOrmXmlResource().getEntityMappings().getTableGenerators().get(0);
+		XmlTableGenerator tableGeneratorResource = getXmlEntityMappings().getTableGenerators().get(0);
 	
 		XmlUniqueConstraint uniqueConstraintResource = OrmFactory.eINSTANCE.createXmlUniqueConstraintImpl();
 		tableGeneratorResource.getUniqueConstraints().add(0, uniqueConstraintResource);
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTableTests.java
index db83022c80..80cc35d2f4 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTableTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTableTests.java
@@ -30,6 +30,7 @@ import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 import org.eclipse.jpt.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class OrmTableTests extends ContextModelTestCase
 {
 	public OrmTableTests(String name) {
@@ -84,7 +85,7 @@ public class OrmTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmTable ormTable = ormEntity.getTable();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertNull(ormTable.getSpecifiedName());
 		assertNull(entityResource.getTable());
 		
@@ -111,7 +112,7 @@ public class OrmTableTests extends ContextModelTestCase
 	public void testModifySpecifiedName() throws Exception {
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmTable ormTable = ((OrmEntity) ormPersistentType.getMapping()).getTable();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertNull(ormTable.getSpecifiedName());
 		assertNull(entityResource.getTable());
 		
@@ -205,7 +206,7 @@ public class OrmTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmTable ormTable = ormEntity.getTable();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertNull(ormTable.getSpecifiedSchema());
 		assertNull(entityResource.getTable());
 		
@@ -320,7 +321,7 @@ public class OrmTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmTable ormTable = ormEntity.getTable();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertNull(ormTable.getSpecifiedSchema());
 		assertNull(entityResource.getTable());
 		
@@ -339,7 +340,7 @@ public class OrmTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmTable ormTable = ormEntity.getTable();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertNull(ormTable.getSpecifiedCatalog());
 		assertNull(entityResource.getTable());
 		
@@ -367,7 +368,7 @@ public class OrmTableTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.foo");
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		OrmTable ormTable = ormEntity.getTable();
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertNull(ormTable.getSpecifiedCatalog());
 		assertNull(entityResource.getTable());
 		
@@ -500,7 +501,7 @@ public class OrmTableTests extends ContextModelTestCase
 		ListIterator<OrmUniqueConstraint> uniqueConstraints = ormEntity.getTable().uniqueConstraints();
 		assertFalse(uniqueConstraints.hasNext());
 
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlTable tableResource = OrmFactory.eINSTANCE.createXmlTable();
 		entityResource.setTable(tableResource);
 		
@@ -527,7 +528,7 @@ public class OrmTableTests extends ContextModelTestCase
 		
 		assertEquals(0,  ormEntity.getTable().uniqueConstraintsSize());
 
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlTable tableResource = OrmFactory.eINSTANCE.createXmlTable();
 		entityResource.setTable(tableResource);
 		
@@ -553,7 +554,7 @@ public class OrmTableTests extends ContextModelTestCase
 		table.addUniqueConstraint(0).addColumnName(0, "BAR");
 		table.addUniqueConstraint(0).addColumnName(0, "BAZ");
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlTable tableResource = entityResource.getTable();
 		
 		ListIterator<XmlUniqueConstraint> uniqueConstraints = tableResource.getUniqueConstraints().listIterator();
@@ -575,7 +576,7 @@ public class OrmTableTests extends ContextModelTestCase
 		table.addUniqueConstraint(1).addColumnName(0, "BAR");
 		table.addUniqueConstraint(0).addColumnName(0, "BAZ");
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlTable tableResource = entityResource.getTable();
 		
 		ListIterator<XmlUniqueConstraint> uniqueConstraints = tableResource.getUniqueConstraints().listIterator();
@@ -597,7 +598,7 @@ public class OrmTableTests extends ContextModelTestCase
 		table.addUniqueConstraint(1).addColumnName(0, "BAR");
 		table.addUniqueConstraint(2).addColumnName(0, "BAZ");
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlTable tableResource = entityResource.getTable();
 		
 		assertEquals(3, tableResource.getUniqueConstraints().size());
@@ -643,7 +644,7 @@ public class OrmTableTests extends ContextModelTestCase
 		table.addUniqueConstraint(1).addColumnName(0, "BAR");
 		table.addUniqueConstraint(2).addColumnName(0, "BAZ");
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlTable tableResource = entityResource.getTable();
 		
 		assertEquals(3, tableResource.getUniqueConstraints().size());
@@ -681,7 +682,7 @@ public class OrmTableTests extends ContextModelTestCase
 		
 		OrmTable table = ormEntity.getTable();
 		
-		XmlEntity entityResource = getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		XmlTable tableResource = OrmFactory.eINSTANCE.createXmlTable();
 		entityResource.setTable(tableResource);
 	
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTransientMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTransientMappingTests.java
index d34bd9a999..60946a9c1d 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTransientMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTransientMappingTests.java
@@ -32,6 +32,7 @@ import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class OrmTransientMappingTests extends ContextModelTestCase
 {
 	public OrmTransientMappingTests(String name) {
@@ -68,7 +69,7 @@ public class OrmTransientMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY, "transientMapping");
 		OrmTransientMapping xmlTransientnMapping = (OrmTransientMapping) ormPersistentAttribute.getMapping();
-		XmlTransient transientResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getTransients().get(0);
+		XmlTransient transientResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getTransients().get(0);
 		
 		assertEquals("transientMapping", xmlTransientnMapping.getName());
 		assertEquals("transientMapping", transientResource.getName());
@@ -88,7 +89,7 @@ public class OrmTransientMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY, "transientMapping");
 		OrmTransientMapping xmlTransientnMapping = (OrmTransientMapping) ormPersistentAttribute.getMapping();
-		XmlTransient transientResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getTransients().get(0);
+		XmlTransient transientResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getTransients().get(0);
 		
 		assertEquals("transientMapping", xmlTransientnMapping.getName());
 		assertEquals("transientMapping", transientResource.getName());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmVersionMappingTests.java
index 6a9d7f1864..61829a4231 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmVersionMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmVersionMappingTests.java
@@ -79,7 +79,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY, "versionMapping");
 		OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping();
-		XmlVersion versionResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0);
+		XmlVersion versionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0);
 		
 		assertEquals("versionMapping", ormVersionMapping.getName());
 		assertEquals("versionMapping", versionResource.getName());
@@ -99,7 +99,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY, "versionMapping");
 		OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping();
-		XmlVersion versionResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0);
+		XmlVersion versionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0);
 		
 		assertEquals("versionMapping", ormVersionMapping.getName());
 		assertEquals("versionMapping", versionResource.getName());
@@ -119,7 +119,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY, "versionMapping");
 		OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping();
-		XmlVersion versionResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0);
+		XmlVersion versionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0);
 		
 		assertNull(ormVersionMapping.getSpecifiedConverter());
 		assertNull(versionResource.getTemporal());
@@ -147,7 +147,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY, "versionMapping");
 		OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping();
-		XmlVersion versionResource = getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0);
+		XmlVersion versionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0);
 		
 		assertNull(ormVersionMapping.getSpecifiedConverter());
 		assertNull(versionResource.getTemporal());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmXmlTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmXmlTests.java
index 36d6ccb092..9e03f6e194 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmXmlTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmXmlTests.java
@@ -11,13 +11,13 @@ package org.eclipse.jpt.core.tests.internal.context.orm;
 
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.context.orm.OrmXml;
-import org.eclipse.jpt.core.context.persistence.PersistenceXml;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
 import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 
+@SuppressWarnings("nls")
 public class OrmXmlTests extends ContextModelTestCase
 {
 	public OrmXmlTests(String name) {
@@ -34,34 +34,33 @@ public class OrmXmlTests extends ContextModelTestCase
 		getPersistenceXmlResource().save(null);
 	}
 	
-	protected PersistenceXml persistenceXml() {
-		return getRootContextNode().getPersistenceXml();
-	}
-	
-	protected OrmXml ormXml() {
+	protected OrmXml getOrmXml() {
 		return (OrmXml) getPersistenceUnit().mappingFileRefs().next().getMappingFile();
 	}
 	
 	public void testUpdateAddEntityMappings() throws Exception {
-		OrmXmlResource ormResource = getOrmXmlResource();
+		assertEquals(2, getJpaProject().jpaFilesSize());
+		JpaXmlResource ormResource = getOrmXmlResource();
 		ormResource.getContents().clear();
 		ormResource.save(null);
 		
-		// removing root node now results in reducing content type to simple xml
-		assertNull(ormXml());
+		//the ContentType of the orm.xml file is no longer orm, so the jpa file is removed
+		assertNull(getOrmXml());
+		assertEquals(1, getJpaProject().jpaFilesSize()); //should only be the persistence.xml file
 		
 		ormResource.getContents().add(OrmFactory.eINSTANCE.createXmlEntityMappings());
 		ormResource.save(null);
 		
-		assertNotNull(ormXml().getRoot());
+		assertNotNull(getOrmXml().getEntityMappings());
+		assertEquals(2, getJpaProject().jpaFilesSize());
 	}
 	
 	public void testModifyAddEntityMappings() {
-		OrmXmlResource ormResource = getOrmXmlResource();
-		ormResource.getContents().remove(ormResource.getEntityMappings());
-		assertNull(ormResource.getEntityMappings());
+		JpaXmlResource ormResource = getOrmXmlResource();
+		ormResource.getContents().remove(getXmlEntityMappings());
+		assertNull(getXmlEntityMappings());
 		
-		OrmXml ormXml = ormXml();
+		OrmXml ormXml = getOrmXml();
 		assertNull(ormXml.getRoot());
 		
 		ormXml.addEntityMappings();
@@ -80,17 +79,17 @@ public class OrmXmlTests extends ContextModelTestCase
 	}
 	
 	public void testUpdateRemoveEntityMappings() throws Exception {
-		OrmXmlResource ormResource = getOrmXmlResource();
+		JpaXmlResource ormResource = getOrmXmlResource();
 		
-		assertNotNull(ormXml().getRoot());
+		assertNotNull(getOrmXml().getRoot());
 		
 		ormResource.getContents().clear();
 		
-		assertNull(ormXml().getRoot());
+		assertNull(getOrmXml().getRoot());
 	}
 	
 	public void testModifyRemoveEntityMappings() {
-		OrmXml ormXml = ormXml();
+		OrmXml ormXml = getOrmXml();
 		
 		assertNotNull(ormXml.getRoot());
 		
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/PersistenceUnitDefaultsTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/PersistenceUnitDefaultsTests.java
index eafcb20895..f52088689b 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/PersistenceUnitDefaultsTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/PersistenceUnitDefaultsTests.java
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 
+@SuppressWarnings("nls")
 public class PersistenceUnitDefaultsTests extends ContextModelTestCase
 {
 	public PersistenceUnitDefaultsTests(String name) {
@@ -41,10 +42,10 @@ public class PersistenceUnitDefaultsTests extends ContextModelTestCase
 	public void testIsAllFeaturesUnset() throws Exception {
 		OrmPersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
 		assertNull(persistenceUnitDefaults.getAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		
 		XmlPersistenceUnitMetadata persistenceUnitMetadata = OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata();
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(persistenceUnitMetadata);
+		getXmlEntityMappings().setPersistenceUnitMetadata(persistenceUnitMetadata);
 		assertTrue(persistenceUnitMetadata.isAllFeaturesUnset());
 		
 		org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults persistenceUnitDefaultsResource = OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults();
@@ -83,286 +84,286 @@ public class PersistenceUnitDefaultsTests extends ContextModelTestCase
 	public void testUpdateSchema() throws Exception {
 		OrmPersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
 		assertNull(persistenceUnitDefaults.getSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		
 		//set schema in the resource model, verify context model updated
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setPersistenceUnitDefaults(OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSchema("MY_SCHEMA");
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().getPersistenceUnitMetadata().setPersistenceUnitDefaults(OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults());
+		getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSchema("MY_SCHEMA");
 		assertEquals("MY_SCHEMA", persistenceUnitDefaults.getSchema());
-		assertEquals("MY_SCHEMA", getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getSchema());
+		assertEquals("MY_SCHEMA", getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getSchema());
 	
 		//set schema to null in the resource model
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSchema(null);
+		getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSchema(null);
 		assertNull(persistenceUnitDefaults.getSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getSchema());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getSchema());
 	}
 	
 	public void testModifySchema() throws Exception {		
 		OrmPersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
 		assertNull(persistenceUnitDefaults.getSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		
 		//set schema in the context model, verify resource model modified
 		persistenceUnitDefaults.setSpecifiedSchema("MY_SCHEMA");
 		assertEquals("MY_SCHEMA", persistenceUnitDefaults.getSchema());
-		assertEquals("MY_SCHEMA", getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getSchema());
+		assertEquals("MY_SCHEMA", getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getSchema());
 		
 		//set schema to null in the context model
 		persistenceUnitDefaults.setSpecifiedSchema(null);
 		assertNull(persistenceUnitDefaults.getSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 	}
 	
 	public void testModifySchema2() throws Exception {
 		OrmPersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
 		assertNull(persistenceUnitDefaults.getSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		
 		//set schema in the context model, verify resource model modified
 		persistenceUnitDefaults.setSpecifiedSchema("MY_SCHEMA");
 		assertEquals("MY_SCHEMA", persistenceUnitDefaults.getSchema());
-		assertEquals("MY_SCHEMA", getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getSchema());
+		assertEquals("MY_SCHEMA", getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getSchema());
 		
 		//set another element on the persistence-unit-defaults element so it doesn't get removed
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setCatalog("MY_CATALOG");
+		getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setCatalog("MY_CATALOG");
 		//set schema to null in the context model
 		persistenceUnitDefaults.setSpecifiedSchema(null);
 		assertNull(persistenceUnitDefaults.getSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getSchema());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getSchema());
 	}
 	
 	public void testModifySchema3() throws Exception {
 		OrmPersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
 		assertNull(persistenceUnitDefaults.getSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		//set another element on the persistence-unit-metadata element so only persistence-unit-defaults element gets removed
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
 		
 		//set schema in the context model, verify resource model modified
 		persistenceUnitDefaults.setSpecifiedSchema("MY_SCHEMA");
 		assertEquals("MY_SCHEMA", persistenceUnitDefaults.getSchema());
-		assertEquals("MY_SCHEMA", getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getSchema());
+		assertEquals("MY_SCHEMA", getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getSchema());
 		
 		//set schema to null in the context model
 		persistenceUnitDefaults.setSpecifiedSchema(null);
 		assertNull(persistenceUnitDefaults.getSchema());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults());
 	}
 	
 	public void testUpdateCatalog() throws Exception {
 		OrmPersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
 		assertNull(persistenceUnitDefaults.getCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		
 		//set catalog in the resource model, verify context model updated
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setPersistenceUnitDefaults(OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setCatalog("MY_CATALOG");
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().getPersistenceUnitMetadata().setPersistenceUnitDefaults(OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults());
+		getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setCatalog("MY_CATALOG");
 		assertEquals("MY_CATALOG", persistenceUnitDefaults.getCatalog());
-		assertEquals("MY_CATALOG", getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getCatalog());
+		assertEquals("MY_CATALOG", getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getCatalog());
 	
 		//set catalog to null in the resource model
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setCatalog(null);
+		getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setCatalog(null);
 		assertNull(persistenceUnitDefaults.getCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getCatalog());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getCatalog());
 	}
 	
 	public void testModifyCatalog() throws Exception {		
 		OrmPersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
 		assertNull(persistenceUnitDefaults.getCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		
 		//set catalog in the context model, verify resource model modified
 		persistenceUnitDefaults.setSpecifiedCatalog("MY_CATALOG");
 		assertEquals("MY_CATALOG", persistenceUnitDefaults.getCatalog());
-		assertEquals("MY_CATALOG", getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getCatalog());
+		assertEquals("MY_CATALOG", getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getCatalog());
 		
 		//set catalog to null in the context model
 		persistenceUnitDefaults.setSpecifiedCatalog(null);
 		assertNull(persistenceUnitDefaults.getCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 	}
 	
 	public void testModifyCatalog2() throws Exception {
 		OrmPersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
 		assertNull(persistenceUnitDefaults.getCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		
 		//set catalog in the context model, verify resource model modified
 		persistenceUnitDefaults.setSpecifiedCatalog("MY_CATALOG");
 		assertEquals("MY_CATALOG", persistenceUnitDefaults.getCatalog());
-		assertEquals("MY_CATALOG", getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getCatalog());
+		assertEquals("MY_CATALOG", getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getCatalog());
 		
 		//set another element on the persistence-unit-defaults element so it doesn't get removed
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSchema("MY_SCHEMA");
+		getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSchema("MY_SCHEMA");
 		//set catalog to null in the context model
 		persistenceUnitDefaults.setSpecifiedCatalog(null);
 		assertNull(persistenceUnitDefaults.getCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getCatalog());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getCatalog());
 	}
 	
 	public void testModifyCatalog3() throws Exception {
 		OrmPersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
 		assertNull(persistenceUnitDefaults.getCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		//set another element on the persistence-unit-metadata element so only persistence-unit-defaults element gets removed
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
 		
 		//set catalog in the context model, verify resource model modified
 		persistenceUnitDefaults.setSpecifiedCatalog("MY_CATALOG");
 		assertEquals("MY_CATALOG", persistenceUnitDefaults.getCatalog());
-		assertEquals("MY_CATALOG", getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getCatalog());
+		assertEquals("MY_CATALOG", getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getCatalog());
 		
 		//set catalog to null in the context model
 		persistenceUnitDefaults.setSpecifiedCatalog(null);
 		assertNull(persistenceUnitDefaults.getCatalog());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults());
 	}
 	
 	public void testUpdateCascadePersist() throws Exception {
 		OrmPersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
 		assertFalse(persistenceUnitDefaults.isCascadePersist());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		
 		//set cascadePersist in the resource model, verify context model updated
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setPersistenceUnitDefaults(OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setCascadePersist(true);
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().getPersistenceUnitMetadata().setPersistenceUnitDefaults(OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults());
+		getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setCascadePersist(true);
 		assertTrue(persistenceUnitDefaults.isCascadePersist());
-		assertTrue(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().isCascadePersist());
+		assertTrue(getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().isCascadePersist());
 	
 		//set cascadePersist to null in the resource model, persistence-unit-defaults tag not removed
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setCascadePersist(false);
+		getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setCascadePersist(false);
 		assertFalse(persistenceUnitDefaults.isCascadePersist());
-		assertFalse(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().isCascadePersist());
+		assertFalse(getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().isCascadePersist());
 	}
 	
 	public void testModifyCascadePersist() throws Exception {		
 		OrmPersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
 		assertFalse(persistenceUnitDefaults.isCascadePersist());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		
 		//set cascadePersist in the context model, verify resource model modified
 		persistenceUnitDefaults.setCascadePersist(true);
 		assertTrue(persistenceUnitDefaults.isCascadePersist());
-		assertTrue(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().isCascadePersist());
+		assertTrue(getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().isCascadePersist());
 		
 		//set cascadePersist to null in the context model
 		persistenceUnitDefaults.setCascadePersist(false);
 		assertFalse(persistenceUnitDefaults.isCascadePersist());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 	}
 	
 	public void testModifyCascadePersist2() throws Exception {
 		OrmPersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
 		assertFalse(persistenceUnitDefaults.isCascadePersist());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		
 		//set cascadePersist in the context model, verify resource model modified
 		persistenceUnitDefaults.setCascadePersist(true);
 		assertTrue(persistenceUnitDefaults.isCascadePersist());
-		assertTrue(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().isCascadePersist());
+		assertTrue(getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().isCascadePersist());
 		
 		//set another element on the persistence-unit-defaults element so it doesn't get removed
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setCatalog("MY_CATALOG");
+		getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setCatalog("MY_CATALOG");
 		//set cascadePersist to null in the context model
 		persistenceUnitDefaults.setCascadePersist(false);
 		assertFalse(persistenceUnitDefaults.isCascadePersist());
-		assertFalse(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().isCascadePersist());
+		assertFalse(getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().isCascadePersist());
 	}
 	
 	public void testModifyCascadePersist3() throws Exception {
 		OrmPersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
 		assertFalse(persistenceUnitDefaults.isCascadePersist());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		//set another element on the persistence-unit-metadata element so only persistence-unit-defaults element gets removed
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
 		
 		//set cascadePersist in the context model, verify resource model modified
 		persistenceUnitDefaults.setCascadePersist(true);
 		assertTrue(persistenceUnitDefaults.isCascadePersist());
-		assertTrue(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().isCascadePersist());
+		assertTrue(getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().isCascadePersist());
 		
 		//set cascadePersist to null in the context model
 		persistenceUnitDefaults.setCascadePersist(false);
 		assertFalse(persistenceUnitDefaults.isCascadePersist());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults());
 	}
 	
 	
 	public void testUpdateAccess() throws Exception {
 		OrmPersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
 		assertNull(persistenceUnitDefaults.getAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		
 		//set access in the resource model, verify context model updated
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setPersistenceUnitDefaults(OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(org.eclipse.jpt.core.resource.orm.AccessType.FIELD);
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().getPersistenceUnitMetadata().setPersistenceUnitDefaults(OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults());
+		getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(org.eclipse.jpt.core.resource.orm.AccessType.FIELD);
 		assertEquals(AccessType.FIELD, persistenceUnitDefaults.getAccess());
-		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.FIELD, getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getAccess());
+		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.FIELD, getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getAccess());
 	
 		//set access to null in the resource model
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(null);
+		getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(null);
 		assertNull(persistenceUnitDefaults.getAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getAccess());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getAccess());
 	}
 	
 	public void testModifyAccess() throws Exception {		
 		OrmPersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
 		assertNull(persistenceUnitDefaults.getAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		
 		//set access in the context model, verify resource model modified
 		persistenceUnitDefaults.setAccess(AccessType.PROPERTY);
 		assertEquals(AccessType.PROPERTY, persistenceUnitDefaults.getAccess());
-		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY, getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getAccess());
+		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY, getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getAccess());
 		
 		//set access to null in the context model
 		persistenceUnitDefaults.setAccess(null);
 		assertNull(persistenceUnitDefaults.getAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 	}
 	
 	public void testModifyAccess2() throws Exception {
 		OrmPersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
 		assertNull(persistenceUnitDefaults.getAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		
 		//set access in the context model, verify resource model modified
 		persistenceUnitDefaults.setAccess(AccessType.FIELD);
 		assertEquals(AccessType.FIELD, persistenceUnitDefaults.getAccess());
-		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.FIELD, getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getAccess());
+		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.FIELD, getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getAccess());
 		
 		//set another element on the persistence-unit-defaults element so it doesn't get removed
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setCascadePersist(true);
+		getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setCascadePersist(true);
 		//set access to null in the context model
 		persistenceUnitDefaults.setAccess(null);
 		assertNull(persistenceUnitDefaults.getAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getAccess());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getAccess());
 	}
 	
 	public void testModifyAccess3() throws Exception {
 		OrmPersistenceUnitDefaults persistenceUnitDefaults = persistenceUnitDefaults();
 		assertNull(persistenceUnitDefaults.getAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		//set another element on the persistence-unit-metadata element so only persistence-unit-defaults element gets removed
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
 		
 		//set access in the context model, verify resource model modified
 		persistenceUnitDefaults.setAccess(AccessType.FIELD);
 		assertEquals(AccessType.FIELD, persistenceUnitDefaults.getAccess());
-		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.FIELD, getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getAccess());
+		assertEquals(org.eclipse.jpt.core.resource.orm.AccessType.FIELD, getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().getAccess());
 		
 		//set access to null in the context model
 		persistenceUnitDefaults.setAccess(null);
 		assertNull(persistenceUnitDefaults.getAccess());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults());
 	}
 
 }
\ No newline at end of file
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/PersistenceUnitMetadataTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/PersistenceUnitMetadataTests.java
index 6db4c8c6f4..ddbd9b9e05 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/PersistenceUnitMetadataTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/PersistenceUnitMetadataTests.java
@@ -38,7 +38,7 @@ public class PersistenceUnitMetadataTests extends ContextModelTestCase
 	
 	public void testIsAllFeaturesUnset() throws Exception {
 		org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata persistenceUnitMetadata = OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata();
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(persistenceUnitMetadata);
+		getXmlEntityMappings().setPersistenceUnitMetadata(persistenceUnitMetadata);
 		assertTrue(persistenceUnitMetadata.isAllFeaturesUnset());
 		
 		persistenceUnitMetadata.setXmlMappingMetadataComplete(true);
@@ -54,51 +54,51 @@ public class PersistenceUnitMetadataTests extends ContextModelTestCase
 	public void testUpdateXmlMappingMetadataComplete() throws Exception {
 		PersistenceUnitMetadata persistenceUnitMetadata = getEntityMappings().getPersistenceUnitMetadata();
 		assertFalse(persistenceUnitMetadata.isXmlMappingMetadataComplete());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		
 		//set xmlMappingMetadataComplete in the resource model, verify context model updated
-		getOrmXmlResource().getEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);		
+		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);		
 		assertTrue(persistenceUnitMetadata.isXmlMappingMetadataComplete());
-		assertTrue(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().isXmlMappingMetadataComplete());
+		assertTrue(getXmlEntityMappings().getPersistenceUnitMetadata().isXmlMappingMetadataComplete());
 
 		//set xmlMappingMetadataComplete to null in the resource model
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false);
+		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false);
 		assertFalse(persistenceUnitMetadata.isXmlMappingMetadataComplete());
-		assertFalse(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().isXmlMappingMetadataComplete());
+		assertFalse(getXmlEntityMappings().getPersistenceUnitMetadata().isXmlMappingMetadataComplete());
 	}
 	
 	public void testModifyXmlMappingMetadataComplete() throws Exception {		
 		PersistenceUnitMetadata persistenceUnitMetadata = getEntityMappings().getPersistenceUnitMetadata();
 		assertFalse(persistenceUnitMetadata.isXmlMappingMetadataComplete());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		
 		//set xmlMappingMetadataComplete in the context model, verify resource model modified
 		persistenceUnitMetadata.setXmlMappingMetadataComplete(true);
 		assertTrue(persistenceUnitMetadata.isXmlMappingMetadataComplete());
-		assertTrue(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().isXmlMappingMetadataComplete());
+		assertTrue(getXmlEntityMappings().getPersistenceUnitMetadata().isXmlMappingMetadataComplete());
 		
 		//set xmlMappingMetadataComplete to null in the context model
 		persistenceUnitMetadata.setXmlMappingMetadataComplete(false);
 		assertFalse(persistenceUnitMetadata.isXmlMappingMetadataComplete());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 	}
 	
 	public void testModifyXmlMappingMetadataComplete2() throws Exception {
 		PersistenceUnitMetadata persistenceUnitMetadata = getEntityMappings().getPersistenceUnitMetadata();
 		assertFalse(persistenceUnitMetadata.isXmlMappingMetadataComplete());
-		assertNull(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata());
+		assertNull(getXmlEntityMappings().getPersistenceUnitMetadata());
 		
 		//set xmlMappingMetadataComplete in the context model, verify resource model modified
 		persistenceUnitMetadata.setXmlMappingMetadataComplete(true);
 		assertTrue(persistenceUnitMetadata.isXmlMappingMetadataComplete());
-		assertTrue(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().isXmlMappingMetadataComplete());
+		assertTrue(getXmlEntityMappings().getPersistenceUnitMetadata().isXmlMappingMetadataComplete());
 		
 		//set xmlMappingMetadataComplete to null in the context model
 		//set another element on the persistence-unit-metadata element so it doesn't get removed
-		getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().setPersistenceUnitDefaults(OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults());
+		getXmlEntityMappings().getPersistenceUnitMetadata().setPersistenceUnitDefaults(OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults());
 		persistenceUnitMetadata.setXmlMappingMetadataComplete(false);
 		assertFalse(persistenceUnitMetadata.isXmlMappingMetadataComplete());
-		assertFalse(getOrmXmlResource().getEntityMappings().getPersistenceUnitMetadata().isXmlMappingMetadataComplete());
+		assertFalse(getXmlEntityMappings().getPersistenceUnitMetadata().isXmlMappingMetadataComplete());
 	}
 }
\ No newline at end of file
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceTests.java
index 9d7565aa45..5fb73d8693 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceTests.java
@@ -11,11 +11,11 @@ package org.eclipse.jpt.core.tests.internal.context.persistence;
 
 import org.eclipse.jpt.core.context.persistence.Persistence;
 import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
-import org.eclipse.jpt.core.resource.persistence.PersistenceXmlResource;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistence;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 
+@SuppressWarnings("nls")
 public class PersistenceTests extends ContextModelTestCase
 {
 	public PersistenceTests(String name) {
@@ -27,8 +27,7 @@ public class PersistenceTests extends ContextModelTestCase
 	}
 	
 	public void testUpdateAddPersistenceUnit() throws Exception {
-		PersistenceXmlResource prm = getPersistenceXmlResource();
-		XmlPersistence xmlPersistence = prm.getPersistence();
+		XmlPersistence xmlPersistence = getXmlPersistence();
 		Persistence persistence = getRootContextNode().getPersistenceXml().getPersistence();
 		
 		// clear xml persistence units, test that it's clear in context
@@ -77,8 +76,7 @@ public class PersistenceTests extends ContextModelTestCase
 	}
 	
 	public void testUpdateRemovePersistenceUnit() throws Exception {
-		PersistenceXmlResource prm = getPersistenceXmlResource();
-		XmlPersistence xmlPersistence = prm.getPersistence();
+		XmlPersistence xmlPersistence = getXmlPersistence();
 		Persistence persistence = getRootContextNode().getPersistenceXml().getPersistence();
 		
 		// add a persistence unit and test that there are two existing xml and 
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceUnitTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceUnitTests.java
index 1ad72141b8..f88e381593 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceUnitTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceUnitTests.java
@@ -11,8 +11,6 @@ package org.eclipse.jpt.core.tests.internal.context.persistence;
 
 import java.io.IOException;
 import java.util.Iterator;
-import java.util.ListIterator;
-
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.MappingKeys;
@@ -22,8 +20,8 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.core.context.persistence.ClassRef;
 import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.core.context.persistence.PersistenceUnitTransactionType;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
 import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
@@ -388,14 +386,14 @@ public class PersistenceUnitTests extends ContextModelTestCase
 		PersistenceUnit persistenceUnit = getPersistenceUnit();
 		
 		// test that there is one initially
-		OrmXmlResource ormResource = getOrmXmlResource();
-		assertTrue(ormResource.exists());
+		JpaXmlResource ormResource = getOrmXmlResource();
+		assertTrue(ormResource.fileExists());
 		assertNotNull(persistenceUnit.getImpliedMappingFileRef());
 		
 		// remove orm.xml
 		deleteResource(ormResource);
 		
-		assertFalse(ormResource.exists());
+		assertFalse(ormResource.fileExists());
 		assertNull(persistenceUnit.getImpliedMappingFileRef());
 	}
 	
@@ -404,8 +402,8 @@ public class PersistenceUnitTests extends ContextModelTestCase
 		PersistenceUnit persistenceUnit = getPersistenceUnit();
 		
 		// test that there is one initially
-		OrmXmlResource ormResource = getOrmXmlResource();
-		assertTrue(ormResource.exists());
+		JpaXmlResource ormResource = getOrmXmlResource();
+		assertTrue(ormResource.fileExists());
 		assertNotNull(persistenceUnit.getImpliedMappingFileRef());
 		
 		// add specified orm.xml
@@ -415,7 +413,7 @@ public class PersistenceUnitTests extends ContextModelTestCase
 		
 		assertEquals(1, persistenceUnit.specifiedMappingFileRefsSize());
 		
-		assertTrue(ormResource.exists());
+		assertTrue(ormResource.fileExists());
 		assertNull(persistenceUnit.getImpliedMappingFileRef());
 	}
 	
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceXmlTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceXmlTests.java
index 46f96420f3..2f8c0d86ef 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceXmlTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceXmlTests.java
@@ -10,8 +10,8 @@
 package org.eclipse.jpt.core.tests.internal.context.persistence;
 
 import org.eclipse.jpt.core.context.persistence.PersistenceXml;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
-import org.eclipse.jpt.core.resource.persistence.PersistenceXmlResource;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 
 public class PersistenceXmlTests extends ContextModelTestCase
@@ -20,29 +20,33 @@ public class PersistenceXmlTests extends ContextModelTestCase
 		super(name);
 	}
 	
-	protected PersistenceXml persistenceXml() {
+	protected PersistenceXml getPersistenceXml() {
 		return getRootContextNode().getPersistenceXml();
 	}
 	
 	public void testUpdateAddPersistence() throws Exception {
-		PersistenceXmlResource prm = getPersistenceXmlResource();
+		assertEquals(2, getJpaProject().jpaFilesSize());
+		JpaXmlResource prm = getPersistenceXmlResource();
 		prm.getContents().clear();
 		prm.save(null);
 		
-		assertNull(persistenceXml().getPersistence());
+		//the ContentType of the persistence.xml file is no longer persistence, so the jpa file is removed
+		assertNull(getPersistenceXml());
+		assertEquals(1, getJpaProject().jpaFilesSize()); //should only be the orm.xml file
 		
 		prm.getContents().add(PersistenceFactory.eINSTANCE.createXmlPersistence());
+		prm.save(null);
 		
-		assertNotNull(persistenceXml().getPersistence());
-		
+		assertNotNull(getPersistenceXml().getPersistence());
+		assertEquals(2, getJpaProject().jpaFilesSize());	
 	}
 	
 	public void testModifyAddPersistence() {
-		PersistenceXmlResource prm = getPersistenceXmlResource();
-		prm.getContents().remove(prm.getPersistence());
-		assertNull(prm.getPersistence());
+		JpaXmlResource prm = getPersistenceXmlResource();
+		prm.getContents().remove(getXmlPersistence());
+		assertNull(getXmlPersistence());
 		
-		PersistenceXml persistenceXml = persistenceXml();
+		PersistenceXml persistenceXml = getPersistenceXml();
 		
 		persistenceXml.addPersistence();
 		
@@ -60,17 +64,17 @@ public class PersistenceXmlTests extends ContextModelTestCase
 	}
 	
 	public void testUpdateRemovePersistence() throws Exception {
-		PersistenceXmlResource prm = getPersistenceXmlResource();
+		JpaXmlResource prm = getPersistenceXmlResource();
 		
-		assertNotNull(persistenceXml().getPersistence());
+		assertNotNull(getPersistenceXml().getPersistence());
 		
 		prm.getContents().clear();
 		
-		assertNull(persistenceXml().getPersistence());
+		assertNull(getPersistenceXml().getPersistence());
 	}
 	
 	public void testModifyRemovePersistence() {
-		PersistenceXml persistenceXml = persistenceXml();
+		PersistenceXml persistenceXml = getPersistenceXml();
 		
 		assertNotNull(persistenceXml.getPersistence());
 		
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/RootContextNodeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/RootContextNodeTests.java
index c75c10b5b2..0648faba72 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/RootContextNodeTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/RootContextNodeTests.java
@@ -10,8 +10,8 @@
 package org.eclipse.jpt.core.tests.internal.context.persistence;
 
 import org.eclipse.jpt.core.context.JpaRootContextNode;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
-import org.eclipse.jpt.core.resource.persistence.PersistenceXmlResource;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 
 public class RootContextNodeTests extends ContextModelTestCase
@@ -20,56 +20,11 @@ public class RootContextNodeTests extends ContextModelTestCase
 		super(name);
 	}
 	
-	public void testModifyAddPersistenceXml() throws Exception {
-		PersistenceXmlResource pr = getPersistenceXmlResource();
-		deleteResource(pr);
-		
-		assertFalse(pr.exists());
-		
-		JpaRootContextNode baseJpaContent = getJavaProject().getJpaProject().getRootContextNode();
-		assertNull(baseJpaContent.getPersistenceXml());
-		
-		baseJpaContent.addPersistenceXml();
-		
-		assertNotNull(baseJpaContent.getPersistenceXml());
-		
-		boolean exceptionThrown = false;
-		try {
-			baseJpaContent.addPersistenceXml();
-		}
-		catch (IllegalStateException ise) {
-			exceptionThrown = true;
-		}
-		
-		assertTrue(exceptionThrown);
-	}
-	
-	public void testModifyRemovePersistenceXml() throws Exception {
-		JpaRootContextNode baseJpaContent = getJavaProject().getJpaProject().getRootContextNode();
-		
-		assertNotNull(baseJpaContent.getPersistenceXml());
-		
-		baseJpaContent.removePersistenceXml();
-		waitForWorkspaceJobs();
-		
-		assertNull(baseJpaContent.getPersistenceXml());
-		
-		boolean exceptionThrown = false;
-		try {
-			baseJpaContent.removePersistenceXml();
-		}
-		catch (IllegalStateException ise) {
-			exceptionThrown = true;
-		}
-		
-		assertTrue(exceptionThrown);
-	}
-	
 	public void testUpdateAddPersistenceXml() throws Exception {
-		PersistenceXmlResource pr = getPersistenceXmlResource();
+		JpaXmlResource pr = getPersistenceXmlResource();
 		deleteResource(pr);
 		
-		assertFalse(pr.exists());
+		assertFalse(pr.fileExists());
 		
 		JpaRootContextNode baseJpaContent = getJavaProject().getJpaProject().getRootContextNode();
 		assertNull(baseJpaContent.getPersistenceXml());
@@ -80,7 +35,7 @@ public class RootContextNodeTests extends ContextModelTestCase
 	}
 	
 	public void testUpdateRemovePersistenceXml() throws Exception {
-		PersistenceXmlResource pr = getPersistenceXmlResource();
+		JpaXmlResource pr = getPersistenceXmlResource();
 		JpaRootContextNode baseJpaContent = getJavaProject().getJpaProject().getRootContextNode();
 		
 		assertNotNull(baseJpaContent.getPersistenceXml());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/JptCoreResourceModelTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/JptCoreResourceModelTests.java
index e77d42f62c..b2a6bba1e7 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/JptCoreResourceModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/JptCoreResourceModelTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2007, 2008 Oracle. 
+ *  Copyright (c) 2007, 2009 Oracle. 
  *  All rights reserved.  This program and the accompanying materials 
  *  are made available under the terms of the Eclipse Public License v1.0 
  *  which accompanies this distribution, and is available at 
@@ -24,8 +24,6 @@ public class JptCoreResourceModelTests extends TestCase
 	public static Test suite(boolean all) {
 		TestSuite suite = new TestSuite(JptCoreResourceModelTests.class.getName());
 		suite.addTest(JptJavaResourceTests.suite(all));
-		suite.addTestSuite(OrmModelTests.class);
-		suite.addTestSuite(PersistenceModelTests.class);
 		return suite;
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/OrmModelTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/OrmModelTests.java
deleted file mode 100644
index 6995dc4424..0000000000
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/OrmModelTests.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.core.tests.internal.resource;
-
-import junit.framework.TestCase;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jpt.core.internal.resource.orm.OrmXmlResourceProvider;
-import org.eclipse.jpt.core.resource.orm.OrmXmlResource;
-import org.eclipse.jpt.core.tests.internal.projects.TestJpaProject;
-
-public class OrmModelTests extends TestCase
-{
-	static final String BASE_PROJECT_NAME = OrmModelTests.class.getSimpleName();
-	
-	TestJpaProject jpaProject;
-
-	
-	public OrmModelTests(String name) {
-		super(name);
-	}
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		jpaProject = TestJpaProject.buildJpaProject(BASE_PROJECT_NAME, false); // false = no auto-build
-	}
-	
-	protected void createFile() throws CoreException {
-		OrmXmlResourceProvider modelProvider = 
-			OrmXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
-		modelProvider.createResource();
-	}
-	
-	@Override
-	protected void tearDown() throws Exception {
-		this.jpaProject.getProject().delete(true, true, null);
-		jpaProject = null;
-		super.tearDown();
-	}
-	
-	public void testModelLoad() {
-		OrmXmlResourceProvider modelProvider = 
-			OrmXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
-		assertNotNull(modelProvider);
-		OrmXmlResource resource = modelProvider.getXmlResource();
-		assertNotNull(resource);
-	}
-	
-	public void testModelLoad2() {
-		OrmXmlResourceProvider modelProvider = 
-			OrmXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
-		assertNotNull(modelProvider);
-		OrmXmlResource resource = modelProvider.getXmlResource();
-		assertNotNull(resource);
-	}
-	
-	public void testModelLoadForDifferentlyNamedOrmXml() {
-		OrmXmlResourceProvider modelProvider = 
-			OrmXmlResourceProvider.getXmlResourceProvider(jpaProject.getProject(), "META-INF/orm2.xml");
-		assertNotNull(modelProvider);
-		OrmXmlResource resource = modelProvider.getXmlResource();
-		assertNotNull(resource);
-	}
-	
-	public void testCreateFile() throws CoreException {
-		createFile();
-		OrmXmlResourceProvider modelProvider = 
-			OrmXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
-		assertNotNull(modelProvider);
-		OrmXmlResource resource = modelProvider.getXmlResource();
-		assertNotNull(resource);
-		assertTrue(resource.exists());
-	}
-}
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/PersistenceModelTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/PersistenceModelTests.java
deleted file mode 100644
index 4788b58e63..0000000000
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/PersistenceModelTests.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.core.tests.internal.resource;
-
-import junit.framework.TestCase;
-import org.eclipse.jpt.core.internal.resource.persistence.PersistenceXmlResourceProvider;
-import org.eclipse.jpt.core.resource.persistence.PersistenceXmlResource;
-import org.eclipse.jpt.core.tests.internal.projects.TestJpaProject;
-
-public class PersistenceModelTests extends TestCase
-{
-	static final String BASE_PROJECT_NAME = PersistenceModelTests.class.getSimpleName();
-	
-	TestJpaProject jpaProject;
-
-	
-	public PersistenceModelTests(String name) {
-		super(name);
-	}
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		this.jpaProject = TestJpaProject.buildJpaProject(BASE_PROJECT_NAME, false); // false = no auto-build
-	}
-	
-	protected void createFile() {
-		PersistenceXmlResourceProvider modelProvider = 
-			PersistenceXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
-		modelProvider.modify(new Runnable() {
-			public void run() {
-				
-			}
-		});
-	}
-	
-	@Override
-	protected void tearDown() throws Exception {
-		this.jpaProject.getProject().delete(true, true, null);
-		this.jpaProject = null;
-		super.tearDown();
-	}
-	
-	public void testModelLoad() {
-		PersistenceXmlResourceProvider modelProvider = 
-			PersistenceXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
-		assertNotNull(modelProvider);
-		PersistenceXmlResource resource = modelProvider.getXmlResource();
-		assertNotNull(resource);
-	}
-	
-	public void testModelLoad2() {
-		PersistenceXmlResourceProvider modelProvider = 
-			PersistenceXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
-		assertNotNull(modelProvider);
-		PersistenceXmlResource resource = modelProvider.getXmlResource();
-		assertNotNull(resource);
-	}
-	
-	public void testCreateFile() {
-		createFile();
-		PersistenceXmlResourceProvider modelProvider = 
-			PersistenceXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
-		assertNotNull(modelProvider);
-		PersistenceXmlResource resource = modelProvider.getXmlResource();
-		assertNotNull(resource);
-		assertTrue(resource.exists());
-	}
-}
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/META-INF/MANIFEST.MF b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/META-INF/MANIFEST.MF
index 7fa24b2512..db70c8709a 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/META-INF/MANIFEST.MF
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/META-INF/MANIFEST.MF
@@ -36,5 +36,4 @@ Export-Package: org.eclipse.jpt.eclipselink.core.tests.internal;x-internal:=true
  org.eclipse.jpt.eclipselink.core.tests.internal.context.persistence.options;x-internal:=true,
  org.eclipse.jpt.eclipselink.core.tests.internal.context.persistence.schema.generation;x-internal:=true,
  org.eclipse.jpt.eclipselink.core.tests.internal.resource;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.tests.internal.resource.java;x-internal:=true,
- org.eclipse.jpt.eclipselink.core.tests.internal.resource.orm;x-internal:=true
+ org.eclipse.jpt.eclipselink.core.tests.internal.resource.java;x-internal:=true
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/JpaProjectTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/JpaProjectTests.java
new file mode 100644
index 0000000000..bef3b6e24d
--- /dev/null
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/JpaProjectTests.java
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.eclipselink.core.tests.internal.context;
+
+import org.eclipse.jpt.core.JptCorePlugin;
+import org.eclipse.jpt.core.internal.resource.orm.OrmXmlResourceProvider;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
+import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
+import org.eclipse.jpt.eclipselink.core.internal.resource.orm.EclipseLinkOrmXmlResourceProvider;
+
+@SuppressWarnings("nls")
+public class JpaProjectTests extends EclipseLinkContextModelTestCase
+{
+	
+	public JpaProjectTests(String name) {
+		super(name);
+	}
+
+	public void testGetDefaultOrmXmlResource() throws Exception {
+		JpaXmlResource resource = this.getJpaProject().getDefaultOrmXmlResource();
+		assertNull(resource);
+		
+		//add the orm.xml file with eclipselink orm content type
+		createDefaultOrmXmlFileWithEclipseLinkContentType();
+		resource = this.getJpaProject().getDefaultOrmXmlResource();
+		assertNotNull(resource);
+		assertEquals(JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE, resource.getContentType());
+		assertEquals("src/META-INF/orm.xml", resource.getFile().getProjectRelativePath().toString());
+		
+		
+		//delete the orm.xml file and verify it is not returned from getDefaultOrmXmlResource()
+		resource.delete(null);
+		resource = this.getJpaProject().getDefaultOrmXmlResource();
+		assertNull(resource);
+		
+		
+		//add the orm.xml file this time with orm content type
+		createDefaultOrmXmlFile();
+		resource = this.getJpaProject().getDefaultOrmXmlResource();
+		assertNotNull(resource);
+		assertEquals(JptCorePlugin.ORM_XML_CONTENT_TYPE, resource.getContentType());
+		assertEquals("src/META-INF/orm.xml", resource.getFile().getProjectRelativePath().toString());
+	}
+	
+	private void createDefaultOrmXmlFileWithEclipseLinkContentType() throws Exception {
+		EclipseLinkOrmXmlResourceProvider resourceProvider = 
+			EclipseLinkOrmXmlResourceProvider.getXmlResourceProvider(this.getJavaProject().getProject(), JptCorePlugin.DEFAULT_ORM_XML_FILE_PATH);
+		resourceProvider.createFileAndResource();
+	}
+	
+	private void createDefaultOrmXmlFile() throws Exception {
+		OrmXmlResourceProvider resourceProvider = 
+			OrmXmlResourceProvider.getDefaultXmlResourceProvider(this.getJavaProject().getProject());
+		resourceProvider.createFileAndResource();
+	}
+//	public void testModelLoad() {
+//		EclipseLinkOrmXmlResourceProvider modelProvider = 
+//			EclipseLinkOrmXmlResourceProvider.getDefaultXmlResourceProvider(this.jpaProject.getProject());
+//		assertNotNull(modelProvider);
+//		JpaXmlResource resource = modelProvider.getXmlResource();
+//		assertNotNull(resource);
+//	}
+//	
+//	public void testModelLoad2() {
+//		EclipseLinkOrmXmlResourceProvider modelProvider = 
+//			EclipseLinkOrmXmlResourceProvider.getDefaultXmlResourceProvider(this.jpaProject.getProject());
+//		assertNotNull(modelProvider);
+//		JpaXmlResource resource = modelProvider.getXmlResource();
+//		assertNotNull(resource);
+//	}
+//	
+//	public void testModelLoadForDifferentlyNamedOrmXml() {
+//		EclipseLinkOrmXmlResourceProvider modelProvider = 
+//			EclipseLinkOrmXmlResourceProvider.getXmlResourceProvider(
+//				this.jpaProject.getProject(),"META-INF/eclipselink-orm2.xml");
+//		assertNotNull(modelProvider);
+//		JpaXmlResource resource = modelProvider.getXmlResource();
+//		assertNotNull(resource);
+//	}
+//	
+//	public void testCreateFile() throws CoreException {
+//		createFile();
+//		EclipseLinkOrmXmlResourceProvider modelProvider = 
+//			EclipseLinkOrmXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
+//		assertNotNull(modelProvider);
+//		JpaXmlResource resource = modelProvider.getXmlResource();
+//		assertNotNull(resource);
+//		assertTrue(resource.fileExists());
+//	}
+}
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/JptEclipseLinkCoreContextModelTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/JptEclipseLinkCoreContextModelTests.java
index 72a8516e11..fc620dabb9 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/JptEclipseLinkCoreContextModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/JptEclipseLinkCoreContextModelTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2007 Oracle. 
+ *  Copyright (c) 2007, 2009 Oracle. 
  *  All rights reserved.  This program and the accompanying materials 
  *  are made available under the terms of the Eclipse Public License v1.0 
  *  which accompanies this distribution, and is available at 
@@ -25,6 +25,7 @@ public class JptEclipseLinkCoreContextModelTests extends TestCase
 	
 	public static Test suite(boolean all) {
 		TestSuite suite = new TestSuite(JptEclipseLinkCoreContextModelTests.class.getName());
+		suite.addTestSuite(JpaProjectTests.class);
 		suite.addTest(JptEclipseLinkCorePersistenceContextModelTests.suite(all));
 		suite.addTest(JptEclipseLinkCoreJavaContextModelTests.suite(all));
 		suite.addTest(JptEclipseLinkCoreOrmContextModelTests.suite(all));
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkEntityMappingsTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkEntityMappingsTests.java
index 5c1c1e52d4..f3570ae2ef 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkEntityMappingsTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkEntityMappingsTests.java
@@ -34,8 +34,8 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe
 
 	
 	public void testUpdateCustomConverters() throws Exception {
-		XmlEntityMappings resourceEntityMappings = getOrmXmlResource().getEntityMappings();
-		EclipseLinkPersistenceUnit persistenceUnit = (EclipseLinkPersistenceUnit) getPersistenceUnit();
+		XmlEntityMappings resourceEntityMappings = getXmlEntityMappings();
+		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		EclipseLinkEntityMappings contextEntityMappings = getEntityMappings();
 		ConverterHolder ormContextConverterHolder = contextEntityMappings.getConverterHolder();
 		
@@ -109,8 +109,8 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe
 	}
 
 	public void testModifyCustomConverters() throws Exception {
-		XmlEntityMappings resourceEntityMappings = getOrmXmlResource().getEntityMappings();
-		EclipseLinkPersistenceUnit persistenceUnit = (EclipseLinkPersistenceUnit) getPersistenceUnit();
+		XmlEntityMappings resourceEntityMappings = getXmlEntityMappings();
+		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		EclipseLinkEntityMappings contextEntityMappings = getEntityMappings();
 		ConverterHolder ormContextConverterHolder = contextEntityMappings.getConverterHolder();
 		
@@ -194,8 +194,8 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe
 	}
 	
 	public void testUpdateTypeConverters() throws Exception {
-		XmlEntityMappings resourceEntityMappings = getOrmXmlResource().getEntityMappings();
-		EclipseLinkPersistenceUnit persistenceUnit = (EclipseLinkPersistenceUnit) getPersistenceUnit();
+		XmlEntityMappings resourceEntityMappings = getXmlEntityMappings();
+		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		EclipseLinkEntityMappings contextEntityMappings = getEntityMappings();
 		ConverterHolder ormContextConverterHolder = contextEntityMappings.getConverterHolder();
 		
@@ -269,8 +269,8 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe
 	}
 
 	public void testModifyTypeConverters() throws Exception {
-		XmlEntityMappings resourceEntityMappings = getOrmXmlResource().getEntityMappings();
-		EclipseLinkPersistenceUnit persistenceUnit = (EclipseLinkPersistenceUnit) getPersistenceUnit();
+		XmlEntityMappings resourceEntityMappings = getXmlEntityMappings();
+		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		EclipseLinkEntityMappings contextEntityMappings = getEntityMappings();
 		ConverterHolder ormContextConverterHolder = contextEntityMappings.getConverterHolder();
 		
@@ -354,8 +354,8 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe
 	}
 	
 	public void testUpdateObjectTypeConverters() throws Exception {
-		XmlEntityMappings resourceEntityMappings = getOrmXmlResource().getEntityMappings();
-		EclipseLinkPersistenceUnit persistenceUnit = (EclipseLinkPersistenceUnit) getPersistenceUnit();
+		XmlEntityMappings resourceEntityMappings = getXmlEntityMappings();
+		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		EclipseLinkEntityMappings contextEntityMappings = getEntityMappings();
 		ConverterHolder ormContextConverterHolder = contextEntityMappings.getConverterHolder();
 		
@@ -429,8 +429,8 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe
 	}
 
 	public void testModifyObjectTypeConverters() throws Exception {
-		XmlEntityMappings resourceEntityMappings = getOrmXmlResource().getEntityMappings();
-		EclipseLinkPersistenceUnit persistenceUnit = (EclipseLinkPersistenceUnit) getPersistenceUnit();
+		XmlEntityMappings resourceEntityMappings = getXmlEntityMappings();
+		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		EclipseLinkEntityMappings contextEntityMappings = getEntityMappings();
 		ConverterHolder ormContextConverterHolder = contextEntityMappings.getConverterHolder();
 		
@@ -514,8 +514,8 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe
 	}
 	
 	public void testUpdateStructConverters() throws Exception {
-		XmlEntityMappings resourceEntityMappings = getOrmXmlResource().getEntityMappings();
-		EclipseLinkPersistenceUnit persistenceUnit = (EclipseLinkPersistenceUnit) getPersistenceUnit();
+		XmlEntityMappings resourceEntityMappings = getXmlEntityMappings();
+		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		EclipseLinkEntityMappings contextEntityMappings = getEntityMappings();
 		ConverterHolder ormContextConverterHolder = contextEntityMappings.getConverterHolder();
 		
@@ -589,8 +589,8 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe
 	}
 
 	public void testModifyStructConverters() throws Exception {
-		XmlEntityMappings resourceEntityMappings = getOrmXmlResource().getEntityMappings();
-		EclipseLinkPersistenceUnit persistenceUnit = (EclipseLinkPersistenceUnit) getPersistenceUnit();
+		XmlEntityMappings resourceEntityMappings = getXmlEntityMappings();
+		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		EclipseLinkEntityMappings contextEntityMappings = getEntityMappings();
 		ConverterHolder ormContextConverterHolder = contextEntityMappings.getConverterHolder();
 		
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java
index 9205056292..fa9161e1d3 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java
@@ -21,7 +21,6 @@ import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.eclipselink.core.context.Convert;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkBasicMapping;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmBasicMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;
 import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity;
@@ -97,7 +96,7 @@ public class EclipseLinkOrmBasicMappingTests
 		EclipseLinkOrmBasicMapping contextBasic = 
 			(EclipseLinkOrmBasicMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity)getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity)getXmlEntityMappings().getEntities().get(0);
 		XmlBasic resourceBasic = 
 			(XmlBasic) resourceEntity.getAttributes().getBasics().get(0);
 		EclipseLinkBasicMapping javaBasicMapping = (EclipseLinkBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping();
@@ -180,7 +179,7 @@ public class EclipseLinkOrmBasicMappingTests
 		EclipseLinkOrmBasicMapping contextBasic = 
 			(EclipseLinkOrmBasicMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity)getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity)getXmlEntityMappings().getEntities().get(0);
 		XmlBasic resourceBasic = 
 			(XmlBasic) resourceEntity.getAttributes().getBasics().get(0);
 		EclipseLinkBasicMapping javaBasicMapping = (EclipseLinkBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("myDate").getMapping();
@@ -220,19 +219,19 @@ public class EclipseLinkOrmBasicMappingTests
 		assertFalse(contextBasic.getMutable().isMutable());
 		
 		
-		((EclipseLinkPersistenceUnit) getPersistenceUnit()).getOptions().setTemporalMutable(Boolean.TRUE);
+		getPersistenceUnit().getOptions().setTemporalMutable(Boolean.TRUE);
 		assertNull(resourceBasic.getMutable());
 		assertTrue(contextBasic.getMutable().isDefaultMutable());
 		assertNull(contextBasic.getMutable().getSpecifiedMutable());
 		assertTrue(contextBasic.getMutable().isMutable());
 		
-		((EclipseLinkPersistenceUnit) getPersistenceUnit()).getOptions().setTemporalMutable(Boolean.FALSE);
+		getPersistenceUnit().getOptions().setTemporalMutable(Boolean.FALSE);
 		assertNull(resourceBasic.getMutable());
 		assertFalse(contextBasic.getMutable().isDefaultMutable());
 		assertNull(contextBasic.getMutable().getSpecifiedMutable());
 		assertFalse(contextBasic.getMutable().isMutable());
 		
-		((EclipseLinkPersistenceUnit) getPersistenceUnit()).getOptions().setTemporalMutable(null);
+		getPersistenceUnit().getOptions().setTemporalMutable(null);
 		assertNull(resourceBasic.getMutable());
 		assertFalse(contextBasic.getMutable().isDefaultMutable());
 		assertNull(contextBasic.getMutable().getSpecifiedMutable());
@@ -278,7 +277,7 @@ public class EclipseLinkOrmBasicMappingTests
 		EclipseLinkOrmBasicMapping contextBasic = 
 			(EclipseLinkOrmBasicMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity)getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity)getXmlEntityMappings().getEntities().get(0);
 		XmlBasic resourceBasic = 
 			(XmlBasic) resourceEntity.getAttributes().getBasics().get(0);
 		
@@ -323,7 +322,7 @@ public class EclipseLinkOrmBasicMappingTests
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "id");
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
-		XmlBasic basicResource = (XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
+		XmlBasic basicResource = (XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
 		JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping();
 		
 		assertEquals(null, ormBasicMapping.getSpecifiedConverter());
@@ -373,7 +372,7 @@ public class EclipseLinkOrmBasicMappingTests
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping");
 		OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping();
-		XmlBasic basicResource = (XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
+		XmlBasic basicResource = (XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0);
 	
 		assertEquals(null, ormBasicMapping.getSpecifiedConverter());
 		assertEquals(null, basicResource.getConvert());
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmContextModelTestCase.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmContextModelTestCase.java
index 7219f97d1f..0b4800ba4a 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmContextModelTestCase.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmContextModelTestCase.java
@@ -10,12 +10,13 @@
 package org.eclipse.jpt.eclipselink.core.tests.internal.context.orm;
 
 import org.eclipse.jpt.core.internal.operations.OrmFileCreationDataModelProperties;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.tests.internal.projects.TestJpaProject;
+import org.eclipse.jpt.eclipselink.core.EclipseLinkJpaProject;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkEntityMappings;
 import org.eclipse.jpt.eclipselink.core.internal.operations.EclipseLinkOrmFileCreationDataModelProvider;
 import org.eclipse.jpt.eclipselink.core.internal.operations.EclipseLinkOrmFileCreationOperation;
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.EclipseLinkOrmXmlResourceProvider;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings;
 import org.eclipse.jpt.eclipselink.core.tests.internal.context.EclipseLinkContextModelTestCase;
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
@@ -23,19 +24,22 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 public abstract class EclipseLinkOrmContextModelTestCase
 	extends EclipseLinkContextModelTestCase
 {
-	protected EclipseLinkOrmXmlResourceProvider eclipseLinkOrmResourceModelProvider;
+	protected JpaXmlResource eclipseLinkOrmXmlResource;
 	
 	
 	protected EclipseLinkOrmContextModelTestCase(String name) {
 		super(name);
 	}
 	
+	@Override
+	protected EclipseLinkJpaProject getJpaProject() {
+		return (EclipseLinkJpaProject) super.getJpaProject();
+	}
 	
 	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
-		this.eclipseLinkOrmResourceModelProvider = 
-			EclipseLinkOrmXmlResourceProvider.getDefaultXmlResourceProvider(getJavaProject().getProject());
+		this.eclipseLinkOrmXmlResource = getJpaProject().getDefaultEclipseLinkOrmXmlResource();
 	}
 	
 	@Override
@@ -59,13 +63,18 @@ public abstract class EclipseLinkOrmContextModelTestCase
 	
 	@Override
 	protected void tearDown() throws Exception {
-		this.eclipseLinkOrmResourceModelProvider = null;
+		this.eclipseLinkOrmXmlResource = null;
 		super.tearDown();
 	}
 	
 	@Override
-	protected EclipseLinkOrmXmlResource getOrmXmlResource() {
-		return this.eclipseLinkOrmResourceModelProvider.getXmlResource();
+	protected JpaXmlResource getOrmXmlResource() {
+		return this.eclipseLinkOrmXmlResource;
+	}
+	
+	@Override
+	protected XmlEntityMappings getXmlEntityMappings() {
+		return (XmlEntityMappings) super.getXmlEntityMappings();
 	}
 	
 	@Override
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmConverterTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmConverterTests.java
index c08f9d8020..4f9a6f5e67 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmConverterTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmConverterTests.java
@@ -75,7 +75,7 @@ public class EclipseLinkOrmConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.CUSTOM_CONVERTER);
 		EclipseLinkOrmCustomConverter ormConverter = (EclipseLinkOrmCustomConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getConverter();
+		XmlConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getConverter();
 		JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping();
 		
 		assertEquals(null, ormConverter.getConverterClass());
@@ -119,7 +119,7 @@ public class EclipseLinkOrmConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.CUSTOM_CONVERTER);
 		EclipseLinkOrmCustomConverter ormConverter = (EclipseLinkOrmCustomConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getConverter();
+		XmlConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getConverter();
 	
 		assertEquals(null, ormConverter.getConverterClass());
 		assertEquals(null, converterResource.getClassName());
@@ -143,7 +143,7 @@ public class EclipseLinkOrmConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.CUSTOM_CONVERTER);
 		EclipseLinkOrmCustomConverter ormConverter = (EclipseLinkOrmCustomConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getConverter();
+		XmlConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getConverter();
 		JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping();
 		
 		assertEquals(null, ormConverter.getName());
@@ -187,7 +187,7 @@ public class EclipseLinkOrmConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.CUSTOM_CONVERTER);
 		EclipseLinkOrmCustomConverter ormConverter = (EclipseLinkOrmCustomConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getConverter();
+		XmlConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getConverter();
 	
 		assertEquals(null, ormConverter.getName());
 		assertEquals(null, converterResource.getName());
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEmbeddableTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEmbeddableTests.java
index 5f8cb3b174..866fc87098 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEmbeddableTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEmbeddableTests.java
@@ -167,7 +167,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkJavaEmbeddable javaContextEmbeddable = (EclipseLinkJavaEmbeddable) ormPersistentType.getJavaPersistentType().getMapping();
 		EclipseLinkOrmEmbeddable ormContextEmbeddable = (EclipseLinkOrmEmbeddable) ormPersistentType.getMapping();
-		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getXmlEntityMappings().getEmbeddables().get(0);
 
 
 		// check defaults
@@ -245,7 +245,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes
 		createTestEmbeddableForCustomizer();
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEmbeddable ormContextEmbeddable = (EclipseLinkOrmEmbeddable) ormPersistentType.getMapping();
-		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getXmlEntityMappings().getEmbeddables().get(0);
 		
 		// check defaults
 		
@@ -278,7 +278,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkJavaEmbeddable javaContextEmbeddable = (EclipseLinkJavaEmbeddable) ormPersistentType.getJavaPersistentType().getMapping();
 		EclipseLinkOrmEmbeddable ormContextEmbeddable = (EclipseLinkOrmEmbeddable) ormPersistentType.getMapping();
-		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getXmlEntityMappings().getEmbeddables().get(0);
 		
 		// check defaults
 		
@@ -367,7 +367,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes
 		createTestEmbeddableForChangeTracking();
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEmbeddable ormContextEmbeddable = (EclipseLinkOrmEmbeddable) ormPersistentType.getMapping();
-		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getXmlEntityMappings().getEmbeddables().get(0);
 		
 		// check defaults
 		
@@ -428,7 +428,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEmbeddable ormContextEmbeddable = (EclipseLinkOrmEmbeddable) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextEmbeddable.getConverterHolder();
-		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getXmlEntityMappings().getEmbeddables().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.customConvertersSize());
 		assertEquals(0, resourceEmbeddable.getConverters().size());
@@ -504,7 +504,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEmbeddable ormContextEmbeddable = (EclipseLinkOrmEmbeddable) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextEmbeddable.getConverterHolder();
-		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getXmlEntityMappings().getEmbeddables().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.customConvertersSize());
 		assertEquals(0, resourceEmbeddable.getConverters().size());
@@ -586,7 +586,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEmbeddable ormContextEmbeddable = (EclipseLinkOrmEmbeddable) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextEmbeddable.getConverterHolder();
-		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getXmlEntityMappings().getEmbeddables().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.typeConvertersSize());
 		assertEquals(0, resourceEmbeddable.getTypeConverters().size());
@@ -663,7 +663,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEmbeddable ormContextEmbeddable = (EclipseLinkOrmEmbeddable) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextEmbeddable.getConverterHolder();
-		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getXmlEntityMappings().getEmbeddables().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.typeConvertersSize());
 		assertEquals(0, resourceEmbeddable.getTypeConverters().size());
@@ -750,7 +750,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEmbeddable ormContextEmbeddable = (EclipseLinkOrmEmbeddable) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextEmbeddable.getConverterHolder();
-		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getXmlEntityMappings().getEmbeddables().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.objectTypeConvertersSize());
 		assertEquals(0, resourceEmbeddable.getObjectTypeConverters().size());
@@ -827,7 +827,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEmbeddable ormContextEmbeddable = (EclipseLinkOrmEmbeddable) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextEmbeddable.getConverterHolder();
-		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getXmlEntityMappings().getEmbeddables().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.objectTypeConvertersSize());
 		assertEquals(0, resourceEmbeddable.getObjectTypeConverters().size());
@@ -914,7 +914,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEmbeddable ormContextEmbeddable = (EclipseLinkOrmEmbeddable) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextEmbeddable.getConverterHolder();
-		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getXmlEntityMappings().getEmbeddables().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.structConvertersSize());
 		assertEquals(0, resourceEmbeddable.getStructConverters().size());
@@ -991,7 +991,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEmbeddable ormContextEmbeddable = (EclipseLinkOrmEmbeddable) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextEmbeddable.getConverterHolder();
-		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getOrmXmlResource().getEntityMappings().getEmbeddables().get(0);
+		XmlEmbeddable resourceEmbeddable = (XmlEmbeddable) getXmlEntityMappings().getEmbeddables().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.structConvertersSize());
 		assertEquals(0, resourceEmbeddable.getStructConverters().size());
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEntityTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEntityTests.java
index 7ddceb7fd3..2cf2ddbe81 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEntityTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEntityTests.java
@@ -258,7 +258,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkJavaEntity javaContextEntity = (EclipseLinkJavaEntity) ormPersistentType.getJavaPersistentType().getMapping();
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		// check defaults
 		
@@ -369,7 +369,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		createTestEntityForReadOnly();
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		// check defaults
 		
@@ -412,7 +412,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkJavaEntity javaContextEntity = (EclipseLinkJavaEntity) ormPersistentType.getJavaPersistentType().getMapping();
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 
 
 		// check defaults
@@ -490,7 +490,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		createTestEntityForCustomizer();
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		// check defaults
 		
@@ -523,7 +523,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkJavaEntity javaContextEntity = (EclipseLinkJavaEntity) ormPersistentType.getJavaPersistentType().getMapping();
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		// check defaults
 		
@@ -612,7 +612,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		createTestEntityForChangeTracking();
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		// check defaults
 		
@@ -673,7 +673,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		JavaCaching javaContextCaching = ((EclipseLinkJavaEntity) ormPersistentType.getJavaPersistentType().getMapping()).getCaching();
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 
 
 		// check defaults
@@ -750,7 +750,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		// check defaults
 		
@@ -783,7 +783,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		JavaCaching javaContextCaching = ((EclipseLinkJavaEntity) ormPersistentType.getJavaPersistentType().getMapping()).getCaching();
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 
 
 		// check defaults
@@ -860,7 +860,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		// check defaults
 		
@@ -894,7 +894,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		JavaCaching javaContextCaching = ((EclipseLinkJavaEntity) ormPersistentType.getJavaPersistentType().getMapping()).getCaching();
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 
 
 		// check defaults
@@ -971,7 +971,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		// check defaults
 		
@@ -1004,7 +1004,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		JavaCaching javaContextCaching = ((EclipseLinkJavaEntity) ormPersistentType.getJavaPersistentType().getMapping()).getCaching();
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 
 
 		// check defaults
@@ -1097,7 +1097,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		// check defaults
 		
@@ -1130,7 +1130,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		JavaCaching javaContextCaching = ((EclipseLinkJavaEntity) ormPersistentType.getJavaPersistentType().getMapping()).getCaching();
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 
 
 		// check defaults
@@ -1223,7 +1223,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		// check defaults
 		
@@ -1256,7 +1256,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		JavaCaching javaContextCaching = ((EclipseLinkJavaEntity) ormPersistentType.getJavaPersistentType().getMapping()).getCaching();
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 
 
 		// check defaults
@@ -1349,7 +1349,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		// check defaults
 		
@@ -1382,7 +1382,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		JavaCaching javaContextCaching = ((EclipseLinkJavaEntity) ormPersistentType.getJavaPersistentType().getMapping()).getCaching();
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 
 
 		// check defaults
@@ -1475,7 +1475,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		// check defaults
 		
@@ -1506,7 +1506,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		ormContextCaching.setSpecifiedType(CacheType.HARD_WEAK);
 		ormContextCaching.setSpecifiedSize(Integer.valueOf(500));
@@ -1547,7 +1547,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		JavaCaching javaContextCaching = ((EclipseLinkJavaEntity) ormPersistentType.getJavaPersistentType().getMapping()).getCaching();
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 
 
 		// check defaults
@@ -1604,7 +1604,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		// check defaults
 		
@@ -1637,7 +1637,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		JavaCaching javaContextCaching = ((EclipseLinkJavaEntity) ormPersistentType.getJavaPersistentType().getMapping()).getCaching();
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 
 
 		// check defaults
@@ -1706,7 +1706,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		// check defaults
 		
@@ -1733,7 +1733,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		JavaCaching javaContextCaching = ((EclipseLinkJavaEntity) ormPersistentType.getJavaPersistentType().getMapping()).getCaching();
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 
 
 		// check defaults
@@ -1804,7 +1804,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextEntity.getCaching();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		// check defaults
 		
@@ -1839,7 +1839,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextEntity.getConverterHolder();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.customConvertersSize());
 		assertEquals(0, resourceEntity.getConverters().size());
@@ -1916,7 +1916,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextEntity.getConverterHolder();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.customConvertersSize());
 		assertEquals(0, resourceEntity.getConverters().size());
@@ -2003,7 +2003,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextEntity.getConverterHolder();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.typeConvertersSize());
 		assertEquals(0, resourceEntity.getTypeConverters().size());
@@ -2080,7 +2080,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextEntity.getConverterHolder();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.typeConvertersSize());
 		assertEquals(0, resourceEntity.getTypeConverters().size());
@@ -2167,7 +2167,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextEntity.getConverterHolder();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.objectTypeConvertersSize());
 		assertEquals(0, resourceEntity.getObjectTypeConverters().size());
@@ -2244,7 +2244,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextEntity.getConverterHolder();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.objectTypeConvertersSize());
 		assertEquals(0, resourceEntity.getObjectTypeConverters().size());
@@ -2331,7 +2331,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextEntity.getConverterHolder();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.structConvertersSize());
 		assertEquals(0, resourceEntity.getStructConverters().size());
@@ -2408,7 +2408,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmEntity ormContextEntity = (EclipseLinkOrmEntity) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextEntity.getConverterHolder();
-		XmlEntity resourceEntity = (XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+		XmlEntity resourceEntity = (XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.structConvertersSize());
 		assertEquals(0, resourceEntity.getStructConverters().size());
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java
index 69b58d663d..18530fb8d8 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java
@@ -22,7 +22,6 @@ import org.eclipse.jpt.eclipselink.core.context.Convert;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkIdMapping;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmBasicMapping;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmIdMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;
 import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlId;
@@ -97,7 +96,7 @@ public class EclipseLinkOrmIdMappingTests
 		EclipseLinkOrmIdMapping contextId = 
 			(EclipseLinkOrmIdMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity)getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity)getXmlEntityMappings().getEntities().get(0);
 		XmlId resourceId = 
 			(XmlId) resourceEntity.getAttributes().getIds().get(0);
 		EclipseLinkIdMapping javaIdMapping = (EclipseLinkIdMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping();
@@ -180,7 +179,7 @@ public class EclipseLinkOrmIdMappingTests
 		EclipseLinkOrmIdMapping contextId = 
 			(EclipseLinkOrmIdMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity)getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity)getXmlEntityMappings().getEntities().get(0);
 		XmlId resourceId = 
 			(XmlId) resourceEntity.getAttributes().getIds().get(0);
 		EclipseLinkIdMapping javaIdMapping = (EclipseLinkIdMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("myDate").getMapping();
@@ -220,19 +219,19 @@ public class EclipseLinkOrmIdMappingTests
 		assertFalse(contextId.getMutable().isMutable());
 		
 		
-		((EclipseLinkPersistenceUnit) getPersistenceUnit()).getOptions().setTemporalMutable(Boolean.TRUE);
+		getPersistenceUnit().getOptions().setTemporalMutable(Boolean.TRUE);
 		assertNull(resourceId.getMutable());
 		assertTrue(contextId.getMutable().isDefaultMutable());
 		assertNull(contextId.getMutable().getSpecifiedMutable());
 		assertTrue(contextId.getMutable().isMutable());
 		
-		((EclipseLinkPersistenceUnit) getPersistenceUnit()).getOptions().setTemporalMutable(Boolean.FALSE);
+		getPersistenceUnit().getOptions().setTemporalMutable(Boolean.FALSE);
 		assertNull(resourceId.getMutable());
 		assertFalse(contextId.getMutable().isDefaultMutable());
 		assertNull(contextId.getMutable().getSpecifiedMutable());
 		assertFalse(contextId.getMutable().isMutable());
 		
-		((EclipseLinkPersistenceUnit) getPersistenceUnit()).getOptions().setTemporalMutable(null);
+		getPersistenceUnit().getOptions().setTemporalMutable(null);
 		assertNull(resourceId.getMutable());
 		assertFalse(contextId.getMutable().isDefaultMutable());
 		assertNull(contextId.getMutable().getSpecifiedMutable());
@@ -278,7 +277,7 @@ public class EclipseLinkOrmIdMappingTests
 		EclipseLinkOrmIdMapping contextId = 
 			(EclipseLinkOrmIdMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity)getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity)getXmlEntityMappings().getEntities().get(0);
 		XmlId resourceId = 
 			(XmlId) resourceEntity.getAttributes().getIds().get(0);
 		
@@ -323,7 +322,7 @@ public class EclipseLinkOrmIdMappingTests
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "id");
 		OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping();
-		XmlId basicResource = (XmlId) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
+		XmlId basicResource = (XmlId) getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
 		JavaIdMapping javaIdMapping = (JavaIdMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping();
 		
 		assertEquals(null, ormIdMapping.getSpecifiedConverter());
@@ -373,7 +372,7 @@ public class EclipseLinkOrmIdMappingTests
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "basicMapping");
 		OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping();
-		XmlId basicResource = (XmlId) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
+		XmlId basicResource = (XmlId) getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0);
 	
 		assertEquals(null, ormIdMapping.getSpecifiedConverter());
 		assertEquals(null, basicResource.getConvert());
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToManyMappingTests.java
index 64d96265e3..f9b56e0d22 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToManyMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToManyMappingTests.java
@@ -93,7 +93,7 @@ public class EclipseLinkOrmManyToManyMappingTests
 		EclipseLinkRelationshipMapping contextManyToMany = 
 			(EclipseLinkRelationshipMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		XmlManyToMany resourceManyToMany = 
 			(XmlManyToMany) resourceEntity.getAttributes().getManyToManys().get(0);
 		
@@ -132,7 +132,7 @@ public class EclipseLinkOrmManyToManyMappingTests
 		EclipseLinkRelationshipMapping contextManyToMany = 
 			(EclipseLinkRelationshipMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity)getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity)getXmlEntityMappings().getEntities().get(0);
 		XmlManyToMany resourceManyToMany = 
 			(XmlManyToMany) resourceEntity.getAttributes().getManyToManys().get(0);
 		
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToOneMappingTests.java
index 92251994f5..2008db21fa 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToOneMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToOneMappingTests.java
@@ -18,6 +18,7 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne;
 
+@SuppressWarnings("nls")
 public class EclipseLinkOrmManyToOneMappingTests
 	extends EclipseLinkOrmContextModelTestCase
 {
@@ -34,7 +35,7 @@ public class EclipseLinkOrmManyToOneMappingTests
 		EclipseLinkRelationshipMapping contextManyToOne = 
 			(EclipseLinkRelationshipMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		XmlManyToOne resourceManyToOne = 
 			(XmlManyToOne) resourceEntity.getAttributes().getManyToOnes().get(0);
 		
@@ -73,7 +74,7 @@ public class EclipseLinkOrmManyToOneMappingTests
 		EclipseLinkRelationshipMapping contextManyToOne = 
 			(EclipseLinkRelationshipMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity)getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity)getXmlEntityMappings().getEntities().get(0);
 		XmlManyToOne resourceManyToOne = 
 			(XmlManyToOne) resourceEntity.getAttributes().getManyToOnes().get(0);
 		
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmMappedSuperclassTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmMappedSuperclassTests.java
index 0f84ff5b9f..effe3d0519 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmMappedSuperclassTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmMappedSuperclassTests.java
@@ -256,7 +256,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkJavaMappedSuperclass javaContextMappedSuperclass = (EclipseLinkJavaMappedSuperclass) ormPersistentType.getJavaPersistentType().getMapping();
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		// check defaults
 		
@@ -365,7 +365,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		createTestMappedSuperclassForReadOnly();
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		// check defaults
 		
@@ -407,7 +407,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkJavaMappedSuperclass javaContextMappedSuperclass = (EclipseLinkJavaMappedSuperclass) ormPersistentType.getJavaPersistentType().getMapping();
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 
 
 		// check defaults
@@ -485,7 +485,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		createTestMappedSuperclassForCustomizer();
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		// check defaults
 		
@@ -518,7 +518,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkJavaMappedSuperclass javaContextMappedSuperclass = (EclipseLinkJavaMappedSuperclass) ormPersistentType.getJavaPersistentType().getMapping();
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		// check defaults
 		
@@ -607,7 +607,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		createTestMappedSuperclassForChangeTracking();
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		// check defaults
 		
@@ -668,7 +668,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		JavaCaching javaContextCaching = ((EclipseLinkJavaMappedSuperclass) ormPersistentType.getJavaPersistentType().getMapping()).getCaching();
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextMappedSuperclass.getCaching();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 
 
 		// check defaults
@@ -745,7 +745,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextMappedSuperclass.getCaching();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		// check defaults
 		
@@ -778,7 +778,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		JavaCaching javaContextCaching = ((EclipseLinkJavaMappedSuperclass) ormPersistentType.getJavaPersistentType().getMapping()).getCaching();
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextMappedSuperclass.getCaching();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 
 
 		// check defaults
@@ -855,7 +855,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextMappedSuperclass.getCaching();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		// check defaults
 		
@@ -889,7 +889,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		JavaCaching javaContextCaching = ((EclipseLinkJavaMappedSuperclass) ormPersistentType.getJavaPersistentType().getMapping()).getCaching();
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextMappedSuperclass.getCaching();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 
 
 		// check defaults
@@ -966,7 +966,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextMappedSuperclass.getCaching();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		// check defaults
 		
@@ -999,7 +999,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		JavaCaching javaContextCaching = ((EclipseLinkJavaMappedSuperclass) ormPersistentType.getJavaPersistentType().getMapping()).getCaching();
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextMappedSuperclass.getCaching();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 
 
 		// check defaults
@@ -1092,7 +1092,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextMappedSuperclass.getCaching();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		// check defaults
 		
@@ -1125,7 +1125,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		JavaCaching javaContextCaching = ((EclipseLinkJavaMappedSuperclass) ormPersistentType.getJavaPersistentType().getMapping()).getCaching();
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextMappedSuperclass.getCaching();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 
 
 		// check defaults
@@ -1218,7 +1218,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextMappedSuperclass.getCaching();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		// check defaults
 		
@@ -1251,7 +1251,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		JavaCaching javaContextCaching = ((EclipseLinkJavaMappedSuperclass) ormPersistentType.getJavaPersistentType().getMapping()).getCaching();
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextMappedSuperclass.getCaching();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 
 
 		// check defaults
@@ -1344,7 +1344,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextMappedSuperclass.getCaching();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		// check defaults
 		
@@ -1377,7 +1377,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		JavaCaching javaContextCaching = ((EclipseLinkJavaMappedSuperclass) ormPersistentType.getJavaPersistentType().getMapping()).getCaching();
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextMappedSuperclass.getCaching();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 
 
 		// check defaults
@@ -1470,7 +1470,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextMappedSuperclass.getCaching();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		// check defaults
 		
@@ -1503,7 +1503,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		JavaCaching javaContextCaching = ((EclipseLinkJavaMappedSuperclass) ormPersistentType.getJavaPersistentType().getMapping()).getCaching();
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextMappedSuperclass.getCaching();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 
 
 		// check defaults
@@ -1560,7 +1560,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		Caching ormContextCaching = ormContextMappedSuperclass.getCaching();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		// check defaults
 		
@@ -1588,11 +1588,11 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 	}
 	public void testUpdateCustomConverters() throws Exception {
 		createTestMappedSuperclassForConverters();
-		EclipseLinkPersistenceUnit persistenceUnit = (EclipseLinkPersistenceUnit) getPersistenceUnit();
+		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextMappedSuperclass.getConverterHolder();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.customConvertersSize());
 		assertEquals(0, resourceMappedSuperclass.getConverters().size());
@@ -1665,11 +1665,11 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 
 	public void testModifyCustomConverters() throws Exception {
 		createTestMappedSuperclassForConverters();
-		EclipseLinkPersistenceUnit persistenceUnit = (EclipseLinkPersistenceUnit) getPersistenceUnit();
+		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextMappedSuperclass.getConverterHolder();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.customConvertersSize());
 		assertEquals(0, resourceMappedSuperclass.getConverters().size());
@@ -1752,11 +1752,11 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 	
 	public void testUpdateTypeConverters() throws Exception {
 		createTestMappedSuperclassForTypeConverters();
-		EclipseLinkPersistenceUnit persistenceUnit = (EclipseLinkPersistenceUnit) getPersistenceUnit();
+		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextMappedSuperclass.getConverterHolder();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.typeConvertersSize());
 		assertEquals(0, resourceMappedSuperclass.getTypeConverters().size());
@@ -1829,11 +1829,11 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 
 	public void testModifyTypeConverters() throws Exception {
 		createTestMappedSuperclassForTypeConverters();
-		EclipseLinkPersistenceUnit persistenceUnit = (EclipseLinkPersistenceUnit) getPersistenceUnit();
+		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextMappedSuperclass.getConverterHolder();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.typeConvertersSize());
 		assertEquals(0, resourceMappedSuperclass.getTypeConverters().size());
@@ -1916,11 +1916,11 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 	
 	public void testUpdateObjectTypeConverters() throws Exception {
 		createTestMappedSuperclassForObjectTypeConverters();
-		EclipseLinkPersistenceUnit persistenceUnit = (EclipseLinkPersistenceUnit) getPersistenceUnit();
+		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextMappedSuperclass.getConverterHolder();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.objectTypeConvertersSize());
 		assertEquals(0, resourceMappedSuperclass.getObjectTypeConverters().size());
@@ -1993,11 +1993,11 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 
 	public void testModifyObjectTypeConverters() throws Exception {
 		createTestMappedSuperclassForObjectTypeConverters();
-		EclipseLinkPersistenceUnit persistenceUnit = (EclipseLinkPersistenceUnit) getPersistenceUnit();
+		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextMappedSuperclass.getConverterHolder();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.objectTypeConvertersSize());
 		assertEquals(0, resourceMappedSuperclass.getObjectTypeConverters().size());
@@ -2080,11 +2080,11 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 	
 	public void testUpdateStructConverters() throws Exception {
 		createTestMappedSuperclassForStructConverters();
-		EclipseLinkPersistenceUnit persistenceUnit = (EclipseLinkPersistenceUnit) getPersistenceUnit();
+		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextMappedSuperclass.getConverterHolder();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.structConvertersSize());
 		assertEquals(0, resourceMappedSuperclass.getStructConverters().size());
@@ -2157,11 +2157,11 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo
 
 	public void testModifyStructConverters() throws Exception {
 		createTestMappedSuperclassForStructConverters();
-		EclipseLinkPersistenceUnit persistenceUnit = (EclipseLinkPersistenceUnit) getPersistenceUnit();
+		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		EclipseLinkOrmMappedSuperclass ormContextMappedSuperclass = (EclipseLinkOrmMappedSuperclass) ormPersistentType.getMapping();
 		ConverterHolder ormContextConverterHolder = ormContextMappedSuperclass.getConverterHolder();
-		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getOrmXmlResource().getEntityMappings().getMappedSuperclasses().get(0);
+		XmlMappedSuperclass resourceMappedSuperclass = (XmlMappedSuperclass) getXmlEntityMappings().getMappedSuperclasses().get(0);
 		
 		assertEquals(0, ormContextConverterHolder.structConvertersSize());
 		assertEquals(0, resourceMappedSuperclass.getStructConverters().size());
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmObjectTypeConverterTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmObjectTypeConverterTests.java
index bbb413107f..99d679f6c7 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmObjectTypeConverterTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmObjectTypeConverterTests.java
@@ -106,7 +106,7 @@ public class EclipseLinkOrmObjectTypeConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER);
 		ObjectTypeConverter ormConverter = (ObjectTypeConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlObjectTypeConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
+		XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
 		JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping();
 		
 		assertEquals(null, ormConverter.getDataType());
@@ -151,7 +151,7 @@ public class EclipseLinkOrmObjectTypeConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER);
 		ObjectTypeConverter ormConverter = (ObjectTypeConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlObjectTypeConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
+		XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
 	
 		assertEquals(null, ormConverter.getDataType());
 		assertEquals(null, converterResource.getDataType());
@@ -175,7 +175,7 @@ public class EclipseLinkOrmObjectTypeConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER);
 		ObjectTypeConverter ormConverter = (ObjectTypeConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlObjectTypeConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
+		XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
 		JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping();
 		
 		assertEquals(null, ormConverter.getObjectType());
@@ -220,7 +220,7 @@ public class EclipseLinkOrmObjectTypeConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER);
 		ObjectTypeConverter ormConverter = (ObjectTypeConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlObjectTypeConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
+		XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
 	
 		assertEquals(null, ormConverter.getObjectType());
 		assertEquals(null, converterResource.getObjectType());
@@ -244,7 +244,7 @@ public class EclipseLinkOrmObjectTypeConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER);
 		EclipseLinkOrmObjectTypeConverter ormConverter = (EclipseLinkOrmObjectTypeConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlObjectTypeConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
+		XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
 		JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping();
 		
 		assertEquals(null, ormConverter.getName());
@@ -292,7 +292,7 @@ public class EclipseLinkOrmObjectTypeConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER);
 		EclipseLinkOrmObjectTypeConverter ormConverter = (EclipseLinkOrmObjectTypeConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlObjectTypeConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
+		XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
 	
 		assertEquals(null, ormConverter.getName());
 		assertEquals(null, converterResource.getName());
@@ -316,7 +316,7 @@ public class EclipseLinkOrmObjectTypeConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER);
 		ObjectTypeConverter ormConverter = (ObjectTypeConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlObjectTypeConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
+		XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
 		JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping();
 		
 		assertEquals(null, ormConverter.getDefaultObjectValue());
@@ -361,7 +361,7 @@ public class EclipseLinkOrmObjectTypeConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER);
 		ObjectTypeConverter ormConverter = (ObjectTypeConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlObjectTypeConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
+		XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
 	
 		assertEquals(null, ormConverter.getDefaultObjectValue());
 		assertEquals(null, converterResource.getDefaultObjectValue());
@@ -386,7 +386,7 @@ public class EclipseLinkOrmObjectTypeConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER);
 		ObjectTypeConverter ormConverter = (ObjectTypeConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlObjectTypeConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
+		XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
 		JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping();
 
 		assertEquals(0, ormConverter.conversionValuesSize());
@@ -500,7 +500,7 @@ public class EclipseLinkOrmObjectTypeConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER);
 		ObjectTypeConverter ormConverter = (ObjectTypeConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlObjectTypeConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
+		XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter();
 		
 		assertEquals(0, ormConverter.conversionValuesSize());
 		assertEquals(0, converterResource.getConversionValues().size());
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java
index d81e70e875..c51a34915e 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java
@@ -91,7 +91,7 @@ public class EclipseLinkOrmOneToManyMappingTests
 		EclipseLinkOneToManyMapping contextOneToMany = 
 			(EclipseLinkOneToManyMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		XmlOneToMany resourceOneToMany = 
 			(XmlOneToMany) resourceEntity.getAttributes().getOneToManys().get(0);
 		
@@ -123,7 +123,7 @@ public class EclipseLinkOrmOneToManyMappingTests
 		EclipseLinkOneToManyMapping contextOneToMany = 
 			(EclipseLinkOneToManyMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity)getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity)getXmlEntityMappings().getEntities().get(0);
 		XmlOneToMany resourceOneToMany = 
 			(XmlOneToMany) resourceEntity.getAttributes().getOneToManys().get(0);
 		
@@ -155,7 +155,7 @@ public class EclipseLinkOrmOneToManyMappingTests
 		EclipseLinkOneToManyMapping contextOneToMany = 
 			(EclipseLinkOneToManyMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		XmlOneToMany resourceOneToMany = 
 			(XmlOneToMany) resourceEntity.getAttributes().getOneToManys().get(0);
 		
@@ -194,7 +194,7 @@ public class EclipseLinkOrmOneToManyMappingTests
 		EclipseLinkOneToManyMapping contextOneToMany = 
 			(EclipseLinkOneToManyMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity)getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity)getXmlEntityMappings().getEntities().get(0);
 		XmlOneToMany resourceOneToMany = 
 			(XmlOneToMany) resourceEntity.getAttributes().getOneToManys().get(0);
 		
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToOneMappingTests.java
index 28349c5f3b..1dd9ef9639 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToOneMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToOneMappingTests.java
@@ -18,6 +18,7 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne;
 
+@SuppressWarnings("nls")
 public class EclipseLinkOrmOneToOneMappingTests
 	extends EclipseLinkOrmContextModelTestCase
 {
@@ -34,7 +35,7 @@ public class EclipseLinkOrmOneToOneMappingTests
 		EclipseLinkOneToOneMapping contextOneToOne = 
 			(EclipseLinkOneToOneMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity)getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity)getXmlEntityMappings().getEntities().get(0);
 		XmlOneToOne resourceOneToOne = 
 			(XmlOneToOne) resourceEntity.getAttributes().getOneToOnes().get(0);
 		
@@ -66,7 +67,7 @@ public class EclipseLinkOrmOneToOneMappingTests
 		EclipseLinkOneToOneMapping contextOneToOne = 
 			(EclipseLinkOneToOneMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity)getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity)getXmlEntityMappings().getEntities().get(0);
 		XmlOneToOne resourceOneToOne = 
 			(XmlOneToOne) resourceEntity.getAttributes().getOneToOnes().get(0);
 		
@@ -95,7 +96,7 @@ public class EclipseLinkOrmOneToOneMappingTests
 		EclipseLinkOneToOneMapping contextOneToOne = 
 			(EclipseLinkOneToOneMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity) getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity) getXmlEntityMappings().getEntities().get(0);
 		XmlOneToOne resourceOneToOne = 
 			(XmlOneToOne) resourceEntity.getAttributes().getOneToOnes().get(0);
 		
@@ -134,7 +135,7 @@ public class EclipseLinkOrmOneToOneMappingTests
 		EclipseLinkOneToOneMapping contextOneToOne = 
 			(EclipseLinkOneToOneMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity)getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity)getXmlEntityMappings().getEntities().get(0);
 		XmlOneToOne resourceOneToOne = 
 			(XmlOneToOne) resourceEntity.getAttributes().getOneToOnes().get(0);
 		
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmPersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmPersistentAttributeTests.java
index c0eb65c618..786723c315 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmPersistentAttributeTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmPersistentAttributeTests.java
@@ -27,6 +27,7 @@ import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class EclipseLinkOrmPersistentAttributeTests extends ContextModelTestCase
 {
 	public EclipseLinkOrmPersistentAttributeTests(String name) {
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmStructConverterTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmStructConverterTests.java
index d6d81c60d5..b8aac797e4 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmStructConverterTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmStructConverterTests.java
@@ -75,7 +75,7 @@ public class EclipseLinkOrmStructConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.STRUCT_CONVERTER);
 		StructConverter ormConverter = (StructConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlStructConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getStructConverter();
+		XmlStructConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getStructConverter();
 		JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping();
 		
 		assertEquals(null, ormConverter.getConverterClass());
@@ -120,7 +120,7 @@ public class EclipseLinkOrmStructConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.STRUCT_CONVERTER);
 		StructConverter ormConverter = (StructConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlStructConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getStructConverter();
+		XmlStructConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getStructConverter();
 	
 		assertEquals(null, ormConverter.getConverterClass());
 		assertEquals(null, converterResource.getConverter());
@@ -144,7 +144,7 @@ public class EclipseLinkOrmStructConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.STRUCT_CONVERTER);
 		EclipseLinkOrmStructConverter ormConverter = (EclipseLinkOrmStructConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlStructConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getStructConverter();
+		XmlStructConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getStructConverter();
 		JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping();
 		
 		assertEquals(null, ormConverter.getName());
@@ -192,7 +192,7 @@ public class EclipseLinkOrmStructConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.STRUCT_CONVERTER);
 		EclipseLinkOrmStructConverter ormConverter = (EclipseLinkOrmStructConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlStructConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getStructConverter();
+		XmlStructConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getStructConverter();
 	
 		assertEquals(null, ormConverter.getName());
 		assertEquals(null, converterResource.getName());
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmTypeConverterTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmTypeConverterTests.java
index 5258548128..a2176ed69a 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmTypeConverterTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmTypeConverterTests.java
@@ -75,7 +75,7 @@ public class EclipseLinkOrmTypeConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.TYPE_CONVERTER);
 		TypeConverter ormConverter = (TypeConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlTypeConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverter();
+		XmlTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverter();
 		JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping();
 		
 		assertEquals(null, ormConverter.getDataType());
@@ -120,7 +120,7 @@ public class EclipseLinkOrmTypeConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.TYPE_CONVERTER);
 		TypeConverter ormConverter = (TypeConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlTypeConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverter();
+		XmlTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverter();
 	
 		assertEquals(null, ormConverter.getDataType());
 		assertEquals(null, converterResource.getDataType());
@@ -144,7 +144,7 @@ public class EclipseLinkOrmTypeConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.TYPE_CONVERTER);
 		TypeConverter ormConverter = (TypeConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlTypeConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverter();
+		XmlTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverter();
 		JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping();
 		
 		assertEquals(null, ormConverter.getObjectType());
@@ -189,7 +189,7 @@ public class EclipseLinkOrmTypeConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.TYPE_CONVERTER);
 		TypeConverter ormConverter = (TypeConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlTypeConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverter();
+		XmlTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverter();
 	
 		assertEquals(null, ormConverter.getObjectType());
 		assertEquals(null, converterResource.getObjectType());
@@ -213,7 +213,7 @@ public class EclipseLinkOrmTypeConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.TYPE_CONVERTER);
 		EclipseLinkOrmTypeConverter ormConverter = (EclipseLinkOrmTypeConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlTypeConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverter();
+		XmlTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverter();
 		JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping();
 		
 		assertEquals(null, ormConverter.getName());
@@ -261,7 +261,7 @@ public class EclipseLinkOrmTypeConverterTests
 		ormBasicMapping.setSpecifiedConverter(Convert.ECLIPSE_LINK_CONVERTER);
 		((Convert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.TYPE_CONVERTER);
 		EclipseLinkOrmTypeConverter ormConverter = (EclipseLinkOrmTypeConverter) ((Convert) ormBasicMapping.getConverter()).getConverter();
-		XmlTypeConverter converterResource = ((XmlBasic) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverter();
+		XmlTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverter();
 	
 		assertEquals(null, ormConverter.getName());
 		assertEquals(null, converterResource.getName());
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java
index 00e76be969..bab68e9029 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java
@@ -22,7 +22,6 @@ import org.eclipse.jpt.eclipselink.core.context.Convert;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkVersionMapping;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmBasicMapping;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmVersionMapping;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;
 import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkJPA;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion;
@@ -97,7 +96,7 @@ public class EclipseLinkOrmVersionMappingTests
 		EclipseLinkOrmVersionMapping contextVersion = 
 			(EclipseLinkOrmVersionMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity)getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity)getXmlEntityMappings().getEntities().get(0);
 		XmlVersion resourceVersion = 
 			(XmlVersion) resourceEntity.getAttributes().getVersions().get(0);
 		EclipseLinkVersionMapping javaVersionMapping = (EclipseLinkVersionMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping();
@@ -180,7 +179,7 @@ public class EclipseLinkOrmVersionMappingTests
 		EclipseLinkOrmVersionMapping contextVersion = 
 			(EclipseLinkOrmVersionMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity)getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity)getXmlEntityMappings().getEntities().get(0);
 		XmlVersion resourceVersion = 
 			(XmlVersion) resourceEntity.getAttributes().getVersions().get(0);
 		EclipseLinkVersionMapping javaVersionMapping = (EclipseLinkVersionMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("myDate").getMapping();
@@ -220,19 +219,19 @@ public class EclipseLinkOrmVersionMappingTests
 		assertFalse(contextVersion.getMutable().isMutable());
 		
 		
-		((EclipseLinkPersistenceUnit) getPersistenceUnit()).getOptions().setTemporalMutable(Boolean.TRUE);
+		getPersistenceUnit().getOptions().setTemporalMutable(Boolean.TRUE);
 		assertNull(resourceVersion.getMutable());
 		assertTrue(contextVersion.getMutable().isDefaultMutable());
 		assertNull(contextVersion.getMutable().getSpecifiedMutable());
 		assertTrue(contextVersion.getMutable().isMutable());
 		
-		((EclipseLinkPersistenceUnit) getPersistenceUnit()).getOptions().setTemporalMutable(Boolean.FALSE);
+		getPersistenceUnit().getOptions().setTemporalMutable(Boolean.FALSE);
 		assertNull(resourceVersion.getMutable());
 		assertFalse(contextVersion.getMutable().isDefaultMutable());
 		assertNull(contextVersion.getMutable().getSpecifiedMutable());
 		assertFalse(contextVersion.getMutable().isMutable());
 		
-		((EclipseLinkPersistenceUnit) getPersistenceUnit()).getOptions().setTemporalMutable(null);
+		getPersistenceUnit().getOptions().setTemporalMutable(null);
 		assertNull(resourceVersion.getMutable());
 		assertFalse(contextVersion.getMutable().isDefaultMutable());
 		assertNull(contextVersion.getMutable().getSpecifiedMutable());
@@ -278,7 +277,7 @@ public class EclipseLinkOrmVersionMappingTests
 		EclipseLinkOrmVersionMapping contextVersion = 
 			(EclipseLinkOrmVersionMapping) ormPersistentAttribute.getMapping();
 		XmlEntity resourceEntity = 
-			(XmlEntity)getOrmXmlResource().getEntityMappings().getEntities().get(0);
+			(XmlEntity)getXmlEntityMappings().getEntities().get(0);
 		XmlVersion resourceVersion = 
 			(XmlVersion) resourceEntity.getAttributes().getVersions().get(0);
 		
@@ -323,7 +322,7 @@ public class EclipseLinkOrmVersionMappingTests
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY, "id");
 		OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping();
-		XmlVersion basicResource = (XmlVersion) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0);
+		XmlVersion basicResource = (XmlVersion) getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0);
 		JavaVersionMapping javaVersionMapping = (JavaVersionMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping();
 		
 		assertEquals(null, ormVersionMapping.getSpecifiedConverter());
@@ -373,7 +372,7 @@ public class EclipseLinkOrmVersionMappingTests
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedPersistentAttribute(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY, "basicMapping");
 		OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping();
-		XmlVersion basicResource = (XmlVersion) getOrmXmlResource().getEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0);
+		XmlVersion basicResource = (XmlVersion) getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0);
 	
 		assertEquals(null, ormVersionMapping.getSpecifiedConverter());
 		assertEquals(null, basicResource.getConvert());
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/persistence/EclipseLinkPersistenceUnitTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/persistence/EclipseLinkPersistenceUnitTests.java
index 591f975f7f..4b69236f78 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/persistence/EclipseLinkPersistenceUnitTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/persistence/EclipseLinkPersistenceUnitTests.java
@@ -12,6 +12,7 @@ package org.eclipse.jpt.eclipselink.core.tests.internal.context.persistence;
 import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProperties;
 import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProvider;
 import org.eclipse.jpt.core.internal.operations.OrmFileCreationDataModelProperties;
+import org.eclipse.jpt.core.resource.common.JpaXmlResource;
 import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
@@ -19,7 +20,6 @@ import org.eclipse.jpt.core.tests.internal.projects.TestJpaProject;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaPlatformProvider;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;
 import org.eclipse.jpt.eclipselink.core.internal.operations.EclipseLinkOrmFileCreationDataModelProvider;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
 import org.eclipse.jpt.eclipselink.core.tests.internal.context.orm.EclipseLinkOrmContextModelTestCase;
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
@@ -55,15 +55,15 @@ public class EclipseLinkPersistenceUnitTests
 		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		
 		// test that there is one initially
-		EclipseLinkOrmXmlResource eclipseLinkOrmResource = getOrmXmlResource();
-		assertTrue(eclipseLinkOrmResource.exists());
+		JpaXmlResource eclipseLinkOrmResource = getOrmXmlResource();
+		assertTrue(eclipseLinkOrmResource.fileExists());
 		assertNotNull(persistenceUnit.getImpliedMappingFileRef());
 		assertNotNull(persistenceUnit.getImpliedEclipseLinkMappingFileRef());
 		
 		// remove eclipselink-orm.xml
 		deleteResource(eclipseLinkOrmResource);
 		
-		assertFalse(eclipseLinkOrmResource.exists());
+		assertFalse(eclipseLinkOrmResource.fileExists());
 		assertNotNull(persistenceUnit.getImpliedMappingFileRef());
 		assertNull(persistenceUnit.getImpliedEclipseLinkMappingFileRef());
 	}
@@ -73,8 +73,8 @@ public class EclipseLinkPersistenceUnitTests
 		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		
 		// test that there is one initially
-		EclipseLinkOrmXmlResource eclipseLinkOrmResource = getOrmXmlResource();
-		assertTrue(eclipseLinkOrmResource.exists());
+		JpaXmlResource eclipseLinkOrmResource = getOrmXmlResource();
+		assertTrue(eclipseLinkOrmResource.fileExists());
 		assertNotNull(persistenceUnit.getImpliedMappingFileRef());
 		assertNotNull(persistenceUnit.getImpliedEclipseLinkMappingFileRef());
 		
@@ -85,7 +85,7 @@ public class EclipseLinkPersistenceUnitTests
 		
 		assertEquals(1, CollectionTools.size(persistenceUnit.specifiedMappingFileRefs()));
 		
-		assertTrue(eclipseLinkOrmResource.exists());
+		assertTrue(eclipseLinkOrmResource.fileExists());
 		assertNotNull(persistenceUnit.getImpliedMappingFileRef());
 		assertNull(persistenceUnit.getImpliedEclipseLinkMappingFileRef());
 	}
@@ -94,15 +94,15 @@ public class EclipseLinkPersistenceUnitTests
 		EclipseLinkPersistenceUnit persistenceUnit = getPersistenceUnit();
 		
 		// test that there is one initially
-		EclipseLinkOrmXmlResource eclipseLinkOrmResource = getOrmXmlResource();
-		assertTrue(eclipseLinkOrmResource.exists());
+		JpaXmlResource eclipseLinkOrmResource = getOrmXmlResource();
+		assertTrue(eclipseLinkOrmResource.fileExists());
 		assertNotNull(persistenceUnit.getImpliedMappingFileRef());
 		assertNotNull(persistenceUnit.getImpliedEclipseLinkMappingFileRef());
 		
 		// ignore in persistence unit
 		persistenceUnit.getGeneralProperties().setExcludeEclipselinkOrm(Boolean.TRUE);
 		
-		assertTrue(eclipseLinkOrmResource.exists());
+		assertTrue(eclipseLinkOrmResource.fileExists());
 		assertNotNull(persistenceUnit.getImpliedMappingFileRef());
 		assertNull(persistenceUnit.getImpliedEclipseLinkMappingFileRef());
 	}
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/JptEclipselinkCoreResourceModelTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/JptEclipselinkCoreResourceModelTests.java
index baf0eba59a..9003ccf6a2 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/JptEclipselinkCoreResourceModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/JptEclipselinkCoreResourceModelTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2007 Oracle. 
+ *  Copyright (c) 2007, 2009 Oracle. 
  *  All rights reserved.  This program and the accompanying materials 
  *  are made available under the terms of the Eclipse Public License v1.0 
  *  which accompanies this distribution, and is available at 
@@ -14,7 +14,6 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import org.eclipse.jpt.eclipselink.core.tests.internal.resource.java.JptEclipseLinkCoreJavaResourceModelTests;
-import org.eclipse.jpt.eclipselink.core.tests.internal.resource.orm.EclipseLinkOrmResourceModelTests;
 
 public class JptEclipselinkCoreResourceModelTests extends TestCase
 {
@@ -25,7 +24,6 @@ public class JptEclipselinkCoreResourceModelTests extends TestCase
 	public static Test suite(boolean all) {
 		TestSuite suite = new TestSuite(JptEclipselinkCoreResourceModelTests.class.getName());
 		suite.addTest(JptEclipseLinkCoreJavaResourceModelTests.suite(all));
-		suite.addTestSuite(EclipseLinkOrmResourceModelTests.class);
 		return suite;
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/orm/EclipseLinkOrmResourceModelTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/orm/EclipseLinkOrmResourceModelTests.java
deleted file mode 100644
index dad30df6b1..0000000000
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/orm/EclipseLinkOrmResourceModelTests.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.tests.internal.resource.orm;
-
-import junit.framework.TestCase;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jpt.core.tests.internal.projects.TestJpaProject;
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.EclipseLinkOrmXmlResourceProvider;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmXmlResource;
-
-public class EclipseLinkOrmResourceModelTests extends TestCase
-{
-	static final String BASE_PROJECT_NAME = EclipseLinkOrmResourceModelTests.class.getSimpleName();
-	
-	TestJpaProject jpaProject;
-
-	
-	public EclipseLinkOrmResourceModelTests(String name) {
-		super(name);
-	}
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		this.jpaProject = TestJpaProject.buildJpaProject(BASE_PROJECT_NAME, false); // false = no auto-build
-	}
-	
-	protected void createFile() throws CoreException {
-		EclipseLinkOrmXmlResourceProvider modelProvider = 
-			EclipseLinkOrmXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
-		modelProvider.createResource();
-	}
-	
-	@Override
-	protected void tearDown() throws Exception {
-		this.jpaProject.getProject().delete(true, true, null);
-		this.jpaProject = null;
-		super.tearDown();
-	}
-	
-	public void testModelLoad() {
-		EclipseLinkOrmXmlResourceProvider modelProvider = 
-			EclipseLinkOrmXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
-		assertNotNull(modelProvider);
-		EclipseLinkOrmXmlResource resource = (EclipseLinkOrmXmlResource) modelProvider.getXmlResource();
-		assertNotNull(resource);
-	}
-	
-	public void testModelLoad2() {
-		EclipseLinkOrmXmlResourceProvider modelProvider = 
-			EclipseLinkOrmXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
-		assertNotNull(modelProvider);
-		EclipseLinkOrmXmlResource resource = (EclipseLinkOrmXmlResource) modelProvider.getXmlResource();
-		assertNotNull(resource);
-	}
-	
-	public void testModelLoadForDifferentlyNamedOrmXml() {
-		EclipseLinkOrmXmlResourceProvider modelProvider = 
-			EclipseLinkOrmXmlResourceProvider.getXmlResourceProvider(
-				jpaProject.getProject(),"META-INF/eclipselink-orm2.xml");
-		assertNotNull(modelProvider);
-		EclipseLinkOrmXmlResource resource = (EclipseLinkOrmXmlResource) modelProvider.getXmlResource();
-		assertNotNull(resource);
-	}
-	
-	public void testCreateFile() throws CoreException {
-		createFile();
-		EclipseLinkOrmXmlResourceProvider modelProvider = 
-			EclipseLinkOrmXmlResourceProvider.getDefaultXmlResourceProvider(jpaProject.getProject());
-		assertNotNull(modelProvider);
-		EclipseLinkOrmXmlResource resource = (EclipseLinkOrmXmlResource) modelProvider.getXmlResource();
-		assertNotNull(resource);
-		assertTrue(resource.exists());
-	}
-}