From b709841f3b01ace438185ea28c7aca19123291be Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Thu, 13 Oct 2016 13:56:47 +0200 Subject: [PATCH] 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 ----- .../vppnsh/impl/cfgattrs/VppNshConfiguration.java | 41 -------- .../honeycomb-minimal-resources/config/vppnsh.json | 3 - samples/minimal-distribution/pom.xml | 5 +- .../java/io/fd/honeycomb/samples/distro/Main.java | 33 ------ .../minimal-distribution/asciidoc/Readme.adoc | 3 - vpp-common/minimal-distribution/pom.xml | 116 --------------------- .../main/java/io/fd/honeycomb/vpp/distro/Main.java | 32 ------ vpp-common/pom.xml | 2 +- .../vpp-common-integration/asciidoc/Readme.adoc | 3 + vpp-common/vpp-common-integration/pom.xml | 116 +++++++++++++++++++++ .../ContextsReaderFactoryProvider.java | 2 +- .../vpp/common/integration}/JVppCoreProvider.java | 2 +- .../common/integration}/JVppRegistryProvider.java | 2 +- .../vpp/common/integration}/VppCommonModule.java | 2 +- .../common/integration}/VppConfigAttributes.java | 2 +- .../honeycomb-minimal-resources/config/jvpp.json | 0 .../common/integration}/VppCommonModuleTest.java | 2 +- .../src/test/resources/jvpp.json | 0 vpp-integration/minimal-distribution/pom.xml | 16 ++- .../fd/honeycomb/vpp/integration/distro/Main.java | 40 ------- 21 files changed, 142 insertions(+), 304 deletions(-) delete mode 100755 nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/cfgattrs/VppNshConfiguration.java delete mode 100644 nsh/impl/src/main/resources/honeycomb-minimal-resources/config/vppnsh.json delete mode 100644 samples/minimal-distribution/src/main/java/io/fd/honeycomb/samples/distro/Main.java delete mode 100644 vpp-common/minimal-distribution/asciidoc/Readme.adoc delete mode 100644 vpp-common/minimal-distribution/pom.xml delete mode 100644 vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/Main.java create mode 100644 vpp-common/vpp-common-integration/asciidoc/Readme.adoc create mode 100644 vpp-common/vpp-common-integration/pom.xml rename vpp-common/{minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro => vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration}/ContextsReaderFactoryProvider.java (96%) rename vpp-common/{minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro => vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration}/JVppCoreProvider.java (97%) rename vpp-common/{minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro => vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration}/JVppRegistryProvider.java (98%) rename vpp-common/{minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro => vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration}/VppCommonModule.java (97%) rename vpp-common/{minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro => vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration}/VppConfigAttributes.java (95%) rename vpp-common/{minimal-distribution => vpp-common-integration}/src/main/resources/honeycomb-minimal-resources/config/jvpp.json (100%) rename vpp-common/{minimal-distribution/src/test/java/io/fd/honeycomb/vpp/distro => vpp-common-integration/src/test/java/io/fd/honeycomb/vpp/common/integration}/VppCommonModuleTest.java (97%) rename vpp-common/{minimal-distribution => vpp-common-integration}/src/test/resources/jvpp.json (100%) delete mode 100644 vpp-integration/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/integration/distro/Main.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(); - } } diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/cfgattrs/VppNshConfiguration.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/cfgattrs/VppNshConfiguration.java deleted file mode 100755 index e6491509d..000000000 --- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/cfgattrs/VppNshConfiguration.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2016 Intel and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.fd.honeycomb.vppnsh.impl.cfgattrs; - -import com.google.common.base.MoreObjects; - -import net.jmob.guice.conf.core.BindConfig; -import net.jmob.guice.conf.core.InjectConfig; -import net.jmob.guice.conf.core.Syntax; - -@BindConfig(value = "vppnsh", syntax = Syntax.JSON) -public class VppNshConfiguration { - - public boolean isNshEnabled() { - return Boolean.valueOf(nshEnable); - } - - @InjectConfig("nsh-enabled") - public String nshEnable; - - @Override - public String toString() { - return MoreObjects.toStringHelper(this) - .add("nshEnable", nshEnable) - .toString(); - } -} diff --git a/nsh/impl/src/main/resources/honeycomb-minimal-resources/config/vppnsh.json b/nsh/impl/src/main/resources/honeycomb-minimal-resources/config/vppnsh.json deleted file mode 100644 index b03a962f1..000000000 --- a/nsh/impl/src/main/resources/honeycomb-minimal-resources/config/vppnsh.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "nsh-enabled": "false" -} \ No newline at end of file diff --git a/samples/minimal-distribution/pom.xml b/samples/minimal-distribution/pom.xml index d3876790f..db4966684 100644 --- a/samples/minimal-distribution/pom.xml +++ b/samples/minimal-distribution/pom.xml @@ -30,10 +30,13 @@ -Xms128m -Xmx128m - io.fd.honeycomb.samples.distro.Main + io.fd.honeycomb.infra.distro.Main 1.16.12-SNAPSHOT 1.16.12-SNAPSHOT true + + io.fd.honeycomb.samples.interfaces.mapping.SampleInterfaceModule + diff --git a/samples/minimal-distribution/src/main/java/io/fd/honeycomb/samples/distro/Main.java b/samples/minimal-distribution/src/main/java/io/fd/honeycomb/samples/distro/Main.java deleted file mode 100644 index f6b38aa78..000000000 --- a/samples/minimal-distribution/src/main/java/io/fd/honeycomb/samples/distro/Main.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2016 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.fd.honeycomb.samples.distro; - -import com.google.common.collect.Lists; -import com.google.inject.Module; -import io.fd.honeycomb.samples.interfaces.mapping.SampleInterfaceModule; -import java.util.List; - -public class Main { - - public static void main(String[] args) { - final List sampleModules = Lists.newArrayList(io.fd.honeycomb.infra.distro.Main.BASE_MODULES); - - sampleModules.add(new SampleInterfaceModule()); - - io.fd.honeycomb.infra.distro.Main.init(sampleModules); - } -} diff --git a/vpp-common/minimal-distribution/asciidoc/Readme.adoc b/vpp-common/minimal-distribution/asciidoc/Readme.adoc deleted file mode 100644 index 1da86caab..000000000 --- a/vpp-common/minimal-distribution/asciidoc/Readme.adoc +++ /dev/null @@ -1,3 +0,0 @@ -= minimal-distribution - -Overview of minimal-distribution \ No newline at end of file diff --git a/vpp-common/minimal-distribution/pom.xml b/vpp-common/minimal-distribution/pom.xml deleted file mode 100644 index 12d11ec1a..000000000 --- a/vpp-common/minimal-distribution/pom.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - io.fd.honeycomb.common - minimal-distribution-parent - 1.16.12-SNAPSHOT - ../../common/minimal-distribution-parent - - - 4.0.0 - io.fd.honeycomb.vpp - minimal-distribution - 1.16.12-SNAPSHOT - - - io.fd.honeycomb.vpp.distro.Main - 1.16.12-SNAPSHOT - 16.12-SNAPSHOT - 1.3 - - - - - - maven-compiler-plugin - - - org.codehaus.gmaven - groovy-maven-plugin - - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.maven.plugins - maven-dependency-plugin - - - maven-assembly-plugin - - - - - - - io.fd.honeycomb - minimal-distribution - ${honeycomb.min.distro.version} - - - ${project.groupId} - naming-context-api - ${project.version} - - - ${project.groupId} - naming-context-impl - ${project.version} - - - io.fd.vpp - jvpp-registry - ${jvpp.version} - - - io.fd.vpp - jvpp-core - ${jvpp.version} - - - ${project.groupId} - vpp-translate-utils - ${project.version} - - - - - junit - junit - test - - - org.mockito - mockito-core - test - - - com.google.inject.extensions - guice-testlib - ${guice.version} - test - - - org.hamcrest - hamcrest-all - ${hamcrest.version} - test - - - diff --git a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/Main.java b/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/Main.java deleted file mode 100644 index 821bd1ef9..000000000 --- a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/Main.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2016 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.fd.honeycomb.vpp.distro; - -import com.google.common.collect.Lists; -import com.google.inject.Module; -import java.util.List; - -public class Main { - - public static void main(String[] args) { - final List sampleModules = Lists.newArrayList(io.fd.honeycomb.infra.distro.Main.BASE_MODULES); - - sampleModules.add(new VppCommonModule()); - - io.fd.honeycomb.infra.distro.Main.init(sampleModules); - } -} diff --git a/vpp-common/pom.xml b/vpp-common/pom.xml index d6833cdd3..e7180aea2 100644 --- a/vpp-common/pom.xml +++ b/vpp-common/pom.xml @@ -34,7 +34,7 @@ vpp-translate-utils naming-context-api naming-context-impl - minimal-distribution + vpp-common-integration vpp-impl-parent vpp-translate-test diff --git a/vpp-common/vpp-common-integration/asciidoc/Readme.adoc b/vpp-common/vpp-common-integration/asciidoc/Readme.adoc new file mode 100644 index 000000000..8c18a3eb2 --- /dev/null +++ b/vpp-common/vpp-common-integration/asciidoc/Readme.adoc @@ -0,0 +1,3 @@ += vpp-common-integration + +Overview of vpp-common-integration \ No newline at end of file diff --git a/vpp-common/vpp-common-integration/pom.xml b/vpp-common/vpp-common-integration/pom.xml new file mode 100644 index 000000000..2cb031ec8 --- /dev/null +++ b/vpp-common/vpp-common-integration/pom.xml @@ -0,0 +1,116 @@ + + + + + + io.fd.honeycomb.common + impl-parent + 1.16.12-SNAPSHOT + ../../common/impl-parent + + + 4.0.0 + io.fd.honeycomb.vpp + vpp-common-integration + 1.16.12-SNAPSHOT + + + 1.16.12-SNAPSHOT + 16.12-SNAPSHOT + 1.3 + + + + + + maven-compiler-plugin + + + org.codehaus.gmaven + groovy-maven-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + org.apache.maven.plugins + maven-dependency-plugin + + + maven-assembly-plugin + + + + + + + io.fd.honeycomb + minimal-distribution + ${honeycomb.min.distro.version} + + + ${project.groupId} + naming-context-api + ${project.version} + + + ${project.groupId} + naming-context-impl + ${project.version} + + + io.fd.vpp + jvpp-registry + ${jvpp.version} + + + io.fd.vpp + jvpp-core + ${jvpp.version} + + + ${project.groupId} + vpp-translate-utils + ${project.version} + + + + + junit + junit + test + + + org.mockito + mockito-core + test + + + com.google.inject.extensions + guice-testlib + ${guice.version} + test + + + org.hamcrest + hamcrest-all + ${hamcrest.version} + test + + + diff --git a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/ContextsReaderFactoryProvider.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/ContextsReaderFactoryProvider.java similarity index 96% rename from vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/ContextsReaderFactoryProvider.java rename to vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/ContextsReaderFactoryProvider.java index 35dd78e4e..d33b8b717 100644 --- a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/ContextsReaderFactoryProvider.java +++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/ContextsReaderFactoryProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.honeycomb.vpp.distro; +package io.fd.honeycomb.vpp.common.integration; import com.google.inject.Inject; import com.google.inject.name.Named; diff --git a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppCoreProvider.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/JVppCoreProvider.java similarity index 97% rename from vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppCoreProvider.java rename to vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/JVppCoreProvider.java index b8334df55..bbd30fbfb 100644 --- a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppCoreProvider.java +++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/JVppCoreProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.honeycomb.vpp.distro; +package io.fd.honeycomb.vpp.common.integration; import com.google.inject.Inject; import io.fd.honeycomb.infra.distro.ProviderTrait; diff --git a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppRegistryProvider.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/JVppRegistryProvider.java similarity index 98% rename from vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppRegistryProvider.java rename to vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/JVppRegistryProvider.java index 9ecdd69ee..fa1d47480 100644 --- a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/JVppRegistryProvider.java +++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/JVppRegistryProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.honeycomb.vpp.distro; +package io.fd.honeycomb.vpp.common.integration; import com.google.inject.Inject; import io.fd.honeycomb.infra.distro.ProviderTrait; diff --git a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppCommonModule.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/VppCommonModule.java similarity index 97% rename from vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppCommonModule.java rename to vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/VppCommonModule.java index 957819f28..9bdba1b14 100644 --- a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppCommonModule.java +++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/VppCommonModule.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.honeycomb.vpp.distro; +package io.fd.honeycomb.vpp.common.integration; import com.google.inject.AbstractModule; import com.google.inject.Singleton; diff --git a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppConfigAttributes.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/VppConfigAttributes.java similarity index 95% rename from vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppConfigAttributes.java rename to vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/VppConfigAttributes.java index 26b5a8385..af06e05db 100644 --- a/vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/VppConfigAttributes.java +++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/honeycomb/vpp/common/integration/VppConfigAttributes.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.honeycomb.vpp.distro; +package io.fd.honeycomb.vpp.common.integration; import net.jmob.guice.conf.core.BindConfig; import net.jmob.guice.conf.core.InjectConfig; diff --git a/vpp-common/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/jvpp.json b/vpp-common/vpp-common-integration/src/main/resources/honeycomb-minimal-resources/config/jvpp.json similarity index 100% rename from vpp-common/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/jvpp.json rename to vpp-common/vpp-common-integration/src/main/resources/honeycomb-minimal-resources/config/jvpp.json diff --git a/vpp-common/minimal-distribution/src/test/java/io/fd/honeycomb/vpp/distro/VppCommonModuleTest.java b/vpp-common/vpp-common-integration/src/test/java/io/fd/honeycomb/vpp/common/integration/VppCommonModuleTest.java similarity index 97% rename from vpp-common/minimal-distribution/src/test/java/io/fd/honeycomb/vpp/distro/VppCommonModuleTest.java rename to vpp-common/vpp-common-integration/src/test/java/io/fd/honeycomb/vpp/common/integration/VppCommonModuleTest.java index f59134812..476e15919 100644 --- a/vpp-common/minimal-distribution/src/test/java/io/fd/honeycomb/vpp/distro/VppCommonModuleTest.java +++ b/vpp-common/vpp-common-integration/src/test/java/io/fd/honeycomb/vpp/common/integration/VppCommonModuleTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.honeycomb.vpp.distro; +package io.fd.honeycomb.vpp.common.integration; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --git a/vpp-common/minimal-distribution/src/test/resources/jvpp.json b/vpp-common/vpp-common-integration/src/test/resources/jvpp.json similarity index 100% rename from vpp-common/minimal-distribution/src/test/resources/jvpp.json rename to vpp-common/vpp-common-integration/src/test/resources/jvpp.json diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml index 7e1aa0241..36d1e0f1a 100644 --- a/vpp-integration/minimal-distribution/pom.xml +++ b/vpp-integration/minimal-distribution/pom.xml @@ -29,11 +29,19 @@ 1.16.12-SNAPSHOT - io.fd.honeycomb.vpp.integration.distro.Main + io.fd.honeycomb.infra.distro.Main 1.16.12-SNAPSHOT 1.16.12-SNAPSHOT - 1.16.12-SNAPSHOT + 1.16.12-SNAPSHOT 1.16.12-SNAPSHOT + + + io.fd.honeycomb.vpp.common.integration.VppCommonModule, + io.fd.honeycomb.lisp.LispModule, + io.fd.honeycomb.translate.v3po.V3poModule, + // io.fd.honeycomb.vppnsh.impl.VppNshModule + + @@ -62,8 +70,8 @@ io.fd.honeycomb.vpp - minimal-distribution - ${vpp.common.min.distro.version} + vpp-common-integration + ${vpp.common.integration.version} io.fd.honeycomb.v3po diff --git a/vpp-integration/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/integration/distro/Main.java b/vpp-integration/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/integration/distro/Main.java deleted file mode 100644 index 04377c382..000000000 --- a/vpp-integration/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/integration/distro/Main.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2016 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.fd.honeycomb.vpp.integration.distro; - -import com.google.common.collect.Lists; -import com.google.inject.Module; -import io.fd.honeycomb.lisp.LispModule; -import io.fd.honeycomb.translate.v3po.V3poModule; -import io.fd.honeycomb.vpp.distro.VppCommonModule; -import io.fd.honeycomb.vppnsh.impl.VppNshModule; -import java.util.List; - -public class Main { - - public static void main(String[] args) { - final List sampleModules = Lists.newArrayList(io.fd.honeycomb.infra.distro.Main.BASE_MODULES); - - // All the plugins should be listed here - sampleModules.add(new VppCommonModule()); - sampleModules.add(new V3poModule()); - sampleModules.add(new LispModule()); - sampleModules.add(new VppNshModule()); - - io.fd.honeycomb.infra.distro.Main.init(sampleModules); - } -} -- 2.16.6