SM changes after refactoring at CC and AS. - this commit breaks master build... will be fixed by Lahiru
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1f7a3046 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1f7a3046 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1f7a3046 Branch: refs/heads/master Commit: 1f7a30468baa8817accb591960c1b49e2693e1a0 Parents: 86a67c0 Author: Nirmal Fernando <[email protected]> Authored: Sun Nov 30 12:46:06 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Sun Nov 30 12:47:24 2014 +0530 ---------------------------------------------------------------------- .../behaviour/CartridgeMgtBehaviour.java | 10 +++--- .../manager/client/AutoscalerServiceClient.java | 38 ++++++++++---------- .../client/CloudControllerServiceClient.java | 17 ++++----- .../deploy/cartridge/CartridgeDeployer.java | 2 +- .../cartridge/DefaultCartridgeDeployer.java | 2 +- .../stratos/manager/deploy/service/Service.java | 4 +-- .../service/ServiceDeploymentManager.java | 8 ++--- .../service/multitenant/MultiTenantService.java | 2 +- .../multitenant/lb/DefaultLBService.java | 6 ++-- .../multitenant/lb/ExistingLBService.java | 4 +-- .../service/multitenant/lb/LBService.java | 4 +-- .../multitenant/lb/MultiTenantLBService.java | 4 +-- .../multitenant/lb/ServiceAwareLBService.java | 6 ++-- .../apache/stratos/manager/dto/Cartridge.java | 4 +-- .../deployer/DefaultServiceGroupDeployer.java | 9 +++-- .../category/DefaultLoadBalancerCategory.java | 8 ++--- .../category/ExistingLoadBalancerCategory.java | 4 +-- .../manager/lb/category/LBDataContext.java | 6 ++-- .../lb/category/LoadBalancerCategory.java | 2 +- .../ServiceLevelLoadBalancerCategory.java | 8 ++--- .../manager/CartridgeSubscriptionManager.java | 6 ++-- .../ApplicationCartridgeSubscription.java | 2 +- .../subscription/CartridgeSubscription.java | 6 ++-- .../subscription/DataCartridgeSubscription.java | 6 ++-- .../FrameworkCartridgeSubscription.java | 2 +- .../InternalRepoBasedCartridgeSubscription.java | 2 +- .../subscription/LBCartridgeSubscription.java | 6 ++-- .../subscription/PersistenceContext.java | 2 +- .../manager/subscription/SubscriptionData.java | 4 +-- .../factory/CartridgeSubscriptionFactory.java | 2 +- .../filter/LBCreationSubscriptionFilter.java | 8 ++--- .../subscription/filter/SubscriptionFilter.java | 4 +-- .../SubscriptionMultiTenantBehaviour.java | 4 +-- .../utils/CartridgeSubscriptionUtils.java | 12 +++---- .../utils/ApplicationManagementUtil.java | 10 +++--- .../manager/test/CartridgeSubscriptionTest.java | 2 +- .../manager/test/LookupDataHolderTest.java | 2 +- 37 files changed, 114 insertions(+), 114 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/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 e3f303e..797935c 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 @@ -20,9 +20,9 @@ package org.apache.stratos.manager.behaviour; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.domain.xsd.Persistence; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.Persistence; +import org.apache.stratos.common.Properties; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.dao.Cluster; import org.apache.stratos.manager.exception.ADCException; @@ -38,7 +38,7 @@ import org.apache.stratos.manager.subscriber.Subscriber; import org.apache.stratos.manager.subscription.utils.CartridgeSubscriptionUtils; import org.apache.stratos.manager.utils.ApplicationManagementUtil; import org.apache.stratos.manager.utils.CartridgeConstants; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; import java.io.Serializable; import java.util.Map; @@ -92,7 +92,7 @@ public abstract class CartridgeMgtBehaviour implements Serializable { // get the payload parameters defined in the cartridge definition file for this cartridge type if (cartridgeInfo.getProperties() != null && cartridgeInfo.getProperties().length != 0) { - for (org.apache.stratos.cloud.controller.stub.pojo.Property property : cartridgeInfo.getProperties()) { + for (org.apache.stratos.common.Property property : cartridgeInfo.getProperties()) { // check if a property is related to the payload. Currently this is done by checking if the // property name starts with 'payload_parameter.' suffix. If so the payload param name will // be taken as the substring from the index of '.' to the end of the property name. http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/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 4dba8d2..4211b0b 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 @@ -24,16 +24,16 @@ 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.autoscaler.applications.pojo.xsd.ApplicationContext; -import org.apache.stratos.autoscaler.pojo.xsd.ServiceGroup; +import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext; +import org.apache.stratos.autoscaler.stub.pojo.ServiceGroup; import org.apache.stratos.autoscaler.stub.*; -import org.apache.stratos.autoscaler.stub.kubernetes.KubernetesGroup; -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.domain.xsd.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.kubernetes.KubernetesGroup; +import org.apache.stratos.common.kubernetes.KubernetesHost; +import org.apache.stratos.common.kubernetes.KubernetesMaster; +import org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy; +import org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy; +import org.apache.stratos.cloud.controller.stub.domain.Partition; +import org.apache.stratos.common.Properties; import org.apache.stratos.manager.internal.DataHolder; import org.apache.stratos.manager.utils.CartridgeConstants; @@ -130,37 +130,37 @@ public class AutoscalerServiceClient { return partitionGroups; } - public org.apache.stratos.autoscaler.stub.policy.model.AutoscalePolicy[] getAutoScalePolicies() + public org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy[] getAutoScalePolicies() throws RemoteException { - org.apache.stratos.autoscaler.stub.policy.model.AutoscalePolicy[] autoscalePolicies; + org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy[] autoscalePolicies; autoscalePolicies = stub.getAllAutoScalingPolicy(); return autoscalePolicies; } - public org.apache.stratos.autoscaler.stub.policy.model.AutoscalePolicy getAutoScalePolicy( + public org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy getAutoScalePolicy( String autoscalingPolicyId) throws RemoteException { - org.apache.stratos.autoscaler.stub.policy.model.AutoscalePolicy autoscalePolicy; + org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy; autoscalePolicy = stub.getAutoscalingPolicy(autoscalingPolicyId); return autoscalePolicy; } - public org.apache.stratos.autoscaler.stub.policy.model.DeploymentPolicy[] getDeploymentPolicies() + public org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy[] getDeploymentPolicies() throws RemoteException { - org.apache.stratos.autoscaler.stub.policy.model.DeploymentPolicy[] deploymentPolicies; + org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy[] deploymentPolicies; deploymentPolicies = stub.getAllDeploymentPolicies(); return deploymentPolicies; } - public org.apache.stratos.autoscaler.stub.policy.model.DeploymentPolicy[] getDeploymentPolicies( + public org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy[] getDeploymentPolicies( String cartridgeType) throws RemoteException { - org.apache.stratos.autoscaler.stub.policy.model.DeploymentPolicy[] deploymentPolicies; + org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy[] deploymentPolicies; deploymentPolicies = stub .getValidDeploymentPoliciesforCartridge(cartridgeType); @@ -181,9 +181,9 @@ public class AutoscalerServiceClient { return stub.checkServiceLBExistenceAgainstPolicy(serviceName, deploymentPolicyId); } - public org.apache.stratos.autoscaler.stub.policy.model.DeploymentPolicy getDeploymentPolicy(String deploymentPolicyId) throws RemoteException { + public org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy getDeploymentPolicy(String deploymentPolicyId) throws RemoteException { - org.apache.stratos.autoscaler.stub.policy.model.DeploymentPolicy deploymentPolicy; + org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy deploymentPolicy; deploymentPolicy = stub.getDeploymentPolicy(deploymentPolicyId); return deploymentPolicy; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/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 8acfa9b..e900c60 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 @@ -25,14 +25,15 @@ 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.stub.*; -import org.apache.stratos.cloud.controller.stub.pojo.*; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.domain.xsd.ClusterContext; -import org.apache.stratos.cloud.controller.domain.xsd.Persistence; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeConfig; -import org.apache.stratos.cloud.controller.domain.xsd.Registrant; -import org.apache.stratos.cloud.controller.domain.xsd.ServiceGroup; -import org.apache.stratos.cloud.controller.domain.xsd.Dependencies; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.ClusterContext; +import org.apache.stratos.cloud.controller.stub.domain.Persistence; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeConfig; +import org.apache.stratos.cloud.controller.stub.domain.Registrant; +import org.apache.stratos.cloud.controller.stub.domain.ServiceGroup; +import org.apache.stratos.cloud.controller.stub.domain.Dependencies; +import org.apache.stratos.common.Properties; +import org.apache.stratos.common.Property; import org.apache.stratos.manager.internal.DataHolder; import org.apache.stratos.manager.utils.CartridgeConstants; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/CartridgeDeployer.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/CartridgeDeployer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/CartridgeDeployer.java index d33dfd8..0d1a8ea 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/CartridgeDeployer.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/CartridgeDeployer.java @@ -18,7 +18,7 @@ */ package org.apache.stratos.manager.deploy.cartridge; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeConfig; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeConfig; import org.apache.stratos.manager.exception.ADCException; public abstract class CartridgeDeployer { http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/DefaultCartridgeDeployer.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/DefaultCartridgeDeployer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/DefaultCartridgeDeployer.java index 1843545..b080a9f 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/DefaultCartridgeDeployer.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/DefaultCartridgeDeployer.java @@ -20,7 +20,7 @@ package org.apache.stratos.manager.deploy.cartridge; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeConfig; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeConfig; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.exception.ADCException; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/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 d539fa8..c5fb786 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 @@ -19,8 +19,8 @@ package org.apache.stratos.manager.deploy.service; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.common.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/1f7a3046/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 22430ba..a56dcdf 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 @@ -22,10 +22,10 @@ package org.apache.stratos.manager.deploy.service; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.domain.xsd.LoadbalancerConfig; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.LoadbalancerConfig; +import org.apache.stratos.common.Properties; +import org.apache.stratos.common.Property; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.deploy.service.multitenant.MultiTenantService; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java index d411910..6111f8d 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java @@ -19,7 +19,7 @@ package org.apache.stratos.manager.deploy.service.multitenant; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; import org.apache.stratos.manager.deploy.service.Service; public class MultiTenantService extends Service { http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/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 dc81b96..4892c8f 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 @@ -21,9 +21,9 @@ package org.apache.stratos.manager.deploy.service.multitenant.lb; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.domain.xsd.ClusterContext; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.ClusterContext; +import org.apache.stratos.common.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/1f7a3046/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 36867e7..7d935be 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 @@ -19,8 +19,8 @@ package org.apache.stratos.manager.deploy.service.multitenant.lb; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.common.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/1f7a3046/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 414135b..2ca815e 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 @@ -19,8 +19,8 @@ package org.apache.stratos.manager.deploy.service.multitenant.lb; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.common.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/1f7a3046/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 d232b63..228bea1 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 @@ -19,8 +19,8 @@ package org.apache.stratos.manager.deploy.service.multitenant.lb; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.common.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/1f7a3046/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 c57cc64..c83879a 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 @@ -21,9 +21,9 @@ package org.apache.stratos.manager.deploy.service.multitenant.lb; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.domain.xsd.ClusterContext; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.ClusterContext; +import org.apache.stratos.common.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/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java index 136fa37..94efad9 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java @@ -21,8 +21,8 @@ package org.apache.stratos.manager.dto; -import org.apache.stratos.cloud.controller.domain.xsd.Persistence; -import org.apache.stratos.cloud.controller.domain.xsd.PortMapping; +import org.apache.stratos.cloud.controller.stub.domain.Persistence; +import org.apache.stratos.cloud.controller.stub.domain.PortMapping; import javax.xml.bind.annotation.XmlRootElement; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java index ab839e5..83c82b5 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java @@ -22,10 +22,9 @@ package org.apache.stratos.manager.grouping.deployer; import org.apache.axis2.AxisFault; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.pojo.xsd.Dependencies; -import org.apache.stratos.autoscaler.pojo.xsd.ServiceGroup; -import org.apache.stratos.autoscaler.stub.AutoScalerServiceAutoScalerExceptionException; -import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidServiceGroupExceptionException; +import org.apache.stratos.autoscaler.stub.pojo.Dependencies; +import org.apache.stratos.autoscaler.stub.pojo.ServiceGroup; +import org.apache.stratos.autoscaler.stub.exception.*; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; import org.apache.stratos.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; @@ -313,7 +312,7 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { servicegroupDef.setName(serviceGroup.getName()); String[] cartridges = serviceGroup.getCartridges(); String[] subGroups = serviceGroup.getSubGroups(); - org.apache.stratos.autoscaler.pojo.xsd.Dependencies deps = serviceGroup.getDependencies(); + org.apache.stratos.autoscaler.stub.pojo.Dependencies deps = serviceGroup.getDependencies(); if (deps != null) { DependencyDefinitions depsDef = new DependencyDefinitions(); http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/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 8dab167..b6bf7ce 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 @@ -21,10 +21,10 @@ package org.apache.stratos.manager.lb.category; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.domain.xsd.ClusterContext; -import org.apache.stratos.cloud.controller.domain.xsd.Persistence; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.ClusterContext; +import org.apache.stratos.cloud.controller.stub.domain.Persistence; +import org.apache.stratos.common.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/1f7a3046/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 2af0e6b..a1d31f7 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 @@ -19,8 +19,8 @@ package org.apache.stratos.manager.lb.category; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.domain.xsd.Persistence; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.Persistence; import org.apache.stratos.common.Properties; import org.apache.stratos.manager.dao.Cluster; import org.apache.stratos.manager.exception.ADCException; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/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 22a8b44..c1631d0 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 @@ -20,9 +20,9 @@ package org.apache.stratos.manager.lb.category; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.common.Properties; +import org.apache.stratos.common.Property; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/LoadBalancerCategory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/LoadBalancerCategory.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/LoadBalancerCategory.java index 1914f5a..69bb2cb 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/LoadBalancerCategory.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/LoadBalancerCategory.java @@ -21,7 +21,7 @@ package org.apache.stratos.manager.lb.category; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; import org.apache.stratos.manager.behaviour.CartridgeMgtBehaviour; import org.apache.stratos.manager.dao.Cluster; import org.apache.stratos.manager.deploy.service.Service; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/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 dd7904f..1b8b61b 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 @@ -21,10 +21,10 @@ package org.apache.stratos.manager.lb.category; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.domain.xsd.ClusterContext; -import org.apache.stratos.cloud.controller.domain.xsd.Persistence; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.ClusterContext; +import org.apache.stratos.cloud.controller.stub.domain.Persistence; +import org.apache.stratos.common.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/1f7a3046/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 92b4495..2c4f466 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 @@ -21,11 +21,11 @@ package org.apache.stratos.manager.manager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.domain.xsd.Persistence; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.Persistence; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; import org.apache.stratos.cloud.controller.stub.pojo.*; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.Properties; 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/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/ApplicationCartridgeSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/ApplicationCartridgeSubscription.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/ApplicationCartridgeSubscription.java index de2a7fa..161f83f 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/ApplicationCartridgeSubscription.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/ApplicationCartridgeSubscription.java @@ -21,7 +21,7 @@ package org.apache.stratos.manager.subscription; import org.apache.stratos.manager.repository.Repository; import org.apache.stratos.manager.subscription.tenancy.SubscriptionTenancyBehaviour; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; public class ApplicationCartridgeSubscription extends CartridgeSubscription { http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/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 de176cb..c649b41 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 @@ -21,9 +21,9 @@ package org.apache.stratos.manager.subscription; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.domain.xsd.Persistence; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.Persistence; +import org.apache.stratos.common.Properties; import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo; import org.apache.stratos.manager.dao.Cluster; import org.apache.stratos.manager.exception.*; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/DataCartridgeSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/DataCartridgeSubscription.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/DataCartridgeSubscription.java index 4962afd..d1bf60f 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/DataCartridgeSubscription.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/DataCartridgeSubscription.java @@ -19,8 +19,8 @@ package org.apache.stratos.manager.subscription; -import org.apache.stratos.cloud.controller.domain.xsd.Persistence; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.cloud.controller.stub.domain.Persistence; +import org.apache.stratos.common.Properties; import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo; import org.apache.stratos.manager.dao.DataCartridge; import org.apache.stratos.manager.exception.ADCException; @@ -28,7 +28,7 @@ import org.apache.stratos.manager.exception.UnregisteredCartridgeException; import org.apache.stratos.manager.repository.Repository; import org.apache.stratos.manager.subscription.tenancy.SubscriptionTenancyBehaviour; import org.apache.stratos.manager.utils.ApplicationManagementUtil; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; import java.util.HashMap; import java.util.Map; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/FrameworkCartridgeSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/FrameworkCartridgeSubscription.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/FrameworkCartridgeSubscription.java index 218d362..2501da3 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/FrameworkCartridgeSubscription.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/FrameworkCartridgeSubscription.java @@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.stratos.manager.exception.*; import org.apache.stratos.manager.repository.Repository; import org.apache.stratos.manager.subscription.tenancy.SubscriptionTenancyBehaviour; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; public class FrameworkCartridgeSubscription extends CartridgeSubscription { http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/InternalRepoBasedCartridgeSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/InternalRepoBasedCartridgeSubscription.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/InternalRepoBasedCartridgeSubscription.java index d875ac6..57e5349 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/InternalRepoBasedCartridgeSubscription.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/InternalRepoBasedCartridgeSubscription.java @@ -21,7 +21,7 @@ package org.apache.stratos.manager.subscription; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; import org.apache.stratos.manager.exception.ADCException; import org.apache.stratos.manager.exception.InvalidRepositoryException; import org.apache.stratos.manager.exception.RepositoryCredentialsRequiredException; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/LBCartridgeSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/LBCartridgeSubscription.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/LBCartridgeSubscription.java index 0f5451d..31d1f2f 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/LBCartridgeSubscription.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/LBCartridgeSubscription.java @@ -21,9 +21,9 @@ package org.apache.stratos.manager.subscription; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.domain.xsd.Persistence; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.Persistence; +import org.apache.stratos.common.Properties; import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo; import org.apache.stratos.manager.exception.*; import org.apache.stratos.manager.lb.category.LoadBalancerCategory; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/PersistenceContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/PersistenceContext.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/PersistenceContext.java index 63a13a1..b01e553 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/PersistenceContext.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/PersistenceContext.java @@ -21,7 +21,7 @@ package org.apache.stratos.manager.subscription; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.Property; public class PersistenceContext { http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java index 3371d3f..23fd891 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java @@ -19,8 +19,8 @@ package org.apache.stratos.manager.subscription; -import org.apache.stratos.cloud.controller.domain.xsd.Persistence; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.cloud.controller.stub.domain.Persistence; +import org.apache.stratos.common.Properties; import java.util.Collections; import java.util.HashSet; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/factory/CartridgeSubscriptionFactory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/factory/CartridgeSubscriptionFactory.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/factory/CartridgeSubscriptionFactory.java index eaa9b3a..029e090 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/factory/CartridgeSubscriptionFactory.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/factory/CartridgeSubscriptionFactory.java @@ -21,7 +21,7 @@ package org.apache.stratos.manager.subscription.factory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; import org.apache.stratos.manager.exception.ADCException; import org.apache.stratos.manager.lb.category.LBDataContext; import org.apache.stratos.manager.lb.category.LoadBalancerCategory; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/LBCreationSubscriptionFilter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/LBCreationSubscriptionFilter.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/LBCreationSubscriptionFilter.java index 7c8fc5b..2d25bf7 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/LBCreationSubscriptionFilter.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/LBCreationSubscriptionFilter.java @@ -23,10 +23,10 @@ import java.util.Random; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.domain.xsd.LoadbalancerConfig; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.LoadbalancerConfig; +import org.apache.stratos.common.Properties; +import org.apache.stratos.common.Property; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.manager.exception.ADCException; import org.apache.stratos.manager.exception.AlreadySubscribedException; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/SubscriptionFilter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/SubscriptionFilter.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/SubscriptionFilter.java index 896c789..99bb511 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/SubscriptionFilter.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/SubscriptionFilter.java @@ -18,8 +18,8 @@ */ package org.apache.stratos.manager.subscription.filter; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.common.Properties; import org.apache.stratos.manager.exception.ADCException; import org.apache.stratos.manager.subscription.SubscriptionData; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionMultiTenantBehaviour.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionMultiTenantBehaviour.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionMultiTenantBehaviour.java index 6f53ba3..b52bfa1 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionMultiTenantBehaviour.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionMultiTenantBehaviour.java @@ -21,8 +21,8 @@ package org.apache.stratos.manager.subscription.tenancy; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.domain.xsd.Persistence; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.Persistence; import org.apache.stratos.common.Properties; import org.apache.stratos.manager.dao.Cluster; import org.apache.stratos.manager.deploy.service.Service; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java index f9812fa..2f8be77 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java @@ -23,12 +23,12 @@ import org.apache.axis2.AxisFault; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.stub.policy.model.DeploymentPolicy; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.domain.xsd.LoadbalancerConfig; -import org.apache.stratos.cloud.controller.domain.xsd.PortMapping; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.LoadbalancerConfig; +import org.apache.stratos.cloud.controller.stub.domain.PortMapping; +import org.apache.stratos.common.Properties; +import org.apache.stratos.common.Property; //import org.apache.stratos.cloud.controller.stub.pojo.*; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.manager.client.AutoscalerServiceClient; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java index 199a529..99e7088 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java @@ -35,11 +35,11 @@ import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.engine.AxisConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.domain.xsd.Persistence; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.Persistence; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.Properties; +import org.apache.stratos.common.Property; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo; import org.apache.stratos.manager.dao.DataCartridge; @@ -107,7 +107,7 @@ public class ApplicationManagementUtil { List<PortMapping> portMappings = new ArrayList<PortMapping>(); if (cartridgeInfo.getPortMappings() != null) { - for (org.apache.stratos.cloud.controller.domain.xsd.PortMapping portMapping : cartridgeInfo.getPortMappings()) { + for (org.apache.stratos.cloud.controller.stub.domain.PortMapping portMapping : cartridgeInfo.getPortMappings()) { PortMapping portMap = new PortMapping(); portMap.setPrimaryPort(portMapping.getPort()); portMap.setProxyPort(portMapping.getProxyPort()); http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/test/java/org/apache/stratos/manager/test/CartridgeSubscriptionTest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/test/java/org/apache/stratos/manager/test/CartridgeSubscriptionTest.java b/components/org.apache.stratos.manager/src/test/java/org/apache/stratos/manager/test/CartridgeSubscriptionTest.java index b519378..4528d2f 100644 --- a/components/org.apache.stratos.manager/src/test/java/org/apache/stratos/manager/test/CartridgeSubscriptionTest.java +++ b/components/org.apache.stratos.manager/src/test/java/org/apache/stratos/manager/test/CartridgeSubscriptionTest.java @@ -20,7 +20,7 @@ package org.apache.stratos.manager.test; import junit.framework.TestCase; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; import org.apache.stratos.manager.exception.ADCException; import org.apache.stratos.manager.subscription.CartridgeSubscription; import org.apache.stratos.manager.subscription.factory.CartridgeSubscriptionFactory; http://git-wip-us.apache.org/repos/asf/stratos/blob/1f7a3046/components/org.apache.stratos.manager/src/test/java/org/apache/stratos/manager/test/LookupDataHolderTest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/test/java/org/apache/stratos/manager/test/LookupDataHolderTest.java b/components/org.apache.stratos.manager/src/test/java/org/apache/stratos/manager/test/LookupDataHolderTest.java index 7804758..7147f20 100644 --- a/components/org.apache.stratos.manager/src/test/java/org/apache/stratos/manager/test/LookupDataHolderTest.java +++ b/components/org.apache.stratos.manager/src/test/java/org/apache/stratos/manager/test/LookupDataHolderTest.java @@ -20,7 +20,7 @@ package org.apache.stratos.manager.test; import junit.framework.TestCase; -import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; import org.apache.stratos.manager.exception.ADCException; import org.apache.stratos.manager.exception.PersistenceManagerException; import org.apache.stratos.manager.retriever.DataInsertionAndRetrievalManager;
