Use Solr packages for o19s payload-component

Also needs an updated wait-for-solr check to verify the packages have been installed before trying to create the collection.

docker-compose.yml

@@ -26,7 +26,7 @@ services:
       - ./volumes/solr_backup:/solr_backup
     links:
       - zookeeper
-    command: "bash -c '/opt/solr/bin/solr start -f -z zookeeper:2181 -Dbootstrap_confdir=/solr-config/index/conf'"
+    command: "bash -c './post-hooks.sh & /opt/solr/bin/solr start -f -z zookeeper:2181 -Denable.packages=true -Dbootstrap_confdir=/solr-config/index/conf'"
 
   solr-proxy:
     build: ./solr-proxy

ocr/init/init.sh

@@ -6,8 +6,9 @@
 #	sleep 5
 #done
 #echo "Sleeping 15"
-#sleep 15
+sleep 15
 ./wait-for-solr.sh --max-attempts 10 --wait-seconds 4 --solr-url http://solr:8983
+sleep 30
 
 echo "Uploading security.json to ZK"
 

solr/Dockerfile

@@ -12,8 +12,9 @@ RUN mkdir -p /home/solr/ # Cache dir for fonts from Tika.
 RUN chown -R 8983:8983 /home/solr
 
 # Add Solr customizations
-ADD lib/*.jar /opt/solr/server/solr-webapp/webapp/WEB-INF/lib/
 ADD web.xml /opt/solr/server/solr-webapp/webapp/WEB-INF
+ADD post-hooks.sh /opt/solr
+RUN chmod +x /opt/solr/post-hooks.sh
 
 COPY solr-home /solr-config
 ADD set_heap.sh /docker-entrypoint-initdb.db

solr/post-hooks.sh

@@ -0,0 +1,6 @@
+wait-for-solr.sh --max-attempts 25 --wait-seconds 4 --solr-url http://solr:8983
+
+bin/solr package add-repo osc https://raw.githubusercontent.com/o19s/payload-component/master/repo
+bin/solr package install solr-payloads:1.1.4
+
+

solr/solr-home/index/conf/schema.xml

@@ -67,13 +67,13 @@
     <fieldType name="ocr" stored="false" indexed="true" class="solr.TextField">
       <analyzer>
         <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="com.o19s.payloads.Base64Encoder" />
+        <filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="solr-payloads:com.o19s.payloads.Base64Encoder" />
         <!-- The payload buffer works around WDF removing payloads from tokens by copying and replacing later in the chain -->
-        <filter class="com.o19s.payloads.filter.PayloadBufferFilterFactory" />
+        <filter class="solr-payloads:com.o19s.payloads.filter.PayloadBufferFilterFactory" />
         <filter class="solr.LowerCaseFilterFactory" />
         <filter class="solr.WordDelimiterFilterFactory" />
         <filter class="solr.KStemFilterFactory" />
-        <filter class="com.o19s.payloads.filter.PayloadBufferFilterFactory" />
+        <filter class="solr-payloads:com.o19s.payloads.filter.PayloadBufferFilterFactory" />
       </analyzer>
     </fieldType>
 

solr/solr-home/index/conf/solrconfig.xml

@@ -134,7 +134,7 @@
   </admin>
 
 
-  <searchComponent class="com.o19s.payloads.component.PayloadComponent" name="payload" />
+  <searchComponent class="solr-payloads:com.o19s.payloads.component.PayloadComponent" name="payload" />
     <!-- Highlighting Component
 
        http://wiki.apache.org/solr/HighlightingParameters
@@ -169,7 +169,7 @@
       <!-- Configure the standard formatter -->
       <formatter name="html"
                  default="true"
-                 class="com.o19s.labs.OffsetFormatter">
+                 class="solr-payloads:com.o19s.hl.OffsetFormatter">
       </formatter>
 
       <!-- Configure the standard encoder -->