perfsonar development work

Author: ales.friedl
Date: 2007-10-09 08:16:41 -0400 (Tue, 09 Oct 2007)
New Revision: 2934

Modified:
   branches/new-structure/trunk/geant2_java-tc-mp/ant/configure-targets.xml
   
branches/new-structure/trunk/geant2_java-tc-mp/ant/const.properties.template
   
branches/new-structure/trunk/geant2_java-tc-mp/src/main/java/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
Log:

Service name fixed not to be with  -version.
Service port fixed not to be hardcoded 8080.



Modified: 
branches/new-structure/trunk/geant2_java-tc-mp/ant/configure-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-tc-mp/ant/configure-targets.xml  
  2007-10-09 11:05:17 UTC (rev 2933)
+++ branches/new-structure/trunk/geant2_java-tc-mp/ant/configure-targets.xml  
  2007-10-09 12:16:41 UTC (rev 2934)
@@ -133,6 +133,7 @@
       <entry  key="service.r.service_type"    value="mp"/>
       <entry  key="service.r.service_name"    value="${service.name}"/>
       <entry  key="service.r.service_version" value="${version}"/>
+      <entry  key="service.r.service_port"    value="${target.port}"/>
 
     </propertyfile>
   </target>

Modified: 
branches/new-structure/trunk/geant2_java-tc-mp/ant/const.properties.template
===================================================================
--- 
branches/new-structure/trunk/geant2_java-tc-mp/ant/const.properties.template  
      2007-10-09 11:05:17 UTC (rev 2933)
+++ 
branches/new-structure/trunk/geant2_java-tc-mp/ant/const.properties.template  
      2007-10-09 12:16:41 UTC (rev 2934)
@@ -9,7 +9,7 @@
 target.server=127.0.0.1
 
 deploy.root=perfSONAR-TCMP-1.0-beta
-service.name=perfSONAR-TCMP-1.0-beta
+service.name=perfSONAR-TCMP
 
 jarfilename=perfsonar-tc-mp
 version=1.0-beta

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-09 11:05:17 UTC (rev 2933)
+++ 
branches/new-structure/trunk/geant2_java-tc-mp/src/main/java/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
   2007-10-09 12:16:41 UTC (rev 2934)
@@ -780,6 +780,7 @@
         
         String hostname = "127.0.0.1";
         String serviceName = "axis";
+        String servicePort = "8080";
         
         try {
             hostname = InetAddress.getLocalHost().getCanonicalHostName();
@@ -787,15 +788,16 @@
         
         try {
             String sn = configuration.getProperty("service.r.service_name");
-           String sv = 
configuration.getProperty("service.r.service_version");
-            if (sn != null && sv != null)
-               serviceName = sn + '-' + sv;
+                 String sv = 
configuration.getProperty("service.r.service_version");
+            if (sn != null && sv != null) serviceName = sn + '-' + sv;
+            String sp = configuration.getProperty("service.r.service_port");
+            if (sp != null) servicePort = sp;
         } catch (Exception e) { }
 
         
         return "http://";
                 + hostname
-                + ":8080/"
+                + ":" + servicePort + "/"
                 + serviceName
                 + "/servlet/perfSONARFileServer?file=" 
                 + filename;