You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/01/10 10:25:13 UTC
[1/2] git commit: moving setKey before calling createSubscription
Updated Branches:
refs/heads/master f8f194503 -> 8195f2214
moving setKey before calling createSubscription
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/060df783
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/060df783
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/060df783
Branch: refs/heads/master
Commit: 060df78392ea96f8e0679fb4cdb9eeb7dccd1820
Parents: a1dbda1
Author: Isuru <is...@wso2.com>
Authored: Fri Jan 10 14:54:46 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Fri Jan 10 14:54:46 2014 +0530
----------------------------------------------------------------------
.../stratos/manager/manager/CartridgeSubscriptionManager.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/060df783/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
index fbcb76b..65f91da 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
@@ -159,11 +159,13 @@ public class CartridgeSubscriptionManager {
//Create subscriber
Subscriber subscriber = new Subscriber(tenantAdminUsername, tenantId, tenantDomain);
+ //Set the key
+ cartridgeSubscription.setSubscriptionKey(CartridgeSubscriptionUtils.generateSubscriptionKey());
+
//create subscription
cartridgeSubscription.createSubscription(subscriber, cartridgeAlias, autoscalingPolicyName,
deploymentPolicyName, repository);
- cartridgeSubscription.setSubscriptionKey(CartridgeSubscriptionUtils.generateSubscriptionKey()); // TODO ---- fix
- // properly
+
log.info("Tenant [" + tenantId + "] with username [" + tenantAdminUsername +
" subscribed to " + "] Cartridge Alias " + cartridgeAlias + ", Cartridge Type: " +
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by is...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8195f221
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8195f221
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8195f221
Branch: refs/heads/master
Commit: 8195f22149868564ab7f55af760b5afaa75a5740
Parents: 060df78 f8f1945
Author: Isuru <is...@wso2.com>
Authored: Fri Jan 10 14:54:54 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Fri Jan 10 14:54:54 2014 +0530
----------------------------------------------------------------------
.../org.apache.stratos.autoscaler/pom.xml | 7 +
.../apache/stratos/autoscaler/Constants.java | 9 +
.../controller/InstanceNotificationClient.java | 71 ++++++
.../health/AutoscalerHealthStatReceiver.java | 217 +++++++++++++------
.../InstanceNotificationPublisher.java | 13 +-
.../InstanceCleanupNotificationService.java | 9 +-
.../notifier/InstanceCleanupClusterEvent.java | 38 ++++
.../instance/notifier/InstanceCleanupEvent.java | 47 ----
.../notifier/InstanceCleanupMemberEvent.java | 38 ++++
...InstanceCleanupNotifierMessageProcessor.java | 6 +-
.../pom.xml | 1 +
service-stubs/pom.xml | 1 +
12 files changed, 333 insertions(+), 124 deletions(-)
----------------------------------------------------------------------