perfsonar development work

Author: roman
Date: 2007-08-16 08:52:13 -0400 (Thu, 16 Aug 2007)
New Revision: 2665

Modified:
   branches/new-structure/trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml
Log:

use of new versions of libraries



Modified: 
branches/new-structure/trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml
===================================================================
--- 
branches/new-structure/trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml 
2007-08-16 12:11:02 UTC (rev 2664)
+++ 
branches/new-structure/trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml 
2007-08-16 12:52:13 UTC (rev 2665)
@@ -45,9 +45,9 @@
   <target name="copy-dep-service-jars"
           depends="copy-dep-base-service-jars">
 
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20070704/perfsonar-base-1.0.20070704.jar"
      todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/2.3.20070723/perfsonar-rrd-ma-2.3.20070723.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20070704/nmwg-1.0.20070704.jar" 
                              
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20070814/perfsonar-base-1.0.20070814.jar"
      todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/2.3.20070814/perfsonar-rrd-ma-2.3.20070814.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20070814/nmwg-1.0.20070814.jar" 
                              
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                              
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/com/ibatis/ibatis-sqlmap/2.1.7.597/ibatis-sqlmap-2.1.7.597.jar"
             todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
@@ -91,10 +91,10 @@
           xmlns:antcontrib="antlib:net.sf.antcontrib"
           xmlns:psbase="psbase:/base.perfsonar.org">
 
-    <input message="Do you want me to start the application server Tomcat 
for you? "
-           addproperty="tomcat.start"
-           validargs="y,n"
-           defaultvalue="y" />
+    <psbase:input2 message="Do you want me to start the application server 
Tomcat for you?"
+                   addproperty="tomcat.start"
+                   validargs="y,n"
+                   defaultvalue="y" />
 
     <echo>Please, insert now the following xml tag 'Context'</echo>
     <echo>into Tomcat configuration file server.xml</echo>
@@ -137,10 +137,10 @@
           xmlns:antcontrib="antlib:net.sf.antcontrib"
           xmlns:psbase="psbase:/base.perfsonar.org">
 
-    <input message="Do you want me to shutdown the application server Tomcat 
for you? "
-           addproperty="tomcat.shutdown"
-           validargs="y,n"
-           defaultvalue="y" />
+    <psbase:input2 message="Do you want me to shutdown the application 
server Tomcat for you?"
+                   addproperty="tomcat.shutdown"
+                   validargs="y,n"
+                   defaultvalue="y" />
 
     <antcontrib:if>
       <equals arg1="${tomcat.shutdown}" arg2="y" />