perfsonar development work

Author: michael.bischoff
Date: 2008-12-15 10:49:21 -0500 (Mon, 15 Dec 2008)
New Revision: 4789

Modified:
   trunk/perfsonar_base/ant/const.properties
   trunk/perfsonar_base/doc/ChangeLog.txt
   trunk/perfsonar_base/pom.xml
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java
Log:
fix bug 711

Modified: trunk/perfsonar_base/ant/const.properties
===================================================================
--- trunk/perfsonar_base/ant/const.properties   2008-12-15 15:28:29 UTC (rev 
4788)
+++ trunk/perfsonar_base/ant/const.properties   2008-12-15 15:49:21 UTC (rev 
4789)
@@ -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.20080902
+version=1.0.20081215

Modified: trunk/perfsonar_base/doc/ChangeLog.txt
===================================================================
--- trunk/perfsonar_base/doc/ChangeLog.txt      2008-12-15 15:28:29 UTC (rev 
4788)
+++ trunk/perfsonar_base/doc/ChangeLog.txt      2008-12-15 15:49:21 UTC (rev 
4789)
@@ -1,5 +1,8 @@
 perfSONAR Base
 
+2008-12-15 v1.0.20081215
+- fix: Bug 711 service.r.root_hints isn't suppose to be mandatory
+
 2008-09-02 v1.0.20080902
 - Change: Checking and removing broken references in case of L2 path status 
metadata configuration switched off (to work with E2EMon MP)
 

Modified: trunk/perfsonar_base/pom.xml
===================================================================
--- trunk/perfsonar_base/pom.xml        2008-12-15 15:28:29 UTC (rev 4788)
+++ trunk/perfsonar_base/pom.xml        2008-12-15 15:49:21 UTC (rev 4789)
@@ -7,7 +7,7 @@
        <artifactId>perfsonar-base</artifactId>
        <packaging>jar</packaging>
        <name>Perfsonar Base package</name>
-       <version>1.0.20080721</version>
+       <version>1.0.20081215</version>
        <description>
                The perfSONAR base provides a number of common, shared 
classes which can be used by 
                MA, MP and Clients. 

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java
     2008-12-15 15:28:29 UTC (rev 4788)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java
     2008-12-15 15:49:21 UTC (rev 4789)
@@ -156,8 +156,8 @@
             responseMessages.clear(); //clear content of array list.
 
             //register to either ls_url explicit URL or one taken from root 
hints
-            String localLsUrls = 
configuration.getProperty("service.r.ls_url");
-            String rootHints = 
configuration.getProperty("service.r.root_hints");
+            String localLsUrls = getProperty("service.r.ls_url");
+            String rootHints = getProperty("service.r.root_hints");
 
             //if no LS to register with throw exception
             if ((localLsUrls == null)&&(rootHints == null))
@@ -200,8 +200,18 @@
     }
 
 
-    protected boolean registerToLS(ServiceLSRegistrator registrator, String 
url) {
+    private String getProperty(String key) {
+       try {
+                       return configuration.getProperty(key);
+               } catch (PerfSONARException e) {
+                       logger.warn("Property with key('"+key+"') not found");
+                       return null;
+               }               
+       }
 
+
+       protected boolean registerToLS(ServiceLSRegistrator registrator, 
String url) {
+
         try {
 
             // send registration request