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/06/28 10:53:56 UTC
[9/9] git commit: Merge branch 'master' into 5257-css-settings
Merge branch 'master' into 5257-css-settings
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/abdf5c3a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/abdf5c3a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/abdf5c3a
Branch: refs/heads/5257-css-settings
Commit: abdf5c3ad6fdb662e2370918818f1f3a0ca69445
Parents: 5ac5a36 f5d586b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 28 11:53:32 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 28 11:53:32 2013 +0300
----------------------------------------------------------------------
pom.xml | 2 +-
wicket-examples/pom.xml | 2 +-
wicket-experimental/wicket-cdi-1.1/pom.xml | 2 +-
.../wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml | 10 +--
.../org/apache/wicket/cdi/AbstractInjector.java | 5 ++
.../org/apache/wicket/cdi/CdiConfiguration.java | 90 ++++++++++---------
.../wicket/cdi/ConversationPropagator.java | 9 ++
.../apache/wicket/cdi/CdiConfigurationTest.java | 77 ++++++++++++++++
.../wicket/cdi/ComponentInjectorTest.java | 94 ++++++++------------
.../org/apache/wicket/cdi/MockCdiContainer.java | 70 +++++++++++++++
.../apache/wicket/cdi/WicketCdiTestCase.java | 78 ++++++++++++++++
.../apache/wicket/cdi/testapp/TestAppScope.java | 41 +++++++++
.../wicket/cdi/testapp/TestApplication.java | 43 +++++++++
.../cdi/testapp/TestConversationBean.java | 42 +++++++++
.../cdi/testapp/TestConversationPage.html | 12 +++
.../cdi/testapp/TestConversationPage.java | 66 ++++++++++++++
.../org/apache/wicket/cdi/testapp/TestPage.html | 10 +++
.../org/apache/wicket/cdi/testapp/TestPage.java | 39 ++++++++
.../wicket/cdi/testapp/TestQualifier.java | 36 ++++++++
.../wicket-cdi-1.1/wicket-cdi-1.1-weld/pom.xml | 6 +-
20 files changed, 624 insertions(+), 110 deletions(-)
----------------------------------------------------------------------