perfsonar development work

Author: mac
Date: 2007-02-21 05:38:46 -0500 (Wed, 21 Feb 2007)
New Revision: 2096

Modified:
   branches/XML-LS-RELEASE-1.1/ant/xmlls/pre-install-targets.xml
   branches/XML-LS-RELEASE-1.1/ant/xmlls/test-targets.xml
Log:
New information (requirements, link to the installation guide) added to 
pre-install
"client-test" information added to test-targets



Modified: branches/XML-LS-RELEASE-1.1/ant/xmlls/pre-install-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/xmlls/pre-install-targets.xml       
2007-02-21 10:21:30 UTC (rev 2095)
+++ branches/XML-LS-RELEASE-1.1/ant/xmlls/pre-install-targets.xml       
2007-02-21 10:38:46 UTC (rev 2096)
@@ -3,7 +3,7 @@
 
 
     <target name="pre-install"
-            depends="init-info,            
+            depends="show-info,            
             get-inputs,
             confirm-inputs,
             get-tomcat,
@@ -22,6 +22,31 @@
 
     <property name="tomcat.tempfile" value="apache-tomcat-5.5.20"/> <!-- 
without .tar.gz -->
 
+    <target name="show-info">
+        <echo>Pre-install</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>Preparing the installation of XML Lookup Service...</echo>
+        <echo></echo>
+        <echo>Answer to all questions. If you go wrong, cancel (ctrl-c) and 
start again.</echo>
+        <echo></echo>
+
+
+    </target>
+
     <target name="get-inputs">
         <!-- tomcat -->
 
@@ -84,17 +109,6 @@
         <fail if="do.abort">Files have not been modified. Configure the 
service manually by editing configuration files, or run configurator 
again.</fail>
     </target>
 
-    <target name="init-info">
-        <echo>Pre-install</echo>
-
-        <echo>Preparing the installation of XML Lookup Service...</echo>
-
-        <echo></echo>
-        <echo>Answer to all questions. If you go wrong, cancel (ctrl-c) and 
start again.</echo>
-            <echo></echo>
-    </target>
-
-
     <!-- INFO: download Tomcat if necessary -->
     <target name="get-tomcat" if="tomcat.install.decision">
 

Modified: branches/XML-LS-RELEASE-1.1/ant/xmlls/test-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/xmlls/test-targets.xml      2007-02-21 
10:21:30 UTC (rev 2095)
+++ branches/XML-LS-RELEASE-1.1/ant/xmlls/test-targets.xml      2007-02-21 
10:38:46 UTC (rev 2096)
@@ -16,6 +16,7 @@
 
       <echo>For testing web service please run:</echo>
       <echo/>
+      <echo>  ant -f build-xmlls.xml client-echo</echo>
       <echo>  ant -f build-xmlls.xml client-register</echo>
       <echo>  ant -f build-xmlls.xml client-query</echo>
       <echo>  ant -f build-xmlls.xml client-keepalive</echo>