diff options
author | Jan Srnicek <jsrnicek@cisco.com> | 2016-10-13 13:56:47 +0200 |
---|---|---|
committer | Maros Marsalek <mmarsale@cisco.com> | 2016-10-13 13:28:56 +0000 |
commit | 6c3f614edb18bdb8cc6e7b87627f240d97a258c3 (patch) | |
tree | 52b9e116e7984d72a94ddee1c4b70b363e05c6ac /samples/minimal-distribution | |
parent | 9d69639d39bd55628cadc445e816fcccf23c1361 (diff) |
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 <jsrnicek@cisco.com>
Diffstat (limited to 'samples/minimal-distribution')
-rw-r--r-- | samples/minimal-distribution/pom.xml | 5 | ||||
-rw-r--r-- | samples/minimal-distribution/src/main/java/io/fd/honeycomb/samples/distro/Main.java | 33 |
2 files changed, 4 insertions, 34 deletions
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 @@ <properties> <exec.parameters>-Xms128m -Xmx128m</exec.parameters> - <main.class>io.fd.honeycomb.samples.distro.Main</main.class> + <main.class>io.fd.honeycomb.infra.distro.Main</main.class> <interfaces.mapping.version>1.16.12-SNAPSHOT</interfaces.mapping.version> <honeycomb.min.distro.version>1.16.12-SNAPSHOT</honeycomb.min.distro.version> <sonar.skip>true</sonar.skip> + <distribution.modules> + io.fd.honeycomb.samples.interfaces.mapping.SampleInterfaceModule + </distribution.modules> </properties> <build> 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<Module> sampleModules = Lists.newArrayList(io.fd.honeycomb.infra.distro.Main.BASE_MODULES); - - sampleModules.add(new SampleInterfaceModule()); - - io.fd.honeycomb.infra.distro.Main.init(sampleModules); - } -} |