Repository: stratos Updated Branches: refs/heads/master a67e9ee56 -> df3d37f89
Fixing autoscaler build failure due to CC stub change Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/df3d37f8 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/df3d37f8 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/df3d37f8 Branch: refs/heads/master Commit: df3d37f896e437f4eaf4ff445dc41aad1e06371e Parents: a67e9ee Author: Lahiru Sandaruwan <[email protected]> Authored: Sat Nov 29 23:51:16 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Sat Nov 29 23:51:16 2014 +0530 ---------------------------------------------------------------------- .../algorithm/AutoscaleAlgorithm.java | 2 +- .../autoscaler/algorithm/OneAfterAnother.java | 2 +- .../autoscaler/algorithm/RoundRobin.java | 2 +- .../autoscaler/api/AutoScalerServiceImpl.java | 2 +- .../applications/ApplicationUtils.java | 4 ++-- .../parser/DefaultApplicationParser.java | 2 +- .../client/CloudControllerClient.java | 15 ++++++++----- .../autoscaler/commands/PartitionsCommands.java | 2 +- .../context/cluster/AbstractClusterContext.java | 2 +- .../context/cluster/ClusterContextFactory.java | 4 ++-- .../cluster/KubernetesClusterContext.java | 10 ++++----- .../partition/ClusterLevelPartitionContext.java | 12 +++++----- .../partition/GroupLevelPartitionContext.java | 2 +- .../context/partition/PartitionContext.java | 2 +- .../ClusterLevelNetworkPartitionContext.java | 2 +- .../GroupLevelNetworkPartitionContext.java | 2 +- .../internal/AutoscalerServerComponent.java | 2 +- .../monitor/cluster/ClusterMonitorFactory.java | 2 +- .../monitor/cluster/VMClusterMonitor.java | 2 +- .../cluster/VMServiceClusterMonitor.java | 2 +- .../autoscaler/pojo/policy/PolicyManager.java | 2 +- .../policy/deployment/DeploymentPolicy.java | 2 +- .../deployment/partition/PartitionManager.java | 2 +- .../ApplicationLevelNetworkPartition.java | 2 +- .../network/ChildLevelNetworkPartition.java | 2 +- .../autoscaler/registry/RegistryManager.java | 2 +- .../autoscaler/rule/RuleTasksDelegator.java | 2 +- .../stratos/autoscaler/TestDelegator.java | 2 +- .../stratos/autoscaler/TestMinimumRule.java | 1 + .../autoscaler/TestObsoletedMemberRule.java | 2 +- .../src/test/resources/autoscaler.drl | 4 ++-- .../resources/test-minimum-autoscaler-rule.drl | 4 ++-- .../test-terminating-obsoleted-members-rule.drl | 4 ++-- .../manager/client/AutoscalerServiceClient.java | 2 +- .../rest/endpoint/api/StratosApiV40Utils.java | 10 ++++----- .../rest/endpoint/api/StratosApiV41Utils.java | 10 ++++----- .../bean/util/converter/PojoConverter.java | 23 ++++++-------------- .../src/main/conf/drools/dependent-scaling.drl | 4 ++-- .../src/main/conf/drools/mincheck.drl | 4 ++-- .../src/main/conf/drools/obsoletecheck.drl | 4 ++-- .../src/main/conf/drools/scaling.drl | 4 ++-- .../pom.xml | 1 + 42 files changed, 80 insertions(+), 88 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/AutoscaleAlgorithm.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/AutoscaleAlgorithm.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/AutoscaleAlgorithm.java index 33c3ac1..fa79521 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/AutoscaleAlgorithm.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/AutoscaleAlgorithm.java @@ -20,7 +20,7 @@ package org.apache.stratos.autoscaler.algorithm; import org.apache.stratos.autoscaler.context.partition.network.ClusterLevelNetworkPartitionContext; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; /** http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/OneAfterAnother.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/OneAfterAnother.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/OneAfterAnother.java index 5a80176..da58265 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/OneAfterAnother.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/OneAfterAnother.java @@ -22,7 +22,7 @@ package org.apache.stratos.autoscaler.algorithm; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.context.partition.network.ClusterLevelNetworkPartitionContext; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; import java.util.Arrays; import java.util.List; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/RoundRobin.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/RoundRobin.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/RoundRobin.java index cf76d29..5cd0455 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/RoundRobin.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/RoundRobin.java @@ -22,7 +22,7 @@ package org.apache.stratos.autoscaler.algorithm; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.context.partition.network.ClusterLevelNetworkPartitionContext; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; import java.util.Arrays; import java.util.List; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java index aa6e332..93b6c89 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java @@ -44,7 +44,7 @@ import org.apache.stratos.autoscaler.pojo.policy.PolicyManager; import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy; import org.apache.stratos.autoscaler.pojo.policy.deployment.DeploymentPolicy; import org.apache.stratos.autoscaler.registry.RegistryManager; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.cloud.controller.stub.pojo.Property; import org.apache.stratos.common.kubernetes.KubernetesGroup; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java index ef0e5b6..fe8dccd 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java @@ -25,8 +25,8 @@ import org.apache.stratos.autoscaler.applications.payload.BasicPayloadData; import org.apache.stratos.autoscaler.applications.payload.PayloadData; import org.apache.stratos.autoscaler.applications.payload.PayloadFactory; import org.apache.stratos.autoscaler.exception.application.ApplicationDefinitionException; -import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.PortMapping; +import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.domain.xsd.PortMapping; import org.apache.stratos.cloud.controller.stub.pojo.Property; import java.util.*; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java index 8a34b09..752f62b 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java @@ -32,7 +32,7 @@ import org.apache.stratos.autoscaler.exception.application.ApplicationDefinition import org.apache.stratos.autoscaler.exception.cartridge.CartridgeInformationException; import org.apache.stratos.autoscaler.pojo.ServiceGroup; import org.apache.stratos.autoscaler.registry.RegistryManager; -import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.Property; import org.apache.stratos.messaging.domain.applications.Application; import org.apache.stratos.messaging.domain.applications.ClusterDataHolder; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java index b9c052b..9eba7c8 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java @@ -33,8 +33,11 @@ import org.apache.stratos.autoscaler.exception.partition.PartitionValidationExce import org.apache.stratos.autoscaler.pojo.policy.deployment.DeploymentPolicy; import org.apache.stratos.autoscaler.kubernetes.KubernetesManager; import org.apache.stratos.autoscaler.util.ConfUtil; +import org.apache.stratos.cloud.controller.domain.xsd.ContainerClusterContext; import org.apache.stratos.cloud.controller.stub.*; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; +import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.*; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.common.kubernetes.KubernetesGroup; @@ -220,10 +223,10 @@ public class CloudControllerClient { public synchronized void createApplicationClusters(String appId, Set<ApplicationClusterContext> appClusterContexts) { - List<ApplicationClusterContextDTO> contextDTOs = - new ArrayList<ApplicationClusterContextDTO>(); + List<org.apache.stratos.cloud.controller.domain.xsd.ApplicationClusterContext> contextDTOs = + new ArrayList<org.apache.stratos.cloud.controller.domain.xsd.ApplicationClusterContext>(); for(ApplicationClusterContext context : appClusterContexts) { - ApplicationClusterContextDTO dto = new ApplicationClusterContextDTO(); + org.apache.stratos.cloud.controller.domain.xsd.ApplicationClusterContext dto = new org.apache.stratos.cloud.controller.domain.xsd.ApplicationClusterContext(); dto.setClusterId(context.getClusterId()); dto.setAutoscalePolicyName(context.getAutoscalePolicyName()); dto.setDeploymentPolicyName(context.getDeploymentPolicyName()); @@ -236,8 +239,8 @@ public class CloudControllerClient { contextDTOs.add(dto); } - ApplicationClusterContextDTO[] applicationClusterContextDTOs = - new ApplicationClusterContextDTO[contextDTOs.size()]; + org.apache.stratos.cloud.controller.domain.xsd.ApplicationClusterContext[] applicationClusterContextDTOs = + new org.apache.stratos.cloud.controller.domain.xsd.ApplicationClusterContext[contextDTOs.size()]; contextDTOs.toArray(applicationClusterContextDTOs); try { stub.createApplicationClusters(appId, applicationClusterContextDTOs); http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/commands/PartitionsCommands.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/commands/PartitionsCommands.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/commands/PartitionsCommands.java index 3e434ef..e63b727 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/commands/PartitionsCommands.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/commands/PartitionsCommands.java @@ -21,7 +21,7 @@ // //import org.apache.commons.lang.StringUtils; //import org.apache.stratos.autoscaler.pojo.policy.deployment.partition.PartitionManager; -//import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +//import org.apache.stratos.cloud.controller.domain.xsd.Partition; //import org.eclipse.osgi.framework.console.CommandInterpreter; //import org.eclipse.osgi.framework.console.CommandProvider; // http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java index 1629c99..14d6748 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java @@ -21,7 +21,7 @@ package org.apache.stratos.autoscaler.context.cluster; import org.apache.commons.configuration.XMLConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; import org.apache.stratos.common.constants.StratosConstants; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java index dc55a9e..fed2ad1 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContextFactory.java @@ -32,8 +32,8 @@ import org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.Ch import org.apache.stratos.autoscaler.pojo.policy.PolicyManager; import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy; import org.apache.stratos.autoscaler.pojo.policy.deployment.DeploymentPolicy; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.cloud.controller.stub.pojo.Property; import org.apache.stratos.common.constants.StratosConstants; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/KubernetesClusterContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/KubernetesClusterContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/KubernetesClusterContext.java index 4f0b34f..0542086 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/KubernetesClusterContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/KubernetesClusterContext.java @@ -35,7 +35,7 @@ import org.apache.stratos.autoscaler.pojo.policy.autoscale.LoadAverage; import org.apache.stratos.autoscaler.pojo.policy.autoscale.MemoryConsumption; import org.apache.stratos.autoscaler.pojo.policy.autoscale.RequestsInFlight; import org.apache.stratos.autoscaler.util.ConfUtil; -import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; import org.apache.stratos.common.constants.StratosConstants; /* @@ -369,14 +369,14 @@ public class KubernetesClusterContext extends AbstractClusterContext { } /** - * Removes the {@link org.apache.stratos.cloud.controller.stub.pojo.MemberContext} object mapping + * Removes the {@link org.apache.stratos.cloud.controller.domain.xsd.MemberContext} object mapping * to the specified member id from the specified MemberContext collection * - * @param iterator The {@link java.util.Iterator} for the collection containing {@link org.apache.stratos.cloud.controller.stub.pojo.MemberContext} + * @param iterator The {@link java.util.Iterator} for the collection containing {@link org.apache.stratos.cloud.controller.domain.xsd.MemberContext} * objects - * @param memberId Member Id {@link String} for the {@link org.apache.stratos.cloud.controller.stub.pojo.MemberContext} + * @param memberId Member Id {@link String} for the {@link org.apache.stratos.cloud.controller.domain.xsd.MemberContext} * to be removed - * @return {@link org.apache.stratos.cloud.controller.stub.pojo.MemberContext} object if + * @return {@link org.apache.stratos.cloud.controller.domain.xsd.MemberContext} object if * object found and removed, null if otherwise. */ private MemberContext removeMemberFrom(Iterator<MemberContext> iterator, String memberId) { http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java index c044957..38dab09 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java @@ -23,8 +23,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.context.member.MemberStatsContext; import org.apache.stratos.autoscaler.util.ConfUtil; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; import java.io.Serializable; import java.util.*; @@ -300,14 +300,14 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se } /** - * Removes the {@link org.apache.stratos.cloud.controller.stub.pojo.MemberContext} object mapping + * Removes the {@link org.apache.stratos.cloud.controller.domain.xsd.MemberContext} object mapping * to the specified member id from the specified MemberContext collection * - * @param iterator The {@link java.util.Iterator} for the collection containing {@link org.apache.stratos.cloud.controller.stub.pojo.MemberContext} + * @param iterator The {@link java.util.Iterator} for the collection containing {@link org.apache.stratos.cloud.controller.domain.xsd.MemberContext} * objects - * @param memberId Member Id {@link String} for the {@link org.apache.stratos.cloud.controller.stub.pojo.MemberContext} + * @param memberId Member Id {@link String} for the {@link org.apache.stratos.cloud.controller.domain.xsd.MemberContext} * to be removed - * @return {@link org.apache.stratos.cloud.controller.stub.pojo.MemberContext} object if + * @return {@link org.apache.stratos.cloud.controller.domain.xsd.MemberContext} object if * object found and removed, null if otherwise. */ private MemberContext removeMemberFrom(Iterator<MemberContext> iterator, String memberId) { http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java index d08bbb6..9475130 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.context.member.MemberStatsContext; import org.apache.stratos.autoscaler.util.ConfUtil; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.messaging.domain.instance.Instance; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java index 01aeabb..e94da59 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java @@ -20,7 +20,7 @@ package org.apache.stratos.autoscaler.context.partition; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; import java.io.Serializable; import java.util.*; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ClusterLevelNetworkPartitionContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ClusterLevelNetworkPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ClusterLevelNetworkPartitionContext.java index f9919e0..f1def4d 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ClusterLevelNetworkPartitionContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ClusterLevelNetworkPartitionContext.java @@ -25,7 +25,7 @@ import org.apache.stratos.autoscaler.context.partition.ClusterLevelPartitionCont import org.apache.stratos.autoscaler.pojo.policy.autoscale.LoadAverage; import org.apache.stratos.autoscaler.pojo.policy.autoscale.MemoryConsumption; import org.apache.stratos.autoscaler.pojo.policy.autoscale.RequestsInFlight; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; import java.io.Serializable; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/GroupLevelNetworkPartitionContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/GroupLevelNetworkPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/GroupLevelNetworkPartitionContext.java index 737248a..d62185e 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/GroupLevelNetworkPartitionContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/GroupLevelNetworkPartitionContext.java @@ -21,7 +21,7 @@ package org.apache.stratos.autoscaler.context.partition.network; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.context.partition.GroupLevelPartitionContext; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; import java.io.Serializable; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java index 4ee16aa..4d6f3d0 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java @@ -34,7 +34,7 @@ import org.apache.stratos.autoscaler.registry.RegistryManager; import org.apache.stratos.autoscaler.status.processor.cluster.ClusterStatusProcessorChain; import org.apache.stratos.autoscaler.status.processor.group.GroupStatusProcessorChain; import org.apache.stratos.autoscaler.util.ServiceReferenceHolder; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; import org.apache.stratos.common.kubernetes.KubernetesGroup; import org.osgi.service.component.ComponentContext; import org.wso2.carbon.ntask.core.service.TaskService; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java index 204b8b0..cdefd89 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.exception.partition.PartitionValidationException; import org.apache.stratos.autoscaler.exception.policy.PolicyValidationException; -import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.messaging.domain.topology.ClusterStatus; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java index 394c546..3ede090 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java @@ -33,7 +33,7 @@ import org.apache.stratos.autoscaler.exception.InvalidArgumentException; import org.apache.stratos.autoscaler.exception.cartridge.TerminationException; import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.stratos.autoscaler.status.processor.StatusChecker; -import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.messaging.domain.topology.Member; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java index 9d1a0ca..5f23269 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java @@ -32,7 +32,7 @@ import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent; import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.stratos.autoscaler.util.AutoScalerConstants; import org.apache.stratos.autoscaler.util.ConfUtil; -import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.cloud.controller.stub.pojo.Property; import org.apache.stratos.common.constants.StratosConstants; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java index fd7a048..56794a6 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java @@ -32,7 +32,7 @@ import org.apache.stratos.autoscaler.exception.policy.InvalidPolicyException; //import org.apache.stratos.autoscaler.pojo.policy.deployment.partition.PartitionManager; import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy; import org.apache.stratos.autoscaler.registry.RegistryManager; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; /** * Manager class for the purpose of managing Autoscale/Deployment policy definitions. http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java index 6869520..66268c2 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java @@ -21,7 +21,7 @@ package org.apache.stratos.autoscaler.pojo.policy.deployment; import org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.ApplicationLevelNetworkPartition; import org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.ChildLevelNetworkPartition; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; import java.io.Serializable; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/PartitionManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/PartitionManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/PartitionManager.java index 41de38d..60ac097 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/PartitionManager.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/PartitionManager.java @@ -29,7 +29,7 @@ //import org.apache.stratos.autoscaler.exception.partition.InvalidPartitionException; //import org.apache.stratos.autoscaler.exception.partition.PartitionValidationException; //import org.apache.stratos.autoscaler.registry.RegistryManager; -//import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +//import org.apache.stratos.cloud.controller.domain.xsd.Partition; // //import java.util.ArrayList; //import java.util.HashMap; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/ApplicationLevelNetworkPartition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/ApplicationLevelNetworkPartition.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/ApplicationLevelNetworkPartition.java index a771445..da4f727 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/ApplicationLevelNetworkPartition.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/ApplicationLevelNetworkPartition.java @@ -19,7 +19,7 @@ package org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; import java.io.Serializable; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/ChildLevelNetworkPartition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/ChildLevelNetworkPartition.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/ChildLevelNetworkPartition.java index f11956b..cd40a39 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/ChildLevelNetworkPartition.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/ChildLevelNetworkPartition.java @@ -19,7 +19,7 @@ package org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; import java.io.Serializable; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java index 63c5fcc..dfaee67 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java @@ -33,7 +33,7 @@ import org.apache.stratos.autoscaler.util.AutoScalerConstants; import org.apache.stratos.autoscaler.util.Deserializer; import org.apache.stratos.autoscaler.util.Serializer; import org.apache.stratos.autoscaler.util.ServiceReferenceHolder; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; import org.apache.stratos.common.kubernetes.KubernetesGroup; import org.apache.stratos.messaging.domain.applications.Application; import org.wso2.carbon.context.PrivilegedCarbonContext; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java index e9244f4..a6c0c1c 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java @@ -37,7 +37,7 @@ import org.apache.stratos.autoscaler.monitor.cluster.AbstractClusterMonitor; import org.apache.stratos.autoscaler.monitor.cluster.VMClusterMonitor; import org.apache.stratos.autoscaler.monitor.cluster.VMServiceClusterMonitor; //import org.apache.stratos.autoscaler.pojo.policy.deployment.partition.PartitionManager; -import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.messaging.domain.topology.Member; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestDelegator.java b/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestDelegator.java index 23b2e7b..1d24171 100644 --- a/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestDelegator.java +++ b/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestDelegator.java @@ -22,7 +22,7 @@ package org.apache.stratos.autoscaler; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; /** * Helper class to keep the state of the consequence of a rule. http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestMinimumRule.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestMinimumRule.java b/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestMinimumRule.java index 4413ff8..af60d37 100644 --- a/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestMinimumRule.java +++ b/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestMinimumRule.java @@ -25,6 +25,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.context.partition.ClusterLevelPartitionContext; import org.apache.stratos.autoscaler.util.ConfUtil; import org.apache.stratos.cloud.controller.stub.pojo.*; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; import org.drools.KnowledgeBase; import org.drools.KnowledgeBaseFactory; import org.drools.builder.*; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestObsoletedMemberRule.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestObsoletedMemberRule.java b/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestObsoletedMemberRule.java index 9873e86..2798e68 100644 --- a/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestObsoletedMemberRule.java +++ b/components/org.apache.stratos.autoscaler/src/test/java/org/apache/stratos/autoscaler/TestObsoletedMemberRule.java @@ -24,7 +24,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.context.partition.ClusterLevelPartitionContext; import org.apache.stratos.autoscaler.util.ConfUtil; -import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; import org.drools.KnowledgeBase; import org.drools.KnowledgeBaseFactory; import org.drools.builder.*; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler.drl ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler.drl b/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler.drl index 060afe3..06c45e1 100644 --- a/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler.drl +++ b/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler.drl @@ -38,8 +38,8 @@ import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.commons.logging.Log; import org.apache.stratos.autoscaler.pojo.policy.deployment.DeploymentPolicy; import org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.NetworkPartition; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; global org.apache.stratos.autoscaler.pojo.policy.PolicyManager $manager; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/test/resources/test-minimum-autoscaler-rule.drl ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/test/resources/test-minimum-autoscaler-rule.drl b/components/org.apache.stratos.autoscaler/src/test/resources/test-minimum-autoscaler-rule.drl index 0c8cb82..3597b38 100644 --- a/components/org.apache.stratos.autoscaler/src/test/resources/test-minimum-autoscaler-rule.drl +++ b/components/org.apache.stratos.autoscaler/src/test/resources/test-minimum-autoscaler-rule.drl @@ -37,8 +37,8 @@ import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.commons.logging.Log; import org.apache.stratos.autoscaler.pojo.policy.deployment.DeploymentPolicy; import org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.NetworkPartition; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; global org.apache.stratos.autoscaler.pojo.policy.PolicyManager $manager; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.autoscaler/src/test/resources/test-terminating-obsoleted-members-rule.drl ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/test/resources/test-terminating-obsoleted-members-rule.drl b/components/org.apache.stratos.autoscaler/src/test/resources/test-terminating-obsoleted-members-rule.drl index 8bc183c..6756565 100644 --- a/components/org.apache.stratos.autoscaler/src/test/resources/test-terminating-obsoleted-members-rule.drl +++ b/components/org.apache.stratos.autoscaler/src/test/resources/test-terminating-obsoleted-members-rule.drl @@ -37,8 +37,8 @@ import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.commons.logging.Log; import org.apache.stratos.autoscaler.pojo.policy.deployment.DeploymentPolicy; import org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.NetworkPartition; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; global org.apache.stratos.autoscaler.pojo.policy.PolicyManager $manager; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java index 32d77d4..1c3d494 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java @@ -32,7 +32,7 @@ import org.apache.stratos.autoscaler.stub.kubernetes.KubernetesHost; import org.apache.stratos.autoscaler.stub.kubernetes.KubernetesMaster; import org.apache.stratos.autoscaler.stub.policy.model.AutoscalePolicy; import org.apache.stratos.autoscaler.stub.policy.model.DeploymentPolicy; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.manager.internal.DataHolder; import org.apache.stratos.manager.utils.CartridgeConstants; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java index b15b620..b6f36f6 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java @@ -176,7 +176,7 @@ public class StratosApiV40Utils { AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { - org.apache.stratos.cloud.controller.stub.deployment.partition.Partition partition = + org.apache.stratos.cloud.controller.domain.xsd.Partition partition = PojoConverter.convertToCCPartitionPojo(partitionBean); try { @@ -274,7 +274,7 @@ public class StratosApiV40Utils { public static Partition[] getAvailablePartitions () throws RestAPIException { - org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] partitions = null; + org.apache.straorg.apache.stratos.cloud.controller.domain.xsd.Partition null; AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { try { @@ -293,8 +293,7 @@ public class StratosApiV40Utils { public static Partition[] getPartitionsOfDeploymentPolicy(String deploymentPolicyId) throws RestAPIException { - org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] partitions = null; - AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); + org.apache.stratos.cloud.controrg.apache.stratos.cloud.controller.domain.xsd.PartitionAutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { try { partitions = @@ -314,8 +313,7 @@ public class StratosApiV40Utils { public static Partition[] getPartitionsOfGroup(String deploymentPolicyId, String groupId) throws RestAPIException { - org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] partitions = null; - AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); + org.apache.stratos.cloud.controller.stub.deplorg.apache.stratos.cloud.controller.domain.xsd.PartitionceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { try { partitions = http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index a67c02b..532789a 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -323,7 +323,7 @@ public class StratosApiV41Utils { AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { - org.apache.stratos.cloud.controller.stub.deployment.partition.Partition partition = + org.apache.stratos.cloud.controller.domain.xsd.Partition partition = PojoConverter.convertToCCPartitionPojo(partitionBean); try { @@ -455,7 +455,7 @@ public class StratosApiV41Utils { public static Partition[] getAvailablePartitions() throws RestAPIException { - org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] partitions = null; + org.apache.straorg.apache.stratos.cloud.controller.domain.xsd.Partition null; AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { try { @@ -474,8 +474,7 @@ public class StratosApiV41Utils { public static Partition[] getPartitionsOfDeploymentPolicy(String deploymentPolicyId) throws RestAPIException { - org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] partitions = null; - AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); + org.apache.stratos.cloud.controrg.apache.stratos.cloud.controller.domain.xsd.PartitionAutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { try { partitions = @@ -495,8 +494,7 @@ public class StratosApiV41Utils { public static Partition[] getPartitionsOfGroup(String deploymentPolicyId, String groupId) throws RestAPIException { - org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] partitions = null; - AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); + org.apache.stratos.cloud.controller.stub.deplorg.apache.stratos.cloud.controller.domain.xsd.PartitionceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { try { partitions = http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java index 2c0b63f..bf1d867 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java @@ -306,13 +306,11 @@ public class PojoConverter { return networkInterfaces; } - public static org.apache.stratos.cloud.controller.stub.deployment.partition.Partition convertToCCPartitionPojo + public static org.apache.stratos.cloud.controller.domain.xsd.Partition convertToCCPartitionPojo (Partition partitionBean) { - org.apache.stratos.cloud.controller.stub.deployment.partition.Partition partition = new - org.apache.stratos.cloud.controller.stub.deployment.partition.Partition(); - - partition.setId(partitionBean.id); + org.apache.straorg.apache.stratos.cloud.controller.domain.xsd.Partitionw + org.apache.stratos.cloud.controrg.apache.stratos.cloud.controller.domain.xsd.PartitionartitionBean.id); partition.setDescription(partitionBean.description); partition.setIsPublic(partitionBean.isPublic); partition.setProvider(partitionBean.provider); @@ -462,12 +460,9 @@ public class PojoConverter { return cluster1; } - private static org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] convertToCCPartitionPojos - (List<Partition> partitionList) { + private static org.apache.stratos.cloud.controller.stub.deplorg.apache.stratos.cloud.controller.domain.xsd.Partitiont<Partition> partitionList) { - org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] partitions = - new org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[partitionList.size()]; - for (int i = 0; i < partitionList.size(); i++) { + org.apache.stratos.cloud.controller.stub.deployment.partitioorg.apache.stratos.cloud.controller.domain.xsd.Partition.controller.stub.deployment.partition.Partition[parorg.apache.stratos.cloud.controller.domain.xsd.Partition++) { partitions[i] = convertToCCPartitionPojo(partitionList.get(i)); } @@ -475,9 +470,7 @@ public class PojoConverter { } public static Partition[] populatePartitionPojos(org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] - partitions) { - - Partition[] partitionBeans; + org.apache.stratos.cloud.controller.domain.xsd.Partitiontition[] partitionBeans; if (partitions == null) { partitionBeans = new Partition[0]; return partitionBeans; @@ -491,9 +484,7 @@ public class PojoConverter { } public static Partition populatePartitionPojo(org.apache.stratos.cloud.controller.stub.deployment.partition.Partition - partition) { - - Partition partitionBeans = new Partition(); + org.apache.stratos.cloud.controller.domain.xsd.Partition = new Partition(); if (partition == null) { return partitionBeans; } http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl b/products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl index b9f25aa..383bb2e 100644 --- a/products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl +++ b/products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl @@ -34,8 +34,8 @@ import org.apache.stratos.autoscaler.algorithm.RoundRobin; import org.apache.stratos.autoscaler.context.partition.ClusterLevelPartitionContext; import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.NetworkPartition; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; import org.apache.stratos.autoscaler.pojo.policy.autoscale.LoadAverage import org.apache.stratos.autoscaler.pojo.policy.autoscale.MemoryConsumption http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl b/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl index 5d631cb..4a56361 100755 --- a/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl +++ b/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl @@ -37,8 +37,8 @@ import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.commons.logging.Log; import org.apache.stratos.autoscaler.pojo.policy.deployment.DeploymentPolicy; import org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.NetworkPartition; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; global org.apache.stratos.autoscaler.rule.RuleLog log; global org.apache.stratos.autoscaler.pojo.policy.PolicyManager $manager; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl b/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl index c0feda9..87e6999 100755 --- a/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl +++ b/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl @@ -37,8 +37,8 @@ import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.commons.logging.Log; import org.apache.stratos.autoscaler.pojo.policy.deployment.DeploymentPolicy; import org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.NetworkPartition; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; global org.apache.stratos.autoscaler.rule.RuleLog log; global org.apache.stratos.autoscaler.pojo.policy.PolicyManager $manager; http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl index ea97778..639a682 100644 --- a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl +++ b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl @@ -39,8 +39,8 @@ import org.apache.stratos.autoscaler.algorithm.RoundRobin; import org.apache.stratos.autoscaler.context.partition.ClusterLevelPartitionContext; import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.NetworkPartition; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.cloud.controller.domain.xsd.Partition; +import org.apache.stratos.cloud.controller.domain.xsd.MemberContext; import org.apache.stratos.autoscaler.pojo.policy.autoscale.LoadAverage import org.apache.stratos.autoscaler.pojo.policy.autoscale.MemoryConsumption http://git-wip-us.apache.org/repos/asf/stratos/blob/df3d37f8/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml b/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml index 1f3c44f..9c7848d 100644 --- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml +++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml @@ -88,6 +88,7 @@ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-Name>${project.artifactId}</Bundle-Name> <Export-Package> + org.apache.stratos.cloud.controller.domain.xsd.*; version=${project.version}, org.apache.stratos.cloud.controller.stub.exception.*; version=${project.version}, org.apache.stratos.cloud.controller.stub.deployment.partition.*; version=${project.version}, org.apache.stratos.cloud.controller.stub.pojo.*; version=${project.version},
