Changeset 36502


Ignore:
Timestamp:
2022-08-26T11:22:05+12:00 (6 weeks 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:
1 edited

Legend:

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

    r36438 r36502  
    124124  <property name="flax.svn.root" value="https://svn.greenstone.org/flax"/>
    125125
    126   <property name="solr-ext.home" value="${basedir}/ext/solr"/>
     126  <property name="solr-ext.home"     value="${basedir}/ext/solr"/>
     127  <property name="webswing-ext.home" value="${basedir}/ext/webswing"/>
    127128
    128129  <property file="build.properties"/>
    129   <if><bool><available file="${user.home}/build.properties"/></bool>
     130  <if>
     131    <bool><available file="${user.home}/build.properties"/></bool>
    130132    <property file="${user.home}/build.properties"/>
    131133  </if>
     
    432434    </else>
    433435  </if> 
     436
     437  <if>
     438    <bool><available file="${web.home}/ext/webswing/etc/catalina-opts-extra.args"/></bool>
     439    <loadfile property="webswing.catalina.opts" srcfile="${web.home}/ext/webswing/etc/catalina-opts-extra.args" failonerror="true"/>
     440    <else>
     441      <property name="webswing.catalina.opts" value=""/>
     442    </else>
     443  </if>
    434444 
    435445  <!-- jar files needed by applets go here -->
     
    17141724    <echo>collection solr-jdbm-demo installed</echo>
    17151725  </target>
     1726
    17161727 
    17171728  <!-- Until 64 bit Linux and Mac (Lion) machines can generate a working IsisGdl,
     
    26272638    <if><bool>
    26282639    <isset property="fedora.maxpermsize"/></bool>
    2629       <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}"/>
     2640      <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}"/>
    26302641      <else>
    2631     <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}"/>
     2642    <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}"/>
    26322643      </else>
    26332644    </if>
     
    27032714    <if><bool>
    27042715    <isset property="fedora.maxpermsize"/></bool>
    2705       <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}"/>
     2716      <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}"/>
    27062717      <else>
    2707     <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}"/>
     2718    <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}"/>
    27082719      </else>
    27092720    </if>
    2710 
     2721   
    27112722    <echo file="${catalina.home}/bin/setenv.bat">set CLASSPATH=${tomcat.classpath}</echo>
    27122723    <echo file="${catalina.home}/bin/setenv.sh">export CLASSPATH=${tomcat.classpath}</echo>
Note: See TracChangeset for help on using the changeset viewer.