Changeset 32622 for other-projects/the-macronizer

Timestamp:

2018-11-22T16:30:29+13:00 (5 years 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:

• build.xml (modified) (3 diffs)
• web/log4j.properties.in (modified) (2 diffs)
• web/macronizer.xml.in (added)

other-projects/the-macronizer/trunk/build.xml

@@ -3 +3 @@
 
   <property environment="env"/>
-  <property name="gsdl3.src.home" value="env.GSDL3HOME"/>
+  <!--
+      the associated Greenstone 3 installation folder
+      You're expected to run/source the gs3-setup script in the GS3
+      before running the default ant target in this file.
+      You will be warned of this if you attempt to run this ant
+      build.xml file without doing gs3-setup.
+  -->
+  <property name="gsdl3.web.home" value="${env.GSDL3HOME}"/>
+  <property name="gsdl3.src.home" value="${env.GSDL3SRCHOME}"/>
+  
   <property name="dist.dir.exp" location="releases" />
   
@@ -68 +77 @@
      or when the destination file does not exist. However, you can explicitly overwrite files
      with the overwrite attribute.-->
-    <copy file="${build.dir.exp}/log4j.properties.in" tofile="${gsdl3.src.home}/web/WEB-INF/classes/log4j.properties"/>
-
+    
+    <!-- 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
+     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
+    -->    
+    
+    <filter token="macronizer.home" value="${basedir}"/>
+    <copy file="${build.dir.exp}/log4j.properties.in" tofile="${gsdl3.web.home}/WEB-INF/classes/log4j.properties" filtering="true" overwrite="true"/>
+    <copy file="${build.dir.exp}/macronizer.xml.in" tofile="${gsdl3.src.home}/packages/tomcat/conf/Catalina/localhost/macronizer.xml" filtering="true" overwrite="true"/>
+    
     <!-- mkdir Creates a directory. Also non-existent parent directories are created,
      when necessary. Does nothing if the directory already exist. -->
@@ -77 +93 @@
     
   <target name="war" depends="build">
+    <echo>Basedir: ${basedir}</echo>
     <jar destfile="${dist.filename.exp}">  
       <fileset dir="${build.dir.exp}" />

other-projects/the-macronizer/trunk/web/log4j.properties.in

@@ -5 +5 @@
 
 # define some reusable properties
-macronizer.home=/greenstone/macron-restoration
+macronizer.home=@macronizer.home@
 macronizer.logplace=${macronizer.home}/web/logs
 
@@ -24 +24 @@
 
 log4j.appender.macronlog.layout=org.apache.log4j.PatternLayout
-log4j.appender.macronlog.layout.ConversionPattern=%-5p: [%d{yyyy-MM-dd hh:mm:ss}] %C{1}.%M()%n %m%n
+log4j.appender.macronlog.layout.ConversionPattern=%-5p: [%d{yyyy-MM-dd HH:mm:ss}] %C{1}.%M()%n %m%n
 
 #######################