diff options
| author | gjoranv <gv@verizonmedia.com> | 2020-07-16 10:30:28 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2020-07-16 10:43:27 +0200 |
| commit | eb899e021d754046ea102ff81a68618e7060a40b (patch) | |
| tree | 1b928ea46c6d11628576b55e8c203a989d044e85 /container-di/src | |
| parent | 1eb5aeac9e1ad94f4e5d290cd57264541968454b (diff) | |
Move new config defs to already exported package, and add to CMakeLists
Diffstat (limited to 'container-di/src')
3 files changed, 4 insertions, 2 deletions
diff --git a/container-di/src/main/java/com/yahoo/container/di/Container.java b/container-di/src/main/java/com/yahoo/container/di/Container.java index d85591386fd..672cef22010 100644 --- a/container-di/src/main/java/com/yahoo/container/di/Container.java +++ b/container-di/src/main/java/com/yahoo/container/di/Container.java @@ -14,6 +14,8 @@ import com.yahoo.container.di.componentgraph.core.ComponentGraph; import com.yahoo.container.di.componentgraph.core.ComponentNode; import com.yahoo.container.di.componentgraph.core.JerseyNode; import com.yahoo.container.di.componentgraph.core.Node; +import com.yahoo.container.di.config.ApplicationBundlesConfig; +import com.yahoo.container.di.config.PlatformBundlesConfig; import com.yahoo.container.di.config.RestApiContext; import com.yahoo.container.di.config.SubscriberFactory; import com.yahoo.vespa.config.ConfigKey; diff --git a/container-di/src/main/resources/configdefinitions/application-bundles.def b/container-di/src/main/resources/configdefinitions/application-bundles.def index e883e4f47ae..7e03b1e3ac8 100644 --- a/container-di/src/main/resources/configdefinitions/application-bundles.def +++ b/container-di/src/main/resources/configdefinitions/application-bundles.def @@ -1,5 +1,5 @@ # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package=com.yahoo.container.di +package=com.yahoo.container.di.config # References to user bundles to install. bundles[] file diff --git a/container-di/src/main/resources/configdefinitions/platform-bundles.def b/container-di/src/main/resources/configdefinitions/platform-bundles.def index 70b78fab074..9b72bf6831e 100644 --- a/container-di/src/main/resources/configdefinitions/platform-bundles.def +++ b/container-di/src/main/resources/configdefinitions/platform-bundles.def @@ -1,5 +1,5 @@ # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package=com.yahoo.container.di +package=com.yahoo.container.di.config # References to platform bundles to install. bundles[] file |