From f70ada1f68e179abd10626f59eda4a1a6539f214 Mon Sep 17 00:00:00 2001
From: Richard Millet <richard.millet@berkeley.edu>
Date: Wed, 23 Nov 2011 18:33:29 +0000
Subject: [PATCH] CSPACE-4526: Updated JaxRsServiceProvider build.xml's deploy
 and undeploy targets to delete Tomcat's copy of our context.xml file at 
 $CATALINA_BASE/conf/[enginename]/[hostname]/cspace-services.xml.  We expected
 Tomcat would replace this file when a new .war was deployed, but it is not. 
 Since the settings in the this file override the ones inside the .war (and
 exploded war) and could be stale, we need to delete it.

---
 services/JaxRsServiceProvider/build.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
index 2dbb4083c..6c712920d 100644
--- a/services/JaxRsServiceProvider/build.xml
+++ b/services/JaxRsServiceProvider/build.xml
@@ -3,14 +3,13 @@
     <description>
         collectionspace services war
     </description>
-  <!-- set global properties for this build -->
+	<!-- set global properties for this build -->
     <property name="services.trunk" value="../.."/>
     <!-- enviornment should be declared before reading build.properties -->
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
-    <property name="cspace-services.war" value="${cspace.services.war}"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -141,20 +140,22 @@
 
     <target name="deploy" depends="package"
     description="deploy cspace services in ${jee.server.cspace}">
+		<delete file="${catalina.context.cspace}"/> <!-- This is a Tomcat specific file that we seem to need to delete inorder for it to be replace with a more recent one during deployment -->
 		<delete dir="${jee.deploy.cspace}/${cspace.services.context}"/>
-        <copy file="${basedir}/target/${cspace-services.war}" todir="${jee.deploy.cspace}"/>
+        <copy file="${basedir}/target/${cspace.services.war}" todir="${jee.deploy.cspace}"/>
     </target>
 
     <target name="undeploy"
     description="undeploy cspace services from ${jee.server.cspace}">
-        <delete file="${jee.deploy.cspace}/${cspace-services.war}"/>
+		<delete file="${catalina.context.cspace}"/> <!-- This is a Tomcat specific file that we seem to need to delete inorder for it to be replace with a more recent one during deployment -->
 		<delete dir="${jee.deploy.cspace}/${cspace.services.context}"/>
+        <delete file="${jee.deploy.cspace}/${cspace.services.war}"/>
     </target>
 
     <target name="dist"
     description="generate distribution for cspace services" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.cspace}">
-            <fileset file="${basedir}/target/${cspace-services.war}"/>
+            <fileset file="${basedir}/target/${cspace.services.war}"/>
         </copy>
     </target>
 
-- 
2.47.3