[258541] JPA 2.0 default delimited identifiers - model

18 files changed, 112 insertions, 112 deletions

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 5992f74b55..25819715cf 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
@@ -348,7 +348,7 @@ public class JpaFileTests extends ContextModelTestCase
 	
 		ormPersistentType.setMappingKey(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY);
 		assertEquals(1, javaJpaFile.rootStructureNodesSize());
-		javaPersistentType = getEntityMappings().persistentTypes().next().getJavaPersistentType();
+		javaPersistentType = getEntityMappings().getPersistentTypes().iterator().next().getJavaPersistentType();
 		assertEquals(javaPersistentType, javaJpaFile.rootStructureNodes().next());
 		
 		getEntityMappings().removePersistentType(0);
@@ -368,7 +368,7 @@ public class JpaFileTests extends ContextModelTestCase
 		MappingFileRef mappingFileRef = getPersistenceUnit().mappingFileRefs().next();
 		mappingFileRef.setFileName("foo");
 		
-		ormPersistentType = ((EntityMappings) getPersistenceUnit().getImpliedMappingFileRef().getMappingFile().getMappingFileRoot()).persistentTypes().next();
+		ormPersistentType = ((EntityMappings) getPersistenceUnit().getImpliedMappingFileRef().getMappingFile().getRoot()).getPersistentTypes().iterator().next();
 		assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.rootStructureNodes().next());
 		
 		IFile file = getPersistenceXmlResource().getFile();
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/GenericJavaPersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/GenericJavaPersistentTypeTests.java
index c7e5a1220d..33c2f55a3b 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/GenericJavaPersistentTypeTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/GenericJavaPersistentTypeTests.java
@@ -324,7 +324,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase
 		
 		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
 		addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild");
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.FIELD);
+		getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.FIELD);
 
 		ListIterator<ClassRef> classRefs = getPersistenceUnit().specifiedClassRefs();
 		classRefs.next();
@@ -362,10 +362,10 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase
 		JavaPersistentType javaPersistentType = entityPersistentType.getJavaPersistentType(); 
 		assertEquals(AccessType.FIELD, javaPersistentType.getAccess());
 
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.FIELD);
+		getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.FIELD);
 		assertEquals(AccessType.FIELD, javaPersistentType.getAccess());
 
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
+		getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
 		assertEquals(AccessType.PROPERTY, javaPersistentType.getAccess());
 	}
 	
@@ -394,7 +394,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase
 		createTestEntityAnnotatedField();
 		JavaPersistentType javaPersistentType = entityPersistentType.getJavaPersistentType(); 
 
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
+		getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
 		assertEquals(AccessType.FIELD, javaPersistentType.getAccess());
 	}
 
@@ -418,7 +418,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase
 		createTestEntityAnnotatedField();
 		JavaPersistentType javaPersistentType = entityPersistentType.getJavaPersistentType(); 
 
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
+		getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
 		getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
 		assertEquals(AccessType.FIELD, javaPersistentType.getAccess());
 		
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaBasicMappingTests.java
index d9e9120366..d28d59fc66 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaBasicMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaBasicMappingTests.java
@@ -246,7 +246,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase
 		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
 		
 		createOrmXmlFile();
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
+		getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
 		PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next();
 		BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping();
 		assertNull(basicMapping.getSpecifiedFetch());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java
index 833b7edce7..8afa665866 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java
@@ -502,7 +502,7 @@ public class JavaEntityTests extends ContextModelTestCase
 		assertEquals(AccessType.FIELD, superPersistentType.getAccess());
 		assertEquals(AccessType.FIELD, childPersistentType.getAccess());
 		
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
+		getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
 		assertEquals(AccessType.PROPERTY, superPersistentType.getAccess());
 		assertEquals(AccessType.PROPERTY, childPersistentType.getAccess());
 		
@@ -543,7 +543,7 @@ public class JavaEntityTests extends ContextModelTestCase
 		((BasicMapping) getJavaPersistentType().getAttributeNamed("id").getMapping()).getColumn().setSpecifiedName(null);
 		assertEquals(AccessType.FIELD, getJavaPersistentType().getAccess());
 		
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
+		getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
 		assertEquals(AccessType.PROPERTY, getJavaPersistentType().getAccess());
 		
 		getEntityMappings().setSpecifiedAccess(AccessType.FIELD);
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableGeneratorTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableGeneratorTests.java
index 1a1e8e1d8e..1b8b01a726 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableGeneratorTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableGeneratorTests.java
@@ -205,7 +205,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase
 		
 		assertNull(idMapping.getGeneratorContainer().getTableGenerator().getDefaultSchema());
 		
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema("FOO");
+		getEntityMappings().getPersistenceUnitDefaults().setSpecifiedSchema("FOO");
 		assertEquals("FOO", idMapping.getGeneratorContainer().getTableGenerator().getDefaultSchema());
 		
 		getEntityMappings().setSpecifiedSchema("BAR");
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableTests.java
index 262e40d131..cc7ba3d18a 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableTests.java
@@ -168,7 +168,7 @@ public class JavaTableTests extends ContextModelTestCase
 		
 		assertNull(javaEntity.getTable().getDefaultSchema());
 		
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema("FOO");
+		getEntityMappings().getPersistenceUnitDefaults().setSpecifiedSchema("FOO");
 		assertEquals("FOO", javaEntity.getTable().getDefaultSchema());
 		
 		getEntityMappings().setSpecifiedSchema("BAR");
@@ -285,7 +285,7 @@ public class JavaTableTests extends ContextModelTestCase
 		
 		assertNull(javaEntity.getTable().getDefaultCatalog());
 		
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog("FOO");
+		getEntityMappings().getPersistenceUnitDefaults().setSpecifiedCatalog("FOO");
 		assertEquals("FOO", javaEntity.getTable().getDefaultCatalog());
 		
 		getEntityMappings().setSpecifiedCatalog("BAR");
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 69fe5297eb..de8b9b1268 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
@@ -193,13 +193,13 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertNull(getEntityMappings().getSpecifiedSchema());
 		assertNull(getXmlEntityMappings().getSchema());
 
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema("DEFAULT_SCHEMA");
+		getEntityMappings().getPersistenceUnitDefaults().setSpecifiedSchema("DEFAULT_SCHEMA");
 		assertEquals("DEFAULT_SCHEMA", getEntityMappings().getDefaultSchema());
 		assertEquals("DEFAULT_SCHEMA", getEntityMappings().getSchema());
 		assertNull(getEntityMappings().getSpecifiedSchema());
 		assertNull(getXmlEntityMappings().getSchema());
 		
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema(null);
+		getEntityMappings().getPersistenceUnitDefaults().setSpecifiedSchema(null);
 		assertNull(getEntityMappings().getDefaultSchema());
 		assertNull(getEntityMappings().getSchema());
 		assertNull(getEntityMappings().getSpecifiedSchema());
@@ -260,13 +260,13 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertNull(getEntityMappings().getSpecifiedCatalog());
 		assertNull(getXmlEntityMappings().getCatalog());
 
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog("DEFAULT_CATALOG");
+		getEntityMappings().getPersistenceUnitDefaults().setSpecifiedCatalog("DEFAULT_CATALOG");
 		assertEquals("DEFAULT_CATALOG", getEntityMappings().getDefaultCatalog());
 		assertEquals("DEFAULT_CATALOG", getEntityMappings().getCatalog());
 		assertNull(getEntityMappings().getSpecifiedCatalog());
 		assertNull(getXmlEntityMappings().getCatalog());
 		
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog(null);
+		getEntityMappings().getPersistenceUnitDefaults().setSpecifiedCatalog(null);
 		assertNull(getEntityMappings().getDefaultCatalog());
 		assertNull(getEntityMappings().getCatalog());
 		assertNull(getEntityMappings().getSpecifiedCatalog());
@@ -345,13 +345,13 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertNull(getEntityMappings().getSpecifiedAccess());
 		assertNull(getXmlEntityMappings().getAccess());
 
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.FIELD);
+		getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.FIELD);
 		assertEquals(AccessType.FIELD, getEntityMappings().getDefaultAccess());
 		assertEquals(AccessType.FIELD, getEntityMappings().getAccess());
 		assertNull(getEntityMappings().getSpecifiedAccess());
 		assertNull(getXmlEntityMappings().getAccess());
 		
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(null);
+		getEntityMappings().getPersistenceUnitDefaults().setAccess(null);
 		assertNull(getEntityMappings().getDefaultAccess());
 		assertNull(getEntityMappings().getAccess());
 		assertNull(getEntityMappings().getSpecifiedAccess());
@@ -360,7 +360,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 
 	
 	public void testUpdateOrmPersistentTypes() throws Exception {
-		assertFalse(getEntityMappings().persistentTypes().hasNext());
+		assertFalse(getEntityMappings().getPersistentTypes().iterator().hasNext());
 		assertTrue(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
 		assertTrue(getXmlEntityMappings().getEntities().isEmpty());
 		assertTrue(getXmlEntityMappings().getEmbeddables().isEmpty());
@@ -369,8 +369,8 @@ public class EntityMappingsTests extends ContextModelTestCase
 		XmlEmbeddable embeddable = OrmFactory.eINSTANCE.createXmlEmbeddable();
 		getXmlEntityMappings().getEmbeddables().add(embeddable);
 		embeddable.setClassName("model.Foo");
-		assertTrue(getEntityMappings().persistentTypes().hasNext());
-		assertEquals("model.Foo", getEntityMappings().persistentTypes().next().getMapping().getClass_());
+		assertTrue(getEntityMappings().getPersistentTypes().iterator().hasNext());
+		assertEquals("model.Foo", getEntityMappings().getPersistentTypes().iterator().next().getMapping().getClass_());
 		assertTrue(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
 		assertTrue(getXmlEntityMappings().getEntities().isEmpty());
 		assertFalse(getXmlEntityMappings().getEmbeddables().isEmpty());
@@ -380,8 +380,8 @@ public class EntityMappingsTests extends ContextModelTestCase
 		XmlEntity entity = OrmFactory.eINSTANCE.createXmlEntity();
 		getXmlEntityMappings().getEntities().add(entity);
 		entity.setClassName("model.Foo2");
-		assertTrue(getEntityMappings().persistentTypes().hasNext());
-		assertEquals("model.Foo2", getEntityMappings().persistentTypes().next().getMapping().getClass_());
+		assertTrue(getEntityMappings().getPersistentTypes().iterator().hasNext());
+		assertEquals("model.Foo2", getEntityMappings().getPersistentTypes().iterator().next().getMapping().getClass_());
 		assertTrue(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
 		assertFalse(getXmlEntityMappings().getEntities().isEmpty());
 		assertFalse(getXmlEntityMappings().getEmbeddables().isEmpty());
@@ -391,8 +391,8 @@ public class EntityMappingsTests extends ContextModelTestCase
 		XmlMappedSuperclass mappedSuperclass = OrmFactory.eINSTANCE.createXmlMappedSuperclass();
 		getXmlEntityMappings().getMappedSuperclasses().add(mappedSuperclass);
 		mappedSuperclass.setClassName("model.Foo3");
-		assertTrue(getEntityMappings().persistentTypes().hasNext());
-		assertEquals("model.Foo3", getEntityMappings().persistentTypes().next().getMapping().getClass_());
+		assertTrue(getEntityMappings().getPersistentTypes().iterator().hasNext());
+		assertEquals("model.Foo3", getEntityMappings().getPersistentTypes().iterator().next().getMapping().getClass_());
 		assertFalse(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
 		assertFalse(getXmlEntityMappings().getEntities().isEmpty());
 		assertFalse(getXmlEntityMappings().getEmbeddables().isEmpty());
@@ -401,16 +401,16 @@ public class EntityMappingsTests extends ContextModelTestCase
 	
 	
 	public void testAddOrmPersistentType() throws Exception {
-		assertFalse(getEntityMappings().persistentTypes().hasNext());
+		assertFalse(getEntityMappings().getPersistentTypes().iterator().hasNext());
 		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(getEntityMappings().getPersistentTypes().iterator().hasNext());
+		assertEquals("model.Foo", getEntityMappings().getPersistentTypes().iterator().next().getMapping().getClass_());
+		assertEquals(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, getEntityMappings().getPersistentTypes().iterator().next().getMapping().getKey());
 		assertTrue(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
 		assertTrue(getXmlEntityMappings().getEntities().isEmpty());
 		assertFalse(getXmlEntityMappings().getEmbeddables().isEmpty());
@@ -418,9 +418,9 @@ public class EntityMappingsTests extends ContextModelTestCase
 
 		//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(getEntityMappings().getPersistentTypes().iterator().hasNext());
+		assertEquals("model.Foo2", getEntityMappings().getPersistentTypes().iterator().next().getMapping().getClass_());
+		assertEquals(MappingKeys.ENTITY_TYPE_MAPPING_KEY, getEntityMappings().getPersistentTypes().iterator().next().getMapping().getKey());
 		assertTrue(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
 		assertFalse(getXmlEntityMappings().getEntities().isEmpty());
 		assertFalse(getXmlEntityMappings().getEmbeddables().isEmpty());
@@ -428,9 +428,9 @@ public class EntityMappingsTests extends ContextModelTestCase
 
 		//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());
+		assertTrue(getEntityMappings().getPersistentTypes().iterator().hasNext());
+		assertEquals("model.Foo3", getEntityMappings().getPersistentTypes().iterator().next().getMapping().getClass_());
+		assertEquals(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, getEntityMappings().getPersistentTypes().iterator().next().getMapping().getKey());
 		assertFalse(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
 		assertFalse(getXmlEntityMappings().getEntities().isEmpty());
 		assertFalse(getXmlEntityMappings().getEmbeddables().isEmpty());
@@ -438,7 +438,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 	}
 	
 	public void testRemoveOrmPersistentType() throws Exception {
-		assertFalse(getEntityMappings().persistentTypes().hasNext());
+		assertFalse(getEntityMappings().getPersistentTypes().iterator().hasNext());
 		assertTrue(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
 		assertTrue(getXmlEntityMappings().getEntities().isEmpty());
 		assertTrue(getXmlEntityMappings().getEmbeddables().isEmpty());
@@ -465,7 +465,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 	}
 	
 	public void testUpdateTableGenerators() throws Exception {
-		assertEquals(0, getEntityMappings().tableGeneratorsSize());
+		assertEquals(0, getEntityMappings().getTableGeneratorsSize());
 		assertEquals(0, getXmlEntityMappings().getTableGenerators().size());
 		assertEquals(0, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
@@ -473,7 +473,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 		getXmlEntityMappings().getTableGenerators().add(tableGeneratorResource);
 		tableGeneratorResource.setName("FOO");
 		
-		TableGenerator tableGenerator = getEntityMappings().tableGenerators().next();
+		TableGenerator tableGenerator = getEntityMappings().getTableGenerators().iterator().next();
 		assertEquals("FOO", tableGenerator.getName());
 		assertEquals(1, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
@@ -481,7 +481,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 		getXmlEntityMappings().getTableGenerators().add(0, tableGeneratorResource2);
 		tableGeneratorResource2.setName("BAR");
 		
-		ListIterator<OrmTableGenerator> tableGenerators = getEntityMappings().tableGenerators();
+		ListIterator<OrmTableGenerator> tableGenerators = getEntityMappings().getTableGenerators().iterator();
 		assertEquals("BAR", tableGenerators.next().getName());
 		assertEquals("FOO", tableGenerators.next().getName());
 		assertFalse(tableGenerators.hasNext());
@@ -491,7 +491,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 		getXmlEntityMappings().getTableGenerators().add(1, tableGeneratorResource3);
 		tableGeneratorResource3.setName("BAZ");
 		
-		tableGenerators = getEntityMappings().tableGenerators();
+		tableGenerators = getEntityMappings().getTableGenerators().iterator();
 		assertEquals("BAR", tableGenerators.next().getName());
 		assertEquals("BAZ", tableGenerators.next().getName());
 		assertEquals("FOO", tableGenerators.next().getName());
@@ -499,7 +499,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertEquals(3, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
 		getXmlEntityMappings().getTableGenerators().move(2, 0);
-		tableGenerators = getEntityMappings().tableGenerators();
+		tableGenerators = getEntityMappings().getTableGenerators().iterator();
 		assertEquals("BAZ", tableGenerators.next().getName());
 		assertEquals("FOO", tableGenerators.next().getName());
 		assertEquals("BAR", tableGenerators.next().getName());
@@ -507,26 +507,26 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertEquals(3, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
 		getXmlEntityMappings().getTableGenerators().remove(0);
-		tableGenerators = getEntityMappings().tableGenerators();
+		tableGenerators = getEntityMappings().getTableGenerators().iterator();
 		assertEquals("FOO", tableGenerators.next().getName());
 		assertEquals("BAR", tableGenerators.next().getName());
 		assertFalse(tableGenerators.hasNext());
 		assertEquals(2, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
 		getXmlEntityMappings().getTableGenerators().remove(1);
-		tableGenerators = getEntityMappings().tableGenerators();
+		tableGenerators = getEntityMappings().getTableGenerators().iterator();
 		assertEquals("FOO", tableGenerators.next().getName());
 		assertFalse(tableGenerators.hasNext());
 		assertEquals(1, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
 		getXmlEntityMappings().getTableGenerators().clear();
-		tableGenerators = getEntityMappings().tableGenerators();
+		tableGenerators = getEntityMappings().getTableGenerators().iterator();
 		assertFalse(tableGenerators.hasNext());
 		assertEquals(0, getEntityMappings().getPersistenceUnit().generatorsSize());
 	}
 	
 	public void testAddTableGenerator() throws Exception {
-		assertEquals(0, getEntityMappings().tableGeneratorsSize());
+		assertEquals(0, getEntityMappings().getTableGeneratorsSize());
 		assertEquals(0, getXmlEntityMappings().getTableGenerators().size());
 		getEntityMappings().addTableGenerator(0).setName("FOO");
 		
@@ -537,14 +537,14 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertEquals("FOO", getXmlEntityMappings().getTableGenerators().get(1).getName());
 		assertEquals(2, getXmlEntityMappings().getTableGenerators().size());
 		
-		ListIterator<OrmTableGenerator> tableGenerators = getEntityMappings().tableGenerators();
+		ListIterator<OrmTableGenerator> tableGenerators = getEntityMappings().getTableGenerators().iterator();
 		assertEquals("BAR", tableGenerators.next().getName());
 		assertEquals("FOO", tableGenerators.next().getName());
 		assertFalse(tableGenerators.hasNext());
 	}
 	
 	public void testRemoveTableGenerator() throws Exception {
-		assertEquals(0, getEntityMappings().tableGeneratorsSize());
+		assertEquals(0, getEntityMappings().getTableGeneratorsSize());
 		assertEquals(0, getXmlEntityMappings().getTableGenerators().size());
 		
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);
@@ -562,7 +562,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertEquals("BAR", getXmlEntityMappings().getTableGenerators().get(0).getName());
 		assertEquals("BAZ", getXmlEntityMappings().getTableGenerators().get(1).getName());
 		
-		ListIterator<OrmTableGenerator> tableGenerators = getEntityMappings().tableGenerators();
+		ListIterator<OrmTableGenerator> tableGenerators = getEntityMappings().getTableGenerators().iterator();
 		OrmTableGenerator xmlTableGenerator = tableGenerators.next();
 		assertEquals("BAR", xmlTableGenerator.getName());
 		assertEquals(tableGenerator2, xmlTableGenerator);
@@ -574,7 +574,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 		
 		getEntityMappings().removeTableGenerator(1);
 		assertEquals("BAR", getXmlEntityMappings().getTableGenerators().get(0).getName());
-		tableGenerators = getEntityMappings().tableGenerators();
+		tableGenerators = getEntityMappings().getTableGenerators().iterator();
 		xmlTableGenerator = tableGenerators.next();
 		assertEquals("BAR", xmlTableGenerator.getName());
 		assertEquals(tableGenerator2, xmlTableGenerator);
@@ -583,12 +583,12 @@ public class EntityMappingsTests extends ContextModelTestCase
 		
 		getEntityMappings().removeTableGenerator(0);
 		assertEquals(0, getXmlEntityMappings().getTableGenerators().size());
-		tableGenerators = getEntityMappings().tableGenerators();
+		tableGenerators = getEntityMappings().getTableGenerators().iterator();
 		assertFalse(tableGenerators.hasNext());		
 	}
 	
 	public void testMoveTableGenerator() throws Exception {
-		assertEquals(0, getEntityMappings().tableGeneratorsSize());
+		assertEquals(0, getEntityMappings().getTableGeneratorsSize());
 		assertEquals(0, getXmlEntityMappings().getTableGenerators().size());
 		
 		TableGenerator tableGenerator = getEntityMappings().addTableGenerator(0);
@@ -616,7 +616,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 	}
 	
 	public void testTableGeneratorsSize() throws Exception {
-		assertEquals(0, getEntityMappings().tableGeneratorsSize());
+		assertEquals(0, getEntityMappings().getTableGeneratorsSize());
 		assertEquals(0, getXmlEntityMappings().getTableGenerators().size());
 		
 		
@@ -627,14 +627,14 @@ public class EntityMappingsTests extends ContextModelTestCase
 		TableGenerator tableGenerator3 = getEntityMappings().addTableGenerator(2);
 		tableGenerator3.setName("BAZ");
 	
-		assertEquals(3, getEntityMappings().tableGeneratorsSize());
+		assertEquals(3, getEntityMappings().getTableGeneratorsSize());
 		
 		getXmlEntityMappings().getTableGenerators().remove(0);
-		assertEquals(2, getEntityMappings().tableGeneratorsSize());
+		assertEquals(2, getEntityMappings().getTableGeneratorsSize());
 	}
 
 	public void testUpdateSequenceGenerators() throws Exception {
-		assertEquals(0, getEntityMappings().sequenceGeneratorsSize());
+		assertEquals(0, getEntityMappings().getSequenceGeneratorsSize());
 		assertEquals(0, getXmlEntityMappings().getSequenceGenerators().size());
 		assertEquals(0, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
@@ -642,7 +642,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 		getXmlEntityMappings().getSequenceGenerators().add(sequenceGeneratorResource);
 		sequenceGeneratorResource.setName("FOO");
 		
-		SequenceGenerator sequenceGenerator = getEntityMappings().sequenceGenerators().next();
+		SequenceGenerator sequenceGenerator = getEntityMappings().getSequenceGenerators().iterator().next();
 		assertEquals("FOO", sequenceGenerator.getName());
 		assertEquals(1, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
@@ -650,7 +650,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 		getXmlEntityMappings().getSequenceGenerators().add(0, sequenceGeneratorResource2);
 		sequenceGeneratorResource2.setName("BAR");
 		
-		ListIterator<OrmSequenceGenerator> sequenceGenerators = getEntityMappings().sequenceGenerators();
+		ListIterator<OrmSequenceGenerator> sequenceGenerators = getEntityMappings().getSequenceGenerators().iterator();
 		assertEquals("BAR", sequenceGenerators.next().getName());
 		assertEquals("FOO", sequenceGenerators.next().getName());
 		assertFalse(sequenceGenerators.hasNext());
@@ -660,7 +660,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 		getXmlEntityMappings().getSequenceGenerators().add(1, sequenceGeneratorResource3);
 		sequenceGeneratorResource3.setName("BAZ");
 
-		sequenceGenerators = getEntityMappings().sequenceGenerators();
+		sequenceGenerators = getEntityMappings().getSequenceGenerators().iterator();
 		assertEquals("BAR", sequenceGenerators.next().getName());
 		assertEquals("BAZ", sequenceGenerators.next().getName());
 		assertEquals("FOO", sequenceGenerators.next().getName());
@@ -668,33 +668,33 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertEquals(3, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
 		getXmlEntityMappings().getSequenceGenerators().move(2, 0);
-		sequenceGenerators = getEntityMappings().sequenceGenerators();
+		sequenceGenerators = getEntityMappings().getSequenceGenerators().iterator();
 		assertEquals("BAZ", sequenceGenerators.next().getName());
 		assertEquals("FOO", sequenceGenerators.next().getName());
 		assertEquals("BAR", sequenceGenerators.next().getName());
 		assertFalse(sequenceGenerators.hasNext());
 		
 		getXmlEntityMappings().getSequenceGenerators().remove(0);
-		sequenceGenerators = getEntityMappings().sequenceGenerators();
+		sequenceGenerators = getEntityMappings().getSequenceGenerators().iterator();
 		assertEquals("FOO", sequenceGenerators.next().getName());
 		assertEquals("BAR", sequenceGenerators.next().getName());
 		assertFalse(sequenceGenerators.hasNext());
 		assertEquals(2, getEntityMappings().getPersistenceUnit().generatorsSize());
 
 		getXmlEntityMappings().getSequenceGenerators().remove(1);
-		sequenceGenerators = getEntityMappings().sequenceGenerators();
+		sequenceGenerators = getEntityMappings().getSequenceGenerators().iterator();
 		assertEquals("FOO", sequenceGenerators.next().getName());
 		assertFalse(sequenceGenerators.hasNext());
 		assertEquals(1, getEntityMappings().getPersistenceUnit().generatorsSize());
 		
 		getXmlEntityMappings().getSequenceGenerators().clear();
-		sequenceGenerators = getEntityMappings().sequenceGenerators();
+		sequenceGenerators = getEntityMappings().getSequenceGenerators().iterator();
 		assertFalse(sequenceGenerators.hasNext());
 		assertEquals(0, getEntityMappings().getPersistenceUnit().generatorsSize());
 	}
 	
 	public void testAddSequenceGenerator() throws Exception {
-		assertEquals(0, getEntityMappings().sequenceGeneratorsSize());
+		assertEquals(0, getEntityMappings().getSequenceGeneratorsSize());
 		assertEquals(0, getXmlEntityMappings().getSequenceGenerators().size());
 		
 		getEntityMappings().addSequenceGenerator(0).setName("FOO");
@@ -706,14 +706,14 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertEquals("FOO", getXmlEntityMappings().getSequenceGenerators().get(1).getName());
 		assertEquals(2, getXmlEntityMappings().getSequenceGenerators().size());
 		
-		ListIterator<OrmSequenceGenerator> sequenceGenerators = getEntityMappings().sequenceGenerators();
+		ListIterator<OrmSequenceGenerator> sequenceGenerators = getEntityMappings().getSequenceGenerators().iterator();
 		assertEquals("BAR", sequenceGenerators.next().getName());
 		assertEquals("FOO", sequenceGenerators.next().getName());
 		assertFalse(sequenceGenerators.hasNext());
 	}
 	
 	public void testRemoveSequenceGenerator() throws Exception {
-		assertEquals(0, getEntityMappings().sequenceGeneratorsSize());
+		assertEquals(0, getEntityMappings().getSequenceGeneratorsSize());
 		assertEquals(0, getXmlEntityMappings().getSequenceGenerators().size());
 		
 		SequenceGenerator sequenceGenerator = getEntityMappings().addSequenceGenerator(0);
@@ -731,7 +731,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 		assertEquals("BAR", getXmlEntityMappings().getSequenceGenerators().get(0).getName());
 		assertEquals("BAZ", getXmlEntityMappings().getSequenceGenerators().get(1).getName());
 		
-		ListIterator<OrmSequenceGenerator> sequenceGenerators = getEntityMappings().sequenceGenerators();
+		ListIterator<OrmSequenceGenerator> sequenceGenerators = getEntityMappings().getSequenceGenerators().iterator();
 		SequenceGenerator xmlSequenceGenerator = sequenceGenerators.next();
 		assertEquals("BAR", xmlSequenceGenerator.getName());
 		assertEquals(sequenceGenerator2, xmlSequenceGenerator);
@@ -743,7 +743,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 		
 		getEntityMappings().removeSequenceGenerator(1);
 		assertEquals("BAR", getXmlEntityMappings().getSequenceGenerators().get(0).getName());
-		sequenceGenerators = getEntityMappings().sequenceGenerators();
+		sequenceGenerators = getEntityMappings().getSequenceGenerators().iterator();
 		xmlSequenceGenerator = sequenceGenerators.next();
 		assertEquals("BAR", xmlSequenceGenerator.getName());
 		assertEquals(sequenceGenerator2, xmlSequenceGenerator);
@@ -752,12 +752,12 @@ public class EntityMappingsTests extends ContextModelTestCase
 		
 		getEntityMappings().removeSequenceGenerator(0);
 		assertEquals(0, getXmlEntityMappings().getSequenceGenerators().size());
-		sequenceGenerators = getEntityMappings().sequenceGenerators();
+		sequenceGenerators = getEntityMappings().getSequenceGenerators().iterator();
 		assertFalse(sequenceGenerators.hasNext());		
 	}
 	
 	public void testMoveSequenceGenerator() throws Exception {
-		assertEquals(0, getEntityMappings().sequenceGeneratorsSize());
+		assertEquals(0, getEntityMappings().getSequenceGeneratorsSize());
 		assertEquals(0, getXmlEntityMappings().getSequenceGenerators().size());
 		
 		SequenceGenerator sequenceGenerator = getEntityMappings().addSequenceGenerator(0);
@@ -786,7 +786,7 @@ public class EntityMappingsTests extends ContextModelTestCase
 	}
 	
 	public void testSequenceGeneratorsSize() throws Exception {
-		assertEquals(0, getEntityMappings().sequenceGeneratorsSize());
+		assertEquals(0, getEntityMappings().getSequenceGeneratorsSize());
 		assertEquals(0, getXmlEntityMappings().getSequenceGenerators().size());
 		
 		
@@ -797,10 +797,10 @@ public class EntityMappingsTests extends ContextModelTestCase
 		SequenceGenerator sequenceGenerator3 = getEntityMappings().addSequenceGenerator(2);
 		sequenceGenerator3.setName("BAZ");
 	
-		assertEquals(3, getEntityMappings().sequenceGeneratorsSize());
+		assertEquals(3, getEntityMappings().getSequenceGeneratorsSize());
 		
 		getXmlEntityMappings().getSequenceGenerators().remove(0);
-		assertEquals(2, getEntityMappings().sequenceGeneratorsSize());
+		assertEquals(2, getEntityMappings().getSequenceGeneratorsSize());
 	}
 
 	
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java
index 2c3642dc77..f2cac368ef 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java
@@ -139,7 +139,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase
 //	
 	
 	public void testMorphXmlTypeMapping() throws Exception {
-		assertFalse(getEntityMappings().persistentTypes().hasNext());
+		assertFalse(getEntityMappings().getPersistentTypes().iterator().hasNext());
 		assertTrue(getXmlEntityMappings().getMappedSuperclasses().isEmpty());
 		assertTrue(getXmlEntityMappings().getEntities().isEmpty());
 		assertTrue(getXmlEntityMappings().getEmbeddables().isEmpty());
@@ -148,7 +148,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase
 		OrmPersistentType entityPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo2");
 		OrmPersistentType mappedSuperclassPersistentType = getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, "model.Foo3");
 	
-		OrmPersistentType ormPersistentType = getEntityMappings().persistentTypes().next();
+		OrmPersistentType ormPersistentType = getEntityMappings().getPersistentTypes().iterator().next();
 		assertEquals(mappedSuperclassPersistentType, ormPersistentType);
 		assertEquals(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, ormPersistentType.getMapping().getKey());
 	
@@ -157,7 +157,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase
 		assertEquals(1, getXmlEntityMappings().getEntities().size());
 		assertEquals(2, getXmlEntityMappings().getEmbeddables().size());
 		
-		Iterator<OrmPersistentType> ormPersistentTypes = getEntityMappings().persistentTypes();
+		Iterator<OrmPersistentType> ormPersistentTypes = getEntityMappings().getPersistentTypes().iterator();
 		//the same OrmPersistentTypes should still be in the context model
 		assertEquals(ormPersistentTypes.next(), entityPersistentType);
 		assertEquals(ormPersistentTypes.next(), embeddablePersistentType);
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 90edce1588..e80566876b 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
@@ -243,7 +243,7 @@ public class OrmEmbeddableTests extends ContextModelTestCase
 		assertEquals(Boolean.TRUE, ormEntity.getSpecifiedMetadataComplete());
 		assertEquals(AccessType.PROPERTY, embeddablePersistentType.getSpecifiedAccess());
 		
-		ListIterator<OrmPersistentType> persistentTypes = getEntityMappings().persistentTypes();
+		ListIterator<OrmPersistentType> persistentTypes = getEntityMappings().getPersistentTypes().iterator();
 		assertEquals(MappingKeys.ENTITY_TYPE_MAPPING_KEY, persistentTypes.next().getMappingKey());
 		assertEquals(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, persistentTypes.next().getMappingKey());
 	}
@@ -287,7 +287,7 @@ public class OrmEmbeddableTests extends ContextModelTestCase
 		assertEquals(Boolean.TRUE, ormMappedSuperclass.getSpecifiedMetadataComplete());
 		assertEquals(AccessType.PROPERTY, embeddablePersistentType.getSpecifiedAccess());
 		
-		ListIterator<OrmPersistentType> persistentTypes = getEntityMappings().persistentTypes();
+		ListIterator<OrmPersistentType> persistentTypes = getEntityMappings().getPersistentTypes().iterator();
 		assertEquals(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, persistentTypes.next().getMappingKey());
 		assertEquals(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, persistentTypes.next().getMappingKey());
 	}
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 20875fa229..3c924250b8 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
@@ -473,7 +473,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		assertEquals(AccessType.FIELD, ormPersistentType.getDefaultAccess());
 		
 		getEntityMappings().setSpecifiedAccess(AccessType.FIELD);
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);		
+		getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);		
 		//entityMappings access wins over persistence-unit-defaults access
 		assertEquals(AccessType.FIELD, ormPersistentType.getDefaultAccess());
 		
@@ -481,7 +481,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		//persistence-unit-defaults access used now
 		assertEquals(AccessType.PROPERTY, ormPersistentType.getDefaultAccess());
 		
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(null);
+		getEntityMappings().getPersistenceUnitDefaults().setAccess(null);
 		assertEquals(AccessType.FIELD, ormPersistentType.getDefaultAccess());
 		
 		ormPersistentType.getJavaPersistentType().getAttributeNamed("id").setSpecifiedMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY);
@@ -489,7 +489,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		assertEquals(AccessType.FIELD, ormPersistentType.getDefaultAccess());
 		
 		getEntityMappings().setSpecifiedAccess(AccessType.PROPERTY);
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
+		getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
 		assertEquals(AccessType.FIELD, ormPersistentType.getDefaultAccess());
 
 		ormPersistentType.getJavaPersistentType().getAttributeNamed("id").setSpecifiedMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY);
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 ba21405a0a..c029ba1a44 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
@@ -247,7 +247,7 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 		assertEquals(Boolean.TRUE, ormEntity.getSpecifiedMetadataComplete());
 		assertEquals(AccessType.PROPERTY, mappedSuperclassPersistentType.getSpecifiedAccess());
 		
-		ListIterator<OrmPersistentType> persistentTypes = getEntityMappings().persistentTypes();
+		ListIterator<OrmPersistentType> persistentTypes = getEntityMappings().getPersistentTypes().iterator();
 		assertEquals(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, persistentTypes.next().getMappingKey());
 		assertEquals(MappingKeys.ENTITY_TYPE_MAPPING_KEY, persistentTypes.next().getMappingKey());
 	}
@@ -290,7 +290,7 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 		assertEquals(Boolean.TRUE, ormEmbeddable.getSpecifiedMetadataComplete());
 		assertEquals(AccessType.PROPERTY, mappedSuperclassPersistentType.getSpecifiedAccess());
 		
-		ListIterator<OrmPersistentType> persistentTypes = getEntityMappings().persistentTypes();
+		ListIterator<OrmPersistentType> persistentTypes = getEntityMappings().getPersistentTypes().iterator();
 		assertEquals(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, persistentTypes.next().getMappingKey());
 		assertEquals(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, persistentTypes.next().getMappingKey());
 	}
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 c67355d6f3..f2ef9efd4c 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
@@ -246,7 +246,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 		ormSecondaryTable.setSpecifiedName("FOO");
 		assertNull(ormSecondaryTable.getDefaultSchema());
 		
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema("FOO");
+		getEntityMappings().getPersistenceUnitDefaults().setSpecifiedSchema("FOO");
 		assertEquals("FOO", ormSecondaryTable.getDefaultSchema());
 		
 		getEntityMappings().setSpecifiedSchema("BAR");
@@ -260,7 +260,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 		getEntityMappings().setSpecifiedSchema(null);
 		assertEquals("FOO", ormSecondaryTable.getDefaultSchema());
 
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema(null);
+		getEntityMappings().getPersistenceUnitDefaults().setSpecifiedSchema(null);
 		assertNull(ormSecondaryTable.getDefaultSchema());
 	}
 	
@@ -339,7 +339,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 		ormSecondaryTable.setSpecifiedName("FOO");
 		assertNull(ormSecondaryTable.getDefaultCatalog());
 		
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog("FOO");
+		getEntityMappings().getPersistenceUnitDefaults().setSpecifiedCatalog("FOO");
 		assertEquals("FOO", ormSecondaryTable.getDefaultCatalog());
 		
 		getEntityMappings().setSpecifiedCatalog("BAR");
@@ -353,7 +353,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase
 		getEntityMappings().setSpecifiedCatalog(null);
 		assertEquals("FOO", ormSecondaryTable.getDefaultCatalog());
 
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog(null);
+		getEntityMappings().getPersistenceUnitDefaults().setSpecifiedCatalog(null);
 		assertNull(ormSecondaryTable.getDefaultCatalog());
 	}
 	
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 26de24eb81..76c247de29 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
@@ -237,7 +237,7 @@ public class OrmTableGeneratorTests extends ContextModelTestCase
 		
 		assertNull(tableGenerator.getDefaultSchema());
 		
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema("FOO");
+		getEntityMappings().getPersistenceUnitDefaults().setSpecifiedSchema("FOO");
 		assertEquals("FOO", tableGenerator.getDefaultSchema());
 		
 		getEntityMappings().setSpecifiedSchema("BAR");
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 347c17b152..c794d23b90 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
@@ -308,7 +308,7 @@ public class OrmTableTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		assertNull(ormEntity.getTable().getDefaultSchema());
 		
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema("FOO");
+		getEntityMappings().getPersistenceUnitDefaults().setSpecifiedSchema("FOO");
 		assertEquals("FOO", ormEntity.getTable().getDefaultSchema());
 		
 		getEntityMappings().setSpecifiedSchema("BAR");
@@ -325,7 +325,7 @@ public class OrmTableTests extends ContextModelTestCase
 		getEntityMappings().setSpecifiedSchema(null);
 		assertEquals("FOO", ormEntity.getTable().getDefaultSchema());
 
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema(null);
+		getEntityMappings().getPersistenceUnitDefaults().setSpecifiedSchema(null);
 		assertNull(ormEntity.getTable().getDefaultSchema());
 		
 		ormEntity.getTable().setSpecifiedName(null);
@@ -461,7 +461,7 @@ public class OrmTableTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		assertNull(ormEntity.getTable().getDefaultCatalog());
 		
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog("FOO");
+		getEntityMappings().getPersistenceUnitDefaults().setSpecifiedCatalog("FOO");
 		assertEquals("FOO", ormEntity.getTable().getDefaultCatalog());
 		
 		getEntityMappings().setSpecifiedCatalog("BAR");
@@ -478,7 +478,7 @@ public class OrmTableTests extends ContextModelTestCase
 		getEntityMappings().setSpecifiedCatalog(null);
 		assertEquals("FOO", ormEntity.getTable().getDefaultCatalog());
 
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog(null);
+		getEntityMappings().getPersistenceUnitDefaults().setSpecifiedCatalog(null);
 		assertNull(ormEntity.getTable().getDefaultCatalog());
 		
 		ormEntity.getTable().setSpecifiedName(null);
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 9a3d6adee6..12081ad1fa 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
@@ -36,7 +36,7 @@ public class PersistenceUnitDefaultsTests extends ContextModelTestCase
 	}
 	
 	protected OrmPersistenceUnitDefaults getPersistenceUnitDefaults() {
-		return getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults();
+		return getEntityMappings().getPersistenceUnitDefaults();
 	}
 	
 	public void testIsAllFeaturesUnset() throws Exception {
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 8c43b82074..b2880656c4 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
@@ -1085,17 +1085,17 @@ public class PersistenceUnitTests extends ContextModelTestCase
 		
 		assertEquals(null, persistenceUnit.getDefaultAccess());
 		
-		ormMappingFile.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);		
+		ormMappingFile.getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);		
 		assertEquals(AccessType.PROPERTY, persistenceUnit.getDefaultAccess());
 		
-		ormMappingFile.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.FIELD);	
+		ormMappingFile.getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.FIELD);	
 		assertEquals(AccessType.FIELD, persistenceUnit.getDefaultAccess());
 		
-		ormMappingFile.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(null);	
-		assertFalse(ormMappingFile.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().resourceExists());
+		ormMappingFile.getEntityMappings().getPersistenceUnitDefaults().setAccess(null);	
+		assertFalse(ormMappingFile.getEntityMappings().getPersistenceUnitDefaults().resourceExists());
 		assertEquals(null, persistenceUnit.getDefaultAccess());
 				
-		orm2MappingFile.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.FIELD);	
+		orm2MappingFile.getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.FIELD);	
 		assertEquals(AccessType.FIELD, persistenceUnit.getDefaultAccess());
 	}
 	
@@ -1109,14 +1109,14 @@ public class PersistenceUnitTests extends ContextModelTestCase
 		
 		assertEquals(null, persistenceUnit.getDefaultSchema());
 		
-		ormMappingFile.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema("FOO");		
+		ormMappingFile.getEntityMappings().getPersistenceUnitDefaults().setSpecifiedSchema("FOO");		
 		assertEquals("FOO", persistenceUnit.getDefaultSchema());
 		
-		ormMappingFile.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema(null);	
-		assertFalse(ormMappingFile.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().resourceExists());
+		ormMappingFile.getEntityMappings().getPersistenceUnitDefaults().setSpecifiedSchema(null);	
+		assertFalse(ormMappingFile.getEntityMappings().getPersistenceUnitDefaults().resourceExists());
 		assertEquals(null, persistenceUnit.getDefaultSchema());
 				
-		orm2MappingFile.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema("BAR");	
+		orm2MappingFile.getEntityMappings().getPersistenceUnitDefaults().setSpecifiedSchema("BAR");	
 		assertEquals("BAR", persistenceUnit.getDefaultSchema());
 	}
 	
@@ -1130,14 +1130,14 @@ public class PersistenceUnitTests extends ContextModelTestCase
 		
 		assertEquals(null, persistenceUnit.getDefaultCatalog());
 		
-		ormMappingFile.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog("FOO");		
+		ormMappingFile.getEntityMappings().getPersistenceUnitDefaults().setSpecifiedCatalog("FOO");		
 		assertEquals("FOO", persistenceUnit.getDefaultCatalog());
 		
-		ormMappingFile.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog(null);	
-		assertFalse(ormMappingFile.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().resourceExists());
+		ormMappingFile.getEntityMappings().getPersistenceUnitDefaults().setSpecifiedCatalog(null);	
+		assertFalse(ormMappingFile.getEntityMappings().getPersistenceUnitDefaults().resourceExists());
 		assertEquals(null, persistenceUnit.getDefaultCatalog());
 				
-		orm2MappingFile.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog("BAR");	
+		orm2MappingFile.getEntityMappings().getPersistenceUnitDefaults().setSpecifiedCatalog("BAR");	
 		assertEquals("BAR", persistenceUnit.getDefaultCatalog());
 	}
 	
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/GenericJavaPersistentType2_0Tests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/GenericJavaPersistentType2_0Tests.java
index b5cfe9afc7..2cf604acd3 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/GenericJavaPersistentType2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/GenericJavaPersistentType2_0Tests.java
@@ -421,7 +421,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes
 		
 		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
 		addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild");
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.FIELD);
+		getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.FIELD);
 
 		ListIterator<ClassRef> classRefs = getPersistenceUnit().specifiedClassRefs();
 		classRefs.next();
@@ -458,10 +458,10 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes
 		createTestEntity();
 		JavaPersistentType javaPersistentType = entityPersistentType.getJavaPersistentType(); 
 
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.FIELD);
+		getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.FIELD);
 		assertEquals(AccessType.FIELD, javaPersistentType.getAccess());
 
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
+		getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
 		assertEquals(AccessType.PROPERTY, javaPersistentType.getAccess());
 	}
 	
@@ -490,7 +490,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes
 		createTestEntityAnnotatedField();
 		JavaPersistentType javaPersistentType = entityPersistentType.getJavaPersistentType(); 
 
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
+		getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
 		assertEquals(AccessType.FIELD, javaPersistentType.getAccess());
 	}
 
@@ -514,7 +514,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes
 		createTestEntityAnnotatedField();
 		JavaPersistentType javaPersistentType = entityPersistentType.getJavaPersistentType(); 
 
-		getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
+		getEntityMappings().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY);
 		getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
 		assertEquals(AccessType.FIELD, javaPersistentType.getAccess());
 		
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0Tests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0Tests.java
index eb8dd3c28b..b0f3a22839 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0Tests.java
@@ -149,7 +149,7 @@ public class GenericJavaSequenceGenerator2_0Tests extends Generic2_0ContextModel
 		
 		assertNull(sequenceGenerator.getDefaultSchema());
 		
-		this.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema("FOO");
+		this.getEntityMappings().getPersistenceUnitDefaults().setSpecifiedSchema("FOO");
 		assertEquals("FOO", sequenceGenerator.getDefaultSchema());
 		
 		this.getEntityMappings().setSpecifiedSchema("BAR");