Changeset 29986 for gs3-extensions/solr/trunk/src/build.xml

Timestamp:

2015-06-19T23:21:26+12:00 (9 years ago)

Author:

ak19

Message:

The getTerms() functionality previously used by the EmbeddedSolrServer has now been re-implemented for HttpSolrServer with the new custom Greenstone Solr RequestHandler class Greenstone3SearchHandler, which lives on the solr server side, in tomcat's solr webapp. The functionality has been improvemed, such as being able to search for: econom* cat, by recursively calling setRewriteMethods on any PrefixQuery and WildcardQuery MultiQueries within an overall BooleanQuery, and by handling BooleanQuery.TooManyClauses exceptions when the number of expanded terms is too large, such as for a search of a*.

File:

• gs3-extensions/solr/trunk/src/build.xml (modified) (4 diffs)

gs3-extensions/solr/trunk/src/build.xml

@@ -130 +130 @@
     </jar>
     <copy file="${build.home}/gs3-solr.jar" todir="${web.libdir}"/>
+
+    <!-- customisations to the http solr server -->
+    <jar destfile="${build.home}/gs3-solrserver.jar">
+      <fileset dir="${build.home}">
+        <include name="org/greenstone/solrserver/**"/>
+      </fileset>
+      <manifest>
+        <attribute name="Built-By" value="greenstone3" />
+      </manifest>
+    </jar>
+    <!--<copy file="${build.home}/gs3-solrserver.jar" todir="${tomcat.dir}/webapps/solr/WEB-INF/lib"/>
+
+          But there's no guarantee the destination will exist at the beginning.
+          The jar file also needs to go into solr.war. Which is taken care of in the add-service task.
+          Instead, for testing, call ant compile-gs3-solrserver, which will copy it across to solr webapp. 
+      -->
   </target>
   
@@ -188 +204 @@
     <copy todir="${tomcat.dir}/webapps" file="webapps/solr.war" />
     <unwar src="${tomcat.dir}/webapps/solr.war" dest="${tomcat.dir}/webapps/solr"/>
-    <echo>Copying xalan related jar files from  ${web.libdir} into ${tomcat.dir}/webapps/solr.war</echo>
+    <echo>Copying xalan related jar files, morphology and gs3-solrserver jars from ${web.libdir} into ${tomcat.dir}/webapps/solr.war</echo>
     <copy todir="${tomcat.dir}/webapps/solr/WEB-INF/lib">
       <filelist dir="${web.libdir}" files="${shared-xalan-jars}" />
+      <file file="${build.home}/gs3-solrserver.jar" />
       <filelist dir="lib/russianmorphology" files="${russian-morph-jars}" />
     </copy>
@@ -224 +241 @@
 
 
-  <target name="add-service" depends="copy-solr-web,copy-files,solr-for-tomcat,compile" description="Run this target to setup the Solr extension for Greenstone3" />
+  <target name="add-service" depends="copy-solr-web,copy-files,compile,solr-for-tomcat" description="Run this target to setup the Solr extension for Greenstone3" />
   
   <target name="del-service" depends="del-files,del-solr-for-tomcat"
@@ -284 +301 @@
   </target>
   
+  <target name="compile-gs3-solrserver" description="TEST Target to compile the solr server side gs3-solserver.jar for testing">
+    <delete dir="build/org/greenstone/solrserver" />
+    <delete file="build/gs3-solrserver.jar" />
+    <antcall target="compile" />
+    <copy file="${build.home}/gs3-solrserver.jar" todir="${tomcat.dir}/webapps/solr/WEB-INF/lib" />
+  </target>
+
 </project>