fixing a conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6df1c6c6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6df1c6c6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6df1c6c6 Branch: refs/heads/master Commit: 6df1c6c624978806081fc4709f6daf3f8e81429b Parents: efdaabd 14b891e Author: Isuru <[email protected]> Authored: Sun Dec 15 02:46:05 2013 +0530 Committer: Isuru <[email protected]> Committed: Sun Dec 15 02:46:05 2013 +0530 ---------------------------------------------------------------------- .../manager/CartridgeSubscriptionManager.java | 1 + .../stratos/adc/mgt/repository/Repository.java | 7 + .../stratos/adc/mgt/subscriber/Subscriber.java | 10 +- .../mgt/subscription/CartridgeSubscription.java | 10 + .../stratos/autoscaler/ClusterMonitor.java | 20 +- .../stratos/autoscaler/LbClusterMonitor.java | 5 + .../autoscaler/NetworkPartitionContext.java | 12 +- .../stratos/autoscaler/PartitionContext.java | 5 +- .../autoscaler/api/AutoScalerServiceImpl.java | 19 +- .../cloud/controller/CloudControllerClient.java | 3 +- .../exception/NonExistingLBException.java | 2 +- .../interfaces/AutoScalerServiceInterface.java | 2 +- .../internal/AutoscalerServerComponent.java | 269 +++++---------- .../autoscaler/partition/PartitionManager.java | 90 +++--- .../autoscaler/policy/PolicyManager.java | 323 +++++++++---------- .../autoscaler/registry/RegistryManager.java | 196 ++++++++++- .../autoscaler/rule/RuleTasksDelegator.java | 28 +- .../autoscaler/util/AutoScalerConstants.java | 1 + .../stratos/autoscaler/util/AutoscalerUtil.java | 28 +- .../impl/CloudControllerServiceImpl.java | 271 ++++++++-------- .../cloud/controller/pojo/IaasProvider.java | 6 + .../cloud/controller/pojo/MemberContext.java | 9 + .../cloud/controller/pojo/Properties.java | 6 + .../stratos/cloud/controller/pojo/Property.java | 7 +- .../cloud/controller/pojo/Registrant.java | 7 + .../controller/topology/TopologyBuilder.java | 12 +- .../topology/TopologyEventSender.java | 18 +- .../controller/util/CloudControllerUtil.java | 4 +- .../messaging/domain/topology/Cluster.java | 9 + .../event/topology/ClusterCreatedEvent.java | 68 ++-- .../ClusterCreatedMessageProcessor.java | 19 +- .../bean/util/converter/PojoConverter.java | 10 +- .../rest/endpoint/services/ServiceUtils.java | 289 +++++++++-------- .../distribution/src/main/conf/mincheck.drl | 3 +- .../distribution/src/main/conf/scaling.drl | 3 +- .../src/main/resources/AutoScalerService.wsdl | 141 ++++---- .../main/resources/CloudControllerService.wsdl | 16 +- 37 files changed, 1031 insertions(+), 898 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6df1c6c6/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6df1c6c6/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java index c476f09,c8b2f2a..d190f10 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java @@@ -445,5 -468,15 +445,15 @@@ public abstract class CartridgeSubscrip public void setServiceStatus(String serviceStatus) { this.serviceStatus = serviceStatus; - } + }*/ + + @Override + public String toString() { + return "CartridgeSubscription [subscriptionId=" + subscriptionId + ", type=" + type + + ", alias=" + alias + ", autoscalingPolicyName=" + autoscalingPolicyName + + ", deploymentPolicyName=" + deploymentPolicyName + ", subscriber=" + subscriber + + ", repository=" + repository + ", cartridgeInfo=" + cartridgeInfo + ", payload=" + + payload + ", cluster=" + cluster + ", subscriptionStatus=" + subscriptionStatus + + ", serviceStatus=" + serviceStatus + ", mappedDomain=" + mappedDomain+ "]"; + } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6df1c6c6/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ----------------------------------------------------------------------
