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 [9/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/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategyAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategyAbstract.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategyAbstract.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategyAbstract.java Tue Nov 16 14:11:21 2010
@@ -28,8 +28,8 @@ import javax.servlet.http.HttpSession;
import org.apache.isis.applib.fixtures.LogonFixture;
import org.apache.isis.core.runtime.authentication.standard.fixture.AuthenticationRequestLogonFixture;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.webapp.WebAppConstants;
-import org.apache.isis.runtime.system.IsisSystem;
public abstract class AuthenticationSessionLookupStrategyAbstract implements
AuthenticationSessionLookupStrategy {
Modified: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategyDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategyDefault.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategyDefault.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategyDefault.java Tue Nov 16 14:11:21 2010
@@ -30,8 +30,8 @@ import org.apache.isis.core.runtime.auth
import org.apache.isis.core.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
import org.apache.isis.core.runtime.authentication.standard.fixture.AuthenticationRequestLogonFixture;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.webapp.WebAppConstants;
-import org.apache.isis.runtime.system.IsisSystem;
/**
* Looks up from the {@link HttpSession}, failing that attempts to logon using a {@link LogonFixture} (if available and
Modified: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/monitor/MonitorServlet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/monitor/MonitorServlet.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/monitor/MonitorServlet.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/monitor/MonitorServlet.java Tue Nov 16 14:11:21 2010
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.isis.runtime.system.internal.monitor.MonitorListenerImpl;
+import org.apache.isis.core.runtime.system.internal.monitor.MonitorListenerImpl;
public class MonitorServlet extends HttpServlet {
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerDeploymentTypeWebServer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerDeploymentTypeWebServer.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerDeploymentTypeWebServer.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerDeploymentTypeWebServer.java Tue Nov 16 14:11:21 2010
@@ -25,7 +25,7 @@ import static org.apache.isis.core.runti
import static org.apache.isis.core.runtime.runner.Constants.TYPE_SERVER_PROTOTYPE;
import org.apache.isis.core.runtime.options.standard.OptionHandlerDeploymentType;
-import org.apache.isis.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.DeploymentType;
public class OptionHandlerDeploymentTypeWebServer extends OptionHandlerDeploymentType {
Modified: incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/CglibObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/CglibObjectFactory.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/CglibObjectFactory.java (original)
+++ incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/CglibObjectFactory.java Tue Nov 16 14:11:21 2010
@@ -21,11 +21,11 @@ package org.apache.isis.bytecode.cglib.p
import org.apache.isis.bytecode.cglib.persistence.objectfactory.internal.ObjectResolveAndObjectChangedEnhancer;
import org.apache.isis.core.metamodel.runtimecontext.ObjectInstantiationException;
-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.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 CglibObjectFactory extends ObjectFactoryAbstract {
Modified: incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java (original)
+++ incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java Tue Nov 16 14:11:21 2010
@@ -37,8 +37,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/defaults/bytecode/src/test/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ClassEnhancerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/bytecode/src/test/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ClassEnhancerTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/src/test/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ClassEnhancerTest.java (original)
+++ incubator/isis/trunk/defaults/bytecode/src/test/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ClassEnhancerTest.java Tue Nov 16 14:11:21 2010
@@ -38,8 +38,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.bytecode.cglib.persistence.objectfactory.internal.ObjectResolveAndObjectChangedEnhancer;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-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;
@RunWith(JMock.class)
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java Tue Nov 16 14:11:21 2010
@@ -37,6 +37,20 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
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.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionHydrator;
+import org.apache.isis.core.runtime.persistence.PersistorUtil;
+import org.apache.isis.core.runtime.persistence.UnsupportedFindException;
+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.query.PersistenceQuery;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryBuiltIn;
import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStoreInstances;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
@@ -44,20 +58,6 @@ import org.apache.isis.runtime.objectsto
import org.apache.isis.runtime.objectstore.inmemory.internal.commands.InMemoryCreateObjectCommand;
import org.apache.isis.runtime.objectstore.inmemory.internal.commands.InMemoryDestroyObjectCommand;
import org.apache.isis.runtime.objectstore.inmemory.internal.commands.InMemorySaveObjectCommand;
-import org.apache.isis.runtime.persistence.ObjectNotFoundException;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtime.persistence.PersistenceSessionHydrator;
-import org.apache.isis.runtime.persistence.PersistorUtil;
-import org.apache.isis.runtime.persistence.UnsupportedFindException;
-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.query.PersistenceQuery;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryBuiltIn;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryPersistenceMechanismInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryPersistenceMechanismInstaller.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryPersistenceMechanismInstaller.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryPersistenceMechanismInstaller.java Tue Nov 16 14:11:21 2010
@@ -21,12 +21,12 @@
package org.apache.isis.runtime.objectstore.inmemory;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-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.system.DeploymentType;
+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.system.DeploymentType;
/**
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryPersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryPersistenceSessionFactory.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryPersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryPersistenceSessionFactory.java Tue Nov 16 14:11:21 2010
@@ -20,15 +20,15 @@
package org.apache.isis.runtime.objectstore.inmemory;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegate;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating;
+import org.apache.isis.core.runtime.persistence.oidgenerator.OidGenerator;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SimpleOidGenerator;
+import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStoreInstances;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjectsDefault;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactoryDelegate;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactoryDelegating;
-import org.apache.isis.runtime.persistence.oidgenerator.OidGenerator;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SimpleOidGenerator;
-import org.apache.isis.runtime.system.DeploymentType;
public class InMemoryPersistenceSessionFactory extends PersistenceSessionFactoryDelegating {
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances.java Tue Nov 16 14:11:21 2010
@@ -38,12 +38,12 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionHydrator;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryBuiltIn;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByTitle;
import org.apache.isis.runtime.objectstore.inmemory.InMemoryObjectStore;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.PersistenceSessionHydrator;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryBuiltIn;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindByTitle;
/*
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjects.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjects.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjects.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjects.java Tue Nov 16 14:11:21 2010
@@ -22,7 +22,7 @@ package org.apache.isis.runtime.objectst
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SimpleOidGenerator.Memento;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SimpleOidGenerator.Memento;
/**
* Represents the persisted objects.
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault.java Tue Nov 16 14:11:21 2010
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SimpleOidGenerator.Memento;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SimpleOidGenerator.Memento;
/**
* Represents the persisted objects.
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/AbstractInMemoryPersistenceCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/AbstractInMemoryPersistenceCommand.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/AbstractInMemoryPersistenceCommand.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/AbstractInMemoryPersistenceCommand.java Tue Nov 16 14:11:21 2010
@@ -23,10 +23,10 @@ package org.apache.isis.runtime.objectst
import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandAbstract;
import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStoreInstances;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandAbstract;
public abstract class AbstractInMemoryPersistenceCommand extends PersistenceCommandAbstract {
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryCreateObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryCreateObjectCommand.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryCreateObjectCommand.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryCreateObjectCommand.java Tue Nov 16 14:11:21 2010
@@ -22,10 +22,10 @@ package org.apache.isis.runtime.objectst
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.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
-import org.apache.isis.runtime.persistence.objectstore.transaction.CreateObjectCommand;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
public final class InMemoryCreateObjectCommand extends AbstractInMemoryPersistenceCommand implements
CreateObjectCommand {
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryDestroyObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryDestroyObjectCommand.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryDestroyObjectCommand.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryDestroyObjectCommand.java Tue Nov 16 14:11:21 2010
@@ -22,10 +22,10 @@ package org.apache.isis.runtime.objectst
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.transaction.ObjectPersistenceException;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
-import org.apache.isis.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
public final class InMemoryDestroyObjectCommand
extends AbstractInMemoryPersistenceCommand
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemorySaveObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemorySaveObjectCommand.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemorySaveObjectCommand.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemorySaveObjectCommand.java Tue Nov 16 14:11:21 2010
@@ -22,10 +22,10 @@ package org.apache.isis.runtime.objectst
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.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
-import org.apache.isis.runtime.persistence.objectstore.transaction.SaveObjectCommand;
public final class InMemorySaveObjectCommand
extends AbstractInMemoryPersistenceCommand
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistorTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistorTest.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistorTest.java Tue Nov 16 14:11:21 2010
@@ -37,8 +37,8 @@ import junit.framework.Assert;
import org.apache.isis.core.runtime.fixture.ObjectFixtureFilePersistor;
import org.apache.isis.core.runtime.fixturesinstaller.FixtureException;
-import org.apache.isis.runtime.testdomain.Movie;
-import org.apache.isis.runtime.testdomain.Person;
+import org.apache.isis.core.runtime.testdomain.Movie;
+import org.apache.isis.core.runtime.testdomain.Person;
import org.apache.isis.runtime.testsystem.TestProxySystemII;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java Tue Nov 16 14:11:21 2010
@@ -31,9 +31,9 @@ import junit.framework.Assert;
import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.core.runtime.fixture.ObjectFixtureService;
-import org.apache.isis.runtime.testdomain.Movie;
-import org.apache.isis.runtime.testdomain.Person;
-import org.apache.isis.runtime.testdomain.Role;
+import org.apache.isis.core.runtime.testdomain.Movie;
+import org.apache.isis.core.runtime.testdomain.Person;
+import org.apache.isis.core.runtime.testdomain.Role;
import org.apache.isis.runtime.testsystem.TestProxySystemII;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/AbstractInMemoryObjectStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/AbstractInMemoryObjectStoreTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/AbstractInMemoryObjectStoreTest.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/AbstractInMemoryObjectStoreTest.java Tue Nov 16 14:11:21 2010
@@ -24,8 +24,8 @@ import java.util.Collections;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
-import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
+import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
public abstract class AbstractInMemoryObjectStoreTest extends ProxyJunit3TestCase {
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_debug.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_debug.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_debug.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_debug.java Tue Nov 16 14:11:21 2010
@@ -24,9 +24,9 @@ import java.util.Collections;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.runtime.persistence.objectstore.transaction.CreateObjectCommand;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
-import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
+import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
public class InMemoryObjectStore_debug extends ProxyJunit3TestCase {
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_init.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_init.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_init.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_init.java Tue Nov 16 14:11:21 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.objectstore.inmemory;
-import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
+import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
public class InMemoryObjectStore_init extends ProxyJunit3TestCase {
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_interactionWithAdapterManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_interactionWithAdapterManager.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_interactionWithAdapterManager.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_interactionWithAdapterManager.java Tue Nov 16 14:11:21 2010
@@ -22,9 +22,9 @@ package org.apache.isis.runtime.objectst
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.persistence.ObjectNotFoundException;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindAllInstances;
-import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
+import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindAllInstances;
+import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
public class InMemoryObjectStore_interactionWithAdapterManager extends ProxyJunit3TestCase {
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_name.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_name.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_name.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_name.java Tue Nov 16 14:11:21 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.objectstore.inmemory;
-import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
+import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
public class InMemoryObjectStore_name extends ProxyJunit3TestCase {
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_openAndClose.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_openAndClose.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_openAndClose.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_openAndClose.java Tue Nov 16 14:11:21 2010
@@ -33,8 +33,8 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
-import org.apache.isis.runtime.persistence.PersistenceSession;
/**
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_persist.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_persist.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_persist.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_persist.java Tue Nov 16 14:11:21 2010
@@ -24,9 +24,9 @@ import java.util.Collections;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindByTitle;
-import org.apache.isis.runtime.testsystem.TestProxyAdapter;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByTitle;
+import org.apache.isis.core.runtime.testsystem.TestProxyAdapter;
public class InMemoryObjectStore_persist extends AbstractInMemoryObjectStoreTest {
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_retrieve.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_retrieve.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_retrieve.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_retrieve.java Tue Nov 16 14:11:21 2010
@@ -23,11 +23,11 @@ package org.apache.isis.runtime.objectst
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.persistence.ObjectNotFoundException;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindAllInstances;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindByTitle;
-import org.apache.isis.runtime.testsystem.TestPojo;
-import org.apache.isis.runtime.testsystem.TestProxyOid;
+import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindAllInstances;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByTitle;
+import org.apache.isis.core.runtime.testsystem.TestPojo;
+import org.apache.isis.core.runtime.testsystem.TestProxyOid;
public class InMemoryObjectStore_retrieve extends AbstractInMemoryObjectStoreTest {
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_serviceRegistry.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_serviceRegistry.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_serviceRegistry.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_serviceRegistry.java Tue Nov 16 14:11:21 2010
@@ -22,7 +22,7 @@ package org.apache.isis.runtime.objectst
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.runtime.testsystem.TestProxyOid;
+import org.apache.isis.core.runtime.testsystem.TestProxyOid;
public class InMemoryObjectStore_serviceRegistry extends AbstractInMemoryObjectStoreTest {
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_findInstancesAndAdd.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_findInstancesAndAdd.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_findInstancesAndAdd.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_findInstancesAndAdd.java Tue Nov 16 14:11:21 2010
@@ -33,7 +33,7 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryBuiltIn;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryBuiltIn;
import com.google.common.collect.Lists;
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault_savesOidGeneratorAsMemento.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault_savesOidGeneratorAsMemento.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault_savesOidGeneratorAsMemento.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault_savesOidGeneratorAsMemento.java Tue Nov 16 14:11:21 2010
@@ -29,8 +29,8 @@ import org.jmock.integration.junit4.JUni
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SimpleOidGenerator;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SimpleOidGenerator.Memento;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SimpleOidGenerator;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SimpleOidGenerator.Memento;
public class ObjectStorePersistedObjectsDefault_savesOidGeneratorAsMemento {
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java Tue Nov 16 14:11:21 2010
@@ -36,13 +36,13 @@ 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.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.runtime.objectstore.inmemory.InMemoryPersistenceMechanismInstaller;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtime.persistence.internal.RuntimeContextFromSession;
-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/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java Tue Nov 16 14:11:21 2010
@@ -39,15 +39,15 @@ import org.apache.isis.core.runtime.auth
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
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.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactoryDefault;
+import org.apache.isis.core.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.testsystem.TestClassSubstitutor;
import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
import org.apache.isis.defaults.progmodel.JavaReflector;
import org.apache.isis.defaults.progmodel.ProgrammingModelFacetsJava5;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtime.persistence.internal.RuntimeContextFromSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
-import org.apache.isis.runtime.session.IsisSessionFactoryDefault;
-import org.apache.isis.runtime.system.DeploymentType;
-import org.apache.isis.runtime.testsystem.TestClassSubstitutor;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.jmock.Expectations;
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ArrayTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ArrayTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ArrayTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ArrayTest.java Tue Nov 16 14:11:21 2010
@@ -26,8 +26,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.testsystem.TestPojo;
import org.apache.isis.defaults.progmodel.JavaReflector;
-import org.apache.isis.runtime.testsystem.TestPojo;
public class JavaReflector_ArrayTest extends JavaReflectorTestAbstract {
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ObjectTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ObjectTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ObjectTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ObjectTest.java Tue Nov 16 14:11:21 2010
@@ -32,8 +32,8 @@ import org.apache.isis.core.progmodel.fa
import org.apache.isis.core.progmodel.facets.object.ident.title.TitleFacet;
import org.apache.isis.core.progmodel.facets.object.notpersistable.NotPersistableFacet;
import org.apache.isis.core.progmodel.facets.object.validprops.ObjectValidPropertiesFacet;
+import org.apache.isis.core.runtime.system.TestDomainObject;
import org.apache.isis.defaults.progmodel.JavaReflector;
-import org.apache.isis.runtime.system.TestDomainObject;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java Tue Nov 16 14:11:21 2010
@@ -19,15 +19,15 @@ import org.apache.isis.core.runtime.cont
import org.apache.isis.core.runtime.fixturesinstaller.FixturesInstallerNoop;
import org.apache.isis.core.runtime.installers.InstallerLookup;
import org.apache.isis.core.runtime.installers.InstallerLookupDefault;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.isis.core.runtime.runner.IsisModule;
+import org.apache.isis.core.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.IsisSystem;
+import org.apache.isis.core.runtime.system.SystemConstants;
+import org.apache.isis.core.runtime.system.internal.InitialisationSession;
import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
import org.apache.isis.core.runtime.userprofile.inmemory.InMemoryUserProfileStoreInstaller;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
-import org.apache.isis.runtime.system.DeploymentType;
-import org.apache.isis.runtime.system.IsisSystem;
-import org.apache.isis.runtime.system.SystemConstants;
-import org.apache.isis.runtime.system.internal.InitialisationSession;
import org.apache.isis.viewer.bdd.common.components.StoryAuthenticationManagerInstaller;
import org.apache.isis.viewer.bdd.common.components.StoryInMemoryPersistenceMechanismInstaller;
import org.apache.isis.viewer.bdd.common.story.bootstrapping.OpenSession;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java Tue Nov 16 14:11:21 2010
@@ -2,11 +2,11 @@ package org.apache.isis.viewer.bdd.commo
import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
import org.apache.isis.core.runtime.installers.InstallerLookup;
+import org.apache.isis.core.runtime.persistence.PersistenceMechanismInstaller;
+import org.apache.isis.core.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.installers.IsisSystemUsingInstallers;
import org.apache.isis.core.runtime.userprofile.UserProfileStoreInstaller;
import org.apache.isis.core.runtime.userprofile.inmemory.InMemoryUserProfileStoreInstaller;
-import org.apache.isis.runtime.persistence.PersistenceMechanismInstaller;
-import org.apache.isis.runtime.system.DeploymentType;
-import org.apache.isis.runtime.system.installers.IsisSystemUsingInstallers;
public class IsisSystemUsingInstallersWithinStory extends
IsisSystemUsingInstallers {
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceMechanismInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceMechanismInstaller.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceMechanismInstaller.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceMechanismInstaller.java Tue Nov 16 14:11:21 2010
@@ -1,8 +1,8 @@
package org.apache.isis.viewer.bdd.common.components;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.runtime.objectstore.inmemory.InMemoryPersistenceMechanismInstaller;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtime.system.DeploymentType;
public class StoryInMemoryPersistenceMechanismInstaller extends
InMemoryPersistenceMechanismInstaller {
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceSessionFactory.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceSessionFactory.java Tue Nov 16 14:11:21 2010
@@ -2,10 +2,10 @@ package org.apache.isis.viewer.bdd.commo
import org.apache.isis.core.metamodel.facets.object.cached.CachedFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegate;
+import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.runtime.objectstore.inmemory.InMemoryPersistenceSessionFactory;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactoryDelegate;
-import org.apache.isis.runtime.system.DeploymentType;
/**
* As per {@link InMemoryPersistenceSessionFactory}, but uses the
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryObjectStorePersistedObjects.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryObjectStorePersistedObjects.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryObjectStorePersistedObjects.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryObjectStorePersistedObjects.java Tue Nov 16 14:11:21 2010
@@ -7,9 +7,9 @@ import org.apache.isis.core.commons.exce
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.facets.object.cached.CachedFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SimpleOidGenerator.Memento;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStoreInstances;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SimpleOidGenerator.Memento;
import com.google.common.collect.Iterables;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java Tue Nov 16 14:11:21 2010
@@ -6,11 +6,11 @@ import java.util.List;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
+import org.apache.isis.core.runtime.persistence.objectstore.ObjectStorePersistence;
+import org.apache.isis.core.runtime.persistence.objectstore.PersistenceSessionObjectStore;
import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
-import org.apache.isis.runtime.persistence.objectstore.ObjectStorePersistence;
-import org.apache.isis.runtime.persistence.objectstore.PersistenceSessionObjectStore;
import org.apache.isis.viewer.bdd.common.AliasRegistry;
import org.apache.isis.viewer.bdd.common.CellBinding;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugObjectStorePeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugObjectStorePeer.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugObjectStorePeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugObjectStorePeer.java Tue Nov 16 14:11:21 2010
@@ -1,7 +1,7 @@
package org.apache.isis.viewer.bdd.common.fixtures;
import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.runtime.persistence.objectstore.ObjectStorePersistence;
+import org.apache.isis.core.runtime.persistence.objectstore.ObjectStorePersistence;
import org.apache.isis.viewer.bdd.common.AliasRegistry;
import org.apache.isis.viewer.bdd.common.CellBinding;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/ShutdownNakedObjects.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/ShutdownNakedObjects.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/ShutdownNakedObjects.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/ShutdownNakedObjects.java Tue Nov 16 14:11:21 2010
@@ -1,7 +1,7 @@
package org.apache.isis.viewer.bdd.common.story.bootstrapping;
import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.runtime.system.IsisSystem;
+import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.viewer.bdd.common.Story;
public class ShutdownNakedObjects extends AbstractHelper {
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/registries/AliasRegistryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/registries/AliasRegistryDefault.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/registries/AliasRegistryDefault.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/registries/AliasRegistryDefault.java Tue Nov 16 14:11:21 2010
@@ -11,7 +11,7 @@ import java.util.TreeMap;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.runtime.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
import org.apache.isis.viewer.bdd.common.AliasRegistry;
import org.apache.isis.viewer.bdd.common.StoryValueException;
Modified: incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionTest.java (original)
+++ incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionTest.java Tue Nov 16 14:11:21 2010
@@ -12,7 +12,7 @@ import java.util.Date;
import java.util.List;
import org.apache.isis.core.commons.io.IoUtils;
-import org.apache.isis.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.viewer.bdd.common.Story;
import org.apache.isis.viewer.bdd.common.StoryValueException;
import org.apache.isis.viewer.bdd.common.fixtures.SetUpObjectsPeer.Mode;
Modified: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/StoryFixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/StoryFixture.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/StoryFixture.java (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/StoryFixture.java Tue Nov 16 14:11:21 2010
@@ -13,7 +13,7 @@ import net.sf.isiscontrib.bdd.fitnesse.i
import net.sf.isiscontrib.bdd.fitnesse.internal.fixtures.SetUpObjectsForFitNesse;
import net.sf.isiscontrib.bdd.fitnesse.internal.fixtures.UsingIsisViewerForFitNesse;
-import org.apache.isis.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.viewer.bdd.common.Story;
import org.apache.isis.viewer.bdd.common.StoryValueException;
import org.apache.isis.viewer.bdd.common.fixtures.CheckListPeer.CheckMode;
Modified: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java Tue Nov 16 14:11:21 2010
@@ -9,7 +9,7 @@ import net.sf.isiscontrib.bdd.fitnesse.i
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.bdd.common.AliasRegistry;
public class CheckSpecificationsLoadedForFitNesse extends AbstractSubsetFixture {
Modified: incubator/isis/trunk/viewer/bdd/src/docbkx/guide/isis-bdd-viewer.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/src/docbkx/guide/isis-bdd-viewer.xml?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/src/docbkx/guide/isis-bdd-viewer.xml (original)
+++ incubator/isis/trunk/viewer/bdd/src/docbkx/guide/isis-bdd-viewer.xml Tue Nov 16 14:11:21 2010
@@ -958,7 +958,7 @@ Isis system <span concordion:assertTr
<tbody>
<row>
- <entry><classname>yDate Is</classname></entry>
+ <entry><classname>Date Is</classname></entry>
<entry><emphasis>date and time</emphasis></entry>
</row>
@@ -1060,42 +1060,51 @@ Isis system <span concordion:assertTr
<th concordion:assertTrue="#result"/>
</tr>
<tr>
- <td>org.apache.isis.support.prototype.objstore.dflt.claim.ClaimRepositoryInMemory</td>
+ <td>com.mycompany.myapp.objstore.dflt.claim.ClaimRepositoryDefault</td>
<td>claims</td>
<td>ok</td>
</tr>
<tr>
- <td>org.apache.isis.support.prototype.objstore.dflt.employee.EmployeeRepositoryInMemory</td>
+ <td>com.mycompany.myapp.objstore.dflt.employee.EmployeeRepositoryDefault</td>
<td>employees</td>
<td>ok</td>
</tr>
</table></programlisting></para>
-
- <para></para>
</sect3>
<sect3>
<title>FitNesse</title>
- <para></para>
-
- <para></para>
-
- <informaltable>
- <tgroup cols="2">
- <colspec />
-
- <tbody>
- <row>
- <entry><classname>Time Is Now</classname></entry>
-
- <entry><emphasis>date and time</emphasis></entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
-
- <para></para>
+ <para>The FitNesse integration provides an implementation of a
+ <classname>ColumnFixture</classname>, which is used as
+ follows:</para>
+
+ <para><informaltable>
+ <tgroup cols="2">
+ <colspec colname="_1" />
+
+ <colspec colname="_2" />
+
+ <tbody>
+ <row>
+ <entry nameend="_2" namest="_1"><classname>Alias
+ Services</classname></entry>
+ </row>
+
+ <row>
+ <entry><classname>class name</classname></entry>
+
+ <entry><classname>alias=</classname></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>com.mycompany.myapp.objstore.dflt.claim.ClaimRepositoryDefault</emphasis></entry>
+
+ <entry><emphasis>claims</emphasis></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable></para>
</sect3>
</sect2>
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/DebugOptions.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/DebugOptions.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/DebugOptions.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/DebugOptions.java Tue Nov 16 14:11:21 2010
@@ -27,6 +27,7 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.system.internal.monitor.SystemPrinter;
import org.apache.isis.extensions.dnd.drawing.Location;
import org.apache.isis.extensions.dnd.view.MenuOptions;
import org.apache.isis.extensions.dnd.view.Toolkit;
@@ -34,7 +35,6 @@ import org.apache.isis.extensions.dnd.vi
import org.apache.isis.extensions.dnd.view.View;
import org.apache.isis.extensions.dnd.view.Workspace;
import org.apache.isis.extensions.dnd.view.option.UserActionAbstract;
-import org.apache.isis.runtime.system.internal.monitor.SystemPrinter;
public class DebugOptions implements MenuOptions {
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/TextField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/TextField.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/TextField.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/TextField.java Tue Nov 16 14:11:21 2010
@@ -29,6 +29,7 @@ import org.apache.isis.core.commons.exce
import org.apache.isis.core.metamodel.adapter.InvalidEntryException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.runtime.persistence.ConcurrencyException;
import org.apache.isis.extensions.dnd.drawing.Canvas;
import org.apache.isis.extensions.dnd.drawing.Color;
import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
@@ -53,7 +54,6 @@ import org.apache.isis.extensions.dnd.vi
import org.apache.isis.extensions.dnd.view.text.TextBlockTarget;
import org.apache.isis.extensions.dnd.view.text.TextContent;
import org.apache.isis.extensions.dnd.view.text.TextSelection;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
public abstract class TextField extends TextParseableFieldAbstract implements TextBlockTarget {
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ObjectView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ObjectView.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ObjectView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ObjectView.java Tue Nov 16 14:11:21 2010
@@ -24,6 +24,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
import org.apache.isis.extensions.dnd.drawing.Location;
import org.apache.isis.extensions.dnd.drawing.Offset;
import org.apache.isis.extensions.dnd.interaction.ViewDragImpl;
@@ -39,7 +40,6 @@ import org.apache.isis.extensions.dnd.vi
import org.apache.isis.extensions.dnd.view.ViewSpecification;
import org.apache.isis.extensions.dnd.view.Workspace;
import org.apache.isis.extensions.dnd.view.option.UserActionAbstract;
-import org.apache.isis.runtime.persistence.PersistenceSession;
public abstract class ObjectView extends AbstractView {
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ViewUpdateNotifierImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ViewUpdateNotifierImpl.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ViewUpdateNotifierImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ViewUpdateNotifierImpl.java Tue Nov 16 14:11:21 2010
@@ -31,6 +31,8 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker;
import org.apache.isis.core.runtime.transaction.updatenotifier.UpdateNotifier;
import org.apache.isis.extensions.dnd.view.Content;
@@ -38,8 +40,6 @@ import org.apache.isis.extensions.dnd.vi
import org.apache.isis.extensions.dnd.view.View;
import org.apache.isis.extensions.dnd.view.ViewUpdateNotifier;
import org.apache.isis.extensions.dnd.view.collection.RootCollection;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
public class ViewUpdateNotifierImpl implements ViewUpdateNotifier {
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/border/SaveTransientObjectBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/border/SaveTransientObjectBorder.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/border/SaveTransientObjectBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/border/SaveTransientObjectBorder.java Tue Nov 16 14:11:21 2010
@@ -27,6 +27,7 @@ import org.apache.isis.core.metamodel.co
import org.apache.isis.core.metamodel.consent.Veto;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
import org.apache.isis.extensions.dnd.drawing.Location;
import org.apache.isis.extensions.dnd.view.ButtonAction;
import org.apache.isis.extensions.dnd.view.Content;
@@ -36,7 +37,6 @@ import org.apache.isis.extensions.dnd.vi
import org.apache.isis.extensions.dnd.view.content.FieldContent;
import org.apache.isis.extensions.dnd.view.content.RootObject;
import org.apache.isis.extensions.dnd.view.control.AbstractButtonAction;
-import org.apache.isis.runtime.persistence.PersistenceSession;
public class SaveTransientObjectBorder extends ButtonBorder {
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractObjectContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractObjectContent.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractObjectContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractObjectContent.java Tue Nov 16 14:11:21 2010
@@ -37,6 +37,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
import org.apache.isis.extensions.dnd.drawing.Image;
import org.apache.isis.extensions.dnd.drawing.ImageFactory;
import org.apache.isis.extensions.dnd.drawing.Location;
@@ -47,7 +48,6 @@ import org.apache.isis.extensions.dnd.vi
import org.apache.isis.extensions.dnd.view.View;
import org.apache.isis.extensions.dnd.view.Workspace;
import org.apache.isis.extensions.dnd.view.option.UserActionAbstract;
-import org.apache.isis.runtime.persistence.PersistenceSession;
public abstract class AbstractObjectContent extends AbstractContent implements ObjectContent {
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/message/ExceptionMessageContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/message/ExceptionMessageContent.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/message/ExceptionMessageContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/message/ExceptionMessageContent.java Tue Nov 16 14:11:21 2010
@@ -28,10 +28,10 @@ import org.apache.isis.core.metamodel.co
import org.apache.isis.core.metamodel.consent.Veto;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.util.NameUtils;
+import org.apache.isis.core.runtime.persistence.ConcurrencyException;
import org.apache.isis.extensions.dnd.drawing.Image;
import org.apache.isis.extensions.dnd.view.Content;
import org.apache.isis.extensions.dnd.view.UserActionSet;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
public class ExceptionMessageContent implements MessageContent {
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/option/DisposeObjectOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/option/DisposeObjectOption.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/option/DisposeObjectOption.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/option/DisposeObjectOption.java Tue Nov 16 14:11:21 2010
@@ -26,12 +26,12 @@ import org.apache.isis.core.metamodel.co
import org.apache.isis.core.metamodel.consent.Veto;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
import org.apache.isis.core.runtime.transaction.updatenotifier.UpdateNotifier;
import org.apache.isis.extensions.dnd.drawing.Location;
import org.apache.isis.extensions.dnd.view.ObjectContent;
import org.apache.isis.extensions.dnd.view.View;
import org.apache.isis.extensions.dnd.view.Workspace;
-import org.apache.isis.runtime.persistence.PersistenceSession;
/**
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/undo/SetValueCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/undo/SetValueCommand.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/undo/SetValueCommand.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/undo/SetValueCommand.java Tue Nov 16 14:11:21 2010
@@ -24,9 +24,9 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.isis.extensions.dnd.view.Command;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
public class SetValueCommand implements Command {
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspace.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspace.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspace.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspace.java Tue Nov 16 14:11:21 2010
@@ -36,6 +36,8 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.standard.exploration.MultiUserExplorationSession;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.isis.core.runtime.userprofile.PerspectiveEntry;
import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
import org.apache.isis.extensions.dnd.drawing.Location;
@@ -67,8 +69,6 @@ import org.apache.isis.extensions.dnd.vi
import org.apache.isis.extensions.dnd.view.window.DialogBorder;
import org.apache.isis.extensions.dnd.view.window.SubviewFocusManager;
import org.apache.isis.extensions.dnd.view.window.WindowBorder;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
public final class ApplicationWorkspace extends CompositeViewUsingBuilder implements Workspace {
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/configurable/PanelViewDropTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/configurable/PanelViewDropTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/configurable/PanelViewDropTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/configurable/PanelViewDropTest.java Tue Nov 16 14:11:21 2010
@@ -27,6 +27,7 @@ import org.jmock.Mockery;
import org.junit.Before;
import org.junit.Test;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.testsystem.TestProxyConfiguration;
import org.apache.isis.extensions.dnd.DummyContent;
import org.apache.isis.extensions.dnd.DummyView;
import org.apache.isis.extensions.dnd.DummyViewSpecification;
@@ -38,7 +39,6 @@ import org.apache.isis.extensions.dnd.vi
import org.apache.isis.extensions.dnd.view.View;
import org.apache.isis.extensions.dnd.view.ViewDrag;
import org.apache.isis.extensions.dnd.view.ViewSpecification;
-import org.apache.isis.runtime.testsystem.TestProxyConfiguration;
import static org.junit.Assert.assertEquals;