20 files changed, 30 insertions, 65 deletions
diff --git a/node-admin/README.md b/node-admin/README.md
index 2302d1346e6..c8c423876d2 100644
--- a/node-admin/README.md
+++ b/node-admin/README.md
@@ -45,14 +45,14 @@ To start a local zone, simply run:
 Package and deploy vespa application by running:
 
 ```
+    Path pathToApp = Paths.get("node-admin/src/test/resources/basic-search-for-docker");
     runVespaLocal.deployApplication(pathToApp);
 ```
-where `pathToApp` is for example [vespa/sample-apps/basic-search-for-docker](../sample-apps/basic-search-for-docker).
 If the deployment is successful, the final log entry should be something like 
 ```
 INFO: Endpoint http://cnode-1:4080/ is now ready
 ```
-use this endpoint URL to feed or query your application as described in [basic-search-for-docker/README](../sample-apps/basic-search-for-docker/README.md).
+use this endpoint URL to feed or query your application.
 
 You can delete application with
 
@@ -60,14 +60,37 @@ You can delete application with
     runVespaLocal.deleteApplication();
 ```
 
+### Feed and search
+ 1. **Feed** the data that is to be searched
+ ```sh
 
+ # Feeding two documents
+ curl -X POST --data-binary  @music-data-1.json <endpoint url>/document/v1/music/music/docid/1 | python -m json.tool
+ curl -X POST --data-binary  @music-data-2.json <endpoint url>/document/v1/music/music/docid/2 | python -m json.tool
 
-## Using
+  ```
 
-Trigger the incredibly rich and complex `node-admin` REST API(s)
-```
-curl localhost:4080/rest/info
-```
+ 2. **Visit documents
+
+ Since we do not have many documents we can list them all
+ ```sh
+
+ # All documents
+ curl <endpoint url>/document/v1/music/music/docid | python -m json.tool
+
+ # Document with id 1
+ curl <endpoint url>/document/v1/music/music/docid/1 | python -m json.tool
+
+  ```
+
+ 3. **Search**
+ We can also search for documents:
+    ```sh
+
+    curl '<endpoint url>/search/?query=bad' | python -m json.tool
+
+
+    ```
 
 ## Troubleshooting
 
diff --git a/sample-apps/basic-search-for-docker/music-data-1.json b/node-admin/src/test/resources/basic-search-for-docker/music-data-1.json
index 44ce547370e..44ce547370e 100644
--- a/sample-apps/basic-search-for-docker/music-data-1.json
+++ b/node-admin/src/test/resources/basic-search-for-docker/music-data-1.json
diff --git a/sample-apps/basic-search-for-docker/music-data-2.json b/node-admin/src/test/resources/basic-search-for-docker/music-data-2.json
index c8e2d3c017c..c8e2d3c017c 100644
--- a/sample-apps/basic-search-for-docker/music-data-2.json
+++ b/node-admin/src/test/resources/basic-search-for-docker/music-data-2.json
diff --git a/sample-apps/basic-search-for-docker/pom.xml b/node-admin/src/test/resources/basic-search-for-docker/pom.xml
index 749640b5a34..749640b5a34 100644
--- a/sample-apps/basic-search-for-docker/pom.xml
+++ b/node-admin/src/test/resources/basic-search-for-docker/pom.xml
diff --git a/sample-apps/basic-search-for-docker/src/main/application/deployment.xml b/node-admin/src/test/resources/basic-search-for-docker/src/main/application/deployment.xml
index 0a2397bbca9..0a2397bbca9 100644
--- a/sample-apps/basic-search-for-docker/src/main/application/deployment.xml
+++ b/node-admin/src/test/resources/basic-search-for-docker/src/main/application/deployment.xml
diff --git a/sample-apps/basic-search-for-docker/src/main/application/searchdefinitions/music.sd b/node-admin/src/test/resources/basic-search-for-docker/src/main/application/searchdefinitions/music.sd
index d6bcaac8ae0..d6bcaac8ae0 100644
--- a/sample-apps/basic-search-for-docker/src/main/application/searchdefinitions/music.sd
+++ b/node-admin/src/test/resources/basic-search-for-docker/src/main/application/searchdefinitions/music.sd
diff --git a/sample-apps/basic-search-for-docker/src/main/application/services.xml b/node-admin/src/test/resources/basic-search-for-docker/src/main/application/services.xml
index cea6861ca91..cea6861ca91 100644
--- a/sample-apps/basic-search-for-docker/src/main/application/services.xml
+++ b/node-admin/src/test/resources/basic-search-for-docker/src/main/application/services.xml
diff --git a/sample-apps/basic-search-for-docker/src/main/java/com/yahoo/example/ExampleDocumentProcessor.java b/node-admin/src/test/resources/basic-search-for-docker/src/main/java/com/yahoo/example/ExampleDocumentProcessor.java
index 907ab355288..907ab355288 100644
--- a/sample-apps/basic-search-for-docker/src/main/java/com/yahoo/example/ExampleDocumentProcessor.java
+++ b/node-admin/src/test/resources/basic-search-for-docker/src/main/java/com/yahoo/example/ExampleDocumentProcessor.java
diff --git a/sample-apps/basic-search-for-docker/src/main/java/com/yahoo/example/ExampleSearcher.java b/node-admin/src/test/resources/basic-search-for-docker/src/main/java/com/yahoo/example/ExampleSearcher.java
index cf4c1fc8e34..cf4c1fc8e34 100644
--- a/sample-apps/basic-search-for-docker/src/main/java/com/yahoo/example/ExampleSearcher.java
+++ b/node-admin/src/test/resources/basic-search-for-docker/src/main/java/com/yahoo/example/ExampleSearcher.java
diff --git a/sample-apps/basic-search-for-docker/src/main/resources/configdefinitions/message.def b/node-admin/src/test/resources/basic-search-for-docker/src/main/resources/configdefinitions/message.def
index d2a2bc5407a..d2a2bc5407a 100644
--- a/sample-apps/basic-search-for-docker/src/main/resources/configdefinitions/message.def
+++ b/node-admin/src/test/resources/basic-search-for-docker/src/main/resources/configdefinitions/message.def
diff --git a/sample-apps/basic-search-for-docker/src/test/application/services.xml b/node-admin/src/test/resources/basic-search-for-docker/src/test/application/services.xml
index 388ab448f9c..388ab448f9c 100644
--- a/sample-apps/basic-search-for-docker/src/test/application/services.xml
+++ b/node-admin/src/test/resources/basic-search-for-docker/src/test/application/services.xml
diff --git a/sample-apps/basic-search-for-docker/src/test/java/BasicSearchConditionalStagingTest.java b/node-admin/src/test/resources/basic-search-for-docker/src/test/java/BasicSearchConditionalStagingTest.java
index 4a6c48073c1..4a6c48073c1 100644
--- a/sample-apps/basic-search-for-docker/src/test/java/BasicSearchConditionalStagingTest.java
+++ b/node-admin/src/test/resources/basic-search-for-docker/src/test/java/BasicSearchConditionalStagingTest.java
diff --git a/sample-apps/basic-search-for-docker/src/test/java/BasicSearchStagingTest.java b/node-admin/src/test/resources/basic-search-for-docker/src/test/java/BasicSearchStagingTest.java
index 89bf52a9870..89bf52a9870 100644
--- a/sample-apps/basic-search-for-docker/src/test/java/BasicSearchStagingTest.java
+++ b/node-admin/src/test/resources/basic-search-for-docker/src/test/java/BasicSearchStagingTest.java
diff --git a/sample-apps/basic-search-for-docker/src/test/java/BasicSearchSystemTest.java b/node-admin/src/test/resources/basic-search-for-docker/src/test/java/BasicSearchSystemTest.java
index e9e72ca4d8c..e9e72ca4d8c 100644
--- a/sample-apps/basic-search-for-docker/src/test/java/BasicSearchSystemTest.java
+++ b/node-admin/src/test/resources/basic-search-for-docker/src/test/java/BasicSearchSystemTest.java
diff --git a/sample-apps/basic-search-for-docker/src/test/java/com/yahoo/example/ExampleSearcherTest.java b/node-admin/src/test/resources/basic-search-for-docker/src/test/java/com/yahoo/example/ExampleSearcherTest.java
index 87592f2a2ba..87592f2a2ba 100644
--- a/sample-apps/basic-search-for-docker/src/test/java/com/yahoo/example/ExampleSearcherTest.java
+++ b/node-admin/src/test/resources/basic-search-for-docker/src/test/java/com/yahoo/example/ExampleSearcherTest.java
diff --git a/sample-apps/basic-search-for-docker/src/test/java/com/yahoo/example/ExampleSystemTest.java b/node-admin/src/test/resources/basic-search-for-docker/src/test/java/com/yahoo/example/ExampleSystemTest.java
index 2bed440868e..2bed440868e 100644
--- a/sample-apps/basic-search-for-docker/src/test/java/com/yahoo/example/ExampleSystemTest.java
+++ b/node-admin/src/test/resources/basic-search-for-docker/src/test/java/com/yahoo/example/ExampleSystemTest.java
diff --git a/sample-apps/basic-search-for-docker/src/test/resources/minifeed.json b/node-admin/src/test/resources/basic-search-for-docker/src/test/resources/minifeed.json
index 2fd5d9e2053..2fd5d9e2053 100644
--- a/sample-apps/basic-search-for-docker/src/test/resources/minifeed.json
+++ b/node-admin/src/test/resources/basic-search-for-docker/src/test/resources/minifeed.json
diff --git a/sample-apps/basic-search-for-docker/src/test/resources/sd-change-requiring-restart.patch b/node-admin/src/test/resources/basic-search-for-docker/src/test/resources/sd-change-requiring-restart.patch
index b4e0745fcc2..b4e0745fcc2 100644
--- a/sample-apps/basic-search-for-docker/src/test/resources/sd-change-requiring-restart.patch
+++ b/node-admin/src/test/resources/basic-search-for-docker/src/test/resources/sd-change-requiring-restart.patch
diff --git a/sample-apps/basic-search-for-docker/.gitignore b/sample-apps/basic-search-for-docker/.gitignore
deleted file mode 100644
index 0e32ad1ca7e..00000000000
--- a/sample-apps/basic-search-for-docker/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-target
-.idea
-*iml
diff --git a/sample-apps/basic-search-for-docker/README.md b/sample-apps/basic-search-for-docker/README.md
deleted file mode 100644
index 0b6a00c9743..00000000000
--- a/sample-apps/basic-search-for-docker/README.md
+++ /dev/null
@@ -1,55 +0,0 @@
-Basic Search Application
-==================
-Start by [deploying a sample application](http://vespa.corp.yahoo.com/6/documentation/developing-with-vespa.html).
-
-### Find the endpoint
-
-When you have successfully deployed your own compiled version of the application above, you need to find the name of the "endpoint".
-The endpoint is used for feeding and searching for data.
-**Please allow a few minutes for the endpoint to appear after deployment**
-You can find this endpoint by doing:
- ```sh
-
- mvn vespa:endpoints | grep Endpoints
- ```
-
-You can also find it by looking at the [Hosted Vespa Dashboard](http://dashboard.vespa.corp.yahoo.com).
-
-
-### Feed and search
- 1. **Feed** the data that is to be searched
- ```sh
-
- # Feeding two documents
- curl -X POST --data-binary  @music-data-1.json <endpoint url>/document/v1/music/music/docid/1 | python -m json.tool
- curl -X POST --data-binary  @music-data-2.json <endpoint url>/document/v1/music/music/docid/2 | python -m json.tool
-
-  ```
-
-For feeding many documents fast and reliable, checkout [feeding example](https://git.corp.yahoo.com/vespa-samples/basic-feeding-client)
-
- 2. **Visit documents
-
- Since we do not have many documents we can list them all
- ```sh
-
- # All documents
- curl <endpoint url>/document/v1/music/music/docid | python -m json.tool
-
- # Document with id 1
- curl <endpoint url>/document/v1/music/music/docid/1 | python -m json.tool
-
-  ```
-
- 3. **Search**
- We can also search for documents:
-    ```sh
-
-    curl '<endpoint url>/search/?query=bad' | python -m json.tool
-
-
-    ```
-
-### Next step: from development to production
-See [continuous deployments](http://vespa.corp.yahoo.com/6/documentation/continuous-deployment.html) for how to implement continuous deployments for production.
-See [RESTified Document Operation API](http://vespa.corp.yahoo.com/6/documentation/document_api_v1.html) for documentation about the REST API for document operations.