Changeset 27829
- Timestamp:
- 2013-07-12T17:22:47+12:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.xml
r27788 r27829 101 101 <property name="build.home" value="${basedir}/build"/> 102 102 <property name="src.home" value="${basedir}/src/java"/> 103 <property name="packages.home" value="${basedir}/packages"/> 104 <!-- this may be set in build.properties, eg if you move the web dir to 105 tomcats webapps directory --> 103 104 <if><bool><istrue value="${gsdl3home.isreadonly}"/></bool> 105 <property name="readonly-packages.home" value="${basedir}/packages"/> 106 <property name="packages.home" value="${gsdl3.writablehome}/packages"/> 107 <else> 108 <property name="packages.home" value="${basedir}/packages"/> 109 </else> 110 </if> 111 112 <!-- this may be set in build.properties, e.g. if you move the web dir to 113 tomcats webapps directory --> 106 114 <property name="web.home" value="${basedir}/web"/> 115 <property name="web.writablehome" value="${gsdl3.writablehome}"/> 116 107 117 <!-- jar files needed by applets go here --> 108 118 <property name="web.applet" value="${web.home}/applet"/> … … 110 120 <!-- jar files needed by the servlet (and extra ones) go here --> 111 121 <property name="web.lib" value="${web.home}/WEB-INF/lib"/> 122 <property name="web.writablelib" value="${web.writablehome}/WEB-INF/lib"/> 112 123 <!-- other files needed by the servlet go here --> 113 124 <property name="web.classes" value="${web.home}/WEB-INF/classes"/> 125 <property name="web.writableclasses" value="${web.writablehome}/WEB-INF/classes"/> 126 127 <if> 128 <bool><istrue value="${gsdl3home.isreadonly}"/></bool> 129 <echo>Greenstone3 home directory is read-only</echo> 130 <echo> => Writable area is: ${gsdl3.writablehome}</echo> 131 132 <condition property="gsdl3.writablehome.already-exists"> 133 <available file="${gsdl3.writablehome}" type="dir"/> 134 </condition> 135 136 <if> 137 <bool><not><istrue value="${gsdl3.writablehome.already-exists}"/></not></bool> 138 139 <!-- set up writable area --> 140 <echo>No previous Greenstone home writable area detected</echo> 141 <echo> => Setting up area</echo> 142 <mkdir dir="${gsdl3.writablehome}"/> 143 <mkdir dir="${gsdl3.writablehome}/packages"/> 144 <mkdir dir="${gsdl3.writablehome}/logs"/> 145 146 <chmod perm="a+rwx" dir="${gsdl3.writablehome}"/> 147 <chmod perm="a+rwx" dir="${gsdl3.writablehome}/packages"/> 148 <chmod perm="a+rwx" dir="${gsdl3.writablehome}/logs"/> 149 150 <!-- copy over packages tomcat folder --> 151 152 <if> 153 <bool><equals arg1="${os.bin.dir}" arg2="windows"/></bool> 154 <copy todir="${gsdl3.writablehome}/packages/tomcat" 155 preservelastmodified="true" 156 failonerror="true" > 157 <fileset dir="${readonly-packages.home}/tomcat" includes="**"/> 158 </copy> 159 160 <else> 161 <!-- else assume Unix --> 162 <!-- Can't go through the OS-independant <copy> task as it fails to preserve exec permissions --> 163 <echo>Copying to ${gsdl3.writablehome}/packages/tomcat</echo> 164 <exec executable="cp" output="/dev/null" spawn="false"> 165 <arg value="-r"/> 166 <arg value="${readonly-packages.home}/tomcat"/> 167 <arg value="${gsdl3.writablehome}/packages/."/> 168 </exec> 169 170 </else> 171 </if> 172 173 <echo> => Copying Greenstone's web/WEB-INF to writable area</echo> 174 <copy todir="${gsdl3.writablehome}/WEB-INF" 175 preservelastmodified="true" 176 failonerror="true" > 177 <fileset dir="${web.home}/WEB-INF" includes="**"/> 178 </copy> 179 180 <copy todir="${gsdl3.writablehome}" 181 preservelastmodified="true" 182 failonerror="true" > 183 <fileset dir="${web.home}" includes="index.html"/> 184 </copy> 185 186 </if> 187 </if> 188 189 114 190 <!--- flax: the WordNet home --> 115 191 <property name="wn.home" value="${web.home}/WEB-INF/classes/flax/WordNet"/> … … 128 204 <property name="admin.dir" value="${basedir}/admin"/> 129 205 130 <!-- defaults - set these on the command line or in build.properties or they will take these default values--> 206 <!-- defaults - set these on the command line or in build.properties or 207 they will take these default values--> 131 208 <property name="app.version" value="trunk"/> 132 209 <property name="branch.path" value="trunk"/> … … 137 214 138 215 <!-- catalina home is set to tomcat basedir if already installed, otherwise 139 use greenstone's tomcat -->216 use greenstone's tomcat --> 140 217 <condition property="catalina.home" value="${tomcat.installed.path}" else="${packages.home}/tomcat"> 141 218 <and> 142 219 <isset property="tomcat.installed.path"/> 143 220 <not> 144 221 <equals arg1="" arg2="${tomcat.installed.path}"/> 145 222 </not> 146 223 </and> … … 501 578 </fileset> 502 579 503 <pathelement location="${web.lib}"/>504 <fileset dir="${web. lib}">580 <pathelement location="${web.writablelib}"/> 581 <fileset dir="${web.writablelib}"> 505 582 <include name="derby.jar"/> 506 583 </fileset> … … 706 783 707 784 <target name="init-oaiconfig" if="oaiconfig.present"> 708 <echo>Writing out baseURL ${url}oaiserver to ${web. classes}/OAIConfig.xml</echo>709 <copy file="${web.classes}/OAIConfig.xml.in" tofile="${web. classes}/OAIConfig.xml"/>710 <rsr file="${web. classes}/OAIConfig.xml" pattern="<baseURL>.*</baseURL>" replacement="<baseURL>${url}oaiserver</baseURL>" />785 <echo>Writing out baseURL ${url}oaiserver to ${web.writableclasses}/OAIConfig.xml</echo> 786 <copy file="${web.classes}/OAIConfig.xml.in" tofile="${web.writableclasses}/OAIConfig.xml"/> 787 <rsr file="${web.writableclasses}/OAIConfig.xml" pattern="<baseURL>.*</baseURL>" replacement="<baseURL>${url}oaiserver</baseURL>" /> 711 788 </target> 712 789 … … 715 792 716 793 <target name="restart" description="Shutdown and restart Tomcat" depends="init,stop,start"/> 717 718 794 719 795 <!-- =========== Help targets =================================== --> … … 842 918 843 919 <target name="prepare-web" depends="init"> 844 <mkdir dir="${web. home}/applet"/>845 <mkdir dir="${web. home}/logs"/>846 <mkdir dir="${web. home}/logs/tmp"/>920 <mkdir dir="${web.writablehome}/applet"/> 921 <mkdir dir="${web.writablehome}/logs"/> 922 <mkdir dir="${web.writablehome}/logs/tmp"/> 847 923 </target> 848 924 … … 985 1061 986 1062 <!-- set the shebangs in the cgi files to point to the correct perlpath --> 987 <rsr file="${web.home}/WEB-INF/cgi/gliserver.pl" pattern="^#!.*" replacement="#!${perl.exec} -w" lines="1"/> 988 <rsr file="${web.home}/WEB-INF/cgi/metadata-server.pl" pattern="^#!.*" replacement="#!${perl.exec} -w" lines="1"/> 989 <rsr file="${web.home}/WEB-INF/cgi/checksum.pl" pattern="^#!.*" replacement="#!${perl.exec} -w" lines="1"/> 1063 <if> 1064 <bool><not><equals arg1="${web.home}" arg2="${web.writablehome}"></equals></not></bool> 1065 <mkdir dir="${web.writablehome}"/> 1066 <copy file="${web.home}/WEB-INF/cgi/gliserver.pl" tofile="${web.writablehome}/WEB-INF/cgi/gliserver.pl" overwrite="true"/> 1067 <copy file="${web.home}/WEB-INF/cgi/metadata-server.pl" tofile="${web.writablehome}/WEB-INF/cgi/metadata-server.pl" overwrite="true"/> 1068 <copy file="${web.home}/WEB-INF/cgi/checksum.pl" tofile="${web.writablehome}/WEB-INF/cgi/checksum.pl" overwrite="true"/> 1069 </if> 1070 1071 <rsr file="${web.writablehome}/WEB-INF/cgi/gliserver.pl" pattern="^#!.*" replacement="#!${perl.exec} -w" lines="1"/> 1072 <rsr file="${web.writablehome}/WEB-INF/cgi/metadata-server.pl" pattern="^#!.*" replacement="#!${perl.exec} -w" lines="1"/> 1073 <rsr file="${web.writablehome}/WEB-INF/cgi/checksum.pl" pattern="^#!.*" replacement="#!${perl.exec} -w" lines="1"/> 990 1074 <else> 991 <echo>WARNING: perl.path is empty. Unable to set the shebangs in the perl files in ${web. home}/WEB-INF/cgi</echo>1075 <echo>WARNING: perl.path is empty. Unable to set the shebangs in the perl files in ${web.writablehome}/WEB-INF/cgi</echo> 992 1076 </else> 993 1077 </if> … … 1000 1084 <path path="${web.home}"/> 1001 1085 </pathconvert> 1086 <pathconvert targetos="unix" property="src.gsdl3.writablehome.unix"> 1087 <path path="${web.writablehome}"/> 1088 </pathconvert> 1002 1089 1003 1090 <antcall target="set-perl-shebangs" inheritAll="true" /> … … 1006 1093 <filter token="gsdl3srchome" value="${basedir}"/> 1007 1094 <filter token="gsdl3home" value="${src.gsdl3.home.unix}"/> 1095 <filter token="gsdl3writablehome" value="${src.gsdl3.writablehome.unix}"/> 1008 1096 <filter token="gsdl3version" value="${app.version}"/> 1009 1097 <filter token="tomcat.server" value="${tomcat.server}"/> … … 1011 1099 <filter token="perlpath" value="${escaped.perl.path}"/> 1012 1100 <filter token="disable.collection.building" value="${disable.collection.building}"/> 1013 <copy file="${web.home}/WEB-INF/cgi/gsdl3site.cfg.in" tofile="${web.home}/WEB-INF/cgi/gsdl3site.cfg" filtering="true" overwrite="true"/> 1014 <copy file="${basedir}/resources/java/global.properties.in" tofile="${web.classes}/global.properties" filtering="true" overwrite="true"/> 1015 <copy file="${basedir}/resources/java/log4j.properties.in" tofile="${web.classes}/log4j.properties" filtering="true" overwrite="true"/> 1016 <chmod file="${web.classes}/global.properties" perm="600"/> 1017 <chmod file="${web.classes}/log4j.properties" perm="600"/> 1101 <copy file="${web.home}/WEB-INF/cgi/gsdl3site.cfg.in" tofile="${web.writablehome}/WEB-INF/cgi/gsdl3site.cfg" filtering="true" overwrite="true"/> 1102 1103 <copy file="${basedir}/resources/java/global.properties.in" tofile="${web.writableclasses}/global.properties" filtering="true" overwrite="true"/> 1104 <copy file="${basedir}/resources/java/log4j.properties.in" tofile="${web.writableclasses}/log4j.properties" filtering="true" overwrite="true"/> 1105 <if><bool><istrue value="${gsdl3home.isreadonly}"/></bool> 1106 <!-- uncomment the writablehome properties --> 1107 <rsr file="${web.writableclasses}/global.properties" pattern="^#gsdl3\.(writable{1})?home" replacement="gsdl3.$1home" /> 1108 </if> 1109 <chmod file="${web.writableclasses}/global.properties" perm="644"/> 1110 <chmod file="${web.writableclasses}/log4j.properties" perm="644"/> 1018 1111 </target> 1019 1112 … … 1060 1153 <exec executable="svn"> 1061 1154 <arg value="update"/> 1062 <arg value="${web. home}"/>1155 <arg value="${web.writablehome}"/> 1063 1156 <arg value="-r"/><arg value="${branch.revision}"/> 1064 1157 </exec> … … 1148 1241 <filterset> 1149 1242 <filter token="gsdl3webhome" value="${web.home}"/> 1243 <filter token="gsdl3webwritablehome" value="${web.writablehome}"/> 1150 1244 <filter token="privilegedattribute" value ="${privileged.attribute}"/> 1151 1245 </filterset> … … 1183 1277 </if> 1184 1278 1185 1186 1279 <echo file="${catalina.home}/bin/setenv.bat">set CLASSPATH=${tomcat.classpath}</echo> 1280 <echo file="${catalina.home}/bin/setenv.sh">export CLASSPATH=${tomcat.classpath}</echo> 1187 1281 1188 1282 <exec executable="${catalina.home}/bin/catalina.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false"> … … 1225 1319 1226 1320 1227 <!-- Another way: http://ptrthomas.wordpress.com/2006/03/25/how-to-start-and-stop-tomcat-from-ant/ -->1321 <!-- Another way: http://ptrthomas.wordpress.com/2006/03/25/how-to-start-and-stop-tomcat-from-ant/ --> 1228 1322 <target name="start-tomcat" description="Startup only Tomcat" depends="init" if="tomcat.islocal"> 1229 1323 <property name="tomcat.classpath" refid="local.tomcat.classpath"/> … … 1238 1332 </if> 1239 1333 1240 1241 1334 <echo file="${catalina.home}/bin/setenv.bat">set CLASSPATH=${tomcat.classpath}</echo> 1335 <echo file="${catalina.home}/bin/setenv.sh">export CLASSPATH=${tomcat.classpath}</echo> 1242 1336 1243 1337 <exec executable="${catalina.home}/bin/startup.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false"> … … 1373 1467 It seems to have a problem with cat or </dev/null, with or without the < sign. --> 1374 1468 <target name="reset-logs" description="Empties catalina.out, greenstone.log and contents of web/logs/tmp"> 1375 <echo>Truncating catalina.out, greenstone.log and server.log, and emptying ${web. home}/logs/tmp</echo>1469 <echo>Truncating catalina.out, greenstone.log and server.log, and emptying ${web.writablehome}/logs/tmp</echo> 1376 1470 <exec executable="rm" os="${os.unix}" dir="${catalina.home}/logs" spawn="false"> 1377 1471 <arg value="-f"/> 1378 1472 <arg value="catalina.out"/> 1379 1473 </exec> 1380 <exec executable="rm" os="${os.unix}" dir="${web. home}/logs" spawn="false">1474 <exec executable="rm" os="${os.unix}" dir="${web.writablehome}/logs" spawn="false"> 1381 1475 <arg value="-f"/> 1382 1476 <arg value="greenstone.log"/> 1383 1477 </exec> 1384 <exec executable="rm" os="${os.unix}" dir="${web. home}/logs" spawn="false">1478 <exec executable="rm" os="${os.unix}" dir="${web.writablehome}/logs" spawn="false"> 1385 1479 <arg value="-f"/> 1386 1480 <arg value="server.log"/> … … 1391 1485 <arg value="catalina.out"/> 1392 1486 </exec> 1393 <exec executable="touch" os="${os.unix}" dir="${web. home}/logs"1487 <exec executable="touch" os="${os.unix}" dir="${web.writablehome}/logs" 1394 1488 spawn="false"> 1395 1489 <arg value="greenstone.log"/> 1396 1490 </exec> 1397 <exec executable="touch" os="${os.unix}" dir="${web. home}/logs"1491 <exec executable="touch" os="${os.unix}" dir="${web.writablehome}/logs" 1398 1492 spawn="false"> 1399 1493 <arg value="server.log"/> … … 1403 1497 <arg line="/c echo. > catalina.out"/> 1404 1498 </exec> 1405 <exec executable="cmd" os="${os.windows}" dir="${web. home}/logs" spawn="false">1499 <exec executable="cmd" os="${os.windows}" dir="${web.writablehome}/logs" spawn="false"> 1406 1500 <arg line="/c echo. > greenstone.log"/> 1407 1501 </exec> 1408 <exec executable="cmd" os="${os.windows}" dir="${web. home}/logs" spawn="false">1502 <exec executable="cmd" os="${os.windows}" dir="${web.writablehome}/logs" spawn="false"> 1409 1503 <arg line="/c echo. > server.log"/> 1410 1504 </exec> 1411 1505 1412 1506 <if> 1413 <bool><available file="${web. home}/logs/tmp" type="dir"/></bool>1507 <bool><available file="${web.writablehome}/logs/tmp" type="dir"/></bool> 1414 1508 <delete> 1415 <fileset dir="${web. home}/logs/tmp" includes="**/*"/>1509 <fileset dir="${web.writablehome}/logs/tmp" includes="**/*"/> 1416 1510 </delete> 1417 1511 </if> … … 2739 2833 2740 2834 <!-- create empty directories --> 2741 <mkdir dir="${web. home}/applet"/>2742 <mkdir dir="${web. home}/logs"/>2743 <mkdir dir="${web. home}/logs/tmp"/>2835 <mkdir dir="${web.writablehome}/applet"/> 2836 <mkdir dir="${web.writablehome}/logs"/> 2837 <mkdir dir="${web.writablehome}/logs/tmp"/> 2744 2838 2745 2839 <!-- os specific tidy-ups -->
Note:
See TracChangeset
for help on using the changeset viewer.