Updated Branches: refs/heads/javelin 28b682c8d -> 7a3ffb47e
Add pipeline concept to RPC facility, fix javelin build issue Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7a3ffb47 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7a3ffb47 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7a3ffb47 Branch: refs/heads/javelin Commit: 7a3ffb47e68e4a18aae31d9bf1d26d5fdcebecc0 Parents: 28b682c Author: Kelven Yang <[email protected]> Authored: Thu Nov 15 16:15:24 2012 -0800 Committer: Kelven Yang <[email protected]> Committed: Thu Nov 15 16:15:24 2012 -0800 ---------------------------------------------------------------------- .../framework/messaging/RpcCallContext.java | 9 +++++ server/src/com/cloud/cluster/ClusterEventBus.java | 24 --------------- 2 files changed, 9 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a3ffb47/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallContext.java ---------------------------------------------------------------------- diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallContext.java b/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallContext.java index bdfcd45..2d379b3 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallContext.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallContext.java @@ -24,6 +24,7 @@ public class RpcCallContext { Map<String, Object> _contextMap = new HashMap<String, Object>(); int _timeoutMilliSeconds = DEFAULT_RPC_TIMEOUT; + String _pipeline; public RpcCallContext() { } @@ -36,6 +37,14 @@ public class RpcCallContext { _timeoutMilliSeconds = timeoutMilliseconds; } + public void setPipeline(String pipeName) { + _pipeline = pipeName; + } + + public String getPipeline() { + return _pipeline; + } + @SuppressWarnings("unchecked") public <T> T getContextParameter(String key) { return (T)_contextMap.get(key); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a3ffb47/server/src/com/cloud/cluster/ClusterEventBus.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/cluster/ClusterEventBus.java b/server/src/com/cloud/cluster/ClusterEventBus.java deleted file mode 100644 index 63ceaea..0000000 --- a/server/src/com/cloud/cluster/ClusterEventBus.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.cloud.cluster; - -import java.io.Serializable; - -import javax.annotation.PostConstruct; - -import org.apache.cloudstack.framework.messaging.EventBusBase; -import org.apache.cloudstack.framework.messaging.PublishScope; -import org.springframework.stereotype.Component; - - -@Component -public class ClusterEventBus extends EventBusBase { - - @PostConstruct - public void init() { - } - - @Override - public void publish(String subject, PublishScope scope, Object sender, - Serializable args) { - super.publish(subject, scope, sender, args); - } -}
