You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2013/02/19 16:42:42 UTC
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Updated Branches:
refs/heads/master 437a55f0b -> e88853150
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e8885315
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e8885315
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e8885315
Branch: refs/heads/master
Commit: e88853150562f9f093a9cdb9787a640d1bc48cc6
Parents: 880a781 437a55f
Author: Martijn Dashorst <da...@apache.org>
Authored: Tue Feb 19 16:42:19 2013 +0100
Committer: Martijn Dashorst <da...@apache.org>
Committed: Tue Feb 19 16:42:19 2013 +0100
----------------------------------------------------------------------
.../apache/wicket/protocol/http/mock/Cookies.java | 65 +++
.../protocol/http/mock/MockHttpServletRequest.java | 10 +-
.../http/mock/MockHttpServletResponse.java | 11 +-
.../wicket/util/tester/BaseWicketTester.java | 95 ++++--
.../SetCookieAndRedirectStatefullTestPage.java | 2 +-
.../util/cookies/SetCookieAndRedirectTest.java | 4 +-
.../org/apache/wicket/util/tester/CookiePage.java | 21 +-
.../wicket/util/tester/WicketTesterTest.java | 86 +++--
.../apache/wicket/devutils/debugbar/DebugBar.java | 7 +-
wicket-experimental/wicket-atmosphere/pom.xml | 2 +-
.../wicket/atmosphere/AtmosphereWebRequest.java | 119 ++++++-
.../org/apache/wicket/atmosphere/EventBus.java | 6 +-
.../apache/wicket/atmosphere/jquery.atmosphere.js | 301 +++++++++++----
13 files changed, 570 insertions(+), 159 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e8885315/wicket-experimental/wicket-atmosphere/pom.xml
----------------------------------------------------------------------
diff --cc wicket-experimental/wicket-atmosphere/pom.xml
index f3b95f6,de9d305..abe7be9
--- a/wicket-experimental/wicket-atmosphere/pom.xml
+++ b/wicket-experimental/wicket-atmosphere/pom.xml
@@@ -24,10 -24,10 +24,10 @@@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-atmosphere</artifactId>
- <version>0.8-SNAPSHOT</version>
+ <version>0.9-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
- <atmosphere.version>1.0.8</atmosphere.version>
+ <atmosphere.version>1.0.10</atmosphere.version>
</properties>
<name>Wicket-Atmosphere</name>
<description>Wicket-Atmosphere provides integration of the Atmosphere Framework in Wicket.</description>