294899 - refactoring in an effort to support default Cacheable again

12 files changed, 295 insertions, 28 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceXmlContextNodeFactory.java
index 0dfeebe3cc..5cbe15623d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceXmlContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceXmlContextNodeFactory.java
@@ -54,4 +54,9 @@ public interface PersistenceXmlContextNodeFactory
 	JarFile buildJarFile(JarFileRef parent, JavaResourcePackageFragmentRoot jarResourcePackageFragmentRoot);
 
 	PersistenceUnit.Property buildProperty(PersistenceUnit parent, XmlProperty property);
+	
+	PersistenceUnitProperties buildConnection(PersistenceUnit parent);
+	
+	PersistenceUnitProperties buildOptions(PersistenceUnit parent);
+
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXmlContextNodeFactory.java
index ed5009247a..64b67b65b2 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXmlContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXmlContextNodeFactory.java
@@ -9,8 +9,21 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.internal.context.persistence;
 
+import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
+import org.eclipse.jpt.core.context.persistence.PersistenceUnitProperties;
+import org.eclipse.jpt.core.internal.jpa2.context.persistence.connection.NullConnection2_0;
+import org.eclipse.jpt.core.internal.jpa2.context.persistence.options.NullOptions2_0;
+
 
 public class GenericPersistenceXmlContextNodeFactory extends AbstractPersistenceXmlContextNodeFactory
 {
 
+	public PersistenceUnitProperties buildConnection(PersistenceUnit parent) {
+		return new NullConnection2_0(parent);
+	}
+	
+	public PersistenceUnitProperties buildOptions(PersistenceUnit parent) {
+		return new NullOptions2_0(parent);
+	}
+
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/Generic2_0PersistenceXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/Generic2_0PersistenceXmlContextNodeFactory.java
index cc8c4f15e8..c7f3fa3430 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/Generic2_0PersistenceXmlContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/Generic2_0PersistenceXmlContextNodeFactory.java
@@ -10,17 +10,29 @@
 package org.eclipse.jpt.core.internal.jpa2.context.persistence;
 
 import org.eclipse.jpt.core.context.persistence.Persistence;
+import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.core.internal.context.persistence.AbstractPersistenceXmlContextNodeFactory;
+import org.eclipse.jpt.core.internal.jpa2.context.persistence.connection.GenericConnection2_0;
+import org.eclipse.jpt.core.internal.jpa2.context.persistence.options.GenericOptions2_0;
 import org.eclipse.jpt.core.jpa2.context.persistence.PersistenceUnit2_0;
+import org.eclipse.jpt.core.jpa2.context.persistence.connection.JpaConnection2_0;
+import org.eclipse.jpt.core.jpa2.context.persistence.options.JpaOptions2_0;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
 
 
 public class Generic2_0PersistenceXmlContextNodeFactory extends AbstractPersistenceXmlContextNodeFactory
 {
-	
 	@Override
 	public PersistenceUnit2_0 buildPersistenceUnit(Persistence parent, XmlPersistenceUnit xmlPersistenceUnit) {
 		return new GenericPersistenceUnit2_0(parent, xmlPersistenceUnit);
 	}
+		
+	public JpaConnection2_0 buildConnection(PersistenceUnit parent) {
+		return new GenericConnection2_0(parent);
+	}
+	
+	public JpaOptions2_0 buildOptions(PersistenceUnit parent) {
+		return new GenericOptions2_0(parent);
+	}
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/GenericPersistenceUnit2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/GenericPersistenceUnit2_0.java
index a9fcd6e415..43067c2630 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/GenericPersistenceUnit2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/GenericPersistenceUnit2_0.java
@@ -11,8 +11,6 @@ package org.eclipse.jpt.core.internal.jpa2.context.persistence;
 
 import org.eclipse.jpt.core.context.persistence.Persistence;
 import org.eclipse.jpt.core.internal.context.persistence.AbstractPersistenceUnit;
-import org.eclipse.jpt.core.internal.jpa2.context.persistence.connection.GenericConnection2_0;
-import org.eclipse.jpt.core.internal.jpa2.context.persistence.options.GenericOptions2_0;
 import org.eclipse.jpt.core.jpa2.context.persistence.PersistenceUnit2_0;
 import org.eclipse.jpt.core.jpa2.context.persistence.connection.JpaConnection2_0;
 import org.eclipse.jpt.core.jpa2.context.persistence.options.JpaOptions2_0;
@@ -69,8 +67,8 @@ public class GenericPersistenceUnit2_0
 	protected void initializeProperties() {
 		super.initializeProperties();
 		
-		this.connection = new GenericConnection2_0(this);
-		this.options = new GenericOptions2_0(this);
+		this.connection = (JpaConnection2_0) getContextNodeFactory().buildConnection(this);
+		this.options = (JpaOptions2_0) getContextNodeFactory().buildOptions(this);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/connection/NullConnection2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/connection/NullConnection2_0.java
new file mode 100644
index 0000000000..2e7130f1d7
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/connection/NullConnection2_0.java
@@ -0,0 +1,110 @@
+/*******************************************************************************
+* Copyright (c) 2009 Oracle. All rights reserved.
+* This program and the accompanying materials are made available under the
+* terms of the Eclipse Public License v1.0, which accompanies this distribution
+* and is available at http://www.eclipse.org/legal/epl-v10.html.
+* 
+* Contributors:
+*     Oracle - initial API and implementation
+*******************************************************************************/
+package org.eclipse.jpt.core.internal.jpa2.context.persistence.connection;
+
+import java.util.Map;
+import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
+import org.eclipse.jpt.core.internal.context.persistence.AbstractPersistenceUnitProperties;
+import org.eclipse.jpt.core.jpa2.context.persistence.connection.JpaConnection2_0;
+
+/**
+ *  GenericConnection2_0
+ */
+public class NullConnection2_0 extends AbstractPersistenceUnitProperties
+	implements JpaConnection2_0
+{
+	
+
+	// ********** constructors **********
+	public NullConnection2_0(PersistenceUnit parent) {
+		super(parent);
+	}
+
+	// ********** initialization **********
+	/**
+	 * Initializes properties with values from the persistence unit.
+	 */
+	@Override
+	protected void initializeProperties() {
+		//do nothing
+	}
+
+	// ********** behavior **********
+	
+	public void propertyValueChanged(String propertyName, String newValue) {
+		//do nothing
+	}
+
+	public void propertyRemoved(String propertyName) {
+		//do nothing
+	}
+
+	/**
+	 * Adds property names key/value pairs, where: 
+	 * 		key = PU property key
+	 * 		value = property id
+	 */
+	@Override
+	protected void addPropertyNames(Map<String, String> propertyNames) {
+		//do nothing
+	}
+
+	// ********** Driver **********
+	public String getDriver() {
+		return null;
+	}
+
+	public void setDriver(String newDriver) {
+		throw new UnsupportedOperationException();
+	}
+
+	public String getDefaultDriver() {
+		return DEFAULT_JDBC_DRIVER;
+	}
+
+	// ********** URL **********
+	public String getUrl() {
+		return null;
+	}
+
+	public void setUrl(String newUrl) {
+		throw new UnsupportedOperationException();
+	}
+
+	public String getDefaultUrl() {
+		return DEFAULT_JDBC_URL;
+	}
+
+	// ********** User **********
+	public String getUser() {
+		return null;
+	}
+
+	public void setUser(String newUser) {
+		throw new UnsupportedOperationException();
+	}
+
+	public String getDefaultUser() {
+		return DEFAULT_JDBC_USER;
+	}
+
+	// ********** Password **********
+	public String getPassword() {
+		return null;
+	}
+
+	public void setPassword(String newPassword) {
+		throw new UnsupportedOperationException();
+	}
+
+	public String getDefaultPassword() {
+		return DEFAULT_JDBC_PASSWORD;
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/options/NullOptions2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/options/NullOptions2_0.java
new file mode 100644
index 0000000000..a09768382a
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/options/NullOptions2_0.java
@@ -0,0 +1,124 @@
+/*******************************************************************************
+* Copyright (c) 2009 Oracle. All rights reserved.
+* This program and the accompanying materials are made available under the
+* terms of the Eclipse Public License v1.0, which accompanies this distribution
+* and is available at http://www.eclipse.org/legal/epl-v10.html.
+* 
+* Contributors:
+*     Oracle - initial API and implementation
+*******************************************************************************/
+package org.eclipse.jpt.core.internal.jpa2.context.persistence.options;
+
+import java.util.Map;
+import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
+import org.eclipse.jpt.core.internal.context.persistence.AbstractPersistenceUnitProperties;
+import org.eclipse.jpt.core.jpa2.context.persistence.options.JpaOptions2_0;
+
+/**
+ * JPA 2.0 options
+ */
+public class NullOptions2_0 extends AbstractPersistenceUnitProperties
+	implements JpaOptions2_0
+{
+	
+
+	// ********** constructors **********
+	public NullOptions2_0(PersistenceUnit parent) {
+		super(parent);
+	}
+
+	// ********** initialization **********
+	/**
+	 * Initializes properties with values from the persistence unit.
+	 */
+	@Override
+	protected void initializeProperties() {
+		//do nothing
+	}
+
+	// ********** behavior **********
+	
+	public void propertyValueChanged(String propertyName, String newValue) {
+		//do nothing
+	}
+
+	public void propertyRemoved(String propertyName) {
+		//do nothing
+	}
+
+	/**
+	 * Adds property names key/value pairs, where: 
+	 * 		key = PU property key
+	 * 		value = property id
+	 */
+	@Override
+	protected void addPropertyNames(Map<String, String> propertyNames) {
+		//do nothing
+	}
+
+	// ********** LockTimeout **********
+	public Integer getLockTimeout() {
+		return null;
+	}
+
+	public void setLockTimeout(Integer newLockTimeout) {
+		throw new UnsupportedOperationException();
+	}
+
+	public Integer getDefaultLockTimeout() {
+		return DEFAULT_LOCK_TIMEOUT;
+	}
+
+	// ********** QueryTimeout **********
+	public Integer getQueryTimeout() {
+		return null;
+	}
+
+	public void setQueryTimeout(Integer newQueryTimeout) {
+		throw new UnsupportedOperationException();
+	}
+
+	public Integer getDefaultQueryTimeout() {
+		return DEFAULT_QUERY_TIMEOUT;
+	}
+
+
+	// ********** ValidationGroupPrePersist **********
+	public String getValidationGroupPrePersist() {
+		return null;
+	}
+
+	public void setValidationGroupPrePersist(String newValidationGroupPrePersist) {
+		throw new UnsupportedOperationException();
+	}
+
+	public String getDefaultValidationGroupPrePersist() {
+		return DEFAULT_VALIDATION_GROUP_PRE_PERSIST;
+	}
+
+	// ********** ValidationGroupPreUpdate **********
+	public String getValidationGroupPreUpdate() {
+		return null;
+	}
+
+	public void setValidationGroupPreUpdate(String newValidationGroupPreUpdate) {
+		throw new UnsupportedOperationException();
+	}
+
+	public String getDefaultValidationGroupPreUpdate() {
+		return DEFAULT_VALIDATION_GROUP_PRE_UPDATE;
+	}
+
+	// ********** ValidationGroupPreRemove **********
+	public String getValidationGroupPreRemove() {
+		return null;
+	}
+
+	public void setValidationGroupPreRemove(String newValidationGroupPreRemove) {
+		throw new UnsupportedOperationException();
+	}
+
+	public String getDefaultValidationGroupPreRemove() {
+		return DEFAULT_VALIDATION_GROUP_PRE_REMOVE;
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java
index 6545d6d2a8..fd49fa8666 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java
@@ -31,11 +31,9 @@ import org.eclipse.jpt.eclipselink.core.context.persistence.options.Options;
 import org.eclipse.jpt.eclipselink.core.context.persistence.schema.generation.SchemaGeneration;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.EclipseLinkCaching;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.EclipseLinkConnection;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.EclipseLinkCustomization;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.general.EclipseLinkGeneralProperties;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.EclipseLinkLogging;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.EclipseLinkOptions;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.EclipseLinkSchemaGeneration;
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
@@ -171,7 +169,7 @@ public class EclipseLinkPersistenceUnit
 	}
 	
 	protected Connection buildEclipseLinkConnection() {
-		return new EclipseLinkConnection(this);
+		return (Connection) getContextNodeFactory().buildConnection(this);
 	}
 	
 	protected Customization buildEclipseLinkCustomization() {
@@ -187,7 +185,7 @@ public class EclipseLinkPersistenceUnit
 	}
 	
 	protected Options buildEclipseLinkOptions() {
-		return new EclipseLinkOptions(this);
+		return (Options) getContextNodeFactory().buildOptions(this);
 	}
 	
 	protected SchemaGeneration buildEclipseLinkSchemaGeneration() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceXmlContextNodeFactory.java
index 703b228c8b..1f09758b7d 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceXmlContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceXmlContextNodeFactory.java
@@ -12,9 +12,12 @@ package org.eclipse.jpt.eclipselink.core.internal.context.persistence;
 import org.eclipse.jpt.core.context.persistence.JarFileRef;
 import org.eclipse.jpt.core.context.persistence.Persistence;
 import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
+import org.eclipse.jpt.core.context.persistence.PersistenceUnitProperties;
 import org.eclipse.jpt.core.internal.context.persistence.AbstractPersistenceXmlContextNodeFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlJarFileRef;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
+import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.EclipseLinkConnection;
+import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.EclipseLinkOptions;
 
 
 public class EclipseLinkPersistenceXmlContextNodeFactory extends AbstractPersistenceXmlContextNodeFactory
@@ -30,4 +33,11 @@ public class EclipseLinkPersistenceXmlContextNodeFactory extends AbstractPersist
 		return new EclipseLinkJarFileRef(parent, xmlJarFileRef);
 	}
 
+	public PersistenceUnitProperties buildConnection(PersistenceUnit parent) {
+		return new EclipseLinkConnection(parent);
+	}
+	
+	public PersistenceUnitProperties buildOptions(PersistenceUnit parent) {
+		return new EclipseLinkOptions(parent);
+	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLink2_0PersistenceXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLink2_0PersistenceXmlContextNodeFactory.java
index a0efed344a..e2d6f9ae57 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLink2_0PersistenceXmlContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLink2_0PersistenceXmlContextNodeFactory.java
@@ -12,7 +12,12 @@ package org.eclipse.jpt.eclipselink.core.internal.v2_0.context.persistence;
 import org.eclipse.jpt.core.context.persistence.Persistence;
 import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.core.internal.context.persistence.AbstractPersistenceXmlContextNodeFactory;
+import org.eclipse.jpt.core.jpa2.context.persistence.PersistenceUnit2_0;
+import org.eclipse.jpt.core.jpa2.context.persistence.connection.JpaConnection2_0;
+import org.eclipse.jpt.core.jpa2.context.persistence.options.JpaOptions2_0;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
+import org.eclipse.jpt.eclipselink.core.internal.v2_0.context.persistence.connection.EclipseLinkConnection2_0;
+import org.eclipse.jpt.eclipselink.core.internal.v2_0.context.persistence.options.EclipseLinkOptions2_0;
 
 
 public class EclipseLink2_0PersistenceXmlContextNodeFactory extends AbstractPersistenceXmlContextNodeFactory
@@ -22,5 +27,13 @@ public class EclipseLink2_0PersistenceXmlContextNodeFactory extends AbstractPers
 	public PersistenceUnit buildPersistenceUnit(Persistence parent, XmlPersistenceUnit xmlPersistenceUnit) {
 		return new EclipseLinkPersistenceUnit2_0(parent, xmlPersistenceUnit);
 	}
+	
+	public JpaConnection2_0 buildConnection(PersistenceUnit parent) {
+		return new EclipseLinkConnection2_0((PersistenceUnit2_0) parent);
+	}
+	
+	public JpaOptions2_0 buildOptions(PersistenceUnit parent) {
+		return new EclipseLinkOptions2_0((PersistenceUnit2_0) parent);
+	}
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLinkPersistenceUnit2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLinkPersistenceUnit2_0.java
index a49df17254..21fc980cf0 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLinkPersistenceUnit2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLinkPersistenceUnit2_0.java
@@ -14,10 +14,7 @@ import org.eclipse.jpt.core.jpa2.context.persistence.PersistenceUnit2_0;
 import org.eclipse.jpt.core.jpa2.context.persistence.options.SharedCacheMode;
 import org.eclipse.jpt.core.jpa2.context.persistence.options.ValidationMode;
 import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.context.persistence.connection.Connection;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.internal.v2_0.context.persistence.connection.EclipseLinkConnection2_0;
-import org.eclipse.jpt.eclipselink.core.internal.v2_0.context.persistence.options.EclipseLinkOptions2_0;
 import org.eclipse.jpt.eclipselink.core.v2_0.context.persistence.connection.Connection2_0;
 import org.eclipse.jpt.eclipselink.core.v2_0.context.persistence.options.Options2_0;
 
@@ -66,19 +63,7 @@ public class EclipseLinkPersistenceUnit2_0
 	public XmlPersistenceUnit getXmlPersistenceUnit() {
 		return this.xmlPersistenceUnit;
 	}
-	
-	// **************** factory methods *********************************************
 
-	@Override
-	protected Connection buildEclipseLinkConnection() {
-		
-		return new EclipseLinkConnection2_0(this);
-	}
-
-	@Override
-	protected Options2_0 buildEclipseLinkOptions() {
-		return new EclipseLinkOptions2_0(this);
-	}
 
 	// **************** properties *********************************************
 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/connection/EclipseLinkConnection2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/connection/EclipseLinkConnection2_0.java
index 2fd0f8e940..4dbfccd99e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/connection/EclipseLinkConnection2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/connection/EclipseLinkConnection2_0.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.core.internal.v2_0.context.persistence.conne
 
 import java.util.Map;
 
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
+import org.eclipse.jpt.core.jpa2.context.persistence.PersistenceUnit2_0;
 import org.eclipse.jpt.core.jpa2.context.persistence.connection.JpaConnection2_0;
 import org.eclipse.jpt.eclipselink.core.context.persistence.connection.Connection;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.EclipseLinkConnection;
@@ -26,7 +26,7 @@ public class EclipseLinkConnection2_0 extends EclipseLinkConnection
 {
 
 	// ********** constructors **********
-	public EclipseLinkConnection2_0(PersistenceUnit parent) {
+	public EclipseLinkConnection2_0(PersistenceUnit2_0 parent) {
 		super(parent);
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/options/EclipseLinkOptions2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/options/EclipseLinkOptions2_0.java
index 23030edc2c..7eafd2c02b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/options/EclipseLinkOptions2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/options/EclipseLinkOptions2_0.java
@@ -11,7 +11,6 @@ package org.eclipse.jpt.eclipselink.core.internal.v2_0.context.persistence.optio
 
 import java.util.Map;
 
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.core.jpa2.context.persistence.PersistenceUnit2_0;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.EclipseLinkOptions;
 import org.eclipse.jpt.eclipselink.core.v2_0.context.persistence.options.Options2_0;
@@ -31,7 +30,7 @@ public class EclipseLinkOptions2_0 extends EclipseLinkOptions
 	
 
 	// ********** constructors **********
-	public EclipseLinkOptions2_0(PersistenceUnit parent) {
+	public EclipseLinkOptions2_0(PersistenceUnit2_0 parent) {
 		super(parent);
 	}