perfsonar development work

Author: roman
Date: 2007-08-14 08:54:59 -0400 (Tue, 14 Aug 2007)
New Revision: 2648

Modified:
   branches/new-structure/trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
   branches/new-structure/trunk/geant2_java-rrd-ma/ant/configure-targets.xml
   
branches/new-structure/trunk/geant2_java-rrd-ma/ant/const.properties.template
   branches/new-structure/trunk/geant2_java-rrd-ma/ant/exist-targets.xml
   branches/new-structure/trunk/geant2_java-rrd-ma/ant/pre-install-targets.xml
Log:

input task has been replaced by input2 macro from psbase namespace (to 
recognize version of Ant and correctly provide default 
values)




Modified: 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
===================================================================
--- 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml 
2007-08-14 11:05:30 UTC (rev 2647)
+++ 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml 
2007-08-14 12:54:59 UTC (rev 2648)
@@ -78,12 +78,13 @@
 
 
   <target name="tomcat-start"
-          xmlns:antcontrib="antlib:net.sf.antcontrib">
+          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>
@@ -138,10 +139,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" />

Modified: 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/configure-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-rrd-ma/ant/configure-targets.xml 
  2007-08-14 11:05:30 UTC (rev 2647)
+++ branches/new-structure/trunk/geant2_java-rrd-ma/ant/configure-targets.xml 
  2007-08-14 12:54:59 UTC (rev 2648)
@@ -25,13 +25,14 @@
 
 
   <target name="get-rrd-metaconfig-file"
-          xmlns:antcontrib="antlib:net.sf.antcontrib">
+          xmlns:antcontrib="antlib:net.sf.antcontrib"
+          xmlns:psbase="psbase:/base.perfsonar.org">
 
     <property name="rrd.default.config.file"
               value="${basedir}/conf/rrd-database_TEST.xml"/>
-    <input message="Enter the path of RRD metadata configuration file 
[${rrd.default.config.file}]:"
-           addproperty="rrd.config.file"
-           defaultvalue="${rrd.default.config.file}"/>
+    <psbase:input2 message="Enter the path of RRD metadata configuration 
file"
+                   addproperty="rrd.config.file"
+                   defaultvalue="${rrd.default.config.file}"/>
 
     <tstamp>
       <format property="current.time" pattern="yyyyMMddHHmmss"/>
@@ -87,20 +88,21 @@
 
 
   <target name="store-fuctionality"
-          xmlns:antcontrib="antlib:net.sf.antcontrib">
+          xmlns:antcontrib="antlib:net.sf.antcontrib"
+          xmlns:psbase="psbase:/base.perfsonar.org">
 
-    <input message="Do you want the service to accept messages with 
measurement data and store them? "
-           addproperty="functionality.store"
-           validargs="y,n"
-           defaultvalue="n"/>
+    <psbase:input2 message="Do you want the service to accept messages with 
measurement data and store them?"
+                   addproperty="functionality.store"
+                   validargs="y,n"
+                   defaultvalue="n"/>
 
     <antcontrib:if>
       <equals arg1="${functionality.store}" arg2="y" />
         <antcontrib:then>
 
-          <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}/"/>
+          <psbase:input2 message="Enter location of new RRD files created 
when measurement data is sent to the service?"
+                         addproperty="functionality.store.path"
+                         defaultvalue="${service.home}/"/>
 
           <propertyfile file="${basedir}/conf/service.properties">
             <entry  key="service.ma.xmldb.db_store"              value="on"/>

Modified: 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/const.properties.template
===================================================================
--- 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/const.properties.template 
      2007-08-14 11:05:30 UTC (rev 2647)
+++ 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/const.properties.template 
      2007-08-14 12:54:59 UTC (rev 2648)
@@ -20,7 +20,7 @@
 wsdd.file.undeploy=service-undeploy.wsdd
 
 antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
-antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20070704.jar
+antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20070814.jar
 
 api.location=doc/api
 api.title=perfSONAR

Modified: 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/exist-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-rrd-ma/ant/exist-targets.xml     
  2007-08-14 11:05:30 UTC (rev 2647)
+++ branches/new-structure/trunk/geant2_java-rrd-ma/ant/exist-targets.xml     
  2007-08-14 12:54:59 UTC (rev 2648)
@@ -68,9 +68,9 @@
   <target name="exist-resource-remove"
           xmlns:psbase="psbase:/base.perfsonar.org">
 
-    <input message="Enter the name of resource to remove []:"
-           addproperty="resource"
-           defaultvalue=""/>
+    <psbase:input2 message="Enter the name of resource to remove"
+                   addproperty="resource"
+                   defaultvalue=""/>
     <psbase:exist-resource-remove uri="${component.ma.xmldb.db_uri.xmlrpc}"
                                   resource="${resource}"
                                   user="${component.ma.xmldb.db_username}"
@@ -135,12 +135,13 @@
 
   <target name="exist-init"
           depends="exist-resource-present"
-          xmlns:antcontrib="antlib:net.sf.antcontrib">
+          xmlns:antcontrib="antlib:net.sf.antcontrib"
+          xmlns:psbase="psbase:/base.perfsonar.org">
 
-    <input message="Do you want me to initialize eXist xml database (eXist 
database will store the metadata configuration file)? "
-           addproperty="exist.init"
-           validargs="y,n"
-           defaultvalue="y" />
+    <psbase:input2 message="Do you want me to initialize eXist xml database 
(eXist database will store the metadata configuration file)?"
+                   addproperty="exist.init"
+                   validargs="y,n"
+                   defaultvalue="y" />
 
     <antcontrib:if>
       <equals arg1="${exist.init}" arg2="y" />
@@ -168,10 +169,10 @@
           xmlns:antcontrib="antlib:net.sf.antcontrib"
           xmlns:psbase="psbase:/base.perfsonar.org">
 
-    <input message="Do you want me to add new user 
${component.ma.xmldb.db_username} (provided in the pre-install step) in eXist 
database (if a user only for this service already exists, because it is not 
the first run of the installation, answer 'n')  ? "
-           addproperty="exist.adduser"
-           validargs="y,n"
-           defaultvalue="y" />
+    <psbase:input2 message="Do you want me to add new user 
${component.ma.xmldb.db_username} (provided in the pre-install step) in eXist 
database (if a user only for this service already exists, because it is not 
the first run of the installation, answer 'n')?"
+                   addproperty="exist.adduser"
+                   validargs="y,n"
+                   defaultvalue="y" />
 
     <antcontrib:if>
       <equals arg1="${exist.adduser}" arg2="y" />
@@ -189,18 +190,18 @@
   <target name="exist-password-update"
           xmlns:psbase="psbase:/base.perfsonar.org">
 
-    <input message="Enter eXist admin password []?"
-           addproperty="adminpass"
-           defaultvalue=""/>
-    <input message="Enter eXist username []?"
-           addproperty="username"
-           defaultvalue=""/>
-    <input message="Enter new password for ${username} []?"
-           addproperty="password"
-           defaultvalue=""/>
-    <input message="Enter the URL of eXist 
[xmldb:exist://${target.server}:${target.port}/exist/xmlrpc/db]?"
-           addproperty="url"
-           
defaultvalue="xmldb:exist://${target.server}:${target.port}/exist/xmlrpc/db"/>
+    <psbase:input2 message="Enter eXist admin password?"
+                   addproperty="adminpass"
+                   defaultvalue=""/>
+    <psbase:input2 message="Enter eXist username?"
+                   addproperty="username"
+                   defaultvalue=""/>
+    <psbase:input2 message="Enter new password for ${username}?"
+                   addproperty="password"
+                   defaultvalue=""/>
+    <psbase:input2 message="Enter the URL of eXist?"
+                   addproperty="url"
+                   
defaultvalue="xmldb:exist://${target.server}:${target.port}/exist/xmlrpc/db"/>
 
     <psbase:exist-xquery uri="${url}"
                          user="admin"

Modified: 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/pre-install-targets.xml
===================================================================
--- 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/pre-install-targets.xml 
2007-08-14 11:05:30 UTC (rev 2647)
+++ 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/pre-install-targets.xml 
2007-08-14 12:54:59 UTC (rev 2648)
@@ -121,24 +121,24 @@
           xmlns:antcontrib="antlib:net.sf.antcontrib"
           xmlns:psbase="psbase:/base.perfsonar.org">
 
-    <input message="Do you want me to compile rrdjtool library for you (if 
not you will have to do it manually in ${basedir}/contrib/rrdjtool after 
pre-install step)? "
-           addproperty="rrdjtool.build.decision"
-           validargs="y,n"
-           defaultvalue="y" />
+    <psbase:input2 message="Do you want me to compile rrdjtool library for 
you (if not you will have to do it manually in ${basedir}/contrib/rrdjtool 
after pre-install step)?"
+                   addproperty="rrdjtool.build.decision"
+                   validargs="y,n"
+                   defaultvalue="y" />
     <antcontrib:if>
       <equals arg1="${rrdjtool.build.decision}" arg2="y" />
       <antcontrib:then>
         <psbase:get-java-path dest-config-file="ant/const.properties"/>
-        <input message="Enter operating system type: "
-               addproperty="os.platform"
-               validargs="linux,linux-64bit,freebsd,solaris,other"
-               defaultvalue="linux" />
-        <input message="Enter the directory path where header file of the 
rrdtool (rrd.h) can be found [/usr/local/rrdtool/include]: "
-               addproperty="_rrd.h.path"
-               defaultvalue="/usr/local/rrdtool/include" />
-        <input message="Enter the directory path where library files of the 
rrdtool (librrd*) can be found [/usr/local/rrdtool/lib]: "
-               addproperty="_rrd.lib.path"
-               defaultvalue="/usr/local/rrdtool/lib" />
+        <psbase:input2 message="Enter operating system type"
+                       addproperty="os.platform"
+                       validargs="linux,linux-64bit,freebsd,solaris,other"
+                       defaultvalue="linux" />
+        <psbase:input2 message="Enter the directory path where header file 
of the rrdtool (rrd.h) can be found"
+                       addproperty="_rrd.h.path"
+                       defaultvalue="/usr/local/rrdtool/include" />
+        <psbase:input2 message="Enter the directory path where library files 
of the rrdtool (librrd*) can be found"
+                       addproperty="_rrd.lib.path"
+                       defaultvalue="/usr/local/rrdtool/lib" />
         <propertyfile file="${basedir}/ant/const.properties">
             <entry  key="rrdjdir"      value="${basedir}/contrib/rrdjtool"/>
             <entry  key="rrd.h.path"   value="${_rrd.h.path}"/>
@@ -185,32 +185,33 @@
 
 
   <target name="exist-install"
-          xmlns:antcontrib="antlib:net.sf.antcontrib">
+          xmlns:antcontrib="antlib:net.sf.antcontrib"
+          xmlns:psbase="psbase:/base.perfsonar.org">
 
-    <input message="Do you want me to install eXist xml database as a web 
application in your Tomcat instance? "
-           addproperty="exist.war.install"
-           validargs="y,n"
-           defaultvalue="y" />
+    <psbase:input2 message="Do you want me to install eXist xml database as 
a web application in your Tomcat instance?"
+                   addproperty="exist.war.install"
+                   validargs="y,n"
+                   defaultvalue="y" />
     <antcontrib:if>
       <equals arg1="${exist.war.install}" arg2="y" />
         <antcontrib:then>
           <antcall target="exist-war-install"/>
         </antcontrib:then>
         <antcontrib:else>
-          <input message="Do you want me to install eXist xml database as a 
stand-alone application? "
-                 addproperty="exist.jar.install"
-                 validargs="y,n"
-                 defaultvalue="y" />
+          <psbase:input2 message="Do you want me to install eXist xml 
database as a stand-alone application?"
+                         addproperty="exist.jar.install"
+                         validargs="y,n"
+                         defaultvalue="y" />
             <antcontrib:if>
               <equals arg1="${exist.jar.install}" arg2="y" />
                 <antcontrib:then>
                   <antcall target="exist-jar-install"/>
                 </antcontrib:then>
                 <antcontrib:else>
-                  <input message="Do you want me just to use already 
installed eXist xml database (web application or stand-alone)? "
-                         addproperty="exist.setup"
-                         validargs="y,n"
-                         defaultvalue="y" />
+                  <psbase:input2 message="Do you want me just to use already 
installed eXist xml database (web application or stand-alone)?"
+                                 addproperty="exist.setup"
+                                 validargs="y,n"
+                                 defaultvalue="y" />
                   <antcontrib:if>
                     <equals arg1="${exist.setup}" arg2="y" />
                       <antcontrib:then>
@@ -244,12 +245,13 @@
 
 
   <target name="exist-war-download"
-          xmlns:antcontrib="antlib:net.sf.antcontrib">
+          xmlns:antcontrib="antlib:net.sf.antcontrib"
+          xmlns:psbase="psbase:/base.perfsonar.org">
 
-    <input message="Do you want me to download eXist web application package 
? "
-           addproperty="exist.war.automat.download"
-           validargs="y,n"
-           defaultvalue="y" />
+    <psbase:input2 message="Do you want me to download eXist web application 
package?"
+                   addproperty="exist.war.automat.download"
+                   validargs="y,n"
+                   defaultvalue="y" />
     <property file="${basedir}/ant/const.properties"/>
 
     <antcontrib:if>
@@ -258,9 +260,9 @@
           <!-- automaic download -->
 
           <dirname property="_exist.war.install.location" file="${basedir}"/>
-          <input message="Enter the path of directory where eXist 
installation file will be located [${_exist.war.install.location}]:"
-                 addproperty="exist.war.install.location"
-                 defaultvalue="${_exist.war.install.location}" />
+          <psbase:input2 message="Enter the path of directory where eXist 
installation file will be located:"
+                         addproperty="exist.war.install.location"
+                         defaultvalue="${_exist.war.install.location}" />
 
           <propertyfile file="${basedir}/ant/const.properties">
             <entry  key="exist.home" value="${exist.war.install.location}"/>
@@ -281,9 +283,9 @@
           <input message="Please do it now and press Enter when finished"/>
 
           <dirname property="_exist.war.install.location" file="${basedir}"/>
-          <input message="Enter the path of directory where downloaded eXist 
war file is located [${_exist.war.install.location}]:"
-                 addproperty="exist.war.install.location"
-                 defaultvalue="${_exist.war.install.location}" />
+          <psbase:input2 message="Enter the path of directory where 
downloaded eXist war file is located:"
+                         addproperty="exist.war.install.location"
+                         defaultvalue="${_exist.war.install.location}" />
 
           <propertyfile file="${basedir}/ant/const.properties">
             <entry  key="exist.home" value="${exist.war.install.location}"/>
@@ -313,15 +315,18 @@
   </target>
 
 
-  <target name="exist-add-new-user">
+  <target name="exist-add-new-user"
+          xmlns:psbase="psbase:/base.perfsonar.org">
 
-    <input message="Enter the eXist user name:"
-           addproperty="_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 []:"
-           addproperty="_exist.adminpassword"
-           defaultvalue=""/>
+    <psbase:input2 message="Enter the eXist user name"
+                   addproperty="_exist.username"
+                   defaultvalue=""/>
+    <psbase:input2 message="Enter the pasword for eXist user name 
${_exist.username}"
+                   addproperty="_exist.password"
+                   defaultvalue=""/>
+    <psbase:input2 message="Enter the password for admin eXist user"
+                   addproperty="_exist.adminpassword"
+                   defaultvalue=""/>
 
     <propertyfile file="${basedir}/conf/service.properties">
       <entry  key="component.ma.xmldb.db_username"      
value="${_exist.username}"/>
@@ -332,7 +337,8 @@
   </target>
 
 
-  <target name="exist-jar-install">
+  <target name="exist-jar-install"
+          xmlns:psbase="psbase:/base.perfsonar.org">
   
     <echo>Visit the web site http://prdownloads.sourceforge.net/exist</echo>
     <echo>and download the file eXist-xxx.jar. </echo>
@@ -359,9 +365,9 @@
     <input message="Please do it now and press Enter when finished"/>
 
     <property name="exist.default.home" value="/usr/local/eXist"/>
-    <input message="Enter the path of eXist [${exist.default.home}] ? "
-           addproperty="_exist.home"
-           defaultvalue="${exist.default.home}" />
+    <psbase:input2 message="Enter the path of eXist?"
+                   addproperty="_exist.home"
+                   defaultvalue="${exist.default.home}" />
 
     <propertyfile file="${basedir}/conf/service.properties">
       <entry  key="component.ma.xmldb.type" value="stand-alone"/>
@@ -413,25 +419,28 @@
   </target>
 
 
-  <target name="exist-details">
+  <target name="exist-details"
+          xmlns:psbase="psbase:/base.perfsonar.org">
 
     <echo></echo>
     <echo>Now, provide some information which will be used to initialize the 
xml database eXist.</echo>
     <echo></echo>
 
     <property name="exist.default.hostname" value="localhost"/>
-    <input message="Enter the host name of xml database eXist 
[${exist.default.hostname}]:"
-           addproperty="_exist.hostname"
-           defaultvalue="${exist.default.hostname}" />
+    <psbase:input2 message="Enter the host name of xml database eXist"
+                   addproperty="_exist.hostname"
+                   defaultvalue="${exist.default.hostname}" />
 
     <property name="exist.default.port" value="8080"/>
-    <input message="Enter the port number of xml database eXist 
[${exist.default.port}]:"
-           addproperty="_exist.port"
-           defaultvalue="${exist.default.port}" />
-    <input message="Enter the eXist user name you have created []:"
-           addproperty="_exist.username"/>
-    <input message="Enter the pasword for eXist user name ${_exist.username} 
[]:"
-           addproperty="_exist.password"/>
+    <psbase:input2 message="Enter the port number of xml database eXist"
+                   addproperty="_exist.port"
+                   defaultvalue="${exist.default.port}" />
+    <psbase:input2 message="Enter the eXist user name you have created"
+                   addproperty="_exist.username"
+                   defaultvalue=""/>
+    <psbase:input2 message="Enter the pasword for eXist user name 
${_exist.username}"
+                   addproperty="_exist.password"
+                   defaultvalue=""/>
 
     <propertyfile file="${basedir}/ant/const.properties">
       <entry  key="exist.hostname" value="${_exist.hostname}"/>
@@ -446,19 +455,20 @@
   </target>
 
 
-  <target name="exist-simple-setup">
+  <target name="exist-simple-setup"
+          xmlns:psbase="psbase:/base.perfsonar.org">
 
     <antcall target="exist-main-properties"/>
 
     <property name="exist.default.hostname" value="localhost"/>
-    <input message="Enter the host name of xml database eXist 
[${exist.default.hostname}]:"
-           addproperty="_exist.hostname"
-           defaultvalue="${exist.default.hostname}" />
+    <psbase:input2 message="Enter the host name of xml database eXist"
+                   addproperty="_exist.hostname"
+                   defaultvalue="${exist.default.hostname}" />
 
     <property name="exist.default.port" value="8080"/>
-    <input message="Enter the port number of xml database eXist 
[${exist.default.port}]:"
-           addproperty="_exist.port"
-           defaultvalue="${exist.default.port}" />
+    <psbase:input2 message="Enter the port number of xml database eXist"
+                   addproperty="_exist.port"
+                   defaultvalue="${exist.default.port}" />
 
     <propertyfile file="${basedir}/ant/const.properties">
       <entry  key="exist.hostname" value="${_exist.hostname}"/>