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 2010/11/16 15:11:41 UTC
svn commit: r1035640 [2/10] - in /incubator/isis/trunk:
alternatives/bytecode/identity/src/main/java/org/apache/isis/runtime/persistence/objectfactory/
alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectf...
Modified: incubator/isis/trunk/alternatives/bytecode/identity/src/main/java/org/apache/isis/runtime/persistence/objectfactory/ObjectFactoryBasic.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/bytecode/identity/src/main/java/org/apache/isis/runtime/persistence/objectfactory/ObjectFactoryBasic.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/bytecode/identity/src/main/java/org/apache/isis/runtime/persistence/objectfactory/ObjectFactoryBasic.java (original)
+++ incubator/isis/trunk/alternatives/bytecode/identity/src/main/java/org/apache/isis/runtime/persistence/objectfactory/ObjectFactoryBasic.java Tue Nov 16 14:11:21 2010
@@ -23,6 +23,7 @@ package org.apache.isis.runtime.persiste
import java.lang.reflect.Modifier;
import org.apache.isis.core.metamodel.runtimecontext.ObjectInstantiationException;
+import org.apache.isis.core.runtime.persistence.objectfactory.ObjectFactoryAbstract;
public class ObjectFactoryBasic extends ObjectFactoryAbstract {
Modified: incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/JavassistObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/JavassistObjectFactory.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/JavassistObjectFactory.java (original)
+++ incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/JavassistObjectFactory.java Tue Nov 16 14:11:21 2010
@@ -22,13 +22,13 @@ package org.apache.isis.bytecode.javassi
import org.apache.isis.bytecode.javassist.persistence.objectfactory.internal.ObjectResolveAndObjectChangedEnhancer;
import org.apache.isis.core.metamodel.runtimecontext.ObjectInstantiationException;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.PersistenceSessionAware;
-import org.apache.isis.runtime.persistence.container.DomainObjectContainerObjectChanged;
-import org.apache.isis.runtime.persistence.container.DomainObjectContainerResolve;
-import org.apache.isis.runtime.persistence.objectfactory.ObjectChanger;
-import org.apache.isis.runtime.persistence.objectfactory.ObjectFactoryAbstract;
-import org.apache.isis.runtime.persistence.objectfactory.ObjectResolver;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionAware;
+import org.apache.isis.core.runtime.persistence.container.DomainObjectContainerObjectChanged;
+import org.apache.isis.core.runtime.persistence.container.DomainObjectContainerResolve;
+import org.apache.isis.core.runtime.persistence.objectfactory.ObjectChanger;
+import org.apache.isis.core.runtime.persistence.objectfactory.ObjectFactoryAbstract;
+import org.apache.isis.core.runtime.persistence.objectfactory.ObjectResolver;
public class JavassistObjectFactory extends ObjectFactoryAbstract {
Modified: incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java (original)
+++ incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java Tue Nov 16 14:11:21 2010
@@ -36,8 +36,8 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.progmodel.spec.JavaSpecification;
import org.apache.isis.core.runtime.bytecode.ObjectResolveAndObjectChangedEnhancerAbstract;
-import org.apache.isis.runtime.persistence.objectfactory.ObjectChanger;
-import org.apache.isis.runtime.persistence.objectfactory.ObjectResolver;
+import org.apache.isis.core.runtime.persistence.objectfactory.ObjectChanger;
+import org.apache.isis.core.runtime.persistence.objectfactory.ObjectResolver;
public class ObjectResolveAndObjectChangedEnhancer extends ObjectResolveAndObjectChangedEnhancerAbstract {
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/file/ClientConnection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/file/ClientConnection.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/file/ClientConnection.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/file/ClientConnection.java Tue Nov 16 14:11:21 2010
@@ -31,9 +31,9 @@ import java.net.Socket;
import java.net.UnknownHostException;
import org.apache.log4j.Logger;
+import org.apache.isis.core.runtime.persistence.ConcurrencyException;
import org.apache.isis.extensions.file.server.Util;
import org.apache.isis.extensions.nosql.NoSqlStoreException;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
public class ClientConnection {
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/file/FileServerDb.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/file/FileServerDb.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/file/FileServerDb.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/file/FileServerDb.java Tue Nov 16 14:11:21 2010
@@ -25,11 +25,11 @@ import java.util.Iterator;
import java.util.List;
import org.apache.log4j.Logger;
+import org.apache.isis.core.runtime.persistence.ConcurrencyException;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
import org.apache.isis.extensions.nosql.NoSqlCommandContext;
import org.apache.isis.extensions.nosql.NoSqlDataDatabase;
import org.apache.isis.extensions.nosql.StateReader;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
public class FileServerDb implements NoSqlDataDatabase {
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/mongo/MongoDb.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/mongo/MongoDb.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/mongo/MongoDb.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/mongo/MongoDb.java Tue Nov 16 14:11:21 2010
@@ -27,14 +27,14 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.extensions.nosql.KeyCreator;
import org.apache.isis.extensions.nosql.NoSqlCommandContext;
import org.apache.isis.extensions.nosql.NoSqlDataDatabase;
import org.apache.isis.extensions.nosql.NoSqlStoreException;
import org.apache.isis.extensions.nosql.StateReader;
import org.apache.isis.extensions.nosql.StateWriter;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
import com.mongodb.BasicDBObject;
import com.mongodb.DB;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/mongo/MongoStateReader.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/mongo/MongoStateReader.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/mongo/MongoStateReader.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/mongo/MongoStateReader.java Tue Nov 16 14:11:21 2010
@@ -24,8 +24,8 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
+import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
import org.apache.isis.extensions.nosql.StateReader;
-import org.apache.isis.runtime.persistence.ObjectNotFoundException;
import com.mongodb.DB;
import com.mongodb.DBCollection;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/DestroyObjectCommandImplementation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/DestroyObjectCommandImplementation.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/DestroyObjectCommandImplementation.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/DestroyObjectCommandImplementation.java Tue Nov 16 14:11:21 2010
@@ -22,8 +22,8 @@ package org.apache.isis.extensions.nosql
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
final class DestroyObjectCommandImplementation implements DestroyObjectCommand {
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlCommandContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlCommandContext.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlCommandContext.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlCommandContext.java Tue Nov 16 14:11:21 2010
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.nosql;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
public interface NoSqlCommandContext extends PersistenceCommandContext {
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlDataDatabase.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlDataDatabase.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlDataDatabase.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlDataDatabase.java Tue Nov 16 14:11:21 2010
@@ -23,7 +23,7 @@ package org.apache.isis.extensions.nosql
import java.util.Iterator;
import java.util.List;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
public interface NoSqlDataDatabase {
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlObjectStore.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlObjectStore.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlObjectStore.java Tue Nov 16 14:11:21 2010
@@ -34,14 +34,14 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.runtime.persistence.objectstore.ObjectStore;
-import org.apache.isis.runtime.persistence.objectstore.transaction.CreateObjectCommand;
-import org.apache.isis.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
-import org.apache.isis.runtime.persistence.objectstore.transaction.SaveObjectCommand;
-import org.apache.isis.runtime.persistence.oidgenerator.OidGenerator;
-import org.apache.isis.runtime.persistence.query.PersistenceQuery;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryBuiltIn;
+import org.apache.isis.core.runtime.persistence.objectstore.ObjectStore;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObjectCommand;
+import org.apache.isis.core.runtime.persistence.oidgenerator.OidGenerator;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryBuiltIn;
public class NoSqlObjectStore implements ObjectStore {
private final NoSqlDataDatabase database;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlOidGenerator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlOidGenerator.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlOidGenerator.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlOidGenerator.java Tue Nov 16 14:11:21 2010
@@ -26,8 +26,8 @@ import org.apache.isis.core.commons.ensu
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
import org.apache.isis.core.metamodel.adapter.oid.AggregatedOid;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.runtime.persistence.oidgenerator.OidGeneratorAbstract;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
+import org.apache.isis.core.runtime.persistence.oidgenerator.OidGeneratorAbstract;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
public class NoSqlOidGenerator extends OidGeneratorAbstract {
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlPersistorMechanismInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlPersistorMechanismInstaller.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlPersistorMechanismInstaller.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlPersistorMechanismInstaller.java Tue Nov 16 14:11:21 2010
@@ -21,14 +21,14 @@
package org.apache.isis.extensions.nosql;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactoryDelegating;
-import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
-import org.apache.isis.runtime.persistence.objectstore.ObjectStore;
-import org.apache.isis.runtime.persistence.objectstore.ObjectStorePersistenceMechanismInstallerAbstract;
-import org.apache.isis.runtime.persistence.oidgenerator.OidGenerator;
-import org.apache.isis.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating;
+import org.apache.isis.core.runtime.persistence.adapterfactory.AdapterFactory;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
+import org.apache.isis.core.runtime.persistence.objectstore.ObjectStore;
+import org.apache.isis.core.runtime.persistence.objectstore.ObjectStorePersistenceMechanismInstallerAbstract;
+import org.apache.isis.core.runtime.persistence.oidgenerator.OidGenerator;
+import org.apache.isis.core.runtime.system.DeploymentType;
public abstract class NoSqlPersistorMechanismInstaller extends ObjectStorePersistenceMechanismInstallerAbstract {
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/ObjectReader.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/ObjectReader.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/ObjectReader.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/ObjectReader.java Tue Nov 16 14:11:21 2010
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
class ObjectReader {
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/SerialKeyCreator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/SerialKeyCreator.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/SerialKeyCreator.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/SerialKeyCreator.java Tue Nov 16 14:11:21 2010
@@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
public class SerialKeyCreator implements KeyCreator {
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/WriteObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/WriteObjectCommand.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/WriteObjectCommand.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/WriteObjectCommand.java Tue Nov 16 14:11:21 2010
@@ -30,9 +30,9 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.runtime.persistence.objectstore.transaction.CreateObjectCommand;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
-import org.apache.isis.runtime.persistence.objectstore.transaction.SaveObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObjectCommand;
final class WriteObjectCommand implements CreateObjectCommand, SaveObjectCommand {
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/mongo/MongoDbTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/mongo/MongoDbTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/mongo/MongoDbTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/mongo/MongoDbTest.java Tue Nov 16 14:11:21 2010
@@ -26,10 +26,10 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.extensions.nosql.ExampleValuePojo;
import org.apache.isis.extensions.nosql.SerialKeyCreator;
import org.apache.isis.extensions.nosql.TrialObjects;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
import com.mongodb.BasicDBObject;
import com.mongodb.DB;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/mongo/ObjectTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/mongo/ObjectTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/mongo/ObjectTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/mongo/ObjectTest.java Tue Nov 16 14:11:21 2010
@@ -27,9 +27,9 @@ import org.junit.Test;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.extensions.nosql.ExampleValuePojo;
import org.apache.isis.extensions.nosql.TrialObjects;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
import static org.junit.Assert.assertEquals;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/DestroyObjectCommandImplementationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/DestroyObjectCommandImplementationTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/DestroyObjectCommandImplementationTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/DestroyObjectCommandImplementationTest.java Tue Nov 16 14:11:21 2010
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.version.SerialNumberVersion;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.runtime.testsystem.TestProxySystemII;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/NoSqlObjectStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/NoSqlObjectStoreTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/NoSqlObjectStoreTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/NoSqlObjectStoreTest.java Tue Nov 16 14:11:21 2010
@@ -33,10 +33,10 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
-import org.apache.isis.runtime.persistence.query.PersistenceQuery;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
import org.apache.isis.runtime.testsystem.TestProxySystemII;
import static org.junit.Assert.assertEquals;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/NoSqlOidGeneratorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/NoSqlOidGeneratorTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/NoSqlOidGeneratorTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/NoSqlOidGeneratorTest.java Tue Nov 16 14:11:21 2010
@@ -26,7 +26,7 @@ import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import static org.junit.Assert.*;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/ObjectReaderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/ObjectReaderTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/ObjectReaderTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/ObjectReaderTest.java Tue Nov 16 14:11:21 2010
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.runtime.testsystem.TestProxySystemII;
import static org.junit.Assert.assertEquals;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/SerialKeyCreatorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/SerialKeyCreatorTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/SerialKeyCreatorTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/SerialKeyCreatorTest.java Tue Nov 16 14:11:21 2010
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.runtime.testsystem.TestProxySystemII;
import static org.junit.Assert.assertEquals;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/TrialObjects.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/TrialObjects.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/TrialObjects.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/TrialObjects.java Tue Nov 16 14:11:21 2010
@@ -34,13 +34,13 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverserDefault;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorNoop;
+import org.apache.isis.core.runtime.persistence.adapterfactory.AdapterFactory;
+import org.apache.isis.core.runtime.persistence.adapterfactory.AdapterFactoryAbstract;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
+import org.apache.isis.core.runtime.testsystem.TestClassSubstitutor;
+import org.apache.isis.core.runtime.testsystem.TestProxyAdapter;
import org.apache.isis.defaults.progmodel.JavaReflector;
import org.apache.isis.defaults.progmodel.ProgrammingModelFacetsJava5;
-import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
-import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactoryAbstract;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
-import org.apache.isis.runtime.testsystem.TestClassSubstitutor;
-import org.apache.isis.runtime.testsystem.TestProxyAdapter;
public class TrialObjects {
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/WriteObjectCommandTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/WriteObjectCommandTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/WriteObjectCommandTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/WriteObjectCommandTest.java Tue Nov 16 14:11:21 2010
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.version.SerialNumberVersion;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
public class WriteObjectCommandTest {
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/IdMappingAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/IdMappingAbstract.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/IdMappingAbstract.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/IdMappingAbstract.java Tue Nov 16 14:11:21 2010
@@ -23,9 +23,9 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.extensions.sql.objectstore.SqlOid.State;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
public class IdMappingAbstract {
private String column;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/ObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/ObjectMapping.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/ObjectMapping.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/ObjectMapping.java Tue Nov 16 14:11:21 2010
@@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindByPattern;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByPattern;
public interface ObjectMapping {
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlExecutionContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlExecutionContext.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlExecutionContext.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlExecutionContext.java Tue Nov 16 14:11:21 2010
@@ -20,10 +20,10 @@
package org.apache.isis.extensions.sql.objectstore;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker;
import org.apache.isis.core.runtime.transaction.updatenotifier.UpdateNotifier;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlObjectStore.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlObjectStore.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlObjectStore.java Tue Nov 16 14:11:21 2010
@@ -30,19 +30,19 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.objectstore.ObjectStore;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObjectCommand;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindAllInstances;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByPattern;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByTitle;
import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker;
import org.apache.isis.core.runtime.transaction.updatenotifier.UpdateNotifier;
-import org.apache.isis.runtime.persistence.objectstore.ObjectStore;
-import org.apache.isis.runtime.persistence.objectstore.transaction.CreateObjectCommand;
-import org.apache.isis.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
-import org.apache.isis.runtime.persistence.objectstore.transaction.SaveObjectCommand;
-import org.apache.isis.runtime.persistence.query.PersistenceQuery;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindAllInstances;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindByPattern;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindByTitle;
import org.apache.log4j.Logger;
public final class SqlObjectStore implements ObjectStore {
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlOidGenerator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlOidGenerator.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlOidGenerator.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlOidGenerator.java Tue Nov 16 14:11:21 2010
@@ -22,8 +22,8 @@ package org.apache.isis.extensions.sql.o
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.runtime.persistence.oidgenerator.OidGeneratorAbstract;
import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
-import org.apache.isis.runtime.persistence.oidgenerator.OidGeneratorAbstract;
import org.apache.log4j.Logger;
public class SqlOidGenerator extends OidGeneratorAbstract {
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlPersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlPersistenceSessionFactory.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlPersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlPersistenceSessionFactory.java Tue Nov 16 14:11:21 2010
@@ -20,8 +20,8 @@
package org.apache.isis.extensions.sql.objectstore;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactoryDelegating;
-import org.apache.isis.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating;
+import org.apache.isis.core.runtime.system.DeploymentType;
public class SqlPersistenceSessionFactory extends PersistenceSessionFactoryDelegating {
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlPersistorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlPersistorInstaller.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlPersistorInstaller.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlPersistorInstaller.java Tue Nov 16 14:11:21 2010
@@ -21,16 +21,16 @@
package org.apache.isis.extensions.sql.objectstore;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.persistence.adapterfactory.AdapterFactory;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
+import org.apache.isis.core.runtime.persistence.objectstore.ObjectStore;
+import org.apache.isis.core.runtime.persistence.objectstore.ObjectStorePersistenceMechanismInstallerAbstract;
+import org.apache.isis.core.runtime.persistence.oidgenerator.OidGenerator;
+import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.extensions.sql.objectstore.auto.AutoMapperFactory;
import org.apache.isis.extensions.sql.objectstore.jdbc.JdbcConnectorFactory;
import org.apache.isis.extensions.sql.objectstore.jdbc.JdbcFieldMappingFactoryInstaller;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
-import org.apache.isis.runtime.persistence.objectstore.ObjectStore;
-import org.apache.isis.runtime.persistence.objectstore.ObjectStorePersistenceMechanismInstallerAbstract;
-import org.apache.isis.runtime.persistence.oidgenerator.OidGenerator;
-import org.apache.isis.runtime.system.DeploymentType;
public class SqlPersistorInstaller extends ObjectStorePersistenceMechanismInstallerAbstract {
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AbstractAutoMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AbstractAutoMapper.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AbstractAutoMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AbstractAutoMapper.java Tue Nov 16 14:11:21 2010
@@ -32,6 +32,7 @@ import org.apache.isis.core.metamodel.co
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.isis.extensions.sql.objectstore.AbstractMapper;
import org.apache.isis.extensions.sql.objectstore.CollectionMapper;
import org.apache.isis.extensions.sql.objectstore.DatabaseConnector;
@@ -40,7 +41,6 @@ import org.apache.isis.extensions.sql.ob
import org.apache.isis.extensions.sql.objectstore.Sql;
import org.apache.isis.extensions.sql.objectstore.SqlObjectStoreException;
import org.apache.isis.extensions.sql.objectstore.mapping.FieldMapping;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.log4j.Logger;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AutoCollectionMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AutoCollectionMapper.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AutoCollectionMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AutoCollectionMapper.java Tue Nov 16 14:11:21 2010
@@ -30,6 +30,7 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.runtime.persistence.PersistorUtil;
import org.apache.isis.extensions.sql.objectstore.AbstractMapper;
import org.apache.isis.extensions.sql.objectstore.CollectionMapper;
import org.apache.isis.extensions.sql.objectstore.DatabaseConnector;
@@ -39,7 +40,6 @@ import org.apache.isis.extensions.sql.ob
import org.apache.isis.extensions.sql.objectstore.Sql;
import org.apache.isis.extensions.sql.objectstore.jdbc.JdbcObjectReferenceMapping;
import org.apache.isis.extensions.sql.objectstore.mapping.ObjectReferenceMapping;
-import org.apache.isis.runtime.persistence.PersistorUtil;
import org.apache.log4j.Logger;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AutoMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AutoMapper.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AutoMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AutoMapper.java Tue Nov 16 14:11:21 2010
@@ -29,6 +29,10 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.version.SerialNumberVersion;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.runtime.persistence.ConcurrencyException;
+import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
+import org.apache.isis.core.runtime.persistence.PersistorUtil;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByPattern;
import org.apache.isis.extensions.sql.objectstore.CollectionMapper;
import org.apache.isis.extensions.sql.objectstore.DatabaseConnector;
import org.apache.isis.extensions.sql.objectstore.FieldMappingLookup;
@@ -40,10 +44,6 @@ import org.apache.isis.extensions.sql.ob
import org.apache.isis.extensions.sql.objectstore.TitleMapping;
import org.apache.isis.extensions.sql.objectstore.VersionMapping;
import org.apache.isis.extensions.sql.objectstore.mapping.FieldMapping;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
-import org.apache.isis.runtime.persistence.ObjectNotFoundException;
-import org.apache.isis.runtime.persistence.PersistorUtil;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindByPattern;
import org.apache.log4j.Logger;
public class AutoMapper extends AbstractAutoMapper implements ObjectMapping,
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/CombinedCollectionMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/CombinedCollectionMapper.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/CombinedCollectionMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/CombinedCollectionMapper.java Tue Nov 16 14:11:21 2010
@@ -29,6 +29,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.runtime.persistence.PersistorUtil;
import org.apache.isis.extensions.sql.objectstore.CollectionMapper;
import org.apache.isis.extensions.sql.objectstore.DatabaseConnector;
import org.apache.isis.extensions.sql.objectstore.FieldMappingLookup;
@@ -40,7 +41,6 @@ import org.apache.isis.extensions.sql.ob
import org.apache.isis.extensions.sql.objectstore.VersionMapping;
import org.apache.isis.extensions.sql.objectstore.mapping.FieldMapping;
import org.apache.isis.extensions.sql.objectstore.mapping.ObjectReferenceMapping;
-import org.apache.isis.runtime.persistence.PersistorUtil;
import org.apache.log4j.Logger;
public class CombinedCollectionMapper extends AbstractAutoMapper implements CollectionMapper {
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/ReversedAutoAssociationMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/ReversedAutoAssociationMapper.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/ReversedAutoAssociationMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/ReversedAutoAssociationMapper.java Tue Nov 16 14:11:21 2010
@@ -31,6 +31,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.version.SerialNumberVersion;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.runtime.persistence.PersistorUtil;
import org.apache.isis.extensions.sql.objectstore.CollectionMapper;
import org.apache.isis.extensions.sql.objectstore.DatabaseConnector;
import org.apache.isis.extensions.sql.objectstore.FieldMappingLookup;
@@ -39,7 +40,6 @@ import org.apache.isis.extensions.sql.ob
import org.apache.isis.extensions.sql.objectstore.VersionMapping;
import org.apache.isis.extensions.sql.objectstore.mapping.FieldMapping;
import org.apache.isis.extensions.sql.objectstore.mapping.ObjectReferenceMapping;
-import org.apache.isis.runtime.persistence.PersistorUtil;
import org.apache.log4j.Logger;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/runtime/testsystem/TestProxySystemIII.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/runtime/testsystem/TestProxySystemIII.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/runtime/testsystem/TestProxySystemIII.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/runtime/testsystem/TestProxySystemIII.java Tue Nov 16 14:11:21 2010
@@ -37,16 +37,16 @@ import org.apache.isis.core.runtime.auth
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.runtime.context.IsisContextStatic;
import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.persistence.internal.RuntimeContextFromSession;
+import org.apache.isis.core.runtime.persistence.objectstore.ObjectStorePersistenceMechanismInstallerAbstract;
+import org.apache.isis.core.runtime.session.IsisSessionFactoryDefault;
+import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
import org.apache.isis.defaults.progmodel.JavaReflectorInstaller;
import org.apache.isis.extensions.sql.objectstore.SqlPersistorInstaller;
import org.apache.isis.extensions.xml.objectstore.XmlPersistenceMechanismInstaller;
import org.apache.isis.runtime.objectstore.inmemory.InMemoryPersistenceMechanismInstaller;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtime.persistence.internal.RuntimeContextFromSession;
-import org.apache.isis.runtime.persistence.objectstore.ObjectStorePersistenceMechanismInstallerAbstract;
-import org.apache.isis.runtime.session.IsisSessionFactoryDefault;
-import org.apache.isis.runtime.system.DeploymentType;
/*
* TODO allow to be created with specific requirements for components being set up rather than using mocks.
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/XmlObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/XmlObjectStore.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/XmlObjectStore.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/XmlObjectStore.java Tue Nov 16 14:11:21 2010
@@ -40,6 +40,18 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.PersistorUtil;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
+import org.apache.isis.core.runtime.persistence.objectstore.ObjectStore;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObjectCommand;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryBuiltIn;
import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
import org.apache.isis.extensions.xml.objectstore.internal.clock.Clock;
import org.apache.isis.extensions.xml.objectstore.internal.commands.XmlCreateObjectCommand;
@@ -56,18 +68,6 @@ import org.apache.isis.extensions.xml.ob
import org.apache.isis.extensions.xml.objectstore.internal.services.ServiceManager;
import org.apache.isis.extensions.xml.objectstore.internal.services.xml.XmlServiceManager;
import org.apache.isis.extensions.xml.objectstore.internal.version.FileVersion;
-import org.apache.isis.runtime.persistence.ObjectNotFoundException;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.PersistorUtil;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
-import org.apache.isis.runtime.persistence.objectstore.ObjectStore;
-import org.apache.isis.runtime.persistence.objectstore.transaction.CreateObjectCommand;
-import org.apache.isis.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
-import org.apache.isis.runtime.persistence.objectstore.transaction.SaveObjectCommand;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
-import org.apache.isis.runtime.persistence.query.PersistenceQuery;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryBuiltIn;
public class XmlObjectStore implements ObjectStore {
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/XmlPersistenceMechanismInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/XmlPersistenceMechanismInstaller.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/XmlPersistenceMechanismInstaller.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/XmlPersistenceMechanismInstaller.java Tue Nov 16 14:11:21 2010
@@ -22,17 +22,17 @@ package org.apache.isis.extensions.xml.o
import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.persistence.adapterfactory.AdapterFactory;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManagerExtended;
+import org.apache.isis.core.runtime.persistence.objectstore.ObjectStore;
+import org.apache.isis.core.runtime.persistence.objectstore.ObjectStorePersistenceMechanismInstallerAbstract;
+import org.apache.isis.core.runtime.persistence.oidgenerator.OidGenerator;
+import org.apache.isis.core.runtime.persistence.oidgenerator.timebased.TimeBasedOidGenerator;
+import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.extensions.xml.objectstore.internal.adapter.XmlAdapterManager;
import org.apache.isis.extensions.xml.objectstore.internal.clock.DefaultClock;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerExtended;
-import org.apache.isis.runtime.persistence.objectstore.ObjectStore;
-import org.apache.isis.runtime.persistence.objectstore.ObjectStorePersistenceMechanismInstallerAbstract;
-import org.apache.isis.runtime.persistence.oidgenerator.OidGenerator;
-import org.apache.isis.runtime.persistence.oidgenerator.timebased.TimeBasedOidGenerator;
-import org.apache.isis.runtime.system.DeploymentType;
public class XmlPersistenceMechanismInstaller extends ObjectStorePersistenceMechanismInstallerAbstract {
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/XmlPersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/XmlPersistenceSessionFactory.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/XmlPersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/XmlPersistenceSessionFactory.java Tue Nov 16 14:11:21 2010
@@ -20,9 +20,9 @@
package org.apache.isis.extensions.xml.objectstore;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactoryDelegate;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactoryDelegating;
-import org.apache.isis.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegate;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating;
+import org.apache.isis.core.runtime.system.DeploymentType;
public class XmlPersistenceSessionFactory extends PersistenceSessionFactoryDelegating {
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/adapter/XmlAdapterManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/adapter/XmlAdapterManager.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/adapter/XmlAdapterManager.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/adapter/XmlAdapterManager.java Tue Nov 16 14:11:21 2010
@@ -23,7 +23,7 @@ package org.apache.isis.extensions.xml.o
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.spec.identifier.Identified;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerDefault;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManagerDefault;
public class XmlAdapterManager extends AdapterManagerDefault {
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/commands/AbstractXmlPersistenceCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/commands/AbstractXmlPersistenceCommand.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/commands/AbstractXmlPersistenceCommand.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/commands/AbstractXmlPersistenceCommand.java Tue Nov 16 14:11:21 2010
@@ -25,11 +25,11 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandAbstract;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.extensions.xml.objectstore.internal.data.DataManager;
import org.apache.isis.extensions.xml.objectstore.internal.data.ObjectData;
import org.apache.isis.extensions.xml.objectstore.internal.version.FileVersion;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandAbstract;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
abstract class AbstractXmlPersistenceCommand extends PersistenceCommandAbstract {
private static final Logger LOG = Logger.getLogger(AbstractXmlPersistenceCommand.class);
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/commands/XmlCreateObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/commands/XmlCreateObjectCommand.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/commands/XmlCreateObjectCommand.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/commands/XmlCreateObjectCommand.java Tue Nov 16 14:11:21 2010
@@ -22,12 +22,12 @@ package org.apache.isis.extensions.xml.o
import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
import org.apache.isis.extensions.xml.objectstore.internal.data.DataManager;
import org.apache.isis.extensions.xml.objectstore.internal.data.ObjectData;
import org.apache.isis.extensions.xml.objectstore.internal.version.FileVersion;
-import org.apache.isis.runtime.persistence.objectstore.transaction.CreateObjectCommand;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
public final class XmlCreateObjectCommand extends AbstractXmlPersistenceCommand implements CreateObjectCommand {
private static final Logger LOG = Logger.getLogger(XmlCreateObjectCommand.class);
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/commands/XmlDestroyObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/commands/XmlDestroyObjectCommand.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/commands/XmlDestroyObjectCommand.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/commands/XmlDestroyObjectCommand.java Tue Nov 16 14:11:21 2010
@@ -22,11 +22,11 @@ package org.apache.isis.extensions.xml.o
import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
import org.apache.isis.extensions.xml.objectstore.internal.data.DataManager;
-import org.apache.isis.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
public final class XmlDestroyObjectCommand extends AbstractXmlPersistenceCommand implements DestroyObjectCommand {
private static final Logger LOG = Logger.getLogger(XmlDestroyObjectCommand.class);
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/commands/XmlUpdateObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/commands/XmlUpdateObjectCommand.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/commands/XmlUpdateObjectCommand.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/commands/XmlUpdateObjectCommand.java Tue Nov 16 14:11:21 2010
@@ -22,12 +22,12 @@ package org.apache.isis.extensions.xml.o
import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObjectCommand;
import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
import org.apache.isis.extensions.xml.objectstore.internal.data.Data;
import org.apache.isis.extensions.xml.objectstore.internal.data.DataManager;
import org.apache.isis.extensions.xml.objectstore.internal.version.FileVersion;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
-import org.apache.isis.runtime.persistence.objectstore.transaction.SaveObjectCommand;
public final class XmlUpdateObjectCommand
extends AbstractXmlPersistenceCommand
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/CollectionData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/CollectionData.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/CollectionData.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/CollectionData.java Tue Nov 16 14:11:21 2010
@@ -21,8 +21,8 @@
package org.apache.isis.extensions.xml.objectstore.internal.data;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.extensions.xml.objectstore.internal.version.FileVersion;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
/**
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/Data.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/Data.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/Data.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/Data.java Tue Nov 16 14:11:21 2010
@@ -21,8 +21,8 @@
package org.apache.isis.extensions.xml.objectstore.internal.data;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.extensions.xml.objectstore.internal.version.FileVersion;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
public abstract class Data {
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/DataManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/DataManager.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/DataManager.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/DataManager.java Tue Nov 16 14:11:21 2010
@@ -20,9 +20,9 @@
package org.apache.isis.extensions.xml.objectstore.internal.data;
+import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
-import org.apache.isis.runtime.persistence.ObjectNotFoundException;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
public interface DataManager {
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/ObjectData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/ObjectData.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/ObjectData.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/ObjectData.java Tue Nov 16 14:11:21 2010
@@ -28,8 +28,8 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.extensions.xml.objectstore.internal.version.FileVersion;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
/**
* A logical collection of elements of a specified type
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/ReferenceVector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/ReferenceVector.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/ReferenceVector.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/ReferenceVector.java Tue Nov 16 14:11:21 2010
@@ -23,7 +23,7 @@ package org.apache.isis.extensions.xml.o
import java.util.Vector;
import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
public class ReferenceVector {
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManager.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManager.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManager.java Tue Nov 16 14:11:21 2010
@@ -28,6 +28,8 @@ import org.apache.isis.core.commons.ensu
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
import org.apache.isis.extensions.xml.objectstore.internal.data.CollectionData;
import org.apache.isis.extensions.xml.objectstore.internal.data.Data;
@@ -37,8 +39,6 @@ import org.apache.isis.extensions.xml.ob
import org.apache.isis.extensions.xml.objectstore.internal.data.PersistorException;
import org.apache.isis.extensions.xml.objectstore.internal.data.ReferenceVector;
import org.apache.isis.extensions.xml.objectstore.internal.version.FileVersion;
-import org.apache.isis.runtime.persistence.ObjectNotFoundException;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/services/xml/XmlServiceManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/services/xml/XmlServiceManager.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/services/xml/XmlServiceManager.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/objectstore/internal/services/xml/XmlServiceManager.java Tue Nov 16 14:11:21 2010
@@ -27,10 +27,10 @@ import java.util.Vector;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.extensions.xml.objectstore.internal.data.xml.ContentWriter;
import org.apache.isis.extensions.xml.objectstore.internal.data.xml.XmlFile;
import org.apache.isis.extensions.xml.objectstore.internal.services.ServiceManager;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/profilestore/UserProfileContentWriter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/profilestore/UserProfileContentWriter.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/profilestore/UserProfileContentWriter.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/profilestore/UserProfileContentWriter.java Tue Nov 16 14:11:21 2010
@@ -30,12 +30,12 @@ import org.apache.commons.lang.StringUti
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.encoding.DataOutputStreamExtended;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.services.ServiceUtil;
import org.apache.isis.core.runtime.userprofile.Options;
import org.apache.isis.core.runtime.userprofile.PerspectiveEntry;
import org.apache.isis.core.runtime.userprofile.UserProfile;
import org.apache.isis.extensions.xml.objectstore.internal.data.xml.ContentWriter;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.services.ServiceUtil;
public class UserProfileContentWriter implements ContentWriter {
private final UserProfile userProfile;
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/profilestore/UserProfileDataHandler.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/profilestore/UserProfileDataHandler.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/profilestore/UserProfileDataHandler.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/extensions/xml/profilestore/UserProfileDataHandler.java Tue Nov 16 14:11:21 2010
@@ -24,10 +24,10 @@ import java.util.List;
import java.util.Stack;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.services.ServiceUtil;
import org.apache.isis.core.runtime.userprofile.Options;
import org.apache.isis.core.runtime.userprofile.PerspectiveEntry;
import org.apache.isis.core.runtime.userprofile.UserProfile;
-import org.apache.isis.runtime.persistence.services.ServiceUtil;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/ObjectStorePersistenceHelper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/ObjectStorePersistenceHelper.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/ObjectStorePersistenceHelper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/ObjectStorePersistenceHelper.java Tue Nov 16 14:11:21 2010
@@ -23,7 +23,7 @@ package org.apache.isis.extensions.xml.o
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryBuiltIn;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryBuiltIn;
public class ObjectStorePersistenceHelper implements PersistenceQueryBuiltIn {
ObjectSpecification specification = null;