perfsonar development work

Author: roman
Date: 2007-08-09 07:30:29 -0400 (Thu, 09 Aug 2007)
New Revision: 2613

Modified:
   branches/new-structure/trunk/geant2_java-rrd-ma/ant/test-targets.xml
Log:

updated because names of example requests have been changed




Modified: branches/new-structure/trunk/geant2_java-rrd-ma/ant/test-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-rrd-ma/ant/test-targets.xml      
  2007-08-09 10:54:43 UTC (rev 2612)
+++ branches/new-structure/trunk/geant2_java-rrd-ma/ant/test-targets.xml      
  2007-08-09 11:30:29 UTC (rev 2613)
@@ -37,7 +37,7 @@
           classpathref="classpath"
           fork="true">
       <arg value="${ma.local}"/>
-      <arg value="${basedir}/samples/requests/Echo-Req.xml"/>
+      <arg value="${basedir}/samples/requests/EchoRequest.xml"/>
       <arg value="${basedir}/samples/requests/response-1.xml"/>
     </java>
   </target>
@@ -49,12 +49,16 @@
           classpathref="classpath"
           fork="true">
       <arg value="${ma.local}"/>
-      <arg value="${basedir}/samples/requests/LookupInfo-Req.xml"/>
+      <arg value="${basedir}/samples/requests/LookupInfoRequest.xml"/>
       <arg value="${basedir}/samples/requests/response-2.xml"/>
     </java>
   </target>
 
 
+  <!-- 
===================================================================================
 -->
+  <!-- utilization -->
+
+
   <!-- fetching metadata key -->
 
   <target name="metadata-key-fetch-test-1"
@@ -63,7 +67,7 @@
           classpathref="classpath"
           fork="true">
       <arg value="${ma.local}"/>
-      <arg value="${basedir}/samples/requests/MetadataKey-Filter-Req-1.xml"/>
+      <arg 
value="${basedir}/samples/requests/MetadataKeyRequest-Utilization-1.xml"/>
       <arg value="${basedir}/samples/requests/response-3.xml"/>
     </java>
   </target>
@@ -71,14 +75,14 @@
 
   <target name="metadata-key-fetch-test-2"
           depends="init-test">
-    <replace file="${basedir}/samples/requests/MetadataKey-Filter-Req-2.xml"
+    <replace 
file="${basedir}/samples/requests/MetadataKeyRequest-Utilization-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/MetadataKeyRequest-Utilization-2.xml"/>
       <arg value="${basedir}/samples/requests/response-4.xml"/>
     </java>
   </target>
@@ -90,7 +94,7 @@
           classpathref="classpath"
           fork="true">
       <arg value="${ma.local}"/>
-      <arg value="${basedir}/samples/requests/MetadataKey-Req.xml"/>
+      <arg 
value="${basedir}/samples/requests/MetadataKeyRequest-Utilization-3.xml"/>
       <arg value="${basedir}/samples/requests/response-5.xml"/>
     </java>
   </target>
@@ -99,79 +103,79 @@
   <!-- fetching data -->
 
 
-  <target name="data-fetch-test-1"
+  <target name="data-fetch-test-2"
           depends="init-test">
+    <replace 
file="${basedir}/samples/requests/SetupDataRequest-Utilization-1.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/SetupData-Req.xml"/>
+      <arg 
value="${basedir}/samples/requests/SetupDataRequest-Utilization-1.xml"/>
       <arg value="${basedir}/samples/requests/response-6.xml"/>
     </java>
   </target>
 
 
-  <target name="data-fetch-test-2"
+  <target name="data-fetch-test-3"
           depends="init-test">
-    <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/SetupDataRequest-Utilization-2.xml"/>
       <arg value="${basedir}/samples/requests/response-7.xml"/>
     </java>
   </target>
 
 
-  <target name="data-fetch-test-3"
+  <target name="data-fetch-test-4"
           depends="init-test">
+    <replace 
file="${basedir}/samples/requests/SetupDataRequest-Utilization-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-2.xml"/>
+      <arg 
value="${basedir}/samples/requests/SetupDataRequest-Utilization-3.xml"/>
       <arg value="${basedir}/samples/requests/response-8.xml"/>
     </java>
   </target>
 
 
-  <target name="data-fetch-test-4"
+  <target name="data-fetch-test-5"
           depends="init-test">
-    <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/SetupDataRequest-Utilization-4.xml"/>
       <arg value="${basedir}/samples/requests/response-9.xml"/>
     </java>
   </target>
 
 
-  <target name="data-fetch-test-5"
+  <target name="data-fetch-test-6"
           depends="init-test">
     <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/SetupDataRequest-Utilization-5.xml"/>
       <arg value="${basedir}/samples/requests/response-10.xml"/>
     </java>
   </target>
 
 
-  <target name="data-fetch-test-6"
+  <target name="data-fetch-test-1"
           depends="init-test">
     <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/SetupDataRequest-Utilization-6.xml"/>
       <arg value="${basedir}/samples/requests/response-11.xml"/>
     </java>
   </target>
@@ -215,7 +219,7 @@
           classpathref="classpath"
           fork="true">
       <arg value="${ma.local}"/>
-      <arg value="${basedir}/samples/requests/MetadataKey-Errors-Req-1.xml"/>
+      <arg 
value="${basedir}/samples/requests/MetadataKeyRequest-Errors-1.xml"/>
       <arg value="${basedir}/samples/requests/response-14.xml"/>
     </java>
   </target>
@@ -223,14 +227,14 @@
 
   <target name="errors-metadata-key-fetch-test-2"
           depends="init-test">
-    <replace file="${basedir}/samples/requests/MetadataKey-Errors-Req-2.xml"
+    <replace 
file="${basedir}/samples/requests/MetadataKeyRequest-Errors-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-Errors-Req-2.xml"/>
+      <arg 
value="${basedir}/samples/requests/MetadataKeyRequest-Errors-2.xml"/>
       <arg value="${basedir}/samples/requests/response-15.xml"/>
     </java>
   </target>
@@ -277,7 +281,7 @@
           classpathref="classpath"
           fork="true">
       <arg value="${ma.local}"/>
-      <arg 
value="${basedir}/samples/requests/MetadataKey-Discards-Req-1.xml"/>
+      <arg 
value="${basedir}/samples/requests/MetadataKeyRequest-Discards-1.xml"/>
       <arg value="${basedir}/samples/requests/response-18.xml"/>
     </java>
   </target>
@@ -285,14 +289,14 @@
 
   <target name="discards-metadata-key-fetch-test-2"
           depends="init-test">
-    <replace 
file="${basedir}/samples/requests/MetadataKey-Discards-Req-2.xml"
+    <replace 
file="${basedir}/samples/requests/MetadataKeyRequest-Discards-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-Discards-Req-2.xml"/>
+      <arg 
value="${basedir}/samples/requests/MetadataKeyRequest-Discards-2.xml"/>
       <arg value="${basedir}/samples/requests/response-19.xml"/>
     </java>
   </target>
@@ -335,6 +339,7 @@
 
     <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"/>
@@ -344,10 +349,12 @@
     <antcall target="data-fetch-test-4"/>
     <antcall target="data-fetch-test-5"/>
     <antcall target="data-fetch-test-6"/>
+
     <antcall target="errors-metadata-key-fetch-test-1"/>
     <antcall target="errors-metadata-key-fetch-test-2"/>
     <antcall target="errors-data-fetch-test-1"/>
     <antcall target="errors-data-fetch-test-2"/>
+
     <antcall target="discards-metadata-key-fetch-test-1"/>
     <antcall target="discards-metadata-key-fetch-test-2"/>
     <antcall target="discards-data-fetch-test-1"/>