perfsonar development work

Author: roman
Date: 2007-09-27 09:57:47 -0400 (Thu, 27 Sep 2007)
New Revision: 2873

Modified:
   branches/new-structure/trunk/perfsonar_base/ant/const.properties
   
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml
Log:

'register-fuctionality' macro updated (value of service.r.service_name 
property is copied from default service.name property in 
const.properties)




Modified: branches/new-structure/trunk/perfsonar_base/ant/const.properties
===================================================================
--- branches/new-structure/trunk/perfsonar_base/ant/const.properties    
2007-09-27 12:43:30 UTC (rev 2872)
+++ branches/new-structure/trunk/perfsonar_base/ant/const.properties    
2007-09-27 13:57:47 UTC (rev 2873)
@@ -13,4 +13,4 @@
 # name of jar file to be created
 jarfilename=perfsonar-base
 # version of the product (will be included in the final name of jar file)
-version=1.0.20070911
+version=1.0.20070927

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-27 12:43:30 UTC (rev 2872)
+++ 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml
 2007-09-27 13:57:47 UTC (rev 2873)
@@ -466,14 +466,10 @@
             <psbase:input2 message="Enter IP or DNS address of the host you 
are using now to deploy the service"
                            addproperty="functionality.register.access_point"
                            defaultvalue=""/>
-            <psbase:input2 message="Enter the name that will represent the 
service in LS database"
-                           addproperty="functionality.register.service_name"
-                           defaultvalue=""/>
             <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/${wsdd.webservice.name}"/>
-              <entry  key="service.r.service_name"         
value="${functionality.register.service_name}"/>
             </propertyfile>
           </antcontrib:then>
       </antcontrib:if>