You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/07/02 20:28:55 UTC
airavata git commit: correct class paths at airavata-server.properties
Repository: airavata
Updated Branches:
refs/heads/master f1d49fb58 -> aecf79475
correct class paths at airavata-server.properties
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/aecf7947
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/aecf7947
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/aecf7947
Branch: refs/heads/master
Commit: aecf79475f247daaf37b847ec0a958267c9cb39c
Parents: f1d49fb
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Thu Jul 2 14:28:49 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Thu Jul 2 14:28:49 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/common/utils/ServerSettings.java | 5 -----
.../server/src/main/resources/airavata-server.properties | 7 +++----
2 files changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/aecf7947/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
----------------------------------------------------------------------
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
index 4ed1e95..6d2238a 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
@@ -75,7 +75,6 @@ public class ServerSettings extends ApplicationSettings {
private static final String MY_PROXY_LIFETIME = "myproxy.life";
private static final String STATUS_PUBLISHER = "status.publisher";
private static final String TASK_LAUNCH_PUBLISHER = "task.launch.publisher";
- private static final String ACTIVITY_LISTENERS = "activity.listeners";
public static final String JOB_NOTIFICATION_ENABLE = "job.notification.enable";
public static final String JOB_NOTIFICATION_EMAILIDS = "job.notification.emailids";
public static final String JOB_NOTIFICATION_FLAGS = "job.notification.flags";
@@ -195,10 +194,6 @@ public class ServerSettings extends ApplicationSettings {
return Integer.parseInt(getSetting(MY_PROXY_LIFETIME));
}
- public static String[] getActivityListeners() throws ApplicationSettingsException {
- return getSetting(ACTIVITY_LISTENERS).split(",");
- }
-
public static String getStatusPublisher() throws ApplicationSettingsException {
return getSetting(STATUS_PUBLISHER);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/aecf7947/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index a86a1d4..6494b5d 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -109,7 +109,7 @@ gfac.server.name=gfac-node0
gfac.server.host=localhost
gfac.server.port=8950
gfac.thread.pool.size=50
-host.scheduler=org.apache.airavata.gfac.core.scheduler.impl.SimpleHostScheduler
+host.scheduler=org.apache.airavata.gfac.impl.DefaultHostScheduler
@@ -203,16 +203,15 @@ rabbitmq.broker.url=amqp://localhost:5672
# and give permissions, refer: http://blog.dtzq.com/2012/06/rabbitmq-users-and-virtual-hosts.html
#rabbitmq.broker.url=amqp://airavata:airavata@localhost:5672/messaging
-activity.listeners=org.apache.airavata.gfac.impl.AiravataJobStatusUpdator,org.apache.airavata.gfac.impl.AiravataTaskStatusUpdator,org.apache.airavata.gfac.impl.AiravataWorkflowNodeStatusUpdator,org.apache.airavata.api.server.listener.AiravataExperimentStatusUpdator,org.apache.airavata.gfac.impl.GfacInternalStatusUpdator
status.publisher=org.apache.airavata.messaging.core.impl.RabbitMQStatusPublisher
-task.launch.publisher=org.apache.airavata.messaging.core.impl.RabbitMQTaskLaunchPublisher
+task.launch.publisher=org.apache.airavata.messaging.core.impl.RabbitMQProcessLaunchPublisher
rabbitmq.status.exchange.name=airavata_rabbitmq_exchange
rabbitmq.task.launch.exchange.name=airavata_task_launch_rabbitmq_exchange
durable.queue=false
prefetch.count=200
launch.queue.name=launch.queue
cancel.queue.name=cancel.queue
-activity.publisher=org.apache.airavata.messaging.core.impl.RabbitMQPublisher
+activity.publisher=org.apache.airavata.messaging.core.impl.RabbitMQStatusPublisher
rabbitmq.exchange.name=airavata_rabbitmq_exchange
###########################################################################