From bd9e92536c54eccade28b4a47def2d60795ba010 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 13 Mar 2015 17:30:04 -0700
Subject: [PATCH] CSPACE-6585: Remove obsolete and merged tenant bindings files
 from newly-cloned tenant folder.

---
 build-tenant.xml       | 26 +++++++++++++++++++++-----
 tenant-utils-build.xml | 18 ++++++++++++++----
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/build-tenant.xml b/build-tenant.xml
index 50c185baa..217f75aa3 100644
--- a/build-tenant.xml
+++ b/build-tenant.xml
@@ -26,13 +26,32 @@
    <!-- This target inherits from an existing target in the imported
         utility routines buildfile, and adds its own behavior specific to this
         CollectionSpace source code layer. -->
-   <target name="rename-files" depends="tenant-utils.rename-files">
+   <target name="rename-files-in-cloned-tenant" depends="tenant-utils.rename-files-in-cloned-tenant">
      <move todir="${tenants.dir}/${tenant.shortname}" includeemptydirs="false">
        <fileset dir="${tenants.dir}/${tenant.shortname}"/>
        <mapper type="regexp" from="^(.*?)${template.tenant.shortname}(.*)$" to="\1${tenant.shortname}\2"/>
      </move>
    </target>
-  
+   
+  <!-- This target inherits from an (essentially empty) target in the imported
+      utility routines buildfile, and adds its own behavior specific to this
+      CollectionSpace source code layer. -->
+  <target name="delete-files-in-cloned-tenant"
+    depends="tenant-utils.delete-files-in-cloned-tenant,
+    delete-obsolete-tenant-bindings-delta,
+    delete-merged-tenant-bindings">
+  </target>
+
+  <!-- TODO: Delete the (obsolete) tenant-bindings.delta.xml file, if any,
+      as this file is used only by CollectionSpace 3.3 and earlier versions. -->
+  <target name="delete-obsolete-tenant-bindings-delta">
+    <delete file="${tenant.dir}/tenant-bindings.delta.xml" failonerror="false"/>
+  </target>
+
+  <target name="delete-merged-tenant-bindings">
+    <delete file="${tenant.dir}/tenant-bindings.merged.xml" failonerror="false"/>
+  </target>
+
   <!-- This target inherits from an (essentially empty) target in the imported
        utility routines buildfile, and adds its own behavior specific to this
        CollectionSpace source code layer. -->
@@ -71,9 +90,6 @@
       flags="gm"/>
   </target>
   
-  <!-- TODO: Delete the (obsolete) tenant-bindings.delta.xml and any
-       tenant-bindings.merged.xml file in the newly-cloned tenant. -->
-
   <!-- This target inherits from an (essentially empty) target in the imported
        utility routines buildfile, and adds its own behavior specific to this
        CollectionSpace source code layer. -->
diff --git a/tenant-utils-build.xml b/tenant-utils-build.xml
index 309e6ac0e..9d357a864 100644
--- a/tenant-utils-build.xml
+++ b/tenant-utils-build.xml
@@ -17,8 +17,12 @@
   
   <!-- Main target -->
   
-  <target name="clone-tenant" depends="clone-template-folder,
-    clone-other-template-files,rename-files,update-text-in-cloned-tenant"
+  <target name="clone-tenant"
+    depends="clone-template-folder,
+    clone-other-template-files,
+    rename-files-in-cloned-tenant,
+    delete-files-in-cloned-tenant,
+    update-text-in-cloned-tenant"
     description="Make a copy ('clone') of an existing tenant (used as a template) to create a new tenant">
   </target>
   
@@ -40,13 +44,19 @@
   
   <!-- This (essentially empty) target can be inherited and overridden by
        any Ant buildfile that imports this tenant-utils buildfile. -->
-  <target name="rename-files" depends="clone-other-template-files">
+  <target name="rename-files-in-cloned-tenant" depends="clone-other-template-files">
     <echo message="Renaming files, where applicable ..."/>
   </target>
+  
+  <!-- This (essentially empty) target can be inherited and overridden by
+       any Ant buildfile that imports this tenant-utils buildfile. -->
+  <target name="delete-files-in-cloned-tenant" depends="rename-files-in-cloned-tenant">
+    <echo message="Deleting files, where applicable ..."/>
+  </target>  
 
   <!-- This (essentially empty) target can be inherited and overridden by
        any Ant buildfile that imports this tenant-utils buildfile. -->
-  <target name="update-text-in-cloned-tenant" depends="rename-files">
+  <target name="update-text-in-cloned-tenant" depends="delete-files-in-cloned-tenant">
     <echo message="Updating text in the newly-cloned tenant ..."/>
   </target>
 
-- 
2.47.3