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/05/03 10:58:46 UTC

[27/27] git commit: Merge branch 'master' into wicket-4774

Merge branch 'master' into wicket-4774


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3eb54bc5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3eb54bc5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3eb54bc5

Branch: refs/heads/wicket-4774
Commit: 3eb54bc556a747b834c0cdf5038684940fff1690
Parents: 665a3e8 abdcf84
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri May 3 10:58:04 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri May 3 10:58:04 2013 +0200

----------------------------------------------------------------------
 .../src/main/resources/archetype-resources/pom.xml |    9 +-
 pom.xml                                            |   56 ++++++-----
 .../WicketAjaxDebugJQueryResourceReference.java    |    8 +-
 .../ajax/WicketAjaxJQueryResourceReference.java    |    8 +-
 .../ajax/WicketEventJQueryResourceReference.java   |    8 +-
 .../wicket/ajax/attributes/ThrottlingSettings.java |   28 ++++--
 .../markup/html/form/AbstractCheckSelector.java    |   15 ++-
 .../markup/html/form/FormComponentLabel.java       |   26 +++++-
 .../markup/html/form/SimpleFormComponentLabel.java |    3 +-
 .../wicket/markup/html/link/DownloadLink.java      |    3 -
 .../apache/wicket/model/StringResourceModel.java   |   21 +++--
 .../apache/wicket/protocol/http/RequestUtils.java  |   31 +++++-
 .../wicket/request/resource/ResourceReference.java |    9 +-
 .../resource/JQueryPluginResourceReference.java    |    8 +-
 .../bundles/ConcatResourceBundleReference.java     |    8 +-
 .../resource/bundles/ResourceBundleReference.java  |    8 +-
 .../validator/AbstractRangeValidator.java          |    3 +-
 .../validation/validator/CreditCardValidator.java  |    3 +-
 .../wicket/validation/validator/DateValidator.java |   31 +++---
 .../validation/validator/PatternValidator.java     |    2 +-
 .../validation/validator/RangeValidator.java       |   22 +++--
 .../validation/validator/StringValidator.java      |   12 ++-
 .../wicket/validation/validator/UrlValidator.java  |    3 +-
 .../markup/head/filter/FilteredHeaderPage.java     |   15 +--
 .../wicket/protocol/http/RequestUtilsTest.java     |   74 +++++++++++++
 .../http/mock/MockHttpServletRequestTest.java      |   20 +++-
 .../http/servlet/ServletWebResponseTest.java       |   32 ++++++
 .../resource/aggregator/ResourceReferenceB.java    |   10 +-
 .../resource/aggregator/ResourceReferenceC.java    |    8 +-
 .../aggregator/ResourceReferenceCirc1.java         |   10 +-
 .../aggregator/ResourceReferenceCirc2.java         |   10 +-
 .../resource/aggregator/ResourceReferenceD.java    |    8 +-
 .../apache/wicket/examples/linkomatic/Home.java    |    2 +-
 .../JQueryWicketAtmosphereResourceReference.java   |   10 +-
 .../validation/DefaultPropertyResolverTest.java    |    2 +-
 .../org/apache/wicket/bootstrap/Bootstrap.java     |   17 ++-
 .../org/apache/wicket/examples/base/Examples.java  |    9 +-
 .../wicket/examples/base/prettify/Prettify.java    |   10 +-
 .../WicketWebSocketJQueryResourceReference.java    |    8 +-
 .../RfcCompliantEmailAddressValidator.java         |    3 +-
 wicket-ioc/pom.xml                                 |    6 +-
 .../injection/CompoundFieldValueFactoryTest.java   |   13 ++-
 .../main/java/org/apache/wicket/request/Url.java   |   41 +++++---
 .../apache/wicket/request/http/WebResponse.java    |   31 +++++-
 .../java/org/apache/wicket/request/UrlTest.java    |   32 +++---
 wicket-spring/pom.xml                              |    2 +-
 .../wicket/spring/test/ApplicationContextMock.java |   14 +++-
 .../convert/converter/AbstractDateConverter.java   |   68 ++++++++++++
 .../util/convert/converter/DateConverter.java      |   52 +---------
 .../util/convert/converter/SqlDateConverter.java   |   81 +--------------
 .../util/convert/converter/SqlTimeConverter.java   |   44 ++-------
 .../convert/converter/SqlTimestampConverter.java   |   61 ++---------
 52 files changed, 599 insertions(+), 419 deletions(-)
----------------------------------------------------------------------