Repository: olingo-odata2 Updated Branches: refs/heads/Olingo-129_PocJpaDataStore cb8e8bc80 -> 13b276fbd
[OLINGO-129] Persistence name as system property Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/13b276fb Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/13b276fb Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/13b276fb Branch: refs/heads/Olingo-129_PocJpaDataStore Commit: 13b276fbdef3f7bbdd5ffebc51cefc1420bea88b Parents: cb8e8bc Author: Michael Bolz <[email protected]> Authored: Sun May 18 00:03:26 2014 +0200 Committer: Michael Bolz <[email protected]> Committed: Sun May 18 00:03:26 2014 +0200 ---------------------------------------------------------------------- .../processor/core/datasource/DualDataStoreFactory.java | 6 +++++- .../processor/core/datasource/JpaAnnotationDataStore.java | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/13b276fb/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/DualDataStoreFactory.java ---------------------------------------------------------------------- diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/DualDataStoreFactory.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/DualDataStoreFactory.java index 0140118..714b629 100644 --- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/DualDataStoreFactory.java +++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/DualDataStoreFactory.java @@ -45,7 +45,11 @@ public class DualDataStoreFactory implements DataStoreFactory { public DataStore<?> createInstance(Class<?> clz, boolean keepPersistent) throws DataStoreException { if(isJpaAnnotated(clz)) { - return JpaAnnotationDataStore.createInstance(clz); + String persistenceName = System.getProperty(JpaAnnotationDataStore.PERSISTENCE_NAME); + if(persistenceName == null) { + return JpaAnnotationDataStore.createInstance(clz); + } + return JpaAnnotationDataStore.createInstance(clz, persistenceName); } return InMemoryDataStore.createInMemory(clz, keepPersistent); } http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/13b276fb/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/JpaAnnotationDataStore.java ---------------------------------------------------------------------- diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/JpaAnnotationDataStore.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/JpaAnnotationDataStore.java index 71c476d..8113c33 100644 --- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/JpaAnnotationDataStore.java +++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/JpaAnnotationDataStore.java @@ -31,6 +31,7 @@ import org.apache.olingo.odata2.api.annotation.edm.EdmKey; public class JpaAnnotationDataStore<T> implements DataStore<T> { public static final String DEFAULT_PERSISTENCE_NAME = "JpaAnnotationDataStorePersistence"; + public static final String PERSISTENCE_NAME = "JpaAnnotationDataStorePersistenceNameSystemProperty"; private static final AnnotationHelper ANNOTATION_HELPER = new AnnotationHelper();
