diff options
| author | Jon Bratseth <jonbratseth@yahoo.com> | 2017-06-14 16:20:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 16:20:54 +0200 |
| commit | b805f670861d7bca4e207a93f10f35e09544feee (patch) | |
| tree | f2a3453029ec94720eb06b51cff4107e27725001 /sample-apps | |
| parent | dd50cadd8e9b4b404e93a3a625fcfb86392a579e (diff) | |
| parent | cdc73cd043fb29c5404b2c90373b74eb0d46e6fa (diff) | |
Merge pull request #2775 from yahoo/kraune/fix-sampleapp
deployable, simplify
Diffstat (limited to 'sample-apps')
| -rw-r--r-- | sample-apps/http-api-using-searcher/src/main/application/hosts.xml | 6 | ||||
| -rw-r--r-- | sample-apps/http-api-using-searcher/src/main/application/services.xml | 27 |
2 files changed, 12 insertions, 21 deletions
diff --git a/sample-apps/http-api-using-searcher/src/main/application/hosts.xml b/sample-apps/http-api-using-searcher/src/main/application/hosts.xml new file mode 100644 index 00000000000..8fa51b58ae4 --- /dev/null +++ b/sample-apps/http-api-using-searcher/src/main/application/hosts.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" ?> +<hosts> + <host name="localhost"> + <alias>node1</alias> + </host> +</hosts> diff --git a/sample-apps/http-api-using-searcher/src/main/application/services.xml b/sample-apps/http-api-using-searcher/src/main/application/services.xml index fe16ec42260..c1d04daae8f 100644 --- a/sample-apps/http-api-using-searcher/src/main/application/services.xml +++ b/sample-apps/http-api-using-searcher/src/main/application/services.xml @@ -1,17 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright 2016 Yahoo Inc. 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"/> - </admin> <container id="default" version="1.0"> - <document-api /> <!-- Enable feed endpoint --> - <search> <chain inherits="vespa" id="default"> - <searcher id="com.yahoo.demo.DemoSearcher" bundle="demo"> + <searcher id="com.yahoo.demo.DemoSearcher" bundle="sample-app-http-api-searcher"> <config name="demo.demo"> <demo> <item> @@ -21,15 +16,12 @@ </config> </searcher> </chain> - <renderer id="demo" class="com.yahoo.demo.DemoRenderer" bundle="demo" /> + <renderer id="demo" class="com.yahoo.demo.DemoRenderer" bundle="sample-app-http-api-searcher"/> </search> - - <handler id="com.yahoo.demo.DemoHandler" bundle="demo"> + <handler id="com.yahoo.demo.DemoHandler" bundle="sample-app-http-api-searcher"> <binding>http://*:8080/demo</binding> </handler> - - <component id="com.yahoo.demo.DemoComponent" bundle="demo"/> - + <component id="com.yahoo.demo.DemoComponent" bundle="sample-app-http-api-searcher"/> <nodes> <node hostalias="node1"/> </nodes> @@ -40,16 +32,9 @@ <documents> <document mode="index" type="basic"/> </documents> - - <group name="mygroup" distribution-key="0"> + <nodes> <node distribution-key="0" hostalias="node1"/> - </group> - - <engine> - <proton> - <searchable-copies>1</searchable-copies> - </proton> - </engine> + </nodes> </content> </services> |