svn commit: r1431009 - in /airavata/trunk/modules: commons/utils/src/main/java/org/apache/airavata/common/utils/ registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ rest/mappings/src/main/java/org/apache/airavata/res...

[samindaw]

Author: samindaw
Date: Wed Jan  9 19:00:53 2013
New Revision: 1431009

URL: http://svn.apache.org/viewvc?rev=1431009&view=rev
Log:
registry service set app as server + fix import + add setting exist function

Modified:
    
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
    
airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
    
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegistryListener.java

Modified: 
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java?rev=1431009&r1=1431008&r2=1431009&view=diff
==============================================================================
--- 
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
 (original)
+++ 
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
 Wed Jan  9 19:00:53 2013
@@ -131,4 +131,9 @@ public abstract class ApplicationSetting
        properties.setProperty(key, value);
        saveProperties();
     }
+    
+    public static boolean isSettingDefined(String key) throws 
ApplicationSettingsException{
+       validateSuccessfulPropertyFileLoad();
+       return properties.containsKey(key);
+    }
 }

Modified: 
airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java?rev=1431009&r1=1431008&r2=1431009&view=diff
==============================================================================
--- 
airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
 (original)
+++ 
airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
 Wed Jan  9 19:00:53 2013
@@ -20,7 +20,7 @@
 */
 package org.apache.airavata.registry.services;
 
-import org.apache.airavata.common.exception.ServerSettingsException;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.utils.ServerSettings;
 import org.apache.airavata.persistance.registry.jpa.ResourceType;
 import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;

Modified: 
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegistryListener.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegistryListener.java?rev=1431009&r1=1431008&r2=1431009&view=diff
==============================================================================
--- 
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegistryListener.java
 (original)
+++ 
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegistryListener.java
 Wed Jan  9 19:00:53 2013
@@ -21,21 +21,19 @@
 
 package org.apache.airavata.rest.mappings.utils;
 
-import org.apache.airavata.common.utils.ServerSettings;
-import org.apache.airavata.registry.api.Gateway;
-import org.apache.airavata.rest.mappings.utils.RestServicesConstants;
-
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Properties;
+
+import org.apache.airavata.common.utils.AiravataUtils;
+import org.apache.airavata.common.utils.ServerSettings;
+import org.apache.airavata.registry.api.Gateway;
 
 public class RegistryListener implements ServletContextListener {
 
     public void contextInitialized(ServletContextEvent servletContextEvent) {
         try {
+               AiravataUtils.setExecutionAsServer();
             ServletContext servletContext = 
servletContextEvent.getServletContext();
             String gatewayID = ServerSettings.getDefaultGatewayId();
             String user = ServerSettings.getSystemUser();