perfsonar development work

Author: roman
Date: 2007-09-13 06:13:54 -0400 (Thu, 13 Sep 2007)
New Revision: 2832

Modified:
   branches/geant2_java-rrd-ma-extra/ant/const.properties.template
   branches/geant2_java-rrd-ma-extra/ant/install-targets.xml
Log:


again, setting LS registering improved (there was a bug in setting 
service.r.access_point)

(I hope I didn't miss anything there; sorry for previous svn log messages on 
this)



Modified: branches/geant2_java-rrd-ma-extra/ant/const.properties.template
===================================================================
--- branches/geant2_java-rrd-ma-extra/ant/const.properties.template     
2007-09-13 10:06:08 UTC (rev 2831)
+++ branches/geant2_java-rrd-ma-extra/ant/const.properties.template     
2007-09-13 10:13:54 UTC (rev 2832)
@@ -17,6 +17,7 @@
 
 wsdd.file.deploy=service-deploy.wsdd
 wsdd.file.undeploy=service-undeploy.wsdd
+wsdd.webservice.name=MeasurementArchiveService
 
 antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
 antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20070814.jar

Modified: branches/geant2_java-rrd-ma-extra/ant/install-targets.xml
===================================================================
--- branches/geant2_java-rrd-ma-extra/ant/install-targets.xml   2007-09-13 
10:06:08 UTC (rev 2831)
+++ branches/geant2_java-rrd-ma-extra/ant/install-targets.xml   2007-09-13 
10:13:54 UTC (rev 2832)
@@ -259,10 +259,10 @@
 
     <psbase:register-fuctionality 
dest-config-file="conf/service.properties"/>
 
-    <!-- service.r.access_point is wrongly set up by register-fuctionality 
-->
+    <!-- service.r.access_point is wrongly set up by register-fuctionality 
target -->
     <!-- so it must be overwritten -->
     <propertyfile file="${basedir}/conf/service.properties">
-      <entry  key="service.r.access_point"  
value="http://${functionality.register.access_point}:${target.port}/${service.name}/services/MeasurementArchiveService"/>
+      <entry  key="service.r.access_point"  
value="http://${functionality.register.access_point}:${target.port}/${service.name}/services/${wsdd.webservice.name}"/>
     </propertyfile>
 
   </target>