From b95b21299e7f317f7eda5ad6fbadd979fe927b7a Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Thu, 24 Oct 2013 11:03:50 -0400
Subject: [PATCH] VIVO-380 Check that Tomcat exists before trying to deploy to
 it.

---
 webapp/build.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/webapp/build.xml b/webapp/build.xml
index 6b60d1fe4..00f61f423 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -102,6 +102,24 @@
 	<target name="deployProperties" depends="buildProperties">
 		<fail unless="vitro.home" message="${build.properties.file} must contain a value for vitro.home" />
 		<fail unless="tomcat.home" message="${build.properties.file} must contain a value for tomcat.home" />
+		<fail>
+			<condition>
+				<not>
+					<available file="${tomcat.home}" />
+				</not>
+			</condition>
+            Tomcat home directory '${tomcat.home}' does not exist. 
+            Check the value of 'tomcat.home' in your build.properties file.
+		</fail>
+		<fail>
+			<condition>
+				<not>
+					<available file="${tomcat.home}/webapps" />
+				</not>
+			</condition>
+            '${tomcat.home}' does not refer to a valid Tomcat instance: it has no 'webapps' sub-directory. 
+            Check the value of 'tomcat.home' in your build.properties file."
+		</fail>
 
 		<property name="solr.home.dir" location="${vitro.home}/solr" />