X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=build.xml;h=98fac385ba317abe163cec6d847e5edd8a025bfc;hb=cc00e8d35ca24ebae55ec4192967a74e1678028a;hp=4dbd098e1468fd18569e88d50c960055cb638207;hpb=ee14de5ff3a1bc9a92c4b2c3e0b0d8cef433938d;p=org.ibex.core.git
diff --git a/build.xml b/build.xml
index 4dbd098..98fac38 100644
--- a/build.xml
+++ b/build.xml
@@ -94,6 +94,9 @@
+
@@ -164,14 +167,15 @@
# tidy up and rsync our changes
find www/html -name \*~ | xargs rm -f
+ rm www/html/tmp.[0-9]
rsync -Pv --delete --exclude=html/dist/\* -rze ssh www/ root@${host}:/xwt-new/www/
rsync -u -Pv -rze ssh www/html/dist/ root@${host}:/xwt-new/www/html/dist/
+
# stop services
- /sbin/start-stop-daemon --stop --pidfile /var/log/xwt/apache.pid --exec /usr/sbin/apache
- /sbin/start-stop-daemon --stop --pidfile /var/log/xwt/tomcat.pid --user www-data
+ /etc/init.d/xwt-cluster stop
rm -rf /xwt-`date +%d-%b-%H:%M`
mv /xwt /xwt-`date +%d-%b-%H:%M`
@@ -185,22 +189,14 @@
ln -s /xwt/www/webapps /xwt/www/webapps/WEB-INF
ln -s /xwt/www/launch /xwt/www/launch/ROOT
ln -s /xwt/www/launch /xwt/www/launch/WEB-INF
+ ln -s /xwt/www/wiki /xwt/www/wiki/ROOT
+ ln -s /xwt/www/wiki /xwt/www/wiki/WEB-INF
- export JAVA_HOME=/usr/lib/j2sdk1.3
- export CLASSPATH=$JAVA_HOME/jre/lib/rt.jar:$JAVA_HOME/lib/tools.jar:/usr/share/tomcat/classes:/usr/share/tomcat/lib/tomcat.jar
-
- touch /var/log/xwt/tomcat.log
- chown www-data /var/log/xwt/tomcat.log
-
test ${host} == "xwt-staging.org" && echo -e "User-agent: *\nDisallow: /\n" > /xwt/www/html/robots.txt
+ echo ${staging-flag} > /xwt/staging-flag
- /sbin/start-stop-daemon \
- --start --pidfile /var/log/xwt/tomcat.pid --make-pidfile --chuid www-data --exec \
- /usr/lib/j2sdk1.3/bin/java -- -server -Dtomcat.home=/usr/share/tomcat -Xmx500M \
- org.apache.tomcat.startup.Main -config /xwt/www/etc/server.xml start \
- >> /var/log/xwt/tomcat.log 2>&1 &
+ /etc/init.d/xwt-cluster start
- /sbin/start-stop-daemon --start --pidfile /var/log/xwt/apache.pid --exec /usr/sbin/apache -- -f /xwt/www/etc/httpd.conf ${staging-flag}