perfsonar development work

Author: mac
Date: 2007-03-13 09:57:38 -0400 (Tue, 13 Mar 2007)
New Revision: 2221

Modified:
   trunk/perfsonar/ant/xmlls/deploy-targets.xml
   trunk/perfsonar/ant/xmlls/pre-install-targets.xml
Log:
New redirecting script for tomcat applied
Deploy without changes, just to commit before merging with XML LS Release 
branch (there was some inconsistency?)


Modified: trunk/perfsonar/ant/xmlls/deploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/xmlls/deploy-targets.xml        2007-03-13 10:29:09 
UTC (rev 2220)
+++ trunk/perfsonar/ant/xmlls/deploy-targets.xml        2007-03-13 13:57:38 
UTC (rev 2221)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="deploy">
-
+ 
     <property file="conf/service.properties" />
     <property file="ant/const.properties" />
     <!-- the main targets -->

Modified: trunk/perfsonar/ant/xmlls/pre-install-targets.xml
===================================================================
--- trunk/perfsonar/ant/xmlls/pre-install-targets.xml   2007-03-13 10:29:09 
UTC (rev 2220)
+++ trunk/perfsonar/ant/xmlls/pre-install-targets.xml   2007-03-13 13:57:38 
UTC (rev 2221)
@@ -15,7 +15,7 @@
     <!-- Official Tomcat -->
 
     <property name="tomcat.download.url"
-              
value="http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.tar.gz";
 />
+              
value="http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=tomcat&amp;version=6.0.7";
 />
 
 
     <!-- property name="tomcat.download.url"
@@ -23,7 +23,7 @@
     <!-- property name="tomcat.download.url"
               value="http://monstera.man.poznan.pl/tomcat.tar.gz"; /-->
 
-    <property name="tomcat.tempfile" value="apache-tomcat-5.5.20"/> <!-- 
without .tar.gz -->
+    <property name="tomcat.tempfile" value="apache-tomcat-6.0.7"/> <!-- 
without .tar.gz -->
 
     <property environment="env"/> <!-- env variables -->
 
@@ -46,9 +46,11 @@
         <echo> 4. JAVA_HOME environment variable set to your Java 
directory</echo>
         <echo>    Now, your JAVA_HOME is [${env.JAVA_HOME}]</echo>
         <echo/>
+
         <input message="Do you want to proceed? Just press ENTER to 
continue. Otherwise CTRL-C stops the process immediately"/>
 
         <echo>Preparing the installation of XML Lookup Service...</echo>
+        <delete file="${basedir}/ant/const.properties" />
         <echo></echo>
         <echo>Answer to all questions. If you go wrong, cancel (ctrl-c) and 
start again.</echo>
         <echo></echo>
@@ -59,6 +61,7 @@
     <target name="get-inputs">
         <!-- tomcat -->
 
+
         <input message="Do you want to download Tomcat webserver 
automatically (say N if you've already got Tomcat)?"
                addproperty="tomcat.install.answer"
                validargs="y,n"
@@ -193,4 +196,4 @@
 
 
     </target>
-</project>
\ No newline at end of file
+</project>