From 6c3f614edb18bdb8cc6e7b87627f240d97a258c3 Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Thu, 13 Oct 2016 13:56:47 +0200 Subject: HONEYCOMB-207 : Configurable modules list for distributions Export list of modules for built distribution on compile time according to distribution.modules property to ***module-config.txt Load aggregated set of modules on start from all descriptors in /modules folder Change-Id: Icdeb23536aee3a243a221d3f2ec5f340d387764e Signed-off-by: Jan Srnicek --- .../io/fd/honeycomb/vppnsh/impl/VppNshModule.java | 24 ---------------------- 1 file changed, 24 deletions(-) (limited to 'nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java') diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java index 156646628..e7d9d1535 100755 --- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java +++ b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java @@ -17,8 +17,6 @@ package io.fd.honeycomb.vppnsh.impl; import com.google.inject.AbstractModule; -import com.google.inject.Guice; -import com.google.inject.Injector; import com.google.inject.Singleton; import com.google.inject.multibindings.Multibinder; import com.google.inject.name.Names; @@ -26,12 +24,10 @@ import io.fd.honeycomb.data.init.DataTreeInitializer; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.vpp.util.NamingContext; import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.honeycomb.vppnsh.impl.cfgattrs.VppNshConfiguration; import io.fd.honeycomb.vppnsh.impl.config.VppNshWriterFactory; import io.fd.honeycomb.vppnsh.impl.init.VppNshInitializer; import io.fd.honeycomb.vppnsh.impl.oper.VppNshReaderFactory; import io.fd.honeycomb.vppnsh.impl.util.JVppNshProvider; -import net.jmob.guice.conf.core.ConfigurationModule; import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,11 +41,6 @@ public final class VppNshModule extends AbstractModule { @Override protected void configure() { - // TODO HONEYCOMB-207 workaround: - if (!isEnabled()) { - LOG.info("VppNshModule is disabled. Skipping module configuration."); - return; - } LOG.info("Configuring VppNsh module"); // Naming contexts @@ -70,19 +61,4 @@ public final class VppNshModule extends AbstractModule { Multibinder.newSetBinder(binder(), DataTreeInitializer.class).addBinding().to(VppNshInitializer.class); LOG.info("NSH module successfully configured"); } - - private static boolean isEnabled() { - final Injector injector = Guice.createInjector(new AbstractModule() { - @Override - protected void configure() { - // These are plugin specific config attributes - install(ConfigurationModule.create()); - requestInjection(VppNshConfiguration.class); - } - }); - - final VppNshConfiguration cfgAttributes = injector.getInstance(VppNshConfiguration.class); - LOG.debug("Configuration for VppNsh module: {}", cfgAttributes); - return cfgAttributes.isNshEnabled(); - } } -- cgit 1.2.3-korg