perfsonar development work

Author: roman
Date: 2007-08-16 08:11:02 -0400 (Thu, 16 Aug 2007)
New Revision: 2664

Modified:
   branches/new-structure/trunk/geant2_java-sql-ma/ant/build.xml
   branches/new-structure/trunk/geant2_java-sql-ma/ant/configure-targets.xml
   
branches/new-structure/trunk/geant2_java-sql-ma/ant/const.properties.template
   branches/new-structure/trunk/geant2_java-sql-ma/ant/exist-targets.xml
   
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-jdbc-config-targets.xml
   
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml
   
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml
   
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
   
branches/new-structure/trunk/geant2_java-sql-ma/ant/libs-download-targets.xml
   branches/new-structure/trunk/geant2_java-sql-ma/ant/pre-install-targets.xml
Log:

updated to use new versions of nmwg, perfsonar-base and perfsonar-ant-base 
libararies




Modified: branches/new-structure/trunk/geant2_java-sql-ma/ant/build.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-sql-ma/ant/build.xml       
2007-08-16 11:52:17 UTC (rev 2663)
+++ branches/new-structure/trunk/geant2_java-sql-ma/ant/build.xml       
2007-08-16 12:11:02 UTC (rev 2664)
@@ -20,10 +20,6 @@
   <property file="${basedir}/ant/const.properties.template"/>
 
 
-  <property name="antcontrib.jar"  
value="${basedir}/lib/misc/ant-contrib-1.0b3.jar"/>
-  <property name="antpsbase.jar"   
value="${basedir}/lib/misc/perfsonar-base-ant-1.0.20070704.jar"/>
-
-
   <taskdef resource="net/sf/antcontrib/antlib.xml"
            uri="antlib:net.sf.antcontrib">
     <classpath>

Modified: 
branches/new-structure/trunk/geant2_java-sql-ma/ant/configure-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-sql-ma/ant/configure-targets.xml 
  2007-08-16 11:52:17 UTC (rev 2663)
+++ branches/new-structure/trunk/geant2_java-sql-ma/ant/configure-targets.xml 
  2007-08-16 12:11:02 UTC (rev 2664)
@@ -25,13 +25,14 @@
 
 
   <target name="get-sql-metaconfig-file"
-          xmlns:antcontrib="antlib:net.sf.antcontrib">
+          xmlns:antcontrib="antlib:net.sf.antcontrib"
+          xmlns:psbase="psbase:/base.perfsonar.org">
 
     <property name="sql.default.config.file"
               value="${basedir}/conf/sql-database_TEST.xml"/>
-    <input message="Enter the path of metadata configuration file 
[${sql.default.config.file}]:"
-           addproperty="sql.config.file"
-           defaultvalue="${sql.default.config.file}"/>
+    <psbase:input2 message="Enter the path of metadata configuration file"
+                   addproperty="sql.config.file"
+                   defaultvalue="${sql.default.config.file}"/>
 
     <tstamp>
       <format property="current.time" pattern="yyyyMMddHHmmss"/>
@@ -120,12 +121,13 @@
 
 
   <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" />

Modified: 
branches/new-structure/trunk/geant2_java-sql-ma/ant/const.properties.template
===================================================================
--- 
branches/new-structure/trunk/geant2_java-sql-ma/ant/const.properties.template 
      2007-08-16 11:52:17 UTC (rev 2663)
+++ 
branches/new-structure/trunk/geant2_java-sql-ma/ant/const.properties.template 
      2007-08-16 12:11:02 UTC (rev 2664)
@@ -14,6 +14,9 @@
 wsdd.file.deploy=service-deploy.wsdd
 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.20070814.jar
+
 api.location=doc/api
 api.title=perfSONAR
 api.windowtitle=perfSONAR

Modified: 
branches/new-structure/trunk/geant2_java-sql-ma/ant/exist-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-sql-ma/ant/exist-targets.xml     
  2007-08-16 11:52:17 UTC (rev 2663)
+++ branches/new-structure/trunk/geant2_java-sql-ma/ant/exist-targets.xml     
  2007-08-16 12:11:02 UTC (rev 2664)
@@ -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-sql-ma/ant/ibatis-jdbc-config-targets.xml
===================================================================
--- 
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-jdbc-config-targets.xml
  2007-08-16 11:52:17 UTC (rev 2663)
+++ 
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-jdbc-config-targets.xml
  2007-08-16 12:11:02 UTC (rev 2664)
@@ -16,14 +16,15 @@
 <project name="ibatis-jdbc-config-targets">
 
 
-  <target name="get-ibatis-jdbc-config">
+  <target name="get-ibatis-jdbc-config"
+          xmlns:psbase="psbase:/base.perfsonar.org">
 
     <!-- db name -->
 
-    <input message="Enter the name of databse you are going to use? "
-           addproperty="_rel.db.name"
-           validargs="mysql,postgresql"
-           defaultvalue="mysql"/>
+    <psbase:input2 message="Enter the name of databse you are going to use?"
+                   addproperty="_rel.db.name"
+                   validargs="mysql,postgresql"
+                   defaultvalue="mysql"/>
 
     <condition property="_rel.db.mysql">
       <equals arg1="mysql" arg2="${_rel.db.name}"/>
@@ -48,21 +49,21 @@
       <isset property="_rel.db.postgresql"/>
     </condition>
 
-    <input message="Enter database jdbc address URL [${rel.db.default.url}]? 
"
-           addproperty="rel.db.url"
-           defaultvalue="${rel.db.default.url}"/>
+    <psbase:input2 message="Enter database jdbc address URL?"
+                   addproperty="rel.db.url"
+                   defaultvalue="${rel.db.default.url}"/>
 
     <!-- db user name -->
 
-    <input message="Enter database user name [perfsonar_ma]? "
-           addproperty="rel.db.username"
-           defaultvalue="perfsonar_ma"/>
+    <psbase:input2 message="Enter database user name?"
+                   addproperty="rel.db.username"
+                   defaultvalue="perfsonar_ma"/>
 
     <!-- db password -->
 
-    <input message="Enter the password of user name ${rel.db.username} 
[testpass]? "
-           addproperty="rel.db.password"
-           defaultvalue="testpass"/>
+    <psbase:input2 message="Enter the password of user name 
${rel.db.username}?"
+                   addproperty="rel.db.password"
+                   defaultvalue="testpass"/>
 
   </target>
 

Modified: 
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml
===================================================================
--- 
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml
   2007-08-16 11:52:17 UTC (rev 2663)
+++ 
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml
   2007-08-16 12:11:02 UTC (rev 2664)
@@ -19,13 +19,14 @@
   <import file="../ibatis-jdbc-config-targets.xml"/>
 
 
-  <target name="metric-question">
+  <target name="metric-question"
+          xmlns:psbase="psbase:/base.perfsonar.org">
 
     <echo></echo>
-    <input message="Do you want to use data of L2 path status metric in 
domain scope which are or will be stored in your relational database? "
-           addproperty="_metric.decision"
-           validargs="y,n"
-           defaultvalue="y"/>
+    <psbase:input2 message="Do you want to use data of L2 path status metric 
in domain scope which are or will be stored in your relational database?"
+                   addproperty="_metric.decision"
+                   validargs="y,n"
+                   defaultvalue="y"/>
 
     <condition property="metric.decision">
       <equals arg1="y" arg2="${_metric.decision}"/>

Modified: 
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml
===================================================================
--- 
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml
      2007-08-16 11:52:17 UTC (rev 2663)
+++ 
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml
      2007-08-16 12:11:02 UTC (rev 2664)
@@ -19,13 +19,14 @@
   <import file="../ibatis-jdbc-config-targets.xml"/>
 
 
-  <target name="metric-question">
+  <target name="metric-question"
+          xmlns:psbase="psbase:/base.perfsonar.org">
 
     <echo></echo>
-    <input message="Do you want to use data of L2 path status metric in 
interdomain scope which are or will be stored in your relational database? "
-           addproperty="_metric.decision"
-           validargs="y,n"
-           defaultvalue="y"/>
+    <psbase:input2 message="Do you want to use data of L2 path status metric 
in interdomain scope which are or will be stored in your relational database?"
+                   addproperty="_metric.decision"
+                   validargs="y,n"
+                   defaultvalue="y"/>
 
     <condition property="metric.decision">
       <equals arg1="y" arg2="${_metric.decision}"/>

Modified: 
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
===================================================================
--- 
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
   2007-08-16 11:52:17 UTC (rev 2663)
+++ 
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
   2007-08-16 12:11:02 UTC (rev 2664)
@@ -19,13 +19,14 @@
   <import file="../ibatis-jdbc-config-targets.xml"/>
 
 
-  <target name="metric-question">
+  <target name="metric-question"
+          xmlns:psbase="psbase:/base.perfsonar.org">
 
     <echo></echo>
-    <input message="Do you want to use data of utilization metric which are 
or will be stored in your relational database? "
-           addproperty="_metric.decision"
-           validargs="y,n"
-           defaultvalue="y"/>
+    <psbase:input2 message="Do you want to use data of utilization metric 
which are or will be stored in your relational database?"
+                   addproperty="_metric.decision"
+                   validargs="y,n"
+                   defaultvalue="y"/>
 
     <condition property="metric.decision">
       <equals arg1="y" arg2="${_metric.decision}"/>

Modified: 
branches/new-structure/trunk/geant2_java-sql-ma/ant/libs-download-targets.xml
===================================================================
--- 
branches/new-structure/trunk/geant2_java-sql-ma/ant/libs-download-targets.xml 
      2007-08-16 11:52:17 UTC (rev 2663)
+++ 
branches/new-structure/trunk/geant2_java-sql-ma/ant/libs-download-targets.xml 
      2007-08-16 12:11:02 UTC (rev 2664)
@@ -54,9 +54,9 @@
 
     <artifact:dependencies>
 
-      <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20070704"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-rrd-ma"     
version="2.3.20070723"/>
-      <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20070704"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20070814"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-rrd-ma"     
version="2.3.20070814"/>
+      <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20070814"/>
 
       <dependency groupId="rrdjtool"   artifactId="rrdjtool"             
version="1.0"/>
       <dependency groupId="com.ibatis" artifactId="ibatis-sqlmap"        
version="2.1.7.597"/>

Modified: 
branches/new-structure/trunk/geant2_java-sql-ma/ant/pre-install-targets.xml
===================================================================
--- 
branches/new-structure/trunk/geant2_java-sql-ma/ant/pre-install-targets.xml 
2007-08-16 11:52:17 UTC (rev 2663)
+++ 
branches/new-structure/trunk/geant2_java-sql-ma/ant/pre-install-targets.xml 
2007-08-16 12:11:02 UTC (rev 2664)
@@ -23,32 +23,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>
@@ -86,12 +87,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>
@@ -100,9 +102,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}"/>
@@ -123,9 +125,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}"/>
@@ -155,15 +157,16 @@
   </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"/>
+    <psbase:input2 message="Enter the pasword for eXist user name 
${_exist.username}"
+                   addproperty="_exist.password"/>
+    <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}"/>
@@ -174,7 +177,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>
@@ -201,9 +205,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"/>
@@ -255,25 +259,26 @@
   </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"/>
+    <psbase:input2 message="Enter the pasword for eXist user name 
${_exist.username}"
+                   addproperty="_exist.password"/>
 
     <propertyfile file="${basedir}/ant/const.properties">
       <entry  key="exist.hostname" value="${_exist.hostname}"/>
@@ -288,19 +293,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}"/>