diff options
| -rw-r--r-- | configdefinitions/src/vespa/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/filedistributor.def (renamed from filedistribution/src/vespa/filedistribution/distributor/filedistributor.def) | 0 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/filereferences.def (renamed from filedistribution/src/vespa/filedistribution/model/filereferences.def) | 0 | ||||
| -rw-r--r-- | filedistribution/pom.xml | 30 |
4 files changed, 4 insertions, 30 deletions
diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt index 9297383c53f..fc9be8ce91b 100644 --- a/configdefinitions/src/vespa/CMakeLists.txt +++ b/configdefinitions/src/vespa/CMakeLists.txt @@ -16,6 +16,10 @@ vespa_generate_config(configdefinitions configserver.def) install_config_definition(configserver.def cloud.config.configserver.def) vespa_generate_config(configdefinitions dispatch.def) install_config_definition(dispatch.def vespa.config.search.dispatch.def) +vespa_generate_config(configdefinitions filedistributor.def) +install_config_definition(filedistributor.def cloud.config.filedistribution.filedistributor.def) +vespa_generate_config(configdefinitions filereferences.def) +install_config_definition(filereferences.def cloud.config.filedistribution.filereferences.def) vespa_generate_config(configdefinitions fleetcontroller.def) install_config_definition(fleetcontroller.def vespa.config.content.fleetcontroller.def) vespa_generate_config(configdefinitions ilscripts.def) diff --git a/filedistribution/src/vespa/filedistribution/distributor/filedistributor.def b/configdefinitions/src/vespa/filedistributor.def index 13dd373eac6..13dd373eac6 100644 --- a/filedistribution/src/vespa/filedistribution/distributor/filedistributor.def +++ b/configdefinitions/src/vespa/filedistributor.def diff --git a/filedistribution/src/vespa/filedistribution/model/filereferences.def b/configdefinitions/src/vespa/filereferences.def index 03e071959ce..03e071959ce 100644 --- a/filedistribution/src/vespa/filedistribution/model/filereferences.def +++ b/configdefinitions/src/vespa/filereferences.def diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml index 0a4b75788bc..e63b85a22b8 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -13,34 +13,4 @@ <version>6-SNAPSHOT</version> <packaging>jar</packaging> <name>${project.artifactId}</name> - <dependencies> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>config-lib</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>com.yahoo.vespa</groupId> - <artifactId>config-class-plugin</artifactId> - <version>${project.version}</version> - <configuration> - <defFilesDirectories> - src/vespa/filedistribution/distributor, - src/vespa/filedistribution/model - </defFilesDirectories> - </configuration> - <executions> - <execution> - <id>config-gen</id> - <goals> - <goal>config-gen</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> |