Changeset 32881

Show
Ignore:
Timestamp:
08.03.2019 09:56:41 (4 months ago)
Author:
davidb
Message:

Addition targets/lines in preparation of working with IIIF Server Bridge

Files:
1 modified

Legend:

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

    r32792 r32881  
    11581158    <!-- assuming that index.html is not needed here -->    
    11591159 
    1160     <!--Now write out the url with oaiserver suffix as the baseURL property in OAIConfig.xml--> 
     1160    <!--Now write out the url with /oaiserver suffix as the baseURL property in OAIConfig.xml--> 
    11611161    <available file="${basedir}/resources/oai/OAIConfig.xml.in" property="oaiconfig.present"/> 
    11621162    <antcall target="init-oaiconfig"> 
    11631163      <param name="url" value="${url}"/> 
    11641164    </antcall> 
     1165 
     1166    <!--Now write out the url with /gs-cantaloupe suffix as the baseURL property in IIIFConfig.xml--> 
     1167    <available file="${basedir}/resources/iiif/IIIFConfig.xml.in" property="iiifconfig.present"/> 
     1168    <antcall target="init-iiifconfig"> 
     1169      <param name="url" value="${url}"/> 
     1170    </antcall> 
     1171 
    11651172  </target> 
    11661173 
     
    11711178  </target> 
    11721179 
     1180  <target name="init-iiifconfig" if="iiifconfig.present"> 
     1181    <echo>Writing out baseURL ${url}gs-cantaloupe to ${web.writableclasses}/IIIFConfig.xml</echo> 
     1182    <copy file="${basedir}/resources/iiif/IIIFConfig.xml.in" tofile="${web.writableclasses}/IIIFConfig.xml"/> 
     1183    <rsr verbosity="1" file="${web.writableclasses}/IIIFConfig.xml" pattern="&lt;baseURL&gt;.*&lt;/baseURL&gt;" replacement="&lt;baseURL&gt;${url}gs-cantaloupe&lt;/baseURL&gt;" />    
     1184  </target> 
     1185   
    11731186  <target name="stop" depends="init,stop-tomcat,stop-derby"  
    11741187    description="Shutdown the Tomcat server."/> 
     
    12961309  <target name="copy-dot-svn-files" depends="init"  
    12971310      description="Copies all resources .svn files to .in versions - which are used during configure to generate the runtime versions." > 
    1298     <if><bool><available file="${basedir}/resources/tomcat/greenstone3.xml.in"/></bool> 
     1311    <if> 
     1312      <bool><available file="${basedir}/resources/tomcat/greenstone3.xml.in"/></bool> 
    12991313      <copy file="${basedir}/resources/tomcat/greenstone3.xml.in" tofile="${basedir}/resources/tomcat/greenstone3.xml.in.backup"  overwrite="true"/> 
    13001314    </if> 
    1301     
    13021315    <copy file="${basedir}/resources/tomcat/greenstone3.xml.svn" tofile="${basedir}/resources/tomcat/greenstone3.xml.in"  overwrite="true"/> 
    1303     <if><bool><available file="${basedir}/resources/tomcat/server_tomcat5.xml.in"/></bool> 
     1316 
     1317    <if> 
     1318      <bool><available file="${basedir}/resources/tomcat/server_tomcat5.xml.in"/></bool> 
    13041319      <copy file="${basedir}/resources/tomcat/server_tomcat5.xml.in" tofile="${basedir}/resources/tomcat/server_tomcat5.xml.in.backup"  overwrite="true"/> 
    13051320    </if> 
    13061321    <copy file="${basedir}/resources/tomcat/server_tomcat5.xml.svn" tofile="${basedir}/resources/tomcat/server_tomcat5.xml.in"  overwrite="true"/> 
    1307     <if><bool><available file="${basedir}/resources/tomcat/server_tomcat7.xml.in"/></bool> 
     1322 
     1323    <if> 
     1324      <bool><available file="${basedir}/resources/tomcat/server_tomcat7.xml.in"/></bool> 
    13081325      <copy file="${basedir}/resources/tomcat/server_tomcat7.xml.in" tofile="${basedir}/resources/tomcat/server_tomcat7.xml.in.backup"  overwrite="true"/> 
    13091326    </if> 
    13101327    <copy file="${basedir}/resources/tomcat/server_tomcat8.xml.svn" tofile="${basedir}/resources/tomcat/server_tomcat8.xml.in" overwrite="true"/> 
    1311     <if><bool><available file="${basedir}/resources/tomcat/server_tomcat8.xml.in"/></bool> 
     1328 
     1329    <if> 
     1330      <bool><available file="${basedir}/resources/tomcat/server_tomcat8.xml.in"/></bool> 
    13121331      <copy file="${basedir}/resources/tomcat/server_tomcat8.xml.in" tofile="${basedir}/resources/tomcat/server_tomcat8.xml.in.backup"  overwrite="true"/> 
    13131332    </if> 
    13141333    <copy file="${basedir}/resources/tomcat/server_tomcat8.xml.svn" tofile="${basedir}/resources/tomcat/server_tomcat8.xml.in" overwrite="true"/> 
    1315     <if><bool><available file="${basedir}/resources/tomcat/web8.xml.in"/></bool> 
     1334 
     1335    <if> 
     1336      <bool><available file="${basedir}/resources/tomcat/web8.xml.in"/></bool> 
    13161337      <copy file="${basedir}/resources/tomcat/web8.xml.in" tofile="${basedir}/resources/tomcat/web8.xml.in.backup"  overwrite="true"/> 
    13171338    </if> 
    13181339    <copy file="${basedir}/resources/tomcat/web8.xml.svn" tofile="${basedir}/resources/tomcat/web8.xml.in"  overwrite="true"/> 
    1319     <if><bool><available file="${basedir}/resources/oai/OAIConfig.xml.in"/></bool> 
    1320     <copy file="${basedir}/resources/oai/OAIConfig.xml.in" tofile="${basedir}/resources/oai/OAIConfig.xml.in.backup"  overwrite="true"/> 
     1340 
     1341    <if> 
     1342      <bool><available file="${basedir}/resources/oai/OAIConfig.xml.in"/></bool> 
     1343      <copy file="${basedir}/resources/oai/OAIConfig.xml.in" tofile="${basedir}/resources/oai/OAIConfig.xml.in.backup"  overwrite="true"/> 
    13211344    </if> 
    13221345    <copy file="${basedir}/resources/oai/OAIConfig.xml.svn" tofile="${basedir}/resources/oai/OAIConfig.xml.in"  overwrite="true"/> 
    1323     <if><bool><available file="${basedir}/resources/cgi/gsdl3site.cfg.in"/></bool> 
     1346 
     1347    <if> 
     1348      <bool><available file="${basedir}/resources/iiif/IIIFConfig.xml.in"/></bool> 
     1349      <copy file="${basedir}/resources/iiif/IIIFConfig.xml.in" tofile="${basedir}/resources/iiif/IIIFConfig.xml.in.backup"  overwrite="true"/> 
     1350    </if> 
     1351    <copy file="${basedir}/resources/iiif/IIIFConfig.xml.svn" tofile="${basedir}/resources/iiif/IIIFConfig.xml.in"  overwrite="true"/> 
     1352 
     1353    <if> 
     1354      <bool><available file="${basedir}/resources/iiif/cantaloupe.properties.in"/></bool> 
     1355      <copy file="${basedir}/resources/iiif/cantaloupe.properties.in" tofile="${basedir}/resources/iiif/cantaloupe.properties.in.backup" overwrite="true"/> 
     1356    </if> 
     1357    <copy file="${basedir}/resources/iiif/cantaloupe.properties.svn" tofile="${basedir}/resources/iiif/cantaloupe.properties.in" overwrite="true"/> 
     1358 
     1359    <if> 
     1360      <bool><available file="${basedir}/resources/cgi/gsdl3site.cfg.in"/></bool> 
    13241361      <copy file="${basedir}/resources/cgi/gsdl3site.cfg.in" tofile="${basedir}/resources/cgi/gsdl3site.cfg.in.backup" overwrite="true"/> 
    13251362    </if> 
    13261363    <copy file="${basedir}/resources/cgi/gsdl3site.cfg.svn" tofile="${basedir}/resources/cgi/gsdl3site.cfg.in" overwrite="true"/> 
    1327     <if><bool><available file="${basedir}/resources/web/global.properties.in"/></bool> 
    1328     <copy file="${basedir}/resources/web/global.properties.in" tofile="${basedir}/resources/web/global.properties.in.backup" overwrite="true"/> 
     1364 
     1365    <if> 
     1366      <bool><available file="${basedir}/resources/web/global.properties.in"/></bool> 
     1367      <copy file="${basedir}/resources/web/global.properties.in" tofile="${basedir}/resources/web/global.properties.in.backup" overwrite="true"/> 
    13291368    </if> 
    13301369    <copy file="${basedir}/resources/web/global.properties.svn" tofile="${basedir}/resources/web/global.properties.in" overwrite="true"/> 
    1331     <if><bool><available file="${basedir}/resources/web/log4j.properties.in"/></bool> 
    1332     <copy file="${basedir}/resources/web/log4j.properties.in" tofile="${basedir}/resources/web/log4j.properties.in.backup" overwrite="true"/> 
     1370 
     1371    <if> 
     1372      <bool><available file="${basedir}/resources/web/log4j.properties.in"/></bool> 
     1373      <copy file="${basedir}/resources/web/log4j.properties.in" tofile="${basedir}/resources/web/log4j.properties.in.backup" overwrite="true"/> 
    13331374    </if> 
    13341375    <copy file="${basedir}/resources/web/log4j.properties.svn" tofile="${basedir}/resources/web/log4j.properties.in" overwrite="true"/> 
    1335   </target> 
     1376     
     1377</target> 
    13361378     
    13371379  <!-- ========== Web app Targets ================================ --> 
     
    15781620    <copy file="${basedir}/resources/web/global.properties.in" tofile="${web.writableclasses}/global.properties" filtering="true" overwrite="true"/> 
    15791621    <copy file="${basedir}/resources/web/log4j.properties.in" tofile="${web.writableclasses}/log4j.properties" filtering="true" overwrite="true"/> 
    1580     <if><bool><istrue value="${gsdl3home.isreadonly}"/></bool> 
     1622    <if> 
     1623      <bool><istrue value="${gsdl3home.isreadonly}"/></bool> 
    15811624      <!-- uncomment the writablehome properties --> 
    15821625      <rsr verbosity="1" file="${web.writableclasses}/global.properties" pattern="^#gsdl3\.(writable{1})?home" replacement="gsdl3.$1home" /> 
     
    15841627    <chmod file="${web.writableclasses}/global.properties" perm="644"/> 
    15851628    <chmod file="${web.writableclasses}/log4j.properties" perm="644"/> 
     1629 
     1630    <copy file="${basedir}/resources/iiif/cantaloupe.properties.in" tofile="${basedir}/cantaloupe.properties" filtering="true" overwrite="true"/> 
     1631    <chmod file="${basedir}/cantaloupe.properties" perm="644"/> 
    15861632  </target> 
    15871633 
     
    23022348    <if><bool> 
    23032349    <isset property="fedora.maxpermsize"/></bool> 
    2304       <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M ${readonly.catalina.opts} ${fedora.maxpermsize}"/> 
     2350      <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M -Dcantaloupe.config=${basedir}/cantaloupe.properties ${readonly.catalina.opts} ${fedora.maxpermsize}"/> 
    23052351      <else> 
    2306     <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M ${readonly.catalina.opts}"/> 
     2352    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M -Dcantaloupe.config=${basedir}/cantaloupe.properties ${readonly.catalina.opts}"/> 
    23072353      </else> 
    23082354    </if> 
     
    23702416    <if><bool> 
    23712417    <isset property="fedora.maxpermsize"/></bool> 
    2372       <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M ${readonly.catalina.opts} ${fedora.maxpermsize}"/> 
     2418      <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M -Dcantaloupe.config=${basedir}/cantaloupe.properties ${readonly.catalina.opts} ${fedora.maxpermsize}"/> 
    23732419      <else> 
    2374     <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M ${readonly.catalina.opts}"/> 
     2420    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M -Dcantaloupe.config=${basedir}/cantaloupe.properties ${readonly.catalina.opts}"/> 
    23752421      </else> 
    23762422    </if>