refactored order by (bug 190866)

20 files changed, 461 insertions, 608 deletions

diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java
index c2d8341735..da87fb8e1e 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java
@@ -10,7 +10,6 @@
 package org.eclipse.jpt.jpa.core.tests.internal.context.java;
 
 import java.util.Iterator;
-
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType;
@@ -28,9 +27,8 @@ import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping;
 import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedMapping;
 import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.jpa.core.context.persistence.ClassRef;
+import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.resource.java.BasicAnnotation;
 import org.eclipse.jpt.jpa.core.resource.java.EmbeddedAnnotation;
 import org.eclipse.jpt.jpa.core.resource.java.IdAnnotation;
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToManyMappingTests.java
index 74faa95b9c..8c1c03bcaf 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToManyMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToManyMappingTests.java
@@ -12,9 +12,9 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java;
 import java.util.Iterator;
 import java.util.ListIterator;
 import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType;
 import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
@@ -29,6 +29,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyRelationship;
 import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
 import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
+import org.eclipse.jpt.jpa.core.context.Orderable;
 import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.TransientMapping;
 import org.eclipse.jpt.jpa.core.context.TypeMapping;
@@ -302,7 +303,8 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(manyToManyMapping.isDefault());
 		
@@ -324,7 +326,8 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(manyToManyMapping.isDefault());
 		
@@ -344,7 +347,8 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(manyToManyMapping.isDefault());
 		
@@ -366,7 +370,8 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(manyToManyMapping.isDefault());
 		
@@ -388,7 +393,8 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(manyToManyMapping.isDefault());
 		
@@ -410,7 +416,8 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(manyToManyMapping.isDefault());
 		
@@ -432,7 +439,8 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(manyToManyMapping.isDefault());
 		
@@ -454,7 +462,8 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(manyToManyMapping.isDefault());
 		
@@ -476,7 +485,8 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(manyToManyMapping.isDefault());
 		
@@ -498,7 +508,8 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(manyToManyMapping.isDefault());
 		
@@ -1002,172 +1013,82 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase
 		assertEquals("zip", mapKeyNames.next());
 		assertFalse(mapKeyNames.hasNext());
 	}
+	
 	public void testUpdateOrderBy() throws Exception {
 		createTestEntityWithManyToManyMapping();
 		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
-		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
-		
+		Orderable orderable = manyToManyMapping.getOrderable();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
 		
-		assertNull(manyToManyMapping.getOrderable().getSpecifiedOrderBy());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
-				
-		//set orderBy in the resource model, verify context model updated
-		resourceField.addAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		orderBy.setValue("newOrderBy");
-		getJpaProject().synchronizeContextModel();
-		assertEquals("newOrderBy", manyToManyMapping.getOrderable().getSpecifiedOrderBy());
-		assertEquals("newOrderBy", orderBy.getValue());
-	
-		//set orderBy to null in the resource model
-		resourceField.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		getJpaProject().synchronizeContextModel();
-		assertNull(manyToManyMapping.getOrderable().getSpecifiedOrderBy());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
-	}
-	
-	public void testModifyOrderBy() throws Exception {
-		createTestEntityWithManyToManyMapping();
-		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
-		
-		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
-		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
+		assertNull(resourceField.getAnnotation(JPA.ORDER_BY));
+		assertTrue(orderable.isNoOrdering());
+		assertFalse(orderable.isOrderByOrdering());
+		assertNull(orderable.getOrderBy().getKey());
 		
-		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
-		JavaResourceField resourceField = resourceType.getFields().iterator().next();
+		resourceField.addAnnotation(JPA.ORDER_BY);
+		getJpaProject().synchronizeContextModel();
 		
-		assertNull(manyToManyMapping.getOrderable().getSpecifiedOrderBy());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
-				
-		//set mappedBy in the context model, verify resource model updated
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("newOrderBy");
-		assertEquals("newOrderBy", manyToManyMapping.getOrderable().getSpecifiedOrderBy());
-		OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		assertEquals("newOrderBy", orderBy.getValue());
-	
-		//set mappedBy to null in the context model
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy(null);
-		assertNull(manyToManyMapping.getOrderable().getSpecifiedOrderBy());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
-	}
-	
-	public void testUpdateNoOrdering()  throws Exception {
-		createTestEntityWithManyToManyMapping();
-		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
+		assertNotNull(resourceField.getAnnotation(JPA.ORDER_BY));
+		assertFalse(orderable.isNoOrdering());
+		assertTrue(orderable.isOrderByOrdering());
+		assertTrue(orderable.getOrderBy().isByPrimaryKey());
+		assertNull(orderable.getOrderBy().getKey());
 		
-		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
-		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
+		((OrderByAnnotation) resourceField.getAnnotation(JPA.ORDER_BY)).setValue("foo");
+		getJpaProject().synchronizeContextModel();
 		
-		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
-		JavaResourceField resourceField = resourceType.getFields().iterator().next();
+		assertEquals("foo", ((OrderByAnnotation) resourceField.getAnnotation(JPA.ORDER_BY)).getValue());
+		assertFalse(orderable.isNoOrdering());
+		assertTrue(orderable.isOrderByOrdering());
+		assertFalse(orderable.getOrderBy().isByPrimaryKey());
+		assertEquals("foo", orderable.getOrderBy().getKey());
 		
-		assertTrue(manyToManyMapping.getOrderable().isNoOrdering());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
-				
-		//set orderBy in the resource model, verify context model updated
-		resourceField.addAnnotation(OrderByAnnotation.ANNOTATION_NAME);
+		resourceField.removeAnnotation(JPA.ORDER_BY);
 		getJpaProject().synchronizeContextModel();
-		assertFalse(manyToManyMapping.getOrderable().isNoOrdering());
 		
-		OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		orderBy.setValue("newOrderBy");
-		getJpaProject().synchronizeContextModel();
-		assertFalse(manyToManyMapping.getOrderable().isNoOrdering());
-	
-		//set orderBy to null in the resource model
-		resourceField.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		getJpaProject().synchronizeContextModel();
-		assertTrue(manyToManyMapping.getOrderable().isNoOrdering());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
+		assertNull(resourceField.getAnnotation(JPA.ORDER_BY));
+		assertTrue(orderable.isNoOrdering());
+		assertFalse(orderable.isOrderByOrdering());
 	}
 	
-	public void testModifyNoOrdering() throws Exception {
+	public void testModifyOrderBy() throws Exception {
 		createTestEntityWithManyToManyMapping();
 		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
-		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
-		
+		Orderable orderable = manyToManyMapping.getOrderable();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
 		
-		assertTrue(manyToManyMapping.getOrderable().isNoOrdering());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
-				
-//		manyToManyMapping.setNoOrdering(false); //this does nothing
-//		//set mappedBy in the context model, verify resource model updated
-//		manyToManyMapping.setOrderBy("newOrderBy");
-//		assertEquals("newOrderBy", manyToManyMapping.getOrderBy());
-//		OrderBy orderBy = (OrderBy) resourceField.annotation(OrderBy.ANNOTATION_NAME);
-//		assertEquals("newOrderBy", orderBy.getValue());
-//	
-//		//set mappedBy to null in the context model
-//		manyToManyMapping.setOrderBy(null);
-//		assertNull(manyToManyMapping.getOrderBy());
-//		assertNull(resourceField.annotation(OrderBy.ANNOTATION_NAME));		
-	}
-	
-	public void testUpdatePkOrdering() throws Exception {
-		createTestEntityWithManyToManyMapping();
-		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
+		assertNull(resourceField.getAnnotation(JPA.ORDER_BY));
+		assertTrue(orderable.isNoOrdering());
+		assertFalse(orderable.isOrderByOrdering());
+		assertNull(orderable.getOrderBy().getKey());
 		
-		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
-		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
+		orderable.setOrderByOrdering();
 		
-		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
-		JavaResourceField resourceField = resourceType.getFields().iterator().next();
+		assertNotNull(resourceField.getAnnotation(JPA.ORDER_BY));
+		assertFalse(orderable.isNoOrdering());
+		assertTrue(orderable.isOrderByOrdering());
+		assertTrue(orderable.getOrderBy().isByPrimaryKey());
+		assertNull(orderable.getOrderBy().getKey());
 		
-		assertFalse(manyToManyMapping.getOrderable().isPkOrdering());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
-				
-		//set orderBy in the resource model, verify context model updated
-		resourceField.addAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		getJpaProject().synchronizeContextModel();
-		assertTrue(manyToManyMapping.getOrderable().isPkOrdering());
+		orderable.getOrderBy().setKey("foo");
 		
-		OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		orderBy.setValue("newOrderBy");
-		getJpaProject().synchronizeContextModel();
-		assertFalse(manyToManyMapping.getOrderable().isPkOrdering());
-	
-		//set orderBy to null in the resource model
-		resourceField.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		getJpaProject().synchronizeContextModel();
-		assertFalse(manyToManyMapping.getOrderable().isPkOrdering());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
-	}
-
-	public void testUpdateCustomOrdering()  throws Exception {
-		createTestEntityWithManyToManyMapping();
-		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
+		assertEquals("foo", ((OrderByAnnotation) resourceField.getAnnotation(JPA.ORDER_BY)).getValue());
+		assertFalse(orderable.isNoOrdering());
+		assertTrue(orderable.isOrderByOrdering());
+		assertFalse(orderable.getOrderBy().isByPrimaryKey());
+		assertEquals("foo", orderable.getOrderBy().getKey());
 		
-		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
-		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
+		orderable.setNoOrdering();
 		
-		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
-		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		
-		assertFalse(manyToManyMapping.getOrderable().isCustomOrdering());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
-				
-		//set orderBy in the resource model, verify context model updated
-		resourceField.addAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		assertFalse(manyToManyMapping.getOrderable().isCustomOrdering());
-		
-		OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		orderBy.setValue("newOrderBy");
-		getJpaProject().synchronizeContextModel();
-		assertTrue(manyToManyMapping.getOrderable().isCustomOrdering());
-	
-		//set orderBy to null in the resource model
-		resourceField.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		getJpaProject().synchronizeContextModel();
-		assertFalse(manyToManyMapping.getOrderable().isCustomOrdering());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
+		assertNull(resourceField.getAnnotation(JPA.ORDER_BY));
+		assertTrue(orderable.isNoOrdering());
+		assertFalse(orderable.isOrderByOrdering());
 	}
 	
 	public void testDefaultTargetEntityForMap() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToOneMappingTests.java
index 03513bf57e..17c3496bd9 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToOneMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToOneMappingTests.java
@@ -18,19 +18,18 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
 import org.eclipse.jpt.common.core.resource.java.NestableAnnotation;
 import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
-import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.BasicMapping;
 import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
 import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
 import org.eclipse.jpt.jpa.core.context.IdMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumnRelationshipStrategy;
 import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
 import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
 import org.eclipse.jpt.jpa.core.context.ManyToOneRelationship;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
 import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumnRelationshipStrategy;
 import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.TransientMapping;
 import org.eclipse.jpt.jpa.core.context.TypeMapping;
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToManyMappingTests.java
index eb75b76633..34048e5ee4 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToManyMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToManyMappingTests.java
@@ -12,9 +12,9 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java;
 import java.util.Iterator;
 import java.util.ListIterator;
 import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType;
 import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
@@ -29,6 +29,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
 import org.eclipse.jpt.jpa.core.context.OneToManyRelationship;
 import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
+import org.eclipse.jpt.jpa.core.context.Orderable;
 import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.TransientMapping;
 import org.eclipse.jpt.jpa.core.context.TypeMapping;
@@ -303,7 +304,8 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(oneToManyMapping.isDefault());
 		
@@ -325,7 +327,8 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(oneToManyMapping.isDefault());
 		
@@ -345,7 +348,8 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(oneToManyMapping.isDefault());
 		
@@ -367,7 +371,8 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(oneToManyMapping.isDefault());
 		
@@ -389,7 +394,8 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(oneToManyMapping.isDefault());
 		
@@ -411,7 +417,8 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(oneToManyMapping.isDefault());
 		
@@ -433,7 +440,8 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(oneToManyMapping.isDefault());
 		
@@ -455,7 +463,8 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(oneToManyMapping.isDefault());
 		
@@ -477,7 +486,8 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(oneToManyMapping.isDefault());
 		
@@ -499,7 +509,8 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		assertFalse(oneToManyMapping.isDefault());
 		
@@ -1011,143 +1022,78 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase
 	public void testUpdateOrderBy() throws Exception {
 		createTestEntityWithOneToManyMapping();
 		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
-		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
-		
+		Orderable orderable = oneToManyMapping.getOrderable();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
 		
-		assertNull(oneToManyMapping.getOrderable().getSpecifiedOrderBy());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
-				
-		//set orderBy in the resource model, verify context model updated
-		resourceField.addAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		orderBy.setValue("newOrderBy");
-		getJpaProject().synchronizeContextModel();
-		assertEquals("newOrderBy", oneToManyMapping.getOrderable().getSpecifiedOrderBy());
-		assertEquals("newOrderBy", orderBy.getValue());
-	
-		//set orderBy to null in the resource model
-		resourceField.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		getJpaProject().synchronizeContextModel();
-		assertNull(oneToManyMapping.getOrderable().getSpecifiedOrderBy());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
-	}
-	
-	public void testModifyOrderBy() throws Exception {
-		createTestEntityWithOneToManyMapping();
-		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
+		assertNull(resourceField.getAnnotation(JPA.ORDER_BY));
+		assertTrue(orderable.isNoOrdering());
+		assertFalse(orderable.isOrderByOrdering());
+		assertNull(orderable.getOrderBy().getKey());
 		
-		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
-		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
+		resourceField.addAnnotation(JPA.ORDER_BY);
+		getJpaProject().synchronizeContextModel();
 		
-		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
-		JavaResourceField resourceField = resourceType.getFields().iterator().next();
+		assertNotNull(resourceField.getAnnotation(JPA.ORDER_BY));
+		assertFalse(orderable.isNoOrdering());
+		assertTrue(orderable.isOrderByOrdering());
+		assertTrue(orderable.getOrderBy().isByPrimaryKey());
+		assertNull(orderable.getOrderBy().getKey());
 		
-		assertNull(oneToManyMapping.getOrderable().getSpecifiedOrderBy());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
-				
-		//set mappedBy in the context model, verify resource model updated
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("newOrderBy");
-		assertEquals("newOrderBy", oneToManyMapping.getOrderable().getSpecifiedOrderBy());
-		OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		assertEquals("newOrderBy", orderBy.getValue());
-	
-		//set mappedBy to null in the context model
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy(null);
-		assertNull(oneToManyMapping.getOrderable().getSpecifiedOrderBy());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
-	}
-	
-	public void testUpdateNoOrdering()  throws Exception {
-		createTestEntityWithOneToManyMapping();
-		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
+		((OrderByAnnotation) resourceField.getAnnotation(JPA.ORDER_BY)).setValue("foo");
+		getJpaProject().synchronizeContextModel();
 		
-		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
-		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
+		assertEquals("foo", ((OrderByAnnotation) resourceField.getAnnotation(JPA.ORDER_BY)).getValue());
+		assertFalse(orderable.isNoOrdering());
+		assertTrue(orderable.isOrderByOrdering());
+		assertFalse(orderable.getOrderBy().isByPrimaryKey());
+		assertEquals("foo", orderable.getOrderBy().getKey());
 		
-		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
-		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		
-		assertTrue(oneToManyMapping.getOrderable().isNoOrdering());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
-				
-		//set orderBy in the resource model, verify context model updated
-		resourceField.addAnnotation(OrderByAnnotation.ANNOTATION_NAME);
+		resourceField.removeAnnotation(JPA.ORDER_BY);
 		getJpaProject().synchronizeContextModel();
-		assertFalse(oneToManyMapping.getOrderable().isNoOrdering());
 		
-		OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		orderBy.setValue("newOrderBy");
-		getJpaProject().synchronizeContextModel();
-		assertFalse(oneToManyMapping.getOrderable().isNoOrdering());
-	
-		//set orderBy to null in the resource model
-		resourceField.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		getJpaProject().synchronizeContextModel();
-		assertTrue(oneToManyMapping.getOrderable().isNoOrdering());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
+		assertNull(resourceField.getAnnotation(JPA.ORDER_BY));
+		assertTrue(orderable.isNoOrdering());
+		assertFalse(orderable.isOrderByOrdering());
 	}
 	
-	public void testUpdatePkOrdering()  throws Exception {
+	public void testModifyOrderBy() throws Exception {
 		createTestEntityWithOneToManyMapping();
 		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
-		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
-		
+		Orderable orderable = oneToManyMapping.getOrderable();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
 		
-		assertFalse(oneToManyMapping.getOrderable().isPkOrdering());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
-				
-		//set orderBy in the resource model, verify context model updated
-		resourceField.addAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		getJpaProject().synchronizeContextModel();
-		assertTrue(oneToManyMapping.getOrderable().isPkOrdering());
+		assertNull(resourceField.getAnnotation(JPA.ORDER_BY));
+		assertTrue(orderable.isNoOrdering());
+		assertFalse(orderable.isOrderByOrdering());
+		assertNull(orderable.getOrderBy().getKey());
 		
-		OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		orderBy.setValue("newOrderBy");
-		getJpaProject().synchronizeContextModel();
-		assertFalse(oneToManyMapping.getOrderable().isPkOrdering());
-	
-		//set orderBy to null in the resource model
-		resourceField.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		getJpaProject().synchronizeContextModel();
-		assertFalse(oneToManyMapping.getOrderable().isPkOrdering());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
-	}
-
-	public void testUpdateCustomOrdering()  throws Exception {
-		createTestEntityWithOneToManyMapping();
-		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
+		orderable.setOrderByOrdering();
 		
-		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
-		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
+		assertNotNull(resourceField.getAnnotation(JPA.ORDER_BY));
+		assertFalse(orderable.isNoOrdering());
+		assertTrue(orderable.isOrderByOrdering());
+		assertTrue(orderable.getOrderBy().isByPrimaryKey());
+		assertNull(orderable.getOrderBy().getKey());
 		
-		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
-		JavaResourceField resourceField = resourceType.getFields().iterator().next();
+		orderable.getOrderBy().setKey("foo");
 		
-		assertFalse(oneToManyMapping.getOrderable().isCustomOrdering());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
-				
-		//set orderBy in the resource model, verify context model updated
-		resourceField.addAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		assertFalse(oneToManyMapping.getOrderable().isCustomOrdering());
+		assertEquals("foo", ((OrderByAnnotation) resourceField.getAnnotation(JPA.ORDER_BY)).getValue());
+		assertFalse(orderable.isNoOrdering());
+		assertTrue(orderable.isOrderByOrdering());
+		assertFalse(orderable.getOrderBy().isByPrimaryKey());
+		assertEquals("foo", orderable.getOrderBy().getKey());
 		
-		OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		orderBy.setValue("newOrderBy");
-		getJpaProject().synchronizeContextModel();
-		assertTrue(oneToManyMapping.getOrderable().isCustomOrdering());
-	
-		//set orderBy to null in the resource model
-		resourceField.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME);
-		getJpaProject().synchronizeContextModel();
-		assertFalse(oneToManyMapping.getOrderable().isCustomOrdering());
-		assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME));
+		orderable.setNoOrdering();
+		
+		assertNull(resourceField.getAnnotation(JPA.ORDER_BY));
+		assertTrue(orderable.isNoOrdering());
+		assertFalse(orderable.isOrderByOrdering());
 	}
 	
 	public void testDefaultTargetEntityForMap() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToOneMappingTests.java
index 01dbbbea21..845f767890 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToOneMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToOneMappingTests.java
@@ -18,7 +18,6 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
 import org.eclipse.jpt.common.core.resource.java.NestableAnnotation;
 import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
-import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.AttributeMapping;
 import org.eclipse.jpt.jpa.core.context.BasicMapping;
@@ -26,14 +25,14 @@ import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
 import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
 import org.eclipse.jpt.jpa.core.context.FetchType;
 import org.eclipse.jpt.jpa.core.context.IdMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumnRelationshipStrategy;
 import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
 import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedMappedByRelationshipStrategy;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
 import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
 import org.eclipse.jpt.jpa.core.context.OneToOneRelationship;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumnRelationshipStrategy;
+import org.eclipse.jpt.jpa.core.context.SpecifiedMappedByRelationshipStrategy;
 import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.SpecifiedPrimaryKeyJoinColumn;
 import org.eclipse.jpt.jpa.core.context.SpecifiedPrimaryKeyJoinColumnRelationshipStrategy;
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToManyMappingTests.java
index 60f39b82bb..921bebcaa7 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToManyMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToManyMappingTests.java
@@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.orm;
 import java.util.Iterator;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
+import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.AttributeMapping;
@@ -21,22 +22,23 @@ import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
 import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
 import org.eclipse.jpt.jpa.core.context.FetchType;
 import org.eclipse.jpt.jpa.core.context.IdMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinTable;
 import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
 import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedMappedByRelationshipStrategy;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
 import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
+import org.eclipse.jpt.jpa.core.context.Orderable;
 import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinTable;
+import org.eclipse.jpt.jpa.core.context.SpecifiedMappedByRelationshipStrategy;
 import org.eclipse.jpt.jpa.core.context.TransientMapping;
 import org.eclipse.jpt.jpa.core.context.VersionMapping;
 import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyRelationship;
-import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
+import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.resource.java.JPA;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEntity;
@@ -596,20 +598,35 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY);
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
+		Orderable orderable = ormManyToManyMapping.getOrderable();
 		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 		
-		assertNull(ormManyToManyMapping.getOrderable().getSpecifiedOrderBy());
 		assertNull(manyToMany.getOrderBy());
-				
-		//set orderBy in the resource model, verify context model updated
-		manyToMany.setOrderBy("newOrderBy");
-		assertEquals("newOrderBy", ormManyToManyMapping.getOrderable().getSpecifiedOrderBy());
-		assertEquals("newOrderBy", manyToMany.getOrderBy());
-	
-		//set orderBy to null in the resource model
+		assertTrue(orderable.isNoOrdering());
+		assertFalse(orderable.isOrderByOrdering());
+		assertNull(orderable.getOrderBy().getKey());
+		
+		manyToMany.setOrderBy(OrmFactory.eINSTANCE.createXmlOrderBy());
+		
+		assertNotNull(manyToMany.getOrderBy());
+		assertFalse(orderable.isNoOrdering());
+		assertTrue(orderable.isOrderByOrdering());
+		assertTrue(orderable.getOrderBy().isByPrimaryKey());
+		assertTrue(StringTools.isBlank(orderable.getOrderBy().getKey()));
+		
+		manyToMany.getOrderBy().setValue("foo");
+		
+		assertNotNull(manyToMany.getOrderBy().getValue());
+		assertFalse(orderable.isNoOrdering());
+		assertTrue(orderable.isOrderByOrdering());
+		assertFalse(orderable.getOrderBy().isByPrimaryKey());
+		assertEquals("foo", orderable.getOrderBy().getKey());
+		
 		manyToMany.setOrderBy(null);
-		assertNull(ormManyToManyMapping.getOrderable().getSpecifiedOrderBy());
+		
 		assertNull(manyToMany.getOrderBy());
+		assertTrue(orderable.isNoOrdering());
+		assertFalse(orderable.isOrderByOrdering());
 	}
 	
 	public void testModifyOrderBy() throws Exception {
@@ -617,74 +634,35 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY);
 		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
+		Orderable orderable = ormManyToManyMapping.getOrderable();
 		XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0);
 		
-		assertNull(ormManyToManyMapping.getOrderable().getSpecifiedOrderBy());
 		assertNull(manyToMany.getOrderBy());
+		assertTrue(orderable.isNoOrdering());
+		assertFalse(orderable.isOrderByOrdering());
+		assertNull(orderable.getOrderBy().getKey());
 				
-		//set mappedBy in the context model, verify resource model updated
-		ormManyToManyMapping.getOrderable().setSpecifiedOrderBy("newOrderBy");
-		assertEquals("newOrderBy", ormManyToManyMapping.getOrderable().getSpecifiedOrderBy());
-		assertEquals("newOrderBy", manyToMany.getOrderBy());
-	
-		//set mappedBy to null in the context model
-		ormManyToManyMapping.getOrderable().setSpecifiedOrderBy(null);
-		assertNull(ormManyToManyMapping.getOrderable().getSpecifiedOrderBy());
-		assertNull(manyToMany.getOrderBy());
-	}
-	
-	public void testIsNoOrdering() throws Exception {
-		createTestType();
-		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
-		OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY);
-		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
-		
-		assertTrue(ormManyToManyMapping.getOrderable().isNoOrdering());
-
-		ormManyToManyMapping.getOrderable().setSpecifiedOrderBy("foo");
-		assertFalse(ormManyToManyMapping.getOrderable().isNoOrdering());
+		orderable.setOrderByOrdering();
 		
-		ormManyToManyMapping.getOrderable().setSpecifiedOrderBy(null);
-		assertTrue(ormManyToManyMapping.getOrderable().isNoOrdering());
-	}
-	
-	public void testSetNoOrdering() throws Exception {
-		createTestType();
-		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
-		OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY);
-		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
+		assertNotNull(manyToMany.getOrderBy());
+		assertFalse(orderable.isNoOrdering());
+		assertTrue(orderable.isOrderByOrdering());
+		assertTrue(orderable.getOrderBy().isByPrimaryKey());
+		assertTrue(StringTools.isBlank(orderable.getOrderBy().getKey()));
 		
-		assertTrue(ormManyToManyMapping.getOrderable().isNoOrdering());
-
-		ormManyToManyMapping.getOrderable().setSpecifiedOrderBy("foo");
-		assertFalse(ormManyToManyMapping.getOrderable().isNoOrdering());
+		orderable.getOrderBy().setKey("foo");
 		
-		ormManyToManyMapping.getOrderable().setNoOrdering(true);
-		assertTrue(ormManyToManyMapping.getOrderable().isNoOrdering());
-		assertNull(ormManyToManyMapping.getOrderable().getSpecifiedOrderBy());
-	}
-//TODO
-//	public boolean isOrderByPk() {
-//		return "".equals(getOrderBy());
-//	}
-//
-//	public void setOrderByPk() {
-//		setOrderBy("");
-//	}
-
-	public void testIsCustomOrdering() throws Exception {
-		createTestType();
-		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
-		OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY);
-		OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping();
+		assertNotNull(manyToMany.getOrderBy().getValue());
+		assertFalse(orderable.isNoOrdering());
+		assertTrue(orderable.isOrderByOrdering());
+		assertFalse(orderable.getOrderBy().isByPrimaryKey());
+		assertEquals("foo", orderable.getOrderBy().getKey());
 		
-		assertFalse(ormManyToManyMapping.getOrderable().isCustomOrdering());
-
-		ormManyToManyMapping.getOrderable().setSpecifiedOrderBy("foo");
-		assertTrue(ormManyToManyMapping.getOrderable().isCustomOrdering());
+		orderable.setNoOrdering();
 		
-		ormManyToManyMapping.getOrderable().setSpecifiedOrderBy(null);
-		assertFalse(ormManyToManyMapping.getOrderable().isCustomOrdering());
+		assertNull(manyToMany.getOrderBy());
+		assertTrue(orderable.isNoOrdering());
+		assertFalse(orderable.isOrderByOrdering());
 	}
 	
 	public void testManyToManyMorphToIdMapping() throws Exception {
@@ -696,7 +674,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		assertFalse(manyToManyMapping.isDefault());
 		manyToManyMapping.setSpecifiedFetch(FetchType.EAGER);
 		manyToManyMapping.setSpecifiedTargetEntity("TargetEntity");
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("customOrder");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("customOrder");
 		manyToManyMapping.setSpecifiedMapKey("mapKey");
 		assertFalse(manyToManyMapping.isDefault());	
 		
@@ -716,7 +695,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		assertFalse(manyToManyMapping.isDefault());
 		manyToManyMapping.setSpecifiedFetch(FetchType.EAGER);
 		manyToManyMapping.setSpecifiedTargetEntity("TargetEntity");
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("customOrder");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("customOrder");
 		manyToManyMapping.setSpecifiedMapKey("mapKey");
 		assertFalse(manyToManyMapping.isDefault());	
 		
@@ -736,7 +716,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		assertFalse(manyToManyMapping.isDefault());
 		manyToManyMapping.setSpecifiedFetch(FetchType.EAGER);
 		manyToManyMapping.setSpecifiedTargetEntity("TargetEntity");
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("customOrder");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("customOrder");
 		manyToManyMapping.setSpecifiedMapKey("mapKey");
 		assertFalse(manyToManyMapping.isDefault());	
 		
@@ -756,7 +737,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		assertFalse(manyToManyMapping.isDefault());
 		manyToManyMapping.setSpecifiedFetch(FetchType.EAGER);
 		manyToManyMapping.setSpecifiedTargetEntity("TargetEntity");
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("customOrder");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("customOrder");
 		manyToManyMapping.setSpecifiedMapKey("mapKey");
 		assertFalse(manyToManyMapping.isDefault());	
 		
@@ -776,7 +758,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		assertFalse(manyToManyMapping.isDefault());
 		manyToManyMapping.setSpecifiedFetch(FetchType.EAGER);
 		manyToManyMapping.setSpecifiedTargetEntity("TargetEntity");
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("customOrder");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("customOrder");
 		manyToManyMapping.setSpecifiedMapKey("mapKey");
 		assertFalse(manyToManyMapping.isDefault());	
 		
@@ -796,7 +779,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		assertFalse(manyToManyMapping.isDefault());
 		manyToManyMapping.setSpecifiedFetch(FetchType.EAGER);
 		manyToManyMapping.setSpecifiedTargetEntity("TargetEntity");
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("customOrder");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("customOrder");
 		manyToManyMapping.setSpecifiedMapKey("mapKey");
 		manyToManyMapping.getRelationship().getMappedByStrategy().setMappedByAttribute("mappedBy");
 		manyToManyMapping.getCascade().setAll(true);
@@ -830,7 +814,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		assertFalse(manyToManyMapping.isDefault());
 		manyToManyMapping.setSpecifiedFetch(FetchType.EAGER);
 		manyToManyMapping.setSpecifiedTargetEntity("TargetEntity");
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("customOrder");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("customOrder");
 		manyToManyMapping.setSpecifiedMapKey("mapKey");
 		manyToManyMapping.getCascade().setAll(true);
 		manyToManyMapping.getCascade().setMerge(true);
@@ -875,7 +860,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		assertFalse(manyToManyMapping.isDefault());
 		manyToManyMapping.setSpecifiedFetch(FetchType.EAGER);
 		manyToManyMapping.setSpecifiedTargetEntity("TargetEntity");
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("customOrder");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("customOrder");
 		manyToManyMapping.setSpecifiedMapKey("mapKey");
 		manyToManyMapping.getCascade().setAll(true);
 		manyToManyMapping.getCascade().setMerge(true);
@@ -907,7 +893,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		assertFalse(manyToManyMapping.isDefault());
 		manyToManyMapping.setSpecifiedFetch(FetchType.EAGER);
 		manyToManyMapping.setSpecifiedTargetEntity("TargetEntity");
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("customOrder");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("customOrder");
 		manyToManyMapping.setSpecifiedMapKey("mapKey");
 		manyToManyMapping.getCascade().setAll(true);
 		manyToManyMapping.getCascade().setMerge(true);
@@ -1049,8 +1036,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		assertTrue(cascade.isRemove());
 		assertTrue(cascade.isRefresh());
 
-		assertTrue(virtualManyToManyMapping.getOrderable().isCustomOrdering());
-		assertEquals("city", virtualManyToManyMapping.getOrderable().getSpecifiedOrderBy());
+		assertTrue(virtualManyToManyMapping.getOrderable().isOrderByOrdering());
+		assertEquals("city", virtualManyToManyMapping.getOrderable().getOrderBy().getKey());
 	}
 
 	public void testVirtualMappingMetadataCompleteTrue() throws Exception {
@@ -1083,6 +1070,6 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
 		assertFalse(cascade.isRefresh());
 
 		assertTrue(ormManyToManyMapping.getOrderable().isNoOrdering());
-		assertEquals(null, ormManyToManyMapping.getOrderable().getSpecifiedOrderBy());
+		assertEquals(null, ormManyToManyMapping.getOrderable().getOrderBy().getKey());
 	}
 }
\ No newline at end of file
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToManyMappingTests.java
index 9ad278b48c..e494fe27b2 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToManyMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToManyMappingTests.java
@@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.orm;
 import java.util.Iterator;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
+import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.AttributeMapping;
@@ -21,22 +22,23 @@ import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
 import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
 import org.eclipse.jpt.jpa.core.context.FetchType;
 import org.eclipse.jpt.jpa.core.context.IdMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinTable;
 import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
 import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedMappedByRelationshipStrategy;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
 import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
+import org.eclipse.jpt.jpa.core.context.Orderable;
 import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinTable;
+import org.eclipse.jpt.jpa.core.context.SpecifiedMappedByRelationshipStrategy;
 import org.eclipse.jpt.jpa.core.context.TransientMapping;
 import org.eclipse.jpt.jpa.core.context.VersionMapping;
 import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyRelationship;
-import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
+import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.resource.java.JPA;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlEntity;
@@ -571,20 +573,35 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY);
 		OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping();
+		Orderable orderable = ormOneToManyMapping.getOrderable();
 		XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
 		
-		assertNull(ormOneToManyMapping.getOrderable().getSpecifiedOrderBy());
 		assertNull(oneToMany.getOrderBy());
-				
-		//set orderBy in the resource model, verify context model updated
-		oneToMany.setOrderBy("newOrderBy");
-		assertEquals("newOrderBy", ormOneToManyMapping.getOrderable().getSpecifiedOrderBy());
-		assertEquals("newOrderBy", oneToMany.getOrderBy());
-	
-		//set orderBy to null in the resource model
+		assertTrue(orderable.isNoOrdering());
+		assertFalse(orderable.isOrderByOrdering());
+		assertNull(orderable.getOrderBy().getKey());
+		
+		oneToMany.setOrderBy(OrmFactory.eINSTANCE.createXmlOrderBy());
+		
+		assertNotNull(oneToMany.getOrderBy());
+		assertFalse(orderable.isNoOrdering());
+		assertTrue(orderable.isOrderByOrdering());
+		assertTrue(orderable.getOrderBy().isByPrimaryKey());
+		assertTrue(StringTools.isBlank(orderable.getOrderBy().getKey()));
+		
+		oneToMany.getOrderBy().setValue("foo");
+		
+		assertNotNull(oneToMany.getOrderBy().getValue());
+		assertFalse(orderable.isNoOrdering());
+		assertTrue(orderable.isOrderByOrdering());
+		assertFalse(orderable.getOrderBy().isByPrimaryKey());
+		assertEquals("foo", orderable.getOrderBy().getKey());
+		
 		oneToMany.setOrderBy(null);
-		assertNull(ormOneToManyMapping.getOrderable().getSpecifiedOrderBy());
+		
 		assertNull(oneToMany.getOrderBy());
+		assertTrue(orderable.isNoOrdering());
+		assertFalse(orderable.isOrderByOrdering());
 	}
 	
 	public void testModifyOrderBy() throws Exception {
@@ -592,74 +609,35 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
 		OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY);
 		OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping();
+		Orderable orderable = ormOneToManyMapping.getOrderable();
 		XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0);
 		
-		assertNull(ormOneToManyMapping.getOrderable().getSpecifiedOrderBy());
 		assertNull(oneToMany.getOrderBy());
+		assertTrue(orderable.isNoOrdering());
+		assertFalse(orderable.isOrderByOrdering());
+		assertNull(orderable.getOrderBy().getKey());
 				
-		//set mappedBy in the context model, verify resource model updated
-		ormOneToManyMapping.getOrderable().setSpecifiedOrderBy("newOrderBy");
-		assertEquals("newOrderBy", ormOneToManyMapping.getOrderable().getSpecifiedOrderBy());
-		assertEquals("newOrderBy", oneToMany.getOrderBy());
-	
-		//set mappedBy to null in the context model
-		ormOneToManyMapping.getOrderable().setSpecifiedOrderBy(null);
-		assertNull(ormOneToManyMapping.getOrderable().getSpecifiedOrderBy());
-		assertNull(oneToMany.getOrderBy());
-	}
-	
-	public void testIsNoOrdering() throws Exception {
-		createTestType();
-		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
-		OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY);
-		OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping();
+		orderable.setOrderByOrdering();
 		
-		assertTrue(ormOneToManyMapping.getOrderable().isNoOrdering());
-
-		ormOneToManyMapping.getOrderable().setSpecifiedOrderBy("foo");
-		assertFalse(ormOneToManyMapping.getOrderable().isNoOrdering());
+		assertNotNull(oneToMany.getOrderBy());
+		assertFalse(orderable.isNoOrdering());
+		assertTrue(orderable.isOrderByOrdering());
+		assertTrue(orderable.getOrderBy().isByPrimaryKey());
+		assertTrue(StringTools.isBlank(orderable.getOrderBy().getKey()));
 		
-		ormOneToManyMapping.getOrderable().setSpecifiedOrderBy(null);
-		assertTrue(ormOneToManyMapping.getOrderable().isNoOrdering());
-	}
-	
-	public void testSetNoOrdering() throws Exception {
-		createTestType();
-		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
-		OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY);
-		OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping();
+		orderable.getOrderBy().setKey("foo");
 		
-		assertTrue(ormOneToManyMapping.getOrderable().isNoOrdering());
-
-		ormOneToManyMapping.getOrderable().setSpecifiedOrderBy("foo");
-		assertFalse(ormOneToManyMapping.getOrderable().isNoOrdering());
+		assertNotNull(oneToMany.getOrderBy().getValue());
+		assertFalse(orderable.isNoOrdering());
+		assertTrue(orderable.isOrderByOrdering());
+		assertFalse(orderable.getOrderBy().isByPrimaryKey());
+		assertEquals("foo", orderable.getOrderBy().getKey());
 		
-		ormOneToManyMapping.getOrderable().setNoOrdering(true);
-		assertTrue(ormOneToManyMapping.getOrderable().isNoOrdering());
-		assertNull(ormOneToManyMapping.getOrderable().getSpecifiedOrderBy());
-	}
-//TODO
-//	public boolean isOrderByPk() {
-//		return "".equals(getOrderBy());
-//	}
-//
-//	public void setOrderByPk() {
-//		setOrderBy("");
-//	}
-
-	public void testIsCustomOrdering() throws Exception {
-		createTestType();
-		OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
-		OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY);
-		OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping();
-		
-		assertFalse(ormOneToManyMapping.getOrderable().isCustomOrdering());
-
-		ormOneToManyMapping.getOrderable().setSpecifiedOrderBy("foo");
-		assertTrue(ormOneToManyMapping.getOrderable().isCustomOrdering());
+		orderable.setNoOrdering();
 		
-		ormOneToManyMapping.getOrderable().setSpecifiedOrderBy(null);
-		assertFalse(ormOneToManyMapping.getOrderable().isCustomOrdering());
+		assertNull(oneToMany.getOrderBy());
+		assertTrue(orderable.isNoOrdering());
+		assertFalse(orderable.isOrderByOrdering());
 	}
 	
 	public void testOneToManyMorphToIdMapping() throws Exception {
@@ -671,7 +649,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		assertFalse(oneToManyMapping.isDefault());
 		oneToManyMapping.setSpecifiedFetch(FetchType.EAGER);
 		oneToManyMapping.setSpecifiedTargetEntity("TargetEntity");
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("customOrder");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("customOrder");
 		oneToManyMapping.setSpecifiedMapKey("mapKey");
 		oneToManyMapping.getRelationship().getMappedByStrategy().setMappedByAttribute("mappedBy");
 		assertFalse(oneToManyMapping.isDefault());	
@@ -692,7 +671,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		assertFalse(oneToManyMapping.isDefault());
 		oneToManyMapping.setSpecifiedFetch(FetchType.EAGER);
 		oneToManyMapping.setSpecifiedTargetEntity("TargetEntity");
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("customOrder");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("customOrder");
 		oneToManyMapping.setSpecifiedMapKey("mapKey");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("MY_JOIN_TABLE");
 		SpecifiedJoinColumn joinColumn = oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().addSpecifiedJoinColumn(0);
@@ -719,7 +699,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		assertFalse(oneToManyMapping.isDefault());
 		oneToManyMapping.setSpecifiedFetch(FetchType.EAGER);
 		oneToManyMapping.setSpecifiedTargetEntity("TargetEntity");
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("customOrder");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("customOrder");
 		oneToManyMapping.setSpecifiedMapKey("mapKey");
 		oneToManyMapping.getRelationship().getMappedByStrategy().setMappedByAttribute("mappedBy");
 		assertFalse(oneToManyMapping.isDefault());	
@@ -740,7 +721,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		assertFalse(oneToManyMapping.isDefault());
 		oneToManyMapping.setSpecifiedFetch(FetchType.EAGER);
 		oneToManyMapping.setSpecifiedTargetEntity("TargetEntity");
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("customOrder");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("customOrder");
 		oneToManyMapping.setSpecifiedMapKey("mapKey");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("MY_JOIN_TABLE");
 		SpecifiedJoinColumn joinColumn = oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().addSpecifiedJoinColumn(0);
@@ -767,7 +749,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		assertFalse(oneToManyMapping.isDefault());
 		oneToManyMapping.setSpecifiedFetch(FetchType.EAGER);
 		oneToManyMapping.setSpecifiedTargetEntity("TargetEntity");
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("customOrder");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("customOrder");
 		oneToManyMapping.setSpecifiedMapKey("mapKey");
 		oneToManyMapping.getRelationship().getMappedByStrategy().setMappedByAttribute("mappedBy");
 		assertFalse(oneToManyMapping.isDefault());	
@@ -788,7 +771,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		assertFalse(oneToManyMapping.isDefault());
 		oneToManyMapping.setSpecifiedFetch(FetchType.EAGER);
 		oneToManyMapping.setSpecifiedTargetEntity("TargetEntity");
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("customOrder");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("customOrder");
 		oneToManyMapping.setSpecifiedMapKey("mapKey");
 		oneToManyMapping.getRelationship().getMappedByStrategy().setMappedByAttribute("mappedBy");
 		oneToManyMapping.getCascade().setAll(true);
@@ -822,7 +806,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		assertFalse(oneToManyMapping.isDefault());
 		oneToManyMapping.setSpecifiedFetch(FetchType.EAGER);
 		oneToManyMapping.setSpecifiedTargetEntity("TargetEntity");
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("customOrder");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("customOrder");
 		oneToManyMapping.setSpecifiedMapKey("mapKey");
 		oneToManyMapping.getCascade().setAll(true);
 		oneToManyMapping.getCascade().setMerge(true);
@@ -867,7 +852,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		assertFalse(oneToManyMapping.isDefault());
 		oneToManyMapping.setSpecifiedFetch(FetchType.EAGER);
 		oneToManyMapping.setSpecifiedTargetEntity("TargetEntity");
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("customOrder");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("customOrder");
 		oneToManyMapping.setSpecifiedMapKey("mapKey");
 		oneToManyMapping.getRelationship().getMappedByStrategy().setMappedByAttribute("mappedBy");
 		oneToManyMapping.getCascade().setAll(true);
@@ -900,7 +886,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		assertFalse(oneToManyMapping.isDefault());
 		oneToManyMapping.setSpecifiedFetch(FetchType.EAGER);
 		oneToManyMapping.setSpecifiedTargetEntity("TargetEntity");
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("customOrder");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("customOrder");
 		oneToManyMapping.setSpecifiedMapKey("mapKey");
 		oneToManyMapping.getRelationship().getMappedByStrategy().setMappedByAttribute("mappedBy");
 		oneToManyMapping.getCascade().setAll(true);
@@ -1042,10 +1029,10 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		assertTrue(cascade.isRemove());
 		assertTrue(cascade.isRefresh());
 
-		assertTrue(virtualOneToManyMapping.getOrderable().isCustomOrdering());
-		assertEquals("city", virtualOneToManyMapping.getOrderable().getSpecifiedOrderBy());
+		assertTrue(virtualOneToManyMapping.getOrderable().isOrderByOrdering());
+		assertEquals("city", virtualOneToManyMapping.getOrderable().getOrderBy().getKey());
 	}
-
+	
 	public void testVirtualMappingMetadataCompleteTrue() throws Exception {
 		createTestEntityOneToManyMapping();
 		createTestTargetEntityAddress();
@@ -1075,6 +1062,6 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
 		assertFalse(cascade.isRefresh());
 
 		assertTrue(ormOneToManyMapping.getOrderable().isNoOrdering());
-		assertEquals(null, ormOneToManyMapping.getOrderable().getSpecifiedOrderBy());
+		assertEquals(null, ormOneToManyMapping.getOrderable().getOrderBy().getKey());
 	}
 }
\ No newline at end of file
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0Tests.java
index e5eba4e71b..78f1e4404b 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0Tests.java
@@ -19,9 +19,8 @@ import org.eclipse.jpt.common.core.resource.java.NestableAnnotation;
 import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
-import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
-import org.eclipse.jpt.jpa.core.context.SpecifiedAttributeOverride;
+import org.eclipse.jpt.jpa.core.context.AttributeOverride;
 import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer;
 import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
 import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
@@ -32,25 +31,25 @@ import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
 import org.eclipse.jpt.jpa.core.context.EnumType;
 import org.eclipse.jpt.jpa.core.context.FetchType;
 import org.eclipse.jpt.jpa.core.context.IdMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
 import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
 import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
-import org.eclipse.jpt.jpa.core.context.AttributeOverride;
+import org.eclipse.jpt.jpa.core.context.SpecifiedAttributeOverride;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
+import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.TemporalType;
 import org.eclipse.jpt.jpa.core.context.TransientMapping;
 import org.eclipse.jpt.jpa.core.context.TypeMapping;
 import org.eclipse.jpt.jpa.core.context.VersionMapping;
 import org.eclipse.jpt.jpa.core.context.VirtualAttributeOverride;
-import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedAttributeOverride;
 import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverrideContainer;
 import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
+import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedAttributeOverride;
 import org.eclipse.jpt.jpa.core.context.persistence.ClassRef;
 import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0;
+import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.AccessAnnotation2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.ElementCollectionAnnotation2_0;
@@ -1167,7 +1166,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte
 		assertEquals(false, orderable.isOrderColumnOrdering());
 		assertEquals(true, orderable.isNoOrdering());
 		
-		orderable.setOrderColumnOrdering(true);
+		orderable.setOrderColumnOrdering();
 		SpecifiedOrderColumn2_0 orderColumn = orderable.getOrderColumn();
 		assertEquals(true, orderable.isOrderColumnOrdering());
 		assertEquals(null, orderColumn.getSpecifiedName());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToManyMapping2_0Tests.java
index 272631c2d1..fb4faf3ef4 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToManyMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToManyMapping2_0Tests.java
@@ -18,40 +18,39 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
 import org.eclipse.jpt.common.core.resource.java.NestableAnnotation;
 import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
-import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.AttributeMapping;
+import org.eclipse.jpt.jpa.core.context.AttributeOverride;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.core.context.BasicMapping;
 import org.eclipse.jpt.jpa.core.context.Embeddable;
 import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
 import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
 import org.eclipse.jpt.jpa.core.context.Entity;
 import org.eclipse.jpt.jpa.core.context.EnumType;
-import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
 import org.eclipse.jpt.jpa.core.context.IdMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinTableRelationshipStrategy;
 import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
 import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
 import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
-import org.eclipse.jpt.jpa.core.context.AttributeOverride;
-import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinTableRelationshipStrategy;
+import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.TemporalType;
 import org.eclipse.jpt.jpa.core.context.TransientMapping;
 import org.eclipse.jpt.jpa.core.context.VersionMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedAttributeOverride;
 import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverrideContainer;
 import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
+import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedAttributeOverride;
 import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAttributeOverride;
 import org.eclipse.jpt.jpa.core.context.persistence.ClassRef;
 import org.eclipse.jpt.jpa.core.jpa2.MappingKeys2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.ManyToManyMapping2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0;
+import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCollectionMapping2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.AccessAnnotation2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.ElementCollectionAnnotation2_0;
@@ -379,7 +378,8 @@ public class GenericJavaManyToManyMapping2_0Tests
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(manyToManyMapping.isDefault());
@@ -403,7 +403,8 @@ public class GenericJavaManyToManyMapping2_0Tests
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(manyToManyMapping.isDefault());
@@ -425,7 +426,8 @@ public class GenericJavaManyToManyMapping2_0Tests
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(manyToManyMapping.isDefault());
@@ -449,7 +451,8 @@ public class GenericJavaManyToManyMapping2_0Tests
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(manyToManyMapping.isDefault());
@@ -473,7 +476,8 @@ public class GenericJavaManyToManyMapping2_0Tests
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(manyToManyMapping.isDefault());
@@ -497,7 +501,8 @@ public class GenericJavaManyToManyMapping2_0Tests
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(manyToManyMapping.isDefault());
@@ -521,7 +526,8 @@ public class GenericJavaManyToManyMapping2_0Tests
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(manyToManyMapping.isDefault());
@@ -545,7 +551,8 @@ public class GenericJavaManyToManyMapping2_0Tests
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(manyToManyMapping.isDefault());
@@ -569,7 +576,8 @@ public class GenericJavaManyToManyMapping2_0Tests
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(manyToManyMapping.isDefault());
@@ -593,7 +601,8 @@ public class GenericJavaManyToManyMapping2_0Tests
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(manyToManyMapping.isDefault());
@@ -617,7 +626,8 @@ public class GenericJavaManyToManyMapping2_0Tests
 		ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		manyToManyMapping.getOrderable().setOrderByOrdering();
+		manyToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(manyToManyMapping.isDefault());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java
index bd2f6af7dc..718a05b41f 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java
@@ -19,28 +19,27 @@ import org.eclipse.jpt.common.core.resource.java.NestableAnnotation;
 import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable;
 import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
-import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.AttributeMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedAttributeOverride;
+import org.eclipse.jpt.jpa.core.context.AttributeOverride;
 import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.core.context.BasicMapping;
 import org.eclipse.jpt.jpa.core.context.Embeddable;
 import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
 import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
 import org.eclipse.jpt.jpa.core.context.Entity;
 import org.eclipse.jpt.jpa.core.context.EnumType;
-import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
 import org.eclipse.jpt.jpa.core.context.IdMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumnRelationship;
 import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
 import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
 import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
+import org.eclipse.jpt.jpa.core.context.SpecifiedAttributeOverride;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumnRelationship;
 import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.AttributeOverride;
-import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.core.context.TemporalType;
 import org.eclipse.jpt.jpa.core.context.TransientMapping;
 import org.eclipse.jpt.jpa.core.context.VersionMapping;
@@ -49,10 +48,10 @@ import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
 import org.eclipse.jpt.jpa.core.context.persistence.ClassRef;
 import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyMapping2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyRelationship2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalMapping2_0;
+import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.AccessAnnotation2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyClassAnnotation2_0;
@@ -398,7 +397,8 @@ public class GenericJavaOneToManyMapping2_0Tests
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(oneToManyMapping.isDefault());
@@ -422,7 +422,8 @@ public class GenericJavaOneToManyMapping2_0Tests
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(oneToManyMapping.isDefault());
@@ -444,7 +445,8 @@ public class GenericJavaOneToManyMapping2_0Tests
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(oneToManyMapping.isDefault());
@@ -468,7 +470,8 @@ public class GenericJavaOneToManyMapping2_0Tests
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(oneToManyMapping.isDefault());
@@ -492,7 +495,8 @@ public class GenericJavaOneToManyMapping2_0Tests
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(oneToManyMapping.isDefault());
@@ -516,7 +520,8 @@ public class GenericJavaOneToManyMapping2_0Tests
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(oneToManyMapping.isDefault());
@@ -540,7 +545,8 @@ public class GenericJavaOneToManyMapping2_0Tests
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(oneToManyMapping.isDefault());
@@ -564,7 +570,8 @@ public class GenericJavaOneToManyMapping2_0Tests
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(oneToManyMapping.isDefault());
@@ -588,7 +595,8 @@ public class GenericJavaOneToManyMapping2_0Tests
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(oneToManyMapping.isDefault());
@@ -612,7 +620,8 @@ public class GenericJavaOneToManyMapping2_0Tests
 		OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
-		oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf");
+		oneToManyMapping.getOrderable().setOrderByOrdering();
+		oneToManyMapping.getOrderable().getOrderBy().setKey("asdf");
 		oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO");
 		resourceField.addAnnotation(AccessAnnotation2_0.ANNOTATION_NAME);
 		assertFalse(oneToManyMapping.isDefault());
@@ -1290,10 +1299,9 @@ public class GenericJavaOneToManyMapping2_0Tests
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping();
 		((SpecifiedJoinColumnRelationship) oneToManyMapping.getRelationship()).setStrategyToJoinColumn();
-		((Orderable2_0) oneToManyMapping.getOrderable()).setOrderColumnOrdering(true);
+		((Orderable2_0) oneToManyMapping.getOrderable()).setOrderColumnOrdering();
 		SpecifiedOrderColumn2_0 orderColumn = ((Orderable2_0) oneToManyMapping.getOrderable()).getOrderColumn();
-
-
+		
 		assertNull(orderColumn.getSpecifiedName());
 		assertEquals("addresses_ORDER", orderColumn.getName());
 		assertEquals("Address", orderColumn.getTableName());//target table name
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java
index c9c1aa7f5d..a6ef061544 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java
@@ -15,38 +15,38 @@ import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
+import org.eclipse.jpt.jpa.core.context.AttributeOverride;
 import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.core.context.BasicMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedColumn;
+import org.eclipse.jpt.jpa.core.context.Column;
 import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
 import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
 import org.eclipse.jpt.jpa.core.context.EnumType;
-import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
 import org.eclipse.jpt.jpa.core.context.FetchType;
 import org.eclipse.jpt.jpa.core.context.IdMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
 import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
 import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
-import org.eclipse.jpt.jpa.core.context.AttributeOverride;
-import org.eclipse.jpt.jpa.core.context.Column;
-import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
+import org.eclipse.jpt.jpa.core.context.SpecifiedColumn;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
 import org.eclipse.jpt.jpa.core.context.TemporalType;
 import org.eclipse.jpt.jpa.core.context.TransientMapping;
 import org.eclipse.jpt.jpa.core.context.VersionMapping;
 import org.eclipse.jpt.jpa.core.context.VirtualAttributeOverride;
 import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedAttributeOverride;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer;
-import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedColumn;
 import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
-import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
+import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedAttributeOverride;
+import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedColumn;
+import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.jpa2.MappingKeys2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0;
+import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmElementCollectionMapping2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0;
@@ -950,7 +950,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
 		assertEquals(false, orderable.isOrderColumnOrdering());
 		assertEquals(true, orderable.isNoOrdering());
 		
-		orderable.setOrderColumnOrdering(true);
+		orderable.setOrderColumnOrdering();
 		SpecifiedOrderColumn2_0 orderColumn = orderable.getOrderColumn();
 		assertEquals(true, orderable.isOrderColumnOrdering());
 		assertEquals(null, orderColumn.getSpecifiedName());
@@ -974,7 +974,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
 		assertEquals(true, orderable.isNoOrdering());
 		
 		JavaElementCollectionMapping2_0 javaElementCollectionMapping = (JavaElementCollectionMapping2_0) ormPersistentAttribute.getJavaPersistentAttribute().getMapping();
-		((Orderable2_0) javaElementCollectionMapping.getOrderable()).setOrderColumnOrdering(true);
+		((Orderable2_0) javaElementCollectionMapping.getOrderable()).setOrderColumnOrdering();
 				
 		assertEquals(false, orderable.isOrderColumnOrdering());
 		assertEquals(true, orderable.isNoOrdering());
@@ -1738,4 +1738,4 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
 		assertFalse(ormElementCollectionMapping.getSpecifiedMapKeyJoinColumns().iterator().hasNext());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java
index 637b3fdd24..d559d0421e 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java
@@ -16,28 +16,28 @@ import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.Sourc
 import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.AttributeMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedColumn;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
+import org.eclipse.jpt.jpa.core.context.Column;
 import org.eclipse.jpt.jpa.core.context.Entity;
 import org.eclipse.jpt.jpa.core.context.EnumType;
-import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
 import org.eclipse.jpt.jpa.core.context.FetchType;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
 import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
-import org.eclipse.jpt.jpa.core.context.Column;
 import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
+import org.eclipse.jpt.jpa.core.context.SpecifiedColumn;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
 import org.eclipse.jpt.jpa.core.context.TemporalType;
 import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
 import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
+import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.NullOrmConverter;
 import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.ManyToManyMapping2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0;
+import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCollectionMapping2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCollectionMapping2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0;
@@ -585,13 +585,13 @@ public class GenericOrmManyToManyMapping2_0Tests
 		assertEquals(true, queuesOrderable.isNoOrdering());
 
 		
-		jobsOrderable.setOrderColumnOrdering(true);
+		jobsOrderable.setOrderColumnOrdering();
 		jobsOrderColumn = jobsOrderable.getOrderColumn();
 		assertEquals(true, jobsOrderable.isOrderColumnOrdering());
 		assertEquals(null, jobsOrderColumn.getSpecifiedName());
 		assertEquals("jobs_ORDER", jobsOrderColumn.getDefaultName());
 		assertEquals("PrintJob_PrintQueue", jobsOrderColumn.getTableName());
-		queuesOrderable.setOrderColumnOrdering(true);
+		queuesOrderable.setOrderColumnOrdering();
 		queuesOrderColumn = queuesOrderable.getOrderColumn();
 		assertEquals(true, queuesOrderable.isOrderColumnOrdering());
 		assertEquals(null, queuesOrderColumn.getSpecifiedName());
@@ -641,7 +641,7 @@ public class GenericOrmManyToManyMapping2_0Tests
 		assertEquals(true, queuesOrderable.isNoOrdering());
 		
 		JavaManyToManyMapping javaJobsManyToManyMapping = (JavaManyToManyMapping) jobsPersistentAttribute.getJavaPersistentAttribute().getMapping();
-		((Orderable2_0) javaJobsManyToManyMapping.getOrderable()).setOrderColumnOrdering(true);
+		((Orderable2_0) javaJobsManyToManyMapping.getOrderable()).setOrderColumnOrdering();
 				
 		assertEquals(false, jobsOrderable.isOrderColumnOrdering());
 		assertEquals(true, jobsOrderable.isNoOrdering());
@@ -912,8 +912,8 @@ public class GenericOrmManyToManyMapping2_0Tests
 		assertTrue(cascade.isRefresh());
 		assertTrue(cascade.isDetach());
 
-		assertTrue(virtualManyToManyMapping.getOrderable().isCustomOrdering());
-		assertEquals("city", virtualManyToManyMapping.getOrderable().getSpecifiedOrderBy());
+		assertTrue(virtualManyToManyMapping.getOrderable().isOrderByOrdering());
+		assertEquals("city", virtualManyToManyMapping.getOrderable().getOrderBy().getKey());
 	}
 
 	public void testVirtualMappingMetadataCompleteTrue() throws Exception {
@@ -948,7 +948,7 @@ public class GenericOrmManyToManyMapping2_0Tests
 		assertFalse(cascade.isDetach());
 
 		assertTrue(ormManyToManyMapping.getOrderable().isNoOrdering());
-		assertEquals(null, ormManyToManyMapping.getOrderable().getSpecifiedOrderBy());
+		assertEquals(null, ormManyToManyMapping.getOrderable().getOrderBy().getKey());
 	}
 	
 	public void testUpdateSpecifiedEnumerated() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java
index 7d5918d8f3..750b1a3405 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java
@@ -19,32 +19,32 @@ import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.Sourc
 import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.AttributeMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedColumn;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
+import org.eclipse.jpt.jpa.core.context.Column;
 import org.eclipse.jpt.jpa.core.context.Entity;
 import org.eclipse.jpt.jpa.core.context.EnumType;
-import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
 import org.eclipse.jpt.jpa.core.context.FetchType;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
-import org.eclipse.jpt.jpa.core.context.Column;
 import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
+import org.eclipse.jpt.jpa.core.context.SpecifiedColumn;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
 import org.eclipse.jpt.jpa.core.context.TemporalType;
 import org.eclipse.jpt.jpa.core.context.java.JavaEntity;
 import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
 import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
+import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.NullOrmConverter;
 import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyMapping2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyRelationship2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalMapping2_0;
+import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOneToManyRelationship2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyColumnAnnotation2_0;
@@ -654,7 +654,7 @@ public class GenericOrmOneToManyMapping2_0Tests
 		assertEquals(false, orderable.isOrderColumnOrdering());
 		assertEquals(true, orderable.isNoOrdering());
 		
-		orderable.setOrderColumnOrdering(true);
+		orderable.setOrderColumnOrdering();
 		SpecifiedOrderColumn2_0 orderColumn = orderable.getOrderColumn();
 		assertEquals(true, orderable.isOrderColumnOrdering());
 		assertEquals(null, orderColumn.getSpecifiedName());
@@ -686,7 +686,7 @@ public class GenericOrmOneToManyMapping2_0Tests
 		assertEquals(true, orderable.isNoOrdering());
 		
 		JavaOneToManyMapping javaOneToManyMapping = (JavaOneToManyMapping) ormPersistentAttribute.getJavaPersistentAttribute().getMapping();
-		((Orderable2_0) javaOneToManyMapping.getOrderable()).setOrderColumnOrdering(true);
+		((Orderable2_0) javaOneToManyMapping.getOrderable()).setOrderColumnOrdering();
 				
 		assertEquals(false, orderable.isOrderColumnOrdering());
 		assertEquals(true, orderable.isNoOrdering());
@@ -1140,7 +1140,7 @@ public class GenericOrmOneToManyMapping2_0Tests
 		OneToManyMapping2_0 javaOneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getJavaPersistentAttribute().getMapping();
 		OneToManyRelationship2_0 rr = (OneToManyRelationship2_0) javaOneToManyMapping.getRelationship();
 		rr.setStrategyToJoinColumn();
-		((Orderable2_0) javaOneToManyMapping.getOrderable()).setOrderColumnOrdering(true);
+		((Orderable2_0) javaOneToManyMapping.getOrderable()).setOrderColumnOrdering();
 		SpecifiedOrderColumn2_0 orderColumn = ((Orderable2_0) oneToManyMapping.getOrderable()).getOrderColumn();
 
 		assertNull(orderColumn.getSpecifiedName());
@@ -1161,7 +1161,7 @@ public class GenericOrmOneToManyMapping2_0Tests
 
 		rr.setStrategyToJoinColumn();
 		assertFalse(((Orderable2_0) oneToManyMapping.getOrderable()).isOrderColumnOrdering());
-		((Orderable2_0) oneToManyMapping.getOrderable()).setOrderColumnOrdering(true);
+		((Orderable2_0) oneToManyMapping.getOrderable()).setOrderColumnOrdering();
 		orderColumn = ((Orderable2_0) oneToManyMapping.getOrderable()).getOrderColumn();
 
 		assertNull(orderColumn.getSpecifiedName());
@@ -1199,8 +1199,8 @@ public class GenericOrmOneToManyMapping2_0Tests
 		assertTrue(cascade.isRefresh());
 		assertTrue(cascade.isDetach());
 
-		assertTrue(virtualOneToManyMapping.getOrderable().isCustomOrdering());
-		assertEquals("city", virtualOneToManyMapping.getOrderable().getSpecifiedOrderBy());
+		assertTrue(virtualOneToManyMapping.getOrderable().isOrderByOrdering());
+		assertEquals("city", virtualOneToManyMapping.getOrderable().getOrderBy().getKey());
 
 		assertTrue(((OrphanRemovalMapping2_0) virtualOneToManyMapping).getOrphanRemoval().isOrphanRemoval());
 	}
@@ -1237,7 +1237,7 @@ public class GenericOrmOneToManyMapping2_0Tests
 		assertFalse(cascade.isDetach());
 
 		assertTrue(ormOneToManyMapping.getOrderable().isNoOrdering());
-		assertEquals(null, ormOneToManyMapping.getOrderable().getSpecifiedOrderBy());
+		assertEquals(null, ormOneToManyMapping.getOrderable().getOrderBy().getKey());
 
 		assertFalse(((OrphanRemovalMapping2_0) ormOneToManyMapping).getOrphanRemoval().isOrphanRemoval());
 	}
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaElementCollectionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaElementCollectionMappingTests.java
index fad40113b2..4b0202441a 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaElementCollectionMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaElementCollectionMappingTests.java
@@ -12,43 +12,43 @@ package org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context.java;
 import java.util.Iterator;
 import java.util.ListIterator;
 import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType;
 import org.eclipse.jpt.common.core.resource.java.NestableAnnotation;
 import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
-import org.eclipse.jpt.jpa.core.context.SpecifiedAttributeOverride;
+import org.eclipse.jpt.jpa.core.context.AttributeOverride;
 import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.core.context.BasicMapping;
 import org.eclipse.jpt.jpa.core.context.Embeddable;
 import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
 import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
 import org.eclipse.jpt.jpa.core.context.EnumType;
-import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
 import org.eclipse.jpt.jpa.core.context.FetchType;
 import org.eclipse.jpt.jpa.core.context.IdMapping;
 import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
 import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
-import org.eclipse.jpt.jpa.core.context.AttributeOverride;
-import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
+import org.eclipse.jpt.jpa.core.context.SpecifiedAttributeOverride;
+import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.TemporalType;
 import org.eclipse.jpt.jpa.core.context.TransientMapping;
 import org.eclipse.jpt.jpa.core.context.TypeMapping;
 import org.eclipse.jpt.jpa.core.context.VersionMapping;
 import org.eclipse.jpt.jpa.core.context.VirtualAttributeOverride;
-import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedAttributeOverride;
 import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverrideContainer;
 import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
+import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedAttributeOverride;
 import org.eclipse.jpt.jpa.core.context.persistence.ClassRef;
 import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0;
+import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.ElementCollectionAnnotation2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0;
@@ -70,8 +70,8 @@ import org.eclipse.jpt.jpa.core.resource.java.OneToManyAnnotation;
 import org.eclipse.jpt.jpa.core.resource.java.TransientAnnotation;
 import org.eclipse.jpt.jpa.core.resource.java.VersionAnnotation;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
 import org.eclipse.jpt.jpa.eclipselink.core.resource.java.ConvertAnnotation;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
 import org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context.EclipseLink2_0ContextModelTestCase;
 
 @SuppressWarnings("nls")
@@ -1073,7 +1073,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests
 		assertEquals(false, orderable.isOrderColumnOrdering());
 		assertEquals(true, orderable.isNoOrdering());
 		
-		orderable.setOrderColumnOrdering(true);
+		orderable.setOrderColumnOrdering();
 		SpecifiedOrderColumn2_0 orderColumn = orderable.getOrderColumn();
 		assertEquals(true, orderable.isOrderColumnOrdering());
 		assertEquals(null, orderColumn.getSpecifiedName());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToManyMappingTests.java
index f8fa73a82f..0d0de25dd1 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToManyMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToManyMappingTests.java
@@ -19,7 +19,7 @@ import org.eclipse.jpt.common.core.resource.java.NestableAnnotation;
 import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable;
 import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
-import org.eclipse.jpt.jpa.core.context.SpecifiedAttributeOverride;
+import org.eclipse.jpt.jpa.core.context.AttributeOverride;
 import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer;
 import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
 import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
@@ -27,11 +27,11 @@ import org.eclipse.jpt.jpa.core.context.BasicMapping;
 import org.eclipse.jpt.jpa.core.context.Embeddable;
 import org.eclipse.jpt.jpa.core.context.Entity;
 import org.eclipse.jpt.jpa.core.context.EnumType;
+import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
+import org.eclipse.jpt.jpa.core.context.SpecifiedAttributeOverride;
 import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
 import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumnRelationship;
-import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
 import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.AttributeOverride;
 import org.eclipse.jpt.jpa.core.context.TemporalType;
 import org.eclipse.jpt.jpa.core.context.VirtualAttributeOverride;
 import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping;
@@ -39,10 +39,10 @@ import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
 import org.eclipse.jpt.jpa.core.context.persistence.ClassRef;
 import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyMapping2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyRelationship2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalMapping2_0;
+import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyClassAnnotation2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyColumnAnnotation2_0;
@@ -913,7 +913,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping();
 		((SpecifiedJoinColumnRelationship) oneToManyMapping.getRelationship()).setStrategyToJoinColumn();
-		((Orderable2_0) oneToManyMapping.getOrderable()).setOrderColumnOrdering(true);
+		((Orderable2_0) oneToManyMapping.getOrderable()).setOrderColumnOrdering();
 		SpecifiedOrderColumn2_0 orderColumn = ((Orderable2_0) oneToManyMapping.getOrderable()).getOrderColumn();
 
 
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java
index 2f1234a909..117487a4c6 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java
@@ -15,12 +15,12 @@ import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
-import org.eclipse.jpt.jpa.core.context.SpecifiedAttributeOverride;
+import org.eclipse.jpt.jpa.core.context.AttributeOverride;
 import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer;
 import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
 import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.core.context.BasicMapping;
-import org.eclipse.jpt.jpa.core.context.SpecifiedColumn;
+import org.eclipse.jpt.jpa.core.context.Column;
 import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
 import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
 import org.eclipse.jpt.jpa.core.context.EnumType;
@@ -29,24 +29,24 @@ import org.eclipse.jpt.jpa.core.context.IdMapping;
 import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
 import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
-import org.eclipse.jpt.jpa.core.context.AttributeOverride;
-import org.eclipse.jpt.jpa.core.context.Column;
+import org.eclipse.jpt.jpa.core.context.SpecifiedAttributeOverride;
+import org.eclipse.jpt.jpa.core.context.SpecifiedColumn;
 import org.eclipse.jpt.jpa.core.context.TemporalType;
 import org.eclipse.jpt.jpa.core.context.TransientMapping;
 import org.eclipse.jpt.jpa.core.context.VersionMapping;
 import org.eclipse.jpt.jpa.core.context.VirtualAttributeOverride;
 import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedAttributeOverride;
 import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer;
-import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedColumn;
 import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
-import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
+import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedAttributeOverride;
+import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedColumn;
+import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.jpa2.MappingKeys2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0;
+import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmElementCollectionMapping2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0;
@@ -978,7 +978,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests
 		assertEquals(false, orderable.isOrderColumnOrdering());
 		assertEquals(true, orderable.isNoOrdering());
 		
-		orderable.setOrderColumnOrdering(true);
+		orderable.setOrderColumnOrdering();
 		SpecifiedOrderColumn2_0 orderColumn = orderable.getOrderColumn();
 		assertEquals(true, orderable.isOrderColumnOrdering());
 		assertEquals(null, orderColumn.getSpecifiedName());
@@ -1002,7 +1002,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests
 		assertEquals(true, orderable.isNoOrdering());
 		
 		JavaElementCollectionMapping2_0 javaElementCollectionMapping = (JavaElementCollectionMapping2_0) ormPersistentAttribute.getJavaPersistentAttribute().getMapping();
-		((Orderable2_0) javaElementCollectionMapping.getOrderable()).setOrderColumnOrdering(true);
+		((Orderable2_0) javaElementCollectionMapping.getOrderable()).setOrderColumnOrdering();
 				
 		assertEquals(false, orderable.isOrderColumnOrdering());
 		assertEquals(true, orderable.isNoOrdering());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java
index f4584dba9b..a71425b772 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java
@@ -10,7 +10,6 @@
 package org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context.orm;
 
 import java.util.Iterator;
-
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
@@ -18,25 +17,25 @@ import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.AttributeMapping;
 import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
 import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
-import org.eclipse.jpt.jpa.core.context.SpecifiedColumn;
+import org.eclipse.jpt.jpa.core.context.Column;
 import org.eclipse.jpt.jpa.core.context.Entity;
 import org.eclipse.jpt.jpa.core.context.EnumType;
 import org.eclipse.jpt.jpa.core.context.FetchType;
 import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
-import org.eclipse.jpt.jpa.core.context.Column;
 import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.SpecifiedColumn;
 import org.eclipse.jpt.jpa.core.context.TemporalType;
 import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
 import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
+import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.ManyToManyMapping2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyMapping2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0;
+import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCollectionMapping2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCollectionMapping2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0;
@@ -606,13 +605,13 @@ public class EclipseLink2_0OrmManyToManyMappingTests
 		assertEquals(true, queuesOrderable.isNoOrdering());
 
 		
-		jobsOrderable.setOrderColumnOrdering(true);
+		jobsOrderable.setOrderColumnOrdering();
 		jobsOrderColumn = jobsOrderable.getOrderColumn();
 		assertEquals(true, jobsOrderable.isOrderColumnOrdering());
 		assertEquals(null, jobsOrderColumn.getSpecifiedName());
 		assertEquals("jobs_ORDER", jobsOrderColumn.getDefaultName());
 		assertEquals("PrintJob_PrintQueue", jobsOrderColumn.getTableName());
-		queuesOrderable.setOrderColumnOrdering(true);
+		queuesOrderable.setOrderColumnOrdering();
 		queuesOrderColumn = queuesOrderable.getOrderColumn();
 		assertEquals(true, queuesOrderable.isOrderColumnOrdering());
 		assertEquals(null, queuesOrderColumn.getSpecifiedName());
@@ -662,7 +661,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests
 		assertEquals(true, queuesOrderable.isNoOrdering());
 		
 		JavaManyToManyMapping javaJobsManyToManyMapping = (JavaManyToManyMapping) jobsPersistentAttribute.getJavaPersistentAttribute().getMapping();
-		((Orderable2_0) javaJobsManyToManyMapping.getOrderable()).setOrderColumnOrdering(true);
+		((Orderable2_0) javaJobsManyToManyMapping.getOrderable()).setOrderColumnOrdering();
 				
 		assertEquals(false, jobsOrderable.isOrderColumnOrdering());
 		assertEquals(true, jobsOrderable.isNoOrdering());
@@ -946,8 +945,8 @@ public class EclipseLink2_0OrmManyToManyMappingTests
 		assertTrue(cascade.isRefresh());
 		assertTrue(cascade.isDetach());
 
-		assertTrue(virtualManyToManyMapping.getOrderable().isCustomOrdering());
-		assertEquals("city", virtualManyToManyMapping.getOrderable().getSpecifiedOrderBy());
+		assertTrue(virtualManyToManyMapping.getOrderable().isOrderByOrdering());
+		assertEquals("city", virtualManyToManyMapping.getOrderable().getOrderBy().getKey());
 
 		assertEquals(EclipseLinkJoinFetchType.INNER, ((EclipseLinkJoinFetchMapping) virtualManyToManyMapping).getJoinFetch().getValue());
 	}
@@ -983,7 +982,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests
 		assertFalse(cascade.isDetach());
 
 		assertTrue(ormManyToManyMapping.getOrderable().isNoOrdering());
-		assertEquals(null, ormManyToManyMapping.getOrderable().getSpecifiedOrderBy());
+		assertEquals(null, ormManyToManyMapping.getOrderable().getOrderBy().getKey());
 
 		assertEquals(null, ormManyToManyMapping.getJoinFetch().getValue());
 	}
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java
index c39d32f722..84d000d7a4 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java
@@ -11,36 +11,36 @@ package org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context.orm;
 
 import java.util.Iterator;
 import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType;
 import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
 import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
-import org.eclipse.jpt.jpa.core.context.SpecifiedColumn;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
+import org.eclipse.jpt.jpa.core.context.Column;
 import org.eclipse.jpt.jpa.core.context.Entity;
 import org.eclipse.jpt.jpa.core.context.EnumType;
-import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
 import org.eclipse.jpt.jpa.core.context.FetchType;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
-import org.eclipse.jpt.jpa.core.context.Column;
-import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
+import org.eclipse.jpt.jpa.core.context.SpecifiedColumn;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
 import org.eclipse.jpt.jpa.core.context.TemporalType;
 import org.eclipse.jpt.jpa.core.context.java.JavaEntity;
 import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
 import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
+import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyMapping2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyRelationship2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalMapping2_0;
+import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyColumnAnnotation2_0;
 import org.eclipse.jpt.jpa.core.resource.java.JPA;
@@ -512,7 +512,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests
 		assertEquals(false, orderable.isOrderColumnOrdering());
 		assertEquals(true, orderable.isNoOrdering());
 		
-		orderable.setOrderColumnOrdering(true);
+		orderable.setOrderColumnOrdering();
 		SpecifiedOrderColumn2_0 orderColumn = orderable.getOrderColumn();
 		assertEquals(true, orderable.isOrderColumnOrdering());
 		assertEquals(null, orderColumn.getSpecifiedName());
@@ -544,7 +544,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests
 		assertEquals(true, orderable.isNoOrdering());
 		
 		JavaOneToManyMapping javaOneToManyMapping = (JavaOneToManyMapping) ormPersistentAttribute.getJavaPersistentAttribute().getMapping();
-		((Orderable2_0) javaOneToManyMapping.getOrderable()).setOrderColumnOrdering(true);
+		((Orderable2_0) javaOneToManyMapping.getOrderable()).setOrderColumnOrdering();
 				
 		assertEquals(false, orderable.isOrderColumnOrdering());
 		assertEquals(true, orderable.isNoOrdering());
@@ -1003,7 +1003,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests
 		OneToManyMapping2_0 virtualOneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping();
 		OneToManyMapping2_0 javaOneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getJavaPersistentAttribute().getMapping();
 		((OneToManyRelationship2_0) javaOneToManyMapping.getRelationship()).setStrategyToJoinColumn();
-		((Orderable2_0) javaOneToManyMapping.getOrderable()).setOrderColumnOrdering(true);
+		((Orderable2_0) javaOneToManyMapping.getOrderable()).setOrderColumnOrdering();
 		SpecifiedOrderColumn2_0 orderColumn = ((Orderable2_0) virtualOneToManyMapping.getOrderable()).getOrderColumn();
 
 		assertEquals("addresses_ORDER", orderColumn.getName());
@@ -1022,7 +1022,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests
 
 		((OneToManyRelationship2_0) ormOneToManyMapping.getRelationship()).setStrategyToJoinColumn();
 		assertFalse(((Orderable2_0) ormOneToManyMapping.getOrderable()).isOrderColumnOrdering());
-		((Orderable2_0) ormOneToManyMapping.getOrderable()).setOrderColumnOrdering(true);
+		((Orderable2_0) ormOneToManyMapping.getOrderable()).setOrderColumnOrdering();
 		orderColumn = ((Orderable2_0) ormOneToManyMapping.getOrderable()).getOrderColumn();
 
 		assertNull(orderColumn.getSpecifiedName());
@@ -1060,8 +1060,8 @@ public class EclipseLink2_0OrmOneToManyMappingTests
 		assertTrue(cascade.isRefresh());
 		assertTrue(cascade.isDetach());
 
-		assertTrue(virtualOneToManyMapping.getOrderable().isCustomOrdering());
-		assertEquals("city", virtualOneToManyMapping.getOrderable().getSpecifiedOrderBy());
+		assertTrue(virtualOneToManyMapping.getOrderable().isOrderByOrdering());
+		assertEquals("city", virtualOneToManyMapping.getOrderable().getOrderBy().getKey());
 
 		assertTrue(((OrphanRemovalMapping2_0) virtualOneToManyMapping).getOrphanRemoval().isOrphanRemoval());
 		assertEquals(EclipseLinkJoinFetchType.INNER, virtualOneToManyMapping.getJoinFetch().getValue());
@@ -1094,7 +1094,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests
 		assertFalse(cascade.isDetach());
 
 		assertTrue(virtualOneToManyMapping.getOrderable().isNoOrdering());
-		assertEquals(null, virtualOneToManyMapping.getOrderable().getSpecifiedOrderBy());
+		assertEquals(null, virtualOneToManyMapping.getOrderable().getOrderBy().getKey());
 
 		assertFalse(((OrphanRemovalMapping2_0) virtualOneToManyMapping).getOrphanRemoval().isOrphanRemoval());
 		assertEquals(null, virtualOneToManyMapping.getJoinFetch().getValue());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToManyMappingTests.java
index 9ee8a4ad6c..e96eed24b6 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToManyMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToManyMappingTests.java
@@ -16,12 +16,12 @@ import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.Cascade;
 import org.eclipse.jpt.jpa.core.context.FetchType;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinTable;
 import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinTable;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
+import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.resource.java.JPA;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetchMapping;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetchType;
@@ -355,8 +355,8 @@ public class EclipseLinkOrmManyToManyMappingTests
 		assertTrue(cascade.isRemove());
 		assertTrue(cascade.isRefresh());
 
-		assertTrue(virtualManyToManyMapping.getOrderable().isCustomOrdering());
-		assertEquals("city", virtualManyToManyMapping.getOrderable().getSpecifiedOrderBy());
+		assertTrue(virtualManyToManyMapping.getOrderable().isOrderByOrdering());
+		assertEquals("city", virtualManyToManyMapping.getOrderable().getOrderBy().getKey());
 
 		assertEquals(EclipseLinkJoinFetchType.INNER, ((EclipseLinkJoinFetchMapping) virtualManyToManyMapping).getJoinFetch().getValue());
 	}
@@ -390,7 +390,7 @@ public class EclipseLinkOrmManyToManyMappingTests
 		assertFalse(cascade.isRefresh());
 
 		assertTrue(ormManyToManyMapping.getOrderable().isNoOrdering());
-		assertEquals(null, ormManyToManyMapping.getOrderable().getSpecifiedOrderBy());
+		assertEquals(null, ormManyToManyMapping.getOrderable().getOrderBy().getKey());
 
 		assertEquals(null, ormManyToManyMapping.getJoinFetch().getValue());
 	}
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java
index c2a581c676..17f6af7b63 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java
@@ -16,12 +16,12 @@ import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.Cascade;
 import org.eclipse.jpt.jpa.core.context.FetchType;
-import org.eclipse.jpt.jpa.core.context.SpecifiedJoinTable;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
+import org.eclipse.jpt.jpa.core.context.SpecifiedJoinTable;
 import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
+import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.resource.java.JPA;
 import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetchType;
@@ -721,8 +721,8 @@ public class EclipseLinkOrmOneToManyMappingTests
 		assertTrue(cascade.isRemove());
 		assertTrue(cascade.isRefresh());
 
-		assertTrue(virtualOneToManyMapping.getOrderable().isCustomOrdering());
-		assertEquals("city", virtualOneToManyMapping.getOrderable().getSpecifiedOrderBy());
+		assertTrue(virtualOneToManyMapping.getOrderable().isOrderByOrdering());
+		assertEquals("city", virtualOneToManyMapping.getOrderable().getOrderBy().getKey());
 
 		assertEquals(EclipseLinkJoinFetchType.INNER, virtualOneToManyMapping.getJoinFetch().getValue());
 	}
@@ -753,7 +753,7 @@ public class EclipseLinkOrmOneToManyMappingTests
 		assertFalse(cascade.isRefresh());
 
 		assertTrue(virtualOneToManyMapping.getOrderable().isNoOrdering());
-		assertEquals(null, virtualOneToManyMapping.getOrderable().getSpecifiedOrderBy());
+		assertEquals(null, virtualOneToManyMapping.getOrderable().getOrderBy().getKey());
 
 		assertEquals(null, virtualOneToManyMapping.getJoinFetch().getValue());
 	}