Revert "Balder/quick restart of slobrok"

4 files changed, 1 insertions, 96 deletions

diff --git a/configserver/src/test/apps/app-jdisc-only-restart/hosts.xml b/configserver/src/test/apps/app-jdisc-only-restart/hosts.xml
deleted file mode 100644
index f4256c9fc81..00000000000
--- a/configserver/src/test/apps/app-jdisc-only-restart/hosts.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<hosts>
-  <host name="mytesthost">
-    <alias>node1</alias>
-  </host>
-</hosts>
diff --git a/configserver/src/test/apps/app-jdisc-only-restart/searchdefinitions/music.sd b/configserver/src/test/apps/app-jdisc-only-restart/searchdefinitions/music.sd
deleted file mode 100644
index 2e40523a6d9..00000000000
--- a/configserver/src/test/apps/app-jdisc-only-restart/searchdefinitions/music.sd
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-# A basic search definition - called music, should be saved to music.sd
-search music {
-
-  # It contains one document type only - called music as well
-  document music {
-
-    field title type string {
-      indexing: summary | index   # How this field should be indexed
-      # index-to: title, default    # Create two indexes
-      weight: 75 # Ranking importancy of this field, used by the built in nativeRank feature
-      header
-    }
-
-    field artist type string {
-      indexing: summary | attribute | index
-      # index-to: artist, default
-
-      weight: 25
-      header
-    }
-
-    field year type int {
-      indexing: summary | attribute
-      header
-    }
-
-    # Increase query
-    field popularity type int {
-      indexing: summary | attribute
-      body
-    }
-
-    field url type uri {
-      indexing: summary | index
-      header
-    }
-
-  }
-
-  rank-profile default inherits default {
-    first-phase {
-      expression: nativeRank(title,artist) + attribute(popularity)
-    }
-
-  }
-
-  rank-profile textmatch inherits default {
-    first-phase {
-      expression: nativeRank(title,artist)
-    }
-
-  }
-
-
-
-}
diff --git a/configserver/src/test/apps/app-jdisc-only-restart/services.xml b/configserver/src/test/apps/app-jdisc-only-restart/services.xml
deleted file mode 100644
index b864ea206ef..00000000000
--- a/configserver/src/test/apps/app-jdisc-only-restart/services.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<services version="1.0">
-
-    <admin version="2.0">
-        <adminserver hostalias="node1"/>
-        <slobroks>
-            <slobrok hostalias="node1" baseport="12345"/>
-        </slobroks>
-    </admin>
-
-    <jdisc version="1.0">
-        <document-processing compressdocuments="true">
-            <chain id="ContainerWrapperTest">
-                <documentprocessor id="com.yahoo.vespa.config.AppleDocProc"/>
-            </chain>
-        </document-processing>
-
-        <config name="project.specific">
-            <value>someval</value>
-        </config>
-
-        <nodes>
-            <node hostalias="node1" />
-        </nodes>
-
-    </jdisc>
-
-</services>
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
index 0b7e9a78967..ecc3a8a0a54 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
@@ -33,8 +33,6 @@ public class ApplicationRepositoryTest {
 
     private final static File testApp = new File("src/test/apps/app");
     private final static File testAppJdiscOnly = new File("src/test/apps/app-jdisc-only");
-    private final static File testAppJdiscOnlyRestart = new File("src/test/apps/app-jdisc-only-restart");
-
     private final static TenantName tenantName = TenantName.from("test");
     private final static Clock clock = Clock.systemUTC();
 
@@ -65,7 +63,7 @@ public class ApplicationRepositoryTest {
     @Test
     public void prepareAndActivateWithRestart() throws IOException {
         prepareAndActivateApp(testAppJdiscOnly);
-        PrepareResult result = prepareAndActivateApp(testAppJdiscOnlyRestart);
+        PrepareResult result = prepareAndActivateApp(testApp);
         assertTrue(result.configChangeActions().getRefeedActions().isEmpty());
         assertFalse(result.configChangeActions().getRestartActions().isEmpty());
     }