Changeset 29711
- Timestamp:
- 2015-02-03T21:57:53+13:00 (9 years ago)
- Files:
-
- 3 added
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
gs3-extensions/solr/trunk/src/build.xml
r29707 r29711 9 9 10 10 <!-- greenstone3 paths --> 11 <property name="web.home" value="${basedir}/../../web"/> 11 <!-- http://stackoverflow.com/questions/3136849/how-do-i-convert-a-relative-path-in-ant-to-an-absolute-path 12 http://stackoverflow.com/questions/8295860/pathconvert-with-relative-file-names --> 13 <property name="web.home" location="${basedir}/../../web"/> <!-- location property creates an absolute path --> 12 14 <property name="localsite.collectdir" value="${web.home}/sites/localsite/collect"/> 13 15 <property name="web.classesdir" value="${web.home}/WEB-INF/classes"/> 14 16 <property name="web.libdir" value="${web.home}/WEB-INF/lib"/> 15 17 <property name="web.extdir" value="${web.home}/ext/solr"/> 18 19 <property name="tomcat.dir" location="${basedir}/../../packages/tomcat"/> <!-- location property creates an absolute path --> 20 <property name="tomcat.lib.dir" value="${tomcat.dir}/lib"/> 21 <property name="tomcat.context.dir" value="${tomcat.dir}/conf/Catalina/localhost"/> 16 22 17 23 <path id="compile.classpath"> … … 25 31 <include name="*.jar"/> 26 32 </fileset> 33 <pathelement location="lib/servlet-api-3.0.jar"/> 27 34 </path> 35 28 36 29 37 <!-- FILE LISTINGS.--> … … 149 157 <echo>Unzipping pre-built index</echo> 150 158 <unzip dest="${localsite.collectdir}/solr-jdbm-demo" src="${localsite.collectdir}/solr-jdbm-demo/index.zip" /> 151 152 153 </target> 154 159 </target> 160 161 <!-- Setting up solr to work with tomcat server instead of jetty server --> 162 <target name="solr-for-tomcat" description="Helper-target: setting up solr to work tomcat"> 163 164 <echo>Copying solr jars needed for running solr with tomcat: ${basedir}/lib/ext</echo> 165 <copy todir="${tomcat.lib.dir}"> 166 <fileset dir="lib/ext"> 167 <include name="*.jar"/> 168 </fileset> 169 </copy> 170 171 <!-- slf4j and commons logging bridge needed to avoid exception about incompatibility in tomcat log files--> 172 <echo>Copying ${basedir}/lib/ext/jcl-over-slf4j-1.6.6.jar again to ${web.libdir}</echo> 173 <copy todir="${web.libdir}"> 174 <filelist id="logging-bridge" dir="lib/ext" files="jcl-over-slf4j-1.6.6.jar"/> 175 </copy> 176 177 <echo>Moving xalan related jar files from ${web.libdir} to ${tomcat.lib.dir}, to share with solr</echo> 178 <move todir="${tomcat.lib.dir}"> 179 <filelist dir="${web.libdir}"> 180 <file name="xalan.jar"/> 181 <file name="xercesImpl.jar"/> 182 <file name="xml-apis.jar"/> 183 <file name="xsltc.jar"/> 184 <file name="serializer.jar"/> 185 </filelist> 186 </move> 187 188 <echo>Copying ${basedir}/webapps/solr.war to ${tomcat.dir}/webapps</echo> 189 <copy todir="${tomcat.dir}/webapps" file="webapps/solr.war" /> 190 <echo>Generating solr context file in ${tomcat.context.dir}</echo> 191 192 <!-- we want unix paths (forward slashes) in the tomcat context file --> 193 <pathconvert targetos="unix" property="gsdl3.web.home"> 194 <path path="${web.home}"/><!-- creates an absolute path--> 195 </pathconvert> 196 <pathconvert targetos="unix" property="tomcat.home"> 197 <path path="${tomcat.dir}"/><!-- creates an absolute path--> 198 </pathconvert> 199 <filter token="gsdl3home" value="${gsdl3.web.home}"/> 200 <filter token="tomcathome" value="${tomcat.home}"/> 201 <copy file="solr-tomcat-context.xml.in" tofile="${tomcat.context.dir}/solr.xml" filtering="true" overwrite="true"/> 202 203 </target> 155 204 156 205 <!-- copy the content of the web folder (avoiding the top-level .svn directory) --> … … 165 214 </target> 166 215 167 <target name="add-service" depends="copy-solr-web,copy-files,compile" description="Run this target to setup the Solr extension for Greenstone3" /> 168 169 170 <target name="del-service" 171 description="Run this target to unset the Solr extension for Greenstone3"> 172 216 217 <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" /> 218 219 <target name="del-service" depends="del-files,del-solr-for-tomcat" 220 description="Run this target to unset the Solr extension for Greenstone3" /> 221 222 223 <target name="del-files" description="Helper-target to delete files for del-service target"> 173 224 <!-- failonerror is set to false in case some files don't exist 174 225 and can't be deleted therefore --> 175 176 177 178 <echo/> 179 <echo>Removing from gsdl3 properties area: properties/${property-files}</echo> 226 227 <echo/> 228 <echo>Removing from gsdl3 properties area: properties/${property-files}</echo> 180 229 <delete failonerror="false"> 181 230 <filelist dir="${web.classesdir}" files="${property-files}"/> … … 194 243 <echo/> 195 244 <echo>Removing solr-jdbm-demo collection from: ${localsite.collectdir}</echo> 196 <delete failonerror="false" includeEmptyDirs="true" dir="${localsite.collectcdir}/solr-jdbm-demo"/> 197 245 <delete failonerror="false" includeEmptyDirs="true" dir="${localsite.collectcdir}/solr-jdbm-demo"/> 246 247 </target> 248 249 <target name="del-solr-for-tomcat" description="Helper-target to remove files for getting solr to work with tomcat"> 250 251 <echo/> 252 <echo>Removing solr modifications to tomcat: context file, solr.war and deployed version, jar files</echo> 253 254 <!-- Actually need to ensure tomcat is not running at this point 255 But if solr.war is deleted first, it can't be re-deployed when deleting the solr folder subsequently 256 --> 257 <delete failonerror="false" file="${tomcat.dir}/webapps/solr.war"/> 258 <delete failonerror="false" includeEmptyDirs="true" dir="${tomcat.dir}/webapps/solr"/> 259 260 <delete failonerror="false" file="${tomcat.context.dir}/solr.xml"/> 261 262 <!-- delete all the jar files in tomcat/lib that were copied from ext/solr/lib/ext 263 which are all the jar files that are present in both tomcat/lib and ext/solr/lib/ext 264 https://ant.apache.org/manual/Types/selectors.html#presentselect --> 265 <delete failonerror="false"> 266 <fileset dir="${tomcat.lib.dir}" includes="**/*.jar"> 267 <present present="both" targetdir="lib/ext"/> 268 </fileset> 269 </delete> 270 271 <!-- remove logging bridge jar file that was added into greenstone 3 web lib area --> 272 <delete failonerror="false" file="${web.libdir}/jcl-over-slf4j-1.6.6.jar"/> 273 274 <!-- moving shared xalan related jar files back from tomcat lib to GS3 web lib --> 275 <move todir="${web.libdir}"> 276 <filelist dir="${tomcat.lib.dir}"> 277 <file name="xalan.jar"/> 278 <file name="xercesImpl.jar"/> 279 <file name="xml-apis.jar"/> 280 <file name="xsltc.jar"/> 281 <file name="serializer.jar"/> 282 </filelist> 283 </move> 284 285 <!--http://stackoverflow.com/questions/2140637/how-do-i-build-a-list-of-file-names--> 198 286 </target> 199 287 -
gs3-extensions/solr/trunk/src/gs3-setup.sh
r24485 r29711 11 11 #-- 12 12 13 # If using tomcat, read the tomcat host and port from the toplevel GS3 build.properties 14 # http://en.kioskea.net/faq/1757-how-to-read-a-file-line-by-line 15 # The following sets the field separator IFS to the = sign, then reads the file line by 16 # line, setting propname and propval (which are fields separated by '=') for each line read 17 SOLR_PORT=8983 18 SOLR_HOST=localhost 19 file=$GSDL3SRCHOME/build.properties 20 while IFS== read propname propval; do 21 if [ "x$propname" = "xtomcat.server" ] ; then 22 SOLR_HOST=$propval 23 fi 24 if [ "x$propname" = "xtomcat.port" ] ; then 25 SOLR_PORT=$propval 26 fi 27 done < $file 28 29 echo "Tomcat port: $SOLR_PORT" 30 echo "Tomcat host: $SOLR_HOST" 31 32 # If using jetty: 13 33 # The port Jetty runs on: 14 34 SOLR_JETTY_PORT=8983 … … 61 81 export SOLR_JETTY_PORT 62 82 export JETTY_STOP_PORT 83 export SOLR_PORT 84 export SOLR_HOST 63 85 first_time=1 64 86 -
gs3-extensions/solr/trunk/src/perllib/solrbuilder.pm
r29338 r29711 676 676 677 677 678 # Also need to stop the Solr /jetty serverif it was explicitly started678 # Also need to stop the Solr server (be it tomcat or jetty) if it was explicitly started 679 679 # in pre_build_indexes() 680 680 -
gs3-extensions/solr/trunk/src/perllib/solrutil.pm
r25846 r29711 72 72 my $full_post_jar = solrutil::locate_file($search_path,$post_jar); 73 73 74 my $jetty_port = $ENV{'SOLR_JETTY_PORT'}; 74 my $server_port = $ENV{'SOLR_PORT'}; # tomcat 75 my $server_host = $ENV{'SOLR_HOST'}; 75 76 76 77 # Now run solr-post command 77 my $post_props = "-Durl=http:// localhost:$jetty_port/solr/$core/update";78 my $post_props = "-Durl=http://$server_host:$server_port/solr/$core/update"; 78 79 $post_props .= " -Ddata=stdin"; 79 80 $post_props .= " -Dcommit=yes"; -
gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java
r29710 r29711 20 20 21 21 // Greenstone classes 22 import java.io.File;23 22 import java.util.ArrayList; 24 import java.util.Collection;25 23 import java.util.HashMap; 26 24 import java.util.Iterator; 27 25 import java.util.List; 28 26 import java.util.Map; 27 import java.util.Properties; 29 28 import java.util.Set; 30 29 import java.util.Vector; 31 30 32 31 import org.apache.log4j.Logger; 33 import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer; 32 import org.apache.solr.client.solrj.SolrServer; 33 import org.apache.solr.client.solrj.impl.HttpSolrServer; 34 34 import org.apache.solr.client.solrj.response.FacetField; 35 import org.apache.solr.core.CoreContainer;36 import org.apache.solr.core.SolrCore;37 35 import org.greenstone.LuceneWrapper4.SharedSoleneQueryResult; 38 36 import org.greenstone.gsdl3.util.FacetWrapper; … … 50 48 { 51 49 50 public static final String SOLR_SERVLET_SUFFIX = "/solr"; 52 51 protected static final String SORT_ORDER_PARAM = "sortOrder"; 53 52 protected static final String SORT_ORDER_DESCENDING = "1"; … … 56 55 static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.GS2SolrSearch.class.getName()); 57 56 58 static protected CoreContainer all_solr_cores = null; 59 60 protected HashMap solr_core_cache; 57 protected String solr_servlet_base_url; 58 protected HashMap<String, SolrServer> solr_core_cache; 61 59 protected SolrQueryWrapper solr_src = null; 62 60 … … 72 70 // based on 'level' parameter passed in to 'setUpQueryer()' 73 71 74 solr_core_cache = new HashMap(); 75 76 if (all_solr_cores == null) 77 { 78 // Share one CoreContainer across all sites/collections 79 try 80 { 81 String gsdl3_writablehome = GlobalProperties.getGSDL3WritableHome(); 82 String solr_ext_name = GlobalProperties.getProperty("gsdlext.solr.dirname", "solr"); 83 84 String solr_home_str = GSFile.extHome(gsdl3_writablehome, solr_ext_name); 85 86 all_solr_cores = new CoreContainer(solr_home_str); 87 } 88 catch (Exception e) 89 { 90 e.printStackTrace(); 91 } 92 } 93 94 this.solr_src = new SolrQueryWrapper(); 72 solr_core_cache = new HashMap<String, SolrServer>(); 73 74 this.solr_src = new SolrQueryWrapper(); 75 76 // Create the solr servlet url on GS3's tomcat. By default it's "http://localhost:8383/solr" 77 // Don't do this in configure(), since the tomcat url will remain unchanged while tomcat is running 78 try { 79 Properties globalProperties = new Properties(); 80 globalProperties.load(Class.forName("org.greenstone.util.GlobalProperties").getClassLoader().getResourceAsStream("global.properties")); 81 String host = globalProperties.getProperty("tomcat.server", "localhost"); 82 String port = globalProperties.getProperty("tomcat.port", "8383"); 83 String protocol = globalProperties.getProperty("tomcat.protocol", "http"); 84 85 String portStr = port.equals("80") ? "" : ":"+port; 86 solr_servlet_base_url = protocol+"://"+host+portStr+SOLR_SERVLET_SUFFIX; 87 } catch(Exception e) { 88 logger.error("Error reading greenstone's tomcat solr server properties from global.properties", e); 89 } 95 90 } 96 91 … … 100 95 boolean success = super.configure(info, extra_info); 101 96 102 // 1. Make the CoreContainer reload solr.xml 103 // This is particularly needed for when activate.pl is executed during 104 // a running GS3 server. At that point, the solr collection is reactivated and 105 // we need to tell Greenstone that the solr index has changed. This requires 106 // the CoreContainer to reload the solr.xml file, and it all works again. 107 108 solr_core_cache.clear(); // clear the map of solr cores for this collection added to the map upon querying 109 110 // Reload the updated solr.xml into the CoreContainer 111 // (Doing an all_solr_cores.shutdown() first doesn't seem to be required) 112 try { 113 String solr_home_str = all_solr_cores.getSolrHome(); 114 File solr_home = new File(solr_home_str); 115 File solr_xml = new File( solr_home,"solr.xml" ); 116 117 //all_solr_cores.load(solr_home_str,solr_xml); 118 all_solr_cores.load(); 119 120 } catch (Exception e) { 121 logger.error("Exception in GS2SolrSearch.configure(): " + e.getMessage()); 122 e.printStackTrace(); 123 return false; 124 } 125 97 // clear the map of solr cores for this collection added to the map upon querying 98 solr_core_cache.clear(); 99 126 100 if(!success) { 127 101 return false; 128 102 } 129 103 130 // 2.Setting up facets104 // Setting up facets 131 105 // TODO - get these from build config, in case some haven't built 132 106 Element searchElem = (Element) GSXML.getChildByTagName(extra_info, GSXML.SEARCH_ELEM); … … 170 144 this.solr_src.cleanUp(); 171 145 172 173 // 1. clear the map keeping track of the solrcores' EmbeddedSolrServers in this collection 146 // clear the map keeping track of the SolrServers in this collection 174 147 solr_core_cache.clear(); 175 176 // 2. For solr 4.7.2., GLI (and ant stop from cmd) is unable to shutdown the tomcat server fully,177 // IF any collection has been previewed AND if there are any solr collections in the collect folder.178 // This is because although the GS3 server seems to have stopped running at this stage, running a179 // `ps aux | grep tomcat` reveals that some part of tomcat is still running. It seems to be still180 // holding on to the cores. Doing an all_cores.shutdown() here, stops GS3 from hanging on to the cores181 // while still preserving the core desciptions in web/ext/solr.xml as needed when restarting the GS3 server.182 183 // Need GS3 server (tomcat) to release the cores, else a part of tomcat is still running in the background184 // on ant stop, holding a lock on the cores. Doing shutdown() preserves core descriptions in solr.xml185 all_solr_cores.shutdown();186 all_solr_cores = null;187 148 } 188 149 … … 356 317 // solr-core, (caching the result in 'solr_core_cache') 357 318 String core_name = getCollectionCoreNamePrefix() + "-" + index; 358 359 EmbeddedSolrServer solr_core = null;319 320 SolrServer solr_core = null; 360 321 361 322 if (!solr_core_cache.containsKey(core_name)) 362 { 363 solr_core = new EmbeddedSolrServer(all_solr_cores, core_name); 364 365 solr_core_cache.put(core_name, solr_core); 323 { 324 solr_core = new HttpSolrServer(this.solr_servlet_base_url+"/"+core_name); 325 solr_core_cache.put(core_name, solr_core); 366 326 } 367 327 else 368 328 { 369 solr_core = (EmbeddedSolrServer)solr_core_cache.get(core_name);329 solr_core = solr_core_cache.get(core_name); 370 330 } 371 331 … … 381 341 try 382 342 { 383 //SharedSoleneQueryResult sqr = this.solr_src.runQuery(query);384 343 SharedSoleneQueryResult sqr = this.solr_src.runQuery(query); 385 344 -
gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/SolrSearch.java
r29710 r29711 13 13 import org.w3c.dom.NodeList; 14 14 15 import java.util.ArrayList; 15 16 import java.util.HashMap; 16 import java.util.ArrayList; 17 import java.util.Iterator; 17 import java.util.Properties; 18 18 19 19 import org.apache.log4j.Logger; 20 20 import org.apache.solr.client.solrj.SolrQuery; 21 21 import org.apache.solr.client.solrj.SolrServer; 22 22 import org.apache.solr.client.solrj.SolrServerException; 23 import org.apache.solr.client.solrj. embedded.EmbeddedSolrServer;23 import org.apache.solr.client.solrj.impl.HttpSolrServer; 24 24 import org.apache.solr.client.solrj.response.QueryResponse; 25 25 import org.apache.solr.common.SolrDocument; 26 26 import org.apache.solr.common.SolrDocumentList; 27 import org.apache.solr.common.params.ModifiableSolrParams;28 import org.apache.solr.common.params.SolrParams;29 27 import org.apache.solr.common.util.NamedList; 30 28 import org.apache.solr.servlet.SolrRequestParsers; 31 import org.apache.solr.core.CoreContainer;32 import org.apache.solr.core.SolrCore;33 34 import java.io.File;35 import java.util.Collection;36 37 38 import org.apache.log4j.*;39 29 40 30 41 31 public class SolrSearch extends LuceneSearch { 42 32 33 public static final String SOLR_SERVLET_SUFFIX = "/solr"; 43 34 static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.SolrSearch.class.getName()); 44 35 45 static protected CoreContainer solr_cores = null;46 protected HashMap solr_server;36 protected String solr_servlet_base_url; 37 protected HashMap<String, SolrServer> solr_server; 47 38 48 39 public SolrSearch() 49 40 { 50 solr_server = new HashMap ();41 solr_server = new HashMap<String, SolrServer>(); 51 42 52 if (solr_cores == null) { 53 // Share one CoreContainer across all sites/collections 54 try { 55 56 String gsdl3_home = GlobalProperties.getGSDL3Home(); 57 String solr_ext_name = GlobalProperties.getProperty("gsdlext.solr.dirname","solr"); 58 59 String solr_home_str = GSFile.extHome(gsdl3_home,solr_ext_name); 60 61 solr_cores = new CoreContainer(solr_home_str); 62 } 63 catch (Exception e) { 64 e.printStackTrace(); 65 } 43 // Create the solr servlet url on GS3's tomcat. By default it's "http://localhost:8383/solr" 44 // Don't do this in configure(), since the tomcat url will remain unchanged while tomcat is running 45 try { 46 Properties globalProperties = new Properties(); 47 globalProperties.load(Class.forName("org.greenstone.util.GlobalProperties").getClassLoader().getResourceAsStream("global.properties")); 48 String host = globalProperties.getProperty("tomcat.server", "localhost"); 49 String port = globalProperties.getProperty("tomcat.port", "8383"); 50 String protocol = globalProperties.getProperty("tomcat.protocol", "http"); 51 52 String portStr = port.equals("80") ? "" : ":"+port; 53 solr_servlet_base_url = protocol+"://"+host+portStr+SOLR_SERVLET_SUFFIX; 54 } catch(Exception e) { 55 logger.error("Error reading greenstone's tomcat solr server properties from global.properties", e); 66 56 } 67 57 } … … 76 66 super.cleanUp(); 77 67 78 // 1. clear the map keeping track of the solrcores' EmbeddedSolrServers in this collection 79 solr_server.clear(); 80 81 // 2. Need GS3 server (tomcat) to release the cores, else a part of tomcat is still running in the background 82 // on ant stop, holding a lock on the cores. Doing shutdown() preserves core descriptions in solr.xml 83 solr_cores.shutdown(); 84 solr_cores = null; 68 // clear the map keeping track of the SolrServers in this collection 69 solr_server.clear(); 85 70 } 86 71 … … 88 73 // adjusted configure to bring it up to speed with changes in GS2SolrSearch (for activate.pl) - not yet tested 89 74 public boolean configure(Element info, Element extra_info) { 90 75 boolean success = super.configure(info, extra_info); 91 76 92 // 1. Make the CoreContainer reload solr.xml 93 // This is particularly needed for when activate.pl is executed during 94 // a running GS3 server. At that point, the solr collection is reactivated and 95 // we need to tell Greenstone that the solr index has changed. This requires 96 // the CoreContainer to reload the solr.xml file, and it all works again. 97 98 solr_server.clear(); // clear the map of solr cores for this collection added to the map upon querying 99 100 // Reload the updated solr.xml into the CoreContainer 101 // (Doing a solr_cores.shutdown() first doesn't seem to be required) 102 try { 103 String solr_home_str = solr_cores.getSolrHome(); 104 File solr_home = new File(solr_home_str); 105 File solr_xml = new File( solr_home,"solr.xml" ); 106 107 //solr_cores.load(solr_home_str,solr_xml); 108 solr_cores.load(); 109 } catch (Exception e) { 110 logger.error("Exception in SolrSearch.configure(): " + e.getMessage()); 111 e.printStackTrace(); 112 return false; 113 } 77 // clear the map of solr cores for this collection added to the map upon querying 78 solr_server.clear(); 79 80 if(!success) { 81 return false; 82 } 114 83 115 84 // initialize required number of SolrCores based on values … … 123 92 String core_name = core_name_prefix + "-" + idx_name; 124 93 125 EmbeddedSolrServer solr_core 126 = new EmbeddedSolrServer(solr_cores,core_name); 127 94 SolrServer solr_core = new HttpSolrServer(this.solr_servlet_base_url+"/"+core_name); 128 95 solr_server.put(core_name,solr_core); 129 96 } 97 130 98 131 99 return success; … … 165 133 166 134 try { 135 136 // Use SolrQuery with HttpSolrServer instead of ModifiableSolrParams, 137 // see http://stackoverflow.com/questions/13944567/querying-solr-server-using-solrj 138 SolrQuery solrParams = new SolrQuery(query_string); // initialised with q url-parameter 139 //solrparams.setRequestHandler("/select"); // default. Or try "select" 167 140 168 ModifiableSolrParams solrParams = new ModifiableSolrParams(); 169 solrParams.set("q", query_string); 170 //solrParams.set("start", start); 171 //solrParams.set("rows", nbDocuments); 141 ///solrParams.set("start", start); 142 ///solrParams.set("rows", nbDocuments); 143 172 144 173 145 String core_name = getCollectionCoreNamePrefix() + "-" + index; 174 146 175 EmbeddedSolrServer solr_core = (EmbeddedSolrServer)solr_server.get(core_name); 176 147 // http://stackoverflow.com/questions/17026530/accessing-a-cores-default-handler-through-solrj-using-setquerytype 148 // default request handler is /select, see http://wiki.apache.org/solr/CoreQueryParameters 149 SolrServer solr_core = solr_server.get(core_name); 177 150 QueryResponse solrResponse = solr_core.query(solrParams); 178 151 -
gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/util/SolrQueryWrapper.java
r29664 r29711 241 241 } 242 242 } else { 243 System.err.println("#### Not an EmbeddedSolrServer. This shouldn't happen." + solr_core.getClass());244 logger.error("#### Not an EmbeddedSolrServer. This shouldn't happen." + solr_core.getClass());243 System.err.println("#### Not an EmbeddedSolrServer. SolrQueryWrapper.getTerms() not yet implemented for " + solr_core.getClass()); 244 logger.error("#### Not an EmbeddedSolrServer. SolrQueryWrapper.getTerms() not yet implemented for " + solr_core.getClass()); 245 245 } 246 246 -
main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java
r29514 r29711 1083 1083 // Do not do configGS3Server for a GS3 solr collection. Not at present at least, when we're stopping 1084 1084 // and starting the GS3 server from GLI for solr cols, since this function clears the solr.xml file. 1085 if(Gatherer.c_man.isSolrCollection()) {1085 /*if(Gatherer.c_man.isSolrCollection()) { 1086 1086 return; 1087 }1087 }*/ 1088 1088 1089 1089 if (Configuration.library_url == null){ -
main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java
r29361 r29711 1753 1753 // For now, for a GS3 solr collection, we'd have stopped the GS3 server before building 1754 1754 // and will now need to restart it. 1755 GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "restart");1756 thread.start();1755 /*GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "restart"); 1756 thread.start();*/ 1757 1757 1758 1758 // Give the GS3 server time to restart: -
main/trunk/gli/src/org/greenstone/gatherer/gui/CreatePane.java
r29222 r29711 700 700 // and restart it after building is complete. Restart is done in CollectionManager.processComplete() 701 701 if(CollectionManager.isSolrCollection()) { 702 GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "stop");703 thread.start();702 /*GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "stop"); 703 thread.start();*/ 704 704 } 705 705 … … 876 876 // then we also restart the GS3 server 877 877 if(CollectionManager.isSolrCollection()) { 878 GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "restart");879 thread.start();878 /*GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "restart"); 879 thread.start();*/ 880 880 } 881 881 -
main/trunk/greenstone3/build.xml
r29578 r29711 2034 2034 <if> 2035 2035 <bool><istrue value="${tomcat.islocal}"/></bool> 2036 <copy file="${web.lib}/xercesImpl.jar" todir="${web.applet}"/> 2037 <copy file="${web.lib}/xml-apis.jar" todir="${web.applet}"/> 2036 <if><bool><available file="${catalina.home}/lib/xercesImpl.jar"/></bool><!-- moved for solr --> 2037 <copy file="${catalina.home}/lib/xercesImpl.jar" todir="${web.applet}"/> 2038 <copy file="${catalina.home}/lib/xml-apis.jar" todir="${web.applet}"/> 2039 2040 <else><!-- get from default GS3 web lib location--> 2041 <copy file="${web.lib}/xercesImpl.jar" todir="${web.applet}"/> 2042 <copy file="${web.lib}/xml-apis.jar" todir="${web.applet}"/> 2043 </else> 2044 </if> 2038 2045 </if> 2039 2046
Note:
See TracChangeset
for help on using the changeset viewer.