You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/11/19 08:03:07 UTC
[syncope] branch 2_1_X updated: Upgrading Wicket
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 43ed419 Upgrading Wicket
43ed419 is described below
commit 43ed4191f2c27db4f279a8438aba420664b8b4e5
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Nov 19 09:02:45 2018 +0100
Upgrading Wicket
---
client/console/pom.xml | 4 ---
.../topology/TopologyWebSocketBehavior.java | 35 ----------------------
pom.xml | 7 +----
3 files changed, 1 insertion(+), 45 deletions(-)
diff --git a/client/console/pom.xml b/client/console/pom.xml
index 5374376..f6be48e 100644
--- a/client/console/pom.xml
+++ b/client/console/pom.xml
@@ -59,10 +59,6 @@ under the License.
<artifactId>wicket-extensions</artifactId>
</dependency>
<dependency>
- <groupId>org.wicketstuff</groupId>
- <artifactId>wicket-datetime</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId>
</dependency>
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyWebSocketBehavior.java b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyWebSocketBehavior.java
index 320e52c..3fc2521 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyWebSocketBehavior.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyWebSocketBehavior.java
@@ -27,9 +27,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javax.servlet.SessionTrackingMode;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@ -42,14 +39,11 @@ import org.apache.syncope.common.lib.to.AttrTO;
import org.apache.syncope.common.lib.to.ConnInstanceTO;
import org.apache.syncope.common.lib.to.ResourceTO;
import org.apache.wicket.Application;
-import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.ThreadContext;
-import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.ws.api.WebSocketBehavior;
import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;
import org.apache.wicket.protocol.ws.api.message.TextMessage;
-import org.apache.wicket.util.cookies.CookieUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.CollectionUtils;
@@ -105,35 +99,6 @@ public class TopologyWebSocketBehavior extends WebSocketBehavior {
}
@Override
- protected CharSequence getSessionId(final Component component) {
- String sessionId = "";
- WebApplication application = (WebApplication) component.getApplication();
- Set<SessionTrackingMode> effectiveSessionTrackingModes = application.getServletContext().
- getEffectiveSessionTrackingModes();
- Object containerRequest = component.getRequest().getContainerRequest();
- if (effectiveSessionTrackingModes.size() == 1
- && SessionTrackingMode.URL.equals(effectiveSessionTrackingModes.iterator().next())) {
-
- sessionId = component.getSession().getId();
- } else if (containerRequest instanceof HttpServletRequest) {
- CookieUtils cookieUtils = new CookieUtils();
- String jsessionCookieName = null;
- if (application.getServletContext().getSessionCookieConfig() != null) {
- jsessionCookieName = application.getServletContext().getSessionCookieConfig().getName();
- }
- if (jsessionCookieName == null) {
- jsessionCookieName = "JSESSIONID";
- }
- Cookie jsessionid = cookieUtils.getCookie(jsessionCookieName);
- HttpServletRequest httpServletRequest = (HttpServletRequest) containerRequest;
- if (jsessionid == null || !httpServletRequest.isRequestedSessionIdValid()) {
- sessionId = component.getSession().getId();
- }
- }
- return sessionId;
- }
-
- @Override
protected void onMessage(final WebSocketRequestHandler handler, final TextMessage message) {
try {
JsonNode obj = OBJECT_MAPPER.readTree(message.getText());
diff --git a/pom.xml b/pom.xml
index 4fac8fb..81e6769 100644
--- a/pom.xml
+++ b/pom.xml
@@ -462,7 +462,7 @@ under the License.
<jsplumb.version>2.0.7</jsplumb.version>
<chartjs.version>1.0.2</chartjs.version>
- <wicket.version>8.1.0</wicket.version>
+ <wicket.version>8.2.0</wicket.version>
<wicket-jqueryui.version>8.1.0</wicket-jqueryui.version>
<wicket-bootstrap.version>2.0.4</wicket-bootstrap.version>
@@ -1208,11 +1208,6 @@ under the License.
<version>${wicket.version}</version>
</dependency>
<dependency>
- <groupId>org.wicketstuff</groupId>
- <artifactId>wicket-datetime</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId>
<version>${wicket.version}</version>