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/10/24 14:02:07 UTC
[1/2] git commit: Added INSTANCE_STATUS_TOPIC constant
Updated Branches:
refs/heads/master b130d39da -> 35dffa0fe
Added INSTANCE_STATUS_TOPIC constant
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8da5a4a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8da5a4a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8da5a4a6
Branch: refs/heads/master
Commit: 8da5a4a6e9493b7bcf053170e878e9ebac6712ac
Parents: 9876bae
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu Oct 24 17:31:37 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Oct 24 17:31:37 2013 +0530
----------------------------------------------------------------------
.../main/java/org/apache/stratos/messaging/util/Constants.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8da5a4a6/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java
index 913236a..702fbe2 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java
@@ -19,9 +19,11 @@
package org.apache.stratos.messaging.util;
public class Constants {
-
- public static final String TOPOLOGY_TOPIC = "topology-topic";
+ /* Message broker topic names */
+ public static final String TOPOLOGY_TOPIC = "topology";
public static final String HEALTH_STAT_TOPIC = "summarized-health-stats";
+ public static final String INSTANCE_STATUS_TOPIC = "instance-status";
+
public static final String TENANT_RANGE_DELIMITER = "-";
public static final String EVENT_CLASS_NAME = "event-class-name";
}
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/35dffa0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/35dffa0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/35dffa0f
Branch: refs/heads/master
Commit: 35dffa0fe7334104871cce1a5625f602438d1e81
Parents: 8da5a4a b130d39
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu Oct 24 17:31:58 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Oct 24 17:31:58 2013 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/AutoscalerContext.java | 54 ++++
.../stratos/autoscaler/ClusterContext.java | 164 +++++++++++
.../apache/stratos/autoscaler/Constants.java | 10 +
.../stratos/autoscaler/MemberContext.java | 58 ++++
.../algorithm/AutoscaleAlgorithm.java | 30 ++
.../autoscaler/algorithm/OneAfterAnother.java | 108 ++++++++
.../autoscaler/algorithm/RoundRobin.java | 119 ++++++++
.../cloud/controller/CloudControllerClient.java | 14 +
.../AverageRequestInFlightEventProcessor.java | 92 +++++++
...GradientOfRequestInFlightEventProcessor.java | 86 ++++++
.../processor/HealthStatEventProcessor.java | 31 +++
...rivativeOfRequestInFlightEventProcessor.java | 89 ++++++
.../internal/AutoscalerServerComponent.java | 23 +-
.../AverageRequestInFlightEventProcessor.java | 79 ------
...GradientOfRequestInFlightEventProcessor.java | 81 ------
.../processor/HealthStatEventProcessor.java | 31 ---
...rivativeOfRequestInFlightEventProcessor.java | 82 ------
.../receiver/TopicSubscriberManager.java | 70 -----
.../message/receiver/TopologyManager.java | 70 +++++
.../health/HealthEventMessageDelegator.java | 12 +-
.../topology/TopologyEventMessageDelegator.java | 10 +-
.../autoscaler/policy/PolicyManager.java | 2 +-
.../policy/deployers/PolicyReader.java | 21 +-
.../autoscaler/policy/model/HAPolicy.java | 2 +-
.../autoscaler/policy/model/LoadAverage.java | 42 +--
.../policy/model/MemoryConsumption.java | 43 +--
.../autoscaler/policy/model/Partition.java | 25 ++
.../policy/model/RequestsInFlight.java | 43 +--
.../controller/deployers/CartridgeDeployer.java | 4 +-
.../impl/CloudControllerServiceImpl.java | 18 +-
.../interfaces/CloudControllerService.java | 38 ++-
.../lb/endpoint/algorithm/RoundRobin.java | 3 +-
.../org.apache.stratos.rest.endpoint/pom.xml | 86 ++++++
.../apache/stratos/rest/endpoint/Constants.java | 28 ++
.../stratos/rest/endpoint/ServiceHolder.java | 61 +++++
.../annotation/AuthorizationAction.java | 38 +++
.../endpoint/annotation/SuperTenantService.java | 34 +++
.../handlers/StratosAuthenticationHandler.java | 99 +++++++
.../handlers/StratosAuthorizingHandler.java | 274 +++++++++++++++++++
.../endpoint/security/StratosPrincipal.java | 53 ++++
.../security/StratosSecurityContext.java | 48 ++++
.../rest/endpoint/services/AbstractAdmin.java | 57 ++++
.../rest/endpoint/services/StratosAdmin.java | 135 +++++++++
.../src/main/resources/addTenantRequest.txt | 4 +
.../src/main/resources/getTenantList.txt | 1 +
.../webapp/META-INF/webapp-classloading.xml | 35 +++
.../src/main/webapp/WEB-INF/cxf-servlet.xml | 45 +++
.../src/main/webapp/WEB-INF/web.xml | 40 +++
.../main/resources/CloudControllerService.wsdl | 160 ++++++++++-
49 files changed, 2290 insertions(+), 462 deletions(-)
----------------------------------------------------------------------