bug 295881 - Eclipselink 1.2 platform support

2 files changed, 87 insertions, 64 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/AbstractEclipseLinkOrmXmlDefinition.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/AbstractEclipseLinkOrmXmlDefinition.java
new file mode 100644
index 0000000000..7aa95d2c54
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/AbstractEclipseLinkOrmXmlDefinition.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.eclipselink.core.internal.context.orm;
+
+import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.core.context.orm.NullOrmAttributeMappingDefinition;
+import org.eclipse.jpt.core.context.orm.OrmAttributeMappingDefinition;
+import org.eclipse.jpt.core.context.orm.OrmTypeMappingDefinition;
+import org.eclipse.jpt.core.internal.context.orm.AbstractOrmXmlDefinition;
+import org.eclipse.jpt.core.internal.context.orm.OrmBasicMappingDefinition;
+import org.eclipse.jpt.core.internal.context.orm.OrmEmbeddableDefinition;
+import org.eclipse.jpt.core.internal.context.orm.OrmEmbeddedIdMappingDefinition;
+import org.eclipse.jpt.core.internal.context.orm.OrmEmbeddedMappingDefinition;
+import org.eclipse.jpt.core.internal.context.orm.OrmEntityDefinition;
+import org.eclipse.jpt.core.internal.context.orm.OrmIdMappingDefinition;
+import org.eclipse.jpt.core.internal.context.orm.OrmManyToManyMappingDefinition;
+import org.eclipse.jpt.core.internal.context.orm.OrmManyToOneMappingDefinition;
+import org.eclipse.jpt.core.internal.context.orm.OrmMappedSuperclassDefinition;
+import org.eclipse.jpt.core.internal.context.orm.OrmOneToManyMappingDefinition;
+import org.eclipse.jpt.core.internal.context.orm.OrmOneToOneMappingDefinition;
+import org.eclipse.jpt.core.internal.context.orm.OrmTransientMappingDefinition;
+import org.eclipse.jpt.core.internal.context.orm.OrmVersionMappingDefinition;
+import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
+
+public abstract class AbstractEclipseLinkOrmXmlDefinition
+	extends AbstractOrmXmlDefinition
+{
+
+	/**
+	 * zero-argument constructor
+	 */
+	protected AbstractEclipseLinkOrmXmlDefinition() {
+		super();
+	}
+	
+	
+	public EFactory getResourceNodeFactory() {
+		return EclipseLinkOrmFactory.eINSTANCE;
+	}
+	
+	
+	// ********* ORM type mappings *********
+	
+	@Override
+	protected OrmTypeMappingDefinition[] buildOrmTypeMappingDefinitions() {
+		// order should not matter here, but we'll use the same order as for java
+		// @see {@link EclipseLinkJpaPlatformProvider}
+		return new OrmTypeMappingDefinition[] {
+			OrmEntityDefinition.instance(),
+			OrmEmbeddableDefinition.instance(),
+			OrmMappedSuperclassDefinition.instance()};
+	}
+	
+	
+	// ********** ORM attribute mappings **********
+	
+	@Override
+	protected OrmAttributeMappingDefinition[] buildOrmAttributeMappingDefinitions() {
+		// order should not matter here, but we'll use the same order as for java
+		// @see {@link EclipseLinkJpaPlatformProvider}
+		return new OrmAttributeMappingDefinition[] {
+			OrmTransientMappingDefinition.instance(),
+			OrmEclipseLinkBasicCollectionMappingDefinition.instance(),
+			OrmEclipseLinkBasicMapMappingDefinition.instance(),
+			OrmIdMappingDefinition.instance(),
+			OrmVersionMappingDefinition.instance(),
+			OrmBasicMappingDefinition.instance(),
+			OrmEmbeddedMappingDefinition.instance(),
+			OrmEmbeddedIdMappingDefinition.instance(),
+			OrmEclipseLinkTransformationMappingDefinition.instance(),
+			OrmManyToManyMappingDefinition.instance(),
+			OrmManyToOneMappingDefinition.instance(),
+			OrmOneToManyMappingDefinition.instance(),
+			OrmOneToOneMappingDefinition.instance(),
+			OrmEclipseLinkVariableOneToOneMappingDefinition.instance(),
+			NullOrmAttributeMappingDefinition.instance()};
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlDefinition.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlDefinition.java
index 119408e0cc..bd05becebe 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlDefinition.java
@@ -9,32 +9,13 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.internal.context.orm;
 
-import org.eclipse.emf.ecore.EFactory;
 import org.eclipse.jpt.core.JpaResourceType;
-import org.eclipse.jpt.core.context.orm.NullOrmAttributeMappingDefinition;
-import org.eclipse.jpt.core.context.orm.OrmAttributeMappingDefinition;
-import org.eclipse.jpt.core.context.orm.OrmTypeMappingDefinition;
 import org.eclipse.jpt.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.core.context.orm.OrmXmlDefinition;
-import org.eclipse.jpt.core.internal.context.orm.AbstractOrmXmlDefinition;
-import org.eclipse.jpt.core.internal.context.orm.OrmBasicMappingDefinition;
-import org.eclipse.jpt.core.internal.context.orm.OrmEmbeddableDefinition;
-import org.eclipse.jpt.core.internal.context.orm.OrmEmbeddedIdMappingDefinition;
-import org.eclipse.jpt.core.internal.context.orm.OrmEmbeddedMappingDefinition;
-import org.eclipse.jpt.core.internal.context.orm.OrmEntityDefinition;
-import org.eclipse.jpt.core.internal.context.orm.OrmIdMappingDefinition;
-import org.eclipse.jpt.core.internal.context.orm.OrmManyToManyMappingDefinition;
-import org.eclipse.jpt.core.internal.context.orm.OrmManyToOneMappingDefinition;
-import org.eclipse.jpt.core.internal.context.orm.OrmMappedSuperclassDefinition;
-import org.eclipse.jpt.core.internal.context.orm.OrmOneToManyMappingDefinition;
-import org.eclipse.jpt.core.internal.context.orm.OrmOneToOneMappingDefinition;
-import org.eclipse.jpt.core.internal.context.orm.OrmTransientMappingDefinition;
-import org.eclipse.jpt.core.internal.context.orm.OrmVersionMappingDefinition;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
 
 public class EclipseLinkOrmXmlDefinition
-	extends AbstractOrmXmlDefinition
+	extends AbstractEclipseLinkOrmXmlDefinition
 {
 	// singleton
 	private static final OrmXmlDefinition INSTANCE = 
@@ -54,12 +35,7 @@ public class EclipseLinkOrmXmlDefinition
 	private EclipseLinkOrmXmlDefinition() {
 		super();
 	}
-	
-	
-	public EFactory getResourceNodeFactory() {
-		return EclipseLinkOrmFactory.eINSTANCE;
-	}
-	
+		
 	@Override
 	protected OrmXmlContextNodeFactory buildContextNodeFactory() {
 		return new EclipseLinkOrmXmlContextNodeFactory();
@@ -68,42 +44,4 @@ public class EclipseLinkOrmXmlDefinition
 	public JpaResourceType getResourceType() {
 		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_1_0_RESOURCE_TYPE;
 	}
-	
-	
-	// ********* ORM type mappings *********
-	
-	@Override
-	protected OrmTypeMappingDefinition[] buildOrmTypeMappingDefinitions() {
-		// order should not matter here, but we'll use the same order as for java
-		// @see {@link EclipseLinkJpaPlatformProvider}
-		return new OrmTypeMappingDefinition[] {
-			OrmEntityDefinition.instance(),
-			OrmEmbeddableDefinition.instance(),
-			OrmMappedSuperclassDefinition.instance()};
-	}
-	
-	
-	// ********** ORM attribute mappings **********
-	
-	@Override
-	protected OrmAttributeMappingDefinition[] buildOrmAttributeMappingDefinitions() {
-		// order should not matter here, but we'll use the same order as for java
-		// @see {@link EclipseLinkJpaPlatformProvider}
-		return new OrmAttributeMappingDefinition[] {
-			OrmTransientMappingDefinition.instance(),
-			OrmEclipseLinkBasicCollectionMappingDefinition.instance(),
-			OrmEclipseLinkBasicMapMappingDefinition.instance(),
-			OrmIdMappingDefinition.instance(),
-			OrmVersionMappingDefinition.instance(),
-			OrmBasicMappingDefinition.instance(),
-			OrmEmbeddedMappingDefinition.instance(),
-			OrmEmbeddedIdMappingDefinition.instance(),
-			OrmEclipseLinkTransformationMappingDefinition.instance(),
-			OrmManyToManyMappingDefinition.instance(),
-			OrmManyToOneMappingDefinition.instance(),
-			OrmOneToManyMappingDefinition.instance(),
-			OrmOneToOneMappingDefinition.instance(),
-			OrmEclipseLinkVariableOneToOneMappingDefinition.instance(),
-			NullOrmAttributeMappingDefinition.instance()};
-	}
 }