Changeset 36586 for main/trunk
- Timestamp:
- 2022-09-07T16:52:38+12:00 (19 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.xml
r36585 r36586 424 424 </if> 425 425 426 <if>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 <else>430 <property name="webswing.catalina.opts" value=""/>431 </else>432 </if>433 434 426 <!-- jar files needed by applets go here --> 435 427 <property name="web.applet" value="${web.home}/applet"/> … … 2661 2653 <arg value="configure-extension"/> 2662 2654 </exec> 2655 2656 <if> 2657 <bool><available file="${web.writablehome}/ext/webswing/etc/catalina-opts-extra.args"/></bool> 2658 <loadfile property="webswing.catalina.opts" srcfile="${web.writablehome}/ext/webswing/etc/catalina-opts-extra.args" failonerror="true"/> 2659 <else> 2660 <property name="webswing.catalina.opts" value=""/> 2661 </else> 2662 </if> 2663 2663 </target> 2664 2664 … … 2668 2668 on how to use this with eclipse 2669 2669 --> 2670 <target name="debug-start-tomcat" description="Startup Tomcat for debugger" depends="envbased-localtomcat-path, init" if="tomcat.islocal">2670 <target name="debug-start-tomcat" description="Startup Tomcat for debugger" depends="envbased-localtomcat-path,configure-webswing-ext,init" if="tomcat.islocal"> 2671 2671 <property name="tomcat.classpath" refid="local.tomcat.classpath"/> 2672 2672 <property name="tomcat.path" refid="local.tomcat.path"/> … … 2684 2684 2685 2685 <exec executable="${catalina.home}/bin/catalina.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false"> 2686 <arg value="jpda" />2687 <arg value="start" />2688 2686 <env key="JPDA_ADDRESS" value="8000"/> <!-- for debugging Tomcat in Eclipse --> 2689 2687 <env key="JPDA_TRANSPORT" value="dt_socket"/> <!-- for debugging Tomcat in Eclipse --> … … 2705 2703 <env key="WNHOME" path="${wn.home}"/> 2706 2704 <env key="FEDORA_HOME" path="${fedora.home}"/> 2705 2706 <env key="_RUNJAVA" value="${env.CATALINA_START_RUNJAVA}"/> 2707 <arg value="jpda" /> 2708 <arg value="start" /> 2707 2709 </exec> 2708 2710 <exec executable="${catalina.home}/bin/catalina.bat" osfamily="windows" dir="${catalina.home}/bin" spawn="true"> 2709 <arg value="jpda" />2710 <arg value="start" />2711 2711 <env key="JPDA_ADDRESS" value="8000"/> <!-- for debugging Tomcat in Eclipse --> 2712 2712 <env key="JPDA_TRANSPORT" value="dt_socket"/> <!-- for debugging Tomcat in Eclipse --> … … 2719 2719 <env key="CLASSPATH" path="${tomcat.classpath}"/> 2720 2720 <env key="FEDORA_HOME" path="${fedora.home}"/> 2721 2722 <arg value="jpda" /> 2723 <arg value="start" /> 2721 2724 </exec> 2722 2725 <!-- wait for the server to startup in case other targets need it running --> … … 2743 2746 2744 2747 <!-- Another way: http://ptrthomas.wordpress.com/2006/03/25/how-to-start-and-stop-tomcat-from-ant/ --> 2745 <target name="force-start-tomcat" description="Startup only Tomcat" depends="envbased-localtomcat-path, init" if="tomcat.islocal">2748 <target name="force-start-tomcat" description="Startup only Tomcat" depends="envbased-localtomcat-path,configure-webswing-ext,init" if="tomcat.islocal"> 2746 2749 2747 2750 <property name="tomcat.classpath" refid="local.tomcat.classpath"/>
Note:
See TracChangeset
for help on using the changeset viewer.