template engine changes

README.md

@@ -10,6 +10,8 @@ Build
 * Build the SADE modules for eXist with ant.
 * Build the distribution zip file with build.sh from dist-utils.
 
+Prepared builds are available via ci.de.dariah.eu: [![Build Status](https://ci.de.dariah.eu/jenkins/job/SADE/badge/icon)](https://ci.de.dariah.eu/jenkins/job/SADE)
+
 Configuration
 =============
 

build.properties

@@ -0,0 +1,11 @@
+#Mon, 15 Apr 2013 13:42:45 +0200
+# default build properties, create local.build.properties to override
+
+app.name=SADE
+app.uri=http://telota.de/sade
+app.version=0.3
+projects.dir=sade-projects
+
+# set conf.overwrite to true if src/repo.xml, src/expath-pkg.xml and src/core/config.xql 
+# should be overwritten from their templates
+conf.overwrite=false

build.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="xar" name="packages">
 
+   <property file="local.build.properties"/>
    <property file="build.properties"/>
 
 	<import file="build_docs.xml" />   
@@ -9,9 +10,12 @@
 	<property name="build.dir" value="${basedir}/build"/>
 	<target name="xar">
 	  <ant dir="src"/>
-	  <ant dir="sample-projects"/>
+	  <!--ant dir="sample-projects"/-->
 	</target>
   <target name="clean">
     <delete dir="build"/>
   </target>
+  <target name="sade-dist-build">
+    <ant antfile="dist-utils/antbuild/build.xml" inheritAll="false"/> 
+  </target>
 </project>

dist-utils/antbuild/build.xml

@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+    basedir="."
+    default="build"
+    name="SADE"
+    xmlns:ivy="antlib:org.apache.ivy.ant"
+    xmlns:git="antlib:com.rimerosolutions.ant.git">
+
+    <property name="build.dir" value="${basedir}/build"/>
+    <property name="resources.dir" value="${basedir}/resources"/>
+
+    <property name="ivy.install.version" value="2.3.0"/>
+    <property name="ivy.jar.dir" value="${basedir}/lib"/>
+    <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
+
+    <property name="exist.git" value="https://github.com/eXist-db/exist.git"/>
+    <property name="exist.tag" value="eXist-2.2"/>
+<!--    <property name="exist.branch" value="00db4c3d9538337b705f7f30c98ba4a54bf05227" /> -->
+
+    <property name="exist.dest" value="${build.dir}/exist-git"/>
+    <property name="exist.dist" value="${exist.dest}/dist/eXist-db-2.2"/>
+    <property name="sade.src" value="../../"/>
+    <property name="markdown.xar.version" value="0.4"/>
+
+    <property name="sade.tgz.file" value="${build.dir}/sade.tar.gz"/>
+    <property name="tgsade.tgz.file" value="${build.dir}/sade-textgrid.tar.gz"/>
+
+    <property name="tg.defp.dest" value="${build.dir}/sade-textgrid-default-project"/>
+    <property name="tg.sadeconnect.dest" value="${build.dir}/textgrid-sade-connector"/>
+
+   <target name="build" depends="exist-git">
+   <!--<target name="build" depends="exist-git">-->
+        <echo message="building eXist"/>
+
+        <!-- add some more xar packages to autodeploy --> 
+        <copy file="${resources.dir}/local.build.properties.override" tofile="${exist.dest}/build.properties" />
+
+        <!-- include cqlparser in build-->
+        <copy file="${resources.dir}/exist.extension.properties.override" tofile="${exist.dest}/extensions/local.build.properties" />
+
+        <antcall target="existBuild"/>
+
+        <!-- include cqlparser in conf.xml -->
+        <replace file="${exist.dist}/conf.xml">
+                <replacetoken>&lt;module uri="http://exist-db.org/xquery/cqlparser"           class="org.exist.xquery.modules.cqlparser.CQLParserModule" /&gt;</replacetoken>
+                <replacevalue>--&gt; &lt;module uri="http://exist-db.org/xquery/cqlparser"           class="org.exist.xquery.modules.cqlparser.CQLParserModule" /&gt; &lt;!--</replacevalue>
+        </replace>
+        <!-- former patch, now replaced <patch patchfile="${resources.dir}/conf.xml.cqlparser.patch" originalfile="${exist.dist}/conf.xml" ignorewhitespace="true" failonerror="true" /> -->
+
+
+        <echo message="building and integrating SADE"/>
+        <ant antfile="${sade.src}/build.xml" inheritAll="false" />
+        <!-- add xar files to autodeploy -->
+        <mkdir dir="${exist.dist}/autodeploy"/>
+        <copy todir="${exist.dist}/autodeploy">
+            <fileset dir="${exist.dest}/autodeploy/" includes="*.xar"/>
+            <fileset dir="${sade.src}/build" includes="*.xar"/>
+        </copy>
+    	  <get src="http://demo.exist-db.org/exist/apps/public-repo/public/markdown-${markdown.xar.version}.xar"
+    		  dest="${exist.dist}/autodeploy/markdown-${markdown.xar.version}.xar"/>
+        <!-- add bin/sade.sh symlink for backwards compatibility / does not work with tar / zip-->
+        <!--symlink link="${exist.dist}/bin/sade.sh" resource="../tools/wrapper/bin/exist.sh"/>
+        <symlink link="${exist.dist}/bin/sade.bat" resource="../tools/wrapper/bin/exist.bat"/-->
+
+        <antcall target="tgz" />
+        <antcall target="textgrid-tgz" />
+
+    </target>
+
+    <target name="existBuild">
+       <!-- get updated xars to autodeploy dir -->
+       <delete dir="${exist.dest}/autodeploy" />
+       <java classname="org.apache.tools.ant.launch.Launcher" fork="true">
+         <arg value="-Dant.home=${exist.dest}/tools/ant"/>
+         <arg value="-Dant.library.dir=${exist.dest}/tools/ant/lib"/>
+         <arg value="-Divy.default.ivy.user.dir=${basedir}/ivy" />
+         <arg value="-Djavax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFactoryImpl"/>
+         <arg value="-f"/>
+         <arg value="${exist.dest}/build.xml"/>
+         <arg value="all"/>
+         <arg value="dist"/>
+         <classpath>
+           <pathelement location="${exist.dest}/tools/ant/lib/ant-launcher.jar"/>
+           <!--pathelement path="${java.class.path}"/-->
+         </classpath>
+       </java>
+    </target>
+
+    <target name="tgz">
+        <delete file="${sade.tgz.file}" />
+        <delete dir="${build.dir}/sade" />
+        <move file="${exist.dist}" toFile="${build.dir}/sade" />
+        <tar destfile="${sade.tgz.file}" compression="gzip" longfile="gnu">
+            <tarfileset dir="${build.dir}" filemode="755">
+                <include name="sade/**/*.sh"/>
+                <include name="sade/tools/wrapper/bin/**"/>
+            </tarfileset>
+            <tarfileset dir="${build.dir}" includes="sade/**">
+                <exclude name="sade/**/*.sh"/>
+                <exclude name="sade/tools/wrapper/bin/**" />
+                <!--exclude name="sade/extensions/**" />
+                <exclude name="sade/src/**" /-->
+            </tarfileset>
+        </tar>
+    </target>
+
+    <target name="textgrid-tgz" depends="textgrid-default-project,textgrid-sade-connector">
+        <delete file="${tgsade.tgz.file}" />
+        <!--delete dir="${build.dir}/sade" /-->
+        <!--move file="${exist.dist}" toFile="${build.dir}/sade" /-->
+        <move file="${tg.sadeconnect.dest}/build/textgrid-connect-0.1.xar" toFile="${build.dir}/sade/autodeploy/textgrid-connect-0.1.xar" />
+        <move file="${tg.defp.dest}/build/sade-textgrid-default-project.xar" toFile="${build.dir}/sade/autodeploy/sade-textgrid-default-project.xar" />
+        <tar destfile="${tgsade.tgz.file}" compression="gzip" longfile="gnu">
+            <tarfileset dir="${build.dir}" filemode="755">
+                <include name="sade/**/*.sh"/>
+                <include name="sade/tools/wrapper/bin/**"/>
+            </tarfileset>
+            <tarfileset dir="${build.dir}" includes="sade/**">
+                <exclude name="sade/**/*.sh"/>
+                <exclude name="sade/tools/wrapper/bin/**" />
+                <!--exclude name="sade/extensions/**" />
+                <exclude name="sade/src/**" /-->
+            </tarfileset>
+        </tar>
+    </target>
+
+    <target name="textgrid-default-project" depends="ant-dependencies">
+        <if>
+            <available file="${tg.defp.dest}" type="dir" />
+            <then>
+                <delete dir="${tg.defp.dest}"/>
+            </then>
+        </if>
+
+        <echo message="cloning https://github.com/ubbo/sade-textgrid-default-project.git" />
+        <git:git directory="${tg.defp.dest}" verbose="false">
+            <git:clone uri="https://github.com/ubbo/sade-textgrid-default-project.git" />
+        </git:git>
+
+        <echo message="packaging sade-textgrid-default-project.xar" />
+        <ant antfile="${tg.defp.dest}/build.xml" inheritAll="false" />
+    </target>
+
+    <target name="textgrid-sade-connector" depends="ant-dependencies">
+        <if>
+          <available file="${tg.sadeconnect.dest}" type="dir" />
+          <then>
+            <echo message="updating tg-sade-connector git repository" />
+            <git:git directory="${tg.sadeconnect.dest}" verbose="false">
+                 <git:pull />
+            </git:git>
+          </then>
+          <else>
+            <echo message="cloning https://github.com/ubbo/textgrid-sade-connector.git"/>
+            <git:git directory="${tg.sadeconnect.dest}" verbose="false">
+                 <git:clone uri="https://github.com/ubbo/textgrid-sade-connector.git"/>
+            </git:git>
+          </else>
+        </if>
+        <echo message="packaging textgrid-sade-connector.xar"/>
+        <ant antfile="${tg.sadeconnect.dest}/build.xml" inheritAll="false" />
+    </target>
+
+    <target name="exist-git" depends="ant-dependencies">
+        <!-- TODO: use http://ant.apache.org/manual/properties.html#if+unless -->
+        <if>
+          <available file="${exist.dest}" type="dir" />
+
+          <then>
+            <echo message="updating exist git repository" />
+            <git:git directory="${exist.dest}" verbose="false">
+                 <!-- <git:checkout branchName="${exist.branch}" /> -->
+                 <git:checkout branchName="${exist.tag}" />
+                 <!-- todo: pull does not (and does not need to) work with detached branch -->
+                 <!-- <git:pull /> -->
+            </git:git>
+          </then>
+
+          <else>
+            <echo message="cloning exist git repository"/>
+            <git:git directory="${exist.dest}" verbose="false">
+                 <git:clone uri="${exist.git}"/>
+                 <!-- <git:checkout branchName="${exist.branch}" /> -->
+                 <git:checkout branchName="${exist.tag}" />
+            </git:git>
+
+          </else>
+        </if>
+    </target>
+
+    <target name="ant-dependencies" depends="install-ivy">
+        <property name="ivy.default.ivy.user.dir" value="${basedir}/ivy"/>
+        <ivy:retrieve conf="tasks" />
+        <path id="classpath">
+            <fileset dir="./lib">
+                <include name="*.jar"/>
+            </fileset>
+        </path>
+        <!-- git -->
+        <taskdef uri="antlib:com.rimerosolutions.ant.git"
+                 resource="com/rimerosolutions/ant/git/jgit-ant-lib.xml"
+                 classpathref="classpath"/>
+        <!-- contrib has if -->
+        <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="classpath" />
+    </target>
+
+    <target name="download-ivy" unless="skip.download">
+    	<mkdir dir="${ivy.jar.dir}"/>
+    	<get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+    		 dest="${ivy.jar.file}" usetimestamp="true"/>
+    </target>
+
+    <target name="install-ivy" depends="download-ivy" description="--> install ivy">
+    	<path id="ivy.lib.path">
+    	    <pathelement location="${ivy.jar.file}"/>
+    	</path>
+    	<taskdef resource="org/apache/ivy/ant/antlib.xml"
+    	          uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+    </target>
+
+</project>

dist-utils/antbuild/ivy.xml

@@ -0,0 +1,17 @@
+<ivy-module version="2.0">
+    <info organisation="sade" module="sadebuild"/>
+
+    <configurations>
+      <conf name="tasks" description="Ant tasks"/>
+    </configurations>
+
+    <dependencies>
+        <dependency org="com.rimerosolutions.ant" name="ant-git-tasks" rev="0.0.1"/>
+        <dependency org="org.eclipse.jgit" name="org.eclipse.jgit.ant" rev="3.0.0.201306101825-r"/>
+        <dependency org="org.eclipse.jgit" name="org.eclipse.jgit" rev="3.0.0.201306101825-r" />
+        <dependency org="com.jcraft" name="jsch" rev="0.1.50" />
+
+        <dependency org="ant-contrib" name="ant-contrib" rev="20020829"/>
+    </dependencies>
+
+</ivy-module>

dist-utils/antbuild/resources/conf.xml.cqlparser.patch

@@ -0,0 +1,12 @@
+--- conf.xml.tmpl	2015-01-20 13:37:32.076323654 +0100
++++ conf.xml	2015-01-20 13:42:52.155281285 +0100
+@@ -898,7 +898,9 @@
+             <module uri="http://exist-db.org/xquery/cssparser" class="org.exist.xquery.modules.cssparser.CSSParserModule"/>
+             <module uri="http://exist-db.org/xquery/backups"            class="org.exist.backup.xquery.BackupModule" />
+             <module uri="http://exist-db.org/xquery/cache"              class="org.exist.xquery.modules.cache.CacheModule" />
++-->
+             <module uri="http://exist-db.org/xquery/cqlparser"           class="org.exist.xquery.modules.cqlparser.CQLParserModule" />
++<!--
+             <module uri="http://exist-db.org/xquery/exi"                class="org.exist.xquery.modules.exi.ExiModule" />
+             <module uri="http://exist-db.org/xquery/jfreechart"         class="org.exist.xquery.modules.jfreechart.JFreeChartModule" /> 
+             <module uri="http://exist-db.org/xquery/memcached"          class="org.exist.xquery.modules.memcached.MemcachedModule" />

dist-utils/antbuild/resources/exist.extension.properties.override

@@ -0,0 +1 @@
+include.module.cqlparser = true

dist-utils/antbuild/resources/local.build.properties.override

@@ -0,0 +1,81 @@
+#
+# 
+#
+# $Id$
+project.name = eXist-db
+project.version = 2.2
+project.version.numeric = 2.2
+project.codename = Ruesselsheim
+
+# build settings
+build.debug = on
+build.optimize = on
+build.deprecation = off
+build.encoding = UTF-8
+build.compiler.pedantic = false
+build.compiler=modern
+build.compiler.source=1.7
+build.compiler.target=1.7
+
+autodeploy=dashboard,shared,eXide,monex,functx
+autodeploy.repo=http://demo.exist-db.org/exist/apps/public-repo
+use.autodeploy.feature=true
+
+# output dir for junit reports
+junit.reports = test
+junit.output = true
+junit.forked.VM.maxmemory = 512m
+# Converted junit tests from external testsuites 
+# reuire more memory, e g 
+# XSLTS requires 512m
+# XQTS requires more than 400m
+junit.forked.VM.maxmemory.external = 512m
+proxy.nonproxyhosts = 
+proxy.host =
+proxy.port = 0
+proxy.password =
+proxy.user =
+proxy.socks.host =
+proxy.socks.port = 0
+#proxy.ntlm.domain = 
+
+# Ant
+tools.ant = ./tools/ant
+
+#aspectj
+tools.aspectj = ./tools/aspectj
+
+# Common libs
+lib.core = ./lib/core
+lib.optional = ./lib/optional
+lib.endorsed = ./lib/endorsed
+lib.user = ./lib/user
+lib.extensions = ./lib/extensions
+lib.test = ./lib/test
+
+# antlr is only needed if you change the XPath/XQuery parser
+# set these properties to true to get a lot of debugging output
+antlr.traceParser = false
+antlr.traceLexer = false
+antlr.traceTreeWalker = false
+
+# IZPack is required to create the installer package.
+# We currently require IzPack 4.3.5. The Izpack 5.0 beta does NOT work.
+# If you change this property value for a reason, 
+# please use a version indicator in directory name,
+# eg /izpack-dir-path/izpack-5.0-beta-11.
+# You might need to change PermSpace to atleast 84 MB eg -XX:MaxPermSize=84m
+# If you only want to point to your own izpack installation directory
+# add this in local.build.properties instead so you don't commit it by mistake.
+#
+# For generating the MacOSX bundle please download the "Java Application Bundler" from
+# https://java.net/projects/appbundler (store in IzPack/lib)
+izpack.dir = /Applications/IzPack/
+
+# Launch4J is required to create the windows installer
+# If you change this property value for a reason, 
+# please use a version indicator in directory name,
+# eg /launch4j-dir-path/launch4j-x.x.x.
+# If you only want to point to your own launch4j installation directory
+# add this in local.build.properties instead so you don't commit it by mistake.
+launch4j.dir = /Applications/launch4j/