perfsonar development work

Author: mac
Date: 2007-08-20 08:58:38 -0400 (Mon, 20 Aug 2007)
New Revision: 2683

Modified:
   branches/new-structure/trunk/geant2_java-xml-ls/ant/axis-deploy-targets.xml
   branches/new-structure/trunk/geant2_java-xml-ls/ant/build.xml
   branches/new-structure/trunk/geant2_java-xml-ls/ant/configure-targets.xml
   
branches/new-structure/trunk/geant2_java-xml-ls/ant/const.properties.template
   branches/new-structure/trunk/geant2_java-xml-ls/ant/exist-targets.xml
   branches/new-structure/trunk/geant2_java-xml-ls/ant/pre-install-targets.xml
   branches/new-structure/trunk/geant2_java-xml-ls/ant/release-targets.xml
   branches/new-structure/trunk/geant2_java-xml-ls/ant/test-targets.xml
Log:
Ant targets for LS.

All work fine, some modifications are still needed in exist-targets in order 
to support Multiple Files auto-configuration

Modified: 
branches/new-structure/trunk/geant2_java-xml-ls/ant/axis-deploy-targets.xml
===================================================================
--- 
branches/new-structure/trunk/geant2_java-xml-ls/ant/axis-deploy-targets.xml 
2007-08-20 12:22:26 UTC (rev 2682)
+++ 
branches/new-structure/trunk/geant2_java-xml-ls/ant/axis-deploy-targets.xml 
2007-08-20 12:58:38 UTC (rev 2683)
@@ -48,19 +48,6 @@
     <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.20070704/perfsonar-base-1.0.20070704.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}/conf/eventType-map.xml"                           
     todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
-    <copy file="${basedir}/conf/eventType-rules.xml"                         
     todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
-
-    <copy file="${service.ma.conf_file}"                                     
     todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
-
-    <basename property="rrd.config.file.basename" 
file="${service.ma.conf_file}" />
-    <propertyfile 
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/service.properties">
-      <entry  key="service.ma.conf_file"
-              
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/${rrd.config.file.basename}"/>
-    </propertyfile>
-
     <copy file="${basedir}/conf/wsdd/${wsdd.file.deploy}"    
todir="${service.home}/${deploy.root}/wsdd"/>
     <copy file="${basedir}/conf/wsdd/${wsdd.file.undeploy}"  
todir="${service.home}/${deploy.root}/wsdd"/>
 
@@ -90,9 +77,7 @@
     <echo>(${tomcat.home}/conf/server.xml)</echo> 
     <echo>inside existing xml tag 'Host':</echo>
     <echo></echo>
-    <echo message="    &lt;Context path='/${deploy.root}'"/>
-    <echo message="        docBase='${service.home}/${service.name}'&gt;"/>
-    <echo message="    &lt;/Context&gt;"/>
+    <echo>    &lt;Context path='/${deploy.root}' 
docBase='${service.home}/${deploy.root}'&gt; &lt;/Context&gt;</echo>
     <echo></echo>
     <input message="Please do it now and press Enter when finished"/>
 
@@ -104,7 +89,6 @@
                 executable="sh">
             <arg line="startup.sh"/>
             <env key="PATH" 
path="${env.PATH}:/bin:/usr/bin:/sbin:/usr/sbin:${tomcat.home}/bin:."/>
-            <env key="LD_LIBRARY_PATH" 
path="${env.LD_LIBRARY_PATH}:${rrd.lib.path}:${rrdjdir}/build"/>
             <env key="CATALINA_HOME" path=""/>
             <env key="CATALINA_BASE" path=""/>
           </exec>
@@ -118,13 +102,8 @@
         </antcontrib:then>
         <antcontrib:else>
 
-          <echo>${line.separator}You have to manually set up the env 
variable LD_LIBRARY_PATH</echo>
-          <echo>which should be seen by the Tomcat instance.</echo>
-          <echo></echo>
-          <echo>After setting up the variable (re)start the Tomcat.</echo>
+          <echo>--- Please (re)start the Tomcat. ---</echo>
 
-          <echo>${line.separator}Example:</echo>
-          <echo>  export 
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${rrd.lib.path}:${rrdjdir}/build</echo>
           <echo></echo>
           <input message="Please do it now and press Enter when finished"/>
 
@@ -223,22 +202,23 @@
 
   <target name="deploy"
           xmlns:antcontrib="antlib:net.sf.antcontrib">
-
+    
+    <property file="${basedir}/ant/const.properties"/>
     <antcall target="copy-service-jar"/>
     <antcall target="tomcat-start"/>
 
     <antcontrib:if>
-      <equals arg1="${component.ma.xmldb.db_status}" arg2="on" />
+      <equals arg1="${service.ls.db_status}" arg2="on" />
         <antcontrib:then>
           <antcontrib:if>
-            <equals arg1="${component.ma.xmldb.type}" arg2="webapp" />
+            <equals arg1="${service.ls.exist_type}" arg2="webapp" />
               <antcontrib:then>
                 <antcontrib:trycatch property="errormessage">
                   <antcontrib:try>
                     <antcall target="exist-adduser"/>
                   </antcontrib:try>
                   <antcontrib:catch>
-                    <echo>The script can not create new user 
${component.ma.xmldb.db_username}.</echo>
+                    <echo>The script can not create new user 
${component.ls.xmldb.db_username}.</echo>
                     <echo>Such user could have been already created or there 
is a problem with eXist.</echo>
                     <echo>---------- Detailed error message:</echo>
                     <echo>${errormessage}</echo>
@@ -257,7 +237,8 @@
 
 
   <target name="undeploy">
-
+    
+    <property file="${basedir}/ant/const.properties"/>
     <antcall target="undeploy-adminclient" />
     <antcall target="delete-deploy-root"/>
     <antcall target="tomcat-shutdown"/>

Modified: branches/new-structure/trunk/geant2_java-xml-ls/ant/build.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-xml-ls/ant/build.xml       
2007-08-20 12:22:26 UTC (rev 2682)
+++ branches/new-structure/trunk/geant2_java-xml-ls/ant/build.xml       
2007-08-20 12:58:38 UTC (rev 2683)
@@ -4,7 +4,7 @@
 
   <description>
 
-    $Id:$
+    $Id$
     project: perfSONAR
     date: 2007/07/18
     author: romradz,mac
@@ -17,11 +17,11 @@
          basedir="..">
 
 
-  <property file="${basedir}/ant/const.properties"/>
+  <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"/>
+  <property name="antpsbase.jar"   
value="${basedir}/lib/misc/perfsonar-base-ant-1.0.20070814.jar"/>
 
 
   <taskdef resource="net/sf/antcontrib/antlib.xml"

Modified: 
branches/new-structure/trunk/geant2_java-xml-ls/ant/configure-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-xml-ls/ant/configure-targets.xml 
  2007-08-20 12:22:26 UTC (rev 2682)
+++ branches/new-structure/trunk/geant2_java-xml-ls/ant/configure-targets.xml 
  2007-08-20 12:58:38 UTC (rev 2683)
@@ -49,7 +49,7 @@
       <echo message="=================="/>
       <echo/>
       
-      <input message="Do you want to use LS Cleanup (removing old entries 
when TTL exceeded)?"
+      <psbase:input2 message="Do you want to use LS Cleanup (removing old 
entries when TTL exceeded)?"
              addproperty="use.ls_cleanup"
              defaultvalue="n"
              validargs="y,n"/>
@@ -58,16 +58,16 @@
         <equals arg1="${use.ls_cleanup}" arg2="y" />
         <antcontrib:then>
 
-          <input message="LS Cleanup -- cleanup interval: how often to 
search old entries in DB [300] (seconds)"
+          <psbase:input2 message="LS Cleanup -- cleanup interval: how often 
to search old entries in DB (seconds)"
                  addproperty="component.ls_cleanup_loader.interval"
                  defaultvalue="300" /><!-- seconds -->
-          <input message="LS Cleanup -- Default TTL of lookup information 
without specified TTL value [3600] (seconds)"
+          <psbase:input2 message="LS Cleanup -- Default TTL of lookup 
information without specified TTL value (seconds)"
                  addproperty="service.ls.ttl"
                  defaultvalue="3600" /><!-- seconds -->
-          <input message="LS Cleanup -- Minimum accepted TTL from service 
[1200] (seconds)"
+          <psbase:input2 message="LS Cleanup -- Minimum accepted TTL from 
service (seconds)"
                  addproperty="service.ls.min_ttl"
                  defaultvalue="1200" /><!-- seconds -->
-          <input message="LS Cleanup -- Maximum accepted TTL from service [] 
(seconds, leave blank if no range)"
+          <psbase:input2 message="LS Cleanup -- Maximum accepted TTL from 
service (seconds, leave blank if no range)"
                  addproperty="service.ls.max_ttl"
                  defaultvalue="" /><!-- seconds or blank -->
 
@@ -104,7 +104,7 @@
      <echo message="================"/>
      <echo/>
      
-     <input message="Do you want to use Multidomain LS (communication with 
other Lookup Services)?"
+     <psbase:input2 message="Do you want to use Multidomain LS 
(communication with other Lookup Services)?"
             addproperty="use.ls_multils"
             defaultvalue="n"
             validargs="y,n"/>
@@ -112,19 +112,19 @@
      <antcontrib:if>
        <equals arg1="${use.ls_multils}" arg2="y" />
        <antcontrib:then>
-         <input message="Multi LS -- URL of well-known LS to initialize peer 
list, mandatory:"
+         <psbase:input2 message="Multi LS -- URL of well-known LS to 
initialize peer list, mandatory:"
                 addproperty="service.r.ls_url" />
-         <input message="Multi LS -- Enter local Lookup Service unique name, 
mandatory []:"
+         <psbase:input2 message="Multi LS -- Enter local Lookup Service 
unique name, mandatory"
                 addproperty="service.r.name" />
-         <input message="Multi LS -- enter your host name and domain name, 
but not localhost! This property will be used for sending Lookup Information 
of your Lookup Service:"
+         <psbase:input2 message="Multi LS -- enter your host name and domain 
name, but not localhost! This property will be used for sending Lookup 
Information of your Lookup Service:"
                 addproperty="service.r.hostname" />
          
-         <input message="Multi LS -- Enter the service description, optional 
[]:"
+         <psbase:input2 message="Multi LS -- Enter the service description, 
optional"
                 addproperty="service.r.description"/>
-         <input message="Multi LS -- Enter the contact email address of 
service owner, optional []:"
+         <psbase:input2 message="Multi LS -- Enter the contact email address 
of service owner, optional"
                 addproperty="service.r.contact.email"
                 defaultvalue=""/>
-         <input message="Multi LS -- Enter the organization name where the 
service is being installed []:"
+         <psbase:input2 message="Multi LS -- Enter the organization name 
where the service is being installed"
                 addproperty="service.r.organization.name"
                 defaultvalue=""/>
          
@@ -167,6 +167,8 @@
   <target name="configure"
           xmlns:psbase="psbase:/base.perfsonar.org">
 
+    <property file="${basedir}/ant/const.properties"/>
+    
     <psbase:template-use template-file="conf/components.properties.template"
                          dest-file="conf/components.properties"/>
 

Modified: 
branches/new-structure/trunk/geant2_java-xml-ls/ant/const.properties.template
===================================================================
--- 
branches/new-structure/trunk/geant2_java-xml-ls/ant/const.properties.template 
      2007-08-20 12:22:26 UTC (rev 2682)
+++ 
branches/new-structure/trunk/geant2_java-xml-ls/ant/const.properties.template 
      2007-08-20 12:58:38 UTC (rev 2683)
@@ -7,7 +7,7 @@
 service.name=LookupSerivce
 
 #deploy root will be updated as "${deploy.root}-${version}"
-deploy.root=XML-LS
+deploy.root.base=XML-LS
 
 
 jarfilename=perfsonar-xml-ls

Modified: 
branches/new-structure/trunk/geant2_java-xml-ls/ant/exist-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-xml-ls/ant/exist-targets.xml     
  2007-08-20 12:22:26 UTC (rev 2682)
+++ branches/new-structure/trunk/geant2_java-xml-ls/ant/exist-targets.xml     
  2007-08-20 12:58:38 UTC (rev 2683)
@@ -4,11 +4,6 @@
 
   <description>
 
-    $Id$
-    project: perfSONAR
-    date: 2007/06/25
-    author: romradz
-
   </description>
 
 -->
@@ -34,17 +29,18 @@
 
   <target name="exist-resources-list"
           xmlns:psbase="psbase:/base.perfsonar.org">
-    <psbase:exist-resources-list uri="${component.ma.xmldb.db_uri.xmlrpc}"/>
+    <psbase:exist-resources-list uri="${service.ls.db_uri.xmlrpc}"/>
   </target>
 
 
   <target name="exist-resource-present"
            xmlns:xdb="http://exist-db.org/ant";>
 
-    <basename property="xmlresource" file="${service.ma.conf_file}"/>
     <condition property="resource.present">
-      <xdb:exist uri="${component.ma.xmldb.db_uri.xmlrpc}"
-                    resource="${xmlresource}"/>
+      <xdb:exist uri="${service.ls.db_uri.xmlrpc}"
+                    resource="LSStore.xml"/>
+      <xdb:exist uri="${service.ls.db_uri.xmlrpc}"
+                 resource="LSStore-control.xml"/>
     </condition>
 
   </target>
@@ -53,58 +49,61 @@
   <target name="exist-collection-remove"
           xmlns:psbase="psbase:/base.perfsonar.org">
 
-    <basename property="collection"  
file="${component.ma.xmldb.db_uri.xmlrpc}" />
+    <basename property="collection"  file="${service.ls.db_uri.xmlrpc}" />
     <basename property="resource" file="${service.ma.conf_file}"/>
 
-    <psbase:exist-collection-remove uri="${component.ma.xmldb.db_uri.xmlrpc}"
+    <psbase:exist-collection-remove uri="${service.ls.db_uri.xmlrpc}"
                                     resource="${resource}"
                                     collection="${collection}"
-                                    user="${component.ma.xmldb.db_username}"
-                                    
password="${component.ma.xmldb.db_password}"/>
-
+                                    user="${service.ls.db_username}"
+                                    password="${service.ls.db_password}"/>
   </target>
 
 
   <target name="exist-resource-remove"
           xmlns:psbase="psbase:/base.perfsonar.org">
 
-    <input message="Enter the name of resource to remove []:"
+    <input message="Enter the name of resource to remove"
            addproperty="resource"
            defaultvalue=""/>
-    <psbase:exist-resource-remove uri="${component.ma.xmldb.db_uri.xmlrpc}"
+    <psbase:exist-resource-remove uri="${service.ls.db_uri.xmlrpc}"
                                   resource="${resource}"
-                                  user="${component.ma.xmldb.db_username}"
-                                  
password="${component.ma.xmldb.db_password}"/>
+                                  user="${service.ls.db_username}"
+                                  password="${service.ls.db_password}"/>
   </target>
 
 
   <target name="exist-resource-store"
           xmlns:psbase="psbase:/base.perfsonar.org">
 
-    <psbase:exist-resource-store uri="${component.ma.xmldb.db_uri.xmlrpc}"
-                                 resource="${service.ma.conf_file}"
-                                 user="${component.ma.xmldb.db_username}"
-                                 
password="${component.ma.xmldb.db_password}"/>
+    <psbase:exist-resource-store uri="${service.ls.db_uri.xmlrpc}"
+                                 resource="samples/requests/LSStore.xml"
+                                 user="${service.ls.db_username}"
+                                 password="${service.ls.db_password}"/>
+    <psbase:exist-resource-store uri="${service.ls.db_uri.xmlrpc}"
+                                 
resource="samples/requests/LSStore-control.xml"
+                                 user="${service.ls.db_username}"
+                                 password="${service.ls.db_password}"/>
 
   </target>
 
 
   <target name="exist-resource-extract"
           xmlns:psbase="psbase:/base.perfsonar.org">
-
-    <basename property="xmlresource" file="${service.ma.conf_file}"/>
-    <psbase:exist-resource-extract uri="${component.ma.xmldb.db_uri.xmlrpc}"
+<!--
+    <basename property="xmlresource" file="resources/requests/LSStore.xml"/>
+    <psbase:exist-resource-extract uri="${service.ls.db_uri.xmlrpc}"
                                    resource="${xmlresource}"
-                                   user="${component.ma.xmldb.db_username}"
-                                   
password="${component.ma.xmldb.db_password}"
+                                   user="${service.ls.db_username}"
+                                   password="${service.ls.db_password}"
                                    dest-file="conf/dump_${xmlresource}"/>
-
+-->    
   </target>
 
 
   <target name="getdbroot">
 
-    <dirname property="dir1" file="/${component.ma.xmldb.db_uri.xmlrpc}"/>
+    <dirname property="dir1" file="/${service.ls.db_uri.xmlrpc}"/>
     <basename property="base1" file="${dir1}"/>
 
     <dirname property="dir2" file="${dir1}"/>
@@ -125,19 +124,20 @@
           depends="getdbroot"
           xmlns:psbase="psbase:/base.perfsonar.org">
 
-    <basename property="ma-collection" 
file="${component.ma.xmldb.db_uri.xmlrpc}" />
+    <basename property="ls-base-collection" 
file="${service.ls.db_uri.xmlrpc}" />
     <psbase:exist-collection-create uri="${dbroot}"
-                                    collection="${ma-collection}"
-                                    user="${component.ma.xmldb.db_username}"
-                                    
password="${component.ma.xmldb.db_password}"/>
+                                    collection="${ls-base-collection}"
+                                    user="${service.ls.db_username}"
+                                    password="${service.ls.db_password}"/>
   </target>
 
 
   <target name="exist-init"
           depends="exist-resource-present"
+          xmlns:psbase="psbase:/base.perfsonar.org"
           xmlns:antcontrib="antlib:net.sf.antcontrib">
 
-    <input message="Do you want me to initialize eXist xml database (eXist 
database will store the metadata configuration file)? "
+    <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" />
@@ -145,19 +145,24 @@
     <antcontrib:if>
       <equals arg1="${exist.init}" arg2="y" />
         <antcontrib:then>
+          
+          <antcall target="exist-collection-create"/>
+                <antcall target="exist-resource-store"/>
+<!--                
           <antcontrib:if>
             <isset property="resource.present"/>
               <antcontrib:then>
                 <antcall target="exist-resource-extract"/>
                 <antcall target="exist-collection-remove"/>
                 <antcall target="exist-collection-create"/>
-                <antcall target="exist-resource-store"/>
+                <antcall target="exist-resource-store"/> 
               </antcontrib:then>
               <antcontrib:else>
                 <antcall target="exist-collection-create"/>
                 <antcall target="exist-resource-store"/>
               </antcontrib:else>
           </antcontrib:if>
+-->          
         </antcontrib:then>
     </antcontrib:if>
 
@@ -168,7 +173,7 @@
           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')  ? "
+    <psbase:input2 message="Do you want me to add new user 
${service.ls.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" />
@@ -178,8 +183,8 @@
         <antcontrib:then>
           <psbase:exist-xquery 
uri="xmldb:exist://${target.server}:${target.port}/exist/xmlrpc/db"
                                user="admin"
-                               
password="${component.ma.xmldb.db_adminpassword}"
-                               
query="xmldb:create-user('${component.ma.xmldb.db_username}', 
'${component.ma.xmldb.db_password}', 'dba', '/db')" />
+                               password="${service.ls.db_adminpassword}"
+                               
query="xmldb:create-user('${service.ls.db_username}', 
'${service.ls.db_password}', 'dba', '/db')" />
         </antcontrib:then>
     </antcontrib:if>
 
@@ -189,16 +194,16 @@
   <target name="exist-password-update"
           xmlns:psbase="psbase:/base.perfsonar.org">
 
-    <input message="Enter eXist admin password []?"
+    <psbase:input2 message="Enter eXist admin password?"
            addproperty="adminpass"
            defaultvalue=""/>
-    <input message="Enter eXist username []?"
+    <psbase:input2 message="Enter eXist username?"
            addproperty="username"
            defaultvalue=""/>
-    <input message="Enter new password for ${username} []?"
+    <psbase:input2 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]?"
+    <psbase:input2 message="Enter the URL of eXist?"
            addproperty="url"
            
defaultvalue="xmldb:exist://${target.server}:${target.port}/exist/xmlrpc/db"/>
 

Modified: 
branches/new-structure/trunk/geant2_java-xml-ls/ant/pre-install-targets.xml
===================================================================
--- 
branches/new-structure/trunk/geant2_java-xml-ls/ant/pre-install-targets.xml 
2007-08-20 12:22:26 UTC (rev 2682)
+++ 
branches/new-structure/trunk/geant2_java-xml-ls/ant/pre-install-targets.xml 
2007-08-20 12:58:38 UTC (rev 2683)
@@ -4,7 +4,7 @@
 
   <description>
 
-    $Id:$
+    $Id$
     project: perfSONAR
     date: 2007/07/18
     author: romradz, mac
@@ -16,16 +16,37 @@
 <project name="pre-install-targets"
          basedir="..">
 
+  <target name="show-info">
+    <echo></echo>
+    <echo>Pre-install</echo>
+    <echo/>
+    <echo>---- Welcome in perfSONAR LookupService ${version} installation 
script ----</echo>
+    <echo/>
+    <echo>You're about to install LookupService that may be also called LS 
during the installation process.</echo>
+        <echo/>
+        <echo>Requirements:</echo>
+        <echo/>
+        <echo> 1. Java 1.5.x</echo>
+        <echo> 2. Ant 1.6.x (we're sure you've already got it installed as 
you run the installation process)</echo>
+        <echo/>
+        
+        <input message="Do you want to proceed? Just press ENTER to 
continue. Otherwise CTRL-C stops the process immediately"/>
+        
+        <echo>Preparing the installation of XML Lookup Service...</echo>
+        <echo></echo>
+        
+        
+    </target>
 
-
   <!-- 
===================================================================================
 -->
   <!-- preparing eXist xml database -->
 
 
   <target name="exist-install"
+          xmlns:psbase="psbase:/base.perfsonar.org"
           xmlns:antcontrib="antlib:net.sf.antcontrib">
-
-    <input message="Do you want me to install eXist xml database as a web 
application in your Tomcat instance? "
+    
+    <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" />
@@ -35,7 +56,7 @@
           <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? "
+          <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" />
@@ -45,7 +66,7 @@
                   <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)? "
+                  <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" />
@@ -69,20 +90,12 @@
     <antcall target="exist-war-download"/>
     <antcall target="exist-main-properties"/>
     <antcall target="exist-tomcat-context"/>
-
-    <!--
-        #MAC
-        service.ls.db_type=%LS_STORAGE_TYPE%
-        service.ls.db_uri=%LS_STORAGE_URI%
-        service.ls.db_username=%LS_STORAGE_USERNAME%
-        service.ls.db_password=%LS_STORAGE_PASSWORD%
-    -->
     
     <property file="${basedir}/ant/const.properties" />
     <propertyfile file="${basedir}/conf/service.properties">
-      <entry  key="service.ls.db_uri"        
value="xmldb:exist://localhost:${target.port}/exist/xmlrpc/db/ls"/>
       <entry  key="service.ls.db_uri.xmlrpc" 
value="xmldb:exist://localhost:${target.port}/exist/xmlrpc/db/ls"/>
       <entry  key="service.ls.db_uri.http"   
value="http://localhost:${target.port}/exist/rest/db/ls"/>
+      <entry  key="service.ls.db_uri"   
value="http://localhost:${target.port}/exist/rest/db/ls"/>
       <entry  key="service.ls.exist_type"     value="webapp"/>
     </propertyfile>
 
@@ -92,9 +105,10 @@
 
 
   <target name="exist-war-download"
+          xmlns:psbase="psbase:/base.perfsonar.org"
           xmlns:antcontrib="antlib:net.sf.antcontrib">
 
-    <input message="Do you want me to download eXist web application package 
? "
+    <psbase:input2 message="Do you want me to download eXist web application 
package ? "
            addproperty="exist.war.automat.download"
            validargs="y,n"
            defaultvalue="y" />
@@ -106,7 +120,7 @@
           <!-- 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}]:"
+          <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}" />
 
@@ -129,7 +143,7 @@
           <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}]:"
+          <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}" />
 
@@ -159,13 +173,13 @@
   </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:"
+    <psbase:input2 message="Enter the eXist user name"
            addproperty="_exist.username"/>
-    <input message="Enter the pasword for eXist user name 
${_exist.username}:"
+    <psbase:input2 message="Enter the pasword for eXist user name 
${_exist.username}"
            addproperty="_exist.password"/>
-    <input message="Enter the password for admin eXist user []:"
+    <psbase:input2 message="Enter the password for admin eXist user"
            addproperty="_exist.adminpassword"
            defaultvalue=""/>
 
@@ -178,7 +192,7 @@
   </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>
@@ -205,7 +219,7 @@
     <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}] ? "
+    <psbase:input2 message="Enter the path of eXist? "
            addproperty="_exist.home"
            defaultvalue="${exist.default.home}" />
 
@@ -221,29 +235,49 @@
     <antcall target="exist-guiclient-add-new-user"/>
     <antcall target="exist-details"/>
 
-    <!--
-        #MAC
-        service.ls.db_type=%LS_STORAGE_TYPE%
-        service.ls.db_uri=%LS_STORAGE_URI%
-        service.ls.db_username=%LS_STORAGE_USERNAME%
-        service.ls.db_password=%LS_STORAGE_PASSWORD%
-    -->
+
     <property file="${basedir}/ant/const.properties" />
     <propertyfile file="${basedir}/conf/service.properties">
-      <entry  key="service.ls.db_uri"        
value="xmldb:exist://${exist.hostname}:${exist.port}/exist/xmlrpc/db/ls"/>
+      <entry  key="service.ls.db_uri.http" 
value="http://localhost:${target.port}/exist/rest/db/ls"/>
+      <entry  key="service.ls.db_uri" 
value="http://localhost:${target.port}/exist/rest/db/ls"/>
       <entry  key="service.ls.db_uri.xmlrpc" 
value="xmldb:exist://${exist.hostname}:${exist.port}/exist/xmlrpc/db/ls"/>
-      <entry  key="service.ls.db_uri.http" 
value="http://localhost:${target.port}/exist/rest/db/ls"/>
     </propertyfile>
 
   </target>
 
 
-  <target name="exist-main-properties">
-     <propertyfile file="${basedir}/conf/service.properties">
+  <target name="exist-main-properties" 
xmlns:antcontrib="antlib:net.sf.antcontrib" 
xmlns:psbase="psbase:/base.perfsonar.org">
+    
+    <echo>Enter the DB data storage implementation, possible values 
are:</echo>
+    <echo>  - [exist-xq] - eXist DB XML using XQuery; reliable but 
slow</echo>
+    <echo>  - [exist-mf] - eXist DB XML using multiple files in the 
collection; fast but experimental</echo>
+    <psbase:input2 message="Select one "
+           addproperty="_exist.db_type"
+           defaultvalue="exist-xq" 
+           validargs="exist-xq,exist-mf"/>
+    
+    <antcontrib:if>
+      <equals arg1="${_exist.db_type}" arg2="exist-xq" />
+      <antcontrib:then>
+        <property name="_exist.classname" 
value="org.perfsonar.service.lookupService.xmlType.storage.exist.XQueryExistDAOImpl"/>
+      </antcontrib:then>
+    </antcontrib:if>
+    
+    <antcontrib:if>
+      <equals arg1="${_exist.db_type}" arg2="exist-mf" />
+      <antcontrib:then>
+        <property name="_exist.classname" 
value="org.perfsonar.service.lookupService.xmlType.storage.exist.MultipleFilesExistDAOImpl"/>
+      </antcontrib:then>
+    </antcontrib:if>
+    
+    <propertyfile file="${basedir}/conf/service.properties">
        <entry  key="service.ls.db_status" value="on"/>
-       <entry  key="service.ls.db_access" value="xmlrpc"/>
+       <!-- entry  key="service.ls.db_access" value="xmlrpc"/ -->
+       <entry  key="service.ls.db_access" value="http" />
+       <entry  key="service.ls.db_type" value="${_exist.classname}"/>
      </propertyfile>
-  </target>
+  
+   </target>
 
 
   <target name="exist-guiclient-add-new-user">
@@ -266,25 +300,27 @@
     <input message="Please do it now and and make sure the xml database is 
running. Press Enter when finished."/>
   </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}]:"
+    <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}]:"
+    <psbase:input2 message="Enter the port number of xml database eXist"
            addproperty="_exist.port"
            defaultvalue="${exist.default.port}" />
-    <input message="Enter the eXist user name you have created []:"
+    <psbase:input2 message="Enter the eXist user name you have created"
            addproperty="_exist.username"/>
-    <input message="Enter the pasword for eXist user name ${_exist.username} 
[]:"
+    <psbase:input2 message="Enter the pasword for eXist user name 
${_exist.username}"
            addproperty="_exist.password"/>
 
     <propertyfile file="${basedir}/ant/const.properties">
@@ -298,19 +334,19 @@
     </propertyfile>
 
   </target>
+  
+  
+  <target name="exist-simple-setup" 
xmlns:antcontrib="antlib:net.sf.antcontrib" 
xmlns:psbase="psbase:/base.perfsonar.org">
 
-
-  <target name="exist-simple-setup">
-
     <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}]:"
+    <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}]:"
+    <psbase:input2 message="Enter the port number of xml database eXist"
            addproperty="_exist.port"
            defaultvalue="${exist.default.port}" />
 
@@ -321,9 +357,10 @@
 
     <propertyfile file="${basedir}/conf/service.properties">
       <entry  key="service.ls.exist_type"    value="webapp"/>
-      <entry  key="service.ls.db_uri"        
value="xmldb:exist://${exist.hostname}:${exist.port}/exist/xmlrpc/db/ls"/>
       <entry  key="service.ls.db_uri.xmlrpc" 
value="xmldb:exist://${exist.hostname}:${exist.port}/exist/xmlrpc/db/ls"/>
       <entry  key="service.ls.db_uri.http" 
value="http://localhost:${target.port}/exist/rest/db/ls"/>
+      <entry  key="service.ls.db_uri" 
value="http://localhost:${target.port}/exist/rest/db/ls"/>
+    
     </propertyfile>
 
     <antcall target="exist-add-new-user"/>
@@ -338,6 +375,9 @@
   <target name="pre-install"
           xmlns:psbase="psbase:/base.perfsonar.org">
 
+    <antcall target="show-info"/>
+    
+    
     <psbase:template-use template-file="ant/const.properties.template"
                          dest-file="ant/const.properties"/>
     <psbase:template-use template-file="conf/service.properties.template"
@@ -354,9 +394,16 @@
     <!-- or use default service.name and default deploy.root+version from 
const.properties -->
     <propertyfile file="${basedir}/ant/const.properties">
       <entry  key="service.name" value="${service.name}"/>
-      <entry  key="deploy.root"  value="${deploy.root}-${version}"/>
+      <entry  key="deploy.root"  value="${deploy.root.base}-${version}"/>
     </propertyfile>
 
+    <echo/>
+    <echo>---------------------------------------------------</echo>
+    <echo/>
+    <echo>Please answer all these questions below:</echo>
+    <echo/>
+    
+    
     <psbase:get-service-home dest-config-file="ant/const.properties"/>
     
     <psbase:get-tomcat dest-config-file="ant/const.properties"

Modified: 
branches/new-structure/trunk/geant2_java-xml-ls/ant/release-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-xml-ls/ant/release-targets.xml   
  2007-08-20 12:22:26 UTC (rev 2682)
+++ branches/new-structure/trunk/geant2_java-xml-ls/ant/release-targets.xml   
  2007-08-20 12:58:38 UTC (rev 2683)
@@ -6,8 +6,8 @@
 
     $Id$
     project: perfSONAR
-    date: 2007/07/03
-    author: romradz
+    date: 2007/08/17
+    author: romradz,mac
 
   </description>
 
@@ -23,48 +23,57 @@
     <psbase:template-use template-file="ant/const.properties.template"
                          dest-file="ant/const.properties"/>
     <property file="${basedir}/ant/const.properties"/>
+    
+    <psbase:input2 message="Enter release version" 
addproperty="release.version" defaultvalue="${version}" />
 
   </target>
 
 
   <target name="release"
           depends="release-init,jar">
+    
+    
 
     <delete dir="tmp"/>
-    <mkdir dir="tmp/${service.name}-${version}"/>
-    <copy todir="tmp/${service.name}-${version}">
+    
+    <mkdir dir="tmp/XML-LS-${release.version}"/>
+    <copy todir="tmp/XML-LS-${release.version}">
       <fileset dir="${basedir}"/>
     </copy>
+    
+    
+    <delete dir="tmp/XML-LS-${release.version}/tmp"/>
+    <delete dir="tmp/XML-LS-${release.version}/build/org"/>
+    <delete dir="tmp/XML-LS-${release.version}/bin"/>
+    <delete dir="tmp/XML-LS-${release.version}/release"/>
 
-    <delete dir="tmp/${service.name}-${version}/tmp"/>
-    <delete dir="tmp/${service.name}-${version}/build/org"/>
-    <delete dir="tmp/${service.name}-${version}/bin"/>
+    <delete file="tmp/XML-LS-${release.version}/conf/components.properties"/>
+    <delete file="tmp/XML-LS-${release.version}/conf/service.properties"/>
+    <delete file="tmp/XML-LS-${release.version}/conf/log4j.properties"/>
+    <delete file="tmp/XML-LS-${release.version}/ant/const.properties"/>
 
-    <delete 
file="tmp/${service.name}-${version}/conf/components.properties"/>
-    <delete file="tmp/${service.name}-${version}/conf/service.properties"/>
-    <delete file="tmp/${service.name}-${version}/conf/log4j.properties"/>
-    <delete file="tmp/${service.name}-${version}/ant/const.properties"/>
-
     <delete>
-      <fileset dir="tmp/${service.name}-${version}/conf" 
includes="**/*.old"/>
-      <fileset dir="tmp/${service.name}-${version}/samples/requests" 
includes="**/response*.xml"/>
+      <fileset dir="tmp/XML-LS-${release.version}/conf" includes="**/*.old"/>
+      <fileset dir="tmp/XML-LS-${release.version}/samples/requests" 
includes="**/*Response.xml"/>      
     </delete>
+    
+    <delete dir="tmp/XML-LS-${release.version}/lib2"/> <!-- temporary -->
 
 
-    <delete dir="tmp/${service.name}-${version}/lib/rrd"/>
-
-    <tar destfile="${service.name}-${version}.tar"
+    <tar destfile="XML-LS-${release.version}.tar"
          basedir="tmp/"
          longfile="gnu"
-         excludes=".svn/**"/>
+         excludes=".svn/**,bak/**"/>
 
     <delete dir="tmp"/>
+    
+    <mkdir dir="release"/>
+      
+    <gzip zipfile="release/XML-LS-${release.version}.tar.gz"
+          src="XML-LS-${release.version}.tar"/>
 
-    <gzip zipfile="${service.name}-${version}.tar.gz"
-          src="${service.name}-${version}.tar"/>
+    <delete file="XML-LS-${release.version}.tar"/>
 
-    <delete file="${service.name}-${version}.tar"/>
-
   </target>
 
 

Modified: branches/new-structure/trunk/geant2_java-xml-ls/ant/test-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-xml-ls/ant/test-targets.xml      
  2007-08-20 12:22:26 UTC (rev 2682)
+++ branches/new-structure/trunk/geant2_java-xml-ls/ant/test-targets.xml      
  2007-08-20 12:58:38 UTC (rev 2683)
@@ -17,194 +17,232 @@
          basedir="..">
 
 
-  <property name="ma.local"
-            
value="http://${target.server}:${target.port}/${deploy.root}/services/MeasurementArchiveService"/>
-
-
   <path id="classpath">
     <fileset dir="${basedir}/lib/repository">
       <include name="**/*.jar"/>
     </fileset>
   </path>
-
-
-  <target name="echo-test">
-    <java classname="org.perfsonar.client.testHarness.SOAPClient"
-          classpathref="classpath"
-          fork="true">
-      <arg value="${ma.local}"/>
-      <arg value="${basedir}/samples/requests/Echo-Req.xml"/>
-      <arg value="${basedir}/samples/requests/response-1.xml"/>
-    </java>
+  
+  
+  <target name="init-test">
+    <property file="${basedir}/ant/const.properties"/>
+    <property name="ls.local"
+              
value="http://${target.server}:${target.port}/${deploy.root}/services/LookupService"/>
   </target>
 
 
-  <target name="lookup-info-test">
-    <java classname="org.perfsonar.client.testHarness.SOAPClient"
-          classpathref="classpath"
-          fork="true">
-      <arg value="${ma.local}"/>
-      <arg value="${basedir}/samples/requests/LookupInfo-Req.xml"/>
-      <arg value="${basedir}/samples/requests/response-2.xml"/>
+  <!-- Sends request to LS deployed        < in Tomcat, Register -->
+    <target name="client-register"
+            depends="init-test"
+            description="Sends request to Tomcat: REGISTER">
+      
+      <java classname="org.perfsonar.client.testHarness.SOAPClient"
+            classpathref="classpath" fork="true">
+        <arg value="${ls.local}"/>
+        <arg value="${basedir}/samples/requests/LSRegisterRequest.xml"/>
+        <arg value="${basedir}/samples/requests/LSRegisterResponse.xml"/>
+      </java>
+    </target>
+    
+    
+    <!-- Sends request to LS deployed in Tomcat, Query -->
+    <target name="client-query"
+            depends="init-test"
+            description="Sends request to Tomcat: QUERY/LOOKUP">
+      
+      <java classname="org.perfsonar.client.testHarness.SOAPClient"
+            classpathref="classpath" fork="true">
+        <arg value="${ls.local}"/>
+        <arg value="${basedir}/samples/requests/LSQueryRequest.xml"/>
+        <arg value="${basedir}/samples/requests/LSQueryResponse.xml"/>
+      </java>
+    </target>
+    
+    
+    <!-- Sends request to LS deployed in Tomcat, Deregister -->
+    <target name="client-deregister"
+            depends="init-test"
+            description="Sends request to Tomcat: DEREGISTER">
+      
+      <java classname="org.perfsonar.client.testHarness.SOAPClient"
+            classpathref="classpath" fork="true">
+        <arg value="${ls.local}"/>
+        <arg value="${basedir}/samples/requests/LSDeregisterRequest.xml"/>
+        <arg value="${basedir}/samples/requests/LSDeregisterResponse.xml"/>
+      </java>
+    </target>
+    
+    
+    <!-- Sends request to LS deployed in Tomcat, Keep alive -->
+    <target name="client-keepalive"
+            depends="init-test"
+            description="Sends request to Tomcat: KEEP ALIVE">
+      
+      <java classname="org.perfsonar.client.testHarness.SOAPClient"
+            classpathref="classpath" fork="true">
+        <arg value="${ls.local}"/>
+        <arg value="${basedir}/samples/requests/LSKeepaliveRequest.xml"/>
+        <arg value="${basedir}/samples/requests/LSKeepaliveResponse.xml"/>
+      </java>
+    </target>
+    
+    
+    <!-- Sends request to LS deployed in Tomcat, Reregister/update -->
+    <target name="client-update"
+            depends="init-test"            
+            description="Sends request to Tomcat: RE-REGISTER UPDATE">
+      
+      <java classname="org.perfsonar.client.testHarness.SOAPClient"
+            classpathref="classpath" fork="true">
+        <arg value="${ls.local}"/>
+        <arg 
value="${basedir}/samples/requests/LSRegisterRequest-Update.xml"/>
+        <arg 
value="${basedir}/samples/requests/LSRegisterResponse-Update.xml"/>
+      </java>
+    </target>
+    
+    <!-- Sends request to LS deployed in Tomcat, Keep alive -->
+    <target name="client-echo"
+            depends="init-test"
+            description="Sends request to Tomcat: ECHO">
+      
+      <java classname="org.perfsonar.client.testHarness.SOAPClient"
+            classpathref="classpath" fork="true">
+        <arg value="${ls.local}"/>
+        <arg value="${basedir}/samples/requests/EchoRequest.xml"/>
+        <arg value="${basedir}/samples/requests/EchoResponse.xml"/>
+      </java>
+        </target>
+        
+        
+  <!-- 
===================================================================================
 -->
+  
+  <path id="classpath_for_test">
+    <fileset dir="./lib/repository">
+      <include name="**/*.jar"/>
+    </fileset>
+    <pathelement location="build/perfSONAR-generic.jar"/>
+    <pathelement location="build/perfSONAR-xmlls.jar"/>
+    <pathelement location="build"/>
+  </path>
+  
+  
+  <target name="copy-config-files-for-test" 
+          depends="init-test"
+          >
+    <mkdir dir="build/perfsonar/conf"/>
+    <copy file="conf/components.properties" todir="build/perfsonar/conf"/>
+    <copy file="conf/service.properties" todir="build/perfsonar/conf"/>
+    <copy file="conf/log4j.properties" todir="build/perfsonar/conf"/>
+  </target>    
+  
+  <!-- LS Lookup (Query) test -->
+  
+  <target name="test-query"
+          depends="copy-config-files-for-test"
+          description="Run LS Test: LOOKUP - QUERY">
+    
+    <java classname="org.perfsonar.client.testHarness.LSTestClient" 
classpathref="classpath_for_test" fork="true">
+      <jvmarg 
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>
+      <jvmarg 
value="-Dservice.properties=${basedir}/conf/service.properties"/>
+      <arg value="query"/>
+      <arg value="RequestHandler"/>
+      <arg value="${basedir}/samples/requests/LSQueryRequest.xml"/>
     </java>
   </target>
-
-
-  <!-- fetching metadata key -->
-
-  <target name="metadata-key-fetch-test-1">
-    <java classname="org.perfsonar.client.testHarness.SOAPClient"
-          classpathref="classpath"
-          fork="true">
-      <arg value="${ma.local}"/>
-      <arg value="${basedir}/samples/requests/MetadataKey-Filter-Req-1.xml"/>
-      <arg value="${basedir}/samples/requests/response-3.xml"/>
+  
+  
+  
+  <!-- LS Register test -->
+  <target name="test-register"
+          depends="copy-config-files-for-test"
+          description="Run LS Test: REGISTER">
+    <java classname="org.perfsonar.client.testHarness.LSTestClient" 
classpathref="classpath_for_test" fork="true">
+      <jvmarg 
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>
+      <jvmarg 
value="-Dservice.properties=${basedir}/conf/service.properties"/>
+      <arg value="query"/>
+      <arg value="RequestHandler"/>
+      <arg value="${basedir}/samples/requests/LSRegisterRequest.xml"/>
     </java>
   </target>
-
-
-  <target name="metadata-key-fetch-test-2">
-    <replace file="${basedir}/samples/requests/MetadataKey-Filter-Req-2.xml"
-             token="__BASEPATH__"
-             value="${basedir}"/>
-    <java classname="org.perfsonar.client.testHarness.SOAPClient"
-          classpathref="classpath"
-          fork="true">
-      <arg value="${ma.local}"/>
-      <arg value="${basedir}/samples/requests/MetadataKey-Filter-Req-2.xml"/>
-      <arg value="${basedir}/samples/requests/response-4.xml"/>
+  
+  <!-- LS Re-Register/Update test -->
+  <target name="test-update"
+          depends="copy-config-files-for-test"
+          description="Run LS Test: REREGISTER/UPDATE">
+    <java classname="org.perfsonar.client.testHarness.LSTestClient" 
classpathref="classpath_for_test" fork="true">
+      <jvmarg 
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>
+      <jvmarg 
value="-Dservice.properties=${basedir}/conf/service.properties"/>
+      <arg value="query"/>
+      <arg value="RequestHandler"/>
+      <arg value="${basedir}/samples/requests/LSRegisterRequest-Update.xml"/>
     </java>
   </target>
-
-
-  <target name="metadata-key-fetch-test-3">
-    <java classname="org.perfsonar.client.testHarness.SOAPClient"
-          classpathref="classpath"
-          fork="true">
-      <arg value="${ma.local}"/>
-      <arg value="${basedir}/samples/requests/MetadataKey-Req.xml"/>
-      <arg value="${basedir}/samples/requests/response-5.xml"/>
+  
+  <!-- LS Deregister test -->
+  <target name="test-deregister"
+          depends="copy-config-files-for-test"
+          description="Run LS Test: DEREGISTER">
+    <java classname="org.perfsonar.client.testHarness.LSTestClient" 
classpathref="classpath_for_test" fork="true">
+      <jvmarg 
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>
+      <jvmarg 
value="-Dservice.properties=${basedir}/conf/service.properties"/>
+      <arg value="query"/>
+      <arg value="RequestHandler"/>
+      <arg value="${basedir}/samples/requests/LSDeregisterRequest.xml"/>
     </java>
   </target>
-
-
-  <!-- fetching data -->
-
-
-  <target name="data-fetch-test-1">
-    <java classname="org.perfsonar.client.testHarness.SOAPClient"
-          classpathref="classpath"
-          fork="true">
-      <arg value="${ma.local}"/>
-      <arg value="${basedir}/samples/requests/SetupData-Req.xml"/>
-      <arg value="${basedir}/samples/requests/response-6.xml"/>
+  
+  
+  <!-- LS Keepalive test -->
+  <target name="test-keepalive"
+          depends="copy-config-files-for-test"
+          description="Run LS Test: KEEPALIVE">
+    <java classname="org.perfsonar.client.testHarness.LSTestClient" 
classpathref="classpath_for_test" fork="true">
+      <jvmarg 
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>
+      <jvmarg 
value="-Dservice.properties=${basedir}/conf/service.properties"/>
+      <arg value="query"/>
+      <arg value="RequestHandler"/>
+      <arg value="${basedir}/samples/requests/LSKeepaliveRequest.xml"/>
     </java>
   </target>
-
-
-  <target name="data-fetch-test-2">
-    <replace 
file="${basedir}/samples/requests/SetupDataRequest-FilterRRDSelect.xml"
-             token="__BASEPATH__"
-             value="${basedir}"/>
-    <java classname="org.perfsonar.client.testHarness.SOAPClient"
-          classpathref="classpath"
-          fork="true">
-      <arg value="${ma.local}"/>
-      <arg 
value="${basedir}/samples/requests/SetupDataRequest-FilterRRDSelect.xml"/>
-      <arg value="${basedir}/samples/requests/response-7.xml"/>
+  
+  <!-- Echo test -->
+  
+  <target name="test-echo"
+          depends="copy-config-files-for-test"
+          description="Run LS Test: ECHO">
+    
+    <java classname="org.perfsonar.client.testHarness.LSTestClient" 
classpathref="classpath_for_test" fork="true">
+      <jvmarg 
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>
+      <jvmarg 
value="-Dservice.properties=${basedir}/conf/service.properties"/>
+      <arg value="query"/>
+      <arg value="RequestHandler"/>
+      <arg value="${basedir}/samples/requests/EchoRequest.xml"/>
     </java>
   </target>
-
-
-  <target name="data-fetch-test-3">
-    <java classname="org.perfsonar.client.testHarness.SOAPClient"
-          classpathref="classpath"
-          fork="true">
-      <arg value="${ma.local}"/>
-      <arg 
value="${basedir}/samples/requests/SetupDataRequest-FilterRRDSelect-2.xml"/>
-      <arg value="${basedir}/samples/requests/response-8.xml"/>
+  
+  <!-- LS Register test -->
+  <target name="test-cleanup"
+          depends="copy-config-files-for-test"
+          description="Run LS Test: CLEANUP">
+    <java classname="org.perfsonar.client.testHarness.LSTestClient" 
classpathref="classpath_for_test" fork="true">
+      <jvmarg 
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>
+      <jvmarg 
value="-Dservice.properties=${basedir}/conf/service.properties"/>
+      <arg value="query"/>
+      <arg value="RequestHandler"/>
+      <arg value="${basedir}/samples/requests/LSCleanupRequest.xml"/>
     </java>
-  </target>
+    </target>     
+    
+    
+    
 
-
-  <target name="data-fetch-test-4">
-    <replace 
file="${basedir}/samples/requests/SetupDataRequest-FilterRRDSelect-3.xml"
-             token="__BASEPATH__"
-             value="${basedir}"/>
-    <java classname="org.perfsonar.client.testHarness.SOAPClient"
-          classpathref="classpath"
-          fork="true">
-      <arg value="${ma.local}"/>
-      <arg 
value="${basedir}/samples/requests//SetupDataRequest-FilterRRDSelect-3.xml"/>
-      <arg value="${basedir}/samples/requests/response-9.xml"/>
-    </java>
-  </target>
-
-
-  <target name="data-fetch-test-5">
-    <java classname="org.perfsonar.client.testHarness.SOAPClient"
-          classpathref="classpath"
-          fork="true">
-      <arg value="${ma.local}"/>
-      <arg 
value="${basedir}/samples/requests/SetupDataRequest-FilterRRDSelect-Chaining-1.xml"/>
-      <arg value="${basedir}/samples/requests/response-10.xml"/>
-    </java>
-  </target>
-
-
-  <target name="data-fetch-test-6">
-    <java classname="org.perfsonar.client.testHarness.SOAPClient"
-          classpathref="classpath"
-          fork="true">
-      <arg value="${ma.local}"/>
-      <arg 
value="${basedir}/samples/requests/SetupDataRequest-FilterRRDSelect-Chaining-2.xml"/>
-      <arg value="${basedir}/samples/requests/response-11.xml"/>
-    </java>
-  </target>
-
-
-  <!--storing data -->
-
-  <target name="data-store-test-1">
-    <java classname="org.perfsonar.client.testHarness.SOAPClient"
-          classpathref="classpath"
-          fork="true">
-      <arg value="${ma.local}"/>
-      <arg 
value="${basedir}/samples/requests/MeasurementArchiveStoreRequest-1.xml"/>
-      <arg value="${basedir}/samples/requests/response-12.xml"/>
-    </java>
-  </target>
-
-
-  <target name="data-store-test-2">
-    <java classname="org.perfsonar.client.testHarness.SOAPClient"
-          classpathref="classpath"
-          fork="true">
-      <arg value="${ma.local}"/>
-      <arg 
value="${basedir}/samples/requests/MeasurementArchiveStoreRequest-Key-1.xml"/>
-      <arg value="${basedir}/samples/requests/response-13.xml"/>
-    </java>
-  </target>
-
-
   <!-- 
===================================================================================
 -->
   <!-- main target -->
 
 
   <target name="test">
-
-    <antcall target="echo-test"/>
-    <antcall target="lookup-info-test"/>
-    <antcall target="metadata-key-fetch-test-1"/>
-    <antcall target="metadata-key-fetch-test-2"/>
-    <antcall target="metadata-key-fetch-test-3"/>
-    <antcall target="data-fetch-test-1"/>
-    <antcall target="data-fetch-test-2"/>
-    <antcall target="data-fetch-test-3"/>
-    <antcall target="data-fetch-test-4"/>
-    <antcall target="data-fetch-test-5"/>
-    <antcall target="data-fetch-test-6"/>
-
+    
+    <antcall target="client-echo"/>
   </target>