Changeset 36585
- Timestamp:
- 2022-09-06T18:18:27+12:00 (20 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.xml
r36583 r36585 425 425 426 426 <if> 427 <bool><available file="${web. home}/ext/webswing/etc/catalina-opts-extra.args"/></bool>428 <loadfile property="webswing.catalina.opts" srcfile="${web. home}/ext/webswing/etc/catalina-opts-extra.args" failonerror="true"/>427 <bool><available file="${web.writablehome}/ext/webswing/etc/catalina-opts-extra.args"/></bool> 428 <loadfile property="webswing.catalina.opts" srcfile="${web.writablehome}/ext/webswing/etc/catalina-opts-extra.args" failonerror="true"/> 429 429 <else> 430 430 <property name="webswing.catalina.opts" value=""/> … … 1318 1318 </target> 1319 1319 1320 <target name="start" depends="needs-gs3-setup,init,configure-tomcat,configure-web,configure-solr-ext, start-derby,start-tomcat"1320 <target name="start" depends="needs-gs3-setup,init,configure-tomcat,configure-web,configure-solr-ext,configure-webswing-ext,start-derby,start-tomcat" 1321 1321 description="Startup the Tomcat server." > 1322 1322 <echo>${app.name} (${app.version}) server running using Apache Tomcat and Java</echo> … … 1738 1738 <target name="install-webswing-ext" depends="init" > 1739 1739 <exec executable="ant.bat" osfamily="windows" dir="${webswing-ext.home}" spawn="false" failonerror="true"> 1740 <arg value="-Dweb.home=${web.home}"/> 1741 <arg value="-Dweb.writablehome=${web.writablehome}"/> 1740 1742 <arg value="add-extension"/> 1741 1743 </exec> 1742 1744 <exec executable="ant" os="${os.unix}" dir="${webswing-ext.home}" spawn="false" failonerror="true"> 1745 <arg value="-Dweb.home=${web.home}"/> 1746 <arg value="-Dweb.writablehome=${web.writablehome}"/> 1743 1747 <arg value="add-extension"/> 1744 1748 </exec> … … 2645 2649 </copy> 2646 2650 </target> 2647 2651 2652 <target name="configure-webswing-ext" depends="init" > 2653 <exec executable="ant.bat" osfamily="windows" dir="${webswing-ext.home}" spawn="false" failonerror="true"> 2654 <arg value="-Dweb.home=${web.home}"/> 2655 <arg value="-Dweb.writablehome=${web.writablehome}"/> 2656 <arg value="configure-extension"/> 2657 </exec> 2658 <exec executable="ant" os="${os.unix}" dir="${webswing-ext.home}" spawn="false" failonerror="true"> 2659 <arg value="-Dweb.home=${web.home}"/> 2660 <arg value="-Dweb.writablehome=${web.writablehome}"/> 2661 <arg value="configure-extension"/> 2662 </exec> 2663 </target> 2664 2648 2665 <!-- This target runs tomcat's "bin/catalina.bat(.sh) jpda start" 2649 2666 to allow debugging the running GS3 server in Eclipse. See the instructions at
Note:
See TracChangeset
for help on using the changeset viewer.