You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/09/10 18:12:16 UTC
[16/34] isis git commit: ISIS-1194: DataNucleusApplicationComponents:
removed createPersistenceManager,
instead inlined into PersistenceSession (only caller).
ISIS-1194: DataNucleusApplicationComponents: removed createPersistenceManager, instead inlined into PersistenceSession (only caller).
... also removed the FrameworkSynchronizer form DNAC, unused.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ecd2b75d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ecd2b75d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ecd2b75d
Branch: refs/heads/ISIS-1194
Commit: ecd2b75db49527e1ef4e3ebfeb3004883bc7f764
Parents: c2afada
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 10 15:58:41 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 10 15:58:41 2015 +0100
----------------------------------------------------------------------
.../persistence/DataNucleusApplicationComponents.java | 12 ------------
.../system/persistence/FrameworkSynchronizer.java | 2 +-
.../runtime/system/persistence/PersistenceSession.java | 2 +-
3 files changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ecd2b75d/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
index 3988567..a702ee5 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
@@ -23,7 +23,6 @@ import java.util.Properties;
import java.util.Set;
import javax.jdo.JDOHelper;
-import javax.jdo.PersistenceManager;
import javax.jdo.PersistenceManagerFactory;
import com.google.common.base.Joiner;
@@ -44,7 +43,6 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.objectstore.jdo.datanucleus.CreateSchemaObjectFromClassMetadata;
import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPropertiesAware;
-import org.apache.isis.objectstore.jdo.datanucleus.persistence.IsisLifecycleListener;
import org.apache.isis.objectstore.jdo.metamodel.facets.object.query.JdoNamedQuery;
import org.apache.isis.objectstore.jdo.metamodel.facets.object.query.JdoQueryFacet;
@@ -85,8 +83,6 @@ public class DataNucleusApplicationComponents implements ApplicationScopedCompon
private final IsisConfiguration jdoObjectstoreConfig;
private final Map<String, String> datanucleusProps;
- private final FrameworkSynchronizer synchronizer;
-
private Map<String, JdoNamedQuery> namedQueryByName;
private PersistenceManagerFactory persistenceManagerFactory;
@@ -99,8 +95,6 @@ public class DataNucleusApplicationComponents implements ApplicationScopedCompon
this.persistableClassNameSet = persistableClassNameSet;
this.jdoObjectstoreConfig = jdoObjectstoreConfig;
- this.synchronizer = new FrameworkSynchronizer();
-
initialize();
// for JRebel plugin
@@ -271,12 +265,6 @@ public class DataNucleusApplicationComponents implements ApplicationScopedCompon
///////////////////////////////////////////////////////////////////////////
//
///////////////////////////////////////////////////////////////////////////
-
- public PersistenceManager createPersistenceManager() {
- PersistenceManager persistenceManager = persistenceManagerFactory.getPersistenceManager();
-
- return persistenceManager;
- }
public JdoNamedQuery getNamedQuery(String queryName) {
return namedQueryByName.get(queryName);
http://git-wip-us.apache.org/repos/asf/isis/blob/ecd2b75d/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/FrameworkSynchronizer.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/FrameworkSynchronizer.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/FrameworkSynchronizer.java
index 242dc94..8c1695d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/FrameworkSynchronizer.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/FrameworkSynchronizer.java
@@ -53,8 +53,8 @@ public class FrameworkSynchronizer {
private static final Logger LOG = LoggerFactory.getLogger(FrameworkSynchronizer.class);
public FrameworkSynchronizer() {
-
}
+
/**
* Categorises where called from.
*
http://git-wip-us.apache.org/repos/asf/isis/blob/ecd2b75d/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index 7afc1dc..2fe4b3b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -222,7 +222,7 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
adapterManager.open();
- persistenceManager = applicationComponents.createPersistenceManager();
+ persistenceManager = applicationComponents.getPersistenceManagerFactory().getPersistenceManager();
final IsisLifecycleListener isisLifecycleListener = new IsisLifecycleListener(frameworkSynchronizer);
persistenceManager.addInstanceLifecycleListener(isisLifecycleListener, (Class[])null);