From 6fee1a736e3133df05b8bcad6036b0eb7fd70973 Mon Sep 17 00:00:00 2001
From: Tyler Ward <twardnw@gmail.com>
Date: Tue, 1 Jan 2019 11:10:12 -0800
Subject: [PATCH] #808 - hard code paths to libraries

---
 images/solr-drupal/solr5.5/conf/solrconfig.xml | 16 ++++++++--------
 images/solr-drupal/solr6.6/conf/solrconfig.xml | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/images/solr-drupal/solr5.5/conf/solrconfig.xml b/images/solr-drupal/solr5.5/conf/solrconfig.xml
index 07bf3a313b..6e19abb8cf 100644
--- a/images/solr-drupal/solr5.5/conf/solrconfig.xml
+++ b/images/solr-drupal/solr5.5/conf/solrconfig.xml
@@ -84,17 +84,17 @@
        The examples below can be used to load some solr-contribs along
        with their external dependencies.
     -->
-  <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
+  <lib dir="/opt/solr/contrib/extraction/lib" regex=".*\.jar" />
+  <lib dir="/opt/solr/dist/" regex="solr-cell-\d.*\.jar" />
 
-  <lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-clustering-\d.*\.jar" />
+  <lib dir="/opt/solr/contrib/clustering/lib/" regex=".*\.jar" />
+  <lib dir="/opt/solr/dist/" regex="solr-clustering-\d.*\.jar" />
 
-  <lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-langid-\d.*\.jar" />
+  <lib dir="/opt/solr/contrib/langid/lib/" regex=".*\.jar" />
+  <lib dir="/opt/solr/dist/" regex="solr-langid-\d.*\.jar" />
 
-  <lib dir="${solr.install.dir:../../../..}/contrib/velocity/lib" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-velocity-\d.*\.jar" />
+  <lib dir="/opt/solr/contrib/velocity/lib" regex=".*\.jar" />
+  <lib dir="/opt/solr/dist/" regex="solr-velocity-\d.*\.jar" />
 
   <!-- an exact path can be used to specify a specific file.  This
        will cause a serious error to be logged if it can't be loaded.
diff --git a/images/solr-drupal/solr6.6/conf/solrconfig.xml b/images/solr-drupal/solr6.6/conf/solrconfig.xml
index ed3a0c4eaa..3467e1cb61 100644
--- a/images/solr-drupal/solr6.6/conf/solrconfig.xml
+++ b/images/solr-drupal/solr6.6/conf/solrconfig.xml
@@ -87,16 +87,16 @@
        The examples below can be used to load some solr-contribs along
        with their external dependencies.
     -->
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-dataimporthandler-.*\.jar" />
+  <lib dir="/opt/solr/dist/" regex="solr-dataimporthandler-.*\.jar" />
 
-  <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
+  <lib dir="/opt/solr/contrib/extraction/lib" regex=".*\.jar" />
+  <lib dir="/opt/solr/dist/" regex="solr-cell-\d.*\.jar" />
 
-  <lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-langid-\d.*\.jar" />
+  <lib dir="/opt/solr/contrib/langid/lib/" regex=".*\.jar" />
+  <lib dir="/opt/solr/dist/" regex="solr-langid-\d.*\.jar" />
 
-  <lib dir="${solr.install.dir:../../../..}/contrib/velocity/lib" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-velocity-\d.*\.jar" />
+  <lib dir="/opt/solr/contrib/velocity/lib" regex=".*\.jar" />
+  <lib dir="/opt/solr/dist/" regex="solr-velocity-\d.*\.jar" />
 
   <!-- an exact 'path' can be used instead of a 'dir' to specify a
        specific jar file.  This will cause a serious error to be logged