perfsonar development work

Author: mac
Date: 2007-04-23 09:40:57 -0400 (Mon, 23 Apr 2007)
New Revision: 2341

Modified:
   trunk/perfsonar/ant/xmlls/configure-targets.xml
   trunk/perfsonar/ant/xmlls/test-targets.xml
Log:
Changes for new DAO objects for LS

Modified: trunk/perfsonar/ant/xmlls/configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/xmlls/configure-targets.xml     2007-04-21 08:59:43 
UTC (rev 2340)
+++ trunk/perfsonar/ant/xmlls/configure-targets.xml     2007-04-23 13:40:57 
UTC (rev 2341)
@@ -113,7 +113,10 @@
         <echo message="====================================="/>
         <echo/>
 
-        <input message="LS Storage -- XML database type (preferred one is 
HTTP, because it's much faster)"
+        <property name="in.ls_storage_type" 
value="org.perfsonar.service.lookupService.xmlType.storage.exist.XQueryExistDAOImpl"/>
+        <property name="default_in.ls_storage_uri" 
value="http://localhost:8680/exist/rest/db/ls"/>
+        <!--
+        <input message="LS Storage - XML database type (preferred one is 
HTTP, because it's much faster)"
                addproperty="in.ls_storage_type"
                validargs="http,xmlrpc"
                defaultvalue="http"/>
@@ -125,7 +128,8 @@
         <condition property="default_in.ls_storage_uri" 
value="xmldb:exist://localhost:8680/exist/xmlrpc/db/ls">
             <equals arg1="xmlrpc" arg2="${in.ls_storage_type}"/>
         </condition>
-
+        -->
+        
         <input message="LS Storage -- XML database collection 
[${default_in.ls_storage_uri}]"
                addproperty="in.ls_storage_uri"
                defaultvalue="${default_in.ls_storage_uri}" />

Modified: trunk/perfsonar/ant/xmlls/test-targets.xml
===================================================================
--- trunk/perfsonar/ant/xmlls/test-targets.xml  2007-04-21 08:59:43 UTC (rev 
2340)
+++ trunk/perfsonar/ant/xmlls/test-targets.xml  2007-04-23 13:40:57 UTC (rev 
2341)
@@ -232,6 +232,20 @@
                 <arg 
value="${basedir}/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml"/>
             </java>
         </target>
+       
+    <!-- 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}/schema/example-instances/perfSONAR/LS/test/LSCleanupRequest.xml"/>
+        </java>
+    </target>  
+       
 
 
         <!--