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 13:29:22 UTC

svn commit: r1035613 [5/7] - in /incubator/isis/trunk: ./ alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql...

Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java Tue Nov 16 12:29:07 2010
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStoreInstances;
 import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
 import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjectsDefault;

Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances.java Tue Nov 16 12:29:07 2010
@@ -37,7 +37,7 @@ 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.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.runtime.objectstore.inmemory.InMemoryObjectStore;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.PersistenceSessionHydrator;

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistorTest.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistorTest.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureFilePersistorTest.java Tue Nov 16 12:29:07 2010
@@ -35,7 +35,8 @@ import java.util.Set;
 
 import junit.framework.Assert;
 
-import org.apache.isis.runtime.fixturesinstaller.FixtureException;
+import org.apache.isis.core.runtime.fixture.ObjectFixtureFilePersistor;
+import org.apache.isis.core.runtime.fixturesinstaller.FixtureException;
 import org.apache.isis.runtime.testdomain.Movie;
 import org.apache.isis.runtime.testdomain.Person;
 import org.apache.isis.runtime.testsystem.TestProxySystemII;

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java Tue Nov 16 12:29:07 2010
@@ -30,6 +30,7 @@ import java.util.Set;
 import junit.framework.Assert;
 
 import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.runtime.fixture.ObjectFixtureService;
 import org.apache.isis.runtime.testdomain.Movie;
 import org.apache.isis.runtime.testdomain.Person;
 import org.apache.isis.runtime.testdomain.Role;

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/AbstractInMemoryObjectStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/AbstractInMemoryObjectStoreTest.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/AbstractInMemoryObjectStoreTest.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/AbstractInMemoryObjectStoreTest.java Tue Nov 16 12:29:07 2010
@@ -23,7 +23,7 @@ package org.apache.isis.runtime.objectst
 import java.util.Collections;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
 import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
 

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java Tue Nov 16 12:29:07 2010
@@ -30,12 +30,12 @@ import org.jmock.lib.legacy.ClassImposte
 import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
 import org.apache.isis.core.metamodel.specloader.ObjectReflectorAbstract;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
+import org.apache.isis.core.runtime.authorization.AuthorizationManager;
+import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContextStatic;
 import org.apache.isis.defaults.progmodel.JavaReflectorInstaller;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.authentication.standard.SimpleSession;
-import org.apache.isis.runtime.authorization.AuthorizationManager;
-import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.runtime.context.IsisContextStatic;
 import org.apache.isis.runtime.imageloader.TemplateImageLoader;
 import org.apache.isis.runtime.objectstore.inmemory.InMemoryPersistenceMechanismInstaller;
 import org.apache.isis.runtime.persistence.PersistenceSessionFactory;

Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java Tue Nov 16 12:29:07 2010
@@ -35,11 +35,11 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverserDefault;
 import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorNoop;
 import org.apache.isis.core.progmodel.facets.object.ident.plural.PluralFacet;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authorization.AuthorizationManager;
+import org.apache.isis.core.runtime.context.IsisContextStatic;
 import org.apache.isis.defaults.progmodel.JavaReflector;
 import org.apache.isis.defaults.progmodel.ProgrammingModelFacetsJava5;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.authorization.AuthorizationManager;
-import org.apache.isis.runtime.context.IsisContextStatic;
 import org.apache.isis.runtime.imageloader.TemplateImageLoader;
 import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
 import org.apache.isis.runtime.persistence.internal.RuntimeContextFromSession;

Modified: incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authentication/standard/noop/AuthenticatorNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authentication/standard/noop/AuthenticatorNoop.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authentication/standard/noop/AuthenticatorNoop.java (original)
+++ incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authentication/standard/noop/AuthenticatorNoop.java Tue Nov 16 12:29:07 2010
@@ -22,8 +22,8 @@ package org.apache.isis.runtime.authenti
 
 import org.apache.isis.core.commons.components.Noop;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.runtime.authentication.standard.AuthenticatorAbstract;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.core.runtime.authentication.standard.AuthenticatorAbstract;
 
 public class AuthenticatorNoop extends AuthenticatorAbstract implements Noop {
 

Modified: incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authentication/standard/noop/NoopAuthenticationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authentication/standard/noop/NoopAuthenticationManagerInstaller.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authentication/standard/noop/NoopAuthenticationManagerInstaller.java (original)
+++ incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authentication/standard/noop/NoopAuthenticationManagerInstaller.java Tue Nov 16 12:29:07 2010
@@ -21,8 +21,8 @@
 package org.apache.isis.runtime.authentication.standard.noop;
 
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.runtime.authentication.standard.Authenticator;
-import org.apache.isis.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
+import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
+import org.apache.isis.core.runtime.authentication.standard.Authenticator;
 
 
 public class NoopAuthenticationManagerInstaller extends AuthenticationManagerStandardInstallerAbstract {

Modified: incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authorization/standard/noop/NoopAuthorizationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authorization/standard/noop/NoopAuthorizationManagerInstaller.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authorization/standard/noop/NoopAuthorizationManagerInstaller.java (original)
+++ incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authorization/standard/noop/NoopAuthorizationManagerInstaller.java Tue Nov 16 12:29:07 2010
@@ -21,8 +21,8 @@
 package org.apache.isis.runtime.authorization.standard.noop;
 
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.runtime.authorization.standard.AuthorizationManagerStandardInstallerAbstract;
-import org.apache.isis.runtime.authorization.standard.Authorizor;
+import org.apache.isis.core.runtime.authorization.standard.AuthorizationManagerStandardInstallerAbstract;
+import org.apache.isis.core.runtime.authorization.standard.Authorizor;
 
 public class NoopAuthorizationManagerInstaller extends
 		AuthorizationManagerStandardInstallerAbstract {

Modified: incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authorization/standard/noop/NoopAuthorizor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authorization/standard/noop/NoopAuthorizor.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authorization/standard/noop/NoopAuthorizor.java (original)
+++ incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authorization/standard/noop/NoopAuthorizor.java Tue Nov 16 12:29:07 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.runtime.authorization.standard.noop;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.runtime.authorization.standard.Authorizor;
+import org.apache.isis.core.runtime.authorization.standard.Authorizor;
 
 public class NoopAuthorizor implements Authorizor {
 

Propchange: incubator/isis/trunk/mvn-build-all.cmd
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Propchange: incubator/isis/trunk/mvn-build-all.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Nov 16 12:29:07 2010
@@ -1 +1 @@
-native
+LF

Propchange: incubator/isis/trunk/mvn-build-standard.cmd
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Modified: incubator/isis/trunk/mvn-build-standard.sh
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/mvn-build-standard.sh?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/mvn-build-standard.sh (original)
+++ incubator/isis/trunk/mvn-build-standard.sh Tue Nov 16 12:29:07 2010
@@ -1 +1,2 @@
 mvn clean install -D modules=standard -o
+

Propchange: incubator/isis/trunk/mvn-build-standard.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Nov 16 12:29:07 2010
@@ -1 +1 @@
-native
+LF

Propchange: incubator/isis/trunk/mvn-build-then-site.cmd
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Propchange: incubator/isis/trunk/mvn-build-then-site.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Nov 16 12:29:07 2010
@@ -1 +1 @@
-native
+LF

Propchange: incubator/isis/trunk/mvn-site-standard-local-full.cmd
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Propchange: incubator/isis/trunk/mvn-site-standard-local-full.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Nov 16 12:29:07 2010
@@ -1 +1 @@
-native
+LF

Propchange: incubator/isis/trunk/mvn-site-standard-local.cmd
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Propchange: incubator/isis/trunk/mvn-site-standard-local.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Nov 16 12:29:07 2010
@@ -1 +1 @@
-native
+LF

Propchange: incubator/isis/trunk/svn-st.sh
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Nov 16 12:29:07 2010
@@ -1 +1 @@
-native
+LF

Propchange: incubator/isis/trunk/svn-up.cmd
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Propchange: incubator/isis/trunk/svn-up.sh
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java Tue Nov 16 12:29:07 2010
@@ -15,8 +15,8 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.oid.AggregatedOid;
 import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
 import org.apache.isis.core.metamodel.config.ConfigurationBuilderFileSystem;
-import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.runtime.fixturesinstaller.FixturesInstallerNoop;
+import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.fixturesinstaller.FixturesInstallerNoop;
 import org.apache.isis.runtime.installers.InstallerLookup;
 import org.apache.isis.runtime.installers.InstallerLookupDefault;
 import org.apache.isis.runtime.persistence.PersistenceSession;

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java Tue Nov 16 12:29:07 2010
@@ -1,6 +1,6 @@
 package org.apache.isis.viewer.bdd.common.components;
 
-import org.apache.isis.runtime.authentication.AuthenticationManagerInstaller;
+import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
 import org.apache.isis.runtime.installers.InstallerLookup;
 import org.apache.isis.runtime.persistence.PersistenceMechanismInstaller;
 import org.apache.isis.runtime.system.DeploymentType;

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryAuthenticationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryAuthenticationManagerInstaller.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryAuthenticationManagerInstaller.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryAuthenticationManagerInstaller.java Tue Nov 16 12:29:07 2010
@@ -1,8 +1,8 @@
 package org.apache.isis.viewer.bdd.common.components;
 
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
-import org.apache.isis.runtime.authentication.standard.Authenticator;
+import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
+import org.apache.isis.core.runtime.authentication.standard.Authenticator;
 import org.apache.isis.runtime.authentication.standard.noop.AuthenticatorNoop;
 
 public class StoryAuthenticationManagerInstaller extends

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java Tue Nov 16 12:29:07 2010
@@ -5,7 +5,7 @@ import java.util.List;
 
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
 import org.apache.isis.runtime.persistence.objectstore.ObjectStorePersistence;

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformAbstract.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformAbstract.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformAbstract.java Tue Nov 16 12:29:07 2010
@@ -1,7 +1,7 @@
 package org.apache.isis.viewer.bdd.common.fixtures.perform;
 
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
 
 public abstract class PerformAbstract implements Perform {
 

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/OpenSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/OpenSession.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/OpenSession.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/OpenSession.java Tue Nov 16 12:29:07 2010
@@ -4,9 +4,9 @@ import java.util.List;
 
 import org.apache.isis.applib.fixtures.LogonFixture;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.authentication.standard.fixture.AuthenticationRequestLogonFixture;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.standard.fixture.AuthenticationRequestLogonFixture;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.viewer.bdd.common.Story;
 
 public class OpenSession {

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/ShutdownNakedObjects.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/ShutdownNakedObjects.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/ShutdownNakedObjects.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/ShutdownNakedObjects.java Tue Nov 16 12:29:07 2010
@@ -1,6 +1,6 @@
 package org.apache.isis.viewer.bdd.common.story.bootstrapping;
 
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.runtime.system.IsisSystem;
 import org.apache.isis.viewer.bdd.common.Story;
 

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/registries/AliasRegistryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/registries/AliasRegistryDefault.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/registries/AliasRegistryDefault.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/registries/AliasRegistryDefault.java Tue Nov 16 12:29:07 2010
@@ -10,7 +10,7 @@ import java.util.Set;
 import java.util.TreeMap;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.viewer.bdd.common.AliasRegistry;
 import org.apache.isis.viewer.bdd.common.StoryValueException;

Modified: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java (original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/CheckSpecificationsLoadedForFitNesse.java Tue Nov 16 12:29:07 2010
@@ -8,7 +8,7 @@ import net.sf.isiscontrib.bdd.fitnesse.i
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.runtime.session.IsisSessionFactory;
 import org.apache.isis.viewer.bdd.common.AliasRegistry;
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/AwtColor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/AwtColor.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/AwtColor.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/AwtColor.java Tue Nov 16 12:29:07 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.extensions.dnd.awt;
 
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.Color;
 import org.apache.isis.extensions.dnd.util.Properties;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 public class AwtColor implements Color {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/AwtText.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/AwtText.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/AwtText.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/AwtText.java Tue Nov 16 12:29:07 2010
@@ -27,10 +27,10 @@ import java.util.StringTokenizer;
 
 import org.apache.log4j.Logger;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
 import org.apache.isis.extensions.dnd.drawing.Text;
 import org.apache.isis.extensions.dnd.util.Properties;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 public class AwtText implements Text {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/DebugOptions.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/DebugOptions.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/DebugOptions.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/DebugOptions.java Tue Nov 16 12:29:07 2010
@@ -26,6 +26,7 @@ import java.io.PrintStream;
 import org.apache.isis.core.commons.debug.DebugInfo;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.Location;
 import org.apache.isis.extensions.dnd.view.MenuOptions;
 import org.apache.isis.extensions.dnd.view.Toolkit;
@@ -33,7 +34,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.View;
 import org.apache.isis.extensions.dnd.view.Workspace;
 import org.apache.isis.extensions.dnd.view.option.UserActionAbstract;
-import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.system.internal.monitor.SystemPrinter;
 
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/LoginDialog.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/LoginDialog.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/LoginDialog.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/LoginDialog.java Tue Nov 16 12:29:07 2010
@@ -42,8 +42,8 @@ import java.awt.event.WindowEvent;
 import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.lang.StringUtils;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
 
 
 public class LoginDialog extends Frame implements ActionListener, KeyListener {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/ViewerFrame.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/ViewerFrame.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/ViewerFrame.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/ViewerFrame.java Tue Nov 16 12:29:07 2010
@@ -31,7 +31,7 @@ import java.awt.event.WindowEvent;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import org.apache.isis.runtime.about.AboutIsis;
+import org.apache.isis.core.runtime.about.AboutIsis;
 import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
 import org.apache.isis.extensions.dnd.view.Toolkit;
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/XFeedbackManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/XFeedbackManager.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/XFeedbackManager.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/XFeedbackManager.java Tue Nov 16 12:29:07 2010
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Vector;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.view.BackgroundTask;
 import org.apache.isis.extensions.dnd.view.Content;
 import org.apache.isis.extensions.dnd.view.Feedback;
@@ -32,7 +33,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.View;
 import org.apache.isis.extensions.dnd.view.message.ExceptionMessageContent;
 import org.apache.isis.extensions.dnd.view.message.TextMessageContent;
-import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.transaction.messagebroker.MessageBroker;
 
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/XViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/XViewer.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/XViewer.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/XViewer.java Tue Nov 16 12:29:07 2010
@@ -39,6 +39,7 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.Background;
 import org.apache.isis.extensions.dnd.drawing.Bounds;
 import org.apache.isis.extensions.dnd.drawing.Canvas;
@@ -72,7 +73,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.menu.PopupMenuContainer;
 import org.apache.isis.extensions.dnd.view.message.MessageContent;
 import org.apache.isis.extensions.dnd.viewer.ApplicationOptions;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 public class XViewer implements Viewer {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/bootstrap/DndViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/bootstrap/DndViewer.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/bootstrap/DndViewer.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/bootstrap/DndViewer.java Tue Nov 16 12:29:07 2010
@@ -29,6 +29,10 @@ import org.apache.isis.core.commons.fact
 import org.apache.isis.core.commons.factory.InstanceFactory;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.config.ConfigurationException;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.core.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
+import org.apache.isis.core.runtime.authentication.standard.fixture.AuthenticationRequestLogonFixture;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.awt.AwtImageFactory;
 import org.apache.isis.extensions.dnd.awt.AwtToolkit;
 import org.apache.isis.extensions.dnd.awt.LoginDialog;
@@ -91,10 +95,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.viewer.basic.InnerWorkspaceSpecification;
 import org.apache.isis.extensions.dnd.viewer.basic.RootWorkspaceSpecification;
 import org.apache.isis.extensions.dnd.viewer.basic.WrappedTextFieldSpecification;
-import org.apache.isis.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
-import org.apache.isis.runtime.authentication.standard.fixture.AuthenticationRequestLogonFixture;
-import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.userprofile.UserProfile;
 import org.apache.isis.runtime.viewer.IsisViewerAbstract;
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarCellContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarCellContent.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarCellContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarCellContent.java Tue Nov 16 12:29:07 2010
@@ -28,9 +28,9 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.view.Content;
 import org.apache.isis.extensions.dnd.view.collection.AbstractCollectionContent;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 public class CalendarCellContent extends AbstractCollectionContent {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/combined/FormWithTableSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/combined/FormWithTableSpecification.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/combined/FormWithTableSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/combined/FormWithTableSpecification.java Tue Nov 16 12:29:07 2010
@@ -25,6 +25,7 @@ import org.apache.isis.core.metamodel.au
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.form.FormSpecification;
 import org.apache.isis.extensions.dnd.table.InternalTableSpecification;
 import org.apache.isis.extensions.dnd.view.Axes;
@@ -34,7 +35,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.base.Layout;
 import org.apache.isis.extensions.dnd.view.composite.GridLayout;
 import org.apache.isis.extensions.dnd.view.composite.StackLayout;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 public class FormWithTableSpecification extends SplitViewSpecification {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/combined/SplitViewSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/combined/SplitViewSpecification.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/combined/SplitViewSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/combined/SplitViewSpecification.java Tue Nov 16 12:29:07 2010
@@ -28,13 +28,13 @@ import org.apache.isis.core.metamodel.au
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.view.Axes;
 import org.apache.isis.extensions.dnd.view.Content;
 import org.apache.isis.extensions.dnd.view.Toolkit;
 import org.apache.isis.extensions.dnd.view.View;
 import org.apache.isis.extensions.dnd.view.ViewRequirement;
 import org.apache.isis.extensions.dnd.view.composite.CompositeViewSpecification;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 public abstract class SplitViewSpecification extends CompositeViewSpecification {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/combined/TwoPartViewSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/combined/TwoPartViewSpecification.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/combined/TwoPartViewSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/combined/TwoPartViewSpecification.java Tue Nov 16 12:29:07 2010
@@ -25,6 +25,7 @@ import org.apache.isis.core.metamodel.au
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.form.FormSpecification;
 import org.apache.isis.extensions.dnd.form.InternalFormSpecification;
 import org.apache.isis.extensions.dnd.view.Axes;
@@ -35,7 +36,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.base.Layout;
 import org.apache.isis.extensions.dnd.view.border.LabelBorder;
 import org.apache.isis.extensions.dnd.view.composite.ColumnLayout;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 public class TwoPartViewSpecification extends SplitViewSpecification {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/drawing/ImageFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/drawing/ImageFactory.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/drawing/ImageFactory.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/drawing/ImageFactory.java Tue Nov 16 12:29:07 2010
@@ -30,8 +30,8 @@ import java.util.Hashtable;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.util.Properties;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 public abstract class ImageFactory {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/PasswordField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/PasswordField.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/PasswordField.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/PasswordField.java Tue Nov 16 12:29:07 2010
@@ -21,6 +21,7 @@
 package org.apache.isis.extensions.dnd.field;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.Canvas;
 import org.apache.isis.extensions.dnd.drawing.Color;
 import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
@@ -33,7 +34,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.ViewSpecification;
 import org.apache.isis.extensions.dnd.view.content.TextParseableContent;
 import org.apache.isis.extensions.dnd.view.text.TextContent;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 public class PasswordField extends TextField {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/form/ExpandableViewBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/form/ExpandableViewBorder.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/form/ExpandableViewBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/form/ExpandableViewBorder.java Tue Nov 16 12:29:07 2010
@@ -27,6 +27,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.Canvas;
 import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
 import org.apache.isis.extensions.dnd.drawing.Shape;
@@ -47,7 +48,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.collection.CollectionElement;
 import org.apache.isis.extensions.dnd.view.content.FieldContent;
 import org.apache.isis.extensions.dnd.view.field.OneToOneFieldImpl;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 public class ExpandableViewBorder extends AbstractBorder {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/help/AboutView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/help/AboutView.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/help/AboutView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/help/AboutView.java Tue Nov 16 12:29:07 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.extensions.dnd.help;
 
-import org.apache.isis.runtime.about.AboutIsis;
+import org.apache.isis.core.runtime.about.AboutIsis;
 import org.apache.isis.extensions.dnd.drawing.Canvas;
 import org.apache.isis.extensions.dnd.drawing.Color;
 import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/service/ServiceIcon.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/service/ServiceIcon.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/service/ServiceIcon.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/service/ServiceIcon.java Tue Nov 16 12:29:07 2010
@@ -21,6 +21,7 @@
 package org.apache.isis.extensions.dnd.service;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
 import org.apache.isis.extensions.dnd.drawing.Location;
 import org.apache.isis.extensions.dnd.icon.Icon;
@@ -37,7 +38,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.base.IconGraphic;
 import org.apache.isis.extensions.dnd.view.option.CloseViewOption;
 import org.apache.isis.extensions.dnd.view.text.ObjectTitleText;
-import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.userprofile.PerspectiveEntry;
 
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/table/TableCellBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/table/TableCellBuilder.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/table/TableCellBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/table/TableCellBuilder.java Tue Nov 16 12:29:07 2010
@@ -31,6 +31,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.core.progmodel.facets.value.BooleanValueFacet;
 import org.apache.isis.core.progmodel.facets.value.ImageValueFacet;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.field.CheckboxField;
 import org.apache.isis.extensions.dnd.view.Axes;
 import org.apache.isis.extensions.dnd.view.Content;
@@ -47,7 +48,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.field.OneToOneFieldImpl;
 import org.apache.isis.extensions.dnd.view.field.TextParseableFieldImpl;
 import org.apache.isis.extensions.dnd.viewer.basic.UnlinedTextFieldSpecification;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 class TableCellBuilder extends AbstractViewBuilder {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/ClosedObjectNodeSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/ClosedObjectNodeSpecification.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/ClosedObjectNodeSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/ClosedObjectNodeSpecification.java Tue Nov 16 12:29:07 2010
@@ -24,6 +24,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.spec.SpecificationFacets;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.view.Axes;
 import org.apache.isis.extensions.dnd.view.Content;
 import org.apache.isis.extensions.dnd.view.ObjectContent;
@@ -31,7 +32,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.View;
 import org.apache.isis.extensions.dnd.view.ViewRequirement;
 import org.apache.isis.extensions.dnd.view.border.SelectObjectBorder;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 /**

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/OpenObjectNodeSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/OpenObjectNodeSpecification.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/OpenObjectNodeSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/OpenObjectNodeSpecification.java Tue Nov 16 12:29:07 2010
@@ -23,6 +23,7 @@ package org.apache.isis.extensions.dnd.t
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.view.Axes;
 import org.apache.isis.extensions.dnd.view.Content;
 import org.apache.isis.extensions.dnd.view.SubviewDecorator;
@@ -32,7 +33,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.border.SelectObjectBorder;
 import org.apache.isis.extensions.dnd.view.composite.ObjectFieldBuilder;
 import org.apache.isis.extensions.dnd.view.composite.StackLayout;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 /**

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/TreeNodeBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/TreeNodeBorder.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/TreeNodeBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/TreeNodeBorder.java Tue Nov 16 12:29:07 2010
@@ -27,6 +27,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.Bounds;
 import org.apache.isis.extensions.dnd.drawing.Canvas;
 import org.apache.isis.extensions.dnd.drawing.Color;
@@ -57,7 +58,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.option.UserActionAbstract;
 import org.apache.isis.extensions.dnd.view.text.ObjectTitleText;
 import org.apache.isis.extensions.dnd.view.text.TitleText;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 // TODO use ObjectBorder to provide the basic border functionality

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/util/Properties.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/util/Properties.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/util/Properties.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/util/Properties.java Tue Nov 16 12:29:07 2010
@@ -26,10 +26,10 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.config.ConfigurationException;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.Location;
 import org.apache.isis.extensions.dnd.drawing.Size;
 import org.apache.isis.extensions.dnd.view.ViewSpecification;
-import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.userprofile.Options;
 
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/View.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/View.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/View.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/View.java Tue Nov 16 12:29:07 2010
@@ -23,13 +23,13 @@ package org.apache.isis.extensions.dnd.v
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.Bounds;
 import org.apache.isis.extensions.dnd.drawing.Canvas;
 import org.apache.isis.extensions.dnd.drawing.Location;
 import org.apache.isis.extensions.dnd.drawing.Padding;
 import org.apache.isis.extensions.dnd.drawing.Size;
 import org.apache.isis.extensions.dnd.util.Properties;
-import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.userprofile.OptionsAware;
 
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/AbstractObjectOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/AbstractObjectOption.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/AbstractObjectOption.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/AbstractObjectOption.java Tue Nov 16 12:29:07 2010
@@ -27,9 +27,9 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.consent.Veto;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.view.View;
 import org.apache.isis.extensions.dnd.view.option.UserActionAbstract;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 public abstract class AbstractObjectOption extends UserActionAbstract {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/DialoggedObjectOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/DialoggedObjectOption.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/DialoggedObjectOption.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/DialoggedObjectOption.java Tue Nov 16 12:29:07 2010
@@ -24,6 +24,7 @@ import org.apache.isis.core.commons.ensu
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.Location;
 import org.apache.isis.extensions.dnd.view.BackgroundTask;
 import org.apache.isis.extensions.dnd.view.Content;
@@ -31,7 +32,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.Toolkit;
 import org.apache.isis.extensions.dnd.view.View;
 import org.apache.isis.extensions.dnd.view.Workspace;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 /**

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/ImmediateObjectOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/ImmediateObjectOption.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/ImmediateObjectOption.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/ImmediateObjectOption.java Tue Nov 16 12:29:07 2010
@@ -24,12 +24,12 @@ import org.apache.isis.core.commons.ensu
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.Location;
 import org.apache.isis.extensions.dnd.view.BackgroundTask;
 import org.apache.isis.extensions.dnd.view.Placement;
 import org.apache.isis.extensions.dnd.view.View;
 import org.apache.isis.extensions.dnd.view.Workspace;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 /**

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ObjectView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ObjectView.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ObjectView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ObjectView.java Tue Nov 16 12:29:07 2010
@@ -23,6 +23,7 @@ package org.apache.isis.extensions.dnd.v
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.Location;
 import org.apache.isis.extensions.dnd.drawing.Offset;
 import org.apache.isis.extensions.dnd.interaction.ViewDragImpl;
@@ -38,7 +39,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.ViewSpecification;
 import org.apache.isis.extensions.dnd.view.Workspace;
 import org.apache.isis.extensions.dnd.view.option.UserActionAbstract;
-import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ViewUpdateNotifierImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ViewUpdateNotifierImpl.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ViewUpdateNotifierImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ViewUpdateNotifierImpl.java Tue Nov 16 12:29:07 2010
@@ -30,12 +30,12 @@ import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.view.Content;
 import org.apache.isis.extensions.dnd.view.ObjectContent;
 import org.apache.isis.extensions.dnd.view.View;
 import org.apache.isis.extensions.dnd.view.ViewUpdateNotifier;
 import org.apache.isis.extensions.dnd.view.collection.RootCollection;
-import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
 import org.apache.isis.runtime.transaction.messagebroker.MessageBroker;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/border/SaveTransientObjectBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/border/SaveTransientObjectBorder.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/border/SaveTransientObjectBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/border/SaveTransientObjectBorder.java Tue Nov 16 12:29:07 2010
@@ -26,6 +26,7 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.Location;
 import org.apache.isis.extensions.dnd.view.ButtonAction;
 import org.apache.isis.extensions.dnd.view.Content;
@@ -35,7 +36,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.content.FieldContent;
 import org.apache.isis.extensions.dnd.view.content.RootObject;
 import org.apache.isis.extensions.dnd.view.control.AbstractButtonAction;
-import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/border/TextFieldResizeBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/border/TextFieldResizeBorder.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/border/TextFieldResizeBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/border/TextFieldResizeBorder.java Tue Nov 16 12:29:07 2010
@@ -20,6 +20,7 @@
 
 package org.apache.isis.extensions.dnd.view.border;
 
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.Canvas;
 import org.apache.isis.extensions.dnd.drawing.Color;
 import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
@@ -28,7 +29,6 @@ import org.apache.isis.extensions.dnd.dr
 import org.apache.isis.extensions.dnd.util.Properties;
 import org.apache.isis.extensions.dnd.view.Toolkit;
 import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 public class TextFieldResizeBorder extends ResizeBorder {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/border/ViewResizeBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/border/ViewResizeBorder.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/border/ViewResizeBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/border/ViewResizeBorder.java Tue Nov 16 12:29:07 2010
@@ -20,11 +20,11 @@
 
 package org.apache.isis.extensions.dnd.view.border;
 
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.Canvas;
 import org.apache.isis.extensions.dnd.drawing.Size;
 import org.apache.isis.extensions.dnd.util.Properties;
 import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 // TODO enhance so the direction of resizing can be specified (could limit to width on right, height on bottom, or width/height from corner

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/CompositeViewSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/CompositeViewSpecification.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/CompositeViewSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/CompositeViewSpecification.java Tue Nov 16 12:29:07 2010
@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.util.Properties;
 import org.apache.isis.extensions.dnd.view.Axes;
 import org.apache.isis.extensions.dnd.view.Content;
@@ -34,7 +35,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.ViewSpecification;
 import org.apache.isis.extensions.dnd.view.base.Layout;
 import org.apache.isis.extensions.dnd.view.window.SubviewFocusManager;
-import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.userprofile.Options;
 
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/IconGridViewSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/IconGridViewSpecification.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/IconGridViewSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/IconGridViewSpecification.java Tue Nov 16 12:29:07 2010
@@ -21,6 +21,7 @@
 package org.apache.isis.extensions.dnd.view.composite;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
 import org.apache.isis.extensions.dnd.drawing.Text;
 import org.apache.isis.extensions.dnd.icon.Icon;
@@ -35,7 +36,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.border.IconBorder;
 import org.apache.isis.extensions.dnd.view.border.LineBorder;
 import org.apache.isis.extensions.dnd.view.text.ObjectTitleText;
-import org.apache.isis.runtime.context.IsisContext;
 
 public class IconGridViewSpecification extends AbstractCollectionViewSpecification {
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/ObjectFieldBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/ObjectFieldBuilder.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/ObjectFieldBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/ObjectFieldBuilder.java Tue Nov 16 12:29:07 2010
@@ -29,6 +29,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
 import org.apache.isis.core.metamodel.util.IsisUtils;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.view.Axes;
 import org.apache.isis.extensions.dnd.view.Content;
 import org.apache.isis.extensions.dnd.view.ObjectContent;
@@ -38,7 +39,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.ViewFactory;
 import org.apache.isis.extensions.dnd.view.base.FieldErrorView;
 import org.apache.isis.extensions.dnd.view.content.FieldContent;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 public class ObjectFieldBuilder extends AbstractViewBuilder {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractObjectContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractObjectContent.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractObjectContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractObjectContent.java Tue Nov 16 12:29:07 2010
@@ -36,6 +36,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.Image;
 import org.apache.isis.extensions.dnd.drawing.ImageFactory;
 import org.apache.isis.extensions.dnd.drawing.Location;
@@ -46,7 +47,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.View;
 import org.apache.isis.extensions.dnd.view.Workspace;
 import org.apache.isis.extensions.dnd.view.option.UserActionAbstract;
-import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugObjectGraph.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugObjectGraph.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugObjectGraph.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugObjectGraph.java Tue Nov 16 12:29:07 2010
@@ -23,7 +23,7 @@ package org.apache.isis.extensions.dnd.v
 import org.apache.isis.core.commons.debug.DebugInfo;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.runtime.util.Dump;
 
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugView.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugView.java Tue Nov 16 12:29:07 2010
@@ -23,13 +23,13 @@ package org.apache.isis.extensions.dnd.v
 import org.apache.isis.core.commons.debug.DebugInfo;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.Bounds;
 import org.apache.isis.extensions.dnd.drawing.DebugCanvas;
 import org.apache.isis.extensions.dnd.view.Content;
 import org.apache.isis.extensions.dnd.view.ObjectContent;
 import org.apache.isis.extensions.dnd.view.View;
 import org.apache.isis.extensions.dnd.view.collection.CollectionContent;
-import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.util.Dump;
 
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/OneToManyFieldElementImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/OneToManyFieldElementImpl.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/OneToManyFieldElementImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/OneToManyFieldElementImpl.java Tue Nov 16 12:29:07 2010
@@ -28,9 +28,9 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.view.UserActionSet;
 import org.apache.isis.extensions.dnd.view.content.AbstractObjectContent;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 public class OneToManyFieldElementImpl extends AbstractObjectContent implements OneToManyFieldElement {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/OneToManyFieldImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/OneToManyFieldImpl.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/OneToManyFieldImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/OneToManyFieldImpl.java Tue Nov 16 12:29:07 2010
@@ -28,12 +28,12 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.Image;
 import org.apache.isis.extensions.dnd.drawing.ImageFactory;
 import org.apache.isis.extensions.dnd.view.Content;
 import org.apache.isis.extensions.dnd.view.UserActionSet;
 import org.apache.isis.extensions.dnd.view.collection.AbstractCollectionContent;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 public class OneToManyFieldImpl extends AbstractCollectionContent implements OneToManyField {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/OneToOneFieldImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/OneToOneFieldImpl.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/OneToOneFieldImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/OneToOneFieldImpl.java Tue Nov 16 12:29:07 2010
@@ -27,10 +27,10 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.view.UserAction;
 import org.apache.isis.extensions.dnd.view.UserActionSet;
 import org.apache.isis.extensions.dnd.view.content.AbstractObjectContent;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 public class OneToOneFieldImpl extends AbstractObjectContent implements OneToOneField {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/TextParseableFieldImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/TextParseableFieldImpl.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/TextParseableFieldImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/TextParseableFieldImpl.java Tue Nov 16 12:29:07 2010
@@ -33,10 +33,10 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.view.Content;
 import org.apache.isis.extensions.dnd.view.ObjectContent;
 import org.apache.isis.extensions.dnd.view.content.AbstractTextParsableContent;
-import org.apache.isis.runtime.context.IsisContext;
 
 
 public class TextParseableFieldImpl extends AbstractTextParsableContent implements TextParseableField, ObjectContent {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/option/DisposeObjectOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/option/DisposeObjectOption.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/option/DisposeObjectOption.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/option/DisposeObjectOption.java Tue Nov 16 12:29:07 2010
@@ -25,11 +25,11 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.Veto;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.Location;
 import org.apache.isis.extensions.dnd.view.ObjectContent;
 import org.apache.isis.extensions.dnd.view.View;
 import org.apache.isis.extensions.dnd.view.Workspace;
-import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.transaction.updatenotifier.UpdateNotifier;
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/undo/SetValueCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/undo/SetValueCommand.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/undo/SetValueCommand.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/undo/SetValueCommand.java Tue Nov 16 12:29:07 2010
@@ -23,8 +23,8 @@ package org.apache.isis.extensions.dnd.v
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.view.Command;
-import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspace.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspace.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspace.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspace.java Tue Nov 16 12:29:07 2010
@@ -34,6 +34,8 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtime.authentication.standard.exploration.MultiUserExplorationSession;
+import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
 import org.apache.isis.extensions.dnd.drawing.Location;
 import org.apache.isis.extensions.dnd.drawing.Padding;
@@ -64,8 +66,6 @@ import org.apache.isis.extensions.dnd.vi
 import org.apache.isis.extensions.dnd.view.window.DialogBorder;
 import org.apache.isis.extensions.dnd.view.window.SubviewFocusManager;
 import org.apache.isis.extensions.dnd.view.window.WindowBorder;
-import org.apache.isis.runtime.authentication.standard.exploration.MultiUserExplorationSession;
-import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
 import org.apache.isis.runtime.userprofile.PerspectiveEntry;