Merge branch 'master' into sandbox/component-queueing-2
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b3c946af Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b3c946af Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b3c946af Branch: refs/heads/sandbox/component-queueing-2 Commit: b3c946af73abe6301017d7d21f487398c6616540 Parents: 3a3e32a f1e84a7 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Feb 18 12:01:28 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Feb 18 12:01:28 2014 +0200 ---------------------------------------------------------------------- Gruntfile.js | 15 ++++ pom.xml | 6 +- .../validation/DefaultPropertyResolver.java | 20 ++++- .../validation/DefaultPropertyResolverTest.java | 27 ++++++ .../main/java/org/apache/wicket/Component.java | 13 ++- .../main/java/org/apache/wicket/Session.java | 86 +++++++++++++------- .../wicket/ajax/res/js/wicket-ajax-jquery.js | 16 ++-- .../core/util/string/ComponentRenderer.java | 15 +--- .../apache/wicket/settings/DebugSettings.java | 38 +++++++++ .../apache/wicket/util/cookies/CookieUtils.java | 2 +- .../wicket/settings/DebugSettingsTest.java | 77 ++++++++++++++++++ .../wicket/settings/ISecuritySettingsTest.java | 2 +- wicket-core/src/test/js/ajax.js | 2 +- .../data/ajax/evaluationIdentifierAndCodeId.xml | 3 +- .../wicket/examples/asemail/MailTemplate.html | 4 +- .../examples/cdi/AutoConversationPage1.html | 19 +++++ .../examples/cdi/AutoConversationPage1.java | 57 +++++++++++++ .../examples/cdi/AutoConversationPage2.html | 17 ++++ .../examples/cdi/AutoConversationPage2.java | 43 ++++++++++ .../wicket/examples/cdi/CdiApplication.java | 18 ++-- .../apache/wicket/examples/cdi/CdiHomePage.html | 3 + .../src/main/webapp/js-test/all.html | 3 + .../src/main/webapp/js-test/lib/gym.js | 5 +- .../src/main/webapp/js-test/tests/ajax/form.js | 3 + .../js-test/tests/bean-validation/birthdate.js | 5 +- .../js-test/tests/bean-validation/email.js | 3 + .../js-test/tests/bean-validation/name.js | 3 + .../js-test/tests/bean-validation/phone.js | 3 + .../js-test/tests/cdi/auto-conversation.js | 79 ++++++++++++++++++ .../webapp/js-test/tests/cdi/conversation.js | 5 +- .../main/webapp/js-test/tests/cdi/injection.js | 5 +- .../src/main/webapp/js-test/tests/echo.js | 3 + .../src/main/webapp/js-test/tests/forminput.js | 3 + .../src/main/webapp/js-test/tests/helloworld.js | 3 + .../main/webapp/js-test/tests/mailtemplate.js | 85 +++++++++++++++++++ .../wicket-native-websocket-javax/pom.xml | 2 +- .../apache/wicket/util/encoding/UrlEncoder.java | 10 +-- 37 files changed, 622 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/b3c946af/wicket-core/src/main/java/org/apache/wicket/Component.java ----------------------------------------------------------------------
