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 2013/12/11 07:46:27 UTC
[1/2] git commit: rest EP compilation failure fix
Updated Branches:
refs/heads/master 656160317 -> 0cfdca41c
rest EP compilation failure fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/118aed58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/118aed58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/118aed58
Branch: refs/heads/master
Commit: 118aed58b96c7593f5deac5bd3b69084e7dc7372
Parents: fdabc1d
Author: Isuru <is...@wso2.com>
Authored: Wed Dec 11 12:15:03 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Wed Dec 11 12:15:03 2013 +0530
----------------------------------------------------------------------
.../apache/stratos/rest/endpoint/services/ServiceUtils.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/118aed58/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 682e320..8ecb79e 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
@@ -31,7 +31,7 @@ import org.apache.stratos.adc.mgt.exception.*;
import org.apache.stratos.adc.mgt.internal.DataHolder;
import org.apache.stratos.adc.mgt.manager.CartridgeSubscriptionManager;
import org.apache.stratos.adc.mgt.subscription.CartridgeSubscription;
-import org.apache.stratos.adc.mgt.topology.model.TopologyClusterModel;
+import org.apache.stratos.adc.mgt.topology.model.TopologyClusterInformationModel;
import org.apache.stratos.adc.mgt.utils.ApplicationManagementUtil;
import org.apache.stratos.adc.mgt.utils.CartridgeConstants;
import org.apache.stratos.adc.mgt.utils.PersistenceManager;
@@ -784,13 +784,13 @@ public class ServiceUtils {
public static Cluster getCluster (String cartridgeType, String subscriptionAlias, ConfigurationContext configurationContext) {
- return TopologyClusterModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext)
+ return TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext)
,cartridgeType , subscriptionAlias);
}
public static Cluster[] getClustersForTenant (ConfigurationContext configurationContext) {
- Set<Cluster> clusterSet = TopologyClusterModel.getInstance().getClusters(ApplicationManagementUtil.
+ Set<Cluster> clusterSet = TopologyClusterInformationModel.getInstance().getClusters(ApplicationManagementUtil.
getTenantId(configurationContext));
return (clusterSet != null && clusterSet.size() > 0 ) ?
@@ -801,7 +801,7 @@ public class ServiceUtils {
public static Cluster[] getClustersForTenantAndCartridgeType (ConfigurationContext configurationContext,
String cartridgeType) {
- Set<Cluster> clusterSet = TopologyClusterModel.getInstance().getClusters(ApplicationManagementUtil.
+ Set<Cluster> clusterSet = TopologyClusterInformationModel.getInstance().getClusters(ApplicationManagementUtil.
getTenantId(configurationContext), cartridgeType);
return (clusterSet != null && clusterSet.size() > 0 ) ?
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos into topology_mgr
Posted by is...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into topology_mgr
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/0cfdca41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0cfdca41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0cfdca41
Branch: refs/heads/master
Commit: 0cfdca41c5e7136cf8dbabf6c0c321478e5d0414
Parents: 118aed5 6561603
Author: Isuru <is...@wso2.com>
Authored: Wed Dec 11 12:15:13 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Wed Dec 11 12:15:13 2013 +0530
----------------------------------------------------------------------
.../common/internal/LoadBalancerCommonServiceComponent.java | 2 +-
.../balancer/common/statistics/LoadBalancerStatsPublisher.java | 4 ++--
.../common/statistics/WSO2CEPFaultyMemberPublisher.java | 6 +++---
.../common/statistics/WSO2CEPInFlightRequestPublisher.java | 5 ++---
.../load/balancer/common/statistics/WSO2CEPStatsPublisher.java | 3 ---
5 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------