Repository: isis Updated Branches: refs/heads/master b03248ec5 -> 0fd587210
ISIS-1057 WebRequestCycleForIsis should use the configured SignIn page PageClassRegistry is a Guice bean, not Isis service. Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0fd58721 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0fd58721 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0fd58721 Branch: refs/heads/master Commit: 0fd587210e8c7ac4382535181371d99d49575e8b Parents: b03248e Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Feb 26 11:58:48 2015 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Feb 26 11:58:48 2015 +0200 ---------------------------------------------------------------------- .../viewer/wicket/viewer/IsisWicketApplication.java | 8 ++++---- .../integration/wicket/WebRequestCycleForIsis.java | 13 +++++++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/0fd58721/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 439cb42..d3fa22a 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 @@ -239,10 +239,6 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement getRequestCycleSettings().setRenderStrategy(RenderStrategy.REDIRECT_TO_RENDER); - RequestCycleListenerCollection requestCycleListeners = getRequestCycleListeners(); - requestCycleListeners.add(newWebRequestCycleForIsis()); - requestCycleListeners.add(new PageRequestHandlerTracker()); - getResourceSettings().setParentFolderPlaceholder("$up$"); determineDeploymentTypeIfRequired(); @@ -260,6 +256,10 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement initWicketComponentInjection(injector); + RequestCycleListenerCollection requestCycleListeners = getRequestCycleListeners(); + requestCycleListeners.add(newWebRequestCycleForIsis()); + requestCycleListeners.add(new PageRequestHandlerTracker()); + // must be done after injected componentFactoryRegistry into the app itself buildCssBundle(); http://git-wip-us.apache.org/repos/asf/isis/blob/0fd58721/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java index 6d8ca62..fa99580 100644 --- a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java +++ b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java @@ -19,8 +19,10 @@ package org.apache.isis.viewer.wicket.viewer.integration.wicket; +import javax.inject.Inject; import java.lang.reflect.Constructor; import java.util.List; +import java.util.concurrent.Callable; import com.google.common.base.Function; import com.google.common.collect.Lists; @@ -35,6 +37,7 @@ import org.apache.wicket.authroles.authentication.AuthenticatedWebSession; import org.apache.wicket.core.request.handler.PageProvider; import org.apache.wicket.core.request.handler.RenderPageRequestHandler; import org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPolicy; +import org.apache.wicket.injection.Injector; import org.apache.wicket.model.Model; import org.apache.wicket.protocol.http.PageExpiredException; import org.apache.wicket.request.IRequestHandler; @@ -69,6 +72,13 @@ public class WebRequestCycleForIsis extends AbstractRequestCycleListener { private static final Logger LOG = LoggerFactory.getLogger(WebRequestCycleForIsis.class); + @Inject + private PageClassRegistry pageClassRegistry; + + public WebRequestCycleForIsis() { + Injector.get().inject(this); + } + @Override public synchronized void onBeginRequest(RequestCycle requestCycle) { @@ -190,8 +200,7 @@ public class WebRequestCycleForIsis extends AbstractRequestCycleListener { * @param exceptionModel A model bringing the information about the occurred problem * @return An instance of the configured signin page */ - private IRequestablePage newSignInPage(ExceptionModel exceptionModel) { - PageClassRegistry pageClassRegistry = getServicesInjector().lookupService(PageClassRegistry.class); + private IRequestablePage newSignInPage(final ExceptionModel exceptionModel) { Class<? extends Page> signInPageClass = pageClassRegistry.getPageClass(PageType.SIGN_IN); PageParameters parameters = new PageParameters(); Page signInPage;
