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 2017/09/14 10:53:28 UTC
[1/2] isis git commit: ISIS-1713: reverts to Wicket 7.7.0
Repository: isis
Updated Branches:
refs/heads/master 3c0750a3e -> 234798ed6
ISIS-1713: reverts to Wicket 7.7.0
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fbbc83da
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fbbc83da
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fbbc83da
Branch: refs/heads/master
Commit: fbbc83da987998ffd697171db2db76c193b779fe
Parents: 3c0750a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 14 11:08:59 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 14 11:08:59 2017 +0100
----------------------------------------------------------------------
core/pom.xml | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fbbc83da/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 3fc43d0..8e6d78c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -139,7 +139,7 @@
<jetty.version>9.3.10.v20160621</jetty.version>
- <wicket.version>7.8.1</wicket.version>
+ <wicket.version>7.7.0</wicket.version>
<wicket-webjars.version>0.5.4</wicket-webjars.version>
<wicket-bootstrap.version>0.10.16</wicket-bootstrap.version>
@@ -419,15 +419,6 @@
</snapshots>
</repository>
- <!-- staging (originally added to be able to test the RC of Wicket 7.8.1) -->
- <repository>
- <id>Apache Staging Repository</id>
- <url>https://repository.apache.org/content/groups/staging/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
</repositories>
[2/2] isis git commit: ISIS-1717: adds new /logout page (for
monitoring apps).
Posted by da...@apache.org.
ISIS-1717: adds new /logout page (for monitoring apps).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/234798ed
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/234798ed
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/234798ed
Branch: refs/heads/master
Commit: 234798ed6269a361d90dc7c27966081f8f5ba23e
Parents: fbbc83d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 14 11:43:52 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 14 11:43:52 2017 +0100
----------------------------------------------------------------------
.../wicket/viewer/IsisWicketApplication.java | 3 ++
.../wicket/ui/pages/login/WicketLogoutPage.java | 48 ++++++++++++++++++++
2 files changed, 51 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/234798ed/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 3b95303..6719fcd 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -109,6 +109,7 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.select2.Select2JsRefe
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountConfirmationMap;
+import org.apache.isis.viewer.wicket.ui.pages.login.WicketLogoutPage;
import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
import org.apache.isis.viewer.wicket.viewer.integration.isis.DeploymentTypeWicketAbstract;
import org.apache.isis.viewer.wicket.viewer.integration.isis.WicketServer;
@@ -784,6 +785,8 @@ public class IsisWicketApplication
// nb: action mount cannot contain {actionArgs}, because the default
// parameters encoder doesn't seem to be able to handle multiple args
mountPage("/action/${objectOid}/${actionOwningSpec}/${actionId}/${actionType}", PageType.ACTION_PROMPT);
+
+ mountPage("/logout", WicketLogoutPage.class);
}
protected void mountPage(final String mountPath, final PageType pageType) {
http://git-wip-us.apache.org/repos/asf/isis/blob/234798ed/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java
new file mode 100644
index 0000000..93657e5
--- /dev/null
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.viewer.wicket.ui.pages.login;
+
+import org.apache.wicket.Page;
+import org.apache.wicket.markup.html.WebPage;
+
+import org.apache.isis.viewer.wicket.model.models.PageType;
+import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
+
+public class WicketLogoutPage extends WebPage {
+
+ private static final long serialVersionUID = 1L;
+
+ public WicketLogoutPage() {
+ getSession().invalidate();
+ setResponsePage(getSignInPage());
+ }
+
+
+ private Class<? extends Page> getSignInPage() {
+ return pageClassRegistry.getPageClass(PageType.SIGN_IN);
+ }
+
+ /**
+ * {@link com.google.inject.Inject}ed when {@link #init() initialized}.
+ */
+ @com.google.inject.Inject
+ PageClassRegistry pageClassRegistry;
+
+}