perfsonar development work

Author: uros
Date: 2006-06-26 05:17:36 -0400 (Mon, 26 Jun 2006)
New Revision: 1329

Removed:
   trunk/perfsonar/src/org/perfsonar/commons/messages/TCMPCaptureRequest.java
Modified:
   trunk/perfsonar/ant/tcmp/tcmp-configure-targets.xml
   trunk/perfsonar/conf/service.properties.tcmp
   
trunk/perfsonar/schema/example-instances/sonar/TCMPCaptureRequest-measurement.xml
   trunk/perfsonar/src/org/perfsonar/service/commons/engine/ActionType.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeServiceEngine.java
Log:
Replace TCMPCaptureRequest message type with perfSONAR compatible 
SetupDataRequest. Usage of keys not added yet.

Modified: trunk/perfsonar/ant/tcmp/tcmp-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/tcmp/tcmp-configure-targets.xml 2006-06-26 05:49:22 
UTC (rev 1328)
+++ trunk/perfsonar/ant/tcmp/tcmp-configure-targets.xml 2006-06-26 09:17:36 
UTC (rev 1329)
@@ -154,7 +154,7 @@
             <entry  key="service.log.log4j.config" 
value="${current.path.tcmp}/perfsonar/conf/log4j.properties"/>
             <entry  key="service.sax_parser.config" 
value="${current.path.tcmp}/perfsonar/src/objects.config"/>
 
-            <entry  key="service.mp.message_types" 
value="TCMPCaptureRequest"/>
+            <entry  key="service.mp.message_types" value="SetupDataRequest"/>
             <entry  key="service.mp.class_name" 
value="org.perfsonar.service.measurementPoint.tracefileCaptureType.TCMPTypeServiceEngine"/>
                         
             <entry  key="service.mp.tcmp.local.interfaces" 
value="${local.ifs}"/>

Modified: trunk/perfsonar/conf/service.properties.tcmp
===================================================================
--- trunk/perfsonar/conf/service.properties.tcmp        2006-06-26 05:49:22 
UTC (rev 1328)
+++ trunk/perfsonar/conf/service.properties.tcmp        2006-06-26 09:17:36 
UTC (rev 1329)
@@ -60,4 +60,4 @@
 
service.mp.class_name=org.perfsonar.service.measurementPoint.tracefileCaptureType.TCMPTypeServiceEngine
 
 # Message types supported by mp service
-service.mp.message_types=TCMPCaptureRequest
+service.mp.message_types=SetupDataRequest

Modified: 
trunk/perfsonar/schema/example-instances/sonar/TCMPCaptureRequest-measurement.xml
===================================================================
--- 
trunk/perfsonar/schema/example-instances/sonar/TCMPCaptureRequest-measurement.xml
   2006-06-26 05:49:22 UTC (rev 1328)
+++ 
trunk/perfsonar/schema/example-instances/sonar/TCMPCaptureRequest-measurement.xml
   2006-06-26 09:17:36 UTC (rev 1329)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <nmwg:message id="tcmpmsg1"
-              type="TCMPCaptureRequest"
+              type="SetupDataRequest"
               xmlns="http://ggf.org/ns/nmwg/base/2.0/";
               xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
               xmlns:passivetracefile= 
"http://ggf.org/ns/nmwg/tools/passivetracefile/2.0/";
@@ -99,7 +99,7 @@
       </nmwg:parameter>
       <!-- end_time specified when to end capture -->
       <nmwg:parameter name="end_time">
-        <nmtm:end type="unix" value="1145456769"/>
+        <nmtm:end type="unix" value="1150893383"/>
       </nmwg:parameter>            
     </passivetracefile:parameters>    
     

Deleted: 
trunk/perfsonar/src/org/perfsonar/commons/messages/TCMPCaptureRequest.java

Modified: 
trunk/perfsonar/src/org/perfsonar/service/commons/engine/ActionType.java
===================================================================
--- trunk/perfsonar/src/org/perfsonar/service/commons/engine/ActionType.java  
  2006-06-26 05:49:22 UTC (rev 1328)
+++ trunk/perfsonar/src/org/perfsonar/service/commons/engine/ActionType.java  
  2006-06-26 09:17:36 UTC (rev 1329)
@@ -34,12 +34,6 @@
 
 
     /**
-     *  Action type to request a measurement
-     */
-    public static final String MAKE_MEASUREMENT = "MAKE_MEASUREMENT";
-
-
-    /**
      *  Action type to store measurements
      */
     public static final String STORE_DATA = "STORE_DATA";

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeServiceEngine.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeServiceEngine.java
  2006-06-26 05:49:22 UTC (rev 1328)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeServiceEngine.java
  2006-06-26 09:17:36 UTC (rev 1329)
@@ -139,9 +139,9 @@
         Message response = null;
 
 
-        if (actionType.equals(ActionType.MAKE_MEASUREMENT)) {
+        if (actionType.equals(ActionType.GET_DATA)) {
 
-            // handle MAKE_MEASUREMENT
+            // handle GET_DATA
 
             response = makeMeasurement(request);