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 2013/04/26 11:02:57 UTC
[03/11] git commit: Merge remote-tracking branch 'upstream/master'
into bugfix-WICKET-5147-cookies-wickettester-second-try
Merge remote-tracking branch 'upstream/master' into bugfix-WICKET-5147-cookies-wickettester-second-try
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/184e51e9
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/184e51e9
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/184e51e9
Branch: refs/heads/master
Commit: 184e51e99c9774ca3cdff6a1d7568d63ef19c5dd
Parents: e87c847 4323728
Author: Michael Mosmann <mi...@mosmann.de>
Authored: Tue Apr 23 00:34:04 2013 +0200
Committer: Michael Mosmann <mi...@mosmann.de>
Committed: Tue Apr 23 00:34:04 2013 +0200
----------------------------------------------------------------------
archetypes/quickstart/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
pom.xml | 52 ++++----
testing/wicket-common-tests/pom.xml | 2 +-
testing/wicket-threadtest/pom.xml | 2 +-
wicket-auth-roles/pom.xml | 2 +-
wicket-cdi/pom.xml | 2 +-
wicket-core/pom.xml | 2 +-
.../org/apache/wicket/DefaultExceptionMapper.java | 5 +-
.../src/main/java/org/apache/wicket/Page.java | 2 +
.../wicket/ajax/res/js/wicket-ajax-jquery.js | 99 +++++++++++----
.../apache/wicket/page/AbstractPageManager.java | 4 -
.../apache/wicket/protocol/http/WicketFilter.java | 28 ++++-
.../request/cycle/PageRequestHandlerTracker.java | 7 +
.../html/ajaxLink/AjaxLinkPageExpectedResult.html | 2 +-
.../AjaxLinkWithBorderPageExpectedResult.html | 2 +-
.../html/ajaxLink/AjaxPage2_ExpectedResult.html | 2 +-
.../html/basic/SimplePageExpectedResult_13.html | 2 +-
.../border/HideableBorderPage_ExpectedResult.html | 2 +-
.../panel/InlinePanelPageExpectedResult_7.html | 2 +-
.../panel/InlinePanelPageExpectedResult_8.html | 2 +-
wicket-core/src/test/js/ajax.js | 23 ++++
wicket-core/src/test/js/all.html | 1 +
.../js/data/ajax/twoEvaluationsWithIdentifier.xml | 18 +++
wicket-datetime/pom.xml | 2 +-
wicket-devutils/pom.xml | 2 +-
wicket-examples/pom.xml | 2 +-
wicket-experimental/pom.xml | 2 +-
wicket-experimental/wicket-atmosphere/pom.xml | 4 +-
wicket-experimental/wicket-bean-validation/pom.xml | 4 +-
wicket-experimental/wicket-bootstrap/pom.xml | 4 +-
wicket-experimental/wicket-examples-parent/pom.xml | 4 +-
.../wicket-examples-jar/pom.xml | 4 +-
.../wicket-examples-war/pom.xml | 4 +-
.../wicket-native-websocket/pom.xml | 4 +-
.../wicket-native-websocket-core/pom.xml | 4 +-
.../wicket-native-websocket-jetty/pom.xml | 4 +-
.../wicket-native-websocket-jetty9/pom.xml | 4 +-
.../wicket-native-websocket-tomcat/pom.xml | 4 +-
wicket-extensions/pom.xml | 2 +-
wicket-guice/pom.xml | 2 +-
wicket-ioc/pom.xml | 2 +-
wicket-jmx/pom.xml | 2 +-
wicket-objectssizeof-agent/pom.xml | 2 +-
wicket-request/pom.xml | 4 +-
wicket-spring/pom.xml | 2 +-
wicket-util/pom.xml | 2 +-
wicket-velocity/pom.xml | 2 +-
wicket/pom.xml | 2 +-
49 files changed, 229 insertions(+), 112 deletions(-)
----------------------------------------------------------------------