You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/10/31 19:38:42 UTC
[1/5] wicket git commit: WICKET-6264: Form: improve error message for
disabled/invisible IFormSubmittingComponent
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x 1c26a5dc7 -> 4457e505d
WICKET-6264: Form: improve error message for disabled/invisible IFormSubmittingComponent
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/afe1e333
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/afe1e333
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/afe1e333
Branch: refs/heads/wicket-7.x
Commit: afe1e333c662d6e15842b8112eedd20ae2223646
Parents: a24e12c
Author: barney2k7 <ba...@gmail.com>
Authored: Mon Oct 31 09:15:43 2016 +0100
Committer: barney2k7 <ba...@gmail.com>
Committed: Mon Oct 31 09:15:43 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/wicket/markup/html/form/Form.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/afe1e333/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
index f3fdbb8..af2e11f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
@@ -762,16 +762,22 @@ public class Form<T> extends WebMarkupContainer
if (!component.isVisibleInHierarchy())
{
+ Page page = findPage();
throw new WicketRuntimeException("Submit Button " +
submittingComponent.getInputName() + " (path=" +
- component.getPageRelativePath() + ") is not visible");
+ component.getPath() + ", pageClass=" +
+ (page == null ? "<unknown>" : page.getPageClass().getName()) +
+ ") is not visible");
}
if (!component.isEnabledInHierarchy())
{
+ Page page = findPage();
throw new WicketRuntimeException("Submit Button " +
submittingComponent.getInputName() + " (path=" +
- component.getPageRelativePath() + ") is not enabled");
+ component.getPath() + ", pageClass=" +
+ (page == null ? "<unknown>" : page.getPageClass().getName()) +
+ ") is not enabled");
}
}
}
[2/5] wicket git commit: javadoc improvements, no functional change
Posted by mg...@apache.org.
javadoc improvements, no functional change
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/13e652bc
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/13e652bc
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/13e652bc
Branch: refs/heads/wicket-7.x
Commit: 13e652bcf9a137b2dd637095c1ec5f34f5972831
Parents: 12b4bfe
Author: Sven Meier <sv...@apache.org>
Authored: Wed Oct 26 10:51:37 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 31 20:32:31 2016 +0100
----------------------------------------------------------------------
.../protocol/http/servlet/AbstractRequestWrapperFactory.java | 8 +++++---
.../wicket/protocol/http/servlet/FilterFactoryManager.java | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/13e652bc/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/AbstractRequestWrapperFactory.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/AbstractRequestWrapperFactory.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/AbstractRequestWrapperFactory.java
index bd0cc92..cc8c50f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/AbstractRequestWrapperFactory.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/AbstractRequestWrapperFactory.java
@@ -26,7 +26,7 @@ import org.apache.wicket.util.lang.Generics;
import org.apache.wicket.util.string.Strings;
/**
- * Abstract base class for HttpServletRequestWrapper
+ * A factory of {@link HttpServletRequest} wrappers.
*
* @author Juergen Donnerstag
*/
@@ -48,7 +48,7 @@ public abstract class AbstractRequestWrapperFactory
/**
*
- * @return True, if filter is enabled
+ * @return {@code true} if filter is enabled
*/
public final boolean isEnabled()
{
@@ -66,7 +66,9 @@ public abstract class AbstractRequestWrapperFactory
}
/**
- * @param request
+ * Wrap the given request.
+ *
+ * @param request request to wrap
* @return Either return the request itself, or if needed a wrapper for the request
*/
public HttpServletRequest getWrapper(final HttpServletRequest request)
http://git-wip-us.apache.org/repos/asf/wicket/blob/13e652bc/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/FilterFactoryManager.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/FilterFactoryManager.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/FilterFactoryManager.java
index 576fd63..578fec5 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/FilterFactoryManager.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/FilterFactoryManager.java
@@ -25,7 +25,7 @@ import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.lang.Generics;
/**
- * A very simple manager for web filter (web filter factories to be exact).
+ * A very simple manager for web filter factories.
*
* @author Juergen Donnerstag
*/
[3/5] wicket git commit: WICKET-6260 let WebRequest detect Ajax
request
Posted by mg...@apache.org.
WICKET-6260 let WebRequest detect Ajax request
WebRequest#isAjax() no longer touches the request body, thus it can safely be asked
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/12b4bfe2
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/12b4bfe2
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/12b4bfe2
Branch: refs/heads/wicket-7.x
Commit: 12b4bfe2a6a7f0ea354376beef18eb9ea20f97d6
Parents: afe1e33
Author: Sven Meier <sv...@apache.org>
Authored: Wed Oct 26 10:19:18 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 31 20:32:31 2016 +0100
----------------------------------------------------------------------
.../wicket/protocol/http/WebApplication.java | 23 ++++----
.../protocol/http/WebApplicationTest.java | 58 ++++++++++++++++++++
2 files changed, 69 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/12b4bfe2/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
index c97d11f..5ed6fb0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
@@ -560,12 +560,21 @@ public abstract class WebApplication extends Application
*/
WebRequest createWebRequest(HttpServletRequest servletRequest, final String filterPath)
{
+ if (hasFilterFactoryManager())
+ {
+ for (AbstractRequestWrapperFactory factory : getFilterFactoryManager())
+ {
+ servletRequest = factory.getWrapper(servletRequest);
+ }
+ }
+
+ WebRequest webRequest = newWebRequest(servletRequest, filterPath);
+
if (servletRequest.getCharacterEncoding() == null)
{
try
{
- String wicketAjaxHeader = servletRequest.getHeader(WebRequest.HEADER_AJAX);
- if (Strings.isTrue(wicketAjaxHeader))
+ if (webRequest.isAjax())
{
// WICKET-3908, WICKET-1816: Forms submitted with Ajax are always UTF-8 encoded
servletRequest.setCharacterEncoding(CharEncoding.UTF_8);
@@ -582,16 +591,6 @@ public abstract class WebApplication extends Application
}
}
- if (hasFilterFactoryManager())
- {
- for (AbstractRequestWrapperFactory factory : getFilterFactoryManager())
- {
- servletRequest = factory.getWrapper(servletRequest);
- }
- }
-
- WebRequest webRequest = newWebRequest(servletRequest, filterPath);
-
return webRequest;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/12b4bfe2/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebApplicationTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebApplicationTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebApplicationTest.java
index 0b51703..ba6b175 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebApplicationTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebApplicationTest.java
@@ -17,9 +17,15 @@
package org.apache.wicket.protocol.http;
import java.nio.charset.Charset;
+import java.util.Enumeration;
import java.util.Iterator;
import java.util.Locale;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.wicket.mock.MockRequestParameters;
+import org.apache.wicket.protocol.http.mock.MockHttpServletRequest;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Request;
@@ -42,6 +48,58 @@ public class WebApplicationTest extends WicketTestCase
private static final String MOUNT_PATH_4 = "mount/path/4";
/**
+ * WICKET-6260
+ */
+ @Test
+ public void testBodyNotReadBeforeApplicationSetsCharacterEncoding() throws Exception {
+ WebApplication application = tester.getApplication();
+
+ HttpServletRequest request = new MockHttpServletRequest(application, null, null) {
+ @Override
+ public Map<String, String[]> getParameterMap()
+ {
+ fail("body should not be read before character encoding is set");
+ return null;
+ }
+
+ @Override
+ public String getParameter(String name)
+ {
+ fail("body should not be read before character encoding is set");
+ return null;
+ }
+
+ @Override
+ public Enumeration<String> getParameterNames()
+ {
+ fail("body should not be read before character encoding is set");
+ return null;
+ }
+
+ @Override
+ public String[] getParameterValues(String name)
+ {
+ fail("body should not be read before character encoding is set");
+ return null;
+ }
+
+ @Override
+ public MockRequestParameters getPostParameters()
+ {
+ fail("body should not be read before character encoding is set");
+ return null;
+ }
+ };
+
+ // character encoding not set yet
+ request.setCharacterEncoding(null);
+
+ application.createWebRequest(request , "/");
+
+ assertEquals("UTF-8", request.getCharacterEncoding());
+ }
+
+ /**
* Test basic unmounting from a compound mapper.
*/
@Test
[5/5] wicket git commit: Merge branch 'pr-186-WICKET-6264' into
wicket-7.x
Posted by mg...@apache.org.
Merge branch 'pr-186-WICKET-6264' into wicket-7.x
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4457e505
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4457e505
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4457e505
Branch: refs/heads/wicket-7.x
Commit: 4457e505dc0b2a4a411273229a6ffdfc9a9ca3b5
Parents: 1c26a5d 23c1b4f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 31 20:38:21 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 31 20:38:21 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/wicket/markup/html/form/Form.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[4/5] wicket git commit: Update maven-compiler-plugin to 3.6.0
Posted by mg...@apache.org.
Update maven-compiler-plugin to 3.6.0
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/23c1b4fd
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/23c1b4fd
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/23c1b4fd
Branch: refs/heads/wicket-7.x
Commit: 23c1b4fd32ce150f4552f8d1c3dc00fbaf1d001b
Parents: 13e652b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 31 20:27:39 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 31 20:32:31 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/23c1b4fd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ef28409..26a61e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -727,7 +727,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5</version>
+ <version>3.6.0</version>
<inherited>true</inherited>
</plugin>
<plugin>