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 2011/03/26 12:07:17 UTC
svn commit: r1085690 [11/11] - in /incubator/isis/trunk: ./ applib/ core/
core/commons/
core/commons/src/main/java/org/apache/isis/core/commons/authentication/
core/commons/src/site/ core/metamodel/
core/metamodel/src/main/java/org/apache/isis/core/met...
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtImageFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtImageFactory.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtImageFactory.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtImageFactory.java Sat Mar 26 11:07:04 2011
@@ -24,8 +24,8 @@ import java.awt.Toolkit;
import java.awt.image.FilteredImageSource;
import java.awt.image.RGBImageFilter;
-import org.apache.isis.runtimes.dflt.runtime.imageloader.TemplateImage;
-import org.apache.isis.runtimes.dflt.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.imageloader.TemplateImage;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
import org.apache.isis.viewer.dnd.drawing.Color;
import org.apache.isis.viewer.dnd.drawing.Image;
import org.apache.isis.viewer.dnd.drawing.ImageFactory;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java Sat Mar 26 11:07:04 2011
@@ -43,8 +43,8 @@ import org.apache.log4j.Logger;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.lang.StringUtils;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtimes.dflt.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/viewer/dnd/awt/ViewerFrame.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java Sat Mar 26 11:07:04 2011
@@ -31,7 +31,7 @@ import java.awt.event.WindowEvent;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import org.apache.isis.runtimes.dflt.runtime.about.AboutIsis;
+import org.apache.isis.core.runtime.about.AboutIsis;
import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
import org.apache.isis.viewer.dnd.view.Toolkit;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/help/AboutView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/help/AboutView.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/help/AboutView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/help/AboutView.java Sat Mar 26 11:07:04 2011
@@ -20,7 +20,7 @@
package org.apache.isis.viewer.dnd.help;
-import org.apache.isis.runtimes.dflt.runtime.about.AboutIsis;
+import org.apache.isis.core.runtime.about.AboutIsis;
import org.apache.isis.viewer.dnd.drawing.Canvas;
import org.apache.isis.viewer.dnd.drawing.Color;
import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugAdapter.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugAdapter.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugAdapter.java Sat Mar 26 11:07:04 2011
@@ -23,7 +23,7 @@ package org.apache.isis.viewer.dnd.view.
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.runtimes.dflt.runtime.util.Dump;
+import org.apache.isis.core.metamodel.util.Dump;
public class DebugAdapter implements DebuggableWithTitle {
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugObjectGraph.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugObjectGraph.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugObjectGraph.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugObjectGraph.java Sat Mar 26 11:07:04 2011
@@ -23,8 +23,8 @@ package org.apache.isis.viewer.dnd.view.
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.util.Dump;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.util.Dump;
public class DebugObjectGraph implements DebuggableWithTitle {
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugObjectSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugObjectSpecification.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugObjectSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugObjectSpecification.java Sat Mar 26 11:07:04 2011
@@ -24,7 +24,7 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtimes.dflt.runtime.util.Dump;
+import org.apache.isis.core.metamodel.util.Dump;
public class DebugObjectSpecification implements DebuggableWithTitle {
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugView.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugView.java Sat Mar 26 11:07:04 2011
@@ -23,8 +23,8 @@ package org.apache.isis.viewer.dnd.view.
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.util.Dump;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.util.Dump;
import org.apache.isis.viewer.dnd.drawing.Bounds;
import org.apache.isis.viewer.dnd.drawing.DebugCanvas;
import org.apache.isis.viewer.dnd.view.Content;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java Sat Mar 26 11:07:04 2011
@@ -36,10 +36,10 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtimes.dflt.runtime.authorization.AuthorizationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authorization.AuthorizationManager;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContextStatic;
-import org.apache.isis.runtimes.dflt.runtime.imageloader.TemplateImageLoader;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtimes.dflt.runtime.session.IsisSessionFactoryDefault;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java Sat Mar 26 11:07:04 2011
@@ -38,10 +38,10 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtimes.dflt.runtime.authorization.AuthorizationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authorization.AuthorizationManager;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContextStatic;
-import org.apache.isis.runtimes.dflt.runtime.imageloader.TemplateImageLoader;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtimes.dflt.runtime.session.IsisSessionFactory;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java Sat Mar 26 11:07:04 2011
@@ -44,12 +44,12 @@ import org.apache.isis.core.commons.exce
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authorization.AuthorizationManager;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
import org.apache.isis.runtimes.dflt.runtime.authentication.standard.exploration.ExplorationSession;
-import org.apache.isis.runtimes.dflt.runtime.authorization.AuthorizationManager;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContextStatic;
-import org.apache.isis.runtimes.dflt.runtime.imageloader.TemplateImageLoader;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtimes.dflt.runtime.session.IsisSessionFactory;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java Sat Mar 26 11:07:04 2011
@@ -39,12 +39,12 @@ import org.apache.isis.core.commons.auth
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authorization.AuthorizationManager;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
import org.apache.isis.runtimes.dflt.runtime.authentication.standard.exploration.ExplorationSession;
-import org.apache.isis.runtimes.dflt.runtime.authorization.AuthorizationManager;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContextStatic;
-import org.apache.isis.runtimes.dflt.runtime.imageloader.TemplateImageLoader;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtimes.dflt.runtime.session.IsisSessionFactoryDefault;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java Sat Mar 26 11:07:04 2011
@@ -36,10 +36,10 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtimes.dflt.runtime.authorization.AuthorizationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authorization.AuthorizationManager;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContextStatic;
-import org.apache.isis.runtimes.dflt.runtime.imageloader.TemplateImageLoader;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtimes.dflt.runtime.session.IsisSessionFactory;
import org.apache.isis.runtimes.dflt.runtime.session.IsisSessionFactoryDefault;
Modified: incubator/isis/trunk/viewer/html/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/pom.xml?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/pom.xml (original)
+++ incubator/isis/trunk/viewer/html/pom.xml Sat Mar 26 11:07:04 2011
@@ -5,12 +5,12 @@
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>viewer</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>html</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<name>Html Viewer</name>
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.isis.runtimes</groupId>
<artifactId>dflt</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -81,6 +81,16 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>runtime</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>webapp</artifactId>
+ </dependency>
<!-- TODO: remove this dependency -->
<dependency>
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java Sat Mar 26 11:07:04 2011
@@ -21,14 +21,14 @@
package org.apache.isis.viewer.html;
import org.apache.isis.core.commons.lang.MapUtils;
+import org.apache.isis.core.webapp.content.StaticContentFilter;
+import org.apache.isis.core.webapp.content.ResourceServlet;
import org.apache.isis.runtimes.dflt.runtime.Isis;
import org.apache.isis.runtimes.dflt.runtime.viewer.IsisViewer;
import org.apache.isis.runtimes.dflt.runtime.viewer.IsisViewerInstallerAbstract;
import org.apache.isis.runtimes.dflt.runtime.web.EmbeddedWebViewer;
import org.apache.isis.runtimes.dflt.runtime.web.WebAppSpecification;
import org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter;
-import org.apache.isis.runtimes.dflt.webapp.StaticContentFilter;
-import org.apache.isis.runtimes.dflt.webapp.servlets.ResourceServlet;
import org.apache.isis.viewer.html.servlet.ControllerServlet;
import org.apache.isis.viewer.html.servlet.HtmlServletConstants;
import org.apache.isis.viewer.html.servlet.LogonServlet;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/LogOut.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/LogOut.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/LogOut.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/LogOut.java Sat Mar 26 11:07:04 2011
@@ -21,7 +21,7 @@
package org.apache.isis.viewer.html.action;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
import org.apache.isis.viewer.html.component.Page;
import org.apache.isis.viewer.html.context.Context;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Welcome.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Welcome.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Welcome.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Welcome.java Sat Mar 26 11:07:04 2011
@@ -20,7 +20,7 @@
package org.apache.isis.viewer.html.action;
-import org.apache.isis.runtimes.dflt.runtime.about.AboutIsis;
+import org.apache.isis.core.runtime.about.AboutIsis;
import org.apache.isis.viewer.html.component.Page;
import org.apache.isis.viewer.html.component.ViewPane;
import org.apache.isis.viewer.html.context.Context;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/About.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/About.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/About.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/About.java Sat Mar 26 11:07:04 2011
@@ -20,7 +20,7 @@
package org.apache.isis.viewer.html.action.misc;
-import org.apache.isis.runtimes.dflt.runtime.about.AboutIsis;
+import org.apache.isis.core.runtime.about.AboutIsis;
import org.apache.isis.viewer.html.action.Action;
import org.apache.isis.viewer.html.component.Page;
import org.apache.isis.viewer.html.component.ViewPane;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/LogonServlet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/LogonServlet.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/LogonServlet.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/LogonServlet.java Sat Mar 26 11:07:04 2011
@@ -31,9 +31,9 @@ import javax.servlet.http.HttpSession;
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationRequestPassword;
+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.runtimes.dflt.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/WebController.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/WebController.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/WebController.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/WebController.java Sat Mar 26 11:07:04 2011
@@ -33,11 +33,11 @@ import org.apache.isis.core.commons.exce
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.util.Dump;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.isis.runtimes.dflt.runtime.system.internal.monitor.Monitor;
import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfile;
-import org.apache.isis.runtimes.dflt.runtime.util.Dump;
import org.apache.isis.viewer.html.action.Action;
import org.apache.isis.viewer.html.action.ActionException;
import org.apache.isis.viewer.html.action.ChangeContext;
Modified: incubator/isis/trunk/viewer/junit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/pom.xml?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/pom.xml (original)
+++ incubator/isis/trunk/viewer/junit/pom.xml Sat Mar 26 11:07:04 2011
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>viewer</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
@@ -17,8 +17,8 @@
<siteBaseDir>../..</siteBaseDir>
<relativeUrl>viewer/junit/</relativeUrl>
- <wrapper-progmodel.version>0.1.1-incubating-SNAPSHOT</wrapper-progmodel.version>
- <identity-bytecode.version>0.1.1-incubating-SNAPSHOT</identity-bytecode.version>
+ <wrapper-progmodel.version>0.1.2-incubating-SNAPSHOT</wrapper-progmodel.version>
+ <identity-bytecode.version>0.1.2-incubating-SNAPSHOT</identity-bytecode.version>
<docbkxGuideTitle>Apache Isis JUnit Support</docbkxGuideTitle>
<docbkxGuideSubTitle>Acceptance Testing using JUnit</docbkxGuideSubTitle>
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.isis.runtimes</groupId>
<artifactId>dflt</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -101,14 +101,13 @@
<groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
<artifactId>identity</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.isis.security</groupId>
+ <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
<artifactId>dflt</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.profilestores</groupId>
+ <groupId>org.apache.isis.security</groupId>
<artifactId>dflt</artifactId>
</dependency>
@@ -126,10 +125,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.profilestores</groupId>
- <artifactId>dflt</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.isis.progmodels</groupId>
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=1085690&r1=1085689&r2=1085690&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 Sat Mar 26 11:07:04 2011
@@ -38,7 +38,7 @@ import org.apache.isis.core.commons.auth
import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderDefault;
import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.runtimes.dflt.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
import org.apache.isis.runtimes.dflt.runtime.authentication.standard.fixture.AuthenticationRequestLogonFixture;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java Sat Mar 26 11:07:04 2011
@@ -26,7 +26,7 @@ import org.apache.isis.core.commons.exce
import org.apache.isis.runtimes.dflt.runtime.installers.InstallerLookup;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
import org.apache.isis.runtimes.dflt.runtime.system.installers.IsisSystemUsingInstallers;
-import org.apache.isis.profilestores.dflt.InMemoryUserProfileStoreInstaller;
+import org.apache.isis.runtimes.dflt.profilestores.dflt.InMemoryUserProfileStoreInstaller;
import org.apache.isis.security.dflt.authentication.NoopAuthenticationManagerInstaller;
import org.apache.isis.security.dflt.authorization.NoopAuthorizationManagerInstaller;
Modified: incubator/isis/trunk/viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/pom.xml?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/pom.xml (original)
+++ incubator/isis/trunk/viewer/pom.xml Sat Mar 26 11:07:04 2011
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>isis-parent</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>viewer</artifactId>
@@ -57,23 +57,15 @@
<dependency>
<groupId>org.apache.isis</groupId>
<artifactId>core</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- TODO: remove this dependency -->
<dependency>
<groupId>org.apache.isis</groupId>
- <artifactId>profilestores</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <!-- TODO: remove this dependency -->
- <dependency>
- <groupId>org.apache.isis</groupId>
<artifactId>security</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -81,7 +73,7 @@
<dependency>
<groupId>org.apache.isis</groupId>
<artifactId>progmodels</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Modified: incubator/isis/trunk/viewer/restful/applib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/applib/pom.xml?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/applib/pom.xml (original)
+++ incubator/isis/trunk/viewer/restful/applib/pom.xml Sat Mar 26 11:07:04 2011
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>restful</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>restful-applib</artifactId>
Modified: incubator/isis/trunk/viewer/restful/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/pom.xml?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/pom.xml (original)
+++ incubator/isis/trunk/viewer/restful/pom.xml Sat Mar 26 11:07:04 2011
@@ -6,12 +6,12 @@
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>viewer</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>restful</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<name>Restful Viewer</name>
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.apache.isis.runtimes</groupId>
<artifactId>dflt</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -72,23 +72,23 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>restful-applib</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>restful-applib</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>restful-viewer</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>restful-viewer</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
Modified: incubator/isis/trunk/viewer/restful/viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/pom.xml?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/pom.xml (original)
+++ incubator/isis/trunk/viewer/restful/viewer/pom.xml Sat Mar 26 11:07:04 2011
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>restful</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>restful-viewer</artifactId>
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=1085690&r1=1085689&r2=1085690&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 Sat Mar 26 11:07:04 2011
@@ -5,7 +5,7 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
import org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionLookupStrategyDefault;
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/EmbeddedWebViewerRestful.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/EmbeddedWebViewerRestful.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/EmbeddedWebViewerRestful.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/EmbeddedWebViewerRestful.java Sat Mar 26 11:07:04 2011
@@ -4,11 +4,11 @@ import org.jboss.resteasy.plugins.server
import org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap;
import org.apache.isis.core.commons.lang.MapUtils;
+import org.apache.isis.core.webapp.content.StaticContentFilter;
+import org.apache.isis.core.webapp.content.ResourceServlet;
import org.apache.isis.runtimes.dflt.runtime.web.EmbeddedWebViewer;
import org.apache.isis.runtimes.dflt.runtime.web.WebAppSpecification;
import org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter;
-import org.apache.isis.runtimes.dflt.webapp.StaticContentFilter;
-import org.apache.isis.runtimes.dflt.webapp.servlets.ResourceServlet;
import org.apache.isis.viewer.restful.viewer.RestfulApplication;
import org.apache.isis.viewer.restful.viewer.authentication.AuthenticationSessionLookupStrategyTrusted;
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=1085690&r1=1085689&r2=1085690&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 Sat Mar 26 11:07:04 2011
@@ -12,9 +12,9 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpSession;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationRequestPassword;
+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.runtimes.dflt.runtime.authentication.standard.exploration.ExplorationSession;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/HomePageResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/HomePageResourceImpl.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/HomePageResourceImpl.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/HomePageResourceImpl.java Sat Mar 26 11:07:04 2011
@@ -1,6 +1,8 @@
package org.apache.isis.viewer.restful.viewer.resources;
import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
import org.apache.isis.viewer.restful.applib.resources.HomePageResource;
import org.apache.isis.viewer.restful.viewer.html.XhtmlTemplate;
@@ -13,6 +15,8 @@ import org.apache.isis.viewer.restful.vi
@Path("/")
public class HomePageResourceImpl extends ResourceAbstract implements HomePageResource {
+
+ @Produces(MediaType.APPLICATION_XHTML_XML)
public String resources() {
init();
final XhtmlTemplate xhtml = new XhtmlTemplate("Home Page", getServletRequest());
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/pom.xml?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/pom.xml (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/pom.xml Sat Mar 26 11:07:04 2011
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>scimpi</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>scimpi-dispatcher</artifactId>
@@ -44,6 +44,15 @@
</reporting>
<dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>progmodel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>runtime</artifactId>
+ </dependency>
+
<!-- TODO: remove this dependency -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java Sat Mar 26 11:07:04 2011
@@ -23,8 +23,8 @@ package org.apache.isis.viewer.scimpi.di
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugAction.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugAction.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugAction.java Sat Mar 26 11:07:04 2011
@@ -35,8 +35,8 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.util.Dump;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.util.Dump;
import org.apache.isis.viewer.scimpi.dispatcher.Action;
import org.apache.isis.viewer.scimpi.dispatcher.Dispatcher;
import org.apache.isis.viewer.scimpi.dispatcher.ForbiddenException;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/logon/LogonAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/logon/LogonAction.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/logon/LogonAction.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/logon/LogonAction.java Sat Mar 26 11:07:04 2011
@@ -24,7 +24,7 @@ import java.io.IOException;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.debug.DebugBuilder;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
import org.apache.isis.viewer.scimpi.dispatcher.Action;
import org.apache.isis.viewer.scimpi.dispatcher.Dispatcher;
import org.apache.isis.viewer.scimpi.dispatcher.UserManager;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/util/MethodsUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/util/MethodsUtils.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/util/MethodsUtils.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/util/MethodsUtils.java Sat Mar 26 11:07:04 2011
@@ -25,12 +25,12 @@ import java.util.List;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.services.ServiceUtil;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession;
import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManager;
-import org.apache.isis.runtimes.dflt.runtime.persistence.services.ServiceUtil;
import org.apache.isis.runtimes.dflt.runtime.session.IsisSession;
import org.apache.isis.viewer.scimpi.dispatcher.DispatchException;
import org.apache.isis.viewer.scimpi.dispatcher.ScimpiException;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java Sat Mar 26 11:07:04 2011
@@ -42,7 +42,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.ObjectMember;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.util.Dump;
+import org.apache.isis.core.metamodel.util.Dump;
import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
import org.apache.isis.viewer.scimpi.dispatcher.Dispatcher;
import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
Modified: incubator/isis/trunk/viewer/scimpi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/pom.xml?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/pom.xml (original)
+++ incubator/isis/trunk/viewer/scimpi/pom.xml Sat Mar 26 11:07:04 2011
@@ -6,12 +6,12 @@
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>viewer</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>scimpi</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<name>Scimpi Viewer</name>
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.isis.runtimes</groupId>
<artifactId>dflt</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -74,13 +74,13 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>scimpi-dispatcher</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>scimpi-servlet</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/isis/trunk/viewer/scimpi/servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/servlet/pom.xml?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/servlet/pom.xml (original)
+++ incubator/isis/trunk/viewer/scimpi/servlet/pom.xml Sat Mar 26 11:07:04 2011
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>scimpi</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
Modified: incubator/isis/trunk/viewer/wicket/applib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/applib/pom.xml?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/applib/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/applib/pom.xml Sat Mar 26 11:07:04 2011
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>wicket-applib</artifactId>
Modified: incubator/isis/trunk/viewer/wicket/metamodel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/metamodel/pom.xml?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/metamodel/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/metamodel/pom.xml Sat Mar 26 11:07:04 2011
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>wicket-metamodel</artifactId>
Modified: incubator/isis/trunk/viewer/wicket/model/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/model/pom.xml?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/model/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/model/pom.xml Sat Mar 26 11:07:04 2011
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>wicket-model</artifactId>
Modified: incubator/isis/trunk/viewer/wicket/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/pom.xml?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/pom.xml Sat Mar 26 11:07:04 2011
@@ -6,12 +6,12 @@
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>viewer</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<name>Wicket Viewer</name>
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.isis.runtimes</groupId>
<artifactId>dflt</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -64,60 +64,60 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket-applib</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket-applib</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket-metamodel</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket-metamodel</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket-model</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket-model</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket-ui</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket-ui</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket-viewer</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket-viewer</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -126,22 +126,22 @@
<dependency>
<groupId>org.apache.isis</groupId>
<artifactId>applib</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>metamodel</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>commons</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>commons</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -150,13 +150,13 @@
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
<artifactId>runtime</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</dependency>
<!-- TODO: remove this dependency -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
<artifactId>webapp</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/isis/trunk/viewer/wicket/ui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/pom.xml?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/ui/pom.xml Sat Mar 26 11:07:04 2011
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>wicket-ui</artifactId>
@@ -51,6 +51,11 @@
<dependencies>
<dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>progmodel</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket-model</artifactId>
</dependency>
Modified: incubator/isis/trunk/viewer/wicket/viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/pom.xml?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/pom.xml Sat Mar 26 11:07:04 2011
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket</artifactId>
- <version>0.1.1-incubating-SNAPSHOT</version>
+ <version>0.1.2-incubating-SNAPSHOT</version>
</parent>
<name>Wicket Viewer Implementation</name>
Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java Sat Mar 26 11:07:04 2011
@@ -50,11 +50,11 @@ import org.apache.isis.core.commons.reso
import org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;
import org.apache.isis.core.commons.resource.ResourceStreamSourceCurrentClassClassPath;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.webapp.config.ResourceStreamSourceForWebInf;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.runner.IsisModule;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
import org.apache.isis.runtimes.dflt.runtime.system.IsisSystem;
-import org.apache.isis.runtimes.dflt.webapp.ResourceStreamSourceServletContext;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.nof.AuthenticationSessionAccessor;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
@@ -196,7 +196,7 @@ public class IsisWicketApplication exten
}
private IsisConfigurationBuilder createConfigBuilder() {
- final ResourceStreamSource rssServletContext = new ResourceStreamSourceServletContext(getServletContext());
+ final ResourceStreamSource rssServletContext = new ResourceStreamSourceForWebInf(getServletContext());
final ResourceStreamSource rssTcl = new ResourceStreamSourceContextLoaderClassPath();
final ResourceStreamSource rssClasspath = new ResourceStreamSourceCurrentClassClassPath();
IsisConfigurationBuilder isisConfigurationBuilder = new IsisConfigurationBuilderResourceStreams(rssTcl, rssClasspath, rssServletContext);
Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java Sat Mar 26 11:07:04 2011
@@ -47,15 +47,16 @@ import org.apache.isis.core.commons.reso
import org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;
import org.apache.isis.core.commons.resource.ResourceStreamSourceCurrentClassClassPath;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.runtimes.dflt.runtime.authentication.standard.AuthenticationManagerStandard;
-import org.apache.isis.runtimes.dflt.runtime.authentication.standard.AuthenticatorAbstract;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandard;
+import org.apache.isis.core.runtime.authentication.standard.Authenticator;
+import org.apache.isis.core.runtime.authentication.standard.AuthenticatorAbstract;
+import org.apache.isis.core.webapp.config.ResourceStreamSourceForWebInf;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.runner.IsisModule;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
import org.apache.isis.runtimes.dflt.runtime.system.IsisSystem;
-import org.apache.isis.runtimes.dflt.webapp.ResourceStreamSourceServletContext;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.nof.AuthenticationSessionAccessor;
import org.apache.isis.viewer.wicket.ui.app.cssrenderer.ApplicationCssRenderer;
@@ -156,7 +157,7 @@ public class IsisWicketUnsecuredApplicat
}
private IsisConfigurationBuilder createConfigBuilder() {
- final ResourceStreamSource rssServletContext = new ResourceStreamSourceServletContext(getServletContext());
+ final ResourceStreamSource rssServletContext = new ResourceStreamSourceForWebInf(getServletContext());
final ResourceStreamSource rssTcl = new ResourceStreamSourceContextLoaderClassPath();
final ResourceStreamSource rssClasspath = new ResourceStreamSourceCurrentClassClassPath();
IsisConfigurationBuilder isisConfigurationBuilder =
@@ -198,7 +199,6 @@ public class IsisWicketUnsecuredApplicat
if(authenticationManager == null) {
final IsisConfiguration configuration = IsisContext.getConfiguration();
AuthenticationManagerStandard authenticationManager = new AuthenticationManagerStandard(configuration);
- authenticationManager.init();
authenticationManager.addAuthenticator(new AuthenticatorAbstract(configuration) {
@Override
public boolean canAuthenticate(AuthenticationRequest request) {
@@ -210,6 +210,7 @@ public class IsisWicketUnsecuredApplicat
return true;
}
});
+ authenticationManager.init();
this.authenticationManager = authenticationManager;
}
return authenticationManager;
Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java Sat Mar 26 11:07:04 2011
@@ -23,7 +23,7 @@ package org.apache.isis.viewer.wicket.vi
import org.apache.wicket.Request;
import org.apache.wicket.Session;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
public class AnonymousWebSessionForIsis extends AuthenticatedWebSessionForIsis {
Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java Sat Mar 26 11:07:04 2011
@@ -29,9 +29,9 @@ import java.util.List;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.ensure.Ensure;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationRequestPassword;
+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.runtimes.dflt.runtime.context.IsisContext;
import org.apache.isis.viewer.wicket.model.nof.AuthenticationSessionAccessor;
import org.apache.wicket.Request;
Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/Fixture_AuthenticationManager_AuthenticateOk.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/Fixture_AuthenticationManager_AuthenticateOk.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/Fixture_AuthenticationManager_AuthenticateOk.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/Fixture_AuthenticationManager_AuthenticateOk.java Sat Mar 26 11:07:04 2011
@@ -20,8 +20,8 @@
package org.apache.isis.viewer.wicket.viewer;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.testsupport.jmock.MockFixture;
import org.apache.isis.core.testsupport.jmock.MockFixtureAdapter;
import org.jmock.Expectations;
Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java Sat Mar 26 11:07:04 2011
@@ -25,8 +25,8 @@ import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.testsupport.jmock.FixtureMockery;
import org.apache.isis.viewer.wicket.viewer.Fixture_AuthenticationManager_AuthenticateOk;
import org.apache.isis.viewer.wicket.viewer.Fixture_Request_Stub;
Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java Sat Mar 26 11:07:04 2011
@@ -23,7 +23,7 @@ package org.apache.isis.viewer.wicket.vi
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.testsupport.jmock.FixtureMockery;
import org.apache.isis.viewer.wicket.viewer.Fixture_AuthenticationManager_AuthenticateOk;
import org.apache.isis.viewer.wicket.viewer.Fixture_Request_Stub;
Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/Fixture_AuthenticatedWebSessionForIsis_SignedIn.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/Fixture_AuthenticatedWebSessionForIsis_SignedIn.java?rev=1085690&r1=1085689&r2=1085690&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/Fixture_AuthenticatedWebSessionForIsis_SignedIn.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/Fixture_AuthenticatedWebSessionForIsis_SignedIn.java Sat Mar 26 11:07:04 2011
@@ -23,7 +23,7 @@ package org.apache.isis.viewer.wicket.vi
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.testsupport.jmock.FixtureMockery;
import org.apache.isis.core.testsupport.jmock.MockFixture;
import org.apache.isis.core.testsupport.jmock.MockFixtureAdapter;