You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/25 13:58:46 UTC
git commit: Renamed topology synchronization task constant values
Updated Branches:
refs/heads/master 8830cc4e1 -> 724207c65
Renamed topology synchronization task constant values
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/724207c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/724207c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/724207c6
Branch: refs/heads/master
Commit: 724207c65def7125c36f3b1daa6ca05ccce17341
Parents: 8830cc4
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 25 18:28:36 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 25 18:28:36 2013 +0530
----------------------------------------------------------------------
.../apache/stratos/cloud/controller/internal/TaskScheduler.java | 2 +-
.../stratos/cloud/controller/util/CloudControllerConstants.java | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/724207c6/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/TaskScheduler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/TaskScheduler.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/TaskScheduler.java
index a1b83c1..0db9176 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/TaskScheduler.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/TaskScheduler.java
@@ -54,7 +54,7 @@ public class TaskScheduler {
tm = taskService.getTaskManager(CloudControllerConstants.TOPOLOGY_SYNC_TASK_TYPE);
FasterLookUpDataHolder dataHolder = FasterLookUpDataHolder.getInstance();
String cron = dataHolder.getTopologyConfig().getProperty(CloudControllerConstants.CRON_ELEMENT);
- cron = ( cron == null ? CloudControllerConstants.PUB_CRON_EXPRESSION : cron );
+ cron = ( cron == null ? CloudControllerConstants.TOPOLOGY_SYNC_CRON : cron );
if(log.isDebugEnabled()) {
log.debug(String.format("Topology synchronization task cron: %s", cron));
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/724207c6/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
index 89cb9c9..96bd2f8 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
@@ -223,10 +223,9 @@ public final class CloudControllerConstants {
* Topology sync related constants
*/
public static final String TOPOLOGY_FILE_PATH = CarbonUtils.getCarbonConfigDirPath()+File.separator+"service-topology.conf";
- public static final String TOPOLOGY_TOPIC_NAME = "topology-topic";
public static final String TOPOLOGY_SYNC_CRON = "1 * * * * ? *";
- public static final String TOPOLOGY_SYNC_TASK_NAME = "TopologySynchronizerTask";
- public static final String TOPOLOGY_SYNC_TASK_TYPE = "TOPOLOGY_SYNC_TASK";
+ public static final String TOPOLOGY_SYNC_TASK_NAME = "TOPOLOGY_SYNC_TASK";
+ public static final String TOPOLOGY_SYNC_TASK_TYPE = "TOPOLOGY_SYNC_TASK_TYPE";
public static final String AMQP_CONNECTION_URL = "amqp://admin:admin@clientID/carbon?brokerlist='tcp://localhost:5672'";
public static final String AMQP_INITIAL_CONTEXT_FACTORY = "org.wso2.andes.jndi.PropertiesFileInitialContextFactory";
public static final String AMQP_TOPIC_CONNECTION_FACTORY = "qpidConnectionfactory";