From 85e78ef2e6e297fc2871bec95ff822ddff552ae3 Mon Sep 17 00:00:00 2001
From: Gethin James <gethin.james@alfresco.com>
Date: Fri, 11 Nov 2016 12:35:28 +0100
Subject: [PATCH] SEARCH-223: Adding a test for Alfresco config changes

---
 packaging/buildAndTest.sh   | 2 ++
 packaging/config.properties | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packaging/buildAndTest.sh b/packaging/buildAndTest.sh
index 3f022349b..d414adfcd 100755
--- a/packaging/buildAndTest.sh
+++ b/packaging/buildAndTest.sh
@@ -20,6 +20,8 @@ docker run --rm "$dockerImage" [ -d /opt/alfresco-solr/solr ] || (echo "solr dir
 docker run --rm "$dockerImage" [ -d /opt/alfresco-solr/data/content ] || (echo "content dir does not exist" && exit 1)
 docker run --rm "$dockerImage" [ -d /opt/alfresco-solr/data/alfrescoModels ] || (echo "alfrescoModels dir does not exist" && exit 1)
 docker run --rm "$dockerImage" [ -e /opt/alfresco-solr/solr.in.sh ] || (echo "solr.in.sh does not exist" && exit 1)
+docker run --rm "$dockerImage" grep -q alfresco /opt/alfresco-solr/solr.in.sh || (echo "solr.in.sh does not contain alfresco config" && exit 1)
+docker run --rm "$dockerImage" grep -q alfresco /opt/alfresco-solr/solr.in.cmd || (echo "solr.in.cmd does not contain alfresco config" && exit 1)
 docker run --rm "$dockerImage" [ -e /opt/alfresco-solr/solrhome/conf/shared.properties ] || (echo "shared.properties does not exist" && exit 1)
 docker run --rm "$dockerImage" /opt/alfresco-solr/solr/bin/solr start
 
diff --git a/packaging/config.properties b/packaging/config.properties
index 08aa75566..6f7bda7d8 100644
--- a/packaging/config.properties
+++ b/packaging/config.properties
@@ -1,9 +1,9 @@
 alfresco.search.ssl=<Set name="KeyStoreType"><Property name="solr.jetty.keystore.type" default="JCEKS"/></Set>\
 ${line.separator}  <Set name="TrustStoreType"><Property name="solr.jetty.truststore.type" default="JCEKS"/></Set>
-alfresco.search.config=# Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\
-${line.separator}SOLR_OPTS="$SOLR_OPTS -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000"
-alfresco.search.config.win=REM Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\
-${line.separator}set SOLR_OPTS=%SOLR_OPTS% -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000
 alfresco.search.ssl.token=  <Set name="excludeProtocols">
 alfresco.search.ssl.need.token=needClientAuth" default="false"
 alfresco.search.ssl.need=needclientauth" default="true"
+alfresco.search.config=# Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\
+${line.separator}SOLR_OPTS="$SOLR_OPTS -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000"
+alfresco.search.config.win=REM Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\
+${line.separator}set SOLR_OPTS=%SOLR_OPTS% -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000
\ No newline at end of file