This commit is related to https://issues.apache.org/jira/browse/AIRAVATA-744
On Thu, Oct 24, 2013 at 9:49 AM, <[email protected]> wrote: > Author: samindaw > Date: Thu Oct 24 13:49:11 2013 > New Revision: 1535381 > > URL: http://svn.apache.org/r1535381 > Log: > updating the use of property system.gateway > > 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/RegistryUtils.java > > airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegistryListener.java > > airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/security/ServletRequestHelper.java > > airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.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=1535381&r1=1535380&r2=1535381&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 Oct 24 13:49:11 2013 > @@ -38,7 +38,6 @@ import org.apache.coyote.http11.Http11Ni > import org.apache.coyote.http11.Http11Protocol; > > public class ServerSettings extends ApplicationSettings{ > - private static final String > DEFAULT_GATEWAY_ID="default.registry.gateway"; > private static final String SYSTEM_USER="system.user"; > private static final String SYSTEM_USER_PASSWORD="system.password"; > private static final String SYSTEM_USER_GATEWAY="system.gateway"; > @@ -58,10 +57,6 @@ public class ServerSettings extends Appl > private static final String ENABLE_HTTPS = "enable.https"; > private static final String HOST_SCHEDULER = "host.scheduler"; > > - public static String getDefaultGatewayId()throws > ApplicationSettingsException{ > - return getSetting(DEFAULT_GATEWAY_ID); > - } > - > public static String getSystemUser() throws > ApplicationSettingsException{ > return getSetting(SYSTEM_USER); > } > > Modified: > airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java > URL: > http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java?rev=1535381&r1=1535380&r2=1535381&view=diff > > ============================================================================== > --- > airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java > (original) > +++ > airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java > Thu Oct 24 13:49:11 2013 > @@ -105,7 +105,7 @@ public class RegistryUtils { > // } > try { > username=ServerSettings.getSystemUser(); > - registry = AiravataRegistryFactory.getRegistry(new > Gateway(ServerSettings.getDefaultGatewayId()), > + registry = AiravataRegistryFactory.getRegistry(new > Gateway(ServerSettings.getSystemUserGateway()), > new AiravataUser(username)); > } catch (AiravataConfigurationException e) { > log.error("Error initializing AiravataRegistry2"); > > 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=1535381&r1=1535380&r2=1535381&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 > Thu Oct 24 13:49:11 2013 > @@ -35,7 +35,7 @@ public class RegistryListener implements > try { > AiravataUtils.setExecutionAsServer(); > ServletContext servletContext = > servletContextEvent.getServletContext(); > - String gatewayID = ServerSettings.getDefaultGatewayId(); > + String gatewayID = ServerSettings.getSystemUserGateway(); > String user = ServerSettings.getSystemUser(); > Gateway gateway = new Gateway(gatewayID); > > > Modified: > airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/security/ServletRequestHelper.java > URL: > http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/security/ServletRequestHelper.java?rev=1535381&r1=1535380&r2=1535381&view=diff > > ============================================================================== > --- > airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/security/ServletRequestHelper.java > (original) > +++ > airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/security/ServletRequestHelper.java > Thu Oct 24 13:49:11 2013 > @@ -97,7 +97,7 @@ public class ServletRequestHelper { > > if (gatewayId == null) { > try { > - gatewayId = ServerSettings.getDefaultGatewayId(); > + gatewayId = ServerSettings.getSystemUserGateway(); > } catch (ApplicationSettingsException e) { > throw new AuthenticationException("Unable to retrieve > default gateway", e); > } > > Modified: > airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java > URL: > http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1535381&r1=1535380&r2=1535381&view=diff > > ============================================================================== > --- > airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java > (original) > +++ > airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java > Thu Oct 24 13:49:11 2013 > @@ -286,7 +286,7 @@ public class WorkflowInterpretorSkeleton > > String s = null; > try { > - s = setupAndLaunch(workflowAsString, topic, > ServerSettings.getDefaultGatewayId(), > + s = setupAndLaunch(workflowAsString, topic, > ServerSettings.getSystemUserGateway(), > user,inputs, configuration, runInThread, > workflowContextHeaderBuilder); > } catch (AiravataAPIInvocationException e) { > log.error(e.getMessage()); > > >
