perfsonar development work

Author: roman
Date: 2006-07-24 05:38:41 -0400 (Mon, 24 Jul 2006)
New Revision: 1481

Modified:
   trunk/perfsonar/ant/configure-targets.xml
   trunk/perfsonar/ant/webservice-env-targets.xml
Log:
Ant script now can download new versions of Tomcat (5.5.17) and Axis (1.4)

Modified: trunk/perfsonar/ant/configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/configure-targets.xml   2006-07-21 13:28:39 UTC (rev 
1480)
+++ trunk/perfsonar/ant/configure-targets.xml   2006-07-24 09:38:41 UTC (rev 
1481)
@@ -15,6 +15,10 @@
 <project name="configure-targets">
 
 
+    <property name="tomcat.dir" value="apache-tomcat-5.5.17" />
+
+
+
     <target name="_get-java-path">
         <exec executable="which"
             os="Linux"
@@ -43,9 +47,9 @@
 
 
     <target name="get-axis-path">
-        <input message="Enter the path of Axis location 
[${basedir}/../jakarta-tomcat-5.0.28/webapps/axis]:"
+        <input message="Enter the path of Axis location 
[${basedir}/../${tomcat.dir}/webapps/axis]:"
             addproperty="axis.path"
-            defaultvalue="${basedir}/../jakarta-tomcat-5.0.28/webapps/axis"
+            defaultvalue="${basedir}/../${tomcat.dir}/webapps/axis"
         />
         <echo message="Accepted Axis path: ${axis.path}"/>
     </target>
@@ -177,9 +181,9 @@
 
 
     <target name="set-tomcat-properties" depends="get-message-4">
-        <input message="Enter the path of Tomcat location 
[${basedir}/../jakarta-tomcat-5.0.28]:"
+        <input message="Enter the path of Tomcat location 
[${basedir}/../${tomcat.dir}]:"
              addproperty="full.tomcat.path"
-             defaultvalue="${basedir}/../jakarta-tomcat-5.0.28"
+            defaultvalue="${basedir}/../${tomcat.dir}"
         />
         <input message="Enter the path of service.properties file 
[${basedir}/conf/service.properties]:"
                 addproperty="service.properties.path"

Modified: trunk/perfsonar/ant/webservice-env-targets.xml
===================================================================
--- trunk/perfsonar/ant/webservice-env-targets.xml      2006-07-21 13:28:39 
UTC (rev 1480)
+++ trunk/perfsonar/ant/webservice-env-targets.xml      2006-07-24 09:38:41 
UTC (rev 1481)
@@ -17,13 +17,13 @@
     <!-- Download URLs -->
 
     <property name="_tomcat.download.url"
-            
value="http://archive.apache.org/dist/tomcat/tomcat-5/v5.0.28/bin/jakarta-tomcat-5.0.28.tar.gz";
 />
+        
value="http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.17/bin/apache-tomcat-5.5.17.tar.gz";
 />
     <property name="_axis.download.url"
-            
value="http://ftp.tpnet.pl/vol/d1/apache/ws/axis/1_2_1/axis-bin-1_2_1.tar.gz"; 
/>
+        
value="http://ftp.tpnet.pl/vol/d1/apache/ws/axis/1_4/axis-src-1_4.tar.gz"; />
 
 
-    <property name="tomcat.dir" value="jakarta-tomcat-5.0.28" />
-    <property name="axis.dir" value="axis-1_2_1" />
+    <property name="tomcat.dir" value="apache-tomcat-5.5.17" />
+    <property name="axis.dir" value="axis-1_4" />
 
 
     <!-- targets -->