perfsonar development work

Author: roman
Date: 2009-02-27 11:07:25 -0500 (Fri, 27 Feb 2009)
New Revision: 5007

Added:
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/requests/SetupDataRequest-Utilization-1.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/requests/SetupDataRequest-Utilization-2.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/requests/SetupDataRequest-Utilization-3.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/requests/SetupDataRequest-Utilization-4.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/responses/SetupDataResponse-Utilization-1.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/responses/SetupDataResponse-Utilization-2.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/responses/SetupDataResponse-Utilization-3.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/responses/SetupDataResponse-Utilization-4.xml
Modified:
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build-simple-testing.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/metadata_configuration_files/rrd_database_test.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/SetupDataServiceEngine.java
Log:


Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build-simple-testing.xml
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build-simple-testing.xml  
      2009-02-27 14:04:29 UTC (rev 5006)
+++ 
branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build-simple-testing.xml  
      2009-02-27 16:07:25 UTC (rev 5007)
@@ -39,7 +39,10 @@
 
     <!-- Set up JAVA_HOME env variable -->
 
+    <!-- Set up LD_LIBRARY_PATH env variable -->
+    <!-- export LD_LIBRARY_PATH=/usr/lib -->
 
+
     <!-- ======================= download.lib =================== -->
 
 
@@ -271,6 +274,7 @@
 
         <delete file="${axis.dir}/lib/commons-digester-2.0.jar"              
       failonerror="false"/>
         <delete file="${axis.dir}/lib/commons-beanutils-1.8.0.jar"           
       failonerror="false"/>
+        <delete file="${axis.dir}/lib/joda-time-1.4.jar"                     
       failonerror="false"/>
 
         <!-- for auth -->
         <!--
@@ -309,6 +313,7 @@
 
         <copy 
file="${basedir}/lib/repository/commons-digester/commons-digester/2.0/commons-digester-2.0.jar"
          todir="${axis.dir}/lib"/>
         <copy 
file="${basedir}/lib/repository/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar"
   todir="${axis.dir}/lib"/>
+        <copy 
file="${basedir}/lib/repository/joda-time/joda-time/1.4/joda-time-1.4.jar"    
                           todir="${axis.dir}/lib"/>
 
         <!-- for auth -->
         <!--

Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/metadata_configuration_files/rrd_database_test.xml
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/metadata_configuration_files/rrd_database_test.xml
  2009-02-27 14:04:29 UTC (rev 5006)
+++ 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/metadata_configuration_files/rrd_database_test.xml
  2009-02-27 16:07:25 UTC (rev 5007)
@@ -31,7 +31,7 @@
     <nmwg:data id="data1" metadataIdRef="meta1">
         <nmwg:key>
             <nmwg:parameters>
-                <nmwg:parameter 
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+                <nmwg:parameter 
name="file">/usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
                 <nmwg:parameter name="dataSource">inoctets</nmwg:parameter>
                 <nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
 
@@ -70,7 +70,7 @@
     <nmwg:data id="data2" metadataIdRef="meta2">
         <nmwg:key>
             <nmwg:parameters>
-                <nmwg:parameter 
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+                <nmwg:parameter 
name="file">/usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
                 <nmwg:parameter name="dataSource">outoctets</nmwg:parameter>
                 <nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
 
@@ -112,7 +112,7 @@
     <nmwg:data id="data3" metadataIdRef="meta3">
         <nmwg:key>
             <nmwg:parameters>
-                <nmwg:parameter 
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+                <nmwg:parameter 
name="file">/usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
                 <nmwg:parameter name="dataSource">inerrors</nmwg:parameter>
                 <nmwg:parameter name="valueUnits">Eps</nmwg:parameter>
 
@@ -154,7 +154,7 @@
     <nmwg:data id="data4" metadataIdRef="meta4">
         <nmwg:key>
             <nmwg:parameters>
-                <nmwg:parameter 
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+                <nmwg:parameter 
name="file">/usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
                 <nmwg:parameter name="dataSource">indiscards</nmwg:parameter>
                 <nmwg:parameter name="valueUnits">Dps</nmwg:parameter>
 

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/requests/SetupDataRequest-Utilization-1.xml

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/requests/SetupDataRequest-Utilization-2.xml

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/requests/SetupDataRequest-Utilization-3.xml

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/requests/SetupDataRequest-Utilization-4.xml

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/responses/SetupDataResponse-Utilization-1.xml

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/responses/SetupDataResponse-Utilization-2.xml

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/responses/SetupDataResponse-Utilization-3.xml

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/responses/SetupDataResponse-Utilization-4.xml

Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/SetupDataServiceEngine.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/SetupDataServiceEngine.java
  2009-02-27 14:04:29 UTC (rev 5006)
+++ 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/SetupDataServiceEngine.java
  2009-02-27 16:07:25 UTC (rev 5007)
@@ -70,12 +70,12 @@
 
             Data fetchedData = dao.fetch(dReq);
 
-            response.addChild(fetchedData);
             if (metadata != null) {
                 response.addChild(metadata);
                 fetchedData.setMetadataIdRef(metadata.getId());
             }
 
+            response.addChild(fetchedData);
         }
 
         serviceResponse.setElement(response);