This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new f1f938a ISIS-2331: move PersistenceSession + Factory to DN5 module
f1f938a is described below
commit f1f938a5019d6bcc3f4c9a0a9e34125972933c90
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Wed Mar 25 11:35:59 2020 +0100
ISIS-2331: move PersistenceSession + Factory to DN5 module
---
.../persistence/commands/DataNucleusCreateObjectCommand.java | 2 +-
.../datanucleus/service/JdoPersistenceLifecycleService.java | 4 ++--
.../persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java | 2 +-
.../object/persistencecapable/JdoPersistenceCapableFacetAbstract.java | 2 +-
.../jdo/datanucleus5/objectadapter/ObjectAdapterContext.java | 2 +-
.../objectadapter/ObjectAdapterContext_NewIdentifier.java | 2 +-
.../jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java | 1 -
.../persistence/IsisPlatformTransactionManagerForJdo.java | 1 -
.../persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java | 1 -
.../persistence/jdo/datanucleus5/persistence}/PersistenceSession.java | 2 +-
.../jdo/datanucleus5/persistence}/PersistenceSessionFactory.java | 2 +-
.../jdo/datanucleus5/persistence/PersistenceSessionFactory5.java | 2 --
12 files changed, 9 insertions(+), 14 deletions(-)
diff --git
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
index 93dbed9..361d4a1 100644
---
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
+++
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
@@ -22,8 +22,8 @@ import javax.jdo.PersistenceManager;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.spec.ManagedObject;
+import
org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSession;
import
org.apache.isis.persistence.jdo.datanucleus5.persistence.command.CreateObjectCommand;
-import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
index 7e45361..9a14c02 100644
---
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
+++
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
@@ -36,8 +36,8 @@ import
org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.runtime.context.session.AppLifecycleEvent;
import
org.apache.isis.core.runtime.context.session.IsisInteractionLifecycleEvent;
import org.apache.isis.core.runtime.iactn.IsisInteraction;
-import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
-import
org.apache.isis.core.runtime.persistence.session.PersistenceSessionFactory;
+import
org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSession;
+import
org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSessionFactory;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
index 1d34838..cdaf067 100644
---
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
+++
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
@@ -48,7 +48,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.ObjectPersistenceException;
import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport_v3_2;
import
org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
-import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
+import
org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSession;
import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
diff --git
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
index d93037e..039a4cd 100644
---
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
+++
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.entity.EntityFacet;
import
org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
-import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
+import
org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSession;
public abstract class JdoPersistenceCapableFacetAbstract
diff --git
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
index a821715..ef7a3fe 100644
---
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
+++
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
@@ -37,8 +37,8 @@ import
org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.context.session.RuntimeContextBase;
-import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import
org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
+import
org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSession;
import lombok.Getter;
import lombok.val;
diff --git
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java
index e27cbfd..420537d 100644
---
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java
+++
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java
@@ -23,7 +23,7 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
+import
org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSession;
import lombok.RequiredArgsConstructor;
diff --git
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
index 2cbdeac..2ac2b92 100644
---
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
+++
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
@@ -22,7 +22,6 @@ import java.util.List;
import
org.apache.isis.persistence.jdo.datanucleus5.objectadapter.ObjectAdapterProvider;
import
org.apache.isis.persistence.jdo.datanucleus5.persistence.command.PersistenceCommand;
-import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
/**
*
diff --git
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
index f42966d..2d2229b 100644
---
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
+++
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
@@ -35,7 +35,6 @@ import
org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
-import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import
org.apache.isis.core.runtime.persistence.transaction.IsisTransactionAspectSupport;
import
org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
import
org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject.IsisInteractionScopeType;
diff --git
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
index f44058a..d042b13 100644
---
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
+++
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
@@ -37,7 +37,6 @@ import
org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.commons.ToString;
import
org.apache.isis.core.metamodel.services.publishing.PublisherDispatchService;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import
org.apache.isis.core.runtime.persistence.transaction.AuditerDispatchService;
import
org.apache.isis.core.runtime.persistence.transaction.IsisTransactionFlushException;
import
org.apache.isis.core.runtime.persistence.transaction.IsisTransactionManagerException;
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSession.java
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession.java
similarity index 98%
rename from
core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSession.java
rename to
persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession.java
index ac255f4..1f0a0ee 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSession.java
+++
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.runtime.persistence.session;
+package org.apache.isis.persistence.jdo.datanucleus5.persistence;
import java.util.List;
import java.util.Map;
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSessionFactory.java
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory.java
similarity index 94%
rename from
core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSessionFactory.java
rename to
persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory.java
index 2a96116..0c86a91 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSessionFactory.java
+++
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.runtime.persistence.session;
+package org.apache.isis.persistence.jdo.datanucleus5.persistence;
import org.apache.isis.core.metamodel.context.MetaModelContext;
diff --git
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
index 0aa8524..0766e2b 100644
---
a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
+++
b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
@@ -42,8 +42,6 @@ import
org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
-import
org.apache.isis.core.runtime.persistence.session.PersistenceSessionFactory;
import
org.apache.isis.persistence.jdo.applib.fixturestate.FixturesInstalledState;
import
org.apache.isis.persistence.jdo.applib.fixturestate.FixturesInstalledStateHolder;
import
org.apache.isis.persistence.jdo.datanucleus5.datanucleus.DataNucleusContextUtil;
