Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2013-10-26 16:48:46 -0400
committerMartin Taal2013-10-26 16:48:46 -0400
commit1c9cfa70161512ee004ec4989d0b185500cb3c97 (patch)
tree72557fd7701ee49bb814ca2e706c9f95f7e4347a
parentc63702a59959a8a42b6883a9ad60900e93657d7e (diff)
downloadorg.eclipse.emf.teneo-1c9cfa70161512ee004ec4989d0b185500cb3c97.tar.gz
org.eclipse.emf.teneo-1c9cfa70161512ee004ec4989d0b185500cb3c97.tar.xz
org.eclipse.emf.teneo-1c9cfa70161512ee004ec4989d0b185500cb3c97.zip
Changes for Hibernate 4.2.7.SP1
-rwxr-xr-xbuild/org.eclipse.emf.teneo.releng.buckminster/buckminster.properties2
-rwxr-xr-xbuild/org.eclipse.emf.teneo.releng.buckminster/build/xsl/content2html.xsl2
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbannotationFactoryImpl.java1
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationAdapterFactory.java1
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationSwitch.java4
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationValidator.java2
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java3
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelFactoryImpl.java1
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbmodelAdapterFactory.java13
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbmodelSwitch.java4
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbEntityDataStore.java190
-rw-r--r--hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/model/teneoauditing/impl/TeneoauditingFactoryImpl.java1
-rw-r--r--hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/model/teneoauditing/util/TeneoauditingAdapterFactory.java1
-rw-r--r--hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/model/teneoauditing/util/TeneoauditingSwitch.java1
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/property/EListPropertyHandler.java5
15 files changed, 97 insertions, 134 deletions
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/buckminster.properties b/build/org.eclipse.emf.teneo.releng.buckminster/buckminster.properties
index 0a40b4706..a23bc83df 100755
--- a/build/org.eclipse.emf.teneo.releng.buckminster/buckminster.properties
+++ b/build/org.eclipse.emf.teneo.releng.buckminster/buckminster.properties
@@ -35,5 +35,5 @@ signing.type=eclipse.local
teneo.download.area=/home/data/httpd/download.eclipse.org/modeling/emf/teneo
buckminster.p2.site=http://download.eclipse.org/tools/buckminster/headless-4.2
director.url=http://download.eclipse.org/tools/buckminster/products/director_latest.zip
-thirdparty.url=http://www.elver.org/eclipse/2.0.0/update/teneotexodeps.zip
+thirdparty.url=http://www.elver.org/eclipse/2.1.0/update/teneotexodeps.zip
#eclipse.staging.area=${env.HUDSON_HOME}/jobs/${env.JOB_NAME}/signing
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/build/xsl/content2html.xsl b/build/org.eclipse.emf.teneo.releng.buckminster/build/xsl/content2html.xsl
index 5fe86a07d..1c916a701 100755
--- a/build/org.eclipse.emf.teneo.releng.buckminster/build/xsl/content2html.xsl
+++ b/build/org.eclipse.emf.teneo.releng.buckminster/build/xsl/content2html.xsl
@@ -29,7 +29,7 @@
<br />
Some EMF Teneo plugins require third party drivers from the
following update site:
- <a href="http://www.elver.org/eclipse/2.0.0/update/">Teneo/Texo dependencies</a>
+ <a href="http://www.elver.org/eclipse/2.1.0/update/">Teneo/Texo dependencies</a>
.
<br />
<br />
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbannotationFactoryImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbannotationFactoryImpl.java
index 1cefbd2d8..b35ea48c4 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbannotationFactoryImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbannotationFactoryImpl.java
@@ -12,7 +12,6 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.teneo.hibernate.hbannotation.*;
import org.eclipse.emf.teneo.hibernate.hbannotation.Any;
import org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef;
import org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize;
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationAdapterFactory.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationAdapterFactory.java
index 4cb30c966..89a023ccc 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationAdapterFactory.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationAdapterFactory.java
@@ -11,7 +11,6 @@ import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.teneo.annotations.pannotation.PAnnotation;
-import org.eclipse.emf.teneo.hibernate.hbannotation.*;
import org.eclipse.emf.teneo.hibernate.hbannotation.Any;
import org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef;
import org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize;
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationSwitch.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationSwitch.java
index c35cdba8d..1828ceb95 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationSwitch.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationSwitch.java
@@ -6,14 +6,10 @@
*/
package org.eclipse.emf.teneo.hibernate.hbannotation.util;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.Switch;
import org.eclipse.emf.teneo.annotations.pannotation.PAnnotation;
-import org.eclipse.emf.teneo.hibernate.hbannotation.*;
import org.eclipse.emf.teneo.hibernate.hbannotation.Any;
import org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef;
import org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize;
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationValidator.java
index abf2bd396..a63532c99 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationValidator.java
@@ -8,13 +8,11 @@ package org.eclipse.emf.teneo.hibernate.hbannotation.util;
import java.util.Map;
-import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.DiagnosticChain;
import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.EObjectValidator;
import org.eclipse.emf.teneo.annotations.pannotation.util.PannotationValidator;
-import org.eclipse.emf.teneo.hibernate.hbannotation.*;
import org.eclipse.emf.teneo.hibernate.hbannotation.Any;
import org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef;
import org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize;
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java
index b63ccae77..06aaa74d6 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java
@@ -9,13 +9,10 @@ package org.eclipse.emf.teneo.hibernate.hbmodel;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference;
import org.eclipse.emf.teneo.hibernate.hbannotation.Any;
import org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef;
-import org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize;
import org.eclipse.emf.teneo.hibernate.hbannotation.Cache;
-import org.eclipse.emf.teneo.hibernate.hbannotation.Fetch;
import org.eclipse.emf.teneo.hibernate.hbannotation.Immutable;
import org.eclipse.emf.teneo.hibernate.hbannotation.NaturalId;
import org.eclipse.emf.teneo.hibernate.hbannotation.NotFound;
-import org.eclipse.emf.teneo.hibernate.hbannotation.OnDelete;
import org.eclipse.emf.teneo.hibernate.hbannotation.Type;
/**
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelFactoryImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelFactoryImpl.java
index 857cb1ab3..4ca93f3e8 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelFactoryImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelFactoryImpl.java
@@ -11,7 +11,6 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.teneo.hibernate.hbmodel.*;
import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute;
import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass;
import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType;
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbmodelAdapterFactory.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbmodelAdapterFactory.java
index 5186c9638..fdae6fcec 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbmodelAdapterFactory.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbmodelAdapterFactory.java
@@ -8,11 +8,8 @@ package org.eclipse.emf.teneo.hibernate.hbmodel.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEAttribute;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEDataType;
@@ -21,8 +18,14 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEPackage;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedETypedElement;
-
-import org.eclipse.emf.teneo.hibernate.hbmodel.*;
+import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute;
+import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass;
+import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType;
+import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEModelElement;
+import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage;
+import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference;
+import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement;
+import org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage;
/**
* <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbmodelSwitch.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbmodelSwitch.java
index 3f36e1707..49a5d1c47 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbmodelSwitch.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbmodelSwitch.java
@@ -6,9 +6,6 @@
*/
package org.eclipse.emf.teneo.hibernate.hbmodel.util;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.Switch;
@@ -20,7 +17,6 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEPackage;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedETypedElement;
-import org.eclipse.emf.teneo.hibernate.hbmodel.*;
import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute;
import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass;
import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType;
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 9aa24e36b..67b686cac 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,11 +23,13 @@ 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;
@@ -36,9 +38,13 @@ 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;
@@ -473,32 +479,26 @@ public class HbEntityDataStore extends HbDataStore implements EntityManagerFacto
return delegate.isOpen();
}
- // @Override
- // public <T> void addNamedEntityGraph(String arg0, EntityGraph<T> arg1) {
- // delegate.addNamedEntityGraph(arg0, arg1);
- // }
+ 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);
- // }
+ public void addNamedQuery(String arg0, Query arg1) {
+ delegate.addNamedQuery(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);
- // }
+ public EntityManager createEntityManager(SynchronizationType arg0) {
+ return delegate.createEntityManager(arg0);
+ }
+
+ 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);
- // }
+ public <T> T unwrap(Class<T> arg0) {
+ return delegate.unwrap(arg0);
+ }
}
/**
@@ -701,61 +701,50 @@ 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();
- // }
+ public <T> EntityGraph<T> createEntityGraph(Class<T> arg0) {
+ return delegateEntityManager.createEntityGraph(arg0);
+ }
+
+ public EntityGraph<?> createEntityGraph(String arg0) {
+ return delegateEntityManager.createEntityGraph(arg0);
+ }
+
+ public StoredProcedureQuery createNamedStoredProcedureQuery(String arg0) {
+ return delegateEntityManager.createNamedStoredProcedureQuery(arg0);
+ }
+
+ public Query createQuery(@SuppressWarnings("rawtypes") CriteriaUpdate arg0) {
+ return delegateEntityManager.createQuery(arg0);
+ }
+
+ public Query createQuery(@SuppressWarnings("rawtypes") CriteriaDelete arg0) {
+ return delegateEntityManager.createQuery(arg0);
+ }
+
+ public StoredProcedureQuery createStoredProcedureQuery(String arg0) {
+ return delegateEntityManager.createStoredProcedureQuery(arg0);
+ }
+
+ public StoredProcedureQuery createStoredProcedureQuery(String arg0,
+ @SuppressWarnings("rawtypes") Class... arg1) {
+ return delegateEntityManager.createStoredProcedureQuery(arg0, arg1);
+ }
+
+ public StoredProcedureQuery createStoredProcedureQuery(String arg0, String... arg1) {
+ return delegateEntityManager.createStoredProcedureQuery(arg0, arg1);
+ }
+
+ public EntityGraph<?> getEntityGraph(String arg0) {
+ return delegateEntityManager.getEntityGraph(arg0);
+ }
+
+ public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> arg0) {
+ return delegateEntityManager.getEntityGraphs(arg0);
+ }
+
+ public boolean isJoinedToTransaction() {
+ return delegateEntityManager.isJoinedToTransaction();
+ }
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@@ -834,30 +823,25 @@ 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);
- // }
+ public <T> void addNamedEntityGraph(String arg0, EntityGraph<T> arg1) {
+ getEntityManagerFactory().addNamedEntityGraph(arg0, arg1);
+ }
+
+ public void addNamedQuery(String arg0, Query arg1) {
+ getEntityManagerFactory().addNamedQuery(arg0, arg1);
+ }
+
+ public EntityManager createEntityManager(SynchronizationType arg0) {
+ return getEntityManagerFactory().createEntityManager(arg0);
+ }
+
+ public EntityManager createEntityManager(SynchronizationType arg0,
+ @SuppressWarnings("rawtypes") Map arg1) {
+ return getEntityManagerFactory().createEntityManager(arg0, arg1);
+ }
+
+ public <T> T unwrap(Class<T> arg0) {
+ return getEntityManagerFactory().unwrap(arg0);
+ }
} \ No newline at end of file
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/model/teneoauditing/impl/TeneoauditingFactoryImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/model/teneoauditing/impl/TeneoauditingFactoryImpl.java
index 70dae50c3..0df628c04 100644
--- a/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/model/teneoauditing/impl/TeneoauditingFactoryImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/model/teneoauditing/impl/TeneoauditingFactoryImpl.java
@@ -8,7 +8,6 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.*;
import org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditCommitInfo;
import org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditEntry;
import org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind;
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/model/teneoauditing/util/TeneoauditingAdapterFactory.java b/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/model/teneoauditing/util/TeneoauditingAdapterFactory.java
index 89dc42c06..a0d6267bb 100644
--- a/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/model/teneoauditing/util/TeneoauditingAdapterFactory.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/model/teneoauditing/util/TeneoauditingAdapterFactory.java
@@ -6,7 +6,6 @@ import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.*;
import org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditCommitInfo;
import org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditEntry;
import org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoauditingPackage;
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/model/teneoauditing/util/TeneoauditingSwitch.java b/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/model/teneoauditing/util/TeneoauditingSwitch.java
index b9dd11181..1ba353665 100644
--- a/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/model/teneoauditing/util/TeneoauditingSwitch.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/auditing/model/teneoauditing/util/TeneoauditingSwitch.java
@@ -5,7 +5,6 @@ package org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.util;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.*;
import org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditCommitInfo;
import org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditEntry;
import org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoauditingPackage;
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/property/EListPropertyHandler.java b/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/property/EListPropertyHandler.java
index 19abf7b6d..caa740b4e 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/property/EListPropertyHandler.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/property/EListPropertyHandler.java
@@ -15,8 +15,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.EMap;
import org.eclipse.emf.ecore.EObject;
@@ -69,9 +67,6 @@ public class EListPropertyHandler implements Getter, Setter, PropertyAccessor, E
*/
private static final long serialVersionUID = 2255108246093951341L;
- /** The logger */
- private static Log log = LogFactory.getLog(EListPropertyHandler.class);
-
/** The EStructuralFeature of this accessor */
protected EStructuralFeature eFeature;

Back to the top