NOJIRA - Added a quick task to check that required environment variables have been...

diff --git a/build.xml b/build.xml
index d456a010142a9c12c18cce6a286f1f3d13fc3b30..7cba456f3a8acef8483ca1a6ffe774f26ff46aa8 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -232,7 +232,7 @@
         <ant antfile="services/build.xml" target="import" inheritAll="false"/>\r
     </target>\r
 \r
-    <target name="deploy" depends="install,setup_nuxeo.conf,setup_cspaceds.cfg,setup_initdb.sql"\r
+    <target name="deploy" depends="checkvars,install,setup_nuxeo.conf,setup_cspaceds.cfg,setup_initdb.sql"\r
             description="deploy services in ${jboss.server.cspace}">\r
         <!-- copy db scripts, etc. -->\r
                                <copy todir="${jboss.server.cspace}/cspace/services/scripts">\r
@@ -248,7 +248,19 @@
         <ant antfile="3rdparty/build.xml" target="deploy" inheritAll="false"/>\r
         <ant antfile="services/build.xml" target="deploy" inheritAll="false"/>\r
 \r
-    </target>\r
+                       </target>\r
+\r
+               <target name="checkvars">\r
+                               <fail unless="env.JBOSS_HOME" \r
+                                                       message="Required environment variable JBOSS_HOME has not been set."/>\r
+                               <fail unless="env.DB_PASSWORD_CSPACE" \r
+                                                       message="Required environment variable DB_PASSWORD_CSPACE has not been set."/>\r
+                               <fail unless="env.DB_PASSWORD_NUXEO" \r
+                                                       message="Required environment variable DB_PASSWORD_NUXEO has not been set."/>\r
+                               <fail unless="env.DB_PASSWORD" \r
+                                                       message="Required environment variable DB_PASSWORD has not been set."/>\r
+               </target>\r
+\r
 \r
                <target name="setup_nuxeo.conf"\r
                                         description="copy nuxeo.conf, replacing keyword to set DB dialect">\r