Changed default SolrMarc config to use HTTP instead of direct write.

Also adjusted continuous integration setup accordingly.

build.xml

@@ -138,6 +138,14 @@
       </else>
     </if>
 
+    <!-- start Solr (use restart in case of old PID files) -->
+    <exec command="VUFIND_HOME=${srcdir} VUFIND_LOCAL_DIR=${srcdir}/local JETTY_PID=${tmp}/vufindtest.pid JETTY_CONSOLE=/dev/null ${srcdir}/vufind.sh restart" outputProperty="LASTOUTPUT" />
+    <echo message="${LASTOUTPUT}" />
+
+    <!-- wait for Solor to finish spinning up -->
+    <echo message="Waiting for Solr to start up..." />
+    <exec command="sleep 30" />
+
     <!-- import marc test records into vufind index (note: the marc test records have prefix "testsample#") -->
     <exec command="find ${srcdir}/tests/data -name *.mrc -printf %p," outputProperty="buglist" />
     <foreach list="${buglist}" param="filename" delimiter="," target="importrec" />
@@ -147,10 +155,6 @@
     <!-- build alphabrowse index -->
     <exec command="VUFIND_HOME=${srcdir} VUFIND_LOCAL_DIR=${srcdir}/local ${srcdir}/index-alphabetic-browse.sh" outputProperty="LASTOUTPUT" />
     <echo message="${LASTOUTPUT}" />
-
-    <!-- start Solr (use restart in case of old PID files) -->
-    <exec command="VUFIND_HOME=${srcdir} VUFIND_LOCAL_DIR=${srcdir}/local JETTY_PID=${tmp}/vufindtest.pid JETTY_CONSOLE=/dev/null ${srcdir}/vufind.sh restart" outputProperty="LASTOUTPUT" />
-    <echo message="${LASTOUTPUT}" />
   </target>
 
   <!-- Uninstall and Deactivate VuFind -->

import/import.properties

@@ -6,7 +6,7 @@
 # this is not provided, SolrMarc can only work by communicating with a running Solr server.
 # IMPORTANT NOTE FOR WINDOWS USERS:
 #      Use forward slashes, not back slashes (i.e.  c:/vufind/..., not c:\vufind\...)
-solrmarc.solr.war.path=/usr/local/vufind/solr/jetty/webapps/solr.war
+# solrmarc.solr.war.path=/usr/local/vufind/solr/jetty/webapps/solr.war
 
 # solrmarc.custom.jar.path - Jar containing custom java code to use in indexing. 
 # If solr.indexer below is defined (other than the default of org.solrmarc.index.SolrIndexer)
@@ -14,7 +14,7 @@ solrmarc.solr.war.path=/usr/local/vufind/solr/jetty/webapps/solr.war
 solrmarc.custom.jar.path=VuFindIndexer.jar|lib
 
 # Path to your solr instance
-solr.path = /usr/local/vufind/solr
+solr.path = REMOTE
 solr.core.name = biblio
 solr.indexer = org.solrmarc.index.VuFindIndexer
 solr.indexer.properties = marc.properties, marc_local.properties

import/import_auth.properties

@@ -6,7 +6,7 @@
 # this is not provided, SolrMarc can only work by communicating with a running Solr server.
 # IMPORTANT NOTE FOR WINDOWS USERS:
 #      Use forward slashes, not back slashes (i.e.  c:/vufind/..., not c:\vufind\...)
-solrmarc.solr.war.path=/usr/local/vufind/solr/jetty/webapps/solr.war
+# solrmarc.solr.war.path=/usr/local/vufind/solr/jetty/webapps/solr.war
 
 # solrmarc.custom.jar.path - Jar containing custom java code to use in indexing. 
 # If solr.indexer below is defined (other than the default of org.solrmarc.index.SolrIndexer)
@@ -14,7 +14,7 @@ solrmarc.solr.war.path=/usr/local/vufind/solr/jetty/webapps/solr.war
 solrmarc.custom.jar.path=VuFindIndexer.jar|lib
 
 # Path to your solr instance
-solr.path = /usr/local/vufind/solr
+solr.path = REMOTE
 solr.core.name = authority
 solr.indexer = org.solrmarc.index.VuFindIndexer
 solr.indexer.properties = marc_auth.properties
@@ -31,3 +31,17 @@ marc.to_utf_8 = true
 marc.permissive = true
 marc.default_encoding = BESTGUESS
 marc.include_errors = true
+
+# Perform Unicode normalization (ignored unless marc.to_utf_8 is true).
+#
+# Allowed values are:
+#
+#   C  - Normalization Form C (NFC)
+#   D  - Normalization Form D (NFD)
+#   KC - Normalization Form KC (NFKC)
+#   KD - Normalization Form KD (NFKD)
+#
+# For the differences of the normalization forms see the Unicode
+# Standards Annex #15, located at <http://unicode.org/reports/tr15/>.
+#
+# marc.unicode_normalize = C