Merge pull request #3826 from vespa-engine/revert-3818-revert-3615-hakon/provide-service-monitor-and-application-model

Provide service-monitor and application-model, try 2

8 files changed, 29 insertions, 3 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db6bbde423a..4976674f3a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,7 @@ enable_testing()
 # Include vespa config definitions in every target
 include_directories(BEFORE ${CMAKE_BINARY_DIR}/configdefinitions/src)
 
+add_subdirectory(application-model)
 add_subdirectory(application-preprocessor)
 add_subdirectory(chain)
 add_subdirectory(component)
@@ -86,6 +87,7 @@ add_subdirectory(searchcore)
 add_subdirectory(searchcorespi)
 add_subdirectory(searchlib)
 add_subdirectory(searchsummary)
+add_subdirectory(service-monitor)
 add_subdirectory(simplemetrics)
 add_subdirectory(slobrok)
 add_subdirectory(staging_vespalib)
diff --git a/application-model/CMakeLists.txt b/application-model/CMakeLists.txt
new file mode 100644
index 00000000000..d37deefffe9
--- /dev/null
+++ b/application-model/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(application-model)
diff --git a/configserver/CMakeLists.txt b/configserver/CMakeLists.txt
index 21cf801a3bc..bb76e2f1f75 100644
--- a/configserver/CMakeLists.txt
+++ b/configserver/CMakeLists.txt
@@ -16,6 +16,8 @@ install(CODE "execute_process(COMMAND mkdir -p \$ENV{DESTDIR}/\${CMAKE_INSTALL_P
 install(CODE "execute_process(COMMAND ln -snf \${CMAKE_INSTALL_PREFIX}/lib/jars/config-model-fat.jar \$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/conf/configserver-app/components/config-model-fat.jar)")
 install(CODE "execute_process(COMMAND ln -snf \${CMAKE_INSTALL_PREFIX}/lib/jars/configserver-jar-with-dependencies.jar \$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/conf/configserver-app/components/configserver.jar)")
 install(CODE "execute_process(COMMAND ln -snf \${CMAKE_INSTALL_PREFIX}/lib/jars/orchestrator-jar-with-dependencies.jar \$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/conf/configserver-app/components/orchestrator.jar)")
+install(CODE "execute_process(COMMAND ln -snf \${CMAKE_INSTALL_PREFIX}/lib/jars/service-monitor-jar-with-dependencies.jar \$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/conf/configserver-app/components/service-monitor.jar)")
+install(CODE "execute_process(COMMAND ln -snf \${CMAKE_INSTALL_PREFIX}/lib/jars/application-model-jar-with-dependencies.jar \$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/conf/configserver-app/components/application-model.jar)")
 install(CODE "execute_process(COMMAND ln -snf \${CMAKE_INSTALL_PREFIX}/lib/jars/node-repository-jar-with-dependencies.jar \$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/conf/configserver-app/components/node-repository.jar)")
 install(CODE "execute_process(COMMAND ln -snf \${CMAKE_INSTALL_PREFIX}/lib/jars/zkfacade-jar-with-dependencies.jar \$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/conf/configserver-app/components/zkfacade.jar)")
 install(CODE "execute_process(COMMAND ln -snf \${CMAKE_INSTALL_PREFIX}/conf/configserver-app/components \$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/lib/jars/config-models)")
diff --git a/node-admin/pom.xml b/node-admin/pom.xml
index c38e66f0b19..f7691cda3f7 100644
--- a/node-admin/pom.xml
+++ b/node-admin/pom.xml
@@ -42,6 +42,18 @@
         </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
+            <artifactId>service-monitor</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
+            <artifactId>application-model</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
             <artifactId>container-dev</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
diff --git a/node-repository/pom.xml b/node-repository/pom.xml
index 7639f57bb03..09b0d3df3d9 100644
--- a/node-repository/pom.xml
+++ b/node-repository/pom.xml
@@ -55,6 +55,12 @@
         </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
+            <artifactId>application-model</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
             <artifactId>zkfacade</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml
index d70e5006c54..c50f9ddcb29 100644
--- a/orchestrator/pom.xml
+++ b/orchestrator/pom.xml
@@ -25,7 +25,7 @@
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>service-monitor</artifactId>
       <version>${project.version}</version>
-      <scope>compile</scope> <!-- TODO: Unbundle, but fix JSON serialization of model objects first. -->
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
@@ -35,7 +35,7 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>config-model-api</artifactId>
+      <artifactId>application-model</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/service-monitor/CMakeLists.txt b/service-monitor/CMakeLists.txt
new file mode 100644
index 00000000000..f4016fd8259
--- /dev/null
+++ b/service-monitor/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(service-monitor)
diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml
index 80958ca9bee..34d245c596b 100644
--- a/service-monitor/pom.xml
+++ b/service-monitor/pom.xml
@@ -57,7 +57,7 @@
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>application-model</artifactId>
             <version>${project.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>