perfsonar development work

Author: uros
Date: 2007-10-08 05:18:10 -0400 (Mon, 08 Oct 2007)
New Revision: 2919

Modified:
   
branches/new-structure/trunk/geant2_java-tc-mp/src/main/java/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
Log:
Fixed the generated tracefile capture interface URL.

Modified: 
branches/new-structure/trunk/geant2_java-tc-mp/src/main/java/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
===================================================================
--- 
branches/new-structure/trunk/geant2_java-tc-mp/src/main/java/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
   2007-10-08 08:36:58 UTC (rev 2918)
+++ 
branches/new-structure/trunk/geant2_java-tc-mp/src/main/java/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
   2007-10-08 09:18:10 UTC (rev 2919)
@@ -356,12 +356,12 @@
             org.ggf.ns.nmwg.tools.passivetracefile.v2_0.Datum datum =
                 (org.ggf.ns.nmwg.tools.passivetracefile.v2_0.Datum)ct
                     .getDatum(0);
-            datum.setFilename(constructTracefileURL(datum.getFileName()));
+            datum.setFilename(constructTracefileURL(datum.getFilename()));
             if (ct.getDatumLength() > 1) {
                 datum =
                     (org.ggf.ns.nmwg.tools.passivetracefile.v2_0.Datum)ct
                         .getDatum(1);
-                
datum.setFilename(constructTracefileURL(datum.getFileName()));
+                
datum.setFilename(constructTracefileURL(datum.getFilename()));
             }
             response.addChild(d);
         }
@@ -787,7 +787,9 @@
         
         try {
             String sn = configuration.getProperty("service.r.service_name");
-            if (sn != null) serviceName = sn;
+           String sv = 
configuration.getProperty("service.r.service_version");
+            if (sn != null && sv != null)
+               serviceName = sn + '-' + sv;
         } catch (Exception e) { }