Changeset 32622

Show
Ignore:
Timestamp:
22.11.2018 16:30:29 (3 weeks ago)
Author:
ak19
Message:

1. Now the Macronizer will work easily with a GS3, first 'run/source gs3-setup' in your GS3 installation before running the 'ant' command in your macronizer svn checkout (in the same terminal). 2. This will now copy the new context (template) macronizer.xml.in file into the GS3's tomcat. So you can then, in a new terminal, run/source gs3-setup.sh in y our GS3 followed by 'ant restart' in the same GS3 installation folder to start up tomcat. Then visit localhost:8383/macronizer to see the running macronizer. 3. Western's log4j.properties fix of hh to HH again.

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

Legend:

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

    r32621 r32622  
    33 
    44  <property environment="env"/> 
    5   <property name="gsdl3.src.home" value="env.GSDL3HOME"/> 
     5  <!-- 
     6      the associated Greenstone 3 installation folder 
     7      You're expected to run/source the gs3-setup script in the GS3 
     8      before running the default ant target in this file. 
     9      You will be warned of this if you attempt to run this ant 
     10      build.xml file without doing gs3-setup. 
     11  --> 
     12  <property name="gsdl3.web.home" value="${env.GSDL3HOME}"/> 
     13  <property name="gsdl3.src.home" value="${env.GSDL3SRCHOME}"/> 
     14   
    615  <property name="dist.dir.exp" location="releases" /> 
    716   
     
    6877     or when the destination file does not exist. However, you can explicitly overwrite files 
    6978     with the overwrite attribute.--> 
    70     <copy file="${build.dir.exp}/log4j.properties.in" tofile="${gsdl3.src.home}/web/WEB-INF/classes/log4j.properties"/> 
    71  
     79     
     80    <!-- 1. Create the log4j.properties file from its log4j.properties.in template file and put it into the correct location in the associated GS3 installation 
     81     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 
     82    -->     
     83     
     84    <filter token="macronizer.home" value="${basedir}"/> 
     85    <copy file="${build.dir.exp}/log4j.properties.in" tofile="${gsdl3.web.home}/WEB-INF/classes/log4j.properties" filtering="true" overwrite="true"/> 
     86    <copy file="${build.dir.exp}/macronizer.xml.in" tofile="${gsdl3.src.home}/packages/tomcat/conf/Catalina/localhost/macronizer.xml" filtering="true" overwrite="true"/> 
     87     
    7288    <!-- mkdir Creates a directory. Also non-existent parent directories are created, 
    7389     when necessary. Does nothing if the directory already exist. --> 
     
    7793     
    7894  <target name="war" depends="build"> 
     95    <echo>Basedir: ${basedir}</echo> 
    7996    <jar destfile="${dist.filename.exp}">   
    8097      <fileset dir="${build.dir.exp}" /> 
  • other-projects/the-macronizer/trunk/web/log4j.properties.in

    r31962 r32622  
    55 
    66# define some reusable properties 
    7 macronizer.home=/greenstone/macron-restoration 
     7macronizer.home=@macronizer.home@ 
    88macronizer.logplace=${macronizer.home}/web/logs 
    99 
     
    2424 
    2525log4j.appender.macronlog.layout=org.apache.log4j.PatternLayout 
    26 log4j.appender.macronlog.layout.ConversionPattern=%-5p: [%d{yyyy-MM-dd hh:mm:ss}] %C{1}.%M()%n %m%n 
     26log4j.appender.macronlog.layout.ConversionPattern=%-5p: [%d{yyyy-MM-dd HH:mm:ss}] %C{1}.%M()%n %m%n 
    2727 
    2828#######################