From 2c6d59c311f2d32ed37f7d6c1ba75c1049fedf03 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Mon, 24 Jul 2017 11:00:22 +0200 Subject: Remove building of old osgi bundles These bundles are not used in any unit or system test. --- container-search/build-osgi-bundles.xml | 147 --------------------- container-search/pom.xml | 46 ------- .../test/java/com/yahoo/osgi/test/Calculator.java | 13 -- .../test/calculatorservice/CalculatorService.java | 31 ----- .../yahoo/osgi/test/calculatorservice/Manifest.MF | 13 -- .../java/com/yahoo/osgi/test/client/Client.java | 33 ----- .../java/com/yahoo/osgi/test/client/Manifest.MF | 12 -- .../osgi/test/counterservice/CounterService.java | 15 --- .../test/counterservice/CounterServiceImpl.java | 35 ----- .../com/yahoo/osgi/test/counterservice/Manifest.MF | 13 -- .../config/test/searcher1-2.1/Manifest.MF | 12 -- .../config/test/searcher1-2.1/Searcher1.java.text | 22 --- .../config/test/searcher1-2.2/Manifest.MF | 12 -- .../config/test/searcher1-2.2/Searcher1.java.text | 22 --- .../config/test/searcher1-2/Manifest.MF | 12 -- .../config/test/searcher1-2/Searcher1.java.text | 22 --- .../searchchain/config/test/searcher1/Manifest.MF | 12 -- .../config/test/searcher1/Searcher1.java | 25 ---- .../searchchain/config/test/searcher2/Manifest.MF | 12 -- .../config/test/searcher2/Searcher2.java | 18 --- .../config/test/twosearchers/Manifest.MF | 11 -- .../config/test/twosearchers/MultiSearcher1.java | 18 --- .../config/test/twosearchers/MultiSearcher2.java | 18 --- .../config/test/updatesearcher-2/Manifest.MF | 12 -- .../test/updatesearcher-2/UpdateSearcher.java.text | 24 ---- .../config/test/updatesearcher/Manifest.MF | 12 -- .../config/test/updatesearcher/UpdateSearcher.java | 24 ---- 27 files changed, 646 deletions(-) delete mode 100644 container-search/build-osgi-bundles.xml delete mode 100644 container-search/src/test/java/com/yahoo/osgi/test/Calculator.java delete mode 100644 container-search/src/test/java/com/yahoo/osgi/test/calculatorservice/CalculatorService.java delete mode 100644 container-search/src/test/java/com/yahoo/osgi/test/calculatorservice/Manifest.MF delete mode 100644 container-search/src/test/java/com/yahoo/osgi/test/client/Client.java delete mode 100644 container-search/src/test/java/com/yahoo/osgi/test/client/Manifest.MF delete mode 100644 container-search/src/test/java/com/yahoo/osgi/test/counterservice/CounterService.java delete mode 100644 container-search/src/test/java/com/yahoo/osgi/test/counterservice/CounterServiceImpl.java delete mode 100644 container-search/src/test/java/com/yahoo/osgi/test/counterservice/Manifest.MF delete mode 100644 container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2.1/Manifest.MF delete mode 100644 container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2.1/Searcher1.java.text delete mode 100644 container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2.2/Manifest.MF delete mode 100644 container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2.2/Searcher1.java.text delete mode 100644 container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2/Manifest.MF delete mode 100644 container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1-2/Searcher1.java.text delete mode 100644 container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1/Manifest.MF delete mode 100644 container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1/Searcher1.java delete mode 100644 container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher2/Manifest.MF delete mode 100644 container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher2/Searcher2.java delete mode 100644 container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/Manifest.MF delete mode 100644 container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/MultiSearcher1.java delete mode 100644 container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/MultiSearcher2.java delete mode 100644 container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher-2/Manifest.MF delete mode 100644 container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher-2/UpdateSearcher.java.text delete mode 100644 container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/Manifest.MF delete mode 100644 container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/UpdateSearcher.java (limited to 'container-search') 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - maven-antrun-plugin - 1.7 - - - test-compile - - - - - - - - - run - - - - org.antlr antlr4-maven-plugin @@ -276,31 +257,4 @@ - - - tools.jar - - - !mac - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - com.sun - tools - 1.5.0 - system - ${java.home}/../lib/tools.jar - - - - - - - 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; - } -} -- cgit v1.2.3