CSPACE-4526: Updated JaxRsServiceProvider build.xml's deploy and undeploy targets...

diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
index 2dbb4083c2195f74d0742e996f4e2e71cbc92529..6c712920da2529a3020902c38f8e429773a0ed22 100644 (file)
--- 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>