Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/wicket
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ef44b7e3 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ef44b7e3 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ef44b7e3 Branch: refs/heads/master Commit: ef44b7e3cd3a8046a358b57fca0a26a6259989df Parents: 1f084f6 0136800 Author: Martijn Dashorst <[email protected]> Authored: Fri Aug 29 13:49:52 2014 +0200 Committer: Martijn Dashorst <[email protected]> Committed: Fri Aug 29 13:49:52 2014 +0200 ---------------------------------------------------------------------- archetypes/quickstart/pom.xml | 4 +- pom.xml | 5 +- testing/wicket-common-tests/pom.xml | 4 +- wicket-auth-roles/pom.xml | 4 +- wicket-core/pom.xml | 4 +- .../java/org/apache/wicket/Application.java | 2 - .../main/java/org/apache/wicket/Component.java | 2 +- .../main/java/org/apache/wicket/Session.java | 2 +- .../wicket/ajax/res/js/wicket-event-jquery.js | 4 + .../wicket/markup/head/MetaDataHeaderItem.java | 6 + .../AbstractTransformerBehavior.java | 6 + .../wicket/markup/transformer/ITransformer.java | 3 +- .../org/apache/wicket/mock/MockPageManager.java | 2 +- .../apache/wicket/page/AbstractPageManager.java | 6 - .../org/apache/wicket/page/IPageManager.java | 7 +- .../wicket/page/PageManagerDecorator.java | 12 +- .../apache/wicket/page/PageStoreManager.java | 59 +++--- .../ListenerInterfaceRequestHandlerTest.java | 2 +- wicket-datetime/pom.xml | 4 +- wicket-devutils/pom.xml | 4 +- wicket-examples/pom.xml | 4 +- .../wicket/examples/repeater/Contact.java | 10 ++ .../wicket/examples/spring/common/Contact.java | 10 ++ wicket-experimental/wicket-atmosphere/pom.xml | 11 +- wicket-extensions/pom.xml | 4 +- .../html/autocomplete/wicket-autocomplete.js | 4 +- .../wicket/extensions/wizard/CancelButton.java | 2 +- .../wicket/extensions/wizard/FinishButton.java | 3 +- .../wicket/extensions/wizard/LastButton.java | 4 +- .../extensions/wizard/PreviousButton.java | 2 +- wicket-guice/pom.xml | 4 +- .../wicket/guice/GuiceFieldValueFactory.java | 17 +- .../wicket/guice/AbstractInjectorTest.java | 179 +++++++++++++++++++ .../wicket/guice/GuiceInjectInjectorTest.java | 34 ++++ .../apache/wicket/guice/GuiceInjectorTest.java | 178 ------------------ .../guice/JavaxInjectGuiceInjectorTest.java | 40 ++++- .../wicket/guice/JavaxInjectTestComponent.java | 16 +- .../wicket/guice/TestComponentInterface.java | 1 - wicket-ioc/pom.xml | 4 +- wicket-jmx/pom.xml | 4 +- .../wicket-native-websocket-core/pom.xml | 4 +- .../wicket-native-websocket-jetty/pom.xml | 4 +- .../wicket-native-websocket-jetty9/pom.xml | 4 +- .../wicket-native-websocket-tomcat/pom.xml | 4 +- wicket-objectsizeof-agent/pom.xml | 4 +- wicket-request/pom.xml | 4 +- .../wicket/request/RequestHandlerStack.java | 2 +- wicket-spring/pom.xml | 4 +- .../annot/AnnotProxyFieldValueFactory.java | 3 +- .../annot/AnnotProxyFieldValueFactoryTest.java | 22 +-- ...axInjectAnnotProxyFieldValueFactoryTest.java | 29 ++- ...ringBeanAnnotProxyFieldValueFactoryTest.java | 34 ++++ .../spring/injection/util/Injectable.java | 64 ------- .../injection/util/JavaxInjectInjectable.java | 69 +++++++ .../spring/injection/util/JavaxInjectable.java | 66 ------- .../injection/util/SpringBeanInjectable.java | 63 +++++++ wicket-util/pom.xml | 4 +- .../java/org/apache/wicket/util/diff/Delta.java | 4 +- .../util/license/XmlPrologHeaderHandler.java | 3 +- .../org/apache/wicket/util/thread/Task.java | 4 +- wicket-velocity/pom.xml | 4 +- 61 files changed, 607 insertions(+), 465 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ef44b7e3/pom.xml ----------------------------------------------------------------------
