Remove building of old osgi bundles

These bundles are not used in any unit or system test.

27 files changed, 0 insertions, 646 deletions

diff --git a/container-search/build-osgi-bundles.xml b/container-search/build-osgi-bundles.xml
deleted file mode 100644
index 4594492546e..00000000000
--- a/container-search/build-osgi-bundles.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-
-<project name="osgi-bundles" default="build" basedir=".">
-
-  <property name="build.compiler" value="extJavac"/>
-
-  <target name="archiveOsgiBundle">
-    <property name="MANIFEST" value="target/build/manifest.mf"/>
-    <copy file="src/test/java/${package}/${name}/Manifest.MF"
-          tofile="${MANIFEST}"
-          overwrite="true">
-    </copy>
-
-    <delete dir="staging"/>
-    <mkdir dir="staging"/>
-    <mkdir dir="target/test-classes"/> <!-- Create test-classes, does not exist during clover testing -->
-    <copy todir="staging">
-      <fileset dir="target/test-classes" includes="${package}/${name}/**"/>
-    </copy>
-
-    <mkdir dir="bundles"/>
-    <jar jarfile="bundles/${name}bundle.jar"
-         basedir="staging"
-         manifest="${MANIFEST}"
-         includes="**"
-         index="true"
-         />
-
-    <delete file="${MANIFEST}"/>
-  </target>
-
-  <target name="archiveOsgiBundleVersion">
-    <delete dir="staging"/>
-    <mkdir dir="staging"/>
-
-    <copy todir="staging">
-      <fileset dir="src/test/java" includes="${package}/${name}-${version}/**"/>
-    </copy>
-
-    <!-- Remove version constraints imposed by developer tools/java -->
-    <!-- Correct directory name to match package -->
-    <move file="staging/${package}/${name}-${version}" todir="staging/${package}/${name}"/>
-    <!-- Make source files .java -->
-    <move todir="staging/${package}/${name}" includeemptydirs="false">
-      <fileset dir="staging/${package}/${name}"/>
-      <mapper type="glob" from="*.java.text" to="*.java"/>
-    </move>
-
-    <antcall target="compile">
-      <param name="SOURCEPATH" value="staging"/>
-      <param name="CLASSES_DIR" value="staging"/>
-    </antcall>
-
-    <mkdir dir="bundles"/>
-    <jar jarfile="bundles/${name}bundle-${version}.jar"
-         basedir="staging"
-         manifest="src/test/java/${package}/${name}-${version}/Manifest.MF"
-         includes="**"
-         excludes="**/*.java"
-         index="true"
-         />
-  </target>
-
-
-  <!-- =================================================================== -->
-  <!-- Creates the class jar archive                                       -->
-  <!-- =================================================================== -->
-  <target name="build"
-          description="Jars the osgi bundles produced by this">
-    <antcall target="archiveOsgiBundle">
-      <param name="name" value="client"/>
-      <param name="package" value="com/yahoo/osgi/test"/>
-    </antcall>
-    <antcall target="archiveOsgiBundle">
-      <param name="name" value="calculatorservice"/>
-      <param name="package" value="com/yahoo/osgi/test"/>
-    </antcall>
-    <antcall target="archiveOsgiBundle">
-      <param name="name" value="counterservice"/>
-      <param name="package" value="com/yahoo/osgi/test"/>
-    </antcall>
-    <antcall target="archiveOsgiBundle">
-      <param name="name" value="searcher2"/>
-      <param name="package" value="com/yahoo/search/searchchain/config/test"/>
-    </antcall>
-    <antcall target="archiveOsgiBundle">
-      <param name="name" value="twosearchers"/>
-      <param name="package" value="com/yahoo/search/searchchain/config/test"/>
-    </antcall>
-    <antcall target="archiveOsgiBundle">
-      <param name="name" value="searcher1"/>
-      <param name="package" value="com/yahoo/search/searchchain/config/test"/>
-    </antcall>
-    <antcall target="archiveOsgiBundleVersion">
-      <param name="name" value="searcher1"/>
-      <param name="package" value="com/yahoo/search/searchchain/config/test"/>
-      <param name="version" value="2"/>
-    </antcall>
-    <antcall target="archiveOsgiBundleVersion">
-      <param name="name" value="searcher1"/>
-      <param name="package" value="com/yahoo/search/searchchain/config/test"/>
-      <param name="version" value="2.1"/>
-    </antcall>
-    <antcall target="archiveOsgiBundleVersion">
-      <param name="name" value="searcher1"/>
-      <param name="package" value="com/yahoo/search/searchchain/config/test"/>
-      <param name="version" value="2.2"/>
-    </antcall>
-    <antcall target="archiveOsgiBundle">
-      <param name="name" value="updatesearcher"/>
-      <param name="package" value="com/yahoo/search/searchchain/config/test"/>
-    </antcall>
-    <antcall target="archiveOsgiBundleVersion">
-      <param name="name" value="updatesearcher"/>
-      <param name="package" value="com/yahoo/search/searchchain/config/test"/>
-      <param name="version" value="2"/>
-    </antcall>
-
-  </target>
-
-  <!-- =================================================================== -->
-  <!-- Compiles the source code                                            -->
-  <!-- =================================================================== -->
-  <target name="compile"
-          description="Compiles all source files in the project SOURCEPATH">
-    <property name="PATTERN" value="*"/>
-    <property name="DEBUG" value="true"/>
-    <property name="OPTI" value="off"/>
-    <javac srcdir="${SOURCEPATH}"
-           includeantruntime="false"
-           encoding="UTF-8"
-           destdir="${CLASSES_DIR}"
-           classpath="target/classes:${MVN_COMPILE_CLASSPATH}"
-           debug="${DEBUG}"
-           deprecation="off"
-           includes="**/${PATTERN}*.java"
-           source="1.5"
-           target="1.5"
-           optimize="${OPTI}">
-      <compilerarg compiler="jikes" value="+Pno-effective-java" />
-      <compilerarg compiler="jikes" value="+Pno-shadow" />
-      <compilerarg compiler="jikes" value="+Pno-switchcheck" />
-    </javac>
-  </target>
-
-</project>
diff --git a/container-search/pom.xml b/container-search/pom.xml
index 84d4ba85548..b4b87131025 100644
--- a/container-search/pom.xml
+++ b/container-search/pom.xml
@@ -222,25 +222,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
-        <executions>
-          <execution>
-            <phase>test-compile</phase>
-            <configuration>
-              <tasks unless="maven.test.skip">
-                <property name="MVN_COMPILE_CLASSPATH" refid="maven.compile.classpath"/>
-                <echo message="BUILDING BUILD-OSGI-BUNDLES with cp ${MVN_COMPILE_CLASSPATH}"/>
-                <ant antfile="build-osgi-bundles.xml"/>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin> <!-- For the YQL query language -->
         <groupId>org.antlr</groupId>
         <artifactId>antlr4-maven-plugin</artifactId>
@@ -276,31 +257,4 @@
       </plugin>
     </plugins>
   </build>
-  <profiles>
-    <profile>
-      <id>tools.jar</id>
-      <activation>
-        <os>
-          <family>!mac</family>
-        </os>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <dependencies>
-              <dependency>
-                <groupId>com.sun</groupId>
-                <artifactId>tools</artifactId>
-                <version>1.5.0</version>
-                <scope>system</scope>
-                <systemPath>${java.home}/../lib/tools.jar</systemPath>
-              </dependency>
-            </dependencies>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
diff --git a/container-search/src/test/java/com/yahoo/osgi/test/Calculator.java b/container-search/src/test/java/com/yahoo/osgi/test/Calculator.java
deleted file mode 100644
index 8869705ac3b..00000000000
--- a/container-search/src/test/java/com/yahoo/osgi/test/Calculator.java
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.osgi.test;
-
-/**
- * A public interface which can be implemented by a bundle
- *
- * @author bratseth
- */
-public interface Calculator {
-
-    int add(int a,int b);
-
-}
diff --git a/container-search/src/test/java/com/yahoo/osgi/test/calculatorservice/CalculatorService.java b/container-search/src/test/java/com/yahoo/osgi/test/calculatorservice/CalculatorService.java
deleted file mode 100644
index ace11739aed..00000000000
--- a/container-search/src/test/java/com/yahoo/osgi/test/calculatorservice/CalculatorService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.osgi.test.calculatorservice;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-import com.yahoo.osgi.test.Calculator;
-
-/**
- * An implementation of an interface which is not part of the bundle
- *
- * @author bratseth
- */
-public class CalculatorService implements Calculator, BundleActivator {
-
-    private ServiceRegistration calculatorServiceRegistration;
-
-    public int add(int a,int b) {
-        return a+b;
-    }
-
-    public void start(BundleContext context) {
-        calculatorServiceRegistration=context.registerService(Calculator.class.getName(), this, null);
-    }
-
-    public void stop(BundleContext context) {
-        calculatorServiceRegistration.unregister();
-    }
-
-}
diff --git a/container-search/src/test/java/com/yahoo/osgi/test/calculatorservice/Manifest.MF b/container-search/src/test/java/com/yahoo/osgi/test/calculatorservice/Manifest.MF
deleted file mode 100644
index cfb2f945761..00000000000
--- a/container-search/src/test/java/com/yahoo/osgi/test/calculatorservice/Manifest.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: CalculatorService
-Bundle-SymbolicName: com.yahoo.osgi.test.calculatorservice.CalculatorService
-Bundle-Version: 1.0.0
-Bundle-Activator: com.yahoo.osgi.test.calculatorservice.CalculatorService
-Bundle-Vendor: Yahoo!
-Import-Package: org.osgi.framework;version="1.3.0",
-                com.yahoo.component,
-                com.yahoo.search.result,
-                com.yahoo.search.searchchain,
-                com.yahoo.search
-Export-Package: com.yahoo.osgi.test.calculatorservice
diff --git a/container-search/src/test/java/com/yahoo/osgi/test/client/Client.java b/container-search/src/test/java/com/yahoo/osgi/test/client/Client.java
deleted file mode 100644
index 1e907e9d92d..00000000000
--- a/container-search/src/test/java/com/yahoo/osgi/test/client/Client.java
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.osgi.test.client;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-
-import com.yahoo.osgi.test.counterservice.CounterService;
-
-/**
- * A bundle which is a client calling to another bundle.
- *
- * @author bratseth
- */
-public class Client implements BundleActivator {
-
-    @SuppressWarnings("unchecked")
-    public void start(BundleContext context) {
-        ServiceReference counterServiceReference=context.getServiceReference(CounterService.class.getName());
-        CounterService counterService =(CounterService)context.getService(counterServiceReference);
-        assertEquals(0, counterService.getCounter());
-        counterService.incrementCounter();
-        assertEquals(1, counterService.getCounter());
-    }
-
-    public void stop(BundleContext context) {}
-
-    private void assertEquals(Object correct,Object test) {
-        if (!correct.equals(test))
-            throw new RuntimeException("Expected " + correct + ", got " + test);
-    }
-
-}
diff --git a/container-search/src/test/java/com/yahoo/osgi/test/client/Manifest.MF b/container-search/src/test/java/com/yahoo/osgi/test/client/Manifest.MF
deleted file mode 100644
index e50de302fc5..00000000000
--- a/container-search/src/test/java/com/yahoo/osgi/test/client/Manifest.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Client
-Bundle-SymbolicName: com.yahoo.osgi.test.client.Client
-Bundle-Version: 1.0.0
-Bundle-Activator: com.yahoo.osgi.test.client.Client
-Bundle-Vendor: Yahoo!
-Import-Package: com.yahoo.osgi.test.counterservice,org.osgi.framework;version="1.3.0",
-                com.yahoo.component,
-                com.yahoo.search.result,
-                com.yahoo.search.searchchain,
-                com.yahoo.search
diff --git a/container-search/src/test/java/com/yahoo/osgi/test/counterservice/CounterService.java b/container-search/src/test/java/com/yahoo/osgi/test/counterservice/CounterService.java
deleted file mode 100644
index a25ea6221d0..00000000000
--- a/container-search/src/test/java/com/yahoo/osgi/test/counterservice/CounterService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.osgi.test.counterservice;
-
-/**
- * Interface to the test bundle service
- *
- * @author bratseth
- */
-public interface CounterService {
-
-    public int getCounter();
-
-    public void incrementCounter();
-
-}
diff --git a/container-search/src/test/java/com/yahoo/osgi/test/counterservice/CounterServiceImpl.java b/container-search/src/test/java/com/yahoo/osgi/test/counterservice/CounterServiceImpl.java
deleted file mode 100644
index 5faf508aaf5..00000000000
--- a/container-search/src/test/java/com/yahoo/osgi/test/counterservice/CounterServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.osgi.test.counterservice;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- * A service which must be imported by another bundle to be used
- *
- * @author bratseth
- */
-public class CounterServiceImpl implements CounterService, BundleActivator {
-
-    private int counter=0;
-
-    private ServiceRegistration counterServiceRegistration;
-
-    public void start(BundleContext context) {
-        counterServiceRegistration=context.registerService(CounterService.class.getName(), this, null);
-    }
-
-    public void stop(BundleContext context) {
-        counterServiceRegistration.unregister();
-    }
-
-    public int getCounter() {
-        return counter;
-    }
-
-    public void incrementCounter() {
-        counter++;
-    }
-
-}
diff --git a/container-search/src/test/java/com/yahoo/osgi/test/counterservice/Manifest.MF b/container-search/src/test/java/com/yahoo/osgi/test/counterservice/Manifest.MF
deleted file mode 100644
index a7644eea4cf..00000000000
--- a/container-search/src/test/java/com/yahoo/osgi/test/counterservice/Manifest.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: CounterService
-Bundle-SymbolicName: com.yahoo.osgi.test.counterservice.CounterService
-Bundle-Version: 1.0.0
-Bundle-Activator: com.yahoo.osgi.test.counterservice.CounterServiceImpl
-Bundle-Vendor: Yahoo!
-Import-Package: org.osgi.framework;version="1.3.0",com.yahoo.osgi.test.calculatorservice,
-                com.yahoo.component,
-                com.yahoo.search.result,
-                com.yahoo.search.searchchain,
-                com.yahoo.search
-Export-Package: com.yahoo.osgi.test.counterservice
\ No newline at end of file
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2.1/Manifest.MF b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2.1/Manifest.MF
deleted file mode 100644
index 09956bb2aef..00000000000
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2.1/Manifest.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Searcher1
-Bundle-SymbolicName: com.yahoo.search.searchchain.config.test.searcher1.Searcher1
-Bundle-Version: 2.1
-Bundle-Vendor: Yahoo!
-Export-Package: com.yahoo.search.searchchain.config.test.searcher1
-Import-Package: org.osgi.framework;version="1.3.0",
-                com.yahoo.component,
-                com.yahoo.search.result,
-                com.yahoo.search.searchchain,
-                com.yahoo.search
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2.1/Searcher1.java.text b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2.1/Searcher1.java.text
deleted file mode 100644
index ecbedc85875..00000000000
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2.1/Searcher1.java.text
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.yahoo.search.searchchain.config.test.searcher1;
-
-import com.yahoo.search.Searcher;
-import com.yahoo.search.Query;
-import com.yahoo.search.searchchain.Execution;
-import com.yahoo.search.Result;
-import com.yahoo.search.result.Hit;
-
-/**
- * @author bratseth
- */
-public class Searcher1 extends Searcher {
-
-    public @Override Result search(Query query,Execution execution) {
-        Result result=execution.search(query);
-        if (result==null)
-            result=new Result(query);
-        result.hits().add(new Hit("from:searcher1:2.1"));
-        return result;
-    }
-
-}
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2.2/Manifest.MF b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2.2/Manifest.MF
deleted file mode 100644
index 719fe7a81ba..00000000000
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2.2/Manifest.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Searcher1
-Bundle-SymbolicName: com.yahoo.search.searchchain.config.test.searcher1.Searcher1
-Bundle-Version: 2.2
-Bundle-Vendor: Yahoo!
-Export-Package: com.yahoo.search.searchchain.config.test.searcher1
-Import-Package: org.osgi.framework;version="1.3.0",
-                com.yahoo.component,
-                com.yahoo.search.result,
-                com.yahoo.search.searchchain,
-                com.yahoo.search
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2.2/Searcher1.java.text b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2.2/Searcher1.java.text
deleted file mode 100644
index 413575aca39..00000000000
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2.2/Searcher1.java.text
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.yahoo.search.searchchain.config.test.searcher1;
-
-import com.yahoo.search.Searcher;
-import com.yahoo.search.Query;
-import com.yahoo.search.searchchain.Execution;
-import com.yahoo.search.Result;
-import com.yahoo.search.result.Hit;
-
-/**
- * @author bratseth
- */
-public class Searcher1 extends Searcher {
-
-    public @Override Result search(Query query,Execution execution) {
-        Result result=execution.search(query);
-        if (result==null)
-            result=new Result(query);
-        result.hits().add(new Hit("from:searcher1:2.2"));
-        return result;
-    }
-
-}
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2/Manifest.MF b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2/Manifest.MF
deleted file mode 100644
index 9e7835f6ee2..00000000000
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2/Manifest.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Searcher1
-Bundle-SymbolicName: com.yahoo.search.searchchain.config.test.searcher1.Searcher1
-Bundle-Version: 2
-Bundle-Vendor: Yahoo!
-Export-Package: com.yahoo.search.searchchain.config.test.searcher1
-Import-Package: org.osgi.framework;version="1.3.0",
-                com.yahoo.component,
-                com.yahoo.search.result,
-                com.yahoo.search.searchchain,
-                com.yahoo.search
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2/Searcher1.java.text b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2/Searcher1.java.text
deleted file mode 100644
index 29e5fb7697a..00000000000
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2/Searcher1.java.text
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.yahoo.search.searchchain.config.test.searcher1;
-
-import com.yahoo.search.Searcher;
-import com.yahoo.search.Query;
-import com.yahoo.search.searchchain.Execution;
-import com.yahoo.search.Result;
-import com.yahoo.search.result.Hit;
-
-/**
- * @author bratseth
- */
-public class Searcher1 extends Searcher {
-
-    public @Override Result search(Query query,Execution execution) {
-        Result result=execution.search(query);
-        if (result==null)
-            result=new Result(query);
-        result.hits().add(new Hit("from:searcher1:2"));
-        return result;
-    }
-
-}
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1/Manifest.MF b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1/Manifest.MF
deleted file mode 100644
index 70447069705..00000000000
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1/Manifest.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Searcher1
-Bundle-SymbolicName: com.yahoo.search.searchchain.config.test.searcher1.Searcher1
-Bundle-Version: 0
-Bundle-Vendor: Yahoo!
-Import-Package: com.yahoo.prelude,
-                org.osgi.framework;version="1.3.0",
-                com.yahoo.component,
-                com.yahoo.search.result,
-                com.yahoo.search.searchchain,
-                com.yahoo.search
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1/Searcher1.java b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1/Searcher1.java
deleted file mode 100644
index 2bc3e3e317c..00000000000
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1/Searcher1.java
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.search.searchchain.config.test.searcher1;
-
-import com.yahoo.search.result.ErrorMessage;
-import com.yahoo.search.Query;
-import com.yahoo.search.Result;
-import com.yahoo.search.Searcher;
-import com.yahoo.search.result.Hit;
-import com.yahoo.search.searchchain.Execution;
-
-/**
- * @author bratseth
- */
-public class Searcher1 extends Searcher {
-
-    public @Override
-    Result search(Query query,Execution execution) {
-        Result result=execution.search(query);
-        ErrorMessage.createErrorInPluginSearcher("nop"); // Check that we may access legacy packages
-        if (result==null)
-            result=new Result(query);
-        result.hits().add(new Hit("from:searcher1:0"));
-        return result;
-    }
-}
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher2/Manifest.MF b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher2/Manifest.MF
deleted file mode 100644
index 972c3090b8d..00000000000
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher2/Manifest.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: HelloWorld
-Bundle-SymbolicName: com.yahoo.search.searchchain.config.test.searcher2.Searcher2
-Bundle-Version: 1.0.0
-Bundle-Vendor: Yahoo!
-Export-Package: com.yahoo.search.searchchain.config.test.searcher2
-Import-Package: org.osgi.framework;version="1.3.0",
-                com.yahoo.component,
-                com.yahoo.search.result,
-                com.yahoo.search.searchchain,
-                com.yahoo.search
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher2/Searcher2.java b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher2/Searcher2.java
deleted file mode 100644
index 3a517d0fd2e..00000000000
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher2/Searcher2.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.search.searchchain.config.test.searcher2;
-
-import com.yahoo.search.Query;
-import com.yahoo.search.Result;
-import com.yahoo.search.Searcher;
-import com.yahoo.search.searchchain.Execution;
-
-/**
- * @author bratseth
- */
-public class Searcher2 extends Searcher {
-
-    public Result search(Query query, Execution execution) {
-        return execution.search(query);
-    }
-
-}
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/Manifest.MF b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/Manifest.MF
deleted file mode 100644
index 20260ba2733..00000000000
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/Manifest.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: HelloWorld
-Bundle-SymbolicName: twosearchers
-Bundle-Version: 1.0.0
-Bundle-Vendor: Yahoo!
-Import-Package: org.osgi.framework;version="1.3.0",
-                com.yahoo.component,
-                com.yahoo.search.result,
-                com.yahoo.search.searchchain,
-                com.yahoo.search
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/MultiSearcher1.java b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/MultiSearcher1.java
deleted file mode 100644
index 5d107e36065..00000000000
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/MultiSearcher1.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.search.searchchain.config.test.twosearchers;
-
-import com.yahoo.search.Query;
-import com.yahoo.search.Result;
-import com.yahoo.search.Searcher;
-import com.yahoo.search.searchchain.Execution;
-
-/**
- * @author bratseth
- */
-public class MultiSearcher1 extends Searcher {
-
-    public Result search(Query query, Execution execution) {
-        return execution.search(query);
-    }
-
-}
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/MultiSearcher2.java b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/MultiSearcher2.java
deleted file mode 100644
index ba5f4ee4afc..00000000000
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/MultiSearcher2.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.search.searchchain.config.test.twosearchers;
-
-import com.yahoo.search.Query;
-import com.yahoo.search.Result;
-import com.yahoo.search.Searcher;
-import com.yahoo.search.searchchain.Execution;
-
-/**
- * @author bratseth
- */
-public class MultiSearcher2 extends Searcher {
-
-    public Result search(Query query, Execution execution) {
-        return execution.search(query);
-    }
-
-}
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher-2/Manifest.MF b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher-2/Manifest.MF
deleted file mode 100644
index 7c98e11231e..00000000000
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher-2/Manifest.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Searcher1
-Bundle-SymbolicName: com.yahoo.search.searchchain.config.test.updatesearcher.UpdateSearcher
-Bundle-Version: 0
-Bundle-Vendor: Yahoo!
-Export-Package: com.yahoo.search.searchchain.config.test.searcher1
-Import-Package: org.osgi.framework;version="1.3.0",
-                com.yahoo.component,
-                com.yahoo.search.result,
-                com.yahoo.search.searchchain,
-                com.yahoo.search
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher-2/UpdateSearcher.java.text b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher-2/UpdateSearcher.java.text
deleted file mode 100644
index f62333761a2..00000000000
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher-2/UpdateSearcher.java.text
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.yahoo.search.searchchain.config.test.updatesearcher;
-
-import com.yahoo.search.Searcher;
-import com.yahoo.search.Result;
-import com.yahoo.search.Query;
-import com.yahoo.search.result.Hit;
-import com.yahoo.search.searchchain.Execution;
-
-/**
- * @author bratseth
- */
-public class UpdateSearcher extends com.yahoo.search.Searcher {
-
-    public String test = "update2";
-
-    public @Override
-    Result search(Query query,Execution execution) {
-        Result result=execution.search(query);
-        if (result==null)
-            result=new Result(query);
-        result.hits().add(new Hit("from:updatesearcher:2"));
-        return result;
-    }
-}
\ No newline at end of file
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/Manifest.MF b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/Manifest.MF
deleted file mode 100644
index 7c98e11231e..00000000000
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/Manifest.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Searcher1
-Bundle-SymbolicName: com.yahoo.search.searchchain.config.test.updatesearcher.UpdateSearcher
-Bundle-Version: 0
-Bundle-Vendor: Yahoo!
-Export-Package: com.yahoo.search.searchchain.config.test.searcher1
-Import-Package: org.osgi.framework;version="1.3.0",
-                com.yahoo.component,
-                com.yahoo.search.result,
-                com.yahoo.search.searchchain,
-                com.yahoo.search
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/UpdateSearcher.java b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/UpdateSearcher.java
deleted file mode 100644
index 04b39fdc4ac..00000000000
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/UpdateSearcher.java
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.search.searchchain.config.test.updatesearcher;
-
-import com.yahoo.search.Query;
-import com.yahoo.search.Result;
-import com.yahoo.search.result.Hit;
-import com.yahoo.search.searchchain.Execution;
-
-/**
- * @author bratseth
- */
-public class UpdateSearcher extends com.yahoo.search.Searcher {
-
-    public String test = "update";
-
-    @Override
-    public Result search(Query query,Execution execution) {
-        Result result=execution.search(query);
-        if (result==null)
-            result=new Result(query);
-        result.hits().add(new Hit("from:updatesearcher:0"));
-        return result;
-    }
-}