Changeset 36586


Ignore:
Timestamp:
2022-09-07T16:52:38+12:00 (4 weeks ago)
Author:
davidb
Message:

Moved (delayed) the location of the test for the webswing config files so they are present when the test is run; also added in _RUNJAVA to the debug-start-tomcat target

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r36585 r36586  
    424424  </if> 
    425425
    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  
    434426  <!-- jar files needed by applets go here -->
    435427  <property name="web.applet" value="${web.home}/applet"/>
     
    26612653      <arg value="configure-extension"/>
    26622654    </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>       
    26632663  </target> 
    26642664 
     
    26682668       on how to use this with eclipse
    26692669    -->
    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">
    26712671    <property name="tomcat.classpath" refid="local.tomcat.classpath"/>
    26722672    <property name="tomcat.path" refid="local.tomcat.path"/>
     
    26842684   
    26852685    <exec executable="${catalina.home}/bin/catalina.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false">
    2686       <arg value="jpda" />
    2687       <arg value="start" />
    26882686      <env key="JPDA_ADDRESS" value="8000"/> <!-- for debugging Tomcat in Eclipse -->
    26892687      <env key="JPDA_TRANSPORT" value="dt_socket"/> <!-- for debugging Tomcat in Eclipse -->
     
    27052703      <env key="WNHOME" path="${wn.home}"/>
    27062704      <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" />     
    27072709    </exec>
    27082710    <exec executable="${catalina.home}/bin/catalina.bat" osfamily="windows" dir="${catalina.home}/bin" spawn="true">
    2709       <arg value="jpda" />
    2710       <arg value="start" />
    27112711      <env key="JPDA_ADDRESS" value="8000"/> <!-- for debugging Tomcat in Eclipse -->
    27122712      <env key="JPDA_TRANSPORT" value="dt_socket"/> <!-- for debugging Tomcat in Eclipse -->
     
    27192719      <env key="CLASSPATH" path="${tomcat.classpath}"/>
    27202720      <env key="FEDORA_HOME" path="${fedora.home}"/>
     2721
     2722      <arg value="jpda" />
     2723      <arg value="start" />
    27212724    </exec>
    27222725    <!-- wait for the server to startup in case other targets need it running -->
     
    27432746
    27442747  <!-- 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">
    27462749
    27472750    <property name="tomcat.classpath" refid="local.tomcat.classpath"/>
Note: See TracChangeset for help on using the changeset viewer.