Changeset 29711 for main

Timestamp:

2015-02-03T21:57:53+13:00 (9 years ago)

Author:

ak19

Message:

Moving from using the solr jetty server to solr using the GS3 tomcat server. Now localhost:8383/solr hosts the solr server RESTful pages. Changes: 1. Minor changes to GS3 build.xml. 2. GLI no longer does the temporary stopping of the GS3 server, launching jetty server for building a solr collection, stopping jetty, restarting GS3 tomcat server. GLI leaves the GS3 server running. 3. The main changes are to ext/solr. The ext/solr/gs3-setup.sh sets the new SOLR_PORT and SOLR_HOST variables read from the GS3 build.properties, as the jetty port and host variables are no longer used. ext/solr/build.xml now puts the solr war file into tomcat's webapps, as well as helper libraries necessary (xalan related); a solr.xml context file is created from a template file and placed into tomcat's conf/Catalina/localhost; additional solr jar files are copied into tomcat/lib, as well as the slf4j bridge being copied into GS3/web/WEB-INF/lib; the solr perl code has been changed to use the new RESTful URLs and particularly to work with solr running off the GS3 tomcat server, or stop and start it as required, rather than working with (or stopping and starting) the solr jetty server. A new run_solr_server.pl executable script runs the tomcat server rather than the jetty server; major changes to the Java Solr code to no longer work with the EmbeddedSolrServer (which caused a conflict when the index is accessed by solr jetty server upon rebuild of solr collections), our solr Java code now uses HttpSolrServer to contact the solr servlet running off tomcat. 5. Still a bug: when search results go over a page after rebuilding a solr collection in GLI against a running GS3 server, the 2nd page of search results aren't present and things break. But if the server is not running, solr collections rebuild fine, so the changes do everything that GS3.06 did and more.

Location:

main/trunk

Files:

• gli/src/org/greenstone/gatherer/Gatherer.java (modified) (1 diff)
• gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (1 diff)
• gli/src/org/greenstone/gatherer/gui/CreatePane.java (modified) (2 diffs)
• greenstone3/build.xml (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -1083 +1083 @@
         // Do not do configGS3Server for a GS3 solr collection. Not at present at least, when we're stopping
         // and starting the GS3 server from GLI for solr cols, since this function clears the solr.xml file.
-        if(Gatherer.c_man.isSolrCollection()) {
+        /*if(Gatherer.c_man.isSolrCollection()) {
         return;
-        }
+        }*/
 
         if (Configuration.library_url == null){

main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -1753 +1753 @@
         // For now, for a GS3 solr collection, we'd have stopped the GS3 server before building
         // and will now need to restart it.
-        GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "restart");
-        thread.start();
+        /*GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "restart");
+          thread.start();*/
         
         // Give the GS3 server time to restart:

main/trunk/gli/src/org/greenstone/gatherer/gui/CreatePane.java

@@ -700 +700 @@
     // and restart it after building is complete. Restart is done in CollectionManager.processComplete()
     if(CollectionManager.isSolrCollection()) {
-        GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "stop");
-        thread.start();
+        /*GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "stop");
+          thread.start();*/
     }
 
@@ -876 +876 @@
     // then we also restart the GS3 server
     if(CollectionManager.isSolrCollection()) {
-        GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "restart");
-        thread.start();
+        /*GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "restart");
+          thread.start();*/
     }
 

main/trunk/greenstone3/build.xml

@@ -2034 +2034 @@
     <if>
       <bool><istrue value="${tomcat.islocal}"/></bool>
-      <copy file="${web.lib}/xercesImpl.jar" todir="${web.applet}"/>
-      <copy file="${web.lib}/xml-apis.jar" todir="${web.applet}"/>
+      <if><bool><available file="${catalina.home}/lib/xercesImpl.jar"/></bool><!-- moved for solr -->
+    <copy file="${catalina.home}/lib/xercesImpl.jar" todir="${web.applet}"/>
+    <copy file="${catalina.home}/lib/xml-apis.jar" todir="${web.applet}"/>
+    
+    <else><!-- get from default GS3 web lib location-->
+      <copy file="${web.lib}/xercesImpl.jar" todir="${web.applet}"/>
+      <copy file="${web.lib}/xml-apis.jar" todir="${web.applet}"/>
+    </else>
+      </if>
     </if>