perfsonar development work

Author: roman
Date: 2007-01-24 05:49:12 -0500 (Wed, 24 Jan 2007)
New Revision: 1958

Modified:
   trunk/perfsonar/ant/configure-targets.xml
   trunk/perfsonar/ant/pre-install-targets.xml
   trunk/perfsonar/ant/rrdma/rrdma-axis-deploy-targets.xml
   trunk/perfsonar/ant/rrdma/rrdma-configure-targets.xml
   trunk/perfsonar/ant/rrdma/rrdma-pre-install-targets.xml
   trunk/perfsonar/ant/rrdma/rrdma-test-run-targets.xml
   trunk/perfsonar/ant/sqlma/sqlma-axis-deploy-targets.xml
   trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml
   trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml
   trunk/perfsonar/ant/sqlma/sqlma-test-run-targets.xml
Log:
Some messages have been added or removed.

Modified: trunk/perfsonar/ant/configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/configure-targets.xml   2007-01-24 08:31:32 UTC (rev 
1957)
+++ trunk/perfsonar/ant/configure-targets.xml   2007-01-24 10:49:12 UTC (rev 
1958)
@@ -101,7 +101,7 @@
 
     <target name="register-fuctionality-question">
 
-        <input message="Do you want the service to register in LS? "
+        <input message="Turn on service registration to Lookup Service? "
             addproperty="_functionality.register.decision"
             validargs="y,n" />
 

Modified: trunk/perfsonar/ant/pre-install-targets.xml
===================================================================
--- trunk/perfsonar/ant/pre-install-targets.xml 2007-01-24 08:31:32 UTC (rev 
1957)
+++ trunk/perfsonar/ant/pre-install-targets.xml 2007-01-24 10:49:12 UTC (rev 
1958)
@@ -126,7 +126,7 @@
             addproperty="tomcat.download.url"
             defaultvalue="${_tomcat.download.url}"
         />
-        <echo message="Installing the Tomcat..."/>
+        <echo message="Installing the Tomcat (please be patient, this can 
take some minutes)..."/>
 
     </target>
 
@@ -253,7 +253,7 @@
 
     <target name="get-server-address">
 
-        <input message="Enter the address of your application server Tomcat 
[localhost]:"
+        <input message="Enter the address (ip or hostname) of your 
application server Tomcat [localhost]:"
             addproperty="server.address"
             defaultvalue="localhost"
         />
@@ -282,8 +282,7 @@
         <echo>for the http communication. If not then configure the Tomcat 
in order</echo>
         <echo>to use this port number.</echo>
         <echo></echo>
-        <echo>Please, do it now. I will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <input message="Please do it now and press Enter when finished"/>
 
         <propertyfile file="ant/const.properties" 
             comment="This file was created by the Ant configuration script.">

Modified: trunk/perfsonar/ant/rrdma/rrdma-axis-deploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-axis-deploy-targets.xml     2007-01-24 
08:31:32 UTC (rev 1957)
+++ trunk/perfsonar/ant/rrdma/rrdma-axis-deploy-targets.xml     2007-01-24 
10:49:12 UTC (rev 1958)
@@ -108,8 +108,7 @@
         <echo message="        
docBase='${service.home}/${service.name}'&gt;"/>
         <echo message="    &lt;/Context&gt;"/>
         <echo></echo>
-        <echo>Please, do it now. I will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <input message="Please do it now and press Enter when finished"/>
 
         <exec dir="${tomcat.home}/bin"
             executable="sh"
@@ -123,7 +122,7 @@
         </exec>
 
         <echo>Please, make sure that the Tomcat is running. Use the address 
http://${target.server}:${target.port} .</echo>
-        <input message="Press Return key ..."/>
+        <input message="Press Enter when finished"/>
 
     </target>
 
@@ -140,8 +139,7 @@
         <echo message="        
docBase='${service.home}/${service.name}'&gt;"/>
         <echo message="    &lt;/Context&gt;"/>
         <echo></echo>
-        <echo>Please, do it now. I will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <input message="Please do it now and press Enter when finished"/>
 
 
         <echo>${line.separator}You have to manually set up the env variable 
LD_LIBRARY_PATH</echo>
@@ -153,7 +151,7 @@
         <echo>  export 
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${rrd_lib_path}:${rrdjdir}/build</echo>
         <echo>${line.separator} Please, do it now. I will wait for 
you.</echo>
 
-        <input message="Press Return key ..."/>
+        <input message="Press Enter ..."/>
 
     </target>
 

Modified: trunk/perfsonar/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-configure-targets.xml       2007-01-24 
08:31:32 UTC (rev 1957)
+++ trunk/perfsonar/ant/rrdma/rrdma-configure-targets.xml       2007-01-24 
10:49:12 UTC (rev 1958)
@@ -168,7 +168,7 @@
         depends="store-fuctionality-question-for-rrdma"
         if="functionality.store.decision">
 
-        <input message="Enter the path where new rrd files with measearement 
data sent to the service will be located [${service.home}]?"
+        <input message="Enter location of new RRD files created when 
measurement data is sent to the service [${service.home}]?"
             addproperty="functionality.store.path"
             defaultvalue="${service.home}"/>
 

Modified: trunk/perfsonar/ant/rrdma/rrdma-pre-install-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-pre-install-targets.xml     2007-01-24 
08:31:32 UTC (rev 1957)
+++ trunk/perfsonar/ant/rrdma/rrdma-pre-install-targets.xml     2007-01-24 
10:49:12 UTC (rev 1958)
@@ -68,7 +68,7 @@
 
     <target name="rrdjtool-platform-question">
 
-        <input message="Which OS platform do you use: "
+        <input message="Enter operating system type: "
             addproperty="_os.platform"
             validargs="linux,linux-64bit,freebsd,solaris,other"
             defaultvalue="linux" />
@@ -161,8 +161,7 @@
         <echo>that you will start later on in deploy action (Tomcat will 
have to be started manually,</echo>
         <echo>not by the installtion script)</echo>
         <echo></echo>
-        <echo>Please, do it now. I will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <input message="Please do it now and press Enter when finished"/>
         <echo></echo>
 
     </target>
@@ -279,8 +278,7 @@
         <echo>and download eXist war file. Suggested is 
exist-1.0.1.war.</echo>
         <echo></echo>
 
-        <echo>Please, do it now. I will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <input message="Please do it now and press Enter when finished"/>
 
         <input message="Enter the name of downloaded eXist war file 
[${exist.war.file}]:"
             addproperty="__exist.war.file"
@@ -332,7 +330,7 @@
             <entry  key="exist.home" value="${exist.war.install.location}"/>
         </propertyfile>
 
-        <echo message="Downloading eXist war file..."/>
+        <echo message="Downloading eXist war file (please be patient, this 
can take some minutes)..."/>
 
         <get src="${exist.war.download.url}"
             dest="${_exist.war.install.location}/${exist.war.file}"
@@ -363,8 +361,7 @@
         <echo message="        
docBase='${exist.home}/${exist.war.file}'&gt;"/>
         <echo message="    &lt;/Context&gt;"/>
         <echo></echo>
-        <echo>Please, do it now. I will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <input message="Please do it now and press Enter when finished"/>
 
         <propertyfile file="conf/service.properties" 
             comment="This file was created by the Ant configuration script.">
@@ -374,10 +371,10 @@
 
         </propertyfile>
 
-        <input message="Enter the eXist user name []:"
+        <input message="Enter the eXist user name:"
             addproperty="_exist.username"/>
 
-        <input message="Enter the pasword for eXist user name 
${_exist.username} []:"
+        <input message="Enter the pasword for eXist user name 
${_exist.username}:"
             addproperty="_exist.password"/>
 
         <input message="Enter the password for admin eXist user []:"
@@ -453,8 +450,7 @@
         <echo>Once you have installed run the application executing</echo>
         <echo>the script startup.sh .</echo>
         <echo></echo>
-        <echo>Please, do it now. I will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <input message="Please do it now and press Enter when finished"/>
 
         <propertyfile file="conf/service.properties" 
             comment="This file was created by the Ant configuration script.">
@@ -503,8 +499,7 @@
         <echo>(user name, hostname and port number 8585 are only 
examples)</echo>
         <echo></echo>
 
-        <echo>Please, do it now and make sure the xml database is running. I 
will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <input message="Please do it now and and make sure the xml database 
is running. Press Enter when finished."/>
 
     </target>
 

Modified: trunk/perfsonar/ant/rrdma/rrdma-test-run-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-test-run-targets.xml        2007-01-24 
08:31:32 UTC (rev 1957)
+++ trunk/perfsonar/ant/rrdma/rrdma-test-run-targets.xml        2007-01-24 
10:49:12 UTC (rev 1958)
@@ -19,6 +19,10 @@
 
     <target name="test">
 
+        <echo>The test will send a set of example messages.</echo>
+        <echo>Please, analyze the responses to make sure the service has 
been installed correctly.</echo>
+        <echo></echo>
+
         <antcall target="run-echo"/>
 
         <antcall target="run-rrdma-client-1"/>

Modified: trunk/perfsonar/ant/sqlma/sqlma-axis-deploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-axis-deploy-targets.xml     2007-01-24 
08:31:32 UTC (rev 1957)
+++ trunk/perfsonar/ant/sqlma/sqlma-axis-deploy-targets.xml     2007-01-24 
10:49:12 UTC (rev 1958)
@@ -115,8 +115,7 @@
         <echo message="        
docBase='${service.home}/${service.name}'&gt;"/>
         <echo message="    &lt;/Context&gt;"/>
         <echo></echo>
-        <echo>Please, do it now. I will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <input message="Please do it now and press Enter when finished"/>
 
         <exec dir="${tomcat.home}/bin"
             executable="sh"
@@ -129,7 +128,7 @@
         </exec>
 
         <echo>Please, make sure that the Tomcat is running. Use the address 
http://${target.server}:${target.port} .</echo>
-        <input message="Press Return key ..."/>
+        <input message="Press Enter when finished"/>
 
     </target>
 
@@ -146,14 +145,13 @@
         <echo message="        
docBase='${service.home}/${service.name}'&gt;"/>
         <echo message="    &lt;/Context&gt;"/>
         <echo></echo>
-        <echo>Please, do it now. I will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <input message="Please do it now and press Enter when finished"/>
 
         <echo></echo>
-        <echo>After setting up the variable (re)start the Tomcat.</echo>
-        <echo>Please, do it now. I will wait for you.</echo>
+        <echo>(Re)Start the Tomcat.</echo>
         
-        <input message="Press Return key ..."/>
+        <echo></echo>
+        <input message="Please do it now and press Enter when finished"/>
         
     </target>
 

Modified: trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml       2007-01-24 
08:31:32 UTC (rev 1957)
+++ trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml       2007-01-24 
10:49:12 UTC (rev 1958)
@@ -247,8 +247,7 @@
         <echo>to have correct connection with the database.</echo>
         
         <echo></echo>
-        <echo>Please, do it now. I will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <input message="Please do it now and press Enter when finished"/>
 
     </target>        
 

Modified: trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml     2007-01-24 
08:31:32 UTC (rev 1957)
+++ trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml     2007-01-24 
10:49:12 UTC (rev 1958)
@@ -108,8 +108,7 @@
         <echo>and download eXist war file. Suggested is 
exist-1.0.1.war.</echo>
         <echo></echo>
 
-        <echo>Please, do it now. I will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <input message="Please do it now and press Enter when finished"/>
 
         <input message="Enter the name of downloaded eXist war file 
[${exist.war.file}]:"
             addproperty="__exist.war.file"
@@ -161,7 +160,7 @@
             <entry  key="exist.home" value="${exist.war.install.location}"/>
         </propertyfile>
 
-        <echo message="Downloading eXist war file..."/>
+        <echo message="Downloading eXist war file (please be patient, this 
can take some minutes)..."/>
 
         <get src="${exist.war.download.url}"
             dest="${_exist.war.install.location}/${exist.war.file}"
@@ -192,8 +191,7 @@
         <echo message="        
docBase='${exist.home}/${exist.war.file}'&gt;"/>
         <echo message="    &lt;/Context&gt;"/>
         <echo></echo>
-        <echo>Please, do it now. I will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <input message="Please do it now and press Enter when finished"/>
 
         <propertyfile file="conf/service.properties" 
             comment="This file was created by the Ant configuration script.">
@@ -203,10 +201,10 @@
 
         </propertyfile>
 
-        <input message="Enter the eXist user name []:"
+        <input message="Enter the eXist user name:"
             addproperty="_exist.username"/>
 
-        <input message="Enter the pasword for eXist user name 
${_exist.username} []:"
+        <input message="Enter the pasword for eXist user name 
${_exist.username}:"
             addproperty="_exist.password"/>
 
         <input message="Enter the password for admin eXist user []:"
@@ -282,8 +280,7 @@
         <echo>Once you have installed run the application executing</echo>
         <echo>the script startup.sh .</echo>
         <echo></echo>
-        <echo>Please, do it now. I will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <input message="Please do it now and press Enter when finished"/>
 
         <propertyfile file="conf/service.properties" 
             comment="This file was created by the Ant configuration script.">
@@ -332,8 +329,8 @@
         <echo>(user name, hostname and port number 8585 are only 
examples)</echo>
         <echo></echo>
 
-        <echo>Please, do it now and make sure the xml database is running. I 
will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <echo>Please, do it now and make sure the xml database is 
running.</echo>
+        <input message="Press Enter when finished"/>
 
     </target>
 
@@ -352,10 +349,10 @@
             addproperty="_exist.port"
             defaultvalue="8080" />
 
-        <input message="Enter the eXist user name []:"
+        <input message="Enter the eXist user name:"
             addproperty="_exist.username"/>
 
-        <input message="Enter the pasword for eXist user name 
${_exist.username} []:"
+        <input message="Enter the pasword for eXist user name 
${_exist.username}:"
             addproperty="_exist.password"/>
 
         <propertyfile file="ant/const.properties" 
@@ -414,8 +411,7 @@
         <echo>(mySQL or postgeSQL but others can be used as well).</echo>
         <echo>Make sure that you have one or install it from scratch.</echo>
         <echo></echo>
-        <echo>Please, do it now. I will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <input message="Please do it now and press Enter when finished"/>
 
         <echo>In order to maintain data of utilization metric and/or L2 path 
status metric,</echo>
         <echo>please, prepare your relational database.</echo>
@@ -424,8 +420,7 @@
         <echo>In case of postgreSQL use psql-sqlma-dbsetup.sql. </echo>
         <echo>(Warning: remember to change the password for perfsonar_ma 
user!)</echo>
         <echo></echo>
-        <echo>Please, do it now. I will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <input message="Please do it now and press Enter when finished"/>
 
     </target>
 

Modified: trunk/perfsonar/ant/sqlma/sqlma-test-run-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-test-run-targets.xml        2007-01-24 
08:31:32 UTC (rev 1957)
+++ trunk/perfsonar/ant/sqlma/sqlma-test-run-targets.xml        2007-01-24 
10:49:12 UTC (rev 1958)
@@ -20,6 +20,10 @@
 
     <target name="test">
 
+        <echo>The test will send a set of example messages.</echo>
+        <echo>Please, analyze the responses to make sure the service has 
been installed correctly.</echo>
+        <echo></echo>
+
         <antcall target="run-echo"/>
         <antcall target="run-sqlma-client-key-util"/>
         <antcall target="run-sqlma-client-data-util-1"/>