Merge remote-tracking branch 'upstream/master' into trunk

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

Branch: refs/heads/master
Commit: 4787614fe2adc02552dfb56be93ac6b6050ec2be
Parents: da4c989 08af7c1
Author: Michael Mosmann <[email protected]>
Authored: Thu Feb 7 20:34:52 2013 +0100
Committer: Michael Mosmann <[email protected]>
Committed: Thu Feb 7 20:34:52 2013 +0100

----------------------------------------------------------------------
 .settings/org.eclipse.core.resources.prefs         |    9 +
 .settings/org.eclipse.jdt.core.prefs               |  368 +++
 .settings/org.eclipse.jdt.ui.prefs                 |   68 +
 .settings/org.eclipse.m2e.core.prefs               |    9 +-
 .settings/org.eclipse.pde.core.prefs               |    3 +
 .settings/org.eclipse.wst.common.component         |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 CHANGELOG-6.x                                      |   45 +
 .../.settings/org.eclipse.core.resources.prefs     |    9 +
 .../.settings/org.eclipse.jdt.core.prefs           |  368 +++-
 .../quickstart/.settings/org.eclipse.jdt.ui.prefs  |   68 +
 .../.settings/org.eclipse.m2e.core.prefs           |    9 +-
 .../.settings/org.eclipse.pde.core.prefs           |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 archetypes/quickstart/pom.xml                      |    2 +-
 .../src/main/resources/archetype-resources/pom.xml |    2 +-
 grunt.js                                           |   14 +-
 pom.xml                                            |   50 +-
 release-dashorst.sh                                |   12 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    7 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 testing/wicket-common-tests/pom.xml                |    2 +-
 .../.settings/org.eclipse.core.resources.prefs     |   18 +-
 .../.settings/org.eclipse.jdt.core.prefs           |  650 +++---
 .../.settings/org.eclipse.jdt.ui.prefs             |    4 +-
 .../.settings/org.eclipse.m2e.core.prefs           |    5 +
 .../.settings/org.eclipse.pde.core.prefs           |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 testing/wicket-threadtest/pom.xml                  |    2 +-
 .../.settings/org.eclipse.core.resources.prefs     |    7 +
 .../.settings/org.eclipse.jdt.core.prefs           |  650 +++---
 .../.settings/org.eclipse.jdt.ui.prefs             |    4 +-
 .../.settings/org.eclipse.m2e.core.prefs           |    9 +-
 .../.settings/org.eclipse.pde.core.prefs           |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-auth-roles/pom.xml                          |    2 +-
 wicket-cdi/.settings/org.eclipse.jdt.core.prefs    |   13 +-
 wicket-cdi/.settings/org.eclipse.jdt.ui.prefs      |    3 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-cdi/pom.xml                                 |    2 +-
 wicket-core/.settings/org.eclipse.jdt.core.prefs   |    7 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-core/pom.xml                                |    2 +-
 .../org/apache/wicket/Application_el.properties    |   48 -
 .../apache/wicket/Application_el.properties.xml    |   67 +
 .../org/apache/wicket/Application_es.properties    |   64 +-
 .../src/main/java/org/apache/wicket/Behaviors.java |   22 +
 .../src/main/java/org/apache/wicket/Component.java |    1 +
 .../java/org/apache/wicket/MarkupContainer.java    |    7 +-
 .../src/main/java/org/apache/wicket/Page.java      |    9 +-
 .../src/main/java/org/apache/wicket/Session.java   |   14 +
 .../wicket/ajax/AbstractAjaxTimerBehavior.java     |   11 +
 .../wicket/ajax/AbstractDefaultAjaxBehavior.java   |    9 +
 .../org/apache/wicket/ajax/AjaxRequestTarget.java  |   23 +
 .../wicket/ajax/attributes/IAjaxCallListener.java  |   25 +-
 .../wicket/ajax/attributes/ThrottlingSettings.java |   12 +-
 .../wicket/ajax/res/js/wicket-ajax-jquery.js       |  137 +-
 .../wicket/ajax/res/js/wicket-event-jquery.js      |   17 +-
 .../java/org/apache/wicket/behavior/Behavior.java  |    8 +
 .../wicket/core/util/lang/WicketObjects.java       |   16 +-
 .../wicket/feedback/FencedFeedbackPanel.java       |    2 +-
 .../apache/wicket/markup/AbstractMarkupParser.java |    6 +-
 .../wicket/markup/html/border/BoxBorder.java       |    2 +
 .../markup/html/form/AbstractCheckSelector.java    |   22 +-
 .../markup/html/form/AbstractCheckSelector.js      |  118 -
 .../html/form/AbstractSingleSelectChoice.java      |   49 +-
 .../wicket/markup/html/form/CheckBoxSelector.java  |   21 +-
 .../wicket/markup/html/form/CheckBoxSelector.js    |   41 -
 .../apache/wicket/markup/html/form/CheckGroup.java |   27 +
 .../markup/html/form/CheckGroupSelector.java       |   44 +-
 .../wicket/markup/html/form/CheckGroupSelector.js  |   48 -
 .../wicket/markup/html/form/CheckSelector.js       |  155 ++
 .../html/form/CheckboxMultipleChoiceSelector.java  |   22 +-
 .../html/form/CheckboxMultipleChoiceSelector.js    |   45 -
 .../markup/html/form/ListMultipleChoice.java       |    9 +-
 .../apache/wicket/markup/html/form/RadioGroup.java |   23 +
 .../html/form/upload/MultiFileUploadField.java     |   30 +-
 .../html/form/upload/MultiFileUploadField.js       |   64 +-
 .../parser/filter/InlineEnclosureHandler.java      |   35 +-
 .../protocol/http/AbstractRequestLogger.java       |    9 +-
 .../request/resource/ContextRelativeResource.java  |    6 +-
 .../request/resource/CssResourceReference.java     |   10 +
 .../resource/IResourceReferenceFactory.java        |   34 +
 .../resource/JavaScriptResourceReference.java      |   13 +-
 .../wicket/request/resource/PackageResource.java   |   22 +-
 .../request/resource/PackageResourceReference.java |    2 +-
 .../resource/ResourceReferenceRegistry.java        |   66 +-
 .../request/resource/UrlResourceReference.java     |    3 +-
 .../loader/PackageStringResourceLoader.java        |    5 +-
 .../apache/wicket/session/HttpSessionStore.java    |   27 +-
 .../wicket/util/tester/BaseWicketTester.java       |   27 +-
 .../org/apache/wicket/util/tester/FormTester.java  |  104 +-
 .../src/main/resources/META-INF/wicket-1.5.xsd     |   27 +-
 .../test/java/org/apache/wicket/RemoveTest.java    |   18 +-
 .../java/org/apache/wicket/RemoveTestPage.java     |   20 +
 .../ajax/GlobalUpdateAjaxAttributesTest.java       |   82 +
 .../core/util/license/ApacheLicenceHeaderTest.java |    4 +-
 .../markup/html/internal/AjaxEnclosureTest.java    |   18 +-
 .../markup/html/internal/TogglePageTest.java       |   16 +
 .../resource/LessResourceReferenceTest.java        |   63 +-
 .../MinifiedAwareResourceReferenceTest.java        |   26 +-
 .../wicket/util/tester/MockFormSubmitsPage.html    |   17 +
 .../wicket/util/tester/MockFormSubmitsPage.java    |   62 +
 .../wicket/util/tester/WicketTesterTest.java       |   27 +
 wicket-core/src/test/js/ajax.js                    |  210 ++-
 wicket-core/src/test/js/all.html                   |   12 +-
 wicket-core/src/test/js/channels.js                |   79 +-
 .../src/test/js/data/ajax/complexComponentId.xml   |    6 +-
 wicket-core/src/test/js/dom.js                     |   13 +-
 wicket-core/src/test/js/event.js                   |   16 +-
 wicket-core/src/test/js/form.js                    |    6 +-
 wicket-core/src/test/js/head.js                    |    6 +-
 wicket-core/src/test/js/qunit/qunit-1.10.0.css     |  235 --
 wicket-core/src/test/js/qunit/qunit-1.10.0.js      | 1977 ---------------
 .../.settings/org.eclipse.core.resources.prefs     |    8 +-
 .../.settings/org.eclipse.jdt.core.prefs           |  650 +++---
 wicket-datetime/.settings/org.eclipse.jdt.ui.prefs |    4 +-
 .../.settings/org.eclipse.m2e.core.prefs           |    9 +-
 .../.settings/org.eclipse.pde.core.prefs           |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-datetime/pom.xml                            |    2 +-
 .../wicket/extensions/yui/calendar/wicket-date.js  |   85 +-
 .../.settings/org.eclipse.core.resources.prefs     |    3 +-
 .../.settings/org.eclipse.jdt.core.prefs           |  735 +++---
 wicket-devutils/.settings/org.eclipse.jdt.ui.prefs |  136 +-
 .../.settings/org.eclipse.m2e.core.prefs           |    9 +-
 .../.settings/org.eclipse.pde.core.prefs           |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-devutils/pom.xml                            |    2 +-
 .../devutils/stateless/StatelessChecker.java       |   25 +-
 wicket-examples/.settings/.jsdtscope               |   12 +
 .../.settings/org.eclipse.core.resources.prefs     |    9 +-
 .../.settings/org.eclipse.jdt.core.prefs           |  650 +++---
 wicket-examples/.settings/org.eclipse.jdt.ui.prefs |    4 +-
 .../.settings/org.eclipse.m2e.core.prefs           |    9 +-
 .../.settings/org.eclipse.pde.core.prefs           |    3 +
 .../.settings/org.eclipse.wst.common.component     |   53 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    7 +
 .../org.eclipse.wst.jsdt.ui.superType.container    |    1 +
 .../org.eclipse.wst.jsdt.ui.superType.name         |    1 +
 wicket-examples/pom.xml                            |    2 +-
 .../examples/atmosphere/AtmosphereApplication.java |    4 +
 .../wicket/examples/atmosphere/HomePage.html       |    8 +-
 .../wicket/examples/upload/MultiUploadPage.java    |    2 +-
 .../.settings/org.eclipse.core.resources.prefs     |    9 +
 .../.settings/org.eclipse.jdt.core.prefs           |  368 +++
 .../.settings/org.eclipse.jdt.ui.prefs             |   68 +
 .../.settings/org.eclipse.m2e.core.prefs           |    9 +-
 .../.settings/org.eclipse.pde.core.prefs           |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-experimental/pom.xml                        |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    7 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-experimental/wicket-atmosphere/pom.xml      |    4 +-
 .../wicket/atmosphere/AtmosphereBehavior.java      |    9 +-
 .../AtmosphereEventSubscriptionCollector.java      |   50 +-
 .../org/apache/wicket/atmosphere/EventBus.java     |   14 +
 .../atmosphere/config/AtmosphereLogLevel.java      |   34 +
 .../wicket/atmosphere/config/AtmosphereMethod.java |   21 +
 .../atmosphere/config/AtmosphereParameters.java    |  667 +++++
 .../atmosphere/config/AtmosphereTransport.java     |   35 +
 .../wicket/atmosphere/jquery.wicketatmosphere.js   |   10 +-
 .../.settings/org.eclipse.core.resources.prefs     |   11 +
 .../.settings/org.eclipse.jdt.core.prefs           |  106 +-
 .../.settings/org.eclipse.jdt.ui.prefs             |   67 +-
 .../.settings/org.eclipse.m2e.core.prefs           |    5 +
 .../.settings/org.eclipse.pde.core.prefs           |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-experimental/wicket-bean-validation/pom.xml |    4 +-
 .../.settings/org.eclipse.core.resources.prefs     |    3 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    7 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-experimental/wicket-bootstrap/pom.xml       |    4 +-
 .../.settings/org.eclipse.core.resources.prefs     |    9 +
 .../.settings/org.eclipse.jdt.core.prefs           |  368 +++
 .../.settings/org.eclipse.jdt.ui.prefs             |   68 +
 .../.settings/org.eclipse.m2e.core.prefs           |    9 +-
 .../.settings/org.eclipse.pde.core.prefs           |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-experimental/wicket-examples-parent/pom.xml |    4 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    7 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 .../wicket-examples-jar/pom.xml                    |    4 +-
 .../wicket-examples-war/.settings/.jsdtscope       |   12 +
 .../.settings/org.eclipse.jdt.core.prefs           |    7 +-
 .../.settings/org.eclipse.wst.common.component     |   41 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    7 +
 .../org.eclipse.wst.jsdt.ui.superType.container    |    1 +
 .../org.eclipse.wst.jsdt.ui.superType.name         |    1 +
 .../wicket-examples-war/pom.xml                    |    4 +-
 .../.settings/org.eclipse.core.resources.prefs     |    9 +
 .../.settings/org.eclipse.jdt.core.prefs           |  368 +++
 .../.settings/org.eclipse.jdt.ui.prefs             |   68 +
 .../.settings/org.eclipse.m2e.core.prefs           |    9 +-
 .../.settings/org.eclipse.pde.core.prefs           |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 .../wicket-native-websocket/pom.xml                |    4 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    7 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 .../wicket-native-websocket-core/pom.xml           |    4 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    7 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 .../wicket-native-websocket-jetty/pom.xml          |    4 +-
 .../.settings/org.eclipse.core.resources.prefs     |   11 +
 .../.settings/org.eclipse.jdt.core.prefs           |  368 +++
 .../.settings/org.eclipse.jdt.ui.prefs             |   68 +
 .../.settings/org.eclipse.m2e.core.prefs           |    5 +
 .../.settings/org.eclipse.pde.core.prefs           |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 .../wicket-native-websocket-jetty9/pom.xml         |    4 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    7 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 .../wicket-native-websocket-tomcat/pom.xml         |    4 +-
 .../.settings/org.eclipse.core.resources.prefs     |   30 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   20 +-
 .../.settings/org.eclipse.jdt.ui.prefs             |    4 +-
 .../.settings/org.eclipse.m2e.core.prefs           |    9 +-
 .../.settings/org.eclipse.pde.core.prefs           |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-extensions/pom.xml                          |    2 +-
 .../html/autocomplete/AutoCompleteTextField.java   |   39 +-
 .../html/autocomplete/wicket-autocomplete.js       |   45 +-
 .../extensions/markup/html/form/select/Select.java |   49 +-
 .../markup/html/form/select/SelectTest.java        |   23 +-
 .../markup/html/form/select/SelectTestPage2.html   |   10 +
 .../markup/html/form/select/SelectTestPage2.java   |   68 +
 .../.settings/org.eclipse.core.resources.prefs     |    6 +
 wicket-guice/.settings/org.eclipse.jdt.core.prefs  |  650 +++---
 wicket-guice/.settings/org.eclipse.jdt.ui.prefs    |    4 +-
 wicket-guice/.settings/org.eclipse.m2e.core.prefs  |    9 +-
 wicket-guice/.settings/org.eclipse.pde.core.prefs  |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-guice/pom.xml                               |    2 +-
 .../.settings/org.eclipse.core.resources.prefs     |    7 +
 wicket-ioc/.settings/org.eclipse.jdt.core.prefs    |  650 +++---
 wicket-ioc/.settings/org.eclipse.jdt.ui.prefs      |    4 +-
 wicket-ioc/.settings/org.eclipse.m2e.core.prefs    |    9 +-
 wicket-ioc/.settings/org.eclipse.pde.core.prefs    |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-ioc/pom.xml                                 |    2 +-
 .../.settings/org.eclipse.core.resources.prefs     |    7 +
 wicket-jmx/.settings/org.eclipse.jdt.core.prefs    |  650 +++---
 wicket-jmx/.settings/org.eclipse.jdt.ui.prefs      |    4 +-
 wicket-jmx/.settings/org.eclipse.m2e.core.prefs    |    9 +-
 wicket-jmx/.settings/org.eclipse.pde.core.prefs    |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-jmx/pom.xml                                 |    2 +-
 .../.settings/org.eclipse.core.resources.prefs     |    8 +-
 .../.settings/org.eclipse.jdt.core.prefs           |  596 +++--
 .../.settings/org.eclipse.jdt.ui.prefs             |  122 +-
 .../.settings/org.eclipse.m2e.core.prefs           |    9 +-
 .../.settings/org.eclipse.pde.core.prefs           |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-objectssizeof-agent/pom.xml                 |    2 +-
 .../.settings/org.eclipse.core.resources.prefs     |    3 +-
 .../.settings/org.eclipse.jdt.core.prefs           |  720 +++---
 wicket-request/.settings/org.eclipse.jdt.ui.prefs  |  136 +-
 .../.settings/org.eclipse.m2e.core.prefs           |    9 +-
 .../.settings/org.eclipse.pde.core.prefs           |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-request/pom.xml                             |    4 +-
 .../.settings/org.eclipse.core.resources.prefs     |    7 +
 wicket-spring/.settings/org.eclipse.jdt.core.prefs |  650 +++---
 wicket-spring/.settings/org.eclipse.jdt.ui.prefs   |    4 +-
 wicket-spring/.settings/org.eclipse.m2e.core.prefs |    9 +-
 wicket-spring/.settings/org.eclipse.pde.core.prefs |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-spring/pom.xml                              |    2 +-
 .../.settings/org.eclipse.core.resources.prefs     |    4 +-
 wicket-util/.settings/org.eclipse.jdt.core.prefs   |  720 +++---
 wicket-util/.settings/org.eclipse.jdt.ui.prefs     |  136 +-
 wicket-util/.settings/org.eclipse.m2e.core.prefs   |    9 +-
 wicket-util/.settings/org.eclipse.pde.core.prefs   |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-util/pom.xml                                |    2 +-
 .../.settings/org.eclipse.core.resources.prefs     |    7 +
 .../.settings/org.eclipse.jdt.core.prefs           |  663 +++---
 wicket-velocity/.settings/org.eclipse.jdt.ui.prefs |    3 +-
 .../.settings/org.eclipse.m2e.core.prefs           |    9 +-
 .../.settings/org.eclipse.pde.core.prefs           |    3 +
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket-velocity/pom.xml                            |    2 +-
 wicket/.settings/org.eclipse.core.resources.prefs  |    9 +
 wicket/.settings/org.eclipse.jdt.core.prefs        |  376 +++-
 wicket/.settings/org.eclipse.jdt.ui.prefs          |   68 +
 wicket/.settings/org.eclipse.m2e.core.prefs        |    9 +-
 wicket/.settings/org.eclipse.pde.core.prefs        |    3 +
 wicket/.settings/org.eclipse.wst.common.component  |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 wicket/pom.xml                                     |    2 +-
 318 files changed, 11594 insertions(+), 7790 deletions(-)
----------------------------------------------------------------------


Reply via email to