Moving properties domain classes to stratos.common module
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fcbb662d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fcbb662d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fcbb662d Branch: refs/heads/docker-grouping-merge Commit: fcbb662dfff53daed37bc9244ba21e4b702e323d Parents: a9025aa Author: Imesh Gunaratne <[email protected]> Authored: Tue Nov 4 07:24:12 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Nov 4 07:24:12 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/api/AutoScalerServiceImpl.java | 2 +- .../applications/ApplicationUtils.java | 2 +- .../applications/pojo/ApplicationContext.java | 12 + .../cloud/controller/CloudControllerClient.java | 4 +- .../interfaces/AutoScalerServiceInterface.java | 2 +- .../application/ApplicationMonitorFactory.java | 4 +- .../monitor/cluster/AbstractClusterMonitor.java | 2 +- .../monitor/cluster/ClusterMonitorFactory.java | 4 +- .../KubernetesServiceClusterMonitor.java | 4 +- .../monitor/cluster/VMClusterMonitor.java | 2 +- .../cluster/VMServiceClusterMonitor.java | 4 +- .../autoscaler/partition/PartitionGroup.java | 1 - .../partition/deployers/PartitionReader.java | 2 +- .../deployers/DeploymentPolicyReader.java | 2 +- .../stratos/autoscaler/util/AutoscalerUtil.java | 8 +- .../deployment/partition/Partition.java | 4 +- ...inerClusterContextToKubernetesContainer.java | 5 +- .../impl/CloudControllerServiceImpl.java | 7 +- .../pojo/ApplicationClusterContext.java | 2 + .../cloud/controller/pojo/CartridgeConfig.java | 2 + .../cloud/controller/pojo/CartridgeInfo.java | 1 + .../pojo/ContainerClusterContext.java | 2 + .../cloud/controller/pojo/IaasConfig.java | 4 +- .../controller/pojo/LoadbalancerConfig.java | 5 +- .../cloud/controller/pojo/MemberContext.java | 2 + .../cloud/controller/pojo/Properties.java | 52 -- .../stratos/cloud/controller/pojo/Property.java | 62 --- .../cloud/controller/pojo/Registrant.java | 2 + .../controller/util/CloudControllerUtil.java | 19 +- .../org/apache/stratos/common/Properties.java | 80 +++ .../org/apache/stratos/common/Property.java | 101 ++++ .../common/kubernetes/KubernetesGroup.java | 2 + .../common/kubernetes/KubernetesHost.java | 1 + .../stratos/common/kubernetes/Properties.java | 80 --- .../stratos/common/kubernetes/Property.java | 101 ---- .../behaviour/CartridgeMgtBehaviour.java | 4 +- .../manager/client/AutoscalerServiceClient.java | 7 +- .../client/CloudControllerServiceClient.java | 12 +- .../stratos/manager/deploy/service/Service.java | 2 +- .../service/ServiceDeploymentManager.java | 4 +- .../multitenant/lb/DefaultLBService.java | 2 +- .../multitenant/lb/ExistingLBService.java | 2 +- .../service/multitenant/lb/LBService.java | 2 +- .../multitenant/lb/MultiTenantLBService.java | 2 +- .../multitenant/lb/ServiceAwareLBService.java | 2 +- .../category/DefaultLoadBalancerCategory.java | 2 +- .../category/ExistingLoadBalancerCategory.java | 2 +- .../manager/lb/category/LBDataContext.java | 4 +- .../ServiceLevelLoadBalancerCategory.java | 2 +- .../manager/CartridgeSubscriptionManager.java | 4 +- .../subscription/CartridgeSubscription.java | 2 +- .../subscription/DataCartridgeSubscription.java | 2 +- .../subscription/LBCartridgeSubscription.java | 2 +- .../subscription/PersistenceContext.java | 2 +- .../manager/subscription/SubscriptionData.java | 4 +- .../filter/LBCreationSubscriptionFilter.java | 4 +- .../subscription/filter/SubscriptionFilter.java | 2 +- .../SubscriptionMultiTenantBehaviour.java | 2 +- .../utils/CartridgeSubscriptionUtils.java | 3 +- .../utils/ApplicationManagementUtil.java | 4 +- .../bean/util/converter/PojoConverter.java | 94 ++-- .../rest/endpoint/services/ServiceUtils.java | 31 +- .../src/main/resources/AutoScalerService.wsdl | 153 +++--- .../main/resources/CloudControllerService.wsdl | 487 +++++++------------ 64 files changed, 604 insertions(+), 830 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/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 fda23ca..4476b1a 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 @@ -41,7 +41,7 @@ import org.apache.stratos.autoscaler.policy.PolicyManager; import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy; import org.apache.stratos.autoscaler.registry.RegistryManager; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.common.kubernetes.KubernetesGroup; import org.apache.stratos.common.kubernetes.KubernetesHost; import org.apache.stratos.common.kubernetes.KubernetesMaster; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/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 e82882c..0886353 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 @@ -27,7 +27,7 @@ import org.apache.stratos.autoscaler.applications.payload.PayloadFactory; import org.apache.stratos.autoscaler.exception.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.stub.pojo.Property; +import org.apache.stratos.common.xsd.Property; import java.util.*; import java.util.regex.Pattern; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java index 5d97ad5..5916a6e 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java @@ -19,6 +19,8 @@ package org.apache.stratos.autoscaler.applications.pojo; +import org.apache.stratos.common.Properties; + import java.io.Serializable; public class ApplicationContext implements Serializable { @@ -39,6 +41,8 @@ public class ApplicationContext implements Serializable { private SubscribableInfoContext[] subscribableInfoContexts; + private Properties properties; + public ApplicationContext() { } @@ -97,4 +101,12 @@ public class ApplicationContext implements Serializable { public void setTeantAdminUsername(String teantAdminUsername) { this.teantAdminUsername = teantAdminUsername; } + + public Properties getProperties() { + return properties; + } + + public void setProperties(Properties properties) { + this.properties = properties; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java index 6f90516..c023ff4 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java @@ -46,8 +46,8 @@ import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; import org.apache.stratos.cloud.controller.stub.pojo.ContainerClusterContext; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.xsd.Properties; +import org.apache.stratos.common.xsd.Property; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.common.kubernetes.KubernetesGroup; import org.apache.stratos.common.kubernetes.KubernetesMaster; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java index 0b2bf43..8dbf20f 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java @@ -32,7 +32,7 @@ import org.apache.stratos.autoscaler.partition.PartitionGroup; import org.apache.stratos.autoscaler.pojo.ServiceGroup; import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.common.kubernetes.KubernetesGroup; import org.apache.stratos.common.kubernetes.KubernetesHost; import org.apache.stratos.common.kubernetes.KubernetesMaster; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitorFactory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitorFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitorFactory.java index 66891d0..d8d8514 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitorFactory.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitorFactory.java @@ -35,8 +35,8 @@ import org.apache.stratos.autoscaler.monitor.cluster.AbstractClusterMonitor; import org.apache.stratos.autoscaler.monitor.cluster.ClusterMonitorFactory; import org.apache.stratos.autoscaler.monitor.cluster.VMClusterMonitor; import org.apache.stratos.autoscaler.monitor.group.GroupMonitor; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.xsd.Property; +import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.messaging.domain.applications.Application; import org.apache.stratos.messaging.domain.applications.Group; import org.apache.stratos.messaging.domain.topology.Cluster; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/AbstractClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/AbstractClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/AbstractClusterMonitor.java index fa9736e..f8e81b8 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/AbstractClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/AbstractClusterMonitor.java @@ -31,7 +31,7 @@ import org.apache.stratos.autoscaler.monitor.events.MonitorScalingEvent; import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent; import org.apache.stratos.autoscaler.monitor.events.MonitorTerminateAllEvent; import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.messaging.domain.topology.ClusterStatus; import org.apache.stratos.messaging.event.health.stat.AverageLoadAverageEvent; import org.apache.stratos.messaging.event.health.stat.AverageMemoryConsumptionEvent; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/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 d2f45f7..8c99d99 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 @@ -39,9 +39,9 @@ import org.apache.stratos.autoscaler.policy.PolicyManager; import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy; 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.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; import org.apache.stratos.common.constants.StratosConstants; +import org.apache.stratos.common.xsd.Properties; +import org.apache.stratos.common.xsd.Property; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.messaging.domain.topology.ClusterStatus; import org.apache.stratos.messaging.domain.topology.Member; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/KubernetesServiceClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/KubernetesServiceClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/KubernetesServiceClusterMonitor.java index 1f17daa..324da34 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/KubernetesServiceClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/KubernetesServiceClusterMonitor.java @@ -29,8 +29,8 @@ import org.apache.stratos.autoscaler.exception.InvalidArgumentException; 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.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.xsd.Properties; +import org.apache.stratos.common.xsd.Property; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.messaging.domain.topology.ClusterStatus; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/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 19d3704..cd617ee 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.policy.model.AutoscalePolicy; import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.stratos.autoscaler.status.checker.StatusChecker; import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.messaging.domain.topology.Member; import org.apache.stratos.messaging.domain.topology.Service; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/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 cc351de..a8b9329 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 @@ -35,8 +35,8 @@ 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.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.xsd.Properties; +import org.apache.stratos.common.xsd.Property; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.messaging.domain.applications.ApplicationStatus; import org.apache.stratos.messaging.domain.applications.GroupStatus; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionGroup.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionGroup.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionGroup.java index eb01552..8f959d1 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionGroup.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionGroup.java @@ -23,7 +23,6 @@ import java.io.Serializable; import java.util.Arrays; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; /** * The model class for PartitionGroup definition. http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/deployers/PartitionReader.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/deployers/PartitionReader.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/deployers/PartitionReader.java index 42fd33b..85956cf 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/deployers/PartitionReader.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/deployers/PartitionReader.java @@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.util.AutoScalerConstants; import org.apache.stratos.autoscaler.util.AutoscalerUtil; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.Properties; import org.jaxen.JaxenException; /** http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyReader.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyReader.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyReader.java index 735758d..704feaf 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyReader.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyReader.java @@ -35,7 +35,7 @@ import org.apache.stratos.autoscaler.exception.InvalidPolicyException; import org.apache.stratos.autoscaler.partition.PartitionGroup; import org.apache.stratos.autoscaler.util.AutoscalerUtil; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.Properties; /** * http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java index 93aa988..f9eea5a 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java @@ -28,16 +28,12 @@ import org.apache.axiom.om.OMElement; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.registry.RegistryManager; -import org.apache.stratos.cloud.controller.stub.pojo.Property; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.xsd.Properties; +import org.apache.stratos.common.xsd.Property; import org.apache.stratos.messaging.domain.applications.Application; import org.apache.stratos.messaging.domain.applications.Applications; -import javax.xml.namespace.QName; -import java.util.*; - /** * This class contains utility methods used by Autoscaler. */ http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployment/partition/Partition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployment/partition/Partition.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployment/partition/Partition.java index 2376fd9..940bdea 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployment/partition/Partition.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployment/partition/Partition.java @@ -19,9 +19,9 @@ package org.apache.stratos.cloud.controller.deployment.partition; -import java.io.Serializable; +import org.apache.stratos.common.Properties; -import org.apache.stratos.cloud.controller.pojo.Properties; +import java.io.Serializable; /** * The model class for Partition definition. http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesContainer.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesContainer.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesContainer.java index 8837406..cda9a89 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesContainer.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesContainer.java @@ -27,9 +27,10 @@ import org.apache.stratos.cloud.controller.pojo.Cartridge; import org.apache.stratos.cloud.controller.pojo.ClusterContext; import org.apache.stratos.cloud.controller.pojo.ContainerClusterContext; import org.apache.stratos.cloud.controller.pojo.PortMapping; -import org.apache.stratos.cloud.controller.pojo.Property; import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder; import org.apache.stratos.cloud.controller.util.CloudControllerUtil; +import org.apache.stratos.common.Properties; +import org.apache.stratos.common.Property; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.kubernetes.client.model.Container; import org.apache.stratos.kubernetes.client.model.EnvironmentVariable; @@ -102,7 +103,7 @@ public class ContainerClusterContextToKubernetesContainer implements Function<Co addToEnvironment(envVars, ctxt.getPayload()); addToEnvironment(envVars, StratosConstants.KUBERNETES_CLUSTER_ID, kubernetesClusterId); if (memberCtxt.getProperties() != null) { - org.apache.stratos.cloud.controller.pojo.Properties props1 = memberCtxt.getProperties(); + Properties props1 = memberCtxt.getProperties(); if (props1 != null) { for (Property prop : props1.getProperties()) { addToEnvironment(envVars, prop.getName(), prop.getValue()); http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java index 04e365a..b38cf85 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java @@ -46,6 +46,7 @@ import org.apache.stratos.cloud.controller.util.CloudControllerConstants; import org.apache.stratos.cloud.controller.util.CloudControllerUtil; import org.apache.stratos.cloud.controller.util.PodActivationWatcher; import org.apache.stratos.cloud.controller.validate.interfaces.PartitionValidator; +import org.apache.stratos.common.Property; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.kubernetes.client.KubernetesApiClient; import org.apache.stratos.kubernetes.client.exceptions.KubernetesClientException; @@ -452,9 +453,9 @@ public class CloudControllerServiceImpl implements CloudControllerService { addToPayload(payload, "NETWORK_PARTITION_ID", memberContext.getNetworkPartitionId()); addToPayload(payload, "PARTITION_ID", partitionId); if(memberContext.getProperties() != null) { - org.apache.stratos.cloud.controller.pojo.Properties props1 = memberContext.getProperties(); - if (props1 != null) { - for (Property prop : props1.getProperties()) { + org.apache.stratos.common.Properties properties = memberContext.getProperties(); + if (properties != null) { + for (Property prop : properties.getProperties()) { addToPayload(payload, prop.getName(), prop.getValue()); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java index fb52ece..0bf3f0f 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java @@ -19,6 +19,8 @@ package org.apache.stratos.cloud.controller.pojo; +import org.apache.stratos.common.Properties; + import java.io.Serializable; public class ApplicationClusterContext implements Serializable { http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java index 51e571e..91b3b06 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java @@ -22,6 +22,8 @@ package org.apache.stratos.cloud.controller.pojo; import java.io.Serializable; import org.apache.commons.lang3.ArrayUtils; +import org.apache.stratos.common.Properties; +import org.apache.stratos.common.Property; /** * This class is used as the pojo for supporting the service at CC, http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java index 58cb366..dd121ab 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.lang3.ArrayUtils; +import org.apache.stratos.common.Property; /** * Holds useful information for externals, regarding a Cartridge. http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ContainerClusterContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ContainerClusterContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ContainerClusterContext.java index 137488a..6396c3f 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ContainerClusterContext.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ContainerClusterContext.java @@ -18,6 +18,8 @@ */ package org.apache.stratos.cloud.controller.pojo; +import org.apache.stratos.common.Properties; + import java.io.Serializable; /** http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/IaasConfig.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/IaasConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/IaasConfig.java index 0937c81..1a181b6 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/IaasConfig.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/IaasConfig.java @@ -22,6 +22,8 @@ package org.apache.stratos.cloud.controller.pojo; import java.io.Serializable; import org.apache.commons.lang3.ArrayUtils; +import org.apache.stratos.common.Properties; +import org.apache.stratos.common.Property; /** * This class is used to support <link>CartridgeConfig</link> @@ -145,7 +147,7 @@ public class IaasConfig implements Serializable { StringBuilder iaasPropertyBuilder = new StringBuilder(); if (properties != null) { - Property [] propertyArray = properties.getProperties(); + Property[] propertyArray = properties.getProperties(); if(propertyArray.length > 0) { for (Property property : propertyArray) { iaasPropertyBuilder.append(property.toString() + " | "); http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/LoadbalancerConfig.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/LoadbalancerConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/LoadbalancerConfig.java index 18810b8..79df8f7 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/LoadbalancerConfig.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/LoadbalancerConfig.java @@ -19,6 +19,9 @@ package org.apache.stratos.cloud.controller.pojo; +import org.apache.stratos.common.Properties; +import org.apache.stratos.common.Property; + import java.io.Serializable; /** @@ -58,7 +61,7 @@ public class LoadbalancerConfig implements Serializable { StringBuilder iaasPropertyBuilder = new StringBuilder(); if (properties != null) { - Property [] propertyArray = properties.getProperties(); + Property[] propertyArray = properties.getProperties(); if(propertyArray.length > 0) { for (Property property : propertyArray) { iaasPropertyBuilder.append(property.toString() + " | "); http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/MemberContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/MemberContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/MemberContext.java index 72b4914..a2a7d4b 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/MemberContext.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/MemberContext.java @@ -19,6 +19,8 @@ package org.apache.stratos.cloud.controller.pojo; import org.apache.stratos.cloud.controller.deployment.partition.Partition; +import org.apache.stratos.common.Properties; +import org.apache.stratos.common.Property; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Properties.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Properties.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Properties.java deleted file mode 100644 index 38ec5fb..0000000 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Properties.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.stratos.cloud.controller.pojo; - -import java.io.Serializable; -import java.util.Arrays; - -import org.apache.commons.lang3.ArrayUtils; - -/** - * Had to wrap {@link Property} array using a class, since there's a bug in current - * stub generation. - */ -public class Properties implements Serializable{ - - private static final long serialVersionUID = 1986895299288322592L; - private Property[] properties; - - public Property[] getProperties() { - return properties; - } - - public void setProperties(Property[] properties) { - if(properties == null) { - this.properties = new Property[0]; - } else { - this.properties = Arrays.copyOf(properties, properties.length); - } - } - - @Override - public String toString() { - return "Properties [properties=" + Arrays.toString(properties) + "]"; - } - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Property.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Property.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Property.java deleted file mode 100644 index e6de83d..0000000 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Property.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.stratos.cloud.controller.pojo; - -import java.io.Serializable; - -/** - * Holds a property - */ -public class Property implements Serializable{ - - private static final long serialVersionUID = -2191782657999410197L; - private String name; - private String value; - - public Property(){ - - } - - public Property(String name, String value){ - this.setName(name); - this.setValue(value); - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - @Override - public String toString() { - return "Property [name=" + name + ", value=" + value + "]"; - } - -} http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java index 2c3458a..d18e695 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java @@ -18,6 +18,8 @@ */ package org.apache.stratos.cloud.controller.pojo; +import org.apache.stratos.common.Properties; + /** * Upon a new subscription, Stratos Manager would send this POJO. * @author nirmal http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java index 5cea0b7..11d432b 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java @@ -30,6 +30,7 @@ import org.apache.stratos.cloud.controller.persist.Deserializer; import org.apache.stratos.cloud.controller.pojo.*; import org.apache.stratos.cloud.controller.registry.RegistryManager; import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder; +import org.apache.stratos.common.Property; import org.apache.stratos.messaging.domain.topology.Topology; import org.wso2.carbon.registry.core.exceptions.RegistryException; @@ -77,7 +78,7 @@ public class CloudControllerUtil { cartridge.setDefaultDeploymentPolicy(config.getDefaultDeploymentPolicy()); cartridge.setServiceGroup(config.getServiceGroup()); cartridge.setDeployerType(config.getDeployerType()); - org.apache.stratos.cloud.controller.pojo.Properties props = config.getProperties(); + org.apache.stratos.common.Properties props = config.getProperties(); if (props != null) { for (Property prop : props.getProperties()) { cartridge.addProperty(prop.getName(), prop.getValue()); @@ -144,7 +145,7 @@ public class CloudControllerUtil { iaasProvider.setPayload(payload); } - org.apache.stratos.cloud.controller.pojo.Properties props1 = + org.apache.stratos.common.Properties props1 = iaasConfig.getProperties(); if (props1 != null) { for (Property prop : props1.getProperties()) { @@ -310,20 +311,20 @@ public class CloudControllerUtil { return null; } - public static String getProperty(org.apache.stratos.cloud.controller.pojo.Properties properties, String key) { + public static String getProperty(org.apache.stratos.common.Properties properties, String key) { Properties props = toJavaUtilProperties(properties); return getProperty(props, key); } - public static org.apache.stratos.cloud.controller.pojo.Properties addProperty( - org.apache.stratos.cloud.controller.pojo.Properties properties, String key, String value) { + public static org.apache.stratos.common.Properties addProperty( + org.apache.stratos.common.Properties properties, String key, String value) { Property property = new Property(); property.setName(key); property.setValue(value); - org.apache.stratos.cloud.controller.pojo.Properties newProperties = - new org.apache.stratos.cloud.controller.pojo.Properties(); + org.apache.stratos.common.Properties newProperties = + new org.apache.stratos.common.Properties(); newProperties.setProperties(ArrayUtils.add(properties.getProperties(), property)); return newProperties; } @@ -334,12 +335,12 @@ public class CloudControllerUtil { * @return java.util.Properties */ public static Properties toJavaUtilProperties( - org.apache.stratos.cloud.controller.pojo.Properties properties) { + org.apache.stratos.common.Properties properties) { Properties javaProps = new Properties(); if (properties != null && properties.getProperties() != null) { - for (org.apache.stratos.cloud.controller.pojo.Property property : properties.getProperties()) { + for (Property property : properties.getProperties()) { if(property.getValue() != null){ javaProps.put(property.getName(), property.getValue()); } http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/Properties.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/Properties.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/Properties.java new file mode 100644 index 0000000..25fea6e --- /dev/null +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/Properties.java @@ -0,0 +1,80 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.stratos.common; + +import java.io.Serializable; +import java.util.Arrays; + +/** + * Had to wrap {@link Property} array using a class, since there's a bug in current + * stub generation. + */ +public class Properties implements Serializable { + + private Property[] properties; + + public Property[] getProperties() { + return properties; + } + + public void setProperties(Property[] properties) { + if(properties == null) { + this.properties = new Property[0]; + } else { + this.properties = Arrays.copyOf(properties, properties.length); + } + } + + @Override + public String toString() { + return "Properties [properties=" + Arrays.toString(properties) + "]"; + } + + @Override + public boolean equals(Object anObject) { + if (anObject == null) { + return false; + } + if (this == anObject) { + return false; + } + + if (!(anObject instanceof Properties)) { + return false; + } + Properties propertiesObj = (Properties) anObject; + if (this.properties == null) { + if (propertiesObj.getProperties() != null) { + return false; + } + } else if (!Arrays.equals(this.properties, propertiesObj.getProperties())) { + return false; + } + + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((this.properties == null) ? 0 : Arrays.hashCode(this.properties)); + return result; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/Property.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/Property.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/Property.java new file mode 100644 index 0000000..2658916 --- /dev/null +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/Property.java @@ -0,0 +1,101 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.stratos.common; + +import java.io.Serializable; + +/** + * Holds a property + */ +public class Property implements Serializable { + + private static final long serialVersionUID = -2191782657999410197L; + private String name; + private String value; + + public Property() { + + } + + public Property(String name, String value) { + this.setName(name); + this.setValue(value); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + @Override + public String toString() { + return "Property [name=" + name + ", value=" + value + "]"; + } + + @Override + public boolean equals(Object anObject) { + if (anObject == null) { + return false; + } + + if (!(anObject instanceof Property)) { + return false; + } + + Property propertyObj = (Property) anObject; + if (this.name == null) { + if (propertyObj.getName() != null) { + return false; + } + } else if (!this.name.equals(propertyObj.getName())) { + return false; + } + + if (this.value == null) { + if (propertyObj.getValue() != null) { + return false; + } + } else if (!this.value.equals(propertyObj.getValue())) { + return false; + } + + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((this.name == null) ? 0 : this.name.hashCode()); + result = prime * result + ((this.value == null) ? 0 : this.value.hashCode()); + return result; + } + +} http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/KubernetesGroup.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/KubernetesGroup.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/KubernetesGroup.java index 7c42048..1244ab4 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/KubernetesGroup.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/KubernetesGroup.java @@ -19,6 +19,8 @@ package org.apache.stratos.common.kubernetes; +import org.apache.stratos.common.Properties; + import java.io.Serializable; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/KubernetesHost.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/KubernetesHost.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/KubernetesHost.java index bfb80b8..60baa12 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/KubernetesHost.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/KubernetesHost.java @@ -23,6 +23,7 @@ package org.apache.stratos.common.kubernetes; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.stratos.common.Properties; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/Properties.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/Properties.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/Properties.java deleted file mode 100644 index 146f6ca..0000000 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/Properties.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.stratos.common.kubernetes; - -import java.io.Serializable; -import java.util.Arrays; - -/** - * Had to wrap {@link Property} array using a class, since there's a bug in current - * stub generation. - */ -public class Properties implements Serializable { - - private Property[] properties; - - public Property[] getProperties() { - return properties; - } - - public void setProperties(Property[] properties) { - if(properties == null) { - this.properties = new Property[0]; - } else { - this.properties = Arrays.copyOf(properties, properties.length); - } - } - - @Override - public String toString() { - return "Properties [properties=" + Arrays.toString(properties) + "]"; - } - - @Override - public boolean equals(Object anObject) { - if (anObject == null) { - return false; - } - if (this == anObject) { - return false; - } - - if (!(anObject instanceof Properties)) { - return false; - } - Properties propertiesObj = (Properties) anObject; - if (this.properties == null) { - if (propertiesObj.getProperties() != null) { - return false; - } - } else if (!Arrays.equals(this.properties, propertiesObj.getProperties())) { - return false; - } - - return true; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((this.properties == null) ? 0 : Arrays.hashCode(this.properties)); - return result; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/Property.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/Property.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/Property.java deleted file mode 100644 index af02ccf..0000000 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/Property.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.stratos.common.kubernetes; - -import java.io.Serializable; - -/** - * Holds a property - */ -public class Property implements Serializable { - - private static final long serialVersionUID = -2191782657999410197L; - private String name; - private String value; - - public Property() { - - } - - public Property(String name, String value) { - this.setName(name); - this.setValue(value); - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - @Override - public String toString() { - return "Property [name=" + name + ", value=" + value + "]"; - } - - @Override - public boolean equals(Object anObject) { - if (anObject == null) { - return false; - } - - if (!(anObject instanceof Property)) { - return false; - } - - Property propertyObj = (Property) anObject; - if (this.name == null) { - if (propertyObj.getName() != null) { - return false; - } - } else if (!this.name.equals(propertyObj.getName())) { - return false; - } - - if (this.value == null) { - if (propertyObj.getValue() != null) { - return false; - } - } else if (!this.value.equals(propertyObj.getValue())) { - return false; - } - - return true; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((this.name == null) ? 0 : this.name.hashCode()); - result = prime * result + ((this.value == null) ? 0 : this.value.hashCode()); - return result; - } - -} http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/behaviour/CartridgeMgtBehaviour.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/behaviour/CartridgeMgtBehaviour.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/behaviour/CartridgeMgtBehaviour.java index d1063e7..9c8ce04 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/behaviour/CartridgeMgtBehaviour.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/behaviour/CartridgeMgtBehaviour.java @@ -22,8 +22,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.Persistence; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.xsd.Properties; +import org.apache.stratos.common.xsd.Property; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.dao.Cluster; import org.apache.stratos.manager.exception.ADCException; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/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 d2737c6..b3e092b 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 @@ -33,9 +33,10 @@ import org.apache.stratos.autoscaler.stub.policy.model.AutoscalePolicy; import org.apache.stratos.autoscaler.applications.pojo.xsd.ApplicationContext; import org.apache.stratos.autoscaler.pojo.xsd.ServiceGroup; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.manager.internal.DataHolder; import org.apache.stratos.manager.utils.CartridgeConstants; +import sun.reflect.generics.reflectiveObjects.NotImplementedException; import java.rmi.RemoteException; @@ -299,7 +300,9 @@ public class AutoscalerServiceClient { } public void updateClusterMonitor(String clusterId, Properties properties) throws RemoteException, AutoScalerServiceInvalidArgumentExceptionException { - stub.updateClusterMonitor(clusterId, properties); + //TODO: To be fixed + throw new NotImplementedException(); + //stub.updateClusterMonitor(clusterId, properties); } http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java index a4e2109..c2f0176 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java @@ -24,9 +24,9 @@ import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.transport.http.HTTPConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.pojo.application.xsd.ApplicationContext; import org.apache.stratos.cloud.controller.stub.*; import org.apache.stratos.cloud.controller.stub.pojo.*; +import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.manager.internal.DataHolder; import org.apache.stratos.manager.utils.CartridgeConstants; @@ -73,15 +73,15 @@ public class CloudControllerServiceClient { return serviceClient; } - public void deployCartridgeDefinition (CartridgeConfig cartridgeConfig) - throws RemoteException, CloudControllerServiceInvalidCartridgeDefinitionExceptionException, - CloudControllerServiceInvalidIaasProviderExceptionException { + public void deployCartridgeDefinition (CartridgeConfig cartridgeConfig) + throws RemoteException, CloudControllerServiceInvalidCartridgeDefinitionExceptionException, + CloudControllerServiceInvalidIaasProviderExceptionException { stub.deployCartridgeDefinition(cartridgeConfig); } - public void unDeployCartridgeDefinition (String cartridgeType) throws RemoteException, CloudControllerServiceInvalidCartridgeTypeExceptionException{ + public void unDeployCartridgeDefinition (String cartridgeType) throws RemoteException, CloudControllerServiceInvalidCartridgeTypeExceptionException { stub.undeployCartridgeDefinition(cartridgeType); @@ -140,7 +140,7 @@ public class CloudControllerServiceClient { String key = (String) iterator.next(); String value = properties.getProperty(key); - Property prop = new Property(); + org.apache.stratos.common.xsd.Property prop = new org.apache.stratos.common.xsd.Property(); prop.setName(key); prop.setValue(value); http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java index 72176c3..68dbdcc 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java @@ -20,7 +20,7 @@ package org.apache.stratos.manager.deploy.service; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.manager.behaviour.CartridgeMgtBehaviour; import org.apache.stratos.manager.dao.Cluster; import org.apache.stratos.manager.exception.ADCException; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java index c5921b6..7337ed2 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java @@ -24,8 +24,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.LoadbalancerConfig; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.xsd.Properties; +import org.apache.stratos.common.xsd.Property; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.deploy.service.multitenant.MultiTenantService; import org.apache.stratos.manager.deploy.service.multitenant.lb.DefaultLBService; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java index 982535a..41aa92f 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.ClusterContext; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.dao.Cluster; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java index 4a67d8b..d81e7ed 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java @@ -20,7 +20,7 @@ package org.apache.stratos.manager.deploy.service.multitenant.lb; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.manager.dao.Cluster; import org.apache.stratos.manager.exception.ADCException; import org.apache.stratos.manager.exception.AlreadySubscribedException; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java index 1214c0e..1cf172b 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java @@ -20,7 +20,7 @@ package org.apache.stratos.manager.deploy.service.multitenant.lb; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.manager.deploy.service.Service; import org.apache.stratos.manager.exception.ADCException; import org.apache.stratos.manager.exception.AlreadySubscribedException; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java index c22c545..ddb2550 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java @@ -20,7 +20,7 @@ package org.apache.stratos.manager.deploy.service.multitenant.lb; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.manager.deploy.service.Service; import org.apache.stratos.manager.exception.ADCException; import org.apache.stratos.manager.exception.UnregisteredCartridgeException; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java index 4f4cae7..b50aada 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.ClusterContext; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.dao.Cluster; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/DefaultLoadBalancerCategory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/DefaultLoadBalancerCategory.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/DefaultLoadBalancerCategory.java index 75f6856..0d45a85 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/DefaultLoadBalancerCategory.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/DefaultLoadBalancerCategory.java @@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.ClusterContext; import org.apache.stratos.cloud.controller.stub.pojo.Persistence; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.dao.Cluster; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ExistingLoadBalancerCategory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ExistingLoadBalancerCategory.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ExistingLoadBalancerCategory.java index 594ad4c..0b41aea 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ExistingLoadBalancerCategory.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ExistingLoadBalancerCategory.java @@ -21,7 +21,7 @@ package org.apache.stratos.manager.lb.category; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.Persistence; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.manager.dao.Cluster; import org.apache.stratos.manager.exception.ADCException; import org.apache.stratos.manager.exception.AlreadySubscribedException; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/LBDataContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/LBDataContext.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/LBDataContext.java index 5b8f827..23998d7 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/LBDataContext.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/LBDataContext.java @@ -21,8 +21,8 @@ package org.apache.stratos.manager.lb.category; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.xsd.Properties; +import org.apache.stratos.common.xsd.Property; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ServiceLevelLoadBalancerCategory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ServiceLevelLoadBalancerCategory.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ServiceLevelLoadBalancerCategory.java index b69ef6a..d374a06 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ServiceLevelLoadBalancerCategory.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ServiceLevelLoadBalancerCategory.java @@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.ClusterContext; import org.apache.stratos.cloud.controller.stub.pojo.Persistence; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.dao.Cluster; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java index 6991947..99ba4c6 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java @@ -25,8 +25,8 @@ import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregister import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.LoadbalancerConfig; import org.apache.stratos.cloud.controller.stub.pojo.Persistence; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.xsd.Properties; +import org.apache.stratos.common.xsd.Property; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo; import org.apache.stratos.manager.deploy.service.Service; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CartridgeSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CartridgeSubscription.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CartridgeSubscription.java index a5d901d..80cdee4 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CartridgeSubscription.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CartridgeSubscription.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.Persistence; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo; import org.apache.stratos.manager.dao.Cluster; import org.apache.stratos.manager.exception.*;
