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:49 UTC
[2/9] git commit: Merge remote-tracking branch 'upstream/master' into
cdi-1.1-experimental
Merge remote-tracking branch 'upstream/master' into cdi-1.1-experimental
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a7fd8502
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a7fd8502
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a7fd8502
Branch: refs/heads/5257-css-settings
Commit: a7fd8502fa7914a8aeb8727c950c0cb863ba6dd0
Parents: 0dbcc4f 8076947
Author: John Sarman <jo...@gmail.com>
Authored: Thu Jun 27 06:46:13 2013 -0400
Committer: John Sarman <jo...@gmail.com>
Committed: Thu Jun 27 06:46:13 2013 -0400
----------------------------------------------------------------------
wicket-examples/pom.xml | 23 +++----------
.../wicket/examples/cdi/CdiApplication.java | 13 +++----
wicket-examples/src/main/webapp/WEB-INF/web.xml | 36 +++++++++++---------
wicket-experimental/wicket-cdi-1.1/pom.xml | 2 +-
.../wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml | 34 ++----------------
.../apache/wicket/cdi/AbstractCdiContainer.java | 5 ++-
.../cdi/ConversationExpiredException.java | 6 ++--
.../wicket/cdi/ComponentInjectorTest.java | 9 -----
.../wicket/cdi/weld/WeldCdiContainer.java | 6 ++--
9 files changed, 39 insertions(+), 95 deletions(-)
----------------------------------------------------------------------