perfsonar development work

Author: roman
Date: 2007-09-14 05:59:35 -0400 (Fri, 14 Sep 2007)
New Revision: 2837

Modified:
   
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml
Log:
the bug in 'register-fuctionality' macro, which was responsible for wrong 
value of service.r.access_point property, fixed




Modified: 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml
===================================================================
--- 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml
 2007-09-13 14:16:33 UTC (rev 2836)
+++ 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml
 2007-09-14 09:59:35 UTC (rev 2837)
@@ -325,12 +325,12 @@
     <attribute name="dest-config-file"/>
     <sequential>
       <property name="target.default.port" value="8080"/>
-      <psbase:input2 message="Enter the port which will be used by your 
application server Tomcat"
+      <psbase:input2 message="Enter the port which will be used by your 
application server"
                      addproperty="_target.port"
                      defaultvalue="${target.default.port}"
       />
-      <echo>Make sure that your application server Tomcat has the same 
port</echo>
-      <echo>for the http communication. If not then configure the Tomcat in 
order</echo>
+      <echo>Make sure that your application server has the same port</echo>
+      <echo>for the http communication. If not then configure it in 
order</echo>
       <echo>to use this port number.</echo>
       <echo></echo>
       <input message="Please do it now and press Enter when finished"/>
@@ -472,7 +472,7 @@
             <propertyfile file="${basedir}/@{dest-config-file}">
               <entry  key="service.r.ls_url"               
value="${functionality.register.ls_address}"/>
               <entry  key="component.registrator.interval" 
value="${functionality.register.interval}"/>
-              <entry  key="service.r.access_point"         
value="http://${functionality.register.access_point}:${target.port}/${deploy.root}/services/${service.name}"/>
+              <entry  key="service.r.access_point"         
value="http://${functionality.register.access_point}:${target.port}/${deploy.root}/services/${wsdd.webservice.name}"/>
               <entry  key="service.r.service_name"         
value="${functionality.register.service_name}"/>
             </propertyfile>
           </antcontrib:then>