Changeset 37626 for main


Ignore:
Timestamp:
2023-04-08T11:32:31+12:00 (12 months ago)
Author:
davidb
Message:

build.xml now makes use of a 'template' version of servlets.xml in resources/web/servlets.xml.in so things like the Google Signin client id key only needs to be specified in one place, and through 'ant configure' the value in build.properties is pushed out into both greenstone3.xml for tomcat, and web/WEB-INF/servlets.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/build.xml

    r37512 r37626  
    16621662    </if>
    16631663    <copy file="${basedir}/resources/cgi/gsdl3site.cfg.svn" tofile="${basedir}/resources/cgi/gsdl3site.cfg.in" overwrite="true"/>
     1664
     1665    <if>
     1666      <bool><available file="${basedir}/resources/web/servlets.xml.in"/></bool>
     1667      <copy file="${basedir}/resources/web/servlets.xml.in" tofile="${basedir}/resources/web/servlets.xml.in.backup"  overwrite="true"/>
     1668    </if>
     1669    <copy file="${basedir}/resources/web/servlets.xml.svn" tofile="${basedir}/resources/web/servlets.xml.in"  overwrite="true"/>
    16641670
    16651671    <if>
    … …  
    27592765    </exec>
    27602766
     2767    <copy file="${basedir}/resources/web/servlets.xml.in" tofile="${web.home}/WEB-INF/servlets.xml" overwrite="true">
     2768      <filterset>
     2769    <filter token="googlesigninclientid" value="${tomcat.googlesigninJDBCRealm.clientid}"/>
     2770    <!-- the following might be useful, but not currently included, as not currently used -->
     2771    <!--
     2772        <filter token="gsdl3webhome" value="${web.home}"/>
     2773        <filter token="gsdl3webwritablehome" value="${web.writablehome}"/>
     2774    <filter token="tomcathome" value="${basedir}/packages/tomcat"/>
     2775    -->
     2776      </filterset>
     2777    </copy>
     2778
    27612779    <copy file="${basedir}/ext/solr/solr-tomcat-context.xml.in" tofile="${packages.home}/tomcat/conf/Catalina/localhost/solr.xml" overwrite="true">
    27622780      <filterset>
    … …  
    27822800    <filter token="derbyserverport" value="${derby.server.port}"/>
    27832801    <filter token="googlesigninclientid" value="${tomcat.googlesigninJDBCRealm.clientid}"/>
    2784 
    27852802      </filterset>
    27862803    </copy>
Note: See TracChangeset for help on using the changeset viewer.