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 [6/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/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspaceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspaceBuilder.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspaceBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspaceBuilder.java Tue Nov 16 12:29:07 2010
@@ -25,6 +25,7 @@ import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
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.service.PerspectiveContent;
@@ -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.base.Layout;
import org.apache.isis.extensions.dnd.view.composite.AbstractViewBuilder;
-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/viewer/basic/LogoBackground.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/LogoBackground.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/LogoBackground.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/LogoBackground.java Tue Nov 16 12:29:07 2010
@@ -22,6 +22,7 @@ package org.apache.isis.extensions.dnd.v
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.Background;
import org.apache.isis.extensions.dnd.drawing.Canvas;
import org.apache.isis.extensions.dnd.drawing.Image;
@@ -29,7 +30,6 @@ import org.apache.isis.extensions.dnd.dr
import org.apache.isis.extensions.dnd.drawing.Location;
import org.apache.isis.extensions.dnd.drawing.Size;
import org.apache.isis.extensions.dnd.util.Properties;
-import org.apache.isis.runtime.context.IsisContext;
public class LogoBackground implements Background {
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/configurable/PanelViewDropTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/configurable/PanelViewDropTest.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/configurable/PanelViewDropTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/configurable/PanelViewDropTest.java Tue Nov 16 12:29:07 2010
@@ -26,6 +26,7 @@ import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.dnd.DummyContent;
import org.apache.isis.extensions.dnd.DummyView;
import org.apache.isis.extensions.dnd.DummyViewSpecification;
@@ -37,7 +38,6 @@ import org.apache.isis.extensions.dnd.vi
import org.apache.isis.extensions.dnd.view.View;
import org.apache.isis.extensions.dnd.view.ViewDrag;
import org.apache.isis.extensions.dnd.view.ViewSpecification;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.testsystem.TestProxyConfiguration;
import static org.junit.Assert.assertEquals;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/configurable/PanelViewTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/configurable/PanelViewTest.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/configurable/PanelViewTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/configurable/PanelViewTest.java Tue Nov 16 12:29:07 2010
@@ -24,13 +24,13 @@ import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.dnd.DummyContent;
import org.apache.isis.extensions.dnd.DummyViewSpecification;
import org.apache.isis.extensions.dnd.TestToolkit;
import org.apache.isis.extensions.dnd.configurable.PanelView.Position;
import org.apache.isis.extensions.dnd.drawing.Location;
import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.testsystem.TestProxyConfiguration;
import static org.junit.Assert.assertEquals;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/MultilineTextFieldContentTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/MultilineTextFieldContentTest.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/MultilineTextFieldContentTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/MultilineTextFieldContentTest.java Tue Nov 16 12:29:07 2010
@@ -35,13 +35,13 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+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.extensions.dnd.view.text.CursorPosition;
import org.apache.isis.extensions.dnd.view.text.TextBlockTarget;
import org.apache.isis.extensions.dnd.view.text.TextContent;
import org.apache.isis.extensions.dnd.view.text.TextSelection;
-import org.apache.isis.runtime.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.session.IsisSessionFactoryDefault;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/TextFieldContentTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/TextFieldContentTest.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/TextFieldContentTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/TextFieldContentTest.java Tue Nov 16 12:29:07 2010
@@ -37,13 +37,13 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+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.extensions.dnd.drawing.Location;
import org.apache.isis.extensions.dnd.view.text.CursorPosition;
import org.apache.isis.extensions.dnd.view.text.TextBlockTarget;
import org.apache.isis.extensions.dnd.view.text.TextContent;
-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.PersistenceSession;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/ViewUpdateNotifierTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/ViewUpdateNotifierTest.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/ViewUpdateNotifierTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/ViewUpdateNotifierTest.java Tue Nov 16 12:29:07 2010
@@ -43,16 +43,16 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.standard.exploration.ExplorationSession;
+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.extensions.dnd.DummyView;
import org.apache.isis.extensions.dnd.DummyWorkspaceView;
import org.apache.isis.extensions.dnd.view.View;
import org.apache.isis.extensions.dnd.view.base.ViewUpdateNotifierImpl;
import org.apache.isis.extensions.dnd.view.content.RootObject;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.authentication.standard.exploration.ExplorationSession;
-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.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ActionFieldBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ActionFieldBuilderTest.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ActionFieldBuilderTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ActionFieldBuilderTest.java Tue Nov 16 12:29:07 2010
@@ -38,17 +38,17 @@ import org.apache.isis.core.metamodel.au
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.standard.exploration.ExplorationSession;
+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.extensions.dnd.DummyView;
import org.apache.isis.extensions.dnd.dialog.ActionFieldBuilder;
import org.apache.isis.extensions.dnd.view.Axes;
import org.apache.isis.extensions.dnd.view.Content;
import org.apache.isis.extensions.dnd.view.View;
import org.apache.isis.extensions.dnd.view.ViewFactory;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.authentication.standard.exploration.ExplorationSession;
-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.persistence.PersistenceSessionFactory;
import org.apache.isis.runtime.session.IsisSessionFactoryDefault;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/PlacementStrategyImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/PlacementStrategyImplTest.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/PlacementStrategyImplTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/PlacementStrategyImplTest.java Tue Nov 16 12:29:07 2010
@@ -23,12 +23,12 @@ package org.apache.isis.extensions.dnd.v
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.dnd.DummyView;
import org.apache.isis.extensions.dnd.DummyWorkspaceView;
import org.apache.isis.extensions.dnd.drawing.Location;
import org.apache.isis.extensions.dnd.drawing.Size;
import org.apache.isis.extensions.dnd.view.PlacementStrategyImpl;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.testsystem.TestProxyConfiguration;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ScrollBorderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ScrollBorderTest.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ScrollBorderTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ScrollBorderTest.java Tue Nov 16 12:29:07 2010
@@ -35,6 +35,9 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+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.extensions.dnd.DummyView;
import org.apache.isis.extensions.dnd.TestToolkit;
import org.apache.isis.extensions.dnd.drawing.Location;
@@ -42,9 +45,6 @@ import org.apache.isis.extensions.dnd.dr
import org.apache.isis.extensions.dnd.view.View;
import org.apache.isis.extensions.dnd.view.ViewAreaType;
import org.apache.isis.extensions.dnd.view.border.ScrollBorder;
-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.session.IsisSessionFactory;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/TitleTextTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/TitleTextTest.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/TitleTextTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/TitleTextTest.java Tue Nov 16 12:29:07 2010
@@ -20,6 +20,7 @@
package org.apache.isis.extensions.dnd.viewer.basic;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.dnd.DummyCanvas;
import org.apache.isis.extensions.dnd.DummyView;
import org.apache.isis.extensions.dnd.TestToolkit;
@@ -29,7 +30,6 @@ import org.apache.isis.extensions.dnd.dr
import org.apache.isis.extensions.dnd.view.Toolkit;
import org.apache.isis.extensions.dnd.view.text.TitleText;
import org.apache.isis.extensions.dnd.viewer.drawing.DummyText;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
import org.apache.isis.runtime.testsystem.TestProxyConfiguration;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/table/TableRowLayoutTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/table/TableRowLayoutTest.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/table/TableRowLayoutTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/table/TableRowLayoutTest.java Tue Nov 16 12:29:07 2010
@@ -25,13 +25,13 @@ import junit.framework.Assert;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.Test;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.dnd.DummyView;
import org.apache.isis.extensions.dnd.TestToolkit;
import org.apache.isis.extensions.dnd.drawing.Size;
import org.apache.isis.extensions.dnd.table.TableAxis;
import org.apache.isis.extensions.dnd.table.TableRowLayout;
import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.testsystem.TestProxyConfiguration;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/tree/TreeBrowserFrameTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/tree/TreeBrowserFrameTest.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/tree/TreeBrowserFrameTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/tree/TreeBrowserFrameTest.java Tue Nov 16 12:29:07 2010
@@ -20,6 +20,7 @@
package org.apache.isis.extensions.dnd.viewer.tree;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.dnd.DummyContent;
import org.apache.isis.extensions.dnd.DummyView;
import org.apache.isis.extensions.dnd.DummyViewSpecification;
@@ -29,7 +30,6 @@ import org.apache.isis.extensions.dnd.dr
import org.apache.isis.extensions.dnd.drawing.Size;
import org.apache.isis.extensions.dnd.view.View;
import org.apache.isis.extensions.dnd.view.composite.MasterDetailPanel;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
import org.apache.isis.runtime.testsystem.TestProxyConfiguration;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/view/configurable/GridLayoutTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/view/configurable/GridLayoutTest.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/view/configurable/GridLayoutTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/view/configurable/GridLayoutTest.java Tue Nov 16 12:29:07 2010
@@ -27,11 +27,11 @@ import org.jmock.integration.junit4.JUni
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+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.View;
import org.apache.isis.extensions.dnd.view.composite.GridLayout;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.testsystem.TestProxyConfiguration;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/LogOut.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/LogOut.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/LogOut.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/LogOut.java Tue Nov 16 12:29:07 2010
@@ -21,11 +21,11 @@
package org.apache.isis.extensions.html.action;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.component.Page;
import org.apache.isis.extensions.html.context.Context;
import org.apache.isis.extensions.html.request.Request;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.context.IsisContext;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Welcome.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Welcome.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Welcome.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Welcome.java Tue Nov 16 12:29:07 2010
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.html.action;
-import org.apache.isis.runtime.about.AboutIsis;
+import org.apache.isis.core.runtime.about.AboutIsis;
import org.apache.isis.extensions.html.component.Page;
import org.apache.isis.extensions.html.component.ViewPane;
import org.apache.isis.extensions.html.context.Context;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/edit/Save.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/edit/Save.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/edit/Save.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/edit/Save.java Tue Nov 16 12:29:07 2010
@@ -21,12 +21,12 @@
package org.apache.isis.extensions.html.action.edit;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.action.Action;
import org.apache.isis.extensions.html.component.Page;
import org.apache.isis.extensions.html.context.Context;
import org.apache.isis.extensions.html.request.ForwardRequest;
import org.apache.isis.extensions.html.request.Request;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.transaction.IsisTransactionManager;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/misc/About.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/misc/About.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/misc/About.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/misc/About.java Tue Nov 16 12:29:07 2010
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.html.action.misc;
-import org.apache.isis.runtime.about.AboutIsis;
+import org.apache.isis.core.runtime.about.AboutIsis;
import org.apache.isis.extensions.html.action.Action;
import org.apache.isis.extensions.html.component.Page;
import org.apache.isis.extensions.html.component.ViewPane;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/misc/SetUser.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/misc/SetUser.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/misc/SetUser.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/misc/SetUser.java Tue Nov 16 12:29:07 2010
@@ -20,13 +20,13 @@
package org.apache.isis.extensions.html.action.misc;
+import org.apache.isis.core.runtime.authentication.standard.exploration.MultiUserExplorationSession;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.action.Action;
import org.apache.isis.extensions.html.component.Page;
import org.apache.isis.extensions.html.component.ViewPane;
import org.apache.isis.extensions.html.context.Context;
import org.apache.isis.extensions.html.request.Request;
-import org.apache.isis.runtime.authentication.standard.exploration.MultiUserExplorationSession;
-import org.apache.isis.runtime.context.IsisContext;
public class SetUser implements Action {
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/misc/SwapUser.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/misc/SwapUser.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/misc/SwapUser.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/misc/SwapUser.java Tue Nov 16 12:29:07 2010
@@ -22,13 +22,13 @@ package org.apache.isis.extensions.html.
import java.util.StringTokenizer;
+import org.apache.isis.core.runtime.authentication.standard.exploration.ExplorationAuthenticatorConstants;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.action.Action;
import org.apache.isis.extensions.html.component.Page;
import org.apache.isis.extensions.html.component.ViewPane;
import org.apache.isis.extensions.html.context.Context;
import org.apache.isis.extensions.html.request.Request;
-import org.apache.isis.runtime.authentication.standard.exploration.ExplorationAuthenticatorConstants;
-import org.apache.isis.runtime.context.IsisContext;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/FieldCollectionView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/FieldCollectionView.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/FieldCollectionView.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/FieldCollectionView.java Tue Nov 16 12:29:07 2010
@@ -23,12 +23,12 @@ package org.apache.isis.extensions.html.
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.action.view.util.TableUtil;
import org.apache.isis.extensions.html.component.Table;
import org.apache.isis.extensions.html.component.ViewPane;
import org.apache.isis.extensions.html.context.Context;
import org.apache.isis.extensions.html.request.Request;
-import org.apache.isis.runtime.context.IsisContext;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectView.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectView.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectView.java Tue Nov 16 12:29:07 2010
@@ -26,13 +26,13 @@ import org.apache.isis.core.metamodel.sp
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.html.component.Block;
import org.apache.isis.extensions.html.component.Component;
import org.apache.isis.extensions.html.component.ComponentFactory;
import org.apache.isis.extensions.html.component.ViewPane;
import org.apache.isis.extensions.html.context.Context;
import org.apache.isis.extensions.html.request.Request;
-import org.apache.isis.runtime.context.IsisContext;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectViewAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectViewAbstract.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectViewAbstract.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectViewAbstract.java Tue Nov 16 12:29:07 2010
@@ -21,6 +21,7 @@
package org.apache.isis.extensions.html.action.view;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.action.Action;
import org.apache.isis.extensions.html.action.ActionException;
import org.apache.isis.extensions.html.action.view.util.MenuUtil;
@@ -28,7 +29,6 @@ import org.apache.isis.extensions.html.c
import org.apache.isis.extensions.html.component.ViewPane;
import org.apache.isis.extensions.html.context.Context;
import org.apache.isis.extensions.html.request.Request;
-import org.apache.isis.runtime.context.IsisContext;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/util/MenuUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/util/MenuUtil.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/util/MenuUtil.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/util/MenuUtil.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.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.component.Component;
import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.runtime.context.IsisContext;
public class MenuUtil {
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/util/TableUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/util/TableUtil.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/util/TableUtil.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/util/TableUtil.java Tue Nov 16 12:29:07 2010
@@ -28,10 +28,10 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.component.ComponentFactory;
import org.apache.isis.extensions.html.component.Table;
import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
import static org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters.PROPERTIES;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/CollectionIcon.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/CollectionIcon.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/CollectionIcon.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/CollectionIcon.java Tue Nov 16 12:29:07 2010
@@ -25,10 +25,10 @@ import java.io.PrintWriter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
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.html.component.Component;
import org.apache.isis.extensions.html.image.ImageLookup;
import org.apache.isis.extensions.html.request.Request;
-import org.apache.isis.runtime.context.IsisContext;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/HtmlComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/HtmlComponentFactory.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/HtmlComponentFactory.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/HtmlComponentFactory.java Tue Nov 16 12:29:07 2010
@@ -26,13 +26,13 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.progmodel.facets.value.BooleanValueFacet;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.component.Block;
import org.apache.isis.extensions.html.component.Component;
import org.apache.isis.extensions.html.component.ComponentFactory;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/HtmlForm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/HtmlForm.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/HtmlForm.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/HtmlForm.java Tue Nov 16 12:29:07 2010
@@ -23,9 +23,9 @@ package org.apache.isis.extensions.html.
import java.io.PrintWriter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.component.ComponentComposite;
import org.apache.isis.extensions.html.component.Form;
-import org.apache.isis.runtime.context.IsisContext;
public class HtmlForm extends ComponentComposite implements Form {
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/CollectionMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/CollectionMapping.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/CollectionMapping.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/CollectionMapping.java Tue Nov 16 12:29:07 2010
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
-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;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/Context.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/Context.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/Context.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/Context.java Tue Nov 16 12:29:07 2010
@@ -38,6 +38,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.component.Block;
import org.apache.isis.extensions.html.component.ComponentFactory;
import org.apache.isis.extensions.html.crumb.CollectionCrumb;
@@ -47,7 +48,6 @@ import org.apache.isis.extensions.html.c
import org.apache.isis.extensions.html.crumb.TaskCrumb;
import org.apache.isis.extensions.html.request.Request;
import org.apache.isis.extensions.html.task.Task;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.ConcurrencyException;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.isis.runtime.userprofile.UserProfile;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/ObjectHistory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/ObjectHistory.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/ObjectHistory.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/ObjectHistory.java Tue Nov 16 12:29:07 2010
@@ -29,9 +29,9 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.component.Block;
import org.apache.isis.extensions.html.component.Component;
-import org.apache.isis.runtime.context.IsisContext;
public class ObjectHistory {
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/PersistentObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/PersistentObjectMapping.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/PersistentObjectMapping.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/PersistentObjectMapping.java Tue Nov 16 12:29:07 2010
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.version.Version;
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.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/TransientObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/TransientObjectMapping.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/TransientObjectMapping.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/TransientObjectMapping.java Tue Nov 16 12:29:07 2010
@@ -25,7 +25,7 @@ import org.apache.isis.core.commons.ensu
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.version.Version;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.runtime.memento.Memento;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/ControllerServlet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/ControllerServlet.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/ControllerServlet.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/ControllerServlet.java Tue Nov 16 12:29:07 2010
@@ -33,13 +33,13 @@ import javax.servlet.http.HttpSession;
import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.component.Page;
import org.apache.isis.extensions.html.component.html.HtmlComponentFactory;
import org.apache.isis.extensions.html.context.Context;
import org.apache.isis.extensions.html.request.Request;
import org.apache.isis.extensions.html.request.ServletRequest;
import org.apache.isis.extensions.html.servlet.internal.WebController;
-import org.apache.isis.runtime.context.IsisContext;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/LogonServlet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/LogonServlet.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/LogonServlet.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/LogonServlet.java Tue Nov 16 12:29:07 2010
@@ -30,16 +30,16 @@ import javax.servlet.http.HttpSession;
import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.webapp.WebAppConstants;
import org.apache.isis.core.webapp.auth.AuthenticationSessionLookupStrategyDefault;
import org.apache.isis.extensions.html.component.html.HtmlComponentFactory;
import org.apache.isis.extensions.html.component.html.LogonFormPage;
import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.runtime.authentication.AuthenticationRequestPassword;
-import org.apache.isis.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.system.DeploymentType;
import org.apache.isis.runtime.system.internal.monitor.Monitor;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/internal/WebController.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/internal/WebController.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/internal/WebController.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/internal/WebController.java Tue Nov 16 12:29:07 2010
@@ -32,6 +32,7 @@ import org.apache.isis.core.commons.exce
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.action.Action;
import org.apache.isis.extensions.html.action.ActionException;
import org.apache.isis.extensions.html.action.ChangeContext;
@@ -61,7 +62,6 @@ import org.apache.isis.extensions.html.r
import org.apache.isis.extensions.html.task.InvokeMethod;
import org.apache.isis.extensions.html.task.TaskLookupException;
import org.apache.isis.extensions.html.task.TaskStep;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.isis.runtime.system.internal.monitor.Monitor;
import org.apache.isis.runtime.userprofile.UserProfile;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/AddItemToCollectionTask.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/AddItemToCollectionTask.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/AddItemToCollectionTask.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/AddItemToCollectionTask.java Tue Nov 16 12:29:07 2010
@@ -25,9 +25,9 @@ import org.apache.isis.core.metamodel.co
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.component.Page;
import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/EditTask.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/EditTask.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/EditTask.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/EditTask.java Tue Nov 16 12:29:07 2010
@@ -33,9 +33,9 @@ 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.IsisUtils;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.component.Page;
import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/InvokeMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/InvokeMethod.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/InvokeMethod.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/InvokeMethod.java Tue Nov 16 12:29:07 2010
@@ -28,13 +28,13 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.spec.Persistability;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.action.Action;
import org.apache.isis.extensions.html.action.ActionException;
import org.apache.isis.extensions.html.component.Page;
import org.apache.isis.extensions.html.context.Context;
import org.apache.isis.extensions.html.request.ForwardRequest;
import org.apache.isis.extensions.html.request.Request;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.transaction.messagebroker.MessageBroker;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/MethodTask.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/MethodTask.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/MethodTask.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/MethodTask.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.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.ParseableEntryActionParameter;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.component.Page;
import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.transaction.messagebroker.MessageBroker;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/Task.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/Task.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/Task.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/Task.java Tue Nov 16 12:29:07 2010
@@ -28,10 +28,10 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationFacets;
import org.apache.isis.core.progmodel.facets.value.PasswordValueFacet;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.extensions.html.component.Page;
import org.apache.isis.extensions.html.context.Context;
import org.apache.isis.extensions.html.request.Request;
-import org.apache.isis.runtime.context.IsisContext;
/**
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/viewer/HtmlViewerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/viewer/HtmlViewerInstaller.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/viewer/HtmlViewerInstaller.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/viewer/HtmlViewerInstaller.java Tue Nov 16 12:29:07 2010
@@ -21,13 +21,13 @@
package org.apache.isis.extensions.html.viewer;
import org.apache.isis.core.commons.lang.MapUtils;
+import org.apache.isis.core.runtime.Isis;
import org.apache.isis.core.webapp.IsisSessionFilter;
import org.apache.isis.core.webapp.StaticContentFilter;
import org.apache.isis.core.webapp.servlets.ResourceServlet;
import org.apache.isis.extensions.html.servlet.ControllerServlet;
import org.apache.isis.extensions.html.servlet.HtmlServletConstants;
import org.apache.isis.extensions.html.servlet.LogonServlet;
-import org.apache.isis.runtime.Isis;
import org.apache.isis.runtime.viewer.IsisViewer;
import org.apache.isis.runtime.viewer.IsisViewerInstallerAbstract;
import org.apache.isis.runtime.web.EmbeddedWebViewer;
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java Tue Nov 16 12:29:07 2010
@@ -37,12 +37,12 @@ import org.apache.isis.core.metamodel.co
import org.apache.isis.core.metamodel.config.ConfigurationBuilderDefault;
import org.apache.isis.core.metamodel.config.ConfigurationBuilderFileSystem;
import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.runtime.authentication.standard.SimpleSession;
-import org.apache.isis.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
-import org.apache.isis.runtime.authentication.standard.exploration.ExplorationSession;
-import org.apache.isis.runtime.authentication.standard.fixture.AuthenticationRequestLogonFixture;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
+import org.apache.isis.core.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
+import org.apache.isis.core.runtime.authentication.standard.exploration.ExplorationSession;
+import org.apache.isis.core.runtime.authentication.standard.fixture.AuthenticationRequestLogonFixture;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.runtime.installers.InstallerLookupDefault;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.system.DeploymentType;
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/FixtureInstallerAnnotatedClass.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/FixtureInstallerAnnotatedClass.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/FixtureInstallerAnnotatedClass.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/FixtureInstallerAnnotatedClass.java Tue Nov 16 12:29:07 2010
@@ -23,8 +23,8 @@ package org.apache.isis.viewer.junit.int
import java.util.ArrayList;
import java.util.List;
-import org.apache.isis.runtime.fixturesinstaller.FixturesInstallerAbstract;
-import org.apache.isis.runtime.fixturesinstaller.FixturesInstallerDelegate;
+import org.apache.isis.core.runtime.fixturesinstaller.FixturesInstallerAbstract;
+import org.apache.isis.core.runtime.fixturesinstaller.FixturesInstallerDelegate;
import org.apache.isis.viewer.junit.Fixture;
import org.apache.isis.viewer.junit.Fixtures;
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyParams.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyParams.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyParams.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyParams.java Tue Nov 16 12:29:07 2010
@@ -5,9 +5,9 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.webapp.auth.AuthenticationSessionLookupStrategyDefault;
-import org.apache.isis.runtime.authentication.AuthenticationRequestPassword;
-import org.apache.isis.runtime.context.IsisContext;
public class AuthenticationSessionLookupStrategyParams extends AuthenticationSessionLookupStrategyDefault {
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyTrusted.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyTrusted.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyTrusted.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyTrusted.java Tue Nov 16 12:29:07 2010
@@ -4,9 +4,9 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.webapp.auth.AuthenticationSessionLookupStrategyDefault;
-import org.apache.isis.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
-import org.apache.isis.runtime.context.IsisContext;
public class AuthenticationSessionLookupStrategyTrusted extends AuthenticationSessionLookupStrategyDefault {
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/filters/IsisSessionFilter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/filters/IsisSessionFilter.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/filters/IsisSessionFilter.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/filters/IsisSessionFilter.java Tue Nov 16 12:29:07 2010
@@ -12,11 +12,11 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpSession;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.runtime.authentication.AuthenticationRequestPassword;
-import org.apache.isis.runtime.authentication.standard.exploration.ExplorationSession;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.runtime.authentication.standard.exploration.ExplorationSession;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.runtime.system.DeploymentType;
import org.apache.log4j.Logger;
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java Tue Nov 16 12:29:07 2010
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.fa
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.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.oidgenerator.OidGenerator;
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java Tue Nov 16 12:29:07 2010
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.viewer.restful.applib.resources.ObjectResource;
import org.apache.isis.viewer.restful.viewer.Constants;
import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java Tue Nov 16 12:29:07 2010
@@ -20,7 +20,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.viewer.restful.applib.resources.SpecsResource;
import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
import org.apache.isis.viewer.restful.viewer.html.XhtmlTemplate;
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/OidUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/OidUtils.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/OidUtils.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/OidUtils.java Tue Nov 16 12:29:07 2010
@@ -3,7 +3,7 @@ package org.apache.isis.viewer.restful.v
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
-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;
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/xom/TableColumnAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/xom/TableColumnAbstract.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/xom/TableColumnAbstract.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/xom/TableColumnAbstract.java Tue Nov 16 12:29:07 2010
@@ -4,7 +4,7 @@ import nu.xom.Element;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
-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.oidgenerator.OidGenerator;
import org.apache.isis.viewer.restful.viewer.util.OidUtils;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/AbstractObjectProcessor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/AbstractObjectProcessor.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/AbstractObjectProcessor.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/AbstractObjectProcessor.java Tue Nov 16 12:29:07 2010
@@ -22,7 +22,7 @@ package org.apache.isis.webapp;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.webapp.processor.Request;
public abstract class AbstractObjectProcessor extends AbstractElementProcessor {
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/Dispatcher.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/Dispatcher.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/Dispatcher.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/Dispatcher.java Tue Nov 16 12:29:07 2010
@@ -45,7 +45,7 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.webapp.action.ActionAction;
import org.apache.isis.webapp.context.RequestContext;
import org.apache.isis.webapp.context.RequestContext.Debug;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/UserManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/UserManager.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/UserManager.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/UserManager.java Tue Nov 16 12:29:07 2010
@@ -22,9 +22,9 @@ package org.apache.isis.webapp;
import org.apache.log4j.Logger;
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.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.webapp.context.RequestContext;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/action/ActionAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/action/ActionAction.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/action/ActionAction.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/action/ActionAction.java Tue Nov 16 12:29:07 2010
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.ConcurrencyException;
import org.apache.isis.webapp.Action;
import org.apache.isis.webapp.Dispatcher;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/DefaultOidObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/DefaultOidObjectMapping.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/DefaultOidObjectMapping.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/DefaultOidObjectMapping.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.encoding.DataOutputExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputStreamExtended;
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.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.webapp.ScimpiException;
import org.apache.isis.webapp.context.RequestContext.Scope;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/HibernateOidObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/HibernateOidObjectMapping.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/HibernateOidObjectMapping.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/HibernateOidObjectMapping.java Tue Nov 16 12:29:07 2010
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
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.webapp.context.RequestContext.Scope;
import org.apache.isis.webapp.debug.DebugView;
import org.apache.isis.webapp.processor.Request;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/Mapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/Mapping.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/Mapping.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/Mapping.java Tue Nov 16 12:29:07 2010
@@ -25,7 +25,7 @@ import org.apache.isis.core.commons.ensu
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.runtime.memento.Memento;
interface Mapping {
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/RequestContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/RequestContext.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/RequestContext.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/RequestContext.java Tue Nov 16 12:29:07 2010
@@ -35,7 +35,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.webapp.Dispatcher;
import org.apache.isis.webapp.ScimpiException;
import org.apache.isis.webapp.action.PropertyException;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/SerialOidObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/SerialOidObjectMapping.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/SerialOidObjectMapping.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/SerialOidObjectMapping.java Tue Nov 16 12:29:07 2010
@@ -27,7 +27,7 @@ import java.util.Map;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
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.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.webapp.context.RequestContext.Scope;
import org.apache.isis.webapp.debug.DebugView;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/debug/DebugAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/debug/DebugAction.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/debug/DebugAction.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/debug/DebugAction.java Tue Nov 16 12:29:07 2010
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.runtime.util.Dump;
import org.apache.isis.webapp.Action;
import org.apache.isis.webapp.Dispatcher;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/edit/EditAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/edit/EditAction.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/edit/EditAction.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/edit/EditAction.java Tue Nov 16 12:29:07 2010
@@ -32,7 +32,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.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.webapp.Action;
import org.apache.isis.webapp.Dispatcher;
import org.apache.isis.webapp.context.RequestContext;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/edit/RemoveAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/edit/RemoveAction.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/edit/RemoveAction.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/edit/RemoveAction.java Tue Nov 16 12:29:07 2010
@@ -25,7 +25,7 @@ import java.io.IOException;
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.OneToManyAssociation;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.webapp.Action;
import org.apache.isis.webapp.ForbiddenException;
import org.apache.isis.webapp.ScimpiException;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/logon/LogonAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/logon/LogonAction.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/logon/LogonAction.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/logon/LogonAction.java Tue Nov 16 12:29:07 2010
@@ -23,7 +23,7 @@ package org.apache.isis.webapp.logon;
import java.io.IOException;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
import org.apache.isis.webapp.Action;
import org.apache.isis.webapp.Dispatcher;
import org.apache.isis.webapp.UserManager;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/logon/LogoutAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/logon/LogoutAction.java?rev=1035613&r1=1035612&r2=1035613&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/logon/LogoutAction.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/logon/LogoutAction.java Tue Nov 16 12:29:07 2010
@@ -23,7 +23,7 @@ package org.apache.isis.webapp.logon;
import java.io.IOException;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.webapp.Action;
import org.apache.isis.webapp.UserManager;
import org.apache.isis.webapp.context.RequestContext;