Changeset 33865

Show
Ignore:
Timestamp:
23.01.2020 18:49:56 (4 weeks ago)
Author:
ak19
Message:

1. The gs3 context name changed from macronizer to macron-restoration. 2. Western Wilson's sql related changes weren't committed to svn

Location:
other-projects/the-macronizer/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • other-projects/the-macronizer/trunk/build.xml

    r32757 r33865  
    8383    <filter token="macronizer.home" value="${basedir}"/> 
    8484 
    85     <!-- 1. Create the log4j.properties file from its log4j.properties.in template file and put it into the *Macronizer* installation's web/WEB-INF/classes folder --> 
     85    <!-- 1a. Create the log4j.properties file from its log4j.properties.in template file and put it into the *Macronizer* installation's web/WEB-INF/classes folder --> 
    8686    <copy file="${build.dir.exp}/log4j.properties.in" tofile="${build.dir.exp}/WEB-INF/classes/log4j.properties" filtering="true" overwrite="true"/> 
    8787     
     88    <!-- 1b. Create the mysql.props file --> 
     89    <copy file="${build.dir.exp}/mysql.properties.in" tofile="${build.dir.exp}/WEB-INF/classes/mysql.properties" filtering="true" overwrite="true"/> 
     90 
     91    <!-- TODO: Ask Ryan Ko if the following message is fit to be known in public: 
     92     <echo>Make sure to change the mysql db.password property in WEB-INF/classes/mysql.properties</echo> 
     93    --> 
     94 
    8895    <!-- 2. Create the macronizer.xml tomcat context file from the macronizer.xml.in template file and put it into the correct location in the associated GS3 installation --> 
    89     <copy file="${build.dir.exp}/macronizer.xml.in" tofile="${gsdl3.src.home}/packages/tomcat/conf/Catalina/localhost/macronizer.xml" filtering="true" overwrite="true"/> 
     96    <copy file="${build.dir.exp}/macronizer.xml.in" tofile="${gsdl3.src.home}/packages/tomcat/conf/Catalina/localhost/macron-restoration.xml" filtering="true" overwrite="true"/> 
    9097     
    9198    <!-- mkdir Creates a directory. Also non-existent parent directories are created, 
  • other-projects/the-macronizer/trunk/web/macronizer.xml.in

    r32622 r33865  
    55<!-- set reloadable to false for a production version. if true, automatically reloads the webapp if it detects changes in classes or lib directories --> 
    66<!-- see http://tomcat.apache.org/tomcat-5.5-doc/config/context.html for more Context attributes --> 
    7 <Context path="/macronizer"  
     7<Context path="/macron-restoration"  
    88  docBase="@macronizer.home@/web"  
    99  debug="1" reloadable="true"