[Yanel-commits] rev 42290 - public/yanel/trunk/src/build/targets/continuous-integration

[michi at wyona.com]

Author: michi
Date: 2009-04-06 23:38:49 +0200 (Mon, 06 Apr 2009)
New Revision: 42290

Modified:
   public/yanel/trunk/src/build/targets/continuous-integration/CI
Log:
hardcoded tomcat fixed

Modified: public/yanel/trunk/src/build/targets/continuous-integration/CI
===================================================================
--- public/yanel/trunk/src/build/targets/continuous-integration/CI	2009-04-06 21:17:04 UTC (rev 42289)
+++ public/yanel/trunk/src/build/targets/continuous-integration/CI	2009-04-06 21:38:49 UTC (rev 42290)
@@ -7,12 +7,10 @@
 set -ex
 HTTP_PORT=$1
 HTTPS_PORT=$2
-#TOMCAT_HOME=/home/michi/src/yanel-trunk/hudson/yanel-trunk/apache-tomcat-5.5.20 #XXX HACK: leaving that blank does not work yet
-TOMCAT_HOME=/opt/hudson/home/jobs/Yanel-trunk/workspace/yanel-trunk.working-copy/local/apache-tomcat-5.5.20 #XXX HACK: leaving that blank does not work yet
-#TOMCAT_HOME=/Users/michaelwechner/src/wyona/public/yanel/trunk/hudson/apache-tomcat-5.5.20 #XXX HACK: leaving that blank does not work yet
+TOMCAT_HOME=../../local/apache-tomcat-5.5.20 #NOTE: Relative to tools/apache-tomcat/ directory
 #WEBTEST_HOME_DIR=/home/michi/local/canoo-DEV_R_1721
 WEBTEST_HOME_DIR=/opt/canoo/webtest-3.0-R_1758
-#WEBTEST_HOME_DIR=/Users/michaelwechner/local/canoo-VERSION_r_1762
+#WEBTEST_HOME_DIR=/Users/michaelwechner/local/canoo-2.6_r_1689
 
 YANEL_SOURCE_HOME=`dirname $0`/../../../..
 cd $YANEL_SOURCE_HOME
@@ -22,7 +20,7 @@
 
 ./yanel.sh configure -Danswer=NO \
  -DanswerReconfigureTomcat1=no \
- -DpathOfUserSpecificTomcat=$TOMCAT_HOME
+ -DanswerAskForCustomTomcatPath=NO
 #FIXME: we do not reconfigure Tomcat for SSL because Canoo tests fail with SSL activated! :/
 
 #BUILD_OPTS="-Dtomcat1.ssl.port=$HTTPS_PORT -Dtomcat1.http.port=$HTTP_PORT"