perfsonar development work

Author: roman
Date: 2006-10-18 05:14:37 -0400 (Wed, 18 Oct 2006)
New Revision: 1686

Added:
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
Modified:
   branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
   branches/romradz-ant4rel-20061017/ant/build-rrdma.xml
   branches/romradz-ant4rel-20061017/ant/configure-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-release-targets.xml
   branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml
Log:
Two new targets for the RRD MA: pre-install and configure (updated 
configure-rrdma). They will be used for the next release.

pre-install - downloading the Tomcat and building native library of rrdjtool
configure - configuring the RRD MA

Modified: branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml       
2006-10-17 09:00:17 UTC (rev 1685)
+++ branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml       
2006-10-18 09:14:37 UTC (rev 1686)
@@ -14,6 +14,11 @@
 <project name="axis-deploy-targets">
 
 
+
+    <property file="conf/service.properties" />
+    <property file="ant/const.properties" />
+
+
     <taskdef resource="axis-tasks.properties" classpathref="classpath" 
onerror="ignore"/>
 
 
@@ -23,9 +28,15 @@
     <property name="axisWebXml" value="${axis.home}/WEB-INF/web.xml" />
 
 
+    <target name="create-deploy-root">
+        <mkdir dir="${service.tomcat.home}/webapps/${service.deploy.root}"/>
+    </target>
 
-    <target name="copy-jars-for-service">
 
+
+
+    <target name="copy-jars-for-service" depends="create-deploy-root">
+
         <copy file="./lib/repository/jdom/jdom/1.0b8/jdom-1.0b8.jar"         
                  todir="${axis.home}/WEB-INF/lib"/>
         <copy file="./lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"      
                  todir="${axis.home}/WEB-INF/lib"/>
         <copy 
file="./lib/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"          
   todir="${axis.home}/WEB-INF/lib"/>

Modified: branches/romradz-ant4rel-20061017/ant/build-rrdma.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/build-rrdma.xml       2006-10-17 
09:00:17 UTC (rev 1685)
+++ branches/romradz-ant4rel-20061017/ant/build-rrdma.xml       2006-10-18 
09:14:37 UTC (rev 1686)
@@ -20,9 +20,7 @@
 <project basedir="../" default="compile-rrdma" name="perfsonar-rrdma">
 
 
-    <property file="ant/const.properties" />
 
-
     <path id="classpath">
         <fileset dir="./lib/repository">
             <include name="**/*.jar"/>
@@ -50,6 +48,8 @@
 
     <!-- RRD MA imports -->
 
+    <import file="rrdma/rrdma-pre-install-targets.xml"/>
+
     <import file="rrdma/rrdjtool-compile-targets.xml"/>
     
     <import file="rrdma/rrdma-java-compile-targets.xml"/>

Modified: branches/romradz-ant4rel-20061017/ant/configure-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/configure-targets.xml 2006-10-17 
09:00:17 UTC (rev 1685)
+++ branches/romradz-ant4rel-20061017/ant/configure-targets.xml 2006-10-18 
09:14:37 UTC (rev 1686)
@@ -15,10 +15,12 @@
 <project name="configure-targets">
 
 
-    <property name="tomcat.dir" value="apache-tomcat-5.5.17" />
+    <property file="ant/const.properties" />
 
 
+    <!-- getting the java path -->
 
+
     <target name="_get-java-path">
         <exec executable="which"
             os="Linux"
@@ -36,72 +38,73 @@
             addproperty="java.path"
             defaultvalue="${_java.path}"
             />
-        <echo message="Accepted Java path: ${java.path}"/>
     </target>
 
 
-    <target name="get-current-path">
-        <dirname property="_current.path" file="."/>
-        <dirname property="current.path" file="${_current.path}"/>
-    </target>
+    <!-- getting the server address -->
 
 
-    <target name="get-axis-path">
-        <input message="Enter the path of Axis location 
[${basedir}/../${tomcat.dir}/webapps/axis]:"
-            addproperty="axis.path"
-            defaultvalue="${basedir}/../${tomcat.dir}/webapps/axis"
-        />
-        <echo message="Accepted Axis path: ${axis.path}"/>
-    </target>
-
-
     <target name="get-server-address">
         <input message="Enter the address of host (perfSONAR service 
location) [localhost]:"
             addproperty="server.address"
             defaultvalue="localhost"
             />
-        <echo message="Accepted server address: ${server.address}"/>
     </target>
 
 
+    <!-- getting the server port -->
+
+
     <target name="get-server-port">
         <input message="Enter the port of server [8080]:"
             addproperty="server.port"
             defaultvalue="8080"
         />
-        <echo message="Accepted server port: ${server.port}"/>
     </target>
-    
 
-    <target name="get-message-1">
-        <echo message="Start creating ant/const.properties file"/>
-        <echo 
message="-----------------------------------------------------------"/>
-    </target>
 
+    <!-- getting the tomcat directory -->
 
-    <target name="get-message-2">
-        <echo message="Start creating conf/service.properties file"/>
-        <echo 
message="-----------------------------------------------------------"/>
+
+    <target name="__get-tomcat-directory">
+
+        <property file="ant/const.properties" />
+
+        <condition property="tomcat.home.present" value="true">
+            <isset property="tomcat.home"/>
+        </condition>
+
+    </target>    
+
+
+    <target name="_get-tomcat-directory_1" depends="__get-tomcat-directory" 
if="tomcat.home.present">
+        
+        <input message="Enter the path for the Tomcat installation: 
[${tomcat.home}]:"
+            addproperty="tomcat.install.location"
+            defaultvalue="${tomcat.home}" />
+        
     </target>
 
 
-    <target name="get-message-3">
-        <echo message="Start creating conf/log4j.properties file"/>
-        <echo 
message="-----------------------------------------------------------"/>
+    <target name="_get-tomcat-directory_2" depends="__get-tomcat-directory" 
unless="tomcat.home.present">
+        
+        <input message="Enter the path for the Tomcat installation: 
[/usr/local/rrdtool]:"
+            addproperty="tomcat.install.location"
+            defaultvalue="/usr/local/rrdtool" />
+        
     </target>
 
 
-    <target name="get-message-4">
-        <echo message="Start adding properties to Tomcat catalina.properties 
file"/>
-        <echo 
message="-----------------------------------------------------------"/>
+    <target name="get-tomcat-directory"
+            depends="_get-tomcat-directory_1, _get-tomcat-directory_2">
     </target>
 
 
     <!-- creating log4j.properties file -->
 
-    <target name="set-log4j-properties"
-            depends="get-message-3">
 
+    <target name="set-log4j-properties">
+
         <property name="logDir" value="${basedir}/log"/>
 
         <propertyfile file="conf/log4j.properties"
@@ -160,12 +163,12 @@
 
         </propertyfile>
 
-        <echo message="log4j.properties file created"/>
-        <input message="Press Return key ..."/>
-
     </target>
 
 
+    <!-- removing prooperties files -->
+
+
     <target name="remove-properties">
       <delete file="ant/const.properties"    failonerror="false"/>
       <delete file="conf/service.properties" failonerror="false"/>
@@ -173,34 +176,6 @@
     </target>
 
 
-    <target name="copy-properties">
-        <copy file="ant/const.properties"    
tofile="ant/const-old.properties"    overwrite="true" failonerror="false"/>
-        <copy file="conf/service.properties" 
tofile="conf/service-old.properties" overwrite="true" failonerror="false"/>
-        <copy file="conf/log4j.properties"   
tofile="conf/log4j-old.properties"   overwrite="true" failonerror="false"/>
-    </target>
 
-
-    <target name="set-tomcat-properties" depends="get-message-4">
-        <input message="Enter the path of Tomcat location 
[${basedir}/../${tomcat.dir}]:"
-             addproperty="full.tomcat.path"
-            defaultvalue="${basedir}/../${tomcat.dir}"
-        />
-        <input message="Enter the path of service.properties file 
[${basedir}/conf/service.properties]:"
-                addproperty="service.properties.path"
-                defaultvalue="${basedir}/conf/service.properties"
-                />
-        <input message="Enter the path of components.properties file 
[${basedir}/conf/components.properties]:"
-                addproperty="components.properties.path"
-                defaultvalue="${basedir}/conf/components.properties"
-                />
-        <propertyfile file="${full.tomcat.path}/conf/catalina.properties"
-                comment="tranformed by perfSONAR">
-            <entry  key="service.properties" 
value="${service.properties.path}"/>
-            <entry  key="components.properties" 
value="${components.properties.path}"/>
-        </propertyfile>
-    </target>
-
-
-
 </project>
 

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml  
  2006-10-17 09:00:17 UTC (rev 1685)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml  
  2006-10-18 09:14:37 UTC (rev 1686)
@@ -27,8 +27,10 @@
 
 
     <property name="lib_name" value="libjrrd.so" />
+    <!--
     <property name="rrd_h_path" value="${rrdtool_path}/include" />
     <property name="rrd_lib_path" value="${rrdtool_path}/lib" />
+    -->
 
 
 
@@ -38,9 +40,9 @@
 
     <target name="init-rrdjtool" depends="init">
 
-        <echo 
message="-----------------------------------------------------------" />
-        <echo message="Remember to download sources of rrdjtool library from 
CVS (sonar/rrdjtool) !!!!"/>
-        <echo 
message="-----------------------------------------------------------" />
+        <property file="ant/const.properties" />
+        <property name="rrd_h_path" value="${rrdtool_path}/include" />
+        <property name="rrd_lib_path" value="${rrdtool_path}/lib" />
 
     </target>
 

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml   
  2006-10-17 09:00:17 UTC (rev 1685)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml   
  2006-10-18 09:14:37 UTC (rev 1686)
@@ -15,27 +15,13 @@
 <project name="rrdma-configure-targets">
 
 
-    <target name="_get-rrdtool-path">
-        <exec executable="which"
-            os="Linux"
-            errorproperty="rrdtool.path.error"
-            outputproperty="full.rrdtool.path">
-        <arg line="rrdtool"/>
-        </exec>
-    </target>
 
+    <property name="deploy.root" value="pS-1.0-RRDMA" />
 
-    <target name="get-rrdtool-path" depends="_get-rrdtool-path" 
if="full.rrdtool.path">
-        <dirname property="__rrdtool.path" file="${full.rrdtool.path}"/>
-        <dirname property="_rrdtool.path" file="${__rrdtool.path}"/>
-        <input message="Enter the base path of RRDTool [${_rrdtool.path}]:"
-            addproperty="rrdtool.path"
-            defaultvalue="${_rrdtool.path}"
-        />
-        <echo message="Accepted RRDTool base path: ${rrdtool.path}"/>
-    </target>
 
+    <!-- getting the rrd metadata configuration file -->
 
+
     <target name="__get-rrd-config-file">
       <input message="Enter the path of rrd config file 
[${basedir}/conf/rrd-database_TEST.xml]:"
             addproperty="rrd.config.file"
@@ -44,36 +30,35 @@
         <available file="${rrd.config.file}" 
property="rrd.config.file.present"/>
     </target>
 
+
     <target name="_get-rrd-config-file_1" depends="__get-rrd-config-file" 
if="rrd.config.file.present">
-        <echo message="Accepted rrd metadata config file: 
${rrd.config.file}"/>
     </target>
 
+
     <target name="_get-rrd-config-file_2" depends="__get-rrd-config-file" 
unless="rrd.config.file.present">
         <echo message="!!!!!! ERROR: Provided rrd metadata config file does 
not exist !!!!!!"/>
         <property name="rrd.config.file" value="xxxxxxxx"/>
     </target>
 
+
     <target name="get-rrd-config-file" 
depends="_get-rrd-config-file_1,_get-rrd-config-file_2">
     </target>
 
 
     <!-- creating const.properties file -->
 
+
     <target name="set-const-properties-for-rrdma"
-            depends="get-message-1,
-                    get-java-path,
-                    get-rrdtool-path,
-                    get-axis-path,
-                    get-server-address,
-                    get-server-port">
+            depends="get-java-path,
+                     get-server-address,
+                     get-server-port,
+                     get-tomcat-directory">
 
         <propertyfile file="ant/const.properties" 
-                        comment="This file was created by the Ant 
configuration script.">
+                      comment="This file was created by the Ant 
configuration script.">
 
-            <entry  key="axis.home" value="${axis.path}"/>
-            <entry  key="rrdjdir" value="${basedir}/contrib/rrdjtool"/>
-            <entry  key="rrdtool_path" value="${rrdtool.path}"/>
-            <entry  key="jdk_path" value="${java.path}"/>
+            <entry  key="deploy.root" value="${deploy.root}"/>
+            <entry  key="tomcat.home" value="${tomcat.install.location}"/>
             <entry  key="target.server" value="${server.address}"/>
             <entry  key="target.port" value="${server.port}"/>
             <entry  key="webservice.name" value="MeasurementArchiveService"/>
@@ -91,25 +76,22 @@
 
         </propertyfile>
 
-        <echo message="const.properties file created"/>
-        <input message="Press Return key ..."/>
-
     </target>
 
 
-
     <!-- creating service.properties file -->
+    
 
     <target name="set-service-properties-for-rrdma"
-            depends="get-message-2,
-                    get-server-address,
-                    get-rrd-config-file">
+            depends="get-rrd-config-file">
 
+        <property file="ant/const.properties" />
+
         <propertyfile file="conf/service.properties" 
-                        comment="This file was created by the Ant 
configuration script.">
+                      comment="This file was created by the Ant 
configuration script.">
 
             <entry  key="service.r.type" value="ma"/>
-            <entry  key="service.r.access_point" 
value="http://${server.address}:8080/axis/services/MeasurementArchiveService"/>
+            <entry  key="service.r.access_point" 
value="http://${target.server}:${target.port}/${deploy.root}/${webservice.name}"/>
             <entry  key="service.r.service_name" value="Java RRD MA"/>
             <entry  key="service.r.service_type" value="RRD MA"/>
             <entry  key="service.r.service_description" value="Java RRD MA, 
perfSONAR project"/>
@@ -118,7 +100,7 @@
             <entry  key="service.sax_parser.config" 
value="${basedir}/src/objects.config"/>
 
             <entry  key="service.r.ma.characteristic" value="utitlization"/>
-            <entry  key="service.r.ma.measurement_tool" 
value="cricket,mrtg"/>
+            <entry  key="service.r.ma.measurement_tool" 
value="cricket,mrtg,cacti"/>
             <entry  key="service.r.ma.format" value="rrd"/>
 
             <entry  key="service.ma.conf_file" value="${rrd.config.file}"/>
@@ -146,31 +128,25 @@
 
         </propertyfile>
 
-        <echo message="service.properties file created"/>
-        <input message="Press Return key ..."/>
-
     </target>
 
 
+    <!-- preparing test rrd metadata configuration file -->
+
+
     <target name="create-testrrdconfig-for-rrdma">
       <copy file="conf/rrd-database_TEST.xml" 
tofile="conf/rrd-database_TEST-old.xml" overwrite="true" failonerror="false"/>
       <replace file="conf/rrd-database_TEST.xml" token="__BASEPATH__" 
value="${basedir}"/>
     </target>
 
 
-    <target name="copy-initconfig-for-rrdma">
-      <copy file="ant/const.properties.ma" tofile="ant/const.properties" 
overwrite="true" failonerror="false"/>
-      <copy file="conf/components.properties.ma" 
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
-    </target>
+    <!-- the main target -->
 
 
-    <target name="configure-rrdma">
-        <antcall target="copy-initconfig-for-rrdma"/>
-        <antcall target="copy-properties"/>
+    <target name="configure">
         <antcall target="set-const-properties-for-rrdma"/>
         <antcall target="set-service-properties-for-rrdma"/>
         <antcall target="set-log4j-properties"/>
-        <antcall target="set-tomcat-properties"/>
         <antcall target="create-testrrdconfig-for-rrdma"/>
     </target>
 

Added: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml


Property changes on: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-release-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-release-targets.xml     
  2006-10-17 09:00:17 UTC (rev 1685)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-release-targets.xml     
  2006-10-18 09:14:37 UTC (rev 1686)
@@ -22,50 +22,9 @@
     <!-- source release of RRD MA -->
 
     <target name="rrdma-release-src"
-            depends="copy-initconfig-for-rrdma"
             description="Build src release.">
 
-        <property file="ant/const.properties" />
 
-        <delete dir="tmp"/>
-        <mkdir 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar"/>
-        <copy 
todir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar">
-            <fileset dir="../perfsonar"/>
-        </copy>
-        <delete 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/tmp"/>
-
-
-        <delete 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src/org/perfsonar/service/lookupService"/>
-        <delete 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src/org/perfsonar/service/measurementPoint"/>
-        <delete 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src/org/perfsonar/service/topologyService"/>
-        <delete 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/build/org"/>
-        <delete>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/build"
 includes="**/*.jar"/>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/log"
 includes="**/*.log"/>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src"
 includes="**/ls-*.wsdd"/>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src"
 includes="**/mp-*.wsdd"/>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src"
 includes="**/tcmp-*.wsdd"/>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.ls"/>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.cl"/>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.sqlma"/>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.tcmp"/>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.mp"/>
-        </delete>
-
-        <tar 
destfile="${release.basename}-${release.servicename}-src-${release.version}.tar"
-             basedir="tmp/"
-             longfile="gnu"
-             excludes=".svn/**"
-        />
-
-        <delete dir="tmp"/>
-
-        <gzip 
zipfile="${release.basename}-${release.servicename}-src-${release.version}.tar.gz"
-            
src="${release.basename}-${release.servicename}-src-${release.version}.tar"
-        />
-
-        <delete 
file="${release.basename}-${release.servicename}-src-${release.version}.tar"/>
-
     </target>
 
 
@@ -73,46 +32,10 @@
     <!-- binary release of RRD MA -->
 
     <target name="rrdma-release-bin"
-            depends="copy-initconfig-for-rrdma, build-rrdma"
+            depends="build-rrdma"
             description="Build bin release.">
 
-        <property file="ant/const.properties" />
 
-        <delete dir="tmp"/>
-        <mkdir 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar"/>
-        <copy 
todir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar">
-            <fileset dir="../perfsonar"/>
-        </copy>
-        <delete 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/tmp"/>
-
-
-        <delete 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/src/org"/>
-        <delete 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/doc"/>
-        <delete 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/test"/>
-        <delete>
-          <fileset 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/log"
 includes="**/*.log"/>
-          <fileset 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/conf"
 includes="**/*.ls"/>
-          <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.cl"/>
-          <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.sqlma"/>
-          <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.tcmp"/>
-          <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.mp"/>
-        </delete>
-
-        <tar 
destfile="${release.basename}-${release.servicename}-bin-${release.version}.tar"
-             basedir="tmp/"
-             longfile="gnu"
-             excludes=".svn/**"
-             />
-
-        <delete dir="tmp"/>
-
-        <gzip 
zipfile="${release.basename}-${release.servicename}-bin-${release.version}.tar.gz"
-              
src="${release.basename}-${release.servicename}-bin-${release.version}.tar"
-              />
-
-        <delete 
file="${release.basename}-${release.servicename}-bin-${release.version}.tar"/>
-
-
     </target>
 
 

Modified: branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml    
2006-10-17 09:00:17 UTC (rev 1685)
+++ branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml    
2006-10-18 09:14:37 UTC (rev 1686)
@@ -18,35 +18,21 @@
 
     <property name="_tomcat.download.url"
         
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_4/axis-bin-1_4.tar.gz"; />
-
-
     <property name="tomcat.dir" value="apache-tomcat-5.5.17" />
-    <property name="axis.dir" value="axis-1_4" />
 
 
     <!-- targets -->
 
 
     <target name="get-tomcat-download-url">
-        <input message="Enter a URL of Tomcat download (mirrors can be found 
on http://tomcat.apache.org/) [${_tomcat.download.url}]:"
+        <input message="Enter a URL of the Tomcat download (mirrors can be 
found on http://tomcat.apache.org/) [${_tomcat.download.url}]:"
                 addproperty="tomcat.download.url"
                 defaultvalue="${_tomcat.download.url}"
         />
-        <echo message="Accepted a URL of Tomcat download: 
${tomcat.download.url}"/>
+        <echo message="Installing..."/>
     </target>
 
 
-    <target name="get-axis-download-url">
-        <input message="Enter a URL of Axis download (mirrors can be found 
on http://www.apache.org/dyn/closer.cgi/ws/axis/1_4/) 
[${_axis.download.url}]:"
-                addproperty="axis.download.url"
-                defaultvalue="${_axis.download.url}"
-        />
-        <echo message="Accepted URL of Axis download: ${axis.download.url}"/>
-    </target>
-
-
     <target name="get-tomcat" depends="get-tomcat-download-url">
         <basename property="tomcat.name" file="${tomcat.download.url}" />
         <get src="${tomcat.download.url}"
@@ -56,15 +42,6 @@
     </target>
 
 
-    <target name="get-axis" depends="get-axis-download-url">
-        <basename property="axis.name" file="${axis.download.url}" />
-        <get src="${axis.download.url}"
-            dest="${axis.name}"
-            verbose="true"
-            usetimestamp="true"/>
-    </target>
-
-
     <target name="unpack-tomcat" depends="get-tomcat">
         <untar src="${tomcat.name}"
                 overwrite="true"
@@ -75,28 +52,39 @@
     </target>
 
 
-    <target name="unpack-axis" depends="get-axis">
-        <untar src="${axis.name}"
-                overwrite="true"
-                compression="gzip"
-                dest="."/>
-        <delete file="${axis.name}" failonerror="false"/>
-    </target>
+    <target name="webservice-container-question">
 
+        <input message="Do you want to install the application server 
Tomcat? "
+            addproperty="_tomcat.install.decision"
+            validargs="y,n"
+            defaultvalue="n" />
 
-    <target name="copy-axis-to-tomcat" depends="unpack-tomcat, unpack-axis">
-        <copy todir="${tomcat.dir}/webapps/">
-            <fileset dir="${axis.dir}/webapps/"/>
-        </copy>
-        <delete dir="${axis.dir}"/>
+        <condition property="tomcat.install.decision">
+            <equals arg1="y" arg2="${_tomcat.install.decision}"/>
+        </condition>
+
     </target>
 
 
-    <target name="webservice-container-download">
-        <antcall target="copy-axis-to-tomcat" />
-        <move todir="${basedir}/../${tomcat.dir}">
+    <target name="webservice-container-download"
+            depends="webservice-container-question"
+            if="tomcat.install.decision">
+
+        <input message="Enter the path for the Tomcat installation: 
[${basedir}/../${tomcat.dir}]:"
+            addproperty="tomcat.install.location"
+            defaultvalue="${basedir}/../${tomcat.dir}" />
+
+        <propertyfile file="ant/const.properties" 
+            comment="This file was created by the Ant configuration script.">
+            <entry  key="tomcat.home" value="${tomcat.install.location}"/>
+        </propertyfile>
+
+        <antcall target="unpack-tomcat" />
+
+        <move todir="${tomcat.install.location}">
             <fileset dir="${tomcat.dir}"/>
         </move>
+
     </target>