ISIS-793: just moving methods around in IsisWicketApplication (for config builder)
... already protected visibility so can be overridden if required. Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fe64d09c Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fe64d09c Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fe64d09c Branch: refs/heads/master Commit: fe64d09c1623afee37e830995442222ede523609 Parents: c3136bf Author: Dan Haywood <[email protected]> Authored: Mon May 26 11:06:26 2014 +0100 Committer: Dan Haywood <[email protected]> Committed: Mon May 26 11:06:26 2014 +0100 ---------------------------------------------------------------------- .../wicket/viewer/IsisWicketApplication.java | 79 ++++++++++---------- 1 file changed, 41 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/fe64d09c/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java index 259a0bd..b2a9f37 100644 --- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java +++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java @@ -438,6 +438,47 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement getCssResourceReferences))); } + // ////////////////////////////////////// + + private IsisConfigurationBuilder createConfigBuilder() { + return createConfigBuilder(getServletContext()); + } + + protected IsisConfigurationBuilder createConfigBuilder(final ServletContext servletContext) { + + final String configLocation = servletContext.getInitParameter(WebAppConstants.CONFIG_DIR_PARAM); + final ResourceStreamSourceForWebInf rssWebInf = new ResourceStreamSourceForWebInf(servletContext); + final ResourceStreamSourceContextLoaderClassPath rssContextLoaderClassPath = ResourceStreamSourceContextLoaderClassPath.create(); + final ResourceStreamSourceCurrentClassClassPath rssCurrentClassPath = new ResourceStreamSourceCurrentClassClassPath(); + final ResourceStreamSourceComposite compositeSource = new ResourceStreamSourceComposite(rssWebInf, rssContextLoaderClassPath, rssCurrentClassPath); + + if ( configLocation != null ) { + LOG.info( "Config override location: " + configLocation ); + compositeSource.addResourceStreamSource(ResourceStreamSourceFileSystem.create(configLocation)); + } else { + LOG.info( "Config override location: No override location configured!" ); + } + + final IsisConfigurationBuilder configurationBuilder = new IsisConfigurationBuilderResourceStreams(compositeSource); + + primeConfigurationBuilder(configurationBuilder, servletContext); + configurationBuilder.addDefaultConfigurationResources(); + + IsisWebAppBootstrapperUtil.addConfigurationResourcesForViewers(configurationBuilder, servletContext); + return configurationBuilder; + } + + @SuppressWarnings("unchecked") + private static void primeConfigurationBuilder(final IsisConfigurationBuilder isisConfigurationBuilder, final ServletContext servletContext) { + final List<IsisConfigurationBuilderPrimer> isisConfigurationBuilderPrimers = (List<IsisConfigurationBuilderPrimer>) servletContext.getAttribute(WebAppConstants.CONFIGURATION_PRIMERS_KEY); + if (isisConfigurationBuilderPrimers == null) { + return; + } + for (final IsisConfigurationBuilderPrimer isisConfigurationBuilderPrimer : isisConfigurationBuilderPrimers) { + isisConfigurationBuilderPrimer.primeConfigurationBuilder(isisConfigurationBuilder); + } + } + // ////////////////////////////////////// @@ -514,44 +555,6 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement return new IsisInjectModule(deploymentType, isisConfigurationBuilder); } - private IsisConfigurationBuilder createConfigBuilder() { - return createConfigBuilder(getServletContext()); - } - - protected IsisConfigurationBuilder createConfigBuilder(final ServletContext servletContext) { - - final String configLocation = servletContext.getInitParameter(WebAppConstants.CONFIG_DIR_PARAM); - final ResourceStreamSourceForWebInf rssWebInf = new ResourceStreamSourceForWebInf(servletContext); - final ResourceStreamSourceContextLoaderClassPath rssContextLoaderClassPath = ResourceStreamSourceContextLoaderClassPath.create(); - final ResourceStreamSourceCurrentClassClassPath rssCurrentClassPath = new ResourceStreamSourceCurrentClassClassPath(); - final ResourceStreamSourceComposite compositeSource = new ResourceStreamSourceComposite(rssWebInf, rssContextLoaderClassPath, rssCurrentClassPath); - - if ( configLocation != null ) { - LOG.info( "Config override location: " + configLocation ); - compositeSource.addResourceStreamSource(ResourceStreamSourceFileSystem.create(configLocation)); - } else { - LOG.info( "Config override location: No override location configured!" ); - } - - final IsisConfigurationBuilder configurationBuilder = new IsisConfigurationBuilderResourceStreams(compositeSource); - - primeConfigurationBuilder(configurationBuilder, servletContext); - configurationBuilder.addDefaultConfigurationResources(); - - IsisWebAppBootstrapperUtil.addConfigurationResourcesForViewers(configurationBuilder, servletContext); - return configurationBuilder; - } - - @SuppressWarnings("unchecked") - private static void primeConfigurationBuilder(final IsisConfigurationBuilder isisConfigurationBuilder, final ServletContext servletContext) { - final List<IsisConfigurationBuilderPrimer> isisConfigurationBuilderPrimers = (List<IsisConfigurationBuilderPrimer>) servletContext.getAttribute(WebAppConstants.CONFIGURATION_PRIMERS_KEY); - if (isisConfigurationBuilderPrimers == null) { - return; - } - for (final IsisConfigurationBuilderPrimer isisConfigurationBuilderPrimer : isisConfigurationBuilderPrimers) { - isisConfigurationBuilderPrimer.primeConfigurationBuilder(isisConfigurationBuilder); - } - } protected void initWicketComponentInjection(final Injector injector) { getComponentInstantiationListeners().add(new GuiceComponentInjector(this, injector, false));
