You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/03/21 09:34:17 UTC
isis git commit: ISIS-1107 Register Guice Injector in Wicket before
trying to inject the application's dependencies
Repository: isis
Updated Branches:
refs/heads/master 3044f0288 -> e6551bc46
ISIS-1107 Register Guice Injector in Wicket before trying to inject the application's dependencies
Register Guice's Injector with wicket-guice before injecting the application's dependencies so that GuiceBeanProvider can be used too in the transitive dependencies.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e6551bc4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e6551bc4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e6551bc4
Branch: refs/heads/master
Commit: e6551bc46829a3828047148154377a7b91ca7e14
Parents: 3044f02
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Mar 21 10:33:11 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Mar 21 10:33:11 2015 +0200
----------------------------------------------------------------------
.../apache/isis/viewer/wicket/viewer/IsisWicketApplication.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e6551bc4/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index ad010fd..ac1de1b 100644
--- a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -252,6 +252,7 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
final IsisInjectModule isisModule = newIsisModule(deploymentType, isisConfigurationBuilder);
final Injector injector = Guice.createInjector(isisModule, newIsisWicketModule());
+ initWicketComponentInjection(injector);
injector.injectMembers(this);
if (requestCycleListenerForIsis instanceof WebRequestCycleForIsis) {
@@ -264,8 +265,6 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
getDebugSettings().setAjaxDebugModeEnabled(determineAjaxDebugModeEnabled(configuration));
- initWicketComponentInjection(injector);
-
// must be done after injected componentFactoryRegistry into the app itself
buildCssBundle();