You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by sa...@apache.org on 2014/01/12 05:51:38 UTC
[1/2] git commit: Fixing Unknown event listener error. Updating
subscription logic for Multitenant cartridges
Updated Branches:
refs/heads/master ff3afed85 -> 029958d3b
Fixing Unknown event listener error. Updating subscription logic for Multitenant cartridges
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c8f2bcbd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c8f2bcbd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c8f2bcbd
Branch: refs/heads/master
Commit: c8f2bcbd3d8a45c00147af704e594eb7fc679da9
Parents: 27fb367
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Sun Jan 12 10:16:02 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Sun Jan 12 10:16:02 2014 +0530
----------------------------------------------------------------------
.../InstanceNotifierMessageProcessorChain.java | 3 +++
.../stratos/rest/endpoint/services/ServiceUtils.java | 14 ++++++++++++++
2 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c8f2bcbd/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceNotifierMessageProcessorChain.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceNotifierMessageProcessorChain.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceNotifierMessageProcessorChain.java
index b844d2d..e0b8d73 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceNotifierMessageProcessorChain.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/notifier/InstanceNotifierMessageProcessorChain.java
@@ -23,6 +23,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.messaging.listener.EventListener;
import org.apache.stratos.messaging.listener.instance.notifier.ArtifactUpdateEventListener;
+import org.apache.stratos.messaging.listener.instance.notifier.InstanceCleanupClusterEventListener;
import org.apache.stratos.messaging.listener.instance.notifier.InstanceCleanupMemberEventListener;
import org.apache.stratos.messaging.message.processor.MessageProcessorChain;
@@ -52,6 +53,8 @@ public class InstanceNotifierMessageProcessorChain extends MessageProcessorChain
artifactUpdateMessageProcessor.addEventListener(eventListener);
} else if (eventListener instanceof InstanceCleanupMemberEventListener) {
artifactUpdateMessageProcessor.addEventListener(eventListener);
+ } else if (eventListener instanceof InstanceCleanupClusterEventListener) {
+ artifactUpdateMessageProcessor.addEventListener(eventListener);
} else {
throw new RuntimeException("Unknown event listener");
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c8f2bcbd/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
index 2dcc03d..7f80551 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
@@ -639,6 +639,20 @@ public class ServiceUtils {
throw new ADCException(msg, e);
}
+ // If multitenant, return for now. TODO -- fix properly
+ if(cartridgeInfo != null && cartridgeInfo.getMultiTenant()) {
+ log.info(" ******* MT cartridge ******* ");
+
+ CartridgeSubscription cartridgeSubscription =
+ cartridgeSubsciptionManager.subscribeToCartridgeWithProperties(cartridgeType, alias, autoscalingPolicy,
+ deploymentPolicy ,tenantDomain,
+ ApplicationManagementUtil.getTenantId(configurationContext),
+ userName, "git", repoURL, false, repoUsername, repoPassword, null);
+ log.info(" --- ** -- ");
+ return cartridgeSubsciptionManager.registerCartridgeSubscription(cartridgeSubscription);
+
+ }
+
List<Property> lbRefProp = new ArrayList<Property>();
// get lb config reference
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by sa...@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/029958d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/029958d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/029958d3
Branch: refs/heads/master
Commit: 029958d3b77b45baa3389c1258ddf98258f9feb2
Parents: c8f2bcb ff3afed
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Sun Jan 12 10:21:00 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Sun Jan 12 10:21:00 2014 +0530
----------------------------------------------------------------------
.../stratos/manager/deploy/service/Service.java | 13 ++++++++++-
.../service/ServiceDeploymentManager.java | 11 ++++++++++
.../manager/lookup/LookupDataHolder.java | 23 ++++++++++++++++++++
.../lookup/TenantIdToSubscriptionContext.java | 6 +++++
.../DataInsertionAndRetrievalManager.java | 14 ++++++++++++
5 files changed, 66 insertions(+), 1 deletion(-)
----------------------------------------------------------------------