From: Richard Millet <richard.millet@berkeley.edu>
Date: Wed, 23 Nov 2011 21:36:39 +0000 (+0000)
Subject: CSPACE-4526: Updated JaxRsServiceProvider build.xml's deploy and undeploy targets... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=9603ad31fb44de72baead5aff880f34870a0c74a;p=tmp%2Fjakarta-migration.git

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.
---

diff --git a/build.properties b/build.properties
index 49e8072e5..f5a9dfa56 100644
--- a/build.properties
+++ b/build.properties
@@ -45,7 +45,7 @@ dist.deploy.nuxeo.system=${dist.deploy.nuxeo}/${nuxeo.system}
 dist.deploy.nuxeo.plugins=${dist.deploy.nuxeo}/${nuxeo.plugins}
 
 #JEE Application Server
-jee.release=tomcat-6
+jee.release=apache-tomcat-6.0.33
 jee.dir=${env.CSPACE_JEESERVER_HOME}
 jee.home=${jee.dir}
 jee.bin=${jee.home}/bin
@@ -67,6 +67,12 @@ jee.lib.nuxeo=${jee.server.nuxeo}/lib
 jee.deploy.nuxeo.system=${jee.deploy.nuxeo}/${nuxeo.system}
 jee.deploy.nuxeo.plugins=${jee.deploy.nuxeo}/${nuxeo.plugins}
 
+# Apache Tomcat specific variables
+catalina.engine=Catalina
+catalina.hostname=localhost
+catalina.base=${jee.dir}
+catalina.context.cspace=${jee.dir}/conf/${catalina.engine}/${catalina.hostname}/${cspace.services.context}.xml
+
 #nuxeo database templates directory
 ##old# nuxeo.templates.dir=${jboss.home}/${nuxeo.templates}