From 4ebb76c5fcfc61e0c584769252e35a4d0038ece1 Mon Sep 17 00:00:00 2001
From: Adam Retter <adam.retter@googlemail.com>
Date: Fri, 23 Mar 2018 13:38:56 +0000
Subject: [PATCH 1/3] [bugfix] Declare required modules

---
 content/apputil.xql   | 6 ++++++
 content/dbutils.xql   | 3 +++
 content/siteutils.xql | 3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/content/apputil.xql b/content/apputil.xql
index bffddb8..5dc7147 100644
--- a/content/apputil.xql
+++ b/content/apputil.xql
@@ -6,6 +6,12 @@ xquery version "3.0";
  :)
 module namespace apputil="http://exist-db.org/xquery/apps";
 
+import module namespace compression="http://exist-db.org/xquery/compression";
+import module namespace map="http://www.w3.org/2005/xpath-functions/map";
+import module namespace request="http://exist-db.org/xquery/request";
+import module namespace util="http://exist-db.org/xquery/util";
+import module namespace xmldb="http://exist-db.org/xquery/xmldb";
+
 declare namespace expath="http://expath.org/ns/pkg";
 declare namespace repo="http://exist-db.org/xquery/repo";
 
diff --git a/content/dbutils.xql b/content/dbutils.xql
index 4056c8f..6a3b951 100644
--- a/content/dbutils.xql
+++ b/content/dbutils.xql
@@ -2,6 +2,9 @@ xquery version "3.0";
 
 module namespace dbutil="http://exist-db.org/xquery/dbutil";
 
+import module namespace sm="http://exist-db.org/xquery/securitymanager";
+import module namespace xmldb="http://exist-db.org/xquery/xmldb";
+
 (:~ Scan a collection tree recursively starting at $root. Call $func once for each collection found :)
 declare function dbutil:scan-collections($root as xs:anyURI, $func as function(xs:anyURI) as item()*) {
     $func($root),
diff --git a/content/siteutils.xql b/content/siteutils.xql
index 2c072f4..c937ea0 100644
--- a/content/siteutils.xql
+++ b/content/siteutils.xql
@@ -2,8 +2,9 @@ xquery version "3.0";
 
 module namespace site="http://exist-db.org/apps/site-utils";
 
-import module namespace templates="http://exist-db.org/xquery/templates";
 import module namespace apputil="http://exist-db.org/xquery/apps";
+import module namespace request="http://exist-db.org/xquery/request";
+import module namespace templates="http://exist-db.org/xquery/templates";
 
 declare namespace expath="http://expath.org/ns/pkg";
 

From 4a30dba014273183948bb612c6f8174ccab6025e Mon Sep 17 00:00:00 2001
From: Adam Retter <adam.retter@googlemail.com>
Date: Fri, 23 Mar 2018 13:39:18 +0000
Subject: [PATCH 2/3] [bugfix] Fix build on a clean clone

---
 build.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.xml b/build.xml
index bc53cfd..1a46925 100644
--- a/build.xml
+++ b/build.xml
@@ -19,6 +19,8 @@
     </target>
     <target name="ace" depends="prepare-ace">
         <mkdir dir="${ace}"/>
+        <mkdir dir="${ace.src}/build/src-min"/>
+        <mkdir dir="${ace.src}/build/kitchen-sink"/>
         <copy todir="${ace}">
             <fileset dir="${ace.src}/build/src-min"/>
             <fileset dir="${ace.src}/build/kitchen-sink">

From 270bf2792c76eab4e9995adffe19c524540e78fd Mon Sep 17 00:00:00 2001
From: Joe Wicentowski <joewiz@gmail.com>
Date: Mon, 16 Apr 2018 15:26:13 -0400
Subject: [PATCH 3/3] =?UTF-8?q?Delete=20emmet.js=20during=20=E2=80=9Cclean?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

confirmed that ant clean performs all steps that git clean -xdf would have performed.
---
 build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.xml b/build.xml
index 1a46925..32f06ae 100644
--- a/build.xml
+++ b/build.xml
@@ -31,6 +31,7 @@
     </target>
     <target name="clean">
         <delete dir="${ace}"/>
+        <delete file="${scripts}/emmet.js"/>
         <delete dir="${build}"/>
         <delete file="expath-pkg.xml"/>
     </target>