java/buildconf/build-webapp.xml | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
New commits:
commit ed0bccb751ba9999aa90e8aad4d87e9675360311
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Dec 12 14:03:33 2012 +0100
Determining tomcat version and using it when building webapp instead hardcode tomcat5
Building webapp couldn't work with any other tomcat than tomcat5.
diff --git a/java/buildconf/build-webapp.xml b/java/buildconf/build-webapp.xml
index 2bcc983..d63d726 100644
--- a/java/buildconf/build-webapp.xml
+++ b/java/buildconf/build-webapp.xml
@@ -1,6 +1,10 @@
<?xml version="1.0"?>
<project name="build-webapp">
+<!-- determine tomcat version -->
+ <property name="tomcat" value="tomcat5" />
+ <available file="/usr/share/java/tomcat6" type="dir"
property="tomcat" value="tomcat6" />
+ <available file="/usr/share/java/tomcat" type="dir"
property="tomcat" value="tomcat7" />
<!-- ================ Local Deployment Tasks ==================== -->
<!--
@@ -196,19 +200,19 @@
<target name="install-java"
description="Used to setup the java side of spacewalk devel
environment">
- <mkdir dir="/var/lib/tomcat5/webapps.save"/>
- <move file="/var/lib/tomcat5/webapps/rhn"
- tofile="/var/lib/tomcat5/webapps.save/rhn"/>
- <symlink link="/var/lib/tomcat5/webapps/rhn"
+ <mkdir dir="/var/lib/${tomcat}/webapps.save"/>
+ <move file="/var/lib/${tomcat}/webapps/rhn"
+ tofile="/var/lib/${tomcat}/webapps.save/rhn"/>
+ <symlink link="/var/lib/${tomcat}/webapps/rhn"
resource="${git.home}/java/rhnwebapp"/>
</target>
<target name="uninstall-java"
description="Used to uninstall the java side of spacewalk devel
environment">
- <symlink action="delete"
link="/var/lib/tomcat5/webapps/rhn"/>
- <move file="/var/lib/tomcat5/webapps.save/rhn"
- tofile="/var/lib/tomcat5/webapps/rhn"/>
- <delete dir="/var/lib/tomcat5/webapps.save"/>
+ <symlink action="delete"
link="/var/lib/${tomcat}/webapps/rhn"/>
+ <move file="/var/lib/${tomcat}/webapps.save/rhn"
+ tofile="/var/lib/${tomcat}/webapps/rhn"/>
+ <delete dir="/var/lib/${tomcat}/webapps.save"/>
</target>
<target name="install-devel"
Show replies by date