Changeset 36502 for main

Timestamp:

2022-08-26T11:22:05+12:00 (20 months ago)

Author:

davidb

Message:

Splicing in of catalina opts that allow for webswing-server.war to be run. Only added in if war file detected

File:

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

main/trunk/greenstone3/build.xml

@@ -124 +124 @@
   <property name="flax.svn.root" value="https://svn.greenstone.org/flax"/>
 
-  <property name="solr-ext.home" value="${basedir}/ext/solr"/>
+  <property name="solr-ext.home"     value="${basedir}/ext/solr"/>
+  <property name="webswing-ext.home" value="${basedir}/ext/webswing"/>
 
   <property file="build.properties"/>
-  <if><bool><available file="${user.home}/build.properties"/></bool>
+  <if>
+    <bool><available file="${user.home}/build.properties"/></bool>
     <property file="${user.home}/build.properties"/>
   </if>
@@ -432 +434 @@
     </else>
   </if>  
+
+  <if>
+    <bool><available file="${web.home}/ext/webswing/etc/catalina-opts-extra.args"/></bool>
+    <loadfile property="webswing.catalina.opts" srcfile="${web.home}/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 -->
@@ -1714 +1724 @@
     <echo>collection solr-jdbm-demo installed</echo>
   </target>
+
   
   <!-- Until 64 bit Linux and Mac (Lion) machines can generate a working IsisGdl, 
@@ -2627 +2638 @@
     <if><bool>
     <isset property="fedora.maxpermsize"/></bool>
-      <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M -Dcantaloupe.config=&quot;${basedir}/cantaloupe.properties&quot; ${readonly.catalina.opts} ${fedora.maxpermsize}"/>
+      <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M -Dcantaloupe.config=&quot;${basedir}/cantaloupe.properties&quot; ${readonly.catalina.opts} ${webswing.catalina.opts} ${fedora.maxpermsize}"/>
       <else>
-    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M -Dcantaloupe.config=&quot;${basedir}/cantaloupe.properties&quot; ${readonly.catalina.opts}"/>
+    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M -Dcantaloupe.config=&quot;${basedir}/cantaloupe.properties&quot; ${webswing.catalina.opts} ${readonly.catalina.opts}"/>
       </else>
     </if>
@@ -2703 +2714 @@
     <if><bool>
     <isset property="fedora.maxpermsize"/></bool>
-      <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M -Dcantaloupe.config=&quot;${basedir}/cantaloupe.properties&quot; ${readonly.catalina.opts} ${fedora.maxpermsize}"/>
+      <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M -Dcantaloupe.config=&quot;${basedir}/cantaloupe.properties&quot; ${readonly.catalina.opts} ${webswing.catalina.opts} ${fedora.maxpermsize}"/>
       <else>
-    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M -Dcantaloupe.config=&quot;${basedir}/cantaloupe.properties&quot; ${readonly.catalina.opts}"/>
+    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M -Dcantaloupe.config=&quot;${basedir}/cantaloupe.properties&quot; ${readonly.catalina.opts} ${webswing.catalina.opts}"/>
       </else>
     </if>
-
+    
     <echo file="${catalina.home}/bin/setenv.bat">set CLASSPATH=${tomcat.classpath}</echo>
     <echo file="${catalina.home}/bin/setenv.sh">export CLASSPATH=${tomcat.classpath}</echo>