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 [4/10] - in /incubator/isis/trunk: alternatives/bytecode/identity/src/main/java/org/apache/isis/runtime/persistence/objectfactory/ alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectf...

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_RemoteActionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_RemoteActionTest.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_RemoteActionTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_RemoteActionTest.java Tue Nov 16 14:11:21 2010
@@ -32,6 +32,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.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.data.DummyIdentityData;
 import org.apache.isis.remoting.data.DummyObjectData;
 import org.apache.isis.remoting.data.DummyReferenceData;
@@ -41,10 +45,6 @@ import org.apache.isis.remoting.exchange
 import org.apache.isis.remoting.exchange.ExecuteServerActionResponse;
 import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-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/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java Tue Nov 16 14:11:21 2010
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRes
 
 import org.apache.isis.alternatives.remoting.marshalling.encode.EncodingMarshaller;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.runtime.system.IsisSystem;
 import org.apache.isis.core.webapp.IsisWebAppBootstrapper;
 import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
 import org.apache.isis.remoting.protocol.internal.ObjectEncoderDecoderDefault;
@@ -37,7 +38,6 @@ import org.apache.isis.remoting.server.S
 import org.apache.isis.remoting.server.ServerConnectionDefault;
 import org.apache.isis.remoting.transport.ServerConnectionHandler;
 import org.apache.isis.remoting.transport.simple.SimpleTransport;
-import org.apache.isis.runtime.system.IsisSystem;
 
 /**
  * Analogous to {@link SocketsViewerAbstract}; both ultimately delegate to {@link ServerConnectionHandler}.

Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java Tue Nov 16 14:11:21 2010
@@ -35,6 +35,9 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.lang.Threads;
+import org.apache.isis.core.runtime.system.IsisSystem;
+import org.apache.isis.core.runtime.system.internal.monitor.HttpServerMonitor;
+import org.apache.isis.core.runtime.system.internal.monitor.SocketServerMonitor;
 import org.apache.isis.core.runtime.viewer.IsisViewerAbstract;
 import org.apache.isis.remoting.facade.ServerFacade;
 import org.apache.isis.remoting.facade.ServerFacadeLogger;
@@ -44,9 +47,6 @@ import org.apache.isis.remoting.server.S
 import org.apache.isis.remoting.transport.ConnectionException;
 import org.apache.isis.remoting.transport.ProfilingInputStream;
 import org.apache.isis.remoting.transport.ProfilingOutputStream;
-import org.apache.isis.runtime.system.IsisSystem;
-import org.apache.isis.runtime.system.internal.monitor.HttpServerMonitor;
-import org.apache.isis.runtime.system.internal.monitor.SocketServerMonitor;
 
 
 public abstract class SocketsViewerAbstract extends IsisViewerAbstract implements DebugInfo {

Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/Worker.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/Worker.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/Worker.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/Worker.java Tue Nov 16 14:11:21 2010
@@ -31,12 +31,12 @@ 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.remoting.transport.ServerConnectionHandler;
-import org.apache.isis.runtime.system.internal.monitor.Monitor;
 
 public class Worker implements Runnable {
     private static final Logger LOG = Logger.getLogger(Worker.class);

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/Isis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/Isis.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/Isis.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/Isis.java Tue Nov 16 14:11:21 2010
@@ -26,7 +26,7 @@ import org.apache.isis.core.runtime.opti
 import org.apache.isis.core.runtime.options.standard.OptionHandlerUser;
 import org.apache.isis.core.runtime.runner.IsisRunner;
 import org.apache.isis.core.runtime.runner.options.OptionValidatorUserAndPasswordCombo;
-import org.apache.isis.runtime.system.SystemConstants;
+import org.apache.isis.core.runtime.system.SystemConstants;
 
 
 public class Isis {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/RuntimeBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/RuntimeBootstrapper.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/RuntimeBootstrapper.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/RuntimeBootstrapper.java Tue Nov 16 14:11:21 2010
@@ -30,13 +30,13 @@ import org.apache.isis.core.runtime.cont
 import org.apache.isis.core.runtime.installers.InstallerLookup;
 import org.apache.isis.core.runtime.runner.IsisBootstrapper;
 import org.apache.isis.core.runtime.runner.IsisModule.ViewerList;
+import org.apache.isis.core.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.IsisSystem;
 import org.apache.isis.core.runtime.viewer.IsisViewer;
 import org.apache.isis.core.runtime.viewer.IsisViewerInstaller;
 import org.apache.isis.core.runtime.web.EmbeddedWebServer;
 import org.apache.isis.core.runtime.web.EmbeddedWebServerInstaller;
 import org.apache.isis.core.runtime.web.WebAppSpecification;
-import org.apache.isis.runtime.system.DeploymentType;
-import org.apache.isis.runtime.system.IsisSystem;
 
 import com.google.common.collect.Lists;
 import com.google.inject.Injector;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstract.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstract.java Tue Nov 16 14:11:21 2010
@@ -23,8 +23,8 @@ package org.apache.isis.core.runtime.aut
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.runtime.system.DeploymentType;
-import org.apache.isis.runtime.system.SystemConstants;
+import org.apache.isis.core.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.SystemConstants;
 
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationAuthenticator.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationAuthenticator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationAuthenticator.java Tue Nov 16 14:11:21 2010
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
 import org.apache.isis.core.runtime.authentication.standard.AuthenticatorAbstract;
 import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
-import org.apache.isis.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.DeploymentType;
 
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/fixture/LogonFixtureAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/fixture/LogonFixtureAuthenticator.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/fixture/LogonFixtureAuthenticator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/fixture/LogonFixtureAuthenticator.java Tue Nov 16 14:11:21 2010
@@ -23,7 +23,7 @@ package org.apache.isis.core.runtime.aut
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
 import org.apache.isis.core.runtime.authentication.standard.AuthenticatorAbstract;
-import org.apache.isis.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.DeploymentType;
 
 public class LogonFixtureAuthenticator extends AuthenticatorAbstract {
 	

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/bytecode/ObjectResolveAndObjectChangedEnhancerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/bytecode/ObjectResolveAndObjectChangedEnhancerAbstract.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/bytecode/ObjectResolveAndObjectChangedEnhancerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/bytecode/ObjectResolveAndObjectChangedEnhancerAbstract.java Tue Nov 16 14:11:21 2010
@@ -30,8 +30,8 @@ import org.apache.isis.core.metamodel.ja
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.progmodel.spec.JavaSpecification;
-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 abstract class ObjectResolveAndObjectChangedEnhancerAbstract {
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java Tue Nov 16 14:11:21 2010
@@ -33,16 +33,16 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authorization.AuthorizationManager;
 import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.system.DeploymentType;
 import org.apache.isis.core.runtime.transaction.IsisTransaction;
 import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
 import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker;
 import org.apache.isis.core.runtime.transaction.updatenotifier.UpdateNotifier;
 import org.apache.isis.core.runtime.userprofile.UserProfile;
 import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
-import org.apache.isis.runtime.system.DeploymentType;
 import org.apache.log4j.Logger;
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextMultiUser.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextMultiUser.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextMultiUser.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextMultiUser.java Tue Nov 16 14:11:21 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.runtime.context;
 
-import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
 
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextPipe.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextPipe.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextPipe.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextPipe.java Tue Nov 16 14:11:21 2010
@@ -21,8 +21,8 @@ package org.apache.isis.core.runtime.con
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
 
 /**
  * A specialised IsisContext implementation that provides two sets of components: one for the server; and one for the

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextStatic.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextStatic.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextStatic.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextStatic.java Tue Nov 16 14:11:21 2010
@@ -25,9 +25,9 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.core.commons.lang.Maybe;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
-import org.apache.isis.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.system.DeploymentType;
 
 import com.google.inject.Injector;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextThreadLocal.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextThreadLocal.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextThreadLocal.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextThreadLocal.java Tue Nov 16 14:11:21 2010
@@ -24,8 +24,8 @@ import java.util.Map;
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
 import org.apache.log4j.Logger;
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/FixturesInstallerDelegate.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/FixturesInstallerDelegate.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/FixturesInstallerDelegate.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/FixturesInstallerDelegate.java Tue Nov 16 14:11:21 2010
@@ -34,9 +34,9 @@ import org.apache.isis.applib.profiles.P
 import org.apache.isis.core.commons.lang.CastUtils;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.DeploymentType;
 import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.system.DeploymentType;
 
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/package-info.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/package-info.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/package-info.java Tue Nov 16 14:11:21 2010
@@ -25,6 +25,6 @@
  * Used during prototyping and testing to initial objects, typically to see an
  * in-memory object store.
  * 
- * @see org.apache.isis.runtime.persistence.services.ServicesInstaller
+ * @see org.apache.isis.core.runtime.persistence.services.ServicesInstaller
  */
 package org.apache.isis.core.runtime.fixturesinstaller;
\ No newline at end of file

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerAbstract.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerAbstract.java Tue Nov 16 14:11:21 2010
@@ -27,7 +27,7 @@ import org.apache.isis.core.commons.comp
 import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
 import org.apache.isis.core.metamodel.config.ConfigurationBuilderAware;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.runtime.persistence.PersistenceMechanismInstaller;
+import org.apache.isis.core.runtime.persistence.PersistenceMechanismInstaller;
 
 import com.google.inject.Module;
 import com.google.inject.internal.Lists;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookup.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookup.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookup.java Tue Nov 16 14:11:21 2010
@@ -32,14 +32,14 @@ import org.apache.isis.core.runtime.auth
 import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
 import org.apache.isis.core.runtime.fixturesinstaller.FixturesInstaller;
 import org.apache.isis.core.runtime.imageloader.TemplateImageLoaderInstaller;
+import org.apache.isis.core.runtime.persistence.PersistenceMechanismInstaller;
+import org.apache.isis.core.runtime.persistence.services.ServicesInstaller;
 import org.apache.isis.core.runtime.remoting.ClientConnectionInstaller;
+import org.apache.isis.core.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.IsisSystem;
 import org.apache.isis.core.runtime.userprofile.UserProfileStoreInstaller;
 import org.apache.isis.core.runtime.viewer.IsisViewerInstaller;
 import org.apache.isis.core.runtime.web.EmbeddedWebServerInstaller;
-import org.apache.isis.runtime.persistence.PersistenceMechanismInstaller;
-import org.apache.isis.runtime.persistence.services.ServicesInstaller;
-import org.apache.isis.runtime.system.DeploymentType;
-import org.apache.isis.runtime.system.IsisSystem;
 
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookupDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookupDefault.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookupDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookupDefault.java Tue Nov 16 14:11:21 2010
@@ -52,14 +52,14 @@ import org.apache.isis.core.runtime.auth
 import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
 import org.apache.isis.core.runtime.fixturesinstaller.FixturesInstaller;
 import org.apache.isis.core.runtime.imageloader.TemplateImageLoaderInstaller;
+import org.apache.isis.core.runtime.persistence.PersistenceMechanismInstaller;
+import org.apache.isis.core.runtime.persistence.services.ServicesInstaller;
 import org.apache.isis.core.runtime.remoting.ClientConnectionInstaller;
+import org.apache.isis.core.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.SystemConstants;
 import org.apache.isis.core.runtime.userprofile.UserProfileStoreInstaller;
 import org.apache.isis.core.runtime.viewer.IsisViewerInstaller;
 import org.apache.isis.core.runtime.web.EmbeddedWebServerInstaller;
-import org.apache.isis.runtime.persistence.PersistenceMechanismInstaller;
-import org.apache.isis.runtime.persistence.services.ServicesInstaller;
-import org.apache.isis.runtime.system.DeploymentType;
-import org.apache.isis.runtime.system.SystemConstants;
 import org.apache.log4j.Logger;
 
 import com.google.inject.Inject;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java Tue Nov 16 14:11:21 2010
@@ -43,9 +43,9 @@ 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.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.PersistenceSessionHydrator;
-import org.apache.isis.runtime.persistence.PersistorUtil;
+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.log4j.Logger;
 
 import com.google.common.collect.Lists;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerConnector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerConnector.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerConnector.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerConnector.java Tue Nov 16 14:11:21 2010
@@ -35,8 +35,8 @@ import org.apache.isis.core.runtime.inst
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
+import org.apache.isis.core.runtime.system.SystemConstants;
 import org.apache.isis.core.runtime.viewer.IsisViewerInstaller;
-import org.apache.isis.runtime.system.SystemConstants;
 
 public class OptionHandlerConnector extends OptionHandlerAbstract {
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDeploymentType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDeploymentType.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDeploymentType.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDeploymentType.java Tue Nov 16 14:11:21 2010
@@ -29,8 +29,8 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
-import org.apache.isis.runtime.system.DeploymentType;
-import org.apache.isis.runtime.system.SystemConstants;
+import org.apache.isis.core.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.SystemConstants;
 
 import static org.apache.isis.core.runtime.runner.Constants.TYPE_LONG_OPT;
 import static org.apache.isis.core.runtime.runner.Constants.TYPE_OPT;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDeploymentTypeIsis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDeploymentTypeIsis.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDeploymentTypeIsis.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDeploymentTypeIsis.java Tue Nov 16 14:11:21 2010
@@ -21,7 +21,7 @@
 
 package org.apache.isis.core.runtime.options.standard;
 
-import org.apache.isis.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.DeploymentType;
 
 import static org.apache.isis.core.runtime.runner.Constants.TYPE_CLIENT;
 import static org.apache.isis.core.runtime.runner.Constants.TYPE_EXPLORATION;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDiagnostics.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDiagnostics.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDiagnostics.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDiagnostics.java Tue Nov 16 14:11:21 2010
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
-import org.apache.isis.runtime.system.SystemConstants;
+import org.apache.isis.core.runtime.system.SystemConstants;
 
 public class OptionHandlerDiagnostics extends OptionHandlerAbstract {
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerFixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerFixture.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerFixture.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerFixture.java Tue Nov 16 14:11:21 2010
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
-import org.apache.isis.runtime.system.SystemConstants;
+import org.apache.isis.core.runtime.system.SystemConstants;
 
 public class OptionHandlerFixture extends OptionHandlerAbstract {
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerNoSplash.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerNoSplash.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerNoSplash.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerNoSplash.java Tue Nov 16 14:11:21 2010
@@ -28,7 +28,7 @@ import org.apache.commons.cli.Options;
 import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
-import org.apache.isis.runtime.system.SystemConstants;
+import org.apache.isis.core.runtime.system.SystemConstants;
 
 
 public class OptionHandlerNoSplash extends OptionHandlerAbstract {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerPassword.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerPassword.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerPassword.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerPassword.java Tue Nov 16 14:11:21 2010
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
-import org.apache.isis.runtime.system.SystemConstants;
+import org.apache.isis.core.runtime.system.SystemConstants;
 
 public class OptionHandlerPassword extends OptionHandlerAbstract {
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerPersistor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerPersistor.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerPersistor.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerPersistor.java Tue Nov 16 14:11:21 2010
@@ -26,11 +26,11 @@ import org.apache.commons.cli.OptionBuil
 import org.apache.commons.cli.Options;
 import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
 import org.apache.isis.core.runtime.installers.InstallerRepository;
+import org.apache.isis.core.runtime.persistence.PersistenceMechanismInstaller;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
-import org.apache.isis.runtime.persistence.PersistenceMechanismInstaller;
-import org.apache.isis.runtime.system.SystemConstants;
+import org.apache.isis.core.runtime.system.SystemConstants;
 
 import static org.apache.isis.core.runtime.runner.Constants.OBJECT_PERSISTENCE_LONG_OPT;
 import static org.apache.isis.core.runtime.runner.Constants.OBJECT_PERSISTENCE_OPT;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerReflector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerReflector.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerReflector.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerReflector.java Tue Nov 16 14:11:21 2010
@@ -33,7 +33,7 @@ import org.apache.isis.core.runtime.inst
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
-import org.apache.isis.runtime.system.SystemConstants;
+import org.apache.isis.core.runtime.system.SystemConstants;
 
 public class OptionHandlerReflector extends OptionHandlerAbstract {
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerUser.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerUser.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerUser.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerUser.java Tue Nov 16 14:11:21 2010
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
-import org.apache.isis.runtime.system.SystemConstants;
+import org.apache.isis.core.runtime.system.SystemConstants;
 
 public class OptionHandlerUser extends OptionHandlerAbstract {
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerUserProfileStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerUserProfileStore.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerUserProfileStore.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerUserProfileStore.java Tue Nov 16 14:11:21 2010
@@ -32,8 +32,8 @@ import org.apache.isis.core.runtime.inst
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
+import org.apache.isis.core.runtime.system.SystemConstants;
 import org.apache.isis.core.runtime.userprofile.UserProfileStoreInstaller;
-import org.apache.isis.runtime.system.SystemConstants;
 
 public class OptionHandlerUserProfileStore extends OptionHandlerAbstract {
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerVerbose.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerVerbose.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerVerbose.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerVerbose.java Tue Nov 16 14:11:21 2010
@@ -27,7 +27,7 @@ import org.apache.commons.cli.Options;
 import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
-import org.apache.isis.runtime.system.SystemConstants;
+import org.apache.isis.core.runtime.system.SystemConstants;
 
 public class OptionHandlerVerbose extends OptionHandlerAbstract {
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerVersion.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerVersion.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerVersion.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerVersion.java Tue Nov 16 14:11:21 2010
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
-import org.apache.isis.runtime.system.SystemConstants;
+import org.apache.isis.core.runtime.system.SystemConstants;
 
 public class OptionHandlerVersion extends OptionHandlerAbstract {
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerViewer.java?rev=1035640&r1=1035639&r2=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerViewer.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerViewer.java Tue Nov 16 14:11:21 2010
@@ -35,8 +35,8 @@ import org.apache.isis.core.runtime.inst
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
+import org.apache.isis.core.runtime.system.SystemConstants;
 import org.apache.isis.core.runtime.viewer.IsisViewerInstaller;
-import org.apache.isis.runtime.system.SystemConstants;
 
 public class OptionHandlerViewer extends OptionHandlerAbstract {
 

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/ConcurrencyException.java (from r1035630, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/ConcurrencyException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/ConcurrencyException.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/ConcurrencyException.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/ConcurrencyException.java&r1=1035630&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/ConcurrencyException.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/ConcurrencyException.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 import java.text.DateFormat;
 

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/FixturesInstalledFlag.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/FixturesInstalledFlag.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/FixturesInstalledFlag.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/FixturesInstalledFlag.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/FixturesInstalledFlag.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/FixturesInstalledFlag.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/FixturesInstalledFlag.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 /**
  * For {@link PersistenceSessionFactory} implementations that can cache 

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/NotPersistableException.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/NotPersistableException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/NotPersistableException.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/NotPersistableException.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/NotPersistableException.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/NotPersistableException.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/NotPersistableException.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
 

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/ObjectNotFoundException.java (from r1035630, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/ObjectNotFoundException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/ObjectNotFoundException.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/ObjectNotFoundException.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/ObjectNotFoundException.java&r1=1035630&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/ObjectNotFoundException.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/ObjectNotFoundException.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceConstants.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceConstants.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceConstants.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceConstants.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceConstants.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceConstants.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceConstants.java Tue Nov 16 14:11:21 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.core.metamodel.config.ConfigurationConstants;
@@ -25,11 +25,11 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
 import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault;
-import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
-import org.apache.isis.runtime.persistence.adapterfactory.pojo.PojoAdapterFactory;
-import org.apache.isis.runtime.persistence.objectfactory.ObjectFactory;
-import org.apache.isis.runtime.persistence.oidgenerator.OidGenerator;
-import org.apache.isis.runtime.persistence.oidgenerator.simple.SimpleOidGenerator;
+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.objectfactory.ObjectFactory;
+import org.apache.isis.core.runtime.persistence.oidgenerator.OidGenerator;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SimpleOidGenerator;
 
 public final class PersistenceConstants {
 

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceMechanismInstaller.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceMechanismInstaller.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceMechanismInstaller.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceMechanismInstaller.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceMechanismInstaller.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceMechanismInstaller.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceMechanismInstaller.java Tue Nov 16 14:11:21 2010
@@ -18,10 +18,10 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 import org.apache.isis.core.commons.components.Installer;
-import org.apache.isis.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.DeploymentType;
 
 
 /**

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceMechanismInstallerAbstract.java (from r1035630, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceMechanismInstallerAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceMechanismInstallerAbstract.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceMechanismInstallerAbstract.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceMechanismInstallerAbstract.java&r1=1035630&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceMechanismInstallerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceMechanismInstallerAbstract.java Tue Nov 16 14:11:21 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
 import static org.hamcrest.CoreMatchers.is;
@@ -36,13 +36,13 @@ import org.apache.isis.core.metamodel.se
 import org.apache.isis.core.runtime.installers.InstallerAbstract;
 import org.apache.isis.core.runtime.installers.InstallerLookup;
 import org.apache.isis.core.runtime.installers.InstallerLookupAware;
-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.oidgenerator.OidGenerator;
+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.log4j.Logger;
 
 /**

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSession.java (from r1035630, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSession.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSession.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSession.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSession.java&r1=1035630&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSession.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.commons.components.Injectable;
@@ -27,12 +27,12 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoaderAware;
+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.objectfactory.ObjectFactory;
+import org.apache.isis.core.runtime.persistence.oidgenerator.OidGenerator;
 import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
 import org.apache.isis.core.runtime.transaction.IsisTransactionManagerAware;
-import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
-import org.apache.isis.runtime.persistence.objectfactory.ObjectFactory;
-import org.apache.isis.runtime.persistence.oidgenerator.OidGenerator;
 
 
 public interface PersistenceSession extends

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionAbstract.java (from r1035630, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionAbstract.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionAbstract.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAbstract.java&r1=1035630&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionAbstract.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
@@ -50,19 +50,19 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.SpecificationFacets;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification.CreationMode;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+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.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.PersistenceQuery;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindAllInstances;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByPattern;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByTitle;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindUsingApplibQuerySerializable;
+import org.apache.isis.core.runtime.persistence.services.ServiceUtil;
 import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
-import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
-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.oidgenerator.OidGenerator;
-import org.apache.isis.runtime.persistence.query.PersistenceQuery;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindAllInstances;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindByPattern;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindByTitle;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
-import org.apache.isis.runtime.persistence.query.PersistenceQueryFindUsingApplibQuerySerializable;
-import org.apache.isis.runtime.persistence.services.ServiceUtil;
 
 
 public abstract class PersistenceSessionAbstract implements PersistenceSession {

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionAdaptedServiceManager.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAdaptedServiceManager.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionAdaptedServiceManager.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionAdaptedServiceManager.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAdaptedServiceManager.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAdaptedServiceManager.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionAdaptedServiceManager.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 import java.util.List;
 

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionAware.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionAware.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionAware.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAware.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAware.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionAware.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 
 public interface PersistenceSessionAware {

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionContainer.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionContainer.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionContainer.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionContainer.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionContainer.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionContainer.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionContainer.java Tue Nov 16 14:11:21 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.applib.query.Query;
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.runtime.persistence.query.PersistenceQuery;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
 
 /**
  * PersistenceSession as it appears to most typical client-side code.

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionFactory.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionFactory.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionFactory.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionFactory.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionFactory.java Tue Nov 16 14:11:21 2010
@@ -18,15 +18,15 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 import java.util.List;
 
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoaderAware;
-import org.apache.isis.runtime.persistence.internal.RuntimeContextFromSession;
-import org.apache.isis.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.persistence.internal.RuntimeContextFromSession;
+import org.apache.isis.core.runtime.system.DeploymentType;
 
 /**
  * @see PersistenceSessionFactoryDelegate

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionFactoryDelegate.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionFactoryDelegate.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionFactoryDelegate.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionFactoryDelegate.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionFactoryDelegate.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionFactoryDelegate.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionFactoryDelegate.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 
 /**

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionFactoryDelegating.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionFactoryDelegating.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionFactoryDelegating.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionFactoryDelegating.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionFactoryDelegating.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionFactoryDelegating.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionFactoryDelegating.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
@@ -29,7 +29,7 @@ import java.util.List;
 import org.apache.isis.applib.clock.Clock;
 import org.apache.isis.applib.fixtures.FixtureClock;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.DeploymentType;
 
 
 /**

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionForceReloader.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionForceReloader.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionForceReloader.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionForceReloader.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionForceReloader.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionForceReloader.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionForceReloader.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionHydrator.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionHydrator.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionHydrator.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionHydrator.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionHydrator.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionHydrator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionHydrator.java Tue Nov 16 14:11:21 2010
@@ -18,15 +18,15 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 import org.apache.isis.core.commons.components.Injectable;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
-import org.apache.isis.runtime.persistence.objectfactory.ObjectFactory;
+import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
+import org.apache.isis.core.runtime.persistence.objectfactory.ObjectFactory;
 
 
 public interface PersistenceSessionHydrator extends Injectable {

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionHydratorAware.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionHydratorAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionHydratorAware.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionHydratorAware.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionHydratorAware.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionHydratorAware.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionHydratorAware.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 public interface PersistenceSessionHydratorAware {
     void setHydrator(PersistenceSessionHydrator hydrator);

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionLogger.java (from r1035630, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionLogger.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionLogger.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionLogger.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionLogger.java&r1=1035630&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionLogger.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionLogger.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 import java.util.List;
 
@@ -33,12 +33,12 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.runtime.logging.Logger;
+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.objectfactory.ObjectFactory;
+import org.apache.isis.core.runtime.persistence.oidgenerator.OidGenerator;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
 import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
-import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
-import org.apache.isis.runtime.persistence.objectfactory.ObjectFactory;
-import org.apache.isis.runtime.persistence.oidgenerator.OidGenerator;
-import org.apache.isis.runtime.persistence.query.PersistenceQuery;
 
 
 public class PersistenceSessionLogger extends Logger implements PersistenceSession, DebugInfo {

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionTestSupport.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionTestSupport.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionTestSupport.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionTestSupport.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionTestSupport.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionTestSupport.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionTestSupport.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 
 /**

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionTransactionManagement.java (from r1035630, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionTransactionManagement.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionTransactionManagement.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionTransactionManagement.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionTransactionManagement.java&r1=1035630&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionTransactionManagement.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionTransactionManagement.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistorUtil.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistorUtil.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistorUtil.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistorUtil.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistorUtil.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistorUtil.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistorUtil.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.ensure.Assert;

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/UnsupportedFindException.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/UnsupportedFindException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/UnsupportedFindException.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/UnsupportedFindException.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/UnsupportedFindException.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/UnsupportedFindException.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/UnsupportedFindException.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence;
+package org.apache.isis.core.runtime.persistence;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
 

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapterfactory/AdapterFactory.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/AdapterFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapterfactory/AdapterFactory.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapterfactory/AdapterFactory.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/AdapterFactory.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/AdapterFactory.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapterfactory/AdapterFactory.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence.adapterfactory;
+package org.apache.isis.core.runtime.persistence.adapterfactory;
 
 import org.apache.isis.core.commons.components.Injectable;
 import org.apache.isis.core.commons.components.SessionScopedComponent;

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapterfactory/AdapterFactoryAbstract.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/AdapterFactoryAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapterfactory/AdapterFactoryAbstract.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapterfactory/AdapterFactoryAbstract.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/AdapterFactoryAbstract.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/AdapterFactoryAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapterfactory/AdapterFactoryAbstract.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence.adapterfactory;
+package org.apache.isis.core.runtime.persistence.adapterfactory;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapterfactory/AdapterFactoryAware.java (from r1035614, incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/AdapterFactoryAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapterfactory/AdapterFactoryAware.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapterfactory/AdapterFactoryAware.java&p1=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/AdapterFactoryAware.java&r1=1035614&r2=1035640&rev=1035640&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/AdapterFactoryAware.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapterfactory/AdapterFactoryAware.java Tue Nov 16 14:11:21 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtime.persistence.adapterfactory;
+package org.apache.isis.core.runtime.persistence.adapterfactory;
 
 public interface AdapterFactoryAware {