Changeset 36586

Timestamp:

2022-09-07T16:52:38+12:00 (20 months 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:

• main/trunk/greenstone3/build.xml (modified) (7 diffs)

main/trunk/greenstone3/build.xml

@@ -424 +424 @@
   </if>  
 
-  <if>
-    <bool><available file="${web.writablehome}/ext/webswing/etc/catalina-opts-extra.args"/></bool>
-    <loadfile property="webswing.catalina.opts" srcfile="${web.writablehome}/ext/webswing/etc/catalina-opts-extra.args" failonerror="true"/>
-    <else>
-      <property name="webswing.catalina.opts" value=""/>
-    </else>
-  </if>
-  
   <!-- jar files needed by applets go here -->
   <property name="web.applet" value="${web.home}/applet"/>
@@ -2661 +2653 @@
       <arg value="configure-extension"/>
     </exec>
+
+    <if>
+      <bool><available file="${web.writablehome}/ext/webswing/etc/catalina-opts-extra.args"/></bool>
+      <loadfile property="webswing.catalina.opts" srcfile="${web.writablehome}/ext/webswing/etc/catalina-opts-extra.args" failonerror="true"/>
+      <else>
+    <property name="webswing.catalina.opts" value=""/>
+      </else>
+    </if>        
   </target>  
   
@@ -2668 +2668 @@
        on how to use this with eclipse
     -->
-  <target name="debug-start-tomcat" description="Startup Tomcat for debugger" depends="envbased-localtomcat-path,init" if="tomcat.islocal">
+  <target name="debug-start-tomcat" description="Startup Tomcat for debugger" depends="envbased-localtomcat-path,configure-webswing-ext,init" if="tomcat.islocal">
     <property name="tomcat.classpath" refid="local.tomcat.classpath"/>
     <property name="tomcat.path" refid="local.tomcat.path"/>
@@ -2684 +2684 @@
     
     <exec executable="${catalina.home}/bin/catalina.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false">
-      <arg value="jpda" />
-      <arg value="start" />
       <env key="JPDA_ADDRESS" value="8000"/> <!-- for debugging Tomcat in Eclipse -->
       <env key="JPDA_TRANSPORT" value="dt_socket"/> <!-- for debugging Tomcat in Eclipse -->
@@ -2705 +2703 @@
       <env key="WNHOME" path="${wn.home}"/>
       <env key="FEDORA_HOME" path="${fedora.home}"/>
+
+      <env key="_RUNJAVA" value="${env.CATALINA_START_RUNJAVA}"/>
+      <arg value="jpda" />
+      <arg value="start" />      
     </exec>
     <exec executable="${catalina.home}/bin/catalina.bat" osfamily="windows" dir="${catalina.home}/bin" spawn="true">
-      <arg value="jpda" />
-      <arg value="start" />
       <env key="JPDA_ADDRESS" value="8000"/> <!-- for debugging Tomcat in Eclipse -->
       <env key="JPDA_TRANSPORT" value="dt_socket"/> <!-- for debugging Tomcat in Eclipse -->
@@ -2719 +2719 @@
       <env key="CLASSPATH" path="${tomcat.classpath}"/>
       <env key="FEDORA_HOME" path="${fedora.home}"/>
+
+      <arg value="jpda" />
+      <arg value="start" />
     </exec>
     <!-- wait for the server to startup in case other targets need it running -->
@@ -2743 +2746 @@
 
   <!-- Another way: http://ptrthomas.wordpress.com/2006/03/25/how-to-start-and-stop-tomcat-from-ant/ -->
-  <target name="force-start-tomcat" description="Startup only Tomcat" depends="envbased-localtomcat-path,init" if="tomcat.islocal">
+  <target name="force-start-tomcat" description="Startup only Tomcat" depends="envbased-localtomcat-path,configure-webswing-ext,init" if="tomcat.islocal">
 
     <property name="tomcat.classpath" refid="local.tomcat.classpath"/>