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 2015/10/08 19:08:50 UTC
isis git commit: ISIS-1208: as a quick fix,
just add the default binding into the IsisWebAppBootstrapper (as used
by RO viewer without Wicket viewer) as well.
Repository: isis
Updated Branches:
refs/heads/master e8c46763c -> d138964b4
ISIS-1208: as a quick fix, just add the default binding into the IsisWebAppBootstrapper (as used by RO viewer without Wicket viewer) as well.
could perhaps refactor later to consolidate...
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d138964b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d138964b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d138964b
Branch: refs/heads/master
Commit: d138964b4fbb9eaf88ce85dc56720b936a2f6a0a
Parents: e8c4676
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Oct 8 18:08:40 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Oct 8 18:08:40 2015 +0100
----------------------------------------------------------------------
.../isis/core/webapp/IsisWebAppBootstrapper.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d138964b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
index f16068b..aa3e8b7 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
@@ -20,14 +20,20 @@
package org.apache.isis.core.webapp;
import java.util.List;
+
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
+
import com.google.common.collect.Lists;
+import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import org.apache.isis.applib.AppManifest;
import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderPrimer;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderResourceStreams;
@@ -43,6 +49,7 @@ import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.SystemConstants;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.systemusinginstallers.IsisSystemThatUsesInstallersFactory;
import org.apache.isis.core.webapp.config.ResourceStreamSourceForWebInf;
/**
@@ -128,7 +135,12 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
private Injector createGuiceInjector(final IsisConfigurationBuilder isisConfigurationBuilder, final DeploymentType deploymentType, final InstallerLookup installerLookup) {
final IsisInjectModule isisModule = new IsisInjectModule(deploymentType, isisConfigurationBuilder, installerLookup);
- return Guice.createInjector(isisModule);
+ return Guice.createInjector(isisModule, new AbstractModule(){
+ @Override
+ protected void configure() {
+ bind(AppManifest.class).toInstance(IsisSystemThatUsesInstallersFactory.NOOP);
+ }
+ });
}
@SuppressWarnings("unchecked")