From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 22 Apr 2015 00:50:33 +0000 (-0700)
Subject: CSPACE-6585: Move import statement earlier to pick up values from properties file... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=0e2846cd5cf9e87d38bba9f31fbfeea09aa39e1e;p=tmp%2Fjakarta-migration.git

CSPACE-6585: Move import statement earlier to pick up values from properties file, prior to their first use.
---

diff --git a/build.xml b/build.xml
index 960f07b8b..ecfffb7fc 100644
--- a/build.xml
+++ b/build.xml
@@ -351,6 +351,11 @@
   <property name="src.dir" value="${basedir}" />
   <property name="tenants.dir" value="${src.dir}/services/common/src/main/cspace/config/services/tenants"/>
 
+  <!-- Imports a set of utility routines for managing tenant folders
+       from a separate Ant buildfile.
+       See http://wiki.apache.org/ant/NewAntFeaturesInDetail/Import -->
+  <import file="./tenant-utils-build.xml"/>
+  
   <!-- Locations of the tenant folders for the
        template tenant and newly-cloned tenant. -->
   <property name="template.tenant.dir" value="${tenants.dir}/${template.tenant.shortname}"/>
@@ -364,11 +369,6 @@
   <property name="tenant.bindings.delta.file"
     value="${tenant.dir}/${tenant.shortname}${tenant.bindings.delta.suffix}"/>
   
-  <!-- Imports a set of utility routines for managing tenant folders
-       from a separate Ant buildfile.
-       See http://wiki.apache.org/ant/NewAntFeaturesInDetail/Import -->
-  <import file="./tenant-utils-build.xml"/>
-  
    <!-- 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. -->