From eb5428fa664a1cd6d97de2e7f6be67cf7cf61b47 Mon Sep 17 00:00:00 2001
From: Gethin James <gethin.james@alfresco.com>
Date: Fri, 10 Jun 2016 15:48:27 +0200
Subject: [PATCH] SEARCH-56: Changed to use "proxy" rather than "solr" host

---
 .../test-files/collection1/conf/solrcore.properties   | 11 +++++++----
 .../test/resources/test-files/conf/shared.properties  |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/search-services/alfresco-solr/src/test/resources/test-files/collection1/conf/solrcore.properties b/search-services/alfresco-solr/src/test/resources/test-files/collection1/conf/solrcore.properties
index 093eab396..c45b0965d 100644
--- a/search-services/alfresco-solr/src/test/resources/test-files/collection1/conf/solrcore.properties
+++ b/search-services/alfresco-solr/src/test/resources/test-files/collection1/conf/solrcore.properties
@@ -1,10 +1,7 @@
 #
 # solrcore.properties - used in solrconfig.xml
 #
-# data is in ${data.dir.root}/${data.dir.store}
 
-data.dir.root=@@ALFRESCO_SOLR4_DATA_DIR@@
-data.dir.store=archive/SpacesStore
 enable.alfresco.tracking=true
 
 #
@@ -12,6 +9,12 @@ enable.alfresco.tracking=true
 #
 alfresco.version=5.1
 
+#
+#These are replaced by the admin handler
+#
+#data.dir.root=DATA_DIR
+#data.dir.store=workspace/SpacesStore
+#alfresco.stores=workspace://SpacesStore
 
 #
 # Properties loaded during alfresco tracking
@@ -22,7 +25,7 @@ alfresco.port=8080
 alfresco.port.ssl=8443
 alfresco.baseUrl=/alfresco
 alfresco.cron=0/15 * * * * ? *
-alfresco.stores=archive://SpacesStore
+
 #alfresco.index.transformContent=false
 #alfresco.ignore.datatype.1=d:content
 alfresco.lag=1000
diff --git a/search-services/alfresco-solr/src/test/resources/test-files/conf/shared.properties b/search-services/alfresco-solr/src/test/resources/test-files/conf/shared.properties
index 44539d0d6..e037cdca4 100644
--- a/search-services/alfresco-solr/src/test/resources/test-files/conf/shared.properties
+++ b/search-services/alfresco-solr/src/test/resources/test-files/conf/shared.properties
@@ -1,9 +1,9 @@
 # Shared Properties file
 
 #Host details an external client would use to connect to Solr
-solr.host=localhost
-solr.port=8983
-solr.baseurl=/solr
+proxy.host=localhost
+proxy.port=8983
+proxy.baseurl=/solr
 
 # Properties treated as identifiers when indexed