svn commit: r1415319 - in /airavata/trunk/modules: commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java

[samindaw]

Author: samindaw
Date: Thu Nov 29 18:52:31 2012
New Revision: 1415319

URL: http://svn.apache.org/viewvc?rev=1415319&view=rev
Log:
overload getsettings to have default val

Modified:
    
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
    
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java

Modified: 
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java?rev=1415319&r1=1415318&r2=1415319&view=diff
==============================================================================
--- 
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
 (original)
+++ 
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
 Thu Nov 29 18:52:31 2012
@@ -61,6 +61,15 @@ public class ServerSettings {
        throw new UnspecifiedServerSettingsException(key);
     }
     
+    public static String getSetting(String key, String defaultValue) throws 
ServerSettingsException{
+       validateSuccessfulPropertyFileLoad();
+       if (properties.containsKey(key)){
+               return properties.getProperty(key);
+       }else{
+               return defaultValue;
+       }
+    }
+    
     public static String getDefaultGatewayId()throws ServerSettingsException{
        return getSetting(DEFAULT_GATEWAY_ID);
     }

Modified: 
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java?rev=1415319&r1=1415318&r2=1415319&view=diff
==============================================================================
--- 
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java
 (original)
+++ 
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java
 Thu Nov 29 18:52:31 2012
@@ -24,6 +24,7 @@ package org.apache.airavata.registry.api
 import java.net.URL;
 import java.util.Properties;
 
+import org.apache.airavata.common.exception.ServerSettingsException;
 import org.apache.airavata.registry.api.exception.RegistrySettingsException;
 import 
org.apache.airavata.registry.api.exception.RegistrySettingsLoadException;
 import 
org.apache.airavata.registry.api.exception.UnspecifiedRegistrySettingsException;
@@ -58,6 +59,15 @@ public class RegistrySettings {
        throw new UnspecifiedRegistrySettingsException(key);
     }
     
+    public static String getSetting(String key, String defaultValue) throws 
RegistrySettingsException{
+       validateSuccessfulPropertyFileLoad();
+       if (properties.containsKey(key)){
+               return properties.getProperty(key);
+       }else{
+               return defaultValue;
+       }
+    }
+    
     public static String getRegistryAccessorClass() throws 
RegistrySettingsException{
        return getSetting(REGISTRY_ACCESSOR_CLASS);
     }