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/01/17 11:10:55 UTC
[1/3] wicket git commit: Remove obsolete revert-release script
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x f4298765b -> 41a37133a
Remove obsolete revert-release script
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ecddd9dd
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ecddd9dd
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ecddd9dd
Branch: refs/heads/wicket-7.x
Commit: ecddd9dd39f11a50f95ad87b544e0bca5e2272e6
Parents: 4988085
Author: Martijn Dashorst <da...@apache.org>
Authored: Sun Jan 17 11:08:39 2016 +0100
Committer: Martijn Dashorst <da...@apache.org>
Committed: Sun Jan 17 11:08:39 2016 +0100
----------------------------------------------------------------------
revert-release.sh | 55 --------------------------------------------------
1 file changed, 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ecddd9dd/revert-release.sh
----------------------------------------------------------------------
diff --git a/revert-release.sh b/revert-release.sh
deleted file mode 100755
index 6220f97..0000000
--- a/revert-release.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-function getVersion {
- cat << EOF | xmllint --noent --shell pom.xml | grep content | cut -f2 -d=
-setns pom=http://maven.apache.org/POM/4.0.0
-xpath /pom:project/pom:version/text()
-EOF
-}
-
-# current_version=$(getVersion)
-# major_version=$(expr $current_version : '\(.*\)\..*\..*\-SNAPSHOT')
-# minor_version=$(expr $current_version : '.*\.\(.*\)\..*\-SNAPSHOT')
-# bugfix_version=$(expr $current_version : '.*\..*\.\(.*\)-SNAPSHOT')
-# version="$major_version.$minor_version.0"
-
-read -p "Revert which version? " version
-
-echo ""
-echo "Revert the current in-progress release for apache-wicket-$version"
-
-echo ""
-echo "Press enter to continue or CTRL-C to abort \c"
-read
-
-branch="build/wicket-$version"
-tag="wicket-$version"
-
-git checkout wicket-7.x
-git branch -D $branch
-git tag -d $tag
-
-svn rm https://dist.apache.org/repos/dist/dev/wicket/$version -m "Reverting release $version"
-
-find . -name "*.releaseBackup" -exec rm {} \;
-rm release.properties release.txt > /dev/null
-
-echo ""
-echo "Cleaned up the release"
-echo ""
-echo "Don't forget to drop the Maven staging repository"
-echo ""
[2/3] wicket git commit: Merge branch 'wicket-7.x' of
https://git-wip-us.apache.org/repos/asf/wicket into wicket-7.x
Posted by da...@apache.org.
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/a9816fae
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a9816fae
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a9816fae
Branch: refs/heads/wicket-7.x
Commit: a9816fae35f8707f1b31cef324d3e508cdfb8835
Parents: ecddd9d f429876
Author: Martijn Dashorst <da...@apache.org>
Authored: Sun Jan 17 11:09:07 2016 +0100
Committer: Martijn Dashorst <da...@apache.org>
Committed: Sun Jan 17 11:09:07 2016 +0100
----------------------------------------------------------------------
.../main/resources/archetype-resources/pom.xml | 22 +-
.../src/test/java/Start.java | 5 +
testing/wicket-common-tests/pom.xml | 5 +
testing/wicket-js-tests/pom.xml | 11 +-
testing/wicket-threadtest/pom.xml | 7 +-
.../java/org/apache/wicket/Application.java | 7 +-
.../java/org/apache/wicket/MarkupContainer.java | 5 +-
.../wicket/ajax/AjaxPreventSubmitBehavior.java | 66 +
...AjaxFormChoiceComponentUpdatingBehavior.java | 1 +
.../wicket/markup/html/border/Border.java | 12 +
.../DynamicJQueryResourceReference.java | 2 +-
.../resource/JQueryResourceReference.java | 2 +-
.../wicket/resource/jquery/jquery-1.11.3.js | 10351 ----------
.../wicket/resource/jquery/jquery-1.11.3.min.js | 5 -
.../wicket/resource/jquery/jquery-1.12.0.js | 11027 +++++++++++
.../wicket/resource/jquery/jquery-1.12.0.min.js | 5 +
.../wicket/resource/jquery/jquery-2.1.4.js | 9210 ---------
.../wicket/resource/jquery/jquery-2.1.4.min.js | 4 -
.../wicket/resource/jquery/jquery-2.2.0.js | 9831 ++++++++++
.../wicket/resource/jquery/jquery-2.2.0.min.js | 4 +
.../apache/wicket/TestDetachPageAjaxResult.html | 2 +-
.../wicket/TestDetachPageExpectedResult.html | 2 +-
.../ajax/AjaxBehaviorEnabled_expected.html | 2 +-
...axHeaderContributionPage2_ajax_expected.html | 2 +-
.../AjaxHeaderContributionPage2_expected.html | 2 +-
...jaxHeaderContributionPage_ajax_expected.html | 2 +-
.../AjaxHeaderContributionPage_expected.html | 2 +-
.../ajax/DomReadyOrderPage_ajax_expected.html | 2 +-
.../wicket/ajax/DomReadyOrderPage_expected.html | 2 +-
.../form/AjaxFormSubmitTestPage_expected.html | 2 +-
.../OnChangeAjaxBehaviorTestPage_expected.html | 2 +-
.../ajaxLink/AjaxLinkPageExpectedResult.html | 2 +-
.../AjaxLinkWithBorderPageExpectedResult.html | 2 +-
.../html/ajaxLink/AjaxPage2_ExpectedResult.html | 2 +-
.../SimpleTestPageExpectedResult-1.html | 2 +-
.../SimpleTestPageExpectedResult.html | 2 +-
.../head/filter/FilteredHeaderPageExpected.html | 2 +-
.../html/basic/SimplePageExpectedResult_13.html | 2 +-
.../HideableBorderPage_ExpectedResult.html | 2 +-
.../panel/InlinePanelPageExpectedResult_7.html | 2 +-
.../panel/InlinePanelPageExpectedResult_8.html | 2 +-
.../wicket/queueing/ComponentQueueingTest.java | 43 +
.../queueing/bodyisachild/BodyIsAChildPage.html | 22 +
.../queueing/bodyisachild/BodyIsAChildPage.java | 41 +
.../wicket/queueing/bodyisachild/FormGroup.html | 15 +
.../wicket/queueing/bodyisachild/FormGroup.java | 262 +
.../queueing/bodyisachild/LoginPanel.html | 21 +
.../queueing/bodyisachild/LoginPanel.java | 62 +
.../ResourceAggregatorTest1Page_results.html | 2 +-
.../ResourceAggregatorTest2Page_results.html | 2 +-
wicket-core/src/test/js/all.html | 2 +-
wicket-core/src/test/js/amd.html | 2 +-
.../yui/calendar/DatesPage1_ExpectedResult.html | 2 +-
.../wicket/examples/ajax/builtin/FormPage.html | 19 +-
.../wicket/examples/ajax/builtin/FormPage.java | 51 +-
.../src/main/webapp/js-test/lib/gym.js | 6 +-
.../src/main/webapp/js-test/lib/jquery.js | 17166 +++++++++--------
.../src/main/webapp/js-test/tests/ajax/form.js | 42 +-
.../extensions/wizard/WizardButtonBar.java | 11 +
.../protocol/ws/api/ServletRequestCopy.java | 95 +-
.../protocol/ws/api/WebSocketRequest.java | 72 +-
.../protocol/ws/api/WebSocketResponse.java | 19 +-
wicket-user-guide/pom.xml | 5 +
63 files changed, 30597 insertions(+), 27989 deletions(-)
----------------------------------------------------------------------
[3/3] wicket git commit: Update changelog
Posted by da...@apache.org.
Update changelog
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/41a37133
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/41a37133
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/41a37133
Branch: refs/heads/wicket-7.x
Commit: 41a37133a5ada1aa4108932643b490538a322404
Parents: a9816fa
Author: Martijn Dashorst <da...@apache.org>
Authored: Sun Jan 17 11:09:56 2016 +0100
Committer: Martijn Dashorst <da...@apache.org>
Committed: Sun Jan 17 11:10:26 2016 +0100
----------------------------------------------------------------------
CHANGELOG-7.x | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/41a37133/CHANGELOG-7.x
----------------------------------------------------------------------
diff --git a/CHANGELOG-7.x b/CHANGELOG-7.x
index 22242a3..b665136 100644
--- a/CHANGELOG-7.x
+++ b/CHANGELOG-7.x
@@ -35,8 +35,12 @@ Release Notes - Wicket - Version 7.2.0
* [WICKET-6058] - Error in calculation of byte ranges
* [WICKET-6059] - TransparentWebMarkupContainer can not resolve autocomponents in its parent
* [WICKET-6062] - MockHttpSession should renew its id after invalidation
+ * [WICKET-6063] - Add support for WebSocketRequest#getUrl() and other properties which are available in the handshake request
+ * [WICKET-6064] - WebSocketResponse.sendRedirect could be supported with <ajax-response><redirect>...</></>
* [WICKET-6065] - Calling http://examples7x.wicket.apache.org/resourceaggregation/ generate Internal error
* [WICKET-6068] - The key RangeValidator.exact is not mapped in Application_de.properties
+ * [WICKET-6076] - Problem with queued components and enclosure
+ * [WICKET-6077] - Border's body is not added as a child due to dequeuing
** Improvement
@@ -50,6 +54,8 @@ Release Notes - Wicket - Version 7.2.0
* [WICKET-6051] - Improve performance of CssUrlReplacer
* [WICKET-6054] - Provide a factory method for the WebSocketResponse & WebSocketRequest
* [WICKET-6061] - Improved PackageResource#getCacheKey
+ * [WICKET-6070] - Provide factory methods for WizardButtonBar buttons
+ * [WICKET-6072] - Improve the quickstart to make it easier to use JSR-356 web sockets
** New Feature
@@ -60,6 +66,11 @@ Release Notes - Wicket - Version 7.2.0
* [WICKET-6049] - Update the site to point to the new deployments of the examples
* [WICKET-6057] - Upgrade commons-collections to 4.1
+ * [WICKET-6071] - Upgrade jQuery to 1.12 / 2.2.0
+
+** Wish
+
+ * [WICKET-6067] - Provide an Ajax Behavior that prevents form submit on ENTER
=======================================================================