Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2013-07-12 10:00:38 -0400
committerMartin Taal2013-07-12 10:00:38 -0400
commit2bf3545b167e0256cc0830df8f34f853c527db57 (patch)
treebcabc866a760b1835d5a63cb803a7562193aedb0
parenta58de88c7c09b02858d2970db56c518198387dbf (diff)
downloadorg.eclipse.emf.teneo-2bf3545b167e0256cc0830df8f34f853c527db57.tar.gz
org.eclipse.emf.teneo-2bf3545b167e0256cc0830df8f34f853c527db57.tar.xz
org.eclipse.emf.teneo-2bf3545b167e0256cc0830df8f34f853c527db57.zip
Changes for Kepler
-rwxr-xr-xbuild/org.eclipse.emf.teneo.releng.buckminster/build/teneo.rmap15
-rwxr-xr-xbuild/org.eclipse.emf.teneo.releng.buckminster/test/teneo.rmap10
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java2
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbEntityDataStore.java114
4 files changed, 140 insertions, 1 deletions
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/build/teneo.rmap b/build/org.eclipse.emf.teneo.releng.buckminster/build/teneo.rmap
index 9b5da9dea..a7b88f7a5 100755
--- a/build/org.eclipse.emf.teneo.releng.buckminster/build/teneo.rmap
+++ b/build/org.eclipse.emf.teneo.releng.buckminster/build/teneo.rmap
@@ -46,12 +46,27 @@
</searchPath>
<searchPath name="target.platform">
+ <provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Kepler)">
+ <uri format="{0}/releases/kepler">
+ <bc:propertyRef key="eclipse.download"/>
+ </uri>
+ </provider>
+ <provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Kepler)">
+ <uri format="{0}/eclipse/updates/4.3">
+ <bc:propertyRef key="eclipse.download"/>
+ </uri>
+ </provider>
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Juno)">
<uri format="{0}/releases/juno">
<bc:propertyRef key="eclipse.download"/>
</uri>
</provider>
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Juno)">
+ <uri format="{0}/eclipse/updates/3.8">
+ <bc:propertyRef key="eclipse.download"/>
+ </uri>
+ </provider>
+ <provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Juno)">
<uri format="{0}/eclipse/updates/3.8milestones/">
<bc:propertyRef key="eclipse.download"/>
</uri>
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo.rmap b/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo.rmap
index 708a0776c..8a51fccd1 100755
--- a/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo.rmap
+++ b/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo.rmap
@@ -60,6 +60,16 @@
</searchPath>
<searchPath name="target.platform">
+ <provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Kepler)">
+ <uri format="{0}/releases/kepler">
+ <bc:propertyRef key="eclipse.download"/>
+ </uri>
+ </provider>
+ <provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Kepler)">
+ <uri format="{0}/eclipse/updates/4.3">
+ <bc:propertyRef key="eclipse.download"/>
+ </uri>
+ </provider>
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Juno)">
<uri format="{0}/releases/juno">
<bc:propertyRef key="eclipse.download"/>
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java
index 9cf95e141..595bb53fb 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java
@@ -91,7 +91,7 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
/**
* @return Returns a new hibernate element for the given entity.
*/
- private Element createEntity(PAnnotatedEClass entity, InheritanceType inhStrategy,
+ protected Element createEntity(PAnnotatedEClass entity, InheritanceType inhStrategy,
PAnnotatedEClass superEntity, DiscriminatorValue dValue, Table table) {
// determine what type of hibernate tag should be used
final InheritanceType inheritanceStrategy = inhStrategy != null ? inhStrategy
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 005de04bf..679ce3e0f 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;
@@ -472,6 +478,32 @@ public class HbEntityDataStore extends HbDataStore implements EntityManagerFacto
public boolean isOpen() {
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 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);
+ }
}
/**
@@ -673,6 +705,62 @@ public class HbEntityDataStore extends HbDataStore implements EntityManagerFacto
public void setDelegateEntityManager(EntityManager delegateEntityManager) {
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();
+ }
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@@ -751,4 +839,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);
+ }
+
} \ No newline at end of file

Back to the top