isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1035640 [3/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...
Date Tue, 16 Nov 2010 14:11:41 GMT
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/XmlObjectStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/XmlObjectStoreTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/XmlObjectStoreTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/XmlObjectStoreTest.java Tue Nov 16 14:11:21 2010
@@ -31,19 +31,19 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.version.Version;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
+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.ObjectStoreTransaction;
+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.oidgenerator.simple.SerialOid;
+import org.apache.isis.core.runtime.testsystem.ProxyJunit4TestCase;
+import org.apache.isis.core.runtime.testsystem.TestProxyAdapter;
+import org.apache.isis.core.runtime.testsystem.TestProxyConfiguration;
 import org.apache.isis.extensions.xml.objectstore.internal.clock.DefaultClock;
 import org.apache.isis.extensions.xml.objectstore.internal.data.MockDataManager;
 import org.apache.isis.extensions.xml.objectstore.internal.services.DummyServiceManager;
-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.ObjectStoreTransaction;
-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.oidgenerator.simple.SerialOid;
-import org.apache.isis.runtime.testsystem.ProxyJunit4TestCase;
-import org.apache.isis.runtime.testsystem.TestProxyConfiguration;
-import org.apache.isis.runtime.testsystem.TestProxyAdapter;
 
 import static org.junit.Assert.*;
 

Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/XmlPersistenceMechanismInstallerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/XmlPersistenceMechanismInstallerTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/XmlPersistenceMechanismInstallerTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/XmlPersistenceMechanismInstallerTest.java Tue Nov 16 14:11:21 2010
@@ -26,13 +26,13 @@ import org.jmock.Mockery;
 import org.jmock.integration.junit4.JUnit4Mockery;
 import org.junit.Before;
 import org.junit.Test;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtime.system.ContextCategory;
-import org.apache.isis.runtime.system.DeploymentCategory;
-import org.apache.isis.runtime.system.DeploymentType;
-import org.apache.isis.runtime.system.Splash;
-import org.apache.isis.runtime.system.SystemConstants;
-import org.apache.isis.runtime.testsystem.ProxyJunit4TestCase;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.system.ContextCategory;
+import org.apache.isis.core.runtime.system.DeploymentCategory;
+import org.apache.isis.core.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.Splash;
+import org.apache.isis.core.runtime.system.SystemConstants;
+import org.apache.isis.core.runtime.testsystem.ProxyJunit4TestCase;
 
 public class XmlPersistenceMechanismInstallerTest  extends ProxyJunit4TestCase {
 	

Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/clock/DefaultClockTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/clock/DefaultClockTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/clock/DefaultClockTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/clock/DefaultClockTest.java Tue Nov 16 14:11:21 2010
@@ -23,7 +23,7 @@ package org.apache.isis.extensions.xml.o
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.apache.isis.runtime.testsystem.ProxyJunit4TestCase;
+import org.apache.isis.core.runtime.testsystem.ProxyJunit4TestCase;
 
 
 

Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/MockDataManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/MockDataManager.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/MockDataManager.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/MockDataManager.java Tue Nov 16 14:11:21 2010
@@ -25,9 +25,9 @@ import java.util.Vector;
 
 import junit.framework.Assert;
 
+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 class MockDataManager implements DataManager {

Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/ObjectDataTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/ObjectDataTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/ObjectDataTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/ObjectDataTest.java Tue Nov 16 14:11:21 2010
@@ -25,9 +25,9 @@ import java.util.Iterator;
 import junit.framework.TestCase;
 
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
 import org.apache.isis.extensions.xml.objectstore.internal.clock.DefaultClock;
 import org.apache.isis.extensions.xml.objectstore.internal.version.FileVersion;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
 
 
 public class ObjectDataTest extends TestCase {

Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/ObjectDataVectorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/ObjectDataVectorTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/ObjectDataVectorTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/ObjectDataVectorTest.java Tue Nov 16 14:11:21 2010
@@ -26,8 +26,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
+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 class ObjectDataVectorTest {
 	private ObjectDataVector objectDataVector;

Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/ReferenceVectorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/ReferenceVectorTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/ReferenceVectorTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/ReferenceVectorTest.java Tue Nov 16 14:11:21 2010
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTru
 
 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;
 
 public class ReferenceVectorTest {
 	private ReferenceVector referenceVector;

Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManagerInstancesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManagerInstancesTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManagerInstancesTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManagerInstancesTest.java Tue Nov 16 14:11:21 2010
@@ -25,13 +25,13 @@ import java.io.FilenameFilter;
 
 import org.apache.log4j.Logger;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
+import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
 import org.apache.isis.extensions.xml.objectstore.internal.clock.DefaultClock;
 import org.apache.isis.extensions.xml.objectstore.internal.clock.DefaultClockTest;
 import org.apache.isis.extensions.xml.objectstore.internal.data.ObjectData;
 import org.apache.isis.extensions.xml.objectstore.internal.data.ObjectDataVector;
 import org.apache.isis.extensions.xml.objectstore.internal.version.FileVersion;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
-import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
 
 
 public class XmlDataManagerInstancesTest extends ProxyJunit3TestCase {

Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManagerTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManagerTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/data/xml/XmlDataManagerTest.java Tue Nov 16 14:11:21 2010
@@ -25,6 +25,8 @@ import java.io.FilenameFilter;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
+import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
 import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
 import org.apache.isis.extensions.xml.objectstore.internal.clock.DefaultClock;
 import org.apache.isis.extensions.xml.objectstore.internal.clock.DefaultClockTest;
@@ -33,8 +35,6 @@ import org.apache.isis.extensions.xml.ob
 import org.apache.isis.extensions.xml.objectstore.internal.data.Role;
 import org.apache.isis.extensions.xml.objectstore.internal.data.Team;
 import org.apache.isis.extensions.xml.objectstore.internal.version.FileVersion;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
-import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
 
 
 public class XmlDataManagerTest extends ProxyJunit3TestCase {

Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/version/FileVersionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/version/FileVersionTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/version/FileVersionTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/objectstore/internal/version/FileVersionTest.java Tue Nov 16 14:11:21 2010
@@ -31,7 +31,7 @@ import org.junit.Test;
 import org.apache.isis.core.metamodel.adapter.version.Version;
 import org.apache.isis.core.metamodel.encoding.DataInputExtended;
 import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
-import org.apache.isis.runtime.testsystem.ProxyJunit4TestCase;
+import org.apache.isis.core.runtime.testsystem.ProxyJunit4TestCase;
 
 public class FileVersionTest extends ProxyJunit4TestCase {
     Mockery context = new JUnit4Mockery();

Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/profilestore/UserProfileDataHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/profilestore/UserProfileDataHandlerTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/profilestore/UserProfileDataHandlerTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/xml/profilestore/UserProfileDataHandlerTest.java Tue Nov 16 14:11:21 2010
@@ -37,13 +37,13 @@ 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.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactoryDefault;
+import org.apache.isis.core.runtime.system.DeploymentType;
 import org.apache.isis.core.runtime.userprofile.Options;
 import org.apache.isis.core.runtime.userprofile.UserProfile;
 import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtime.session.IsisSessionFactory;
-import org.apache.isis.runtime.session.IsisSessionFactoryDefault;
-import org.apache.isis.runtime.system.DeploymentType;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;

Modified: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandlerDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandlerDefault.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandlerDefault.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandlerDefault.java Tue Nov 16 14:11:21 2010
@@ -28,10 +28,10 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtime.persistence.container.DomainObjectContainerObjectChanged;
+import org.apache.isis.core.runtime.persistence.container.DomainObjectContainerResolve;
 import org.apache.isis.progmodel.wrapper.applib.WrapperFactory;
 import org.apache.isis.progmodel.wrapper.applib.WrapperFactory.ExecutionMode;
-import org.apache.isis.runtime.persistence.container.DomainObjectContainerObjectChanged;
-import org.apache.isis.runtime.persistence.container.DomainObjectContainerResolve;
 
 
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ClientConnectionDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ClientConnectionDefault.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ClientConnectionDefault.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ClientConnectionDefault.java Tue Nov 16 14:11:21 2010
@@ -22,12 +22,12 @@ package org.apache.isis.remoting.client;
 
 import java.io.IOException;
 
+import org.apache.isis.core.runtime.persistence.ConcurrencyException;
 import org.apache.isis.remoting.IsisRemoteException;
 import org.apache.isis.remoting.exchange.Request;
 import org.apache.isis.remoting.exchange.ResponseEnvelope;
 import org.apache.isis.remoting.marshalling.ClientMarshaller;
 import org.apache.isis.remoting.transport.ConnectionException;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
 import org.apache.log4j.Logger;
 
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ProxyInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ProxyInstallerAbstract.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ProxyInstallerAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ProxyInstallerAbstract.java Tue Nov 16 14:11:21 2010
@@ -32,7 +32,17 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authorization.AuthorizationManager;
+import org.apache.isis.core.runtime.persistence.PersistenceMechanismInstallerAbstract;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionTransactionManagement;
+import org.apache.isis.core.runtime.persistence.adapterfactory.AdapterFactory;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManagerExtended;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManagerProxy;
+import org.apache.isis.core.runtime.persistence.objectfactory.ObjectFactory;
+import org.apache.isis.core.runtime.persistence.oidgenerator.OidGenerator;
 import org.apache.isis.core.runtime.remoting.ClientConnectionInstaller;
+import org.apache.isis.core.runtime.system.DeploymentType;
 import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
 import org.apache.isis.remoting.client.authentication.AuthenticationManagerProxy;
 import org.apache.isis.remoting.client.authorization.AuthorizationManagerProxy;
@@ -46,16 +56,6 @@ import org.apache.isis.remoting.marshall
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
 import org.apache.isis.remoting.protocol.internal.ObjectEncoderDecoderDefault;
 import org.apache.isis.remoting.transport.Transport;
-import org.apache.isis.runtime.persistence.PersistenceMechanismInstallerAbstract;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtime.persistence.PersistenceSessionTransactionManagement;
-import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerExtended;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerProxy;
-import org.apache.isis.runtime.persistence.objectfactory.ObjectFactory;
-import org.apache.isis.runtime.persistence.oidgenerator.OidGenerator;
-import org.apache.isis.runtime.system.DeploymentType;
 import org.apache.log4j.Logger;
 
 public abstract class ProxyInstallerAbstract extends PersistenceMechanismInstallerAbstract implements

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ActionInvocationFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ActionInvocationFacetWrapProxy.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ActionInvocationFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ActionInvocationFacetWrapProxy.java Tue Nov 16 14:11:21 2010
@@ -35,6 +35,9 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetAbstract;
 import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.ConcurrencyException;
+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.messagebroker.MessageList;
 import org.apache.isis.core.runtime.transaction.messagebroker.WarningList;
@@ -48,9 +51,6 @@ import org.apache.isis.remoting.exchange
 import org.apache.isis.remoting.exchange.KnownObjectsRequest;
 import org.apache.isis.remoting.facade.ServerFacade;
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
 import org.apache.log4j.Logger;
 
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionAddToFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionAddToFacetWrapProxy.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionAddToFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionAddToFacetWrapProxy.java Tue Nov 16 14:11:21 2010
@@ -27,13 +27,13 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
 import org.apache.isis.core.progmodel.facets.collections.modify.CollectionAddToFacetAbstract;
 import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.ConcurrencyException;
 import org.apache.isis.remoting.data.common.IdentityData;
 import org.apache.isis.remoting.data.common.ObjectData;
 import org.apache.isis.remoting.exchange.SetAssociationRequest;
 import org.apache.isis.remoting.exchange.SetAssociationResponse;
 import org.apache.isis.remoting.facade.ServerFacade;
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
 import org.apache.log4j.Logger;
 
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionRemoveFromFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionRemoveFromFacetWrapProxy.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionRemoveFromFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionRemoveFromFacetWrapProxy.java Tue Nov 16 14:11:21 2010
@@ -27,13 +27,13 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
 import org.apache.isis.core.progmodel.facets.collections.modify.CollectionRemoveFromFacetAbstract;
 import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.ConcurrencyException;
 import org.apache.isis.remoting.data.common.IdentityData;
 import org.apache.isis.remoting.data.common.ObjectData;
 import org.apache.isis.remoting.exchange.ClearAssociationRequest;
 import org.apache.isis.remoting.exchange.ClearAssociationResponse;
 import org.apache.isis.remoting.facade.ServerFacade;
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
 import org.apache.log4j.Logger;
 
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertyClearFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertyClearFacetWrapProxy.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertyClearFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertyClearFacetWrapProxy.java Tue Nov 16 14:11:21 2010
@@ -26,13 +26,13 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
 import org.apache.isis.core.progmodel.facets.properties.modify.PropertyClearFacetAbstract;
 import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.ConcurrencyException;
 import org.apache.isis.remoting.data.common.IdentityData;
 import org.apache.isis.remoting.data.common.ObjectData;
 import org.apache.isis.remoting.exchange.ClearAssociationRequest;
 import org.apache.isis.remoting.exchange.ClearAssociationResponse;
 import org.apache.isis.remoting.facade.ServerFacade;
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
 
 
 /**

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertySetterFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertySetterFacetWrapProxy.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertySetterFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertySetterFacetWrapProxy.java Tue Nov 16 14:11:21 2010
@@ -27,6 +27,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.progmodel.facets.properties.modify.PropertySetterFacetAbstract;
 import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.ConcurrencyException;
 import org.apache.isis.remoting.data.common.EncodableObjectData;
 import org.apache.isis.remoting.data.common.IdentityData;
 import org.apache.isis.remoting.data.common.ObjectData;
@@ -36,7 +37,6 @@ import org.apache.isis.remoting.exchange
 import org.apache.isis.remoting.exchange.SetValueResponse;
 import org.apache.isis.remoting.facade.ServerFacade;
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
 
 
 /**

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ProxyUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ProxyUtil.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ProxyUtil.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ProxyUtil.java Tue Nov 16 14:11:21 2010
@@ -23,9 +23,9 @@ package org.apache.isis.remoting.client.
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
+import org.apache.isis.core.runtime.persistence.ConcurrencyException;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
 import org.apache.log4j.Logger;
 
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ClientSideTransactionManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ClientSideTransactionManager.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ClientSideTransactionManager.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ClientSideTransactionManager.java Tue Nov 16 14:11:21 2010
@@ -26,6 +26,10 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.version.Version;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.ConcurrencyException;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionTransactionManagement;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManagerProxy;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
 import org.apache.isis.core.runtime.transaction.IsisTransactionManagerAbstract;
 import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker;
 import org.apache.isis.core.runtime.transaction.updatenotifier.UpdateNotifier;
@@ -38,10 +42,6 @@ import org.apache.isis.remoting.exchange
 import org.apache.isis.remoting.exchange.KnownObjectsRequest;
 import org.apache.isis.remoting.facade.ServerFacade;
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
-import org.apache.isis.runtime.persistence.PersistenceSessionTransactionManagement;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerProxy;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
 import org.apache.log4j.Logger;
 
 public class ClientSideTransactionManager extends IsisTransactionManagerAbstract<ClientSideTransaction> {

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/PersistenceSessionProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/PersistenceSessionProxy.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/PersistenceSessionProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/PersistenceSessionProxy.java Tue Nov 16 14:11:21 2010
@@ -38,6 +38,16 @@ 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.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionAbstract;
+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.AdapterManagerExtended;
+import org.apache.isis.core.runtime.persistence.objectfactory.ObjectFactory;
+import org.apache.isis.core.runtime.persistence.objectstore.PersistenceSessionObjectStore;
+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;
 import org.apache.isis.core.runtime.transaction.TransactionalClosureAbstract;
 import org.apache.isis.core.runtime.transaction.TransactionalClosureWithReturnAbstract;
 import org.apache.isis.core.runtime.transaction.updatenotifier.UpdateNotifier;
@@ -59,16 +69,6 @@ import org.apache.isis.remoting.exchange
 import org.apache.isis.remoting.exchange.ResolveObjectResponse;
 import org.apache.isis.remoting.facade.ServerFacade;
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.PersistenceSessionAbstract;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerExtended;
-import org.apache.isis.runtime.persistence.objectfactory.ObjectFactory;
-import org.apache.isis.runtime.persistence.objectstore.PersistenceSessionObjectStore;
-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.log4j.Logger;
 
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ProxyPersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ProxyPersistenceSessionFactory.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ProxyPersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ProxyPersistenceSessionFactory.java Tue Nov 16 14:11:21 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.remoting.client.persistence;
 
-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 ProxyPersistenceSessionFactory extends PersistenceSessionFactoryDelegating {
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryData.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryData.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryData.java Tue Nov 16 14:11:21 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.remoting.data.query;
 
+import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
 import org.apache.isis.remoting.data.Data;
-import org.apache.isis.runtime.persistence.query.PersistenceQuery;
 
 /**
  * Serializable representation of {@link PersistenceQuery}.

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindAllInstancesData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindAllInstancesData.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindAllInstancesData.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindAllInstancesData.java Tue Nov 16 14:11:21 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.remoting.data.query;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindAllInstances;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindAllInstances;
 
 /**
  * Serializable representation of {@link PersistenceQueryFindAllInstances}.

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindByPatternData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindByPatternData.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindByPatternData.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindByPatternData.java Tue Nov 16 14:11:21 2010
@@ -21,8 +21,8 @@
 package org.apache.isis.remoting.data.query;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByPattern;
 import org.apache.isis.remoting.data.common.ObjectData;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindByPattern;
 
 /**
  * Serializable representation of {@link PersistenceQueryFindByPattern}.

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindByTitleData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindByTitleData.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindByTitleData.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindByTitleData.java Tue Nov 16 14:11:21 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.remoting.data.query;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindByTitle;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByTitle;
 
 public class PersistenceQueryFindByTitleData extends PersistenceQueryDataAbstract {
 	

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindUsingApplibQueryDefaultData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindUsingApplibQueryDefaultData.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindUsingApplibQueryDefaultData.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindUsingApplibQueryDefaultData.java Tue Nov 16 14:11:21 2010
@@ -24,8 +24,8 @@ import java.util.Map;
 
 import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
 import org.apache.isis.remoting.data.common.ObjectData;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
 
 /**
  * Serializable representation of {@link PersistenceQueryFindUsingApplibQueryDefault}.

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindUsingApplibQuerySerializableData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindUsingApplibQuerySerializableData.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindUsingApplibQuerySerializableData.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/data/query/PersistenceQueryFindUsingApplibQuerySerializableData.java Tue Nov 16 14:11:21 2010
@@ -25,7 +25,7 @@ import java.io.Serializable;
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindUsingApplibQuerySerializable;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindUsingApplibQuerySerializable;
 
 /**
  * Serializable representation of {@link PersistenceQueryFindUsingApplibQuerySerializable}.

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/impl/ServerFacadeImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/impl/ServerFacadeImpl.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/impl/ServerFacadeImpl.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/impl/ServerFacadeImpl.java Tue Nov 16 14:11:21 2010
@@ -52,6 +52,9 @@ import org.apache.isis.core.metamodel.ut
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
 import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.PersistenceConstants;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
 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;
@@ -100,9 +103,6 @@ import org.apache.isis.remoting.exchange
 import org.apache.isis.remoting.exchange.SetValueResponse;
 import org.apache.isis.remoting.facade.ServerFacade;
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.persistence.PersistenceConstants;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.query.PersistenceQuery;
 import org.apache.log4j.Logger;
 
 /**

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/ObjectEncoderDecoder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/ObjectEncoderDecoder.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/ObjectEncoderDecoder.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/ObjectEncoderDecoder.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.adapter.version.Version;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
 import org.apache.isis.remoting.data.Data;
 import org.apache.isis.remoting.data.common.EncodableObjectData;
 import org.apache.isis.remoting.data.common.IdentityData;
@@ -35,7 +36,6 @@ import org.apache.isis.remoting.exchange
 import org.apache.isis.remoting.exchange.ExecuteClientActionResponse;
 import org.apache.isis.remoting.exchange.ExecuteServerActionResponse;
 import org.apache.isis.remoting.exchange.KnownObjectsRequest;
-import org.apache.isis.runtime.persistence.query.PersistenceQuery;
 
 public interface ObjectEncoderDecoder {
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/PersistenceQueryEncoder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/PersistenceQueryEncoder.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/PersistenceQueryEncoder.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/PersistenceQueryEncoder.java Tue Nov 16 14:11:21 2010
@@ -20,8 +20,8 @@
 package org.apache.isis.remoting.protocol;
 
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
 import org.apache.isis.remoting.data.query.PersistenceQueryData;
-import org.apache.isis.runtime.persistence.query.PersistenceQuery;
 
 /**
  * TODO: this would be a good candidate for genericizing.

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectDeserializer.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectDeserializer.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectDeserializer.java Tue Nov 16 14:11:21 2010
@@ -37,6 +37,11 @@ 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.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionHydrator;
+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.PersistenceSessionObjectStore;
 import org.apache.isis.core.runtime.transaction.updatenotifier.UpdateNotifier;
 import org.apache.isis.remoting.IsisRemoteException;
 import org.apache.isis.remoting.data.Data;
@@ -47,11 +52,6 @@ import org.apache.isis.remoting.data.com
 import org.apache.isis.remoting.data.common.ObjectData;
 import org.apache.isis.remoting.data.common.ReferenceData;
 import org.apache.isis.remoting.exchange.KnownObjectsRequest;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.PersistenceSessionHydrator;
-import org.apache.isis.runtime.persistence.PersistorUtil;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
-import org.apache.isis.runtime.persistence.objectstore.PersistenceSessionObjectStore;
 import org.apache.log4j.Logger;
 
 public class ObjectDeserializer {

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectEncoderDecoderDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectEncoderDecoderDefault.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectEncoderDecoderDefault.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectEncoderDecoderDefault.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.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.PersistorUtil;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
 import org.apache.isis.remoting.IsisRemoteException;
 import org.apache.isis.remoting.client.facets.ActionInvocationFacetWrapProxy;
 import org.apache.isis.remoting.client.facets.PropertySetterFacetWrapProxy;
@@ -69,8 +71,6 @@ import org.apache.isis.remoting.facade.i
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
 import org.apache.isis.remoting.protocol.PersistenceQueryEncoder;
 import org.apache.isis.remoting.protocol.ProtocolConstants;
-import org.apache.isis.runtime.persistence.PersistorUtil;
-import org.apache.isis.runtime.persistence.query.PersistenceQuery;
 import org.apache.log4j.Logger;
 
 public class ObjectEncoderDecoderDefault implements ObjectEncoderDecoder {

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectSerializer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectSerializer.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectSerializer.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectSerializer.java Tue Nov 16 14:11:21 2010
@@ -32,6 +32,7 @@ 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.metamodel.util.CollectionFacetUtils;
+import org.apache.isis.core.runtime.persistence.PersistorUtil;
 import org.apache.isis.remoting.data.Data;
 import org.apache.isis.remoting.data.DataFactory;
 import org.apache.isis.remoting.data.common.CollectionData;
@@ -39,7 +40,6 @@ import org.apache.isis.remoting.data.com
 import org.apache.isis.remoting.data.common.ObjectData;
 import org.apache.isis.remoting.data.common.ReferenceData;
 import org.apache.isis.remoting.exchange.KnownObjectsRequest;
-import org.apache.isis.runtime.persistence.PersistorUtil;
 
 /**
  * Utility class to create Data objects representing a graph of Isis.

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java Tue Nov 16 14:11:21 2010
@@ -24,13 +24,13 @@ import org.apache.isis.core.metamodel.ad
 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.core.runtime.persistence.query.PersistenceQuery;
 import org.apache.isis.remoting.data.Data;
 import org.apache.isis.remoting.data.common.ObjectData;
 import org.apache.isis.remoting.data.query.PersistenceQueryData;
 import org.apache.isis.remoting.exchange.KnownObjectsRequest;
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
 import org.apache.isis.remoting.protocol.PersistenceQueryEncoder;
-import org.apache.isis.runtime.persistence.query.PersistenceQuery;
 
 public abstract class PersistenceQueryEncoderAbstract implements PersistenceQueryEncoder {
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindAllInstancesEncoder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindAllInstancesEncoder.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindAllInstancesEncoder.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindAllInstancesEncoder.java Tue Nov 16 14:11:21 2010
@@ -21,10 +21,10 @@
 package org.apache.isis.remoting.protocol.internal;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindAllInstances;
 import org.apache.isis.remoting.data.query.PersistenceQueryData;
 import org.apache.isis.remoting.data.query.PersistenceQueryFindAllInstancesData;
-import org.apache.isis.runtime.persistence.query.PersistenceQuery;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindAllInstances;
 
 public class PersistenceQueryFindAllInstancesEncoder extends PersistenceQueryEncoderAbstract {
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindByPatternEncoder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindByPatternEncoder.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindByPatternEncoder.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindByPatternEncoder.java Tue Nov 16 14:11:21 2010
@@ -22,11 +22,11 @@ package org.apache.isis.remoting.protoco
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByPattern;
 import org.apache.isis.remoting.data.common.ObjectData;
 import org.apache.isis.remoting.data.query.PersistenceQueryData;
 import org.apache.isis.remoting.data.query.PersistenceQueryFindByPatternData;
-import org.apache.isis.runtime.persistence.query.PersistenceQuery;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindByPattern;
 
 public class PersistenceQueryFindByPatternEncoder extends PersistenceQueryEncoderAbstract {
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindByTitleEncoder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindByTitleEncoder.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindByTitleEncoder.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindByTitleEncoder.java Tue Nov 16 14:11:21 2010
@@ -21,10 +21,10 @@
 package org.apache.isis.remoting.protocol.internal;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByTitle;
 import org.apache.isis.remoting.data.query.PersistenceQueryData;
 import org.apache.isis.remoting.data.query.PersistenceQueryFindByTitleData;
-import org.apache.isis.runtime.persistence.query.PersistenceQuery;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindByTitle;
 
 public class PersistenceQueryFindByTitleEncoder extends PersistenceQueryEncoderAbstract {
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindUsingApplibQueryDefaultEncoder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindUsingApplibQueryDefaultEncoder.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindUsingApplibQueryDefaultEncoder.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindUsingApplibQueryDefaultEncoder.java Tue Nov 16 14:11:21 2010
@@ -26,12 +26,12 @@ import java.util.Map;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByTitle;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
 import org.apache.isis.remoting.data.common.ObjectData;
 import org.apache.isis.remoting.data.query.PersistenceQueryData;
 import org.apache.isis.remoting.data.query.PersistenceQueryFindUsingApplibQueryDefaultData;
-import org.apache.isis.runtime.persistence.query.PersistenceQuery;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindByTitle;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
 
 public class PersistenceQueryFindUsingApplibQueryDefaultEncoder extends PersistenceQueryEncoderAbstract {
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindUsingApplibQuerySerializableEncoder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindUsingApplibQuerySerializableEncoder.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindUsingApplibQuerySerializableEncoder.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindUsingApplibQuerySerializableEncoder.java Tue Nov 16 14:11:21 2010
@@ -23,11 +23,11 @@ package org.apache.isis.remoting.protoco
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByTitle;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindUsingApplibQuerySerializable;
 import org.apache.isis.remoting.data.query.PersistenceQueryData;
 import org.apache.isis.remoting.data.query.PersistenceQueryFindUsingApplibQuerySerializableData;
-import org.apache.isis.runtime.persistence.query.PersistenceQuery;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindByTitle;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindUsingApplibQuerySerializable;
 
 public class PersistenceQueryFindUsingApplibQuerySerializableEncoder extends PersistenceQueryEncoderAbstract {
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/ServerConnectionHandler.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/ServerConnectionHandler.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/ServerConnectionHandler.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/ServerConnectionHandler.java Tue Nov 16 14:11:21 2010
@@ -28,11 +28,11 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.system.internal.monitor.Monitor;
 import org.apache.isis.remoting.exchange.OpenSessionRequest;
 import org.apache.isis.remoting.exchange.Request;
 import org.apache.isis.remoting.exchange.ResponseEnvelope;
 import org.apache.isis.remoting.server.ServerConnection;
-import org.apache.isis.runtime.system.internal.monitor.Monitor;
 import org.apache.log4j.Logger;
 
 /**

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/CommandClientTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/CommandClientTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/CommandClientTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/CommandClientTest.java Tue Nov 16 14:11:21 2010
@@ -21,6 +21,9 @@
 package org.apache.isis.remoting.client;
 
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
+import org.apache.isis.core.runtime.testsystem.TestProxyOid;
+import org.apache.isis.core.runtime.testsystem.TestProxySession;
 import org.apache.isis.remoting.IsisRemoteException;
 import org.apache.isis.remoting.data.DummyIdentityData;
 import org.apache.isis.remoting.data.common.IdentityData;
@@ -36,9 +39,6 @@ import org.apache.isis.remoting.exchange
 import org.apache.isis.remoting.exchange.ResponseEnvelope;
 import org.apache.isis.remoting.facade.ServerFacade;
 import org.apache.isis.remoting.facade.proxy.ServerFacadeProxy;
-import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
-import org.apache.isis.runtime.testsystem.TestProxyOid;
-import org.apache.isis.runtime.testsystem.TestProxySession;
 import org.easymock.MockControl;
 
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/ProxyPersistorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/ProxyPersistorTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/ProxyPersistorTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/ProxyPersistorTest.java Tue Nov 16 14:11:21 2010
@@ -36,6 +36,23 @@ import org.apache.isis.core.metamodel.se
 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.core.runtime.persistence.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.persistence.adapterfactory.AdapterFactory;
+import org.apache.isis.core.runtime.persistence.adapterfactory.pojo.PojoAdapterFactory;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManagerDefault;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManagerExtended;
+import org.apache.isis.core.runtime.persistence.internal.RuntimeContextFromSession;
+import org.apache.isis.core.runtime.persistence.objectfactory.ObjectFactory;
+import org.apache.isis.core.runtime.persistence.oidgenerator.OidGenerator;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindAllInstances;
+import org.apache.isis.core.runtime.testdomain.Movie;
+import org.apache.isis.core.runtime.testdomain.Person;
+import org.apache.isis.core.runtime.testspec.MovieSpecification;
+import org.apache.isis.core.runtime.testsystem.ProxyJunit4TestCase;
+import org.apache.isis.core.runtime.testsystem.TestProxyAdapter;
+import org.apache.isis.core.runtime.testsystem.TestProxyOid;
+import org.apache.isis.core.runtime.testsystem.TestProxyOidGenerator;
+import org.apache.isis.core.runtime.testsystem.TestProxyVersion;
 import org.apache.isis.remoting.client.persistence.ClientSideTransactionManager;
 import org.apache.isis.remoting.client.persistence.PersistenceSessionProxy;
 import org.apache.isis.remoting.data.Data;
@@ -57,24 +74,7 @@ import org.apache.isis.remoting.exchange
 import org.apache.isis.remoting.exchange.ResolveObjectRequest;
 import org.apache.isis.remoting.facade.ServerFacade;
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
-import org.apache.isis.runtime.persistence.adapterfactory.pojo.PojoAdapterFactory;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerDefault;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerExtended;
-import org.apache.isis.runtime.persistence.internal.RuntimeContextFromSession;
-import org.apache.isis.runtime.persistence.objectfactory.ObjectFactory;
 import org.apache.isis.runtime.persistence.objectfactory.ObjectFactoryBasic;
-import org.apache.isis.runtime.persistence.oidgenerator.OidGenerator;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindAllInstances;
-import org.apache.isis.runtime.testdomain.Movie;
-import org.apache.isis.runtime.testdomain.Person;
-import org.apache.isis.runtime.testspec.MovieSpecification;
-import org.apache.isis.runtime.testsystem.ProxyJunit4TestCase;
-import org.apache.isis.runtime.testsystem.TestProxyAdapter;
-import org.apache.isis.runtime.testsystem.TestProxyOid;
-import org.apache.isis.runtime.testsystem.TestProxyOidGenerator;
-import org.apache.isis.runtime.testsystem.TestProxyVersion;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteLocallyTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteLocallyTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteLocallyTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteLocallyTest.java Tue Nov 16 14:11:21 2010
@@ -27,9 +27,9 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.runtime.testsystem.TestProxySystem;
 import org.apache.isis.remoting.facade.ServerFacade;
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.testsystem.TestProxySystem;
 import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteRemotelyTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteRemotelyTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteRemotelyTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteRemotelyTest.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.spec.feature.ObjectActionType;
 import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionPeer;
 import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.testsystem.TestProxySystem;
 import org.apache.isis.remoting.data.Data;
 import org.apache.isis.remoting.data.DummyNullValue;
 import org.apache.isis.remoting.data.DummyReferenceData;
@@ -40,7 +41,6 @@ import org.apache.isis.remoting.exchange
 import org.apache.isis.remoting.exchange.ExecuteServerActionResponse;
 import org.apache.isis.remoting.facade.ServerFacade;
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.testsystem.TestProxySystem;
 import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectDecoderCollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectDecoderCollectionTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectDecoderCollectionTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectDecoderCollectionTest.java Tue Nov 16 14:11:21 2010
@@ -30,6 +30,11 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
 import org.apache.isis.core.progmodel.facets.collections.modify.CollectionFacetAbstract;
+import org.apache.isis.core.runtime.persistence.adaptermanager.ObjectToAdapterTransformer;
+import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
+import org.apache.isis.core.runtime.testsystem.TestPojo;
+import org.apache.isis.core.runtime.testsystem.TestProxyOid;
+import org.apache.isis.core.runtime.testsystem.TestProxyVersion;
 import org.apache.isis.remoting.data.DummyCollectionData;
 import org.apache.isis.remoting.data.DummyObjectData;
 import org.apache.isis.remoting.data.common.CollectionData;
@@ -37,11 +42,6 @@ import org.apache.isis.remoting.data.com
 import org.apache.isis.remoting.data.common.ReferenceData;
 import org.apache.isis.remoting.protocol.internal.FieldOrderCache;
 import org.apache.isis.remoting.protocol.internal.ObjectDeserializer;
-import org.apache.isis.runtime.persistence.adaptermanager.ObjectToAdapterTransformer;
-import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
-import org.apache.isis.runtime.testsystem.TestPojo;
-import org.apache.isis.runtime.testsystem.TestProxyOid;
-import org.apache.isis.runtime.testsystem.TestProxyVersion;
 
 
 public class ObjectDecoderCollectionTest extends ProxyJunit3TestCase {

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectEncoderImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectEncoderImplTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectEncoderImplTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectEncoderImplTest.java Tue Nov 16 14:11:21 2010
@@ -28,19 +28,19 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.runtime.testdomain.Movie;
+import org.apache.isis.core.runtime.testdomain.Person;
+import org.apache.isis.core.runtime.testspec.MovieSpecification;
+import org.apache.isis.core.runtime.testspec.PersonSpecification;
+import org.apache.isis.core.runtime.testsystem.ProxyJunit4TestCase;
+import org.apache.isis.core.runtime.testsystem.TestProxyOid;
+import org.apache.isis.core.runtime.testsystem.TestProxyVersion;
 import org.apache.isis.remoting.data.Data;
 import org.apache.isis.remoting.data.DummyEncodeableObjectData;
 import org.apache.isis.remoting.data.DummyNullValue;
 import org.apache.isis.remoting.data.DummyObjectData;
 import org.apache.isis.remoting.data.common.NullData;
 import org.apache.isis.remoting.protocol.internal.ObjectEncoderDecoderDefault;
-import org.apache.isis.runtime.testdomain.Movie;
-import org.apache.isis.runtime.testdomain.Person;
-import org.apache.isis.runtime.testspec.MovieSpecification;
-import org.apache.isis.runtime.testspec.PersonSpecification;
-import org.apache.isis.runtime.testsystem.ProxyJunit4TestCase;
-import org.apache.isis.runtime.testsystem.TestProxyOid;
-import org.apache.isis.runtime.testsystem.TestProxyVersion;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_AssociationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_AssociationTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_AssociationTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_AssociationTest.java Tue Nov 16 14:11:21 2010
@@ -31,6 +31,10 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.ConcurrencyException;
+import org.apache.isis.core.runtime.testsystem.ProxyJunit4TestCase;
+import org.apache.isis.core.runtime.testsystem.TestProxyAssociation;
+import org.apache.isis.core.runtime.testsystem.TestProxyVersion;
 import org.apache.isis.remoting.data.DummyReferenceData;
 import org.apache.isis.remoting.data.common.ObjectData;
 import org.apache.isis.remoting.exchange.ClearAssociationRequest;
@@ -39,10 +43,6 @@ import org.apache.isis.remoting.exchange
 import org.apache.isis.remoting.exchange.SetAssociationResponse;
 import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
-import org.apache.isis.runtime.testsystem.ProxyJunit4TestCase;
-import org.apache.isis.runtime.testsystem.TestProxyAssociation;
-import org.apache.isis.runtime.testsystem.TestProxyVersion;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ClientActionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ClientActionTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ClientActionTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ClientActionTest.java Tue Nov 16 14:11:21 2010
@@ -30,6 +30,11 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.ConcurrencyException;
+import org.apache.isis.core.runtime.testsystem.TestProxyAdapter;
+import org.apache.isis.core.runtime.testsystem.TestProxySession;
+import org.apache.isis.core.runtime.testsystem.TestProxySystem;
+import org.apache.isis.core.runtime.testsystem.TestProxyVersion;
 import org.apache.isis.remoting.client.transaction.ClientTransactionEvent;
 import org.apache.isis.remoting.data.DummyIdentityData;
 import org.apache.isis.remoting.data.DummyObjectData;
@@ -40,11 +45,6 @@ import org.apache.isis.remoting.exchange
 import org.apache.isis.remoting.exchange.KnownObjectsRequest;
 import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
-import org.apache.isis.runtime.testsystem.TestProxyAdapter;
-import org.apache.isis.runtime.testsystem.TestProxySession;
-import org.apache.isis.runtime.testsystem.TestProxySystem;
-import org.apache.isis.runtime.testsystem.TestProxyVersion;
 import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ParseableAssociationsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ParseableAssociationsTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ParseableAssociationsTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ParseableAssociationsTest.java Tue Nov 16 14:11:21 2010
@@ -33,6 +33,10 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.ConcurrencyException;
+import org.apache.isis.core.runtime.testsystem.ProxyJunit4TestCase;
+import org.apache.isis.core.runtime.testsystem.TestProxyAssociation;
+import org.apache.isis.core.runtime.testsystem.TestProxyVersion;
 import org.apache.isis.remoting.data.DummyEncodeableObjectData;
 import org.apache.isis.remoting.data.DummyReferenceData;
 import org.apache.isis.remoting.data.common.ObjectData;
@@ -43,10 +47,6 @@ import org.apache.isis.remoting.exchange
 import org.apache.isis.remoting.facade.ServerFacade;
 import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
-import org.apache.isis.runtime.testsystem.ProxyJunit4TestCase;
-import org.apache.isis.runtime.testsystem.TestProxyAssociation;
-import org.apache.isis.runtime.testsystem.TestProxyVersion;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;



Mime
View raw message