From 44f9706d82a785ae7b8e973931130ef77447ec15 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 30 Apr 2010 14:02:49 +0000
Subject: [PATCH] NIHVIVO-327 Set <sync> steps to not fail if ontologies or
 submodels directories are missing. Modify <copyetc> target to copy those
 directories even if they are empty.

---
 webapp/build.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/webapp/build.xml b/webapp/build.xml
index c92a3cc6c..22548ed8d 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -197,7 +197,10 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 		</copy>
 
 		<copy todir="${build.dir}/war/WEB-INF">
+			<fileset dir="${webapp.dir}" includes="ontologies" />
 			<fileset dir="${webapp.dir}" includes="ontologies/**/*" />
+			<fileset dir="${webapp.dir}" includes="submodels" />
+			<fileset dir="${webapp.dir}" includes="submodels/**/*" />
 		</copy>
 
 		<copy file="${webapp.dir}/config/default.log4j.properties"
@@ -254,12 +257,16 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 		</copy>
 
 		<!-- Discard any ontology files from previous builds. -->
-		<sync todir="${webapp.deploy.home}/WEB-INF/ontologies" includeEmptyDirs="true">
+		<sync todir="${webapp.deploy.home}/WEB-INF/ontologies"
+		      includeEmptyDirs="true"
+		      failonerror="false">
 			<fileset dir="${build.dir}/war/WEB-INF/ontologies" includes="**/*" />
 		</sync>
 
 		<!-- Discard any submodel files from previous builds. -->
-		<sync todir="${webapp.deploy.home}/WEB-INF/submodels" includeemptydirs="true">
+		<sync todir="${webapp.deploy.home}/WEB-INF/submodels"
+		      includeemptydirs="true"
+		      failonerror="false">
 			<fileset dir="${build.dir}/war/WEB-INF/submodels" includes="**/*" />
 		</sync>
 	</target>