The Unified and Autonomous Development Platform
Upgrade to Wicket 7.14.0
Robin Shen96b0b28e0156
diff --git a/server-core/pom.xml b/server-core/pom.xmlindex bc3e798ef7..8685842e9c 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -404,8 +404,8 @@<jgit.version>5.1.3.201810200350-r</jgit.version><flexmark.version>0.18.3</flexmark.version><groovy.version>2.4.14</groovy.version>- <wicket.version>7.10.0</wicket.version>- <wicketbootstrap.version>0.10.17</wicketbootstrap.version>+ <wicket.version>7.14.0</wicket.version>+ <wicketbootstrap.version>0.10.18</wicketbootstrap.version><jersey.version>2.26</jersey.version><jetty.version>9.3.27.v20190418</jetty.version><servlet.version>3.1.0</servlet.version>diff --git a/server-core/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.html b/server-core/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.htmldeleted file mode 100644index 63a1c04325..0000000000--- a/server-core/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.html+++ /dev/null@@ -1,14 +0,0 @@-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">-<html xmlns:wicket="http://wicket.apache.org">- <body>- <div style="text-align: center; padding-top: 200px;">- <img src="/img/ajax-indicator-big.gif">- </div>- <div style="display: none;">- If you see this, it means that both JavaScript and meta-refresh are not support by- your browser configuration. Please click <a wicket:id="link" href="#">this link</a> to- continue to the original destination.- </div>- <div wicket:id="postback"></div>- </body>-</html>diff --git a/server-core/src/main/java/org/apache/wicket/page/PageStoreManager.java b/server-core/src/main/java/org/apache/wicket/page/PageStoreManager.javaindex dd555f2a0f..d535f4ba22 100644--- a/server-core/src/main/java/org/apache/wicket/page/PageStoreManager.java+++ b/server-core/src/main/java/org/apache/wicket/page/PageStoreManager.java@@ -45,10 +45,10 @@ public class PageStoreManager extends AbstractPageManager* Web containers intercept* {@link javax.servlet.http.HttpSession#setAttribute(String, Object)} to detect changes and* replicate the session. If the attribute has been already bound in the session then- * {@link #valueUnbound(HttpSessionBindingEvent)} might get called - this flag+ * {@link SessionEntry#valueUnbound(HttpSessionBindingEvent)} might get called - this flag* helps us to ignore the invocation in that case.*- * @see #valueUnbound(HttpSessionBindingEvent)+ * @see SessionEntry#valueUnbound(HttpSessionBindingEvent)*/private static final ThreadLocal<Boolean> STORING_TOUCHED_PAGES = new ThreadLocal<Boolean>(){@@ -171,14 +171,7 @@ public class PageStoreManager extends AbstractPageManager// triggered by #storeTouchedPages(), so do not remove the datareturn;}-- // WICKET-5164 use the original sessionId- IPageStore store = getPageStore();- // store might be null if destroyed already- if (store != null)- {- store.unbind(sessionId);- }+ clear();}@Override@@ -187,6 +180,17 @@ public class PageStoreManager extends AbstractPageManager// see https://issues.apache.org/jira/browse/WICKET-5390return false;}++ public void clear()+ {+ // WICKET-5164 use the original sessionId+ IPageStore store = getPageStore();+ // store might be null if destroyed already+ if (store != null)+ {+ store.unbind(sessionId);+ }+ }}private String getAttributeName()@@ -302,11 +306,12 @@ public class PageStoreManager extends AbstractPageManagerpublic void clear(){RequestAdapter requestAdapter = getRequestAdapter();+ requestAdapter.clear();String sessionEntryAttributeName = getAttributeName();Serializable sessionEntry = requestAdapter.getSessionAttribute(sessionEntryAttributeName);if (sessionEntry instanceof SessionEntry){- ((SessionEntry)sessionEntry).valueUnbound(null);+ ((SessionEntry)sessionEntry).clear();}}diff --git a/server-core/src/main/java/org/apache/wicket/page/RequestAdapter.java b/server-core/src/main/java/org/apache/wicket/page/RequestAdapter.javaindex f8be83cb4b..7d44d1b65b 100644--- a/server-core/src/main/java/org/apache/wicket/page/RequestAdapter.java+++ b/server-core/src/main/java/org/apache/wicket/page/RequestAdapter.java@@ -177,4 +177,8 @@ public abstract class RequestAdapter}}}-}++ public void clear() {+ touchedPages.clear();+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java b/server-core/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.javaindex 73bb936e04..e4137fa3d5 100644--- a/server-core/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java+++ b/server-core/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java@@ -21,6 +21,7 @@ import javax.servlet.http.HttpServletResponse;import org.apache.wicket.request.IRequestCycle;import org.apache.wicket.request.IRequestHandler;import org.apache.wicket.request.Url;+import org.apache.wicket.request.http.WebRequest;import org.apache.wicket.request.http.WebResponse;import org.apache.wicket.util.lang.Args;@@ -105,7 +106,15 @@ public class RedirectRequestHandler implements IRequestHandlerelse{response.setStatus(status);- response.setHeader("Location", location);++ if (((WebRequest)requestCycle.getRequest()).isAjax())+ {+ response.setHeader("Ajax-Location", location);+ }+ else+ {+ response.setHeader("Location", location);+ }}}}diff --git a/server-core/src/main/java/org/apache/wicket/util/string/Strings.java b/server-core/src/main/java/org/apache/wicket/util/string/Strings.javaindex 167e8fd6fa..9be5d3fc98 100644--- a/server-core/src/main/java/org/apache/wicket/util/string/Strings.java+++ b/server-core/src/main/java/org/apache/wicket/util/string/Strings.java@@ -21,11 +21,15 @@ import java.nio.charset.Charset;import java.security.AccessController;import java.security.PrivilegedAction;import java.util.ArrayList;+import java.util.Collections;+import java.util.HashSet;import java.util.List;import java.util.Locale;+import java.util.Set;import java.util.regex.Matcher;import java.util.regex.Pattern;+import org.apache.wicket.util.lang.Args;/**@@ -59,7 +63,20 @@ public final class Strings/** A table of hex digits */private static final char[] HEX_DIGIT = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9','A', 'B', 'C', 'D', 'E', 'F' };+ private static final Set<Character> NONCHARACTERS = Collections.unmodifiableSet(new HashSet<Character>()+ {+ private static final long serialVersionUID = 1L;+ {+ for (int i = 0x0000FDD0; i <= 0x0000FDEF; ++i)+ {+ add((char)i);+ }+ add((char)0x0000FFFE);+ // all other non-characters are out of range of (char)+ }+ });+private static final Pattern HTML_NUMBER_REGEX = Pattern.compile("&#\\d+;");private static final String[] NO_STRINGS = new String[0];@@ -320,6 +337,10 @@ public final class Strings{final char c = s.charAt(i);+ if (NONCHARACTERS.contains(c))+ {+ continue;+ }switch (c){case '\t' :@@ -932,7 +953,7 @@ public final class Strings}// http://.../abc;jsessionid=...?param=...- int ixSemiColon = url.toLowerCase(Locale.ENGLISH).indexOf(SESSION_ID_PARAM);+ int ixSemiColon = url.toLowerCase(Locale.ROOT).indexOf(SESSION_ID_PARAM);if (ixSemiColon == -1){return url;@@ -1016,6 +1037,10 @@ public final class Stringsfor (int x = 0; x < len; x++){char aChar = unicodeString.charAt(x);+ if (NONCHARACTERS.contains(aChar))+ {+ continue;+ }// Handle common case first, selecting largest block that// avoids the specials belowif ((aChar > 61) && (aChar < 127))@@ -1355,7 +1380,7 @@ public final class Strings}else{- return str.toLowerCase().startsWith(prefix.toLowerCase());+ return str.toLowerCase(Locale.ROOT).startsWith(prefix.toLowerCase(Locale.ROOT));}}