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:54 UTC
[7/9] git commit: Merge branch 'cdi-1.1-experimental' of
https://github.com/jsarman/wicket into cdi-1.1-tests
Merge branch 'cdi-1.1-experimental' of https://github.com/jsarman/wicket into cdi-1.1-tests
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6a3d865a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6a3d865a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6a3d865a
Branch: refs/heads/5257-css-settings
Commit: 6a3d865af097b1039704386ef1fa3f90318df4ff
Parents: c66b167 73d7cb4
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 28 09:41:34 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 28 09:41:34 2013 +0300
----------------------------------------------------------------------
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 | 125 +++++++++++++++++++
.../wicket/cdi/ComponentInjectorTest.java | 112 +++++++++++------
.../org/apache/wicket/cdi/MockContainer.java | 70 +++++++++++
.../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 +-
18 files changed, 630 insertions(+), 90 deletions(-)
----------------------------------------------------------------------