From 5d31a9c514fb29a5a92550b1e8fc245c38725ae2 Mon Sep 17 00:00:00 2001
From: Lars Windauer <lars@existsolutions.com>
Date: Tue, 24 Nov 2020 17:14:24 +0100
Subject: [PATCH 1/2] added git info to repo.xml

---
 .gitignore                |   2 +
 README.md                 |  12 +--
 build.properties.xml      |  10 ---
 build.xml                 | 154 +++++++++++---------------------------
 collection.xconf.tmpl     |  26 -------
 repo.xml => repo.xml.tmpl |   2 +-
 6 files changed, 46 insertions(+), 160 deletions(-)
 delete mode 100644 collection.xconf.tmpl
 rename repo.xml => repo.xml.tmpl (82%)

diff --git a/.gitignore b/.gitignore
index 4e5ce30..cb03b90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 build/*
 .existdb.json
 .DS_Store
+expath-pkg.xml
+repo.xml
\ No newline at end of file
diff --git a/README.md b/README.md
index efe95c5..6a34b8f 100644
--- a/README.md
+++ b/README.md
@@ -24,16 +24,6 @@ The data and app are very preliminary and subject to reorganization.
       ```shell
       ant
       ```
-  
-    2. DEV environment: The replication triggers for the producer server are enabled in  `collection.xconf` and point to the dev server's replication service IP.
-      ```shell
-      ant xar-dev
-      ```
-  
-    3. PROD environment: Same as in 2. but for PROD destination
-      ```shell
-      ant xar-prod
-      ```
-
+      
 - Upload build/terms-0.1.xar to eXist-db's Dashboard > Package Manager
 - Open http://localhost:8080/exist/apps/terms
diff --git a/build.properties.xml b/build.properties.xml
index 323cba1..dcdd42d 100644
--- a/build.properties.xml
+++ b/build.properties.xml
@@ -6,14 +6,4 @@
         <title>Terms</title>
         <version>0.4</version>
     </app>
-    <trigger>
-        <provider-url>
-            <dev>failover:tcp://10.0.1.114:61616</dev>
-            <prod>failover:tcp://10.0.1.131:61616</prod>
-        </provider-url>
-        <destination>
-            <dev>dynamicTopics/hsg-replication</dev>
-            <prod>dynamicTopics/hsg-replication</prod>
-        </destination>
-    </trigger>
 </root>
diff --git a/build.xml b/build.xml
index 7870803..0a9c5d8 100644
--- a/build.xml
+++ b/build.xml
@@ -1,136 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project default="xar" name="terms">
+<project default="xar" name="terms" basedir=".">
     <xmlproperty file="build.properties.xml" semanticAttributes="true" keepRoot="false"/>
     <property name="build.dir" value="build"/>
-    
+    <property name="git.repo.path" value="${basedir}/.git"/>
+    <available file="${git.repo.path}" type="dir" property="git.present"/>
+
     <target name="clean">
         <echo message="Deleting xar files..."/>
-        <delete dir="${build.dir}"/>
+        <delete dir="${build.dir}" failonerror="false"/>
+        <delete file="${basedir}/expath-pkg.xml" failonerror="false"/>
+        <delete file="${basedir}/repo.xml" failonerror="false"/>
     </target>
     
-    <target name="prepare">
+    <target name="xar" depends="clean,git.revision" description="create xar file">
         <echo message="Creating build folder..."/>
         <mkdir dir="${build.dir}"/>
-    </target>
-    
-    <target name="copy">
-        <echo message="Copying the files to the build folder..."/>
-        <copy todir="${build.dir}/${app.name}-${app.version}">
-            <fileset dir="${basedir}">
-                <exclude name="${build.dir}/**"/>
-            </fileset>
-        </copy>
-    </target>
-    
-    <target name="apply-filters-to-expath-pkg">
+
         <echo message="Apply values to expath-pkg.xml..."/>
-        <copy todir="${build.dir}/${app.name}-${app.version}" overwrite="true" verbose="true">
-            <fileset file="expath-pkg.xml.tmpl"/>
+        <copy todir="${basedir}" overwrite="true" verbose="true">
+            <fileset file="*.xml.tmpl"/>
             <filterset>
                 <filter token="name" value="${app.name}"/>
                 <filter token="version" value="${app.version}"/>
                 <filter token="url" value="${app.url}"/>
                 <filter token="title" value="${app.title}"/>
+                <filter token="commit-id" value="${git.revision}"/>
+                <filter token="commit-time" value="${git.time}"/>
             </filterset>
             <globmapper from="*.tmpl" to="*"/>
         </copy>
-    </target>
-    
-    <target name="apply-filters-to-producer-dev">
-        <echo message="Apply DEV values to collection.xconf..."/>
-        <copy todir="${build.dir}/${app.name}-${app.version}" overwrite="true" verbose="true">
-            <fileset file="collection.xconf.tmpl"/>
-            <fileset file="expath-pkg.xml.tmpl"/>
-            <filterset>
-                <filter token="provider-url" value="${trigger.provider-url.dev}"/>
-                <filter token="destination" value="${trigger.destination.dev}"/>
-                <filter token="name" value="${app.name}"/>
-                <filter token="version" value="${app.version}"/>
-                <filter token="url" value="${app.url}"/>
-                <filter token="title" value="${app.title}"/>
-            </filterset>
-            <globmapper from="*.tmpl" to="*"/>
-        </copy>
-    </target>
-    
-    <target name="apply-filters-to-producer-prod">
-        <echo message="Apply PROD values to collection.xconf..."/>
-        <copy todir="${build.dir}/${app.name}-${app.version}" overwrite="true" verbose="true">
-            <fileset file="collection.xconf.tmpl"/>
-            <fileset file="expath-pkg.xml.tmpl"/>
-            <filterset>
-                <filter token="provider-url" value="${trigger.provider-url.prod}"/>
-                <filter token="destination" value="${trigger.destination.prod}"/>
-                <filter token="name" value="${app.name}"/>
-                <filter token="version" value="${app.version}"/>
-                <filter token="url" value="${app.url}"/>
-                <filter token="title" value="${app.title}"/>
-            </filterset>
-            <globmapper from="*.tmpl" to="*"/>
-        </copy>
-    </target>
-    
-    <target name="xar-dev" depends="clean,prepare" description="create xar files for DEV environment">
-        <antcall target="copy"/>
-        <antcall target="apply-filters-to-expath-pkg"/>
-        <echo message="------------------------------------------------------------"/>
-        <echo message="Creating DEV 'consumer' xar file..."/>
-        <echo message="------------------------------------------------------------"/>
-        
-        <zip basedir="${build.dir}/${app.name}-${app.version}" destfile="${build.dir}/${app.name}-${app.version}-consumer-dev.xar">
-            <exclude name="${build.dir}/**"/>
-            <exclude name="**/*.tmpl"/>
-        </zip>
-        
-        <antcall target="apply-filters-to-producer-dev"/>
-        
-        <echo message="------------------------------------------------------------"/>
-        <echo message="Creating DEV 'producer' xar file containing triggers..."/>
-        <echo message="------------------------------------------------------------"/>
-        
-        <zip basedir="${build.dir}/${app.name}-${app.version}" destfile="${build.dir}/${app.name}-${app.version}-producer-dev.xar">
-            <exclude name="**/*.tmpl"/>
-        </zip>
-        <delete dir="${build.dir}/${app.name}-${app.version}"/>
-    </target>
-    
-    <target name="xar-prod" depends="clean,prepare" description="create xar files for PROD environment">
-        <antcall target="copy"/>
-        <antcall target="apply-filters-to-expath-pkg"/>
-        
-        <echo message="------------------------------------------------------------"/>
-        <echo message="Creating PROD 'consumer' xar file..."/>
-        <echo message="------------------------------------------------------------"/>
-        
-        <zip basedir="${build.dir}/${app.name}-${app.version}" destfile="${build.dir}/${app.name}-${app.version}-consumer.xar">
-            <exclude name="${build.dir}/**"/>
-            <exclude name="**/*.tmpl"/>
-        </zip>
-        
-        <antcall target="apply-filters-to-producer-prod"/>
-        
-        <echo message="------------------------------------------------------------"/>
-        <echo message="Creating PROD 'producer' xar file containing triggers..."/>
-        <echo message="------------------------------------------------------------"/>
-        
-        <zip basedir="${build.dir}/${app.name}-${app.version}" destfile="${build.dir}/${app.name}-${app.version}-producer.xar">
-            <exclude name="${build.dir}/**"/>
-            <exclude name="**/*.tmpl"/>
-        </zip>
-        <delete dir="${build.dir}/${app.name}-${app.version}"/>
-    </target>
-    
-    <target name="xar" depends="clean,prepare" description="create xar file">
-        <antcall target="copy"/>
-        <antcall target="apply-filters-to-expath-pkg"/>
+
         <echo message="------------------------------------------------------------"/>
         <echo message="Creating xar file..."/>
         <echo message="------------------------------------------------------------"/>
         
-        <zip basedir="${build.dir}/${app.name}-${app.version}" destfile="${build.dir}/${app.name}-${app.version}.xar">
+        <zip basedir="${basedir}" destfile="${build.dir}/${app.name}-${app.version}.xar">
             <exclude name="${build.dir}/**"/>
-            <exclude name="**/*.tmpl"/>
-        </zip>
-        <delete dir="${build.dir}/${app.name}-${app.version}"/>
+            <exclude name="*.tmpl"/>
+        </zip>        
     </target>
-</project>
+
+    <target name="git.revision" description="Store git revision in ${repository.version}" if="git.present">
+        <exec executable="git" outputproperty="git.revision" failifexecutionfails="false" errorproperty="">
+            <arg value="--git-dir=${git.repo.path}"/>
+            <arg value="rev-parse"/>            
+            <arg value="HEAD"/>
+        </exec>
+        <condition property="repository.version" value="${git.revision}" else="unknown">
+            <and>
+                <isset property="git.revision"/>
+                <length string="${git.revision}" trim="yes" length="0" when="greater"/>
+            </and>
+        </condition>
+        <echo>Git repo: ${repository.version}</echo>
+        
+        <exec executable="git" outputproperty="git.time" failifexecutionfails="false" errorproperty="">
+            <arg value="--git-dir=${git.repo.path}"/>
+            <arg value="show"/>
+            <arg value="-s"/>
+            <arg value="--format=%ct"/>
+            <arg value="${git.revision}"/>
+        </exec>
+        <echo>Git time: ${git.time}</echo>
+    </target>  
+</project>
\ No newline at end of file
diff --git a/collection.xconf.tmpl b/collection.xconf.tmpl
deleted file mode 100644
index 2007162..0000000
--- a/collection.xconf.tmpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<collection xmlns="http://exist-db.org/collection-config/1.0">
-    <index xmlns:xs="http://www.w3.org/2001/XMLSchema">
-        <fulltext default="none" attributes="false"/>
-        <lucene><!-- The standard analyzer will ignore stopwords like 'the', 'and' -->
-            <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
-            <analyzer id="ws" class="org.apache.lucene.analysis.core.WhitespaceAnalyzer"/>
-            <text qname="name"/>
-            <text qname="remark"/>
-        </lucene>
-        <range>
-            <create qname="name" type="xs:string"/>
-            <create qname="remark" type="xs:string"/>
-        </range>
-    </index>
-    
-    <!-- Replication -->
-    <triggers>
-        <trigger class="org.exist.jms.replication.publish.ReplicationTrigger">
-            <parameter name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-            <parameter name="java.naming.provider.url" value="@provider-url@"/>
-            <parameter name="connection-factory" value="ConnectionFactory"/>
-            <parameter name="destination" value="@destination@"/>
-        </trigger>
-    </triggers>
-</collection>
diff --git a/repo.xml b/repo.xml.tmpl
similarity index 82%
rename from repo.xml
rename to repo.xml.tmpl
index 1475a82..2d83ede 100644
--- a/repo.xml
+++ b/repo.xml.tmpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<meta xmlns="http://exist-db.org/xquery/repo">
+<meta xmlns="http://exist-db.org/xquery/repo" commit-id="@commit-id@" commit-time="@commit-time@">
     <description>Terms</description>
     <author>Office of the Historian</author>
     <website>https://history.state.gov</website>

From 86b0b099e826afb138ce0c55ef7406e9112d4edf Mon Sep 17 00:00:00 2001
From: Lars Windauer <lars@existsolutions.com>
Date: Tue, 24 Nov 2020 23:34:21 +0100
Subject: [PATCH 2/2] switched from filterset to filterchain

---
 build.xml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 0a9c5d8..ddf44c1 100644
--- a/build.xml
+++ b/build.xml
@@ -19,14 +19,20 @@
         <echo message="Apply values to expath-pkg.xml..."/>
         <copy todir="${basedir}" overwrite="true" verbose="true">
             <fileset file="*.xml.tmpl"/>
-            <filterset>
-                <filter token="name" value="${app.name}"/>
-                <filter token="version" value="${app.version}"/>
-                <filter token="url" value="${app.url}"/>
-                <filter token="title" value="${app.title}"/>
-                <filter token="commit-id" value="${git.revision}"/>
-                <filter token="commit-time" value="${git.time}"/>
-            </filterset>
+            <filterchain>
+                <replacetokens>
+                    <token key="name" value="${app.name}"/>
+                    <token key="version" value="${app.version}"/>
+                    <token key="url" value="${app.url}"/>
+                    <token key="title" value="${app.title}"/>
+                    <token key="commit-id" value="${git.revision}"/>
+                    <token key="commit-time" value="${git.time}"/>
+                </replacetokens>
+                <tokenfilter>
+                    <!-- until we move template processing to XSLT, take care with reserved characters -->
+                    <replacestring from="&amp;" to="&amp;amp;"/>
+                </tokenfilter>
+            </filterchain>
             <globmapper from="*.tmpl" to="*"/>
         </copy>