perfsonar development work

Author: mac
Date: 2007-03-09 09:21:52 -0500 (Fri, 09 Mar 2007)
New Revision: 2206

Modified:
   trunk/perfsonar/ant/xmlls/configure-targets.xml
   trunk/perfsonar/ant/xmlls/pre-install-targets.xml
   trunk/perfsonar/ant/xmlls/release-targets.xml
Log:
Changes to satisfy bug 175



Modified: trunk/perfsonar/ant/xmlls/configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/xmlls/configure-targets.xml     2007-03-09 07:52:53 
UTC (rev 2205)
+++ trunk/perfsonar/ant/xmlls/configure-targets.xml     2007-03-09 14:21:52 
UTC (rev 2206)
@@ -40,31 +40,48 @@
         <echo message="1. Service configuration"/>
         <echo message="=========================="/>
         <echo/>
+        <echo>All parameters here were set automatically</echo>
 
         <property name="default_in.log4j_properties"
                   
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
+        <property name="in.log4j_properties" 
value="${default_in.log4j_properties}" />
+        <!--
         <input message="Enter log configuration file 
[${default_in.log4j_properties}]"
                addproperty="in.log4j_properties"
                defaultvalue="${default_in.log4j_properties}" />
+        -->
 
         <property name="default_in.logs_dir"
                   value="${service.home}/${deploy.root}/log"/>
+        <property name="in.logs_dir" value="${default_in.logs_dir}" />
+
+        <!--
         <input message="Enter logs directory [${default_in.logs_dir}]"
                addproperty="in.logs_dir"
                defaultvalue="${default_in.logs_dir}" />
+        -->
 
         <property name="default_in.sax_parser_config"
                   
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/objects.config"/>
+        <property name="in.sax_parser_config" 
value="${default_in.sax_parser_config}"/>
+        <!--
         <input message="Enter path for parser configuration file 
[${default_in.sax_parser_config}]"
                addproperty="in.sax_parser_config"
                defaultvalue="${default_in.sax_parser_config}" />
+        -->
 
         <echo/>
         <echo message="2. Lookup Information configuration"/>
         <echo message="====================================="/>
         <echo/>
 
-        <property name="default_in.r_access_point" 
value="http://${target.server}:8080/${deploy.root}"/>
+        <property name="default_in.hostname" 
value="mycomputer.mydomain.com"/>
+        <input message="Enter hostname and domainname of your machine. Not 
localhost. [${default_in.hostname}]"
+               addproperty="in.hostname"
+               defaultvalue="${default_in.hostname}" />
+
+
+        <property name="default_in.r_access_point" 
value="http://${in.hostname}:8080/${deploy.root}"/>
         <input message="Lookup Information of service -- access point (URL) 
[${default_in.r_access_point}]"
                addproperty="in.r_access_point"
                defaultvalue="${default_in.r_access_point}" />

Modified: trunk/perfsonar/ant/xmlls/pre-install-targets.xml
===================================================================
--- trunk/perfsonar/ant/xmlls/pre-install-targets.xml   2007-03-09 07:52:53 
UTC (rev 2205)
+++ trunk/perfsonar/ant/xmlls/pre-install-targets.xml   2007-03-09 14:21:52 
UTC (rev 2206)
@@ -3,7 +3,7 @@
 
 
     <target name="pre-install"
-            depends="show-info,            
+            depends="show-info,
             get-inputs,
             confirm-inputs,
             get-tomcat,
@@ -12,32 +12,41 @@
     </target>
 
 
+    <!-- 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";
 /-->
     <property name="tomcat.download.url"
-                 
value="http://monstera.man.poznan.pl/private/bak/apache-tomcat-5.5.20.tar.gz"; 
/>
+              
value="http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.tar.gz";
 />
+
+
     <!-- property name="tomcat.download.url"
+                 
value="http://monstera.man.poznan.pl/private/bak/apache-tomcat-5.5.20.tar.gz"; 
/-->
+    <!-- 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 environment="env"/> <!-- env variables -->
+
     <target name="show-info">
         <echo>Pre-install</echo>
-       <echo/>
+        <echo/>
         <echo>---- Welcome in perfSONAR LookupService installation script 
----</echo>
-       <echo/>
-       <echo>You're about to install LookupService that may be also called 
LS during the installation process. The installation guide is accessible on 
http://wiki.perfsonar.net/jra1-wiki/index.php/Installation_LS_1.1#Lookup_service_installation
 web page</echo>
-       <echo/>
-       <echo>Requirements:</echo>
-       <echo/>
-       <echo> 1. Java 1.5.x</echo>
-       <echo> 2. Ant 1.6.x (we're sure you've already got it installed as 
you run the installation process)</echo>
-       <echo> 3. eXist DB XML - see Exist DB Installation Guide for 
LS:</echo>
-       <echo>     
http://wiki.perfsonar.net/jra1-wiki/index.php/Exist_DB_Installation_Guide_for_LS</echo>
-       <echo> 4. JAVA_HOME environment variable set to your Java 
directory</echo>
-       <echo/> 
-       <input message="Do you want to proceed? Just press ENTER to continue. 
Otherwise CTRL-C stops the process immediately"/>
+        <echo/>
+        <echo>You're about to install LookupService that may be also called 
LS during the installation process.</echo>
+        <!--
+            <echo>The installation guide is accessible on 
http://wiki.perfsonar.net/jra1-wiki/index.php/Installation_LS_1.1#Lookup_service_installation
 web page</echo>
+        -->
+        <echo/>
+        <echo>Requirements:</echo>
+        <echo/>
+        <echo> 1. Java 1.5.x</echo>
+        <echo> 2. Ant 1.6.x (we're sure you've already got it installed as 
you run the installation process)</echo>
+        <echo> 3. eXist DB XML - see Exist DB Installation Guide for 
LS:</echo>
+        <echo>     
http://wiki.perfsonar.net/jra1-wiki/index.php/Exist_DB_Installation_Guide_for_LS</echo>
+        <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>
         <echo></echo>
@@ -50,7 +59,7 @@
     <target name="get-inputs">
         <!-- tomcat -->
 
-        <input message="Do you want to install Tomcat webserver?"
+        <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"
                defaultvalue="n"/>
@@ -61,34 +70,51 @@
         </condition>
 
         <property name="default_tomcat.home" value="/usr/local/tomcat_ls"/>
-        <input message="Enter webserver home directory 
[${default_tomcat.home}]"
+        <input message="Enter webserver (Tomcat) home directory. If answered 
Y for previous question, this directory will be the target directory where to 
install Tomcat. If answered N, Tomcat will be installed there 
[${default_tomcat.home}]"
                addproperty="tomcat.home"
                defaultvalue="${default_tomcat.home}" />
 
-        <property name="default_tomcat.tempdir" value="/tmp"/>
-       <input message="Temporary directory [${default_tomcat.tempdir}]?"
-              addproperty="tomcat.tempdir"
-              defaultvalue="${default_tomcat.tempdir}"/>                     
                       
+        <property name="default_tomcat.tempdir" value="${basedir}/tmp"/>
+        <!--
+        <input message="Temporary directory [${default_tomcat.tempdir}]?"
+               addproperty="tomcat.tempdir"
+               defaultvalue="${default_tomcat.tempdir}"/>
+        -->
+        <property name="tomcat.tempdir" value="${default_tomcat.tempdir}" 
/><!-- don't ask for tmp -->
 
+        <!--
         <property name="default_hostname" value="localhost"/>
         <input message="Enter webserver hostname (please type your host and 
domain name - not localhost)"
                addproperty="target.server"
                defaultvalue="${default_hostname}" />
+        -->
+        <property name="target.server" value="127.0.0.1"/> <!-- localhost to 
avoid use AdminClient on remote host; it fails if not enabled in tomcat 
configuration -->
 
         <property name="default_target.port" value="8080"/>
         <input message="Enter webserver port [${default_target.port}]"
                addproperty="target.port"
                defaultvalue="${default_target.port}" />
 
-        <property name="default_service.home" value="${basedir}"/>
-        <input message="Enter service directory (where to be installed) 
[${default_service.home}]"
+        <!-- directories -->
+
+        <dirname property="basedirUp" file="${basedir}" /> <!-- ../ -->
+        <dirname property="basedirUpUp" file="${basedirUp}" /> <!-- ../../ 
-->
+        <basename property="owndir" file="${basedirUp}" /> <!-- 
XML-LS-v.w(-RCx) -->
+
+        <property name="default_in.deploy.root" value="${owndir}"/>
+        <property name="deploy.root" value="${default_in.deploy.root}"/> 
<!-- don't ask for deploy root -->
+        <!--
+            <input message="Enter service deployment name 
[${default_in.deploy.root}]"
+                   addproperty="deploy.root"
+                   defaultvalue="${default_in.deploy.root}" />
+        -->
+
+        <property name="default_service.home" 
value="${basedirUpUp}/webapps"/>
+        <input message="Service directory is suffix is [${deploy.root}]. 
Enter service prefix directory (where target directory ${deploy.root} will be 
installed) Default is [${default_service.home}]"
                addproperty="service.home"
                defaultvalue="${default_service.home}" />
 
-        <property name="default_in.deploy.root" value="LookupService"/>
-        <input message="Enter service deployment name 
[${default_in.deploy.root}]"
-               addproperty="deploy.root"
-               defaultvalue="${default_in.deploy.root}" />
+
     </target>
 
     <target name="confirm-inputs">
@@ -96,8 +122,9 @@
         <echo message="Your settings: "/>
         <echo 
message="---------------------------------------------------------------"/>
 
-        <echo message="Tomcat home directory [${tomcat.home}]" />
-        <echo message="Service address 
[http://${target.server}:${target.port}/${deploy.root}]"/>
+        <echo message="Tomcat home directory: [${tomcat.home}]" />
+        <echo message="Tomcat address: 
[http://${target.server}:${target.port}/${deploy.root}]"/>
+        <echo message="Service destination directory: 
[${service.home}/${deploy.root}]"/>
 
         <input message="Proceed with these settings? "
                validargs="y,n"
@@ -114,8 +141,8 @@
 
         <echo>Download Tomcat</echo>
         <property name="tomcat.tar" 
value="${tomcat.tempdir}/${tomcat.tempfile}.tar.gz"/>
-       
-        <mkdir dir="${tomcat.tempdir}"/>       
+
+        <mkdir dir="${tomcat.tempdir}"/>
         <get src="${tomcat.download.url}"
                 dest="${tomcat.tar}"
                 verbose="true"

Modified: trunk/perfsonar/ant/xmlls/release-targets.xml
===================================================================
--- trunk/perfsonar/ant/xmlls/release-targets.xml       2007-03-09 07:52:53 
UTC (rev 2205)
+++ trunk/perfsonar/ant/xmlls/release-targets.xml       2007-03-09 14:21:52 
UTC (rev 2206)
@@ -19,14 +19,15 @@
 
     <target name="ask-for-values">
 
-        <property name="release-file" value="perfSONAR-XML-LS"/>
+        <property name="release-file" value="perfSONAR-XML-LS"/> <!-- tar gz 
file prefix -->
+       <property name="release-srcdir" value="XML-LS"/>         <!-- root 
directory of tar gz content -->
 
         <property name="default_release-number" value="1.1-RC1"/>
-       <input addproperty="release-number" message="Enter release number 
[${default_release-number}" defaultvalue="${default_release-number}"/>
+       <input addproperty="release-number" message="Enter release number 
[${default_release-number}]" defaultvalue="${default_release-number}"/>
 
-        <property name="release-dir" 
value="${basedir}/release/${release-file}-${release-number}/perfsonar"/> <!-- 
$BASEDIR/release/perfSONAR-XML-LS-1.1/perfsonar-->
+        <property name="release-dir" 
value="${basedir}/release/${release-srcdir}-${release-number}/perfsonar"/> 
<!-- $BASEDIR/release/XML-LS-1.1/perfsonar-->
 
-        <echo>Path for release is: [${release-dir}]</echo>
+        <echo>Path for release is: [${release-dir}]</echo>     
         <echo>Release file is: 
[${release-file}-${release-number}.tar.gz]</echo>