diff options
50 files changed, 330 insertions, 162 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 413d232c00d..d7857ec616f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,6 @@ find_package(JNI REQUIRED) include(functions.cmake) include(build_settings.cmake) -include(install_java.cmake) # Enable CTest unit testing enable_testing() @@ -24,12 +23,36 @@ enable_testing() # Include vespa config definitions in every target include_directories(BEFORE ${CMAKE_BINARY_DIR}/configdefinitions/src) +add_subdirectory(application-preprocessor) +add_subdirectory(chain) +add_subdirectory(component) +add_subdirectory(config-bundle) +add_subdirectory(config-model) +add_subdirectory(config-model-api) +add_subdirectory(config-provisioning) +add_subdirectory(config-proxy) add_subdirectory(config) add_subdirectory(configd) add_subdirectory(configdefinitions) +add_subdirectory(configmodel-fat) add_subdirectory(configserver) add_subdirectory(configutil) +add_subdirectory(container-accesslogging) +add_subdirectory(container-core) +add_subdirectory(container-di) +add_subdirectory(container-disc) +add_subdirectory(container-jersey2) +add_subdirectory(container-messagebus) +add_subdirectory(container-search) +add_subdirectory(container-search-and-docproc) +add_subdirectory(clustercontroller-apps) +add_subdirectory(clustercontroller-appsutil) +add_subdirectory(clustercontroller-utils) +add_subdirectory(clustercontroller-core) add_subdirectory(defaults) +add_subdirectory(docker-api) +add_subdirectory(docproc) +add_subdirectory(docprocs) add_subdirectory(document) add_subdirectory(documentapi) add_subdirectory(eval) @@ -41,14 +64,20 @@ add_subdirectory(filedistribution) add_subdirectory(fnet) add_subdirectory(frtstream) add_subdirectory(fsa) +add_subdirectory(jdisc_core) +add_subdirectory(jdisc_http_service) +add_subdirectory(jdisc_jetty) add_subdirectory(jrt_test) add_subdirectory(juniper) add_subdirectory(logd) +add_subdirectory(logserver) add_subdirectory(lowercasing_test) add_subdirectory(memfilepersistence) add_subdirectory(messagebus) add_subdirectory(messagebus_test) add_subdirectory(metrics) +add_subdirectory(node-repository) +add_subdirectory(orchestrator) add_subdirectory(persistence) add_subdirectory(persistencetypes) add_subdirectory(searchcommon) @@ -56,22 +85,32 @@ add_subdirectory(searchcore) add_subdirectory(searchcorespi) add_subdirectory(searchlib) add_subdirectory(searchsummary) +add_subdirectory(simplemetrics) add_subdirectory(slobrok) add_subdirectory(staging_vespalib) +add_subdirectory(standalone-container) add_subdirectory(storage) add_subdirectory(storageapi) add_subdirectory(storageframework) add_subdirectory(storageserver) +add_subdirectory(statistics) add_subdirectory(streamingvisitors) add_subdirectory(vbench) add_subdirectory(vdslib) add_subdirectory(vdstestlib) +add_subdirectory(vespa-http-client) +add_subdirectory(vespa_jersey2) add_subdirectory(vespabase) add_subdirectory(vespaclient) +add_subdirectory(vespaclient-core) +add_subdirectory(vespaclient-container-plugin) +add_subdirectory(vespaclient-java) +add_subdirectory(vespajlib) add_subdirectory(vespalib) add_subdirectory(vespalog) add_subdirectory(vespamalloc) add_subdirectory(vsm) +add_subdirectory(zkfacade) # Note: Change when cmake gets proper post-install support. # Post installation steps are run from dist subdirectory which needs to be the last add_subdirectory(...) call in this file. add_subdirectory(dist) diff --git a/application-preprocessor/CMakeLists.txt b/application-preprocessor/CMakeLists.txt new file mode 100644 index 00000000000..e40fd4a6736 --- /dev/null +++ b/application-preprocessor/CMakeLists.txt @@ -0,0 +1,4 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(application-preprocessor) +vespa_install_script(src/main/sh/vespa-preprocess-application bin) + diff --git a/chain/CMakeLists.txt b/chain/CMakeLists.txt new file mode 100644 index 00000000000..c6c50c46639 --- /dev/null +++ b/chain/CMakeLists.txt @@ -0,0 +1,3 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install(FILES src/main/resources/configdefinitions/chains.def RENAME container.core.chains.def + DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/clustercontroller-apps/CMakeLists.txt b/clustercontroller-apps/CMakeLists.txt new file mode 100644 index 00000000000..f59ffbfa7bf --- /dev/null +++ b/clustercontroller-apps/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(clustercontroller-apps) diff --git a/clustercontroller-apputil/CMakeLists.txt b/clustercontroller-apputil/CMakeLists.txt new file mode 100644 index 00000000000..bdfb3ab3ed7 --- /dev/null +++ b/clustercontroller-apputil/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(clustercontroller-apputil) diff --git a/clustercontroller-core/CMakeLists.txt b/clustercontroller-core/CMakeLists.txt new file mode 100644 index 00000000000..6754e893009 --- /dev/null +++ b/clustercontroller-core/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(clustercontroller-core) diff --git a/clustercontroller-utils/CMakeLists.txt b/clustercontroller-utils/CMakeLists.txt new file mode 100644 index 00000000000..250a8e7e693 --- /dev/null +++ b/clustercontroller-utils/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(clustercontroller-utils) diff --git a/component/CMakeLists.txt b/component/CMakeLists.txt new file mode 100644 index 00000000000..87d0a4989ba --- /dev/null +++ b/component/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(component) diff --git a/config-bundle/CMakeLists.txt b/config-bundle/CMakeLists.txt new file mode 100644 index 00000000000..8d4878920a4 --- /dev/null +++ b/config-bundle/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(config-bundle) diff --git a/config-model-api/CMakeLists.txt b/config-model-api/CMakeLists.txt new file mode 100644 index 00000000000..f69e5242e2e --- /dev/null +++ b/config-model-api/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(config-model-api) diff --git a/config-model-fat/CMakeLists.txt b/config-model-fat/CMakeLists.txt new file mode 100644 index 00000000000..1e2364556dc --- /dev/null +++ b/config-model-fat/CMakeLists.txt @@ -0,0 +1,5 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_java_artifact(config-model-fat) + +install(FILES src/main/resources/config-models.xml + DESTINATION conf/configserver-app) diff --git a/config-model/CMakeLists.txt b/config-model/CMakeLists.txt new file mode 100644 index 00000000000..274ab8a763b --- /dev/null +++ b/config-model/CMakeLists.txt @@ -0,0 +1,10 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(config-model) + +vespa_install_script(src/main/perl/vespa-deploy bin) +vespa_install_script(src/main/perl/vespa-expand-config.pl bin) +vespa_install_script(src/main/perl/vespa-replicate-log-stream bin) +vespa_install_script(src/main/sh/vespa-validate-application bin) + +install(DIRECTORY src/main/resources/schema DESTINATION share/vespa PATTERN ".gitignore" EXCLUDE) +install(DIRECTORY src/main/resources/schema DESTINATION share/vespa/schema/version/6.x PATTERN ".gitignore" EXCLUDE) diff --git a/config-provisioning/CMakeLists.txt b/config-provisioning/CMakeLists.txt new file mode 100644 index 00000000000..c70fee87d78 --- /dev/null +++ b/config-provisioning/CMakeLists.txt @@ -0,0 +1,4 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(config-provisioning) +install(FILES src/main/resources/configdefinitions/flavors.def RENAME config.provisioning.flavors.def + DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/config-proxy/CMakeLists.txt b/config-proxy/CMakeLists.txt new file mode 100644 index 00000000000..a87f10573be --- /dev/null +++ b/config-proxy/CMakeLists.txt @@ -0,0 +1,6 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(config-proxy) + +vespa_install_script(src/main/sh/vespa-config-ctl.sh vespa-config-ctl bin) +vespa_install_script(src/main/sh/vespa-config-loadtester.sh vespa-config-loadtester bin) +vespa_install_script(src/main/sh/vespa-config-verification.sh vespa-config-verification bin) diff --git a/configdefinitions/CMakeLists.txt b/configdefinitions/CMakeLists.txt index d8f89e04cc1..ee78759254a 100644 --- a/configdefinitions/CMakeLists.txt +++ b/configdefinitions/CMakeLists.txt @@ -8,3 +8,5 @@ vespa_define_module( LIBS src/vespa ) + +install_fat_java_artifact(configdefinitions) diff --git a/configserver/CMakeLists.txt b/configserver/CMakeLists.txt index e54a93b3d28..58eb3da927a 100644 --- a/configserver/CMakeLists.txt +++ b/configserver/CMakeLists.txt @@ -1,9 +1,12 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(configserver) + vespa_install_script(src/main/sh/vespa-configserver-remove-state bin) vespa_install_script(src/main/sh/start-filedistribution libexec/vespa) vespa_install_script(src/main/sh/ping-configserver libexec/vespa) vespa_install_script(src/main/sh/start-configserver libexec/vespa) vespa_install_script(src/main/sh/start-logd libexec/vespa) vespa_install_script(src/main/sh/stop-configserver libexec/vespa) + install(DIRECTORY src/main/resources/logd DESTINATION conf) install(DIRECTORY src/main/resources/configserver-app DESTINATION conf) diff --git a/container-accesslogging/CMakeLists.txt b/container-accesslogging/CMakeLists.txt new file mode 100644 index 00000000000..9ddd26e1cc1 --- /dev/null +++ b/container-accesslogging/CMakeLists.txt @@ -0,0 +1,3 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install(FILES src/main/resources/configdefinitions/access-log.def RENAME container.core.access-log.def + DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/container-core/CMakeLists.txt b/container-core/CMakeLists.txt new file mode 100644 index 00000000000..b29758de071 --- /dev/null +++ b/container-core/CMakeLists.txt @@ -0,0 +1,31 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install(FILES src/main/resources/configdefinitions/application-metadata.def RENAME container.core.application-metadata.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/container-document.def RENAME container.core.document.container-document.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/container-http.def RENAME container.core.container-http.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/diagnostics.def RENAME container.core.diagnostics.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/health-monitor.def RENAME container.jdisc.config.health-monitor.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/http-filter.def RENAME container.core.http.http-filter.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/metrics-presentation.def RENAME metrics.metrics-presentation.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/mockservice.def RENAME container.handler.test.mockservice.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/qr-logging.def RENAME container.core.qr-logging.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/qr-searchers.def RENAME container.qr-searchers.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/qr-templates.def RENAME container.core.qr-templates.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/qr.def RENAME container.qr.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/servlet-config.def RENAME container.servlet.servlet-config.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/threadpool.def RENAME container.handler.threadpool.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/vip-status.def RENAME container.core.vip-status.def + DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/container-di/CMakeLists.txt b/container-di/CMakeLists.txt new file mode 100644 index 00000000000..afc4f379881 --- /dev/null +++ b/container-di/CMakeLists.txt @@ -0,0 +1,10 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install(FILES src/main/resources/configdefinitions/bundles.def RENAME container.bundles.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/components.def RENAME container.components.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/jersey-bundles.def RENAME container.di.config.jersey-bundles.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/jersey-injection.def RENAME container.di.config.jersey-injection.def + DESTINATION var/db/vespa/config_server/serverdb/classes) + diff --git a/container-disc/CMakeLists.txt b/container-disc/CMakeLists.txt new file mode 100644 index 00000000000..032429ac173 --- /dev/null +++ b/container-disc/CMakeLists.txt @@ -0,0 +1,21 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(container-disc) + +vespa_install_script(src/main/sh/vespa-start-container-daemon.sh vespa-start-container-daemon bin) + +install(FILES src/main/resources/configdefinitions/container.jdisc.config.http-server.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/jdisc-bindings.def RENAME container.jdisc.jdisc-bindings.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/jersey-connection.def RENAME container.config.jersey.jersey-connection.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/jersey-init.def RENAME container.config.jersey.jersey-init.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/jersey-web-app-pool.def RENAME container.config.jersey.jersey-web-app-pool.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/metric-defaults.def RENAME container.jdisc.config.metric-defaults.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/score-board.def RENAME jdisc.metrics.yamasconsumer.cloud.score-board.def + DESTINATION var/db/vespa/config_server/serverdb/classes) + + diff --git a/container-jersey2/CMakeLists.txt b/container-jersey2/CMakeLists.txt new file mode 100644 index 00000000000..d2490563372 --- /dev/null +++ b/container-jersey2/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(container-jersey2) diff --git a/container-messagebus/CMakeLists.txt b/container-messagebus/CMakeLists.txt new file mode 100644 index 00000000000..9bc2dad4bba --- /dev/null +++ b/container-messagebus/CMakeLists.txt @@ -0,0 +1,6 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install(FILES src/main/resources/configdefinitions/container-mbus.def RENAME container.jdisc.container-mbus.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/session.def RENAME container.jdisc.config.session.def + DESTINATION var/db/vespa/config_server/serverdb/classes) + diff --git a/container-search-and-docproc/CMakeLists.txt b/container-search-and-docproc/CMakeLists.txt new file mode 100644 index 00000000000..695bf156896 --- /dev/null +++ b/container-search-and-docproc/CMakeLists.txt @@ -0,0 +1,5 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(container-search-and-docproc) + +install(FILES src/main/resources/configdefinitions/application-userdata.def RENAME container.handler.observability.application-userdata.def + DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/container-search/CMakeLists.txt b/container-search/CMakeLists.txt new file mode 100644 index 00000000000..fd93244386b --- /dev/null +++ b/container-search/CMakeLists.txt @@ -0,0 +1,55 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install(FILES src/main/resources/configdefinitions/cluster.def RENAME search.config.cluster.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/documentdb-info.def RENAME prelude.fastsearch.documentdb-info.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/emulation.def RENAME prelude.emulation.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/federation.def RENAME search.federation.federation.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/fs4.def RENAME container.search.fs4.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/index-info.def RENAME search.config.index-info.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/keyvalue.def RENAME prelude.searcher.keyvalue.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/legacy-emulation.def RENAME container.search.legacy-emulation.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/lowercasing.def RENAME search.querytransform.lowercasing.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/measure-qps.def RENAME search.statistics.measure-qps.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/page-templates.def RENAME search.pagetemplates.page-templates.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/provider.def RENAME search.federation.provider.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/qr-binary-cache-region.def RENAME search.cache.qr-binary-cache-region.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/qr-binary-cache.def RENAME search.cache.qr-binary-cache.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/qr-monitor.def RENAME prelude.cluster.qr-monitor.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/qr-quotetable.def RENAME prelude.searcher.qr-quotetable.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/qr-start.def RENAME search.config.qr-start.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/query-profiles.def RENAME search.query.profile.config.query-profiles.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/rate-limiting.def RENAME search.config.rate-limiting.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/resolvers.def RENAME search.pagetemplates.resolvers.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/rewrites.def RENAME search.query.rewrite.rewrites.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/search-nodes.def RENAME search.config.dispatchprototype.search-nodes.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/search-with-renderer-handler.def RENAME search.handler.search-with-renderer-handler.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/searchchain-forward.def RENAME search.federation.searchchain-forward.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/semantic-rules.def RENAME prelude.semantics.semantic-rules.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/strict-contracts.def RENAME search.federation.strict-contracts.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/timing-searcher.def RENAME search.statistics.timing-searcher.def + DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/defaults/CMakeLists.txt b/defaults/CMakeLists.txt index 2b7f719d297..c42e5402688 100644 --- a/defaults/CMakeLists.txt +++ b/defaults/CMakeLists.txt @@ -6,3 +6,5 @@ vespa_define_module( APPS src/apps/printdefault ) + +install_fat_java_artifact(defaults) diff --git a/docker-api/CMakeLists.txt b/docker-api/CMakeLists.txt new file mode 100644 index 00000000000..2cf9e977458 --- /dev/null +++ b/docker-api/CMakeLists.txt @@ -0,0 +1,3 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install(FILES src/main/resources/configdefinitions/docker.def RENAME vespa.hosted.dockerapi.docker.def + DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/docproc/CMakeLists.txt b/docproc/CMakeLists.txt new file mode 100644 index 00000000000..328683fab33 --- /dev/null +++ b/docproc/CMakeLists.txt @@ -0,0 +1,7 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install(FILES src/main/resources/configdefinitions/docproc.def RENAME config.docproc.docproc.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/schemamapping.def RENAME config.docproc.schemamapping.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/splitter-joiner-document-processor.def RENAME config.docproc.splitter-joiner-document-processor.def + DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/docprocs/CMakeLists.txt b/docprocs/CMakeLists.txt new file mode 100644 index 00000000000..8786a77cbf8 --- /dev/null +++ b/docprocs/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(docprocs) diff --git a/document/CMakeLists.txt b/document/CMakeLists.txt index ca2ee029c87..72f4ee445fb 100644 --- a/document/CMakeLists.txt +++ b/document/CMakeLists.txt @@ -40,3 +40,5 @@ vespa_define_module( src/tests/struct_anno src/tests/tensor_fieldvalue ) + +install_java_artifact(document) diff --git a/fileacquirer/CMakeLists.txt b/fileacquirer/CMakeLists.txt index 1ae83a6f6c2..3a675f572be 100644 --- a/fileacquirer/CMakeLists.txt +++ b/fileacquirer/CMakeLists.txt @@ -9,3 +9,6 @@ vespa_define_module( LIBS src/vespa/fileacquirer ) + +install(FILES src/main/resources/configdefinitions/filedistributorrpc.def RENAME cloud.config.filedistribution.filedistributorrpc.def + DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/functions.cmake b/functions.cmake index 38ae339cd53..9ee4dca4eed 100644 --- a/functions.cmake +++ b/functions.cmake @@ -536,3 +536,15 @@ function(__export_include_directories TARGET) target_include_directories(${TARGET} PUBLIC ${LOCAL_INCLUDE_DIRS}) endif() endfunction() + +function(install_java_artifact NAME) + install(FILES "target/${NAME}.jar" DESTINATION lib/jars/) +endfunction() + +function(install_java_artifact_dependencies NAME) + install(DIRECTORY "target/dependency/" DESTINATION lib/jars FILES_MATCHING PATTERN "*.jar") +endfunction() + +function(install_fat_java_artifact NAME) + install(FILES "target/${NAME}-jar-with-dependencies.jar" DESTINATION lib/jars/) +endfunction() diff --git a/install_java.cmake b/install_java.cmake deleted file mode 100644 index e0611306b5f..00000000000 --- a/install_java.cmake +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -function(install_java_artifact NAME) - install(FILES "${NAME}/target/${NAME}.jar" DESTINATION lib/jars/) -endfunction() - -function(install_java_artifact_dependencies NAME) - install(DIRECTORY "${NAME}/target/dependency/" DESTINATION lib/jars FILES_MATCHING PATTERN "*.jar") -endfunction() - -function(install_fat_java_artifact NAME) - install(FILES "${NAME}/target/${NAME}-jar-with-dependencies.jar" DESTINATION lib/jars/) -endfunction() - -install_java_artifact(config-model-fat) -install_java_artifact(document) -install_java_artifact(jdisc_jetty) -install_java_artifact_dependencies(jdisc_jetty) -install_java_artifact_dependencies(vespa_jersey2) -install_java_artifact(searchlib) -install_java_artifact(vespajlib) - -install_fat_java_artifact(application-preprocessor) -install_fat_java_artifact(clustercontroller-apps) -install_fat_java_artifact(clustercontroller-apputil) -install_fat_java_artifact(clustercontroller-utils) -install_fat_java_artifact(clustercontroller-core) -install_fat_java_artifact(component) -install_fat_java_artifact(config-bundle) -install_fat_java_artifact(config-model-api) -install_fat_java_artifact(config-model) -install_fat_java_artifact(config-provisioning) -install_fat_java_artifact(config-proxy) -install_fat_java_artifact(configdefinitions) -install_fat_java_artifact(configserver) -install_fat_java_artifact(container-disc) -install_fat_java_artifact(container-jersey2) -install_fat_java_artifact(container-search-and-docproc) -install_fat_java_artifact(defaults) -install_fat_java_artifact(docprocs) -install_fat_java_artifact(jdisc_core) -install_fat_java_artifact(jdisc_http_service) -install_fat_java_artifact(logserver) -install_fat_java_artifact(node-repository) -install_fat_java_artifact(orchestrator) -install_fat_java_artifact(persistence) -install_fat_java_artifact(searchlib) -install_fat_java_artifact(simplemetrics) -install_fat_java_artifact(standalone-container) -install_fat_java_artifact(vespa-http-client) -install_fat_java_artifact(vespaclient-container-plugin) -install_fat_java_artifact(vespaclient-java) -install_fat_java_artifact(zkfacade) - -vespa_install_script(application-preprocessor/src/main/sh/vespa-preprocess-application bin) -vespa_install_script(config-proxy/src/main/sh/vespa-config-ctl.sh vespa-config-ctl bin) -vespa_install_script(config-proxy/src/main/sh/vespa-config-loadtester.sh vespa-config-loadtester bin) -vespa_install_script(config-proxy/src/main/sh/vespa-config-verification.sh vespa-config-verification bin) -vespa_install_script(config-model/src/main/perl/vespa-deploy bin) -vespa_install_script(config-model/src/main/perl/vespa-expand-config.pl bin) -vespa_install_script(config-model/src/main/perl/vespa-replicate-log-stream bin) -vespa_install_script(config-model/src/main/sh/vespa-validate-application bin) -vespa_install_script(container-disc/src/main/sh/vespa-start-container-daemon.sh vespa-start-container-daemon bin) -vespa_install_script(searchlib/src/main/sh/vespa-gbdt-converter bin) -vespa_install_script(searchlib/src/main/sh/vespa-treenet-converter bin) -vespa_install_script(vespaclient-java/src/main/sh/vespa-document-statistics.sh vespa-document-statistics bin) -vespa_install_script(vespaclient-java/src/main/sh/vespa-stat.sh vespa-stat bin) -vespa_install_script(vespaclient-java/src/main/sh/vespa-query-profile-dump-tool.sh vespa-query-profile-dump-tool bin) -vespa_install_script(vespaclient-java/src/main/sh/vespa-summary-benchmark.sh vespa-summary-benchmark bin) -vespa_install_script(vespaclient-java/src/main/sh/vespa-destination.sh vespa-destination bin) -vespa_install_script(vespaclient-java/src/main/sh/vespa-feeder.sh vespa-feeder bin) -vespa_install_script(vespaclient-java/src/main/sh/vespa-get.sh vespa-get bin) -vespa_install_script(vespaclient-java/src/main/sh/vespa-visit.sh vespa-visit bin) -vespa_install_script(vespaclient-java/src/main/sh/vespa-visit-target.sh vespa-visit-target bin) - -vespa_install_script(logserver/bin/logserver-start.sh vespa-logserver-start bin) - -install(DIRECTORY config-model/src/main/resources/schema DESTINATION share/vespa PATTERN ".gitignore" EXCLUDE) -install(DIRECTORY config-model/src/main/resources/schema DESTINATION share/vespa/schema/version/6.x PATTERN ".gitignore" EXCLUDE) - -install(FILES jdisc_core/src/main/perl/vespa-jdisc-logfmt.1 DESTINATION man/man1) - -install(FILES - config-model-fat/src/main/resources/config-models.xml - node-repository/src/main/config/node-repository.xml - DESTINATION conf/configserver-app) - -install(FILES - chain/src/main/resources/configdefinitions/chains.def - config-provisioning/src/main/resources/configdefinitions/flavors.def - container-accesslogging/src/main/resources/configdefinitions/access-log.def - container-core/src/main/resources/configdefinitions/application-metadata.def - container-core/src/main/resources/configdefinitions/container-document.def - container-core/src/main/resources/configdefinitions/container-http.def - container-core/src/main/resources/configdefinitions/diagnostics.def - container-core/src/main/resources/configdefinitions/health-monitor.def - container-core/src/main/resources/configdefinitions/http-filter.def - container-core/src/main/resources/configdefinitions/metrics-presentation.def - container-core/src/main/resources/configdefinitions/mockservice.def - container-core/src/main/resources/configdefinitions/qr-logging.def - container-core/src/main/resources/configdefinitions/qr-searchers.def - container-core/src/main/resources/configdefinitions/qr-templates.def - container-core/src/main/resources/configdefinitions/qr.def - container-core/src/main/resources/configdefinitions/servlet-config.def - container-core/src/main/resources/configdefinitions/threadpool.def - container-core/src/main/resources/configdefinitions/vip-status.def - container-di/src/main/resources/configdefinitions/bundles.def - container-di/src/main/resources/configdefinitions/components.def - container-di/src/main/resources/configdefinitions/jersey-bundles.def - container-di/src/main/resources/configdefinitions/jersey-injection.def - container-disc/src/main/resources/configdefinitions/container.jdisc.config.http-server.def - container-disc/src/main/resources/configdefinitions/jdisc-bindings.def - container-disc/src/main/resources/configdefinitions/jersey-connection.def - container-disc/src/main/resources/configdefinitions/jersey-init.def - container-disc/src/main/resources/configdefinitions/jersey-web-app-pool.def - container-disc/src/main/resources/configdefinitions/metric-defaults.def - container-disc/src/main/resources/configdefinitions/score-board.def - container-messagebus/src/main/resources/configdefinitions/container-mbus.def - container-messagebus/src/main/resources/configdefinitions/session.def - container-search-and-docproc/src/main/resources/configdefinitions/application-userdata.def - container-search/src/main/resources/configdefinitions/cluster.def - container-search/src/main/resources/configdefinitions/documentdb-info.def - container-search/src/main/resources/configdefinitions/emulation.def - container-search/src/main/resources/configdefinitions/federation.def - container-search/src/main/resources/configdefinitions/fs4.def - container-search/src/main/resources/configdefinitions/index-info.def - container-search/src/main/resources/configdefinitions/keyvalue.def - container-search/src/main/resources/configdefinitions/legacy-emulation.def - container-search/src/main/resources/configdefinitions/lowercasing.def - container-search/src/main/resources/configdefinitions/measure-qps.def - container-search/src/main/resources/configdefinitions/page-templates.def - container-search/src/main/resources/configdefinitions/provider.def - container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def - container-search/src/main/resources/configdefinitions/qr-binary-cache.def - container-search/src/main/resources/configdefinitions/qr-monitor.def - container-search/src/main/resources/configdefinitions/qr-quotetable.def - container-search/src/main/resources/configdefinitions/qr-start.def - container-search/src/main/resources/configdefinitions/query-profiles.def - container-search/src/main/resources/configdefinitions/rate-limiting.def - container-search/src/main/resources/configdefinitions/resolvers.def - container-search/src/main/resources/configdefinitions/rewrites.def - container-search/src/main/resources/configdefinitions/search-nodes.def - container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def - container-search/src/main/resources/configdefinitions/searchchain-forward.def - container-search/src/main/resources/configdefinitions/semantic-rules.def - container-search/src/main/resources/configdefinitions/strict-contracts.def - container-search/src/main/resources/configdefinitions/timing-searcher.def - docproc/src/main/resources/configdefinitions/docproc.def - docproc/src/main/resources/configdefinitions/schemamapping.def - docproc/src/main/resources/configdefinitions/splitter-joiner-document-processor.def - fileacquirer/src/main/resources/configdefinitions/filedistributorrpc.def - jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.client.http-client.def - jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def - jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.server.def - jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.servlet-paths.def - persistence/src/main/resources/configdefinitions/persistence-rpc.def - simplemetrics/src/main/resources/configdefinitions/manager.def - statistics/src/main/resources/configdefinitions/statistics.def - vespaclient-core/src/main/resources/configdefinitions/feeder.def - vespaclient-core/src/main/resources/configdefinitions/spooler.def - docker-api/src/main/resources/configdefinitions/docker.def - DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/jdisc_core/CMakeLists.txt b/jdisc_core/CMakeLists.txt new file mode 100644 index 00000000000..b56d6ce1e5b --- /dev/null +++ b/jdisc_core/CMakeLists.txt @@ -0,0 +1,4 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(jdisc_core) + +install(FILES src/main/perl/vespa-jdisc-logfmt.1 DESTINATION man/man1) diff --git a/jdisc_http_service/CMakeLists.txt b/jdisc_http_service/CMakeLists.txt new file mode 100644 index 00000000000..06af545bf34 --- /dev/null +++ b/jdisc_http_service/CMakeLists.txt @@ -0,0 +1,10 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(jdisc_http_service) + +install(FILES + src/main/resources/configdefinitions/jdisc.http.client.http-client.def + src/main/resources/configdefinitions/jdisc.http.connector.def + src/main/resources/configdefinitions/jdisc.http.server.def + src/main/resources/configdefinitions/jdisc.http.servlet-paths.def + DESTINATION var/db/vespa/config_server/serverdb/classes) + diff --git a/jdisc_jetty/CMakeLists.txt b/jdisc_jetty/CMakeLists.txt new file mode 100644 index 00000000000..5a0aa2576c1 --- /dev/null +++ b/jdisc_jetty/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_java_artifact(jdisc_jetty) diff --git a/logserver/CMakeLists.txt b/logserver/CMakeLists.txt new file mode 100644 index 00000000000..736878948fb --- /dev/null +++ b/logserver/CMakeLists.txt @@ -0,0 +1,4 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(logserver) + +vespa_install_script(bin/logserver-start.sh vespa-logserver-start bin) diff --git a/node-repository/CMakeLists.txt b/node-repository/CMakeLists.txt new file mode 100644 index 00000000000..24a8f7e4177 --- /dev/null +++ b/node-repository/CMakeLists.txt @@ -0,0 +1,5 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(node-repository) + +install(FILES src/main/config/node-repository.xml + DESTINATION conf/configserver-app) diff --git a/orchestrator/CMakeLists.txt b/orchestrator/CMakeLists.txt new file mode 100644 index 00000000000..5ff6a7ac576 --- /dev/null +++ b/orchestrator/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(orchestrator) diff --git a/persistence/CMakeLists.txt b/persistence/CMakeLists.txt index b773fccc09a..7b49b7c2872 100644 --- a/persistence/CMakeLists.txt +++ b/persistence/CMakeLists.txt @@ -29,3 +29,7 @@ vespa_define_module( src/tests/proxy src/tests/spi ) + +install_fat_java_artifact(persistence) +install(FILES persistence/src/main/resources/configdefinitions/persistence-rpc.def RENAME persistence.persistence-rpc.def + DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt index 787ca6ed008..ad52889614d 100644 --- a/searchlib/CMakeLists.txt +++ b/searchlib/CMakeLists.txt @@ -225,3 +225,9 @@ vespa_define_module( src/tests/util/statefile src/tests/vespa-fileheader-inspect ) + +install_java_artifact(searchlib) + +vespa_install_script(src/main/sh/vespa-gbdt-converter bin) +vespa_install_script(src/main/sh/vespa-treenet-converter bin) + diff --git a/simplemetrics/CMakeLists.txt b/simplemetrics/CMakeLists.txt new file mode 100644 index 00000000000..106a0cac1f5 --- /dev/null +++ b/simplemetrics/CMakeLists.txt @@ -0,0 +1,6 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(simplemetrics) + +install(FILES src/main/resources/configdefinitions/manager.def RENAME metrics.manager.def + DESTINATION var/db/vespa/config_server/serverdb/classes) + diff --git a/standalone-container/CMakeLists.txt b/standalone-container/CMakeLists.txt new file mode 100644 index 00000000000..83c58e09945 --- /dev/null +++ b/standalone-container/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(standalone-container) diff --git a/statistics/CMakeLists.txt b/statistics/CMakeLists.txt new file mode 100644 index 00000000000..cd746e8a6c6 --- /dev/null +++ b/statistics/CMakeLists.txt @@ -0,0 +1,3 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install(FILES src/main/resources/configdefinitions/statistics.def RENAME container.statistics.def + DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/vespa-http-client/CMakeLists.txt b/vespa-http-client/CMakeLists.txt new file mode 100644 index 00000000000..511b4a4c985 --- /dev/null +++ b/vespa-http-client/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(vespa-http-client) diff --git a/vespa_jersey2/CMakeLists.txt b/vespa_jersey2/CMakeLists.txt new file mode 100644 index 00000000000..f4f6c44202c --- /dev/null +++ b/vespa_jersey2/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_java_artifact_dependencies(vespa_jersey2) diff --git a/vespaclient-container-plugin/CMakeLists.txt b/vespaclient-container-plugin/CMakeLists.txt new file mode 100644 index 00000000000..4c8a8647b23 --- /dev/null +++ b/vespaclient-container-plugin/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(vespaclient-container-plugin) diff --git a/vespaclient-core/CMakeLists.txt b/vespaclient-core/CMakeLists.txt new file mode 100644 index 00000000000..5068accc919 --- /dev/null +++ b/vespaclient-core/CMakeLists.txt @@ -0,0 +1,5 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install(FILES src/main/resources/configdefinitions/feeder.def RENAME vespaclient.config.feeder.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES src/main/resources/configdefinitions/spooler.def RENAME vespa.config.content.spooler.spooler.def + DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/vespaclient-java/CMakeLists.txt b/vespaclient-java/CMakeLists.txt new file mode 100644 index 00000000000..b9240adee8a --- /dev/null +++ b/vespaclient-java/CMakeLists.txt @@ -0,0 +1,12 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(vespaclient-java) + +vespa_install_script(src/main/sh/vespa-document-statistics.sh vespa-document-statistics bin) +vespa_install_script(src/main/sh/vespa-stat.sh vespa-stat bin) +vespa_install_script(src/main/sh/vespa-query-profile-dump-tool.sh vespa-query-profile-dump-tool bin) +vespa_install_script(src/main/sh/vespa-summary-benchmark.sh vespa-summary-benchmark bin) +vespa_install_script(src/main/sh/vespa-destination.sh vespa-destination bin) +vespa_install_script(src/main/sh/vespa-feeder.sh vespa-feeder bin) +vespa_install_script(src/main/sh/vespa-get.sh vespa-get bin) +vespa_install_script(src/main/sh/vespa-visit.sh vespa-visit bin) +vespa_install_script(src/main/sh/vespa-visit-target.sh vespa-visit-target bin) diff --git a/vespajlib/CMakeLists.txt b/vespajlib/CMakeLists.txt new file mode 100644 index 00000000000..7235535ace8 --- /dev/null +++ b/vespajlib/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_java_artifact(vespajlib) diff --git a/zkfacade/CMakeLists.txt b/zkfacade/CMakeLists.txt new file mode 100644 index 00000000000..6610356c0fd --- /dev/null +++ b/zkfacade/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(zkfacade) |