Changes in main/trunk/greenstone3/build.xml [30236:30304]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.xml
r30236 r30304 143 143 <property name="readonly-packages.home" value="${basedir}/packages"/> 144 144 <property name="packages.home" value="${gsdl3.writablehome}/packages"/> 145 <!-- 146 To run solr from a read-only location (like a DVD-ROM), its locktype needs to be "single", 147 else solr tries to write out a lock file to the collection's index folder which is read-only. 148 149 https://cwiki.apache.org/confluence/display/solr/IndexConfig+in+SolrConfig 150 says that the "single" locktype is "for special situations of a read-only index directory, or ...." 151 152 See also http://wiki.apache.org/lucene-java/AvailableLockFactories 153 And look for the documentation on "locktype" in solr collection's etc/conf/solrconfig.xml 154 for further information on the different locktypes. 155 156 To set the locktype property from the commandline (it's a property to the server web), pass in 157 "-Dsolr.lock.type=..." to the web server, as explained in 158 http://lucene.472066.n3.nabble.com/Where-can-we-set-the-parameters-in-Solr-Config-td4183706.html 159 --> 160 <property name="readonly.catalina.opts" value="-Dsolr.lock.type=single"/> 145 161 <else> 146 162 <property name="packages.home" value="${basedir}/packages"/> 163 <property name="readonly.catalina.opts" value=""/> 147 164 </else> 148 165 </if> … … 200 217 <else> 201 218 <!-- else assume Unix --> 202 <!-- Can't go through the OS-independ ant <copy> task as it fails to preserve exec permissions -->219 <!-- Can't go through the OS-independent <copy> task as it fails to preserve exec permissions --> 203 220 <echo>Copying to ${gsdl3.writablehome}/packages/tomcat</echo> 204 221 <exec executable="cp" output="/dev/null" spawn="false"> … … 207 224 <arg value="${gsdl3.writablehome}/packages/."/> 208 225 </exec> 209 226 227 <!-- the packages folder in tmp only has read permissions at this stage, it needs more permissions to work when running GS3 off a disc --> 228 <chmod perm="a+rwx" file="${gsdl3.writablehome}/packages/**" /> 229 210 230 </else> 211 231 </if> … … 1506 1526 <if><bool> 1507 1527 <isset property="fedora.maxpermsize"/></bool> 1508 <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M ${ fedora.maxpermsize}"/>1528 <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M ${readonly.catalina.opts} ${fedora.maxpermsize}"/> 1509 1529 <else> 1510 <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M "/>1530 <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M ${readonly.catalina.opts}"/> 1511 1531 </else> 1512 1532 </if> … … 1573 1593 <if><bool> 1574 1594 <isset property="fedora.maxpermsize"/></bool> 1575 <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M ${ fedora.maxpermsize}"/>1595 <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M ${readonly.catalina.opts} ${fedora.maxpermsize}"/> 1576 1596 <else> 1577 <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M "/>1597 <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M ${readonly.catalina.opts}"/> 1578 1598 </else> 1579 1599 </if>
Note:
See TracChangeset
for help on using the changeset viewer.