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/07/07 08:56:50 UTC
svn commit: r1143679 - in /incubator/isis/trunk/framework/viewer/wicket:
ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/
ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/
viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/ ...
Author: danhaywood
Date: Thu Jul 7 06:56:49 2011
New Revision: 1143679
URL: http://svn.apache.org/viewvc?rev=1143679&view=rev
Log:
ISIS-104: added logout support for wicket viewer
Added:
incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/
incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/UserPanel.html
- copied unchanged from r1143335, incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/UserPanel.html
incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/UserPanel.java
- copied, changed from r1143335, incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/UserPanel.java
incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
- copied, changed from r1143335, incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignInPage.html
incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
- copied, changed from r1143335, incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignInPage.java
incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/
incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/DeploymentTypeAbstract.java
- copied, changed from r1143335, incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/DeploymentTypeAbstract.java
incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/IsisContextForWicket.java
- copied, changed from r1143335, incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/IsisContextForWicket.java
incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServer.java
- copied, changed from r1143335, incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServer.java
incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerExploration.java
- copied, changed from r1143335, incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServerExploration.java
incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java
- copied, changed from r1143335, incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServerPrototype.java
Removed:
incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/
incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/
Modified:
incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageType.java
incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java
incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
Modified: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css?rev=1143679&r1=1143678&r2=1143679&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css Thu Jul 7 06:56:49 2011
@@ -91,6 +91,14 @@ div {
padding: 0;
}
+#body {
+ min-height: 400px;
+}
+
+#footer {
+ background-color: #C4D9EA;
+}
+
h3 {
margin-top: 9px;
margin-bottom: 0px;
Modified: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html?rev=1143679&r1=1143678&r2=1143679&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html Thu Jul 7 06:56:49 2011
@@ -23,7 +23,7 @@
xml:lang="en"
lang="en">
<head>
- <title>Wicket Objects</title>
+ <title>Apache Isis Wicket Viewer</title>
<wicket:link>
<link href="cssreset.css" rel="stylesheet" type="text/css"/>
<link href="PageAbstract.css" rel="stylesheet" type="text/css"/>
@@ -43,6 +43,7 @@
</div>
<div id="footer">
+ <a href="#" wicket:id="logoutLink">logout</a>
</div>
</div>
</body>
Modified: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java?rev=1143679&r1=1143678&r2=1143679&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java Thu Jul 7 06:56:49 2011
@@ -34,10 +34,15 @@ import org.apache.isis.viewer.wicket.ui.
import org.apache.isis.viewer.wicket.ui.app.cssrenderer.ApplicationCssRenderer;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
+import org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage;
import org.apache.wicket.PageParameters;
+import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.link.PageLink;
import org.apache.wicket.model.IModel;
/**
@@ -46,6 +51,7 @@ import org.apache.wicket.model.IModel;
public abstract class PageAbstract extends WebPage {
public static final String ID_MENU_LINK = "menuLink";
+ public static final String ID_LOGOUT_LINK = "logoutLink";
private final List<ComponentType> childComponentIds;
private final PageParameters pageParameters;
@@ -54,9 +60,20 @@ public abstract class PageAbstract exten
addApplicationActionsComponent();
this.childComponentIds = Collections.unmodifiableList(Arrays.asList(childComponentIds));
this.pageParameters = pageParameters;
+ addLogoutLink();
}
- /**
+ private void addLogoutLink() {
+ add(new Link<Object>(ID_LOGOUT_LINK){
+ private static final long serialVersionUID = 1L;
+ @Override
+ public void onClick() {
+ getSession().invalidate();
+ throw new RestartResponseAtInterceptPageException(WicketSignInPage.class);
+ }});
+ }
+
+ /**
* As provided in the {@link #PageAbstract(ComponentType) constructor}.
*
* <p>
Modified: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageType.java?rev=1143679&r1=1143678&r2=1143679&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageType.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageType.java Thu Jul 7 06:56:49 2011
@@ -33,8 +33,7 @@ import org.apache.wicket.markup.html.Web
* large-scale structure of page layout (eg headers, footers) to be altered.
*/
public enum PageType {
- SIGN_IN(WebPage.class), HOME(HomePage.class), ENTITY(EntityPage.class), ACTION(ActionPage.class),
- SIGN_OUT(WebPage.class);
+ SIGN_IN(WebPage.class), HOME(HomePage.class), ENTITY(EntityPage.class), ACTION(ActionPage.class);
private Class<? extends Page> superClass;
Copied: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/UserPanel.java (from r1143335, incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/UserPanel.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/UserPanel.java?p2=incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/UserPanel.java&p1=incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/UserPanel.java&r1=1143335&r2=1143679&rev=1143679&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/UserPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/UserPanel.java Thu Jul 7 06:56:49 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.viewer.wicket.viewer.login;
+package org.apache.isis.viewer.wicket.ui.pages.login;
/**
* TODO
Copied: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html (from r1143335, incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignInPage.html)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html?p2=incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html&p1=incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignInPage.html&r1=1143335&r2=1143679&rev=1143679&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignInPage.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html Thu Jul 7 06:56:49 2011
@@ -21,7 +21,7 @@
<head>
<title>Sign In</title>
<wicket:link>
- <link href="../../ui/pages/PageAbstract.css" rel="stylesheet" />
+ <link href="../PageAbstract.css" rel="stylesheet" />
</wicket:link>
</head>
<body>
Copied: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java (from r1143335, incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignInPage.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java?p2=incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java&p1=incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignInPage.java&r1=1143335&r2=1143679&rev=1143679&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignInPage.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java Thu Jul 7 06:56:49 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.viewer.wicket.viewer.login;
+package org.apache.isis.viewer.wicket.ui.pages.login;
import org.apache.isis.viewer.wicket.ui.app.cssrenderer.ApplicationCssRenderer;
import org.apache.wicket.PageParameters;
Modified: incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java?rev=1143679&r1=1143678&r2=1143679&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java Thu Jul 7 06:56:49 2011
@@ -48,8 +48,8 @@ import org.apache.isis.viewer.wicket.ui.
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.pages.PageType;
import org.apache.isis.viewer.wicket.viewer.imagecache.ImageCacheClassPath;
-import org.apache.isis.viewer.wicket.viewer.integration.nof.WicketServer;
-import org.apache.isis.viewer.wicket.viewer.integration.nof.WicketServerPrototype;
+import org.apache.isis.viewer.wicket.viewer.integration.isis.WicketServer;
+import org.apache.isis.viewer.wicket.viewer.integration.isis.WicketServerPrototype;
import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjectAdapter;
import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjectAdapterMemento;
Modified: incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java?rev=1143679&r1=1143678&r2=1143679&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java Thu Jul 7 06:56:49 2011
@@ -47,8 +47,8 @@ import org.apache.isis.viewer.wicket.ui.
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.pages.PageType;
import org.apache.isis.viewer.wicket.viewer.imagecache.ImageCacheClassPath;
-import org.apache.isis.viewer.wicket.viewer.integration.nof.WicketServer;
-import org.apache.isis.viewer.wicket.viewer.integration.nof.WicketServerPrototype;
+import org.apache.isis.viewer.wicket.viewer.integration.isis.WicketServer;
+import org.apache.isis.viewer.wicket.viewer.integration.isis.WicketServerPrototype;
import org.apache.isis.viewer.wicket.viewer.integration.wicket.AnonymousWebSessionForIsis;
import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjectAdapter;
import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjectAdapterMemento;
Copied: incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/DeploymentTypeAbstract.java (from r1143335, incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/DeploymentTypeAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/DeploymentTypeAbstract.java?p2=incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/DeploymentTypeAbstract.java&p1=incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/DeploymentTypeAbstract.java&r1=1143335&r2=1143679&rev=1143679&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/DeploymentTypeAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/DeploymentTypeAbstract.java Thu Jul 7 06:56:49 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.viewer.wicket.viewer.integration.nof;
+package org.apache.isis.viewer.wicket.viewer.integration.isis;
import org.apache.isis.runtimes.dflt.runtime.system.ContextCategory;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentCategory;
Copied: incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/IsisContextForWicket.java (from r1143335, incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/IsisContextForWicket.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/IsisContextForWicket.java?p2=incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/IsisContextForWicket.java&p1=incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/IsisContextForWicket.java&r1=1143335&r2=1143679&rev=1143679&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/IsisContextForWicket.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/IsisContextForWicket.java Thu Jul 7 06:56:49 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.viewer.wicket.viewer.integration.nof;
+package org.apache.isis.viewer.wicket.viewer.integration.isis;
import java.util.Collection;
import java.util.List;
Copied: incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServer.java (from r1143335, incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServer.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServer.java?p2=incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServer.java&p1=incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServer.java&r1=1143335&r2=1143679&rev=1143679&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServer.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServer.java Thu Jul 7 06:56:49 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.viewer.wicket.viewer.integration.nof;
+package org.apache.isis.viewer.wicket.viewer.integration.isis;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentCategory;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
Copied: incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerExploration.java (from r1143335, incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServerExploration.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerExploration.java?p2=incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerExploration.java&p1=incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServerExploration.java&r1=1143335&r2=1143679&rev=1143679&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServerExploration.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerExploration.java Thu Jul 7 06:56:49 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.viewer.wicket.viewer.integration.nof;
+package org.apache.isis.viewer.wicket.viewer.integration.isis;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentCategory;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
Copied: incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java (from r1143335, incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServerPrototype.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java?p2=incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java&p1=incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServerPrototype.java&r1=1143335&r2=1143679&rev=1143679&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServerPrototype.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java Thu Jul 7 06:56:49 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.viewer.wicket.viewer.integration.nof;
+package org.apache.isis.viewer.wicket.viewer.integration.isis;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentCategory;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
Modified: incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java?rev=1143679&r1=1143678&r2=1143679&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java Thu Jul 7 06:56:49 2011
@@ -25,8 +25,7 @@ import org.apache.isis.viewer.wicket.ui.
import org.apache.isis.viewer.wicket.ui.pages.action.ActionPage;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
-import org.apache.isis.viewer.wicket.viewer.login.WicketSignInPage;
-import org.apache.isis.viewer.wicket.viewer.login.WicketSignOutPage;
+import org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage;
import com.google.inject.Singleton;
@@ -39,7 +38,6 @@ public class PageClassListDefault implem
@Override
public void registerPages(final PageRegistrySpi pageRegistry) {
pageRegistry.registerPage(PageType.SIGN_IN, WicketSignInPage.class);
- pageRegistry.registerPage(PageType.SIGN_OUT, WicketSignOutPage.class);
pageRegistry.registerPage(PageType.ENTITY, EntityPage.class);
pageRegistry.registerPage(PageType.HOME, HomePage.class);
pageRegistry.registerPage(PageType.ACTION, ActionPage.class);