perfsonar development work

Author: roman
Date: 2007-08-10 09:54:29 -0400 (Fri, 10 Aug 2007)
New Revision: 2628

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

- some target names has been changed
- two targets for base chaining tests removed




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-10 13:36:37 UTC (rev 2627)
+++ branches/new-structure/trunk/geant2_java-rrd-ma/ant/test-targets.xml      
  2007-08-10 13:54:29 UTC (rev 2628)
@@ -61,7 +61,7 @@
 
   <!-- fetching metadata key -->
 
-  <target name="metadata-key-fetch-test-1"
+  <target name="util-metadata-key-fetch-test-1"
           depends="init-test">
     <java classname="org.perfsonar.client.testHarness.SOAPClient"
           classpathref="classpath"
@@ -73,7 +73,7 @@
   </target>
 
 
-  <target name="metadata-key-fetch-test-2"
+  <target name="util-metadata-key-fetch-test-2"
           depends="init-test">
     <replace 
file="${basedir}/samples/requests/MetadataKeyRequest-Utilization-2.xml"
              token="__BASEPATH__"
@@ -88,7 +88,7 @@
   </target>
 
 
-  <target name="metadata-key-fetch-test-3"
+  <target name="util-metadata-key-fetch-test-3"
           depends="init-test">
     <java classname="org.perfsonar.client.testHarness.SOAPClient"
           classpathref="classpath"
@@ -103,7 +103,7 @@
   <!-- fetching data -->
 
 
-  <target name="data-fetch-test-1"
+  <target name="util-data-fetch-test-1"
           depends="init-test">
     <replace 
file="${basedir}/samples/requests/SetupDataRequest-Utilization-1.xml"
              token="__BASEPATH__"
@@ -118,7 +118,7 @@
   </target>
 
 
-  <target name="data-fetch-test-2"
+  <target name="util-data-fetch-test-2"
           depends="init-test">
     <java classname="org.perfsonar.client.testHarness.SOAPClient"
           classpathref="classpath"
@@ -130,7 +130,7 @@
   </target>
 
 
-  <target name="data-fetch-test-3"
+  <target name="util-data-fetch-test-3"
           depends="init-test">
     <replace 
file="${basedir}/samples/requests/SetupDataRequest-Utilization-3.xml"
              token="__BASEPATH__"
@@ -145,64 +145,40 @@
   </target>
 
 
-  <target name="data-fetch-test-4"
+  <target name="util-data-fetch-test-4"
           depends="init-test">
     <java classname="org.perfsonar.client.testHarness.SOAPClient"
           classpathref="classpath"
           fork="true">
       <arg value="${ma.local}"/>
-      <arg 
value="${basedir}/samples/requests/SetupDataRequest-Utilization-4.xml"/>
+      <arg 
value="${basedir}/samples/requests/SetupDataRequest-Utilization-6.xml"/>
       <arg value="${basedir}/samples/requests/response-9.xml"/>
     </java>
   </target>
 
 
-  <target name="data-fetch-test-5"
-          depends="init-test">
-    <java classname="org.perfsonar.client.testHarness.SOAPClient"
-          classpathref="classpath"
-          fork="true">
-      <arg value="${ma.local}"/>
-      <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"
-          depends="init-test">
-    <java classname="org.perfsonar.client.testHarness.SOAPClient"
-          classpathref="classpath"
-          fork="true">
-      <arg value="${ma.local}"/>
-      <arg 
value="${basedir}/samples/requests/SetupDataRequest-Utilization-6.xml"/>
-      <arg value="${basedir}/samples/requests/response-11.xml"/>
-    </java>
-  </target>
-
-
   <!--storing data -->
 
-  <target name="data-store-test-1"
+  <target name="util-data-store-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/MeasurementArchiveStoreRequest-1.xml"/>
-      <arg value="${basedir}/samples/requests/response-12.xml"/>
+      <arg value="${basedir}/samples/requests/response-10.xml"/>
     </java>
   </target>
 
 
-  <target name="data-store-test-2"
+  <target name="util-data-store-test-2"
           depends="init-test">
     <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"/>
+      <arg value="${basedir}/samples/requests/response-11.xml"/>
     </java>
   </target>
 
@@ -220,7 +196,7 @@
           fork="true">
       <arg value="${ma.local}"/>
       <arg 
value="${basedir}/samples/requests/MetadataKeyRequest-Errors-1.xml"/>
-      <arg value="${basedir}/samples/requests/response-14.xml"/>
+      <arg value="${basedir}/samples/requests/response-12.xml"/>
     </java>
   </target>
 
@@ -235,7 +211,7 @@
           fork="true">
       <arg value="${ma.local}"/>
       <arg 
value="${basedir}/samples/requests/MetadataKeyRequest-Errors-2.xml"/>
-      <arg value="${basedir}/samples/requests/response-15.xml"/>
+      <arg value="${basedir}/samples/requests/response-13.xml"/>
     </java>
   </target>
 
@@ -249,7 +225,7 @@
           fork="true">
       <arg value="${ma.local}"/>
       <arg 
value="${basedir}/samples/requests/SetupDataRequest-Errors-1.xml"/>
-      <arg value="${basedir}/samples/requests/response-16.xml"/>
+      <arg value="${basedir}/samples/requests/response-14.xml"/>
     </java>
   </target>
 
@@ -264,11 +240,12 @@
           fork="true">
       <arg value="${ma.local}"/>
       <arg 
value="${basedir}/samples/requests/SetupDataRequest-Errors-2.xml"/>
-      <arg value="${basedir}/samples/requests/response-17.xml"/>
+      <arg value="${basedir}/samples/requests/response-15.xml"/>
     </java>
   </target>
 
 
+
   <!-- 
===================================================================================
 -->
   <!-- discards -->
 
@@ -282,7 +259,7 @@
           fork="true">
       <arg value="${ma.local}"/>
       <arg 
value="${basedir}/samples/requests/MetadataKeyRequest-Discards-1.xml"/>
-      <arg value="${basedir}/samples/requests/response-18.xml"/>
+      <arg value="${basedir}/samples/requests/response-16.xml"/>
     </java>
   </target>
 
@@ -297,7 +274,7 @@
           fork="true">
       <arg value="${ma.local}"/>
       <arg 
value="${basedir}/samples/requests/MetadataKeyRequest-Discards-2.xml"/>
-      <arg value="${basedir}/samples/requests/response-19.xml"/>
+      <arg value="${basedir}/samples/requests/response-17.xml"/>
     </java>
   </target>
 
@@ -311,7 +288,7 @@
           fork="true">
       <arg value="${ma.local}"/>
       <arg 
value="${basedir}/samples/requests/SetupDataRequest-Discards-1.xml"/>
-      <arg value="${basedir}/samples/requests/response-20.xml"/>
+      <arg value="${basedir}/samples/requests/response-18.xml"/>
     </java>
   </target>
 
@@ -326,7 +303,7 @@
           fork="true">
       <arg value="${ma.local}"/>
       <arg 
value="${basedir}/samples/requests/SetupDataRequest-Discards-2.xml"/>
-      <arg value="${basedir}/samples/requests/response-21.xml"/>
+      <arg value="${basedir}/samples/requests/response-19.xml"/>
     </java>
   </target>
 
@@ -340,15 +317,13 @@
     <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="util-metadata-key-fetch-test-1"/>
+    <antcall target="util-metadata-key-fetch-test-2"/>
+    <antcall target="util-metadata-key-fetch-test-3"/>
+    <antcall target="util-data-fetch-test-1"/>
+    <antcall target="util-data-fetch-test-2"/>
+    <antcall target="util-data-fetch-test-3"/>
+    <antcall target="util-data-fetch-test-4"/>
 
     <antcall target="errors-metadata-key-fetch-test-1"/>
     <antcall target="errors-metadata-key-fetch-test-2"/>