Use java.persistence [2.0.0,2.1.0)

2 files changed, 106 insertions, 111 deletions

diff --git a/hibernate/org.eclipse.emf.teneo.hibernate/META-INF/MANIFEST.MF b/hibernate/org.eclipse.emf.teneo.hibernate/META-INF/MANIFEST.MF
index 7f9ce55cd..81508ec87 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate/META-INF/MANIFEST.MF
+++ b/hibernate/org.eclipse.emf.teneo.hibernate/META-INF/MANIFEST.MF
@@ -25,9 +25,9 @@ Export-Package: org.eclipse.emf.teneo.hibernate;version="2.0.1",
  org.eclipse.emf.teneo.hibernate.resource;version="2.0.1",
  org.eclipse.emf.teneo.hibernate.tuplizer;version="2.0.1"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: javax.persistence;version="[2.0.0,3.0.0)";resolution:=optional,
- javax.persistence.criteria;version="[2.0.0,3.0.0)",
- javax.persistence.metamodel;version="[2.0.0,3.0.0)",
+Import-Package: javax.persistence;version="[2.0.0,2.1.0)";resolution:=optional,
+ javax.persistence.criteria;version="[2.0.0,2.1.0)",
+ javax.persistence.metamodel;version="[2.0.0,2.1.0)",
  org.apache.commons.logging;version="[1.0.0,2.0.0)";resolution:=optional,
  org.dom4j;version="[1.0.0,2.0.0)";resolution:=optional,
  org.hibernate;version="[4.0.0,5.0.0)";resolution:=optional,
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbEntityDataStore.java b/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbEntityDataStore.java
index 679ce3e0f..9aa24e36b 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbEntityDataStore.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbEntityDataStore.java
@@ -23,13 +23,11 @@ import java.lang.reflect.Field;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
 import javax.persistence.Cache;
-import javax.persistence.EntityGraph;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
@@ -38,13 +36,9 @@ import javax.persistence.LockModeType;
 import javax.persistence.Parameter;
 import javax.persistence.PersistenceUnitUtil;
 import javax.persistence.Query;
-import javax.persistence.StoredProcedureQuery;
-import javax.persistence.SynchronizationType;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaDelete;
 import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.CriteriaUpdate;
 import javax.persistence.metamodel.Metamodel;
 
 import org.apache.commons.logging.Log;
@@ -479,31 +473,32 @@ public class HbEntityDataStore extends HbDataStore implements EntityManagerFacto
 			return delegate.isOpen();
 		}
 
-		@Override
-		public <T> void addNamedEntityGraph(String arg0, EntityGraph<T> arg1) {
-			delegate.addNamedEntityGraph(arg0, arg1);
-		}
-
-		@Override
-		public void addNamedQuery(String arg0, Query arg1) {
-			delegate.addNamedQuery(arg0, arg1);
-		}
+		// @Override
+		// public <T> void addNamedEntityGraph(String arg0, EntityGraph<T> arg1) {
+		// delegate.addNamedEntityGraph(arg0, arg1);
+		// }
 
-		@Override
-		public EntityManager createEntityManager(SynchronizationType arg0) {
-			return delegate.createEntityManager(arg0);
-		}
+		// @Override
+		// public void addNamedQuery(String arg0, Query arg1) {
+		// delegate.addNamedQuery(arg0, arg1);
+		// }
 
-		@Override
-		public EntityManager createEntityManager(SynchronizationType arg0,
-				@SuppressWarnings("rawtypes") Map arg1) {
-			return delegate.createEntityManager(arg0, arg1);
-		}
+		//
+		// @Override
+		// public EntityManager createEntityManager(SynchronizationType arg0) {
+		// return delegate.createEntityManager(arg0);
+		// }
+		//
+		// @Override
+		// public EntityManager createEntityManager(SynchronizationType arg0,
+		// @SuppressWarnings("rawtypes") Map arg1) {
+		// return delegate.createEntityManager(arg0, arg1);
+		// }
 
-		@Override
-		public <T> T unwrap(Class<T> arg0) {
-			return delegate.unwrap(arg0);
-		}
+		// @Override
+		// public <T> T unwrap(Class<T> arg0) {
+		// return delegate.unwrap(arg0);
+		// }
 	}
 
 	/**
@@ -706,61 +701,61 @@ public class HbEntityDataStore extends HbDataStore implements EntityManagerFacto
 			this.delegateEntityManager = delegateEntityManager;
 		}
 
-		@Override
-		public <T> EntityGraph<T> createEntityGraph(Class<T> arg0) {
-			return delegateEntityManager.createEntityGraph(arg0);
-		}
-
-		@Override
-		public EntityGraph<?> createEntityGraph(String arg0) {
-			return delegateEntityManager.createEntityGraph(arg0);
-		}
-
-		@Override
-		public StoredProcedureQuery createNamedStoredProcedureQuery(String arg0) {
-			return delegateEntityManager.createNamedStoredProcedureQuery(arg0);
-		}
-
-		@Override
-		public Query createQuery(@SuppressWarnings("rawtypes") CriteriaUpdate arg0) {
-			return delegateEntityManager.createQuery(arg0);
-		}
-
-		@Override
-		public Query createQuery(@SuppressWarnings("rawtypes") CriteriaDelete arg0) {
-			return delegateEntityManager.createQuery(arg0);
-		}
-
-		@Override
-		public StoredProcedureQuery createStoredProcedureQuery(String arg0) {
-			return delegateEntityManager.createStoredProcedureQuery(arg0);
-		}
-
-		@Override
-		public StoredProcedureQuery createStoredProcedureQuery(String arg0,
-				@SuppressWarnings("rawtypes") Class... arg1) {
-			return delegateEntityManager.createStoredProcedureQuery(arg0, arg1);
-		}
-
-		@Override
-		public StoredProcedureQuery createStoredProcedureQuery(String arg0, String... arg1) {
-			return delegateEntityManager.createStoredProcedureQuery(arg0, arg1);
-		}
-
-		@Override
-		public EntityGraph<?> getEntityGraph(String arg0) {
-			return delegateEntityManager.getEntityGraph(arg0);
-		}
-
-		@Override
-		public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> arg0) {
-			return delegateEntityManager.getEntityGraphs(arg0);
-		}
-
-		@Override
-		public boolean isJoinedToTransaction() {
-			return delegateEntityManager.isJoinedToTransaction();
-		}
+		// @Override
+		// public <T> EntityGraph<T> createEntityGraph(Class<T> arg0) {
+		// return delegateEntityManager.createEntityGraph(arg0);
+		// }
+		//
+		// @Override
+		// public EntityGraph<?> createEntityGraph(String arg0) {
+		// return delegateEntityManager.createEntityGraph(arg0);
+		// }
+		//
+		// @Override
+		// public StoredProcedureQuery createNamedStoredProcedureQuery(String arg0) {
+		// return delegateEntityManager.createNamedStoredProcedureQuery(arg0);
+		// }
+		//
+		// @Override
+		// public Query createQuery(@SuppressWarnings("rawtypes") CriteriaUpdate arg0) {
+		// return delegateEntityManager.createQuery(arg0);
+		// }
+		//
+		// @Override
+		// public Query createQuery(@SuppressWarnings("rawtypes") CriteriaDelete arg0) {
+		// return delegateEntityManager.createQuery(arg0);
+		// }
+		//
+		// @Override
+		// public StoredProcedureQuery createStoredProcedureQuery(String arg0) {
+		// return delegateEntityManager.createStoredProcedureQuery(arg0);
+		// }
+		//
+		// @Override
+		// public StoredProcedureQuery createStoredProcedureQuery(String arg0,
+		// @SuppressWarnings("rawtypes") Class... arg1) {
+		// return delegateEntityManager.createStoredProcedureQuery(arg0, arg1);
+		// }
+		//
+		// @Override
+		// public StoredProcedureQuery createStoredProcedureQuery(String arg0, String... arg1) {
+		// return delegateEntityManager.createStoredProcedureQuery(arg0, arg1);
+		// }
+		//
+		// @Override
+		// public EntityGraph<?> getEntityGraph(String arg0) {
+		// return delegateEntityManager.getEntityGraph(arg0);
+		// }
+		//
+		// @Override
+		// public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> arg0) {
+		// return delegateEntityManager.getEntityGraphs(arg0);
+		// }
+		//
+		// @Override
+		// public boolean isJoinedToTransaction() {
+		// return delegateEntityManager.isJoinedToTransaction();
+		// }
 	}
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })
@@ -839,30 +834,30 @@ public class HbEntityDataStore extends HbDataStore implements EntityManagerFacto
 		}
 	}
 
-	@Override
-	public <T> void addNamedEntityGraph(String arg0, EntityGraph<T> arg1) {
-		getEntityManagerFactory().addNamedEntityGraph(arg0, arg1);
-	}
-
-	@Override
-	public void addNamedQuery(String arg0, Query arg1) {
-		getEntityManagerFactory().addNamedQuery(arg0, arg1);
-	}
-
-	@Override
-	public EntityManager createEntityManager(SynchronizationType arg0) {
-		return getEntityManagerFactory().createEntityManager(arg0);
-	}
-
-	@Override
-	public EntityManager createEntityManager(SynchronizationType arg0,
-			@SuppressWarnings("rawtypes") Map arg1) {
-		return getEntityManagerFactory().createEntityManager(arg0, arg1);
-	}
-
-	@Override
-	public <T> T unwrap(Class<T> arg0) {
-		return getEntityManagerFactory().unwrap(arg0);
-	}
+	// @Override
+	// public <T> void addNamedEntityGraph(String arg0, EntityGraph<T> arg1) {
+	// getEntityManagerFactory().addNamedEntityGraph(arg0, arg1);
+	// }
+	//
+	// @Override
+	// public void addNamedQuery(String arg0, Query arg1) {
+	// getEntityManagerFactory().addNamedQuery(arg0, arg1);
+	// }
+	//
+	// @Override
+	// public EntityManager createEntityManager(SynchronizationType arg0) {
+	// return getEntityManagerFactory().createEntityManager(arg0);
+	// }
+	//
+	// @Override
+	// public EntityManager createEntityManager(SynchronizationType arg0,
+	// @SuppressWarnings("rawtypes") Map arg1) {
+	// return getEntityManagerFactory().createEntityManager(arg0, arg1);
+	// }
+	//
+	// @Override
+	// public <T> T unwrap(Class<T> arg0) {
+	// return getEntityManagerFactory().unwrap(arg0);
+	// }
 
 }
\ No newline at end of file