Changeset 27860 for main/trunk
- Timestamp:
- 2013-07-15T20:30:45+12:00 (11 years ago)
- Location:
- main/trunk/greenstone3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.xml
r27859 r27860 94 94 <property name="src.packages.home" value="${basedir}/src/packages"/> 95 95 <property name="flax.svn.root" value="http://svn.greenstone.org/flax"/> 96 97 <property name="solr-ext.home" value="${basedir}/ext/solr"/> 96 98 97 99 <property file="build.properties"/> … … 171 173 <mkdir dir="${gsdl3.writablehome}/packages"/> 172 174 <mkdir dir="${gsdl3.writablehome}/logs"/> 175 <mkdir dir="${gsdl3.writablehome}/ext/solr"/> 173 176 174 177 <chmod perm="a+rwx" dir="${gsdl3.writablehome}"/> 175 178 <chmod perm="a+rwx" dir="${gsdl3.writablehome}/packages"/> 176 179 <chmod perm="a+rwx" dir="${gsdl3.writablehome}/logs"/> 180 <chmod perm="a+rwx" dir="${gsdl3.writablehome}/ext/solr"/> 177 181 178 182 <!-- copy over packages tomcat folder --> … … 778 782 </target> 779 783 780 <target name="start" depends="init,configure-tomcat,configure-web, start-tomcat"784 <target name="start" depends="init,configure-tomcat,configure-web,configure-solr-ext,start-tomcat" 781 785 description="Startup the Tomcat server." > 782 786 <echo>${app.name} (${app.version}) server running using Apache Tomcat and Java</echo> … … 1064 1068 1065 1069 <target name="prepare-solr-ext" depends="init" > 1066 <property name="solr-ext.home" value="${basedir}/ext/solr"/>1067 1070 <exec executable="ant.bat" os="${os.windows}" dir="${solr-ext.home}" spawn="false"> 1068 1071 <arg value="add-service"/> … … 1289 1292 </copy> 1290 1293 1291 1292 1293 1294 1295 1296 1294 <!-- set up the greenstone3 web.xml file --> 1295 <copy file="${basedir}/resources/tomcat/web.xml" tofile="${packages.home}/tomcat/conf/web.xml" overwrite="true"> 1296 <filterset> 1297 <filter token="perlpath" value="${perl.path}"/> 1298 </filterset> 1299 </copy> 1297 1300 </target> 1298 1301 … … 1302 1305 </target> 1303 1306 1307 1308 <target name="configure-solr-ext" depends="init" > 1309 <!-- re-setup the web/ext/solr/solr.xml file --> 1310 <copy file="${solr-ext.home}/solr.xml.in" 1311 tofile="${gsdl3.writablehome}/solr/ext/solr.xml" overwrite="true"> 1312 <filterset> 1313 <filter token="gsdl3.home" value="${src.gsdl3.home.unix}"/> 1314 <filter token="gsdl3.writablehome" value="${src.gsdl3.writablehome.unix}"/> 1315 </filterset> 1316 </copy> 1317 </target> 1304 1318 1305 1319 <!-- This target runs tomcat's "bin/catalina.bat(.sh) jpda start" -
main/trunk/greenstone3/gs3-server.sh
r27837 r27860 45 45 mkdir -p "$gsdl3_writablehome/packages" 46 46 mkdir -p "$gsdl3_writablehome/logs" 47 mkdir -p "$gsdl3_writablehome/ext/solr" 47 48 48 49 chmod a+rwx "$gsdl3_writablehome" 49 50 chmod a+rwx "$gsdl3_writablehome/packages" 50 51 chmod a+rwx "$gsdl3_writablehome/logs" 52 chmod a+rwx "$gsdl3_writablehome/ext/solr" 51 53 52 54 echo "Copying to $gsdl3_writablehome/packages/tomcat"
Note:
See TracChangeset
for help on using the changeset viewer.