You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/05/26 12:33:09 UTC
[08/12] git commit: ISIS-793: just moving methods around in
IsisWicketApplication (CSS bundle)
ISIS-793: just moving methods around in IsisWicketApplication (CSS bundle)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/813841a8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/813841a8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/813841a8
Branch: refs/heads/master
Commit: 813841a8e12a53d6c43ec08a0f3e63399a8c3ddc
Parents: a14d2d2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon May 26 11:10:53 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon May 26 11:10:53 2014 +0100
----------------------------------------------------------------------
.../wicket/viewer/IsisWicketApplication.java | 104 ++++++++++---------
1 file changed, 53 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/813841a8/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 3ff19bc..ae8c427 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
@@ -368,6 +368,57 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
}
}
+
+ // //////////////////////////////////////
+
+ 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);
+ }
+ }
+
+ // //////////////////////////////////////
+
+ /**
+ * Override if required
+ */
+ protected Module newIsisWicketModule() {
+ return new IsisWicketModule();
+ }
+
// //////////////////////////////////////
/**
@@ -440,57 +491,6 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
// //////////////////////////////////////
- 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);
- }
- }
-
- // //////////////////////////////////////
-
- /**
- * Override if required
- */
- protected Module newIsisWicketModule() {
- return new IsisWicketModule();
- }
-
-
- // //////////////////////////////////////
-
/**
* The validation errors, if any, that occurred on {@link #init() startup}.
*/
@@ -564,6 +564,8 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
return new IsisInjectModule(deploymentType, isisConfigurationBuilder);
}
+ // //////////////////////////////////////
+
protected void initWicketComponentInjection(final Injector injector) {
getComponentInstantiationListeners().add(new GuiceComponentInjector(this, injector, false));