From 6ea86f71973cec3522f6f8d5ebb7adb3fb898281 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 29 Mar 2010 16:23:00 +0000
Subject: [PATCH] NIHVIVO-242 Remove from the Tomcat deploy area any ontology
 or submodel files that are left over from previous builds.

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

diff --git a/webapp/build.xml b/webapp/build.xml
index ceaa34605..298f72ac5 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -205,6 +205,10 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 			<fileset file="${webapp.dir}/config/dwr.xml" />
 		</copy>
 
+		<copy todir="${build.dir}/war/WEB-INF">
+			<fileset dir="${webapp.dir}" includes="ontologies/**/*" />
+		</copy>
+
 		<copy file="${webapp.dir}/config/default.log4j.properties"
 		      tofile="${build.dir}/war/WEB-INF/classes/log4j.properties"
 		      filtering="true">
@@ -257,6 +261,16 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 		<copy todir="${webapp.deploy.home}">
 			<fileset dir="${build.dir}/war" />
 		</copy>
+
+		<!-- Discard any ontology files from previous builds. -->
+		<sync todir="${webapp.deploy.home}/WEB-INF/ontologies" includeEmptyDirs="true">
+			<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">
+			<fileset dir="${build.dir}/war/WEB-INF/submodels" includes="**/*" />
+		</sync>
 	</target>
 
 </project>