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 2016/05/05 10:12:03 UTC

[3/9] wicket git commit: Merge branch 'wicket-7.x' of https://git-wip-us.apache.org/repos/asf/wicket into wicket-7.x

Merge branch 'wicket-7.x' of https://git-wip-us.apache.org/repos/asf/wicket 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/8b056c34
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8b056c34
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8b056c34

Branch: refs/heads/wicket-7.x
Commit: 8b056c34b84e79d11bb6dab057eb06f854779c3c
Parents: 51e58fa ff41797
Author: Martijn Dashorst <da...@apache.org>
Authored: Mon Apr 25 09:59:29 2016 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Mon Apr 25 09:59:29 2016 +0200

----------------------------------------------------------------------
 testing/wicket-js-tests/package.json            | 12 ++++++------
 testing/wicket-js-tests/pom.xml                 |  6 +++---
 .../main/java/org/apache/wicket/Component.java  |  4 +++-
 .../wicket/core/util/lang/WicketObjects.java    |  5 +++++
 .../pageStore/memory/HttpSessionDataStore.java  | 18 ++++++++++--------
 .../wicket/serialize/java/JavaSerializer.java   |  6 +-----
 .../wicket/util/tester/BaseWicketTester.java    | 14 +++++---------
 .../protocol/ws/api/WebSocketBehavior.java      | 20 +++++++++++++++++++-
 .../apache/wicket/request/http/WebRequest.java  |  9 +++++++--
 9 files changed, 59 insertions(+), 35 deletions(-)
----------------------------------------------------------------------