From 2c2a3971c2179a675777da0876ffbf0001563cf1 Mon Sep 17 00:00:00 2001
From: Alberto Di Meglio <alberto.di.meglio@cern.ch>
Date: Sat, 9 Jul 2005 19:22:27 +0000
Subject: [PATCH] Updated to new servicetool conventions

---
 .../config/scripts/glite-lb-config.py              |  4 +--
 .../config/templates/glite-lb.cfg.xml              | 31 +++++++++-------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/org.glite.deployment.lb/config/scripts/glite-lb-config.py b/org.glite.deployment.lb/config/scripts/glite-lb-config.py
index 09ba25c..61f5e5c 100644
--- a/org.glite.deployment.lb/config/scripts/glite-lb-config.py
+++ b/org.glite.deployment.lb/config/scripts/glite-lb-config.py
@@ -420,7 +420,7 @@ if __name__ == '__main__':
     
     # Command line opts if any
     try:
-        opts, args = getopt.getopt(sys.argv[1:], 'chv', ['checkconf', 'help', 'version','stop','start','status','siteconfig='])
+        opts, args = getopt.getopt(sys.argv[1:], 'chv', ['checkconf', 'help', 'version','configure','stop','start','status','siteconfig='])
     except getopt.GetoptError:
         service.usage(msg = "Unknown options(s)")
         sys.exit(1)
@@ -515,7 +515,7 @@ if __name__ == '__main__':
         if o in ("stop", "--stop"): 
             # Stop the service
             if service.stop() == 0:
-                print "\n\nThe %s was successfully stoped           " % service.friendly_name,
+                print "\n\nThe %s was successfully stopped           " % service.friendly_name,
                 glib.printOkMessage()
                 sys.exit(0)
             else:
diff --git a/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml b/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml
index ed39d97..0eeb26d 100644
--- a/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml
+++ b/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml
@@ -66,28 +66,23 @@
 				
 				value="true"/>
 				
+			<rgma.servicetool.service_type
+				description="The service type. This should be uniquely defined for each service type. 
+					The recommended format is the service namespace in
+					reversed domain name format [Type: 'string']"
+				value="org.glite.lb.lbserver"/>
+
 			<rgma.servicetool.name
-				description="Name of the service. This should be globally unique.
-					Example: your.host.name_Logging_Bookkeeping_Server
-					[Type: 'String']"
-				value="${HOSTNAME}_Logging_Bookkeeping_Server"/>
+				description="Name of the service. This should be globally unique.							 
+					[Example: 'HOSTANME_LB_LocalLogger'] [Type: 'String']"
+				value="${HOSTNAME}_${rgma.servicetool.service_type}"/>
 
 			<rgma.servicetool.url_endpoint
 				description="URL to contact the service at. 
 					This should be unique for each service. Use example and adapt host. 
 					Example: http://your.host.name/LB/LBServer
 					[Type: 'string']"
-				value="http://${HOSTNAME}/LB/LBServer"/>
-
-			<rgma.servicetool.service_type
-				description="The service type. This should be uniquely defined for 
-					each service type. Currently two methods of type naming are recommended:
-					(1) The targetNamespace from the WSDL document,
-						followed by a space and then the service name.
-					(2) A URL owned by the body or individual who defines the service type.
-					Example: Logging and Bookkeeping Server
-					[Type: 'string']"
-				value="Logging and Bookkeeping Server"/>
+				value="not available"/>
 
 			<rgma.servicetool.service_version
 				description="Service version in the form 'major.minor.patch'
@@ -112,21 +107,21 @@
 			<rgma.servicetool.status_interval
 				description="How often to check and publish service status.
 					Example: 60 [Type: 'string'] [Unit: 'seconds']"
-				value="60"/>
+				value="30"/>
 
 			<rgma.servicetool.url_wsdl
 				description="URL of a WSDL document for the service (leave blank if the 
 					service has no WSDL).
 					Example: http://example.rl.ac.uk/service?WSDL
 					[Type: 'string']"
-				value="n/a"/>
+				value="not available"/>
 
 			<rgma.servicetool.url_semantics
 				description="URL of a document containing a detailed description of the service
 					and how it should be used.
 					Example: http://example.rl.ac.uk/service/semantics.html
 					[Type: 'string']"
-				value="n/a"/>
+				value="not available"/>
 
 		</parameters>
 	</instance>
-- 
1.8.2.3