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/03/30 17:43:52 UTC
[23/59] [abbrv] isis git commit: ISIS-789: Merging in
https://github.com/apache/isis/pull/27 (jdbranham/master) for upgrading JDO
Objectstore to 4.0.4.
ISIS-789: Merging in https://github.com/apache/isis/pull/27 (jdbranham/master) for upgrading JDO Objectstore to 4.0.4.
Have excluded changes to neoapp and simpleapp (will add as separate commits).
Resolved conflicts:
core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/30a4cb67
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/30a4cb67
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/30a4cb67
Branch: refs/heads/ISIS-789
Commit: 30a4cb674607ce522d4b9852c932e03e924f1bff
Parents: 2c7cfbf 0d223de
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Mar 30 14:55:16 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Mar 30 14:55:16 2015 +0100
----------------------------------------------------------------------
core/applib/pom.xml | 2 +-
...DatanucleusPersistableTypesFacetFactory.java | 14 ++
.../RemoveDnPrefixedMethodsFacetFactory.java | 28 +++
.../classsubstitutor/ClassSubstitutor.java | 4 +
.../dflt/ProgrammingModelFacetsJava5.java | 5 +
core/pom.xml | 8 +-
.../IdentifierGeneratorForDataNucleus.java | 4 +-
.../system/persistence/PersistenceSession.java | 2 +-
.../DataNucleusApplicationComponents.java | 42 ++--
.../jdo/datanucleus/DataNucleusObjectStore.java | 10 +-
...ataNucleusPersistenceMechanismInstaller.java | 18 +-
.../IsisConfigurationForJdoIntegTests.java | 11 +-
.../jdo/datanucleus/JDOStateManagerForIsis.java | 92 +++++++--
.../persistence/FrameworkSynchronizer.java | 42 ++--
.../persistence/IsisLifecycleListener.java | 19 +-
.../jdo/datanucleus/persistence/Utils.java | 14 +-
.../PersistenceQueryProcessorAbstract.java | 9 +-
.../persistence/spi/JdoObjectIdSerializer.java | 202 ++++++++-----------
.../datanucleus/valuetypes/IsisDateMapping.java | 9 +-
.../valuetypes/IsisDateTimeMapping.java | 9 +-
tck/pom.xml | 7 +-
tck/tck-dom/pom.xml | 2 +-
.../spi/JdoObjectIdSerializerTest.java | 14 +-
23 files changed, 338 insertions(+), 229 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/30a4cb67/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/30a4cb67/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
----------------------------------------------------------------------
diff --cc core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
index c92bae9,013041e..92ea2b5
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
@@@ -26,10 -27,10 +27,10 @@@ import javax.jdo.FetchGroup
import javax.jdo.FetchPlan;
import javax.jdo.PersistenceManager;
import javax.jdo.Query;
- import javax.jdo.spi.PersistenceCapable;
+
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-
+import org.datanucleus.api.jdo.NucleusJDOHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
http://git-wip-us.apache.org/repos/asf/isis/blob/30a4cb67/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
----------------------------------------------------------------------
diff --cc core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
index 21e6882,d511f10..37ff550
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
@@@ -19,21 -19,19 +19,18 @@@
package org.apache.isis.objectstore.jdo.datanucleus;
- import javax.jdo.spi.PersistenceCapable;
- import javax.jdo.spi.StateManager;
-
import org.datanucleus.ExecutionContext;
import org.datanucleus.cache.CachedPC;
+ import org.datanucleus.enhancer.Persistable;
import org.datanucleus.metadata.AbstractClassMetaData;
import org.datanucleus.state.ObjectProvider;
- import org.datanucleus.state.ReferentialJDOStateManager;
+ import org.datanucleus.state.ReferentialStateManagerImpl;
import org.datanucleus.store.FieldValues;
import org.datanucleus.store.fieldmanager.FieldManager;
-
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.objectstore.jdo.datanucleus.service.eventbus.EventBusServiceJdo;
- public class JDOStateManagerForIsis extends ReferentialJDOStateManager implements StateManager, ObjectProvider {
+ public class JDOStateManagerForIsis extends ReferentialStateManagerImpl {
public JDOStateManagerForIsis(ExecutionContext ec, AbstractClassMetaData cmd) {
super(ec, cmd);