perfsonar development work

Author: roman
Date: 2007-01-24 07:15:44 -0500 (Wed, 24 Jan 2007)
New Revision: 1965

Modified:
   branches/JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
   branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml
Log:


svn merge -r 1963:1964 
https://svn.perfsonar.net/svn/perfsonar/trunk/perfsonar/ant




Modified: branches/JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml     2007-01-24 
12:13:34 UTC (rev 1964)
+++ branches/JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml     2007-01-24 
12:15:44 UTC (rev 1965)
@@ -215,8 +215,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="Press Enter when finished"/>
 
         <exec dir="${tomcat.home}/bin"
             executable="sh"
@@ -228,6 +227,8 @@
             <env key="CATALINA_BASE" path=""/>
         </exec>
 
+        <echo>Please, make sure that Tomcat is running.</echo>
+
     </target>
 
 

Modified: branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml 
2007-01-24 12:13:34 UTC (rev 1964)
+++ branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml 
2007-01-24 12:15:44 UTC (rev 1965)
@@ -121,7 +121,10 @@
             <env key="CATALINA_BASE" path=""/>
         </exec>
 
-        <echo>Please, make sure that the Tomcat is running. Use the address 
http://${target.server}:${target.port} .</echo>
+        <echo>Please, make sure that Tomcat is running.</echo>
+        <echo>You can do it using your web browser and connect the address 
http://${target.server}:${target.port}</echo>
+        <echo>or looking at Tomcat's log file (catalina.out).</echo>
+
         <input message="Press Enter when finished"/>
 
     </target>
@@ -151,7 +154,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 Enter ..."/>
+        <input message="Please do it now and press Enter when finished"/>
 
     </target>