airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ramin...@apache.org
Subject [1/2] Cleanup airavata server property, removed unused files and other property cleanup. AIRAVATA-1472
Date Thu, 16 Oct 2014 14:23:38 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 1e520bc69 -> 9aeed4d32


http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/credential-store-service/credential-store-webapp/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/credential-store-service/credential-store-webapp/src/main/resources/airavata-server.properties
b/modules/credential-store-service/credential-store-webapp/src/main/resources/airavata-server.properties
index 91a8ae6..fb02901 100644
--- a/modules/credential-store-service/credential-store-webapp/src/main/resources/airavata-server.properties
+++ b/modules/credential-store-service/credential-store-webapp/src/main/resources/airavata-server.properties
@@ -21,38 +21,14 @@
 ###########################################################################
 #
 #  This properties file provides configuration for all Airavata Services:
-#  Registry, Workflow Interpreter, GFac, Message Broker, Message Box
+#  API Server, Registry, Workflow Interpreter, GFac, Orchestrator
 #
 ###########################################################################
 
 ###########################################################################
-# Airavata Embedded-Tomcat Server Configuration
+#  API Server Registry Configuration
 ###########################################################################
-# By default, tomcat runs on port 80. If the port is changed, it will be
-#  have to be specified with port properties. This will be picked up by
-#  the registry service to register the service end-points.
 
-port=8080
-
-# Axis2 server automatically picks up IP address from axis configuration,
-#  but some DHCP enables machines do not report correct ip addresses,
-#  in which case, the IP address can be manually specified.
-
-#ip=192.2.33.12
-
-
-#This property will enable https and stops http, during the url registration, https urls
will be stored and
-# http urls will not get registered, because currently airavata supports only one url for
each service
-#enable.https=false
-#system properties used by services to register service URLs
-system.gateway=default
-system.user=admin
-system.password=admin
-airavata.server.url=http://localhost:8080/airavata/services/registry
-
-###########################################################################
-# Airavata Registry Configuration
-###########################################################################
 #for derby [AiravataJPARegistry]
 registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
 registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata
@@ -65,16 +41,17 @@ start.derby.server.mode=true
 validationQuery=SELECT 1 from CONFIGURATION
 jpa.cache.size=5000
 #jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
-# Properties to setup registry service
+
+# Properties for default user mode
 default.registry.user=admin
 default.registry.password=admin
 default.registry.password.hash.method=SHA
 default.registry.gateway=default
-#for rest [RegistryClient]
-#registry.jdbc.url=http://localhost:9080/airavata-services
+
+#ip=127.0.0.1
 
 ###########################################################################
-# Airavata App Catalog DB Configuration
+#  Application Catalog DB Configuration
 ###########################################################################
 #for derby [AiravataJPARegistry]
 appcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
@@ -86,31 +63,55 @@ appcatalog.jdbc.user=airavata
 appcatalog.jdbc.password=airavata
 appcatalog.validationQuery=SELECT 1 from CONFIGURATION
 
-#user defined registry accessor classes
-#class.provenance.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.configuration.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.descriptor.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.project.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+###########################################################################
+#  Server module Configuration
+###########################################################################
+
+servers=apiserver,orchestrator,gfac,workflowserver
+#shutdown.trategy=NONE
+shutdown.trategy=SELF_TERMINATE
+
+
+apiserver.server.host=localhost
+apiserver.server.port=8930
+apiserver.server.min.threads=50
+workflow.server.host=localhost
+workflow.server.port=8931
+orchestrator.server.host=localhost
+orchestrator.server.port=8940
+gfac.server.host=localhost
+gfac.server.port=8950
+orchestrator.server.min.threads=50
 
 ###########################################################################
-# Airavata Workflow Interpreter Configurations
+# Credential Store module Configuration
 ###########################################################################
+credential.store.keystore.url=/Users/lahirugunathilake/Downloads/airavata_sym.jks
+credential.store.keystore.alias=airavata
+credential.store.keystore.password=airavata
+credential.store.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata
+credential.store.jdbc.user=airavata
+credential.store.jdbc.password=airavata
+credential.store.jdbc.driver=org.apache.derby.jdbc.ClientDriver
 
-runInThread=true
-provenance=true
-provenanceWriterThreadPoolSize=20
-gfac.embedded=true
+notifier.enabled=false
+#period in milliseconds
+notifier.duration=5000
 
-#
-# Security Configuration used by Airavata Generic Factory Service
-#  to interact with Computational Resources.
-#
+email.server=smtp.googlemail.com
+email.server.port=465
+email.user=airavata
+email.password=xxx
+email.ssl=true
+email.from=airavata@apache.org
 
 ###########################################################################
 # Airavata GFac MyProxy GSI credentials to access Grid Resources.
 ###########################################################################
+#
+# Security Configuration used by Airavata Generic Factory Service
+#  to interact with Computational Resources.
+#
 gfac=org.apache.airavata.gfac.server.GfacServer
 myproxy.server=myproxy.teragrid.org
 myproxy.username=ogce
@@ -135,117 +136,51 @@ trusted.cert.location=/Users/lahirugunathilake/Downloads/certificates
 
 
 ###########################################################################
-# Airavata Message Broker Basic Configurations.
-#  the Advanced section provides detailed custom configuration properties.
+# Airavata Workflow Interpreter Configurations
 ###########################################################################
 
-# Default derby database configuration
-broker.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
-broker.jdbc.url=jdbc:derby:wsmg;create=true;user=airavata;password=airavata
+#runInThread=true
+#provenance=true
+#provenanceWriterThreadPoolSize=20
+#gfac.embedded=true
+#workflowserver=org.apache.airavata.api.server.WorkflowServer
 
-# Note: This database will only be used  if 'broker.storage.type=persistent'
-#       is set in advanced properties below.
-# MySql database configuration
-#broker.jdbc.driver=com.mysql.jdbc.Driver
-#broker.jdbc.url=jdbc:mysql://localhost:3306/wsmg?user=airavata&password=airavata
 
 ###########################################################################
-# Airavata Message Box Basic Configurations,
-#  the Advanced section provides detailed custom configuration properties.
+# API Server module Configuration
 ###########################################################################
+apiserver=org.apache.airavata.api.server.AiravataAPIServer
 
-# Default derby database
-msgBox.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
-msgBox.jdbc.url=jdbc:derby:wsmg;create=true;user=airavata;password=airavata
+###########################################################################
+# Workflow Server module Configuration
+###########################################################################
 
-# MySql database configuration
-#msgBox.jdbc.driver=com.mysql.jdbc.Driver
-#msgBox.jdbc.url=jdbc:mysql://localhost:3306/wsmg?user=airavata&password=airavata
+workflowserver=org.apache.airavata.api.server.WorkflowServer
 
 ###########################################################################
 # Advance configuration to change service implementations
 ###########################################################################
-
-#Update the server context root path if airavata server is deployed under a different context
root other than axis2
-server.context-root=airavata-server
-
+# If false, disables two phase commit when submitting jobs
+TwoPhase=true
 #
 # Class which implemented HostScheduler interface. It will determine the which host to submit
the request
 #
 host.scheduler=org.apache.airavata.gfac.core.scheduler.impl.SimpleHostScheduler
 
-#
-# Data Service Plugins classes
-#
-datachain.classes= org.apache.airavata.core.gfac.extension.data.RegistryDataService
-
-#
-# Pre execution Plugins classes. For example, GridFTP Input Staging
-#
-prechain.classes= org.apache.airavata.core.gfac.extension.pre.GridFtpInputStaging
-prechain.classes= org.apache.airavata.core.gfac.extension.pre.HttpInputStaging
-
-#
-# Post execution Plugins classes. For example, GridFTP Output Staging
-#
-postchain.classes= org.apache.airavata.core.gfac.extension.post.GridFtpOutputStaging
-postchain.classes= org.apache.airavata.core.gfac.extension.post.OutputRegister
-
-#
-# Advanced Message Broker Configurations
-#
-
-#socket time out in milliseconds for sending messages. (defaults is 20000)
-broker.socket.timeout=60000
-
-broker.storage.type=persistent
-#broker.storage.type=memory
-
-#specifies wether delivery component should be started or not.
-broker.start.delivery.thread=true
-
-#fixed thread pool based delivery
-#broker.delivery.method=pcrew
-
-#dynamic thread pool based delivery
-#broker.delivery.method=parallel
-
-#single thread delivery
-broker.delivery.method=serial
-
-#number of message delivery failures before a url become black listed (default is 2)
-#broker.msg.delivery.retries=2
-
-#time period (in seconds) a url will be kept blacklisted (default is 5 seconds)
-#consumer.expiration.time.gap=5
-
-#maximum number of messages to be send to a one consumer/url at time.
-#applicable if 'broker.delivery.method' is 'pcrew' . (default is 10)
-
-#sending.batch.size=10
-
-#size of the thread pool. only applicable if 'broker.delivery.method' is 'pcrew'. (default
is 4)
-#sending.thread.pool.size=4
-
-#
-# Advanced Message Box Configurations
-#
-msgBox.usedatabase=true
-messagePreservationDays=2
-messagePreservationHours=0
-messagePreservationMinutes=0
-messagePerservationIntervalDays=0
-messagePerservationIntervalHours=1
-messagePerservationIntervalMinutes=0
+###########################################################################
+# Monitoring module Configuration
+###########################################################################
 
-###---------------------------REGISTRY API IMPLEMENTATION---------------------------###
+#This will be the primary monitoring tool which runs in airavata, in future there will be
multiple monitoring
+#mechanisms and one would be able to start a monitor
+monitors=org.apache.airavata.gfac.monitor.impl.pull.qstat.QstatMonitor,org.apache.airavata.gfac.monitor.impl.LocalJobMonitor
 
-class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
 
 ###########################################################################
 # AMQP Notification Configuration
 ###########################################################################
+
+
 amqp.notification.enable=1
 
 amqp.broker.host=localhost
@@ -257,30 +192,24 @@ amqp.sender=org.apache.airavata.wsmg.client.amqp.rabbitmq.AMQPSenderImpl
 amqp.topic.sender=org.apache.airavata.wsmg.client.amqp.rabbitmq.AMQPTopicSenderImpl
 amqp.broadcast.sender=org.apache.airavata.wsmg.client.amqp.rabbitmq.AMQPBroadcastSenderImpl
 
-###---------------------------Computational Middleware Configurations---------------------------###
-
-#enable.application.job.status.history=true
-#http://localhost:8080/axis2/services/RegistryService?wsdl
-registry.service.wsdl=http://localhost:${port}/${server.context-root}/services/RegistryService?wsdl
-
-# If false, disables two phase commit when submitting jobs
-TwoPhase=true
-
-
-###---------------------------Monitoring module Configurations---------------------------###
-#This will be the primary monitoring tool which runs in airavata, in future there will be
multiple monitoring
-#mechanisms and one would be able to start a monitor
-monitors=org.apache.airavata.gfac.monitor.impl.pull.qstat.QstatMonitor,org.apache.airavata.gfac.monitor.impl.LocalJobMonitor
 #,org.apache.airavata.gfac.monitor.impl.push.amqp.AMQPMonitor
 #This is the amqp related configuration and this lists down the Rabbitmq host, this is an
xsede specific configuration
 amqp.hosts=info1.dyn.teragrid.org,info2.dyn.teragrid.org
 proxy.file.path=/Users/lahirugunathilake/Downloads/x509up_u503876
 connection.name=xsede
-activity.listeners=org.apache.airavata.gfac.core.monitor.AiravataJobStatusUpdator,org.apache.airavata.gfac.core.monitor.AiravataTaskStatusUpdator,org.apache.airavata.gfac.core.monitor.AiravataWorkflowNodeStatusUpdator,org.apache.airavata.gfac.core.monitor.AiravataExperimentStatusUpdator
+#publisher
+activity.listeners=org.apache.airavata.gfac.core.monitor.AiravataJobStatusUpdator,org.apache.airavata.gfac.core.monitor.AiravataTaskStatusUpdator,org.apache.airavata.gfac.core.monitor.AiravataWorkflowNodeStatusUpdator,org.apache.airavata.api.server.listener.AiravataExperimentStatusUpdator,org.apache.airavata.gfac.core.monitor.GfacInternalStatusUpdator,org.apache.airavata.workflow.engine.util.ProxyMonitorPublisher
+publish.rabbitmq=false
+activity.publisher=org.apache.airavata.messaging.core.impl.RabbitMQPublisher
+rabbitmq.broker.url=amqp://localhost:5672
+rabbitmq.exchange.name=airavata_rabbitmq_exchange
+
+###########################################################################
+# Orchestrator module Configuration
+###########################################################################
 
-###---------------------------Orchestrator module Configurations---------------------------###
-job.submitter=org.apache.airavata.orchestrator.core.impl.GFACEmbeddedJobSubmitter
-#job.submitter=org.apache.airavata.orchestrator.core.impl.GFACServiceJobSubmitter
+#job.submitter=org.apache.airavata.orchestrator.core.impl.GFACEmbeddedJobSubmitter
+job.submitter=org.apache.airavata.orchestrator.core.impl.GFACServiceJobSubmitter
 job.validators=org.apache.airavata.orchestrator.core.validator.impl.SimpleAppDataValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator
 submitter.interval=10000
 threadpool.size=10
@@ -289,44 +218,17 @@ embedded.mode=true
 enable.validation=true
 orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer
 
-###---------------------------API Server module Configurations---------------------------###
-apiserver=org.apache.airavata.api.server.AiravataAPIServer
-
-###---------------------------Application Catalog Server module Configurations---------------------------###
-#appcatalogserver=org.apache.airavata.api.server.ApplicationCatalogServer
-
-
-###---------------------------Airavata Server Configurations---------------------------###
-servers=apiserver,orchestrator
-#shutdown.trategy=NONE
-shutdown.trategy=SELF_TERMINATE
-
-
-###--------------------------- Credential Store Specific Parameters---------------------------###
-credential.store.keystore.url=/Users/chathuri/dev/airavata/source/trunk_git/airavata/modules/credential-store-service/credential-store-webapp/keys/credential-store/airavata_sym.jks
-credential.store.keystore.alias=airavata
-credential.store.keystore.password=airavata
-credential.store.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata
-credential.store.jdbc.user=airavata
-credential.store.jdbc.password=airavata
-credential.store.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-
-notifier.enabled=false
-#period in milliseconds
-notifier.duration=5000
-
-email.server=smtp.googlemail.com
-email.server.port=465
-email.user=airavata
-email.password=xxx
-email.ssl=true
-email.from=airavata@apache.org
+###########################################################################
+# Zookeeper Server Configuration
+###########################################################################
 
-apiserver.server.host=localhost
-apiserver.server.port=8930
-apiserver.server.min.threads=30
-#app.catalog.server.host=localhost
-#app.catalog.server.port=8931
-orchestrator.server.host=localhost
-orchestrator.server.port=8940
-orchestrator.server.min.threads=30
+embedded.zk=true
+zookeeper.server.host=localhost
+zookeeper.server.port=2181
+airavata-server=/api-server
+orchestrator-server=/orchestrator-server
+gfac-server=/gfac-server
+gfac-experiments=/gfac-experiments
+gfac-server-name=gfac-node0
+orchestrator-server-name=orch-node0
+airavata-server-name=api-node0

http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
index 7e0995d..cbc0c86 100644
--- a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
+++ b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
@@ -218,7 +218,7 @@ public class GfacServerHandler implements GfacService.Iface, Watcher{
         logger.infoId(experimentId, "GFac Received cancel job request for Experiment: {}
TaskId: {} ", experimentId, taskId);
         GFac gfac = getGfac();
         try {
-            if (gfac.cancel(experimentId, taskId, ServerSettings.getSetting(Constants.GATEWAY_NAME)))
{
+            if (gfac.cancel(experimentId, taskId, ServerSettings.getDefaultUserGateway()))
{
                 logger.debugId(experimentId, "Successfully cancelled job, experiment {} ,
task {}", experimentId, taskId);
                 return true;
             } else {
@@ -239,14 +239,6 @@ public class GfacServerHandler implements GfacService.Iface, Watcher{
         this.registry = registry;
     }
 
-    public String getRegistryURL() {
-        return registryURL;
-    }
-
-    public void setRegistryURL(String registryURL) {
-        this.registryURL = registryURL;
-    }
-
     public String getGatewayName() {
         return gatewayName;
     }
@@ -263,9 +255,8 @@ public class GfacServerHandler implements GfacService.Iface, Watcher{
         this.airavataUserName = airavataUserName;
     }
     protected void setGatewayProperties() throws ApplicationSettingsException {
-         setAiravataUserName(ServerSettings.getSetting("system.user"));
-         setGatewayName(ServerSettings.getSetting("system.gateway"));
-         setRegistryURL(ServerSettings.getSetting("airavata.server.url"));
+         setAiravataUserName(ServerSettings.getDefaultUser());
+         setGatewayName(ServerSettings.getDefaultUserGateway());
      }
 
     private GFac getGfac()throws TException{

http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacUtils.java
b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacUtils.java
index 1582f62..729c1ee 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacUtils.java
@@ -1206,13 +1206,18 @@ public class GFacUtils {
 
 	public static CredentialReader getCredentialReader()
 			throws ApplicationSettingsException, IllegalAccessException,
-			ClassNotFoundException, InstantiationException {
+			InstantiationException {
+		try{
 		String jdbcUrl = ServerSettings.getCredentialStoreDBURL();
 		String jdbcUsr = ServerSettings.getCredentialStoreDBUser();
 		String jdbcPass = ServerSettings.getCredentialStoreDBPassword();
 		String driver = ServerSettings.getCredentialStoreDBDriver();
 		return new CredentialReaderImpl(new DBUtil(jdbcUrl, jdbcUsr, jdbcPass,
 				driver));
+		}catch(ClassNotFoundException e){
+			log.error("Not able to find driver: " + e.getLocalizedMessage());
+			return null;	
+		}
 	}
 
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java
b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java
index bb20a53..431f9f6 100644
--- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java
+++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java
@@ -160,7 +160,10 @@ public class TokenizedMyProxyAuthInfo extends GSIAuthenticationInfo {
     public GSSCredential getCredentialsFromStore() throws Exception {
 
         if (getCredentialReader() == null) {
-            setCredentialReader(GFacUtils.getCredentialReader());
+        	credentialReader = GFacUtils.getCredentialReader();
+        	if(credentialReader == null){
+        		return null;
+        	}
         }
 
         Credential credential = getCredentialReader().getCredential(getRequestData().getGatewayId(),

http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/security/TokenizedSSHAuthInfo.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/security/TokenizedSSHAuthInfo.java
b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/security/TokenizedSSHAuthInfo.java
index 9e3fc58..5536e17 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/security/TokenizedSSHAuthInfo.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/security/TokenizedSSHAuthInfo.java
@@ -115,6 +115,9 @@ public class TokenizedSSHAuthInfo implements SSHPublicKeyFileAuthentication
{
 
         if (getCredentialReader() == null) {
             credentialReader = GFacUtils.getCredentialReader();
+            if(credentialReader == null){
+            	 return null;
+            }
         }
 
         Credential credential = getCredentialReader().getCredential(getRequestData().getGatewayId(),

http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorNew.java
----------------------------------------------------------------------
diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorNew.java
b/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorNew.java
index a94d32c..7f8ab57 100644
--- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorNew.java
+++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorNew.java
@@ -119,7 +119,7 @@ public class DocumentCreatorNew {
                 null, null);
         gatewayResourceProfile = new GatewayResourceProfile();
 //		gatewayResourceProfile.setGatewayID("default");
-        gatewayResourceProfile.setGatewayName(ClientSettings.getSetting("gateway_id", "php_reference_gateway"));
+        gatewayResourceProfile.setGatewayName(ClientSettings.getSetting("default.registry.gateway",
"php_reference_gateway"));
         gatewayResourceProfile.addToComputeResourcePreferences(computeResourcePreference);
         String gatewayId = client.registerGatewayResourceProfile(gatewayResourceProfile);
         gatewayResourceProfile.setGatewayID(gatewayId);

http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
index 929408d..0139fad 100644
--- a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
+++ b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
@@ -91,8 +91,8 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface,
 					+ ":"
 					+ ServerSettings
 							.getSetting(Constants.ORCHESTRATOR_SERVER_PORT);
-            setGatewayName(ServerSettings.getSystemUserGateway());
-            setAiravataUserName(ServerSettings.getSystemUser());
+            setGatewayName(ServerSettings.getDefaultUserGateway());
+            setAiravataUserName(ServerSettings.getDefaultUser());
 			try {
 				zk = new ZooKeeper(zkhostPort, 6000, this); // no watcher is
 															// required, this

http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACEmbeddedJobSubmitter.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACEmbeddedJobSubmitter.java
b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACEmbeddedJobSubmitter.java
index 9bbb0b6..f658802 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACEmbeddedJobSubmitter.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACEmbeddedJobSubmitter.java
@@ -59,7 +59,7 @@ public class GFACEmbeddedJobSubmitter implements JobSubmitter {
 
     public boolean submit(String experimentID, String taskID) throws OrchestratorException
{
         try {
-            return gfac.submitJob(experimentID, taskID, ServerSettings.getSetting(Constants.GATEWAY_NAME));
+            return gfac.submitJob(experimentID, taskID, ServerSettings.getDefaultUserGateway());
         } catch (Exception e) {
             String error = "Error launching the job : " + experimentID;
             logger.error(error);

http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACServiceJobSubmitter.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACServiceJobSubmitter.java
b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACServiceJobSubmitter.java
index 67c3f11..1180c99 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACServiceJobSubmitter.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACServiceJobSubmitter.java
@@ -102,7 +102,7 @@ public class GFACServiceJobSubmitter implements JobSubmitter, Watcher
{
 					// before submitting the job we check again the state of the node
 					if (GFacUtils.createExperimentEntry(experimentID, taskID, zk, experimentNode, pickedChild,
tokenId)) {
 						// FIXME:: The GatewayID is temporarily read from properties file. It should instead
be inferred from the token.
-						return gfacClient.submitJob(experimentID, taskID, ServerSettings.getSetting(Constants.GATEWAY_NAME));
+						return gfacClient.submitJob(experimentID, taskID, ServerSettings.getDefaultUserGateway());
 					}
 				}
 			}

http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/GatewayRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/GatewayRegistry.java
b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/GatewayRegistry.java
index f39bd46..035258e 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/GatewayRegistry.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/GatewayRegistry.java
@@ -29,7 +29,7 @@ import org.apache.airavata.registry.cpi.RegistryException;
 
 public class GatewayRegistry {
     public GatewayResource getDefaultGateway () throws ApplicationSettingsException, RegistryException
{
-        return (GatewayResource)ResourceUtils.getGateway(ServerSettings.getSystemUserGateway());
+        return (GatewayResource)ResourceUtils.getGateway(ServerSettings.getDefaultUserGateway());
     }
 
     public GatewayResource getExistingGateway (String gatewayName) throws RegistryException
{

http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java
b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java
index 0a8395b..71de056 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java
@@ -45,18 +45,18 @@ public class RegistryImpl implements Registry {
 
     public RegistryImpl() throws RegistryException{
         try {
-            if (!ResourceUtils.isGatewayExist(ServerSettings.getSystemUserGateway())){
-                gatewayResource = (GatewayResource) ResourceUtils.createGateway(ServerSettings.getSystemUserGateway());
+            if (!ResourceUtils.isGatewayExist(ServerSettings.getDefaultUserGateway())){
+                gatewayResource = (GatewayResource) ResourceUtils.createGateway(ServerSettings.getDefaultUserGateway());
                 gatewayResource.save();
             }else {
-                gatewayResource = (GatewayResource)ResourceUtils.getGateway(ServerSettings.getSystemUserGateway());
+                gatewayResource = (GatewayResource)ResourceUtils.getGateway(ServerSettings.getDefaultUserGateway());
             }
 
-            if (!ResourceUtils.isUserExist(ServerSettings.getSystemUser())){
-                user = ResourceUtils.createUser(ServerSettings.getSystemUser(), ServerSettings.getSystemUserPassword());
+            if (!ResourceUtils.isUserExist(ServerSettings.getDefaultUser())){
+                user = ResourceUtils.createUser(ServerSettings.getDefaultUser(), ServerSettings.getDefaultUserPassword());
                 user.save();
             }else {
-                user = (UserResource)ResourceUtils.getUser(ServerSettings.getSystemUser());
+                user = (UserResource)ResourceUtils.getUser(ServerSettings.getDefaultUser());
             }
             experimentRegistry = new ExperimentRegistry(gatewayResource, user);
             projectRegistry = new ProjectRegistry(gatewayResource, user);

http://git-wip-us.apache.org/repos/asf/airavata/blob/9aeed4d3/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/UserReg.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/UserReg.java
b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/UserReg.java
index 5dc2868..ef544b2 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/UserReg.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/UserReg.java
@@ -30,7 +30,7 @@ import org.apache.airavata.registry.cpi.RegistryException;
 
 public class UserReg {
     public WorkerResource getSystemUser() throws ApplicationSettingsException, RegistryException
{
-        return (WorkerResource)ResourceUtils.getWorker(ServerSettings.getSystemUserGateway(),
ServerSettings.getSystemUser());
+        return (WorkerResource)ResourceUtils.getWorker(ServerSettings.getDefaultUserGateway(),
ServerSettings.getDefaultUser());
     }
 
     public WorkerResource getExistingUser (String gatewayName, String userName) throws RegistryException
{


Mime
View raw message