Repository: stratos Updated Branches: refs/heads/master df3d37f89 -> d69569e25
Fixing Manager backend build failures due to CC stub change, and comenting out partition deployment calls Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d69569e2 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d69569e2 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d69569e2 Branch: refs/heads/master Commit: d69569e25abae747b25c0aad275bb378ea7e8dc6 Parents: df3d37f Author: Lahiru Sandaruwan <[email protected]> Authored: Sun Nov 30 00:27:31 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Sun Nov 30 00:27:31 2014 +0530 ---------------------------------------------------------------------- .../behaviour/CartridgeMgtBehaviour.java | 5 +- .../manager/client/AutoscalerServiceClient.java | 84 ++++----- .../client/CloudControllerServiceClient.java | 7 + .../deploy/cartridge/CartridgeDeployer.java | 2 +- .../cartridge/DefaultCartridgeDeployer.java | 2 +- .../stratos/manager/deploy/service/Service.java | 2 +- .../service/ServiceDeploymentManager.java | 4 +- .../service/multitenant/MultiTenantService.java | 2 +- .../multitenant/lb/DefaultLBService.java | 4 +- .../multitenant/lb/ExistingLBService.java | 2 +- .../service/multitenant/lb/LBService.java | 2 +- .../multitenant/lb/MultiTenantLBService.java | 2 +- .../multitenant/lb/ServiceAwareLBService.java | 4 +- .../apache/stratos/manager/dto/Cartridge.java | 5 +- .../category/DefaultLoadBalancerCategory.java | 6 +- .../category/ExistingLoadBalancerCategory.java | 4 +- .../manager/lb/category/LBDataContext.java | 2 +- .../lb/category/LoadBalancerCategory.java | 2 +- .../ServiceLevelLoadBalancerCategory.java | 6 +- .../manager/CartridgeSubscriptionManager.java | 2 + .../ApplicationCartridgeSubscription.java | 2 +- .../subscription/CartridgeSubscription.java | 4 +- .../subscription/DataCartridgeSubscription.java | 4 +- .../FrameworkCartridgeSubscription.java | 2 +- .../InternalRepoBasedCartridgeSubscription.java | 2 +- .../subscription/LBCartridgeSubscription.java | 4 +- .../manager/subscription/SubscriptionData.java | 3 +- .../factory/CartridgeSubscriptionFactory.java | 2 +- .../filter/LBCreationSubscriptionFilter.java | 178 +++++++++---------- .../subscription/filter/SubscriptionFilter.java | 2 +- .../SubscriptionMultiTenantBehaviour.java | 4 +- .../utils/CartridgeSubscriptionUtils.java | 7 +- .../utils/ApplicationManagementUtil.java | 6 +- .../manager/test/CartridgeSubscriptionTest.java | 2 +- .../manager/test/LookupDataHolderTest.java | 2 +- .../bean/util/converter/PojoConverter.java | 2 +- 36 files changed, 196 insertions(+), 179 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 12208b9..e3f303e 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,8 +20,8 @@ package org.apache.stratos.manager.behaviour; 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.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.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.dao.Cluster; @@ -38,6 +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 java.io.Serializable; import java.util.Map; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 1c3d494..4dba8d2 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 @@ -78,48 +78,48 @@ public class AutoscalerServiceClient { return serviceClient; } - public Partition[] getAvailablePartitions() throws RemoteException { - - Partition[] partitions; - partitions = stub.getAllAvailablePartitions(); - - return partitions; - } +// public Partition[] getAvailablePartitions() throws RemoteException { +// +// Partition[] partitions; +// partitions = stub.getAllAvailablePartitions(); +// +// return partitions; +// } public void undeployServiceGroupDefinition(String serviceGroupName) throws RemoteException, AutoScalerServiceAutoScalerExceptionException { stub.undeployServiceGroup(serviceGroupName); } - public Partition getPartition( - String partitionId) throws RemoteException { - - Partition partition; - partition = stub.getPartition(partitionId); - - return partition; - } - - public Partition[] getPartitionsOfGroup( - String deploymentPolicyId, String partitionGroupId) - throws RemoteException { - - Partition[] partitions; - partitions = stub.getPartitionsOfGroup(deploymentPolicyId, - partitionGroupId); - - return partitions; - } - - public Partition[] - getPartitionsOfDeploymentPolicy( - String deploymentPolicyId) throws RemoteException { - - Partition[] partitions; - partitions = stub.getPartitionsOfDeploymentPolicy(deploymentPolicyId); - - return partitions; - } +// public Partition getPartition( +// String partitionId) throws RemoteException { +// +// Partition partition; +// partition = stub.getPartition(partitionId); +// +// return partition; +// } + +// public Partition[] getPartitionsOfGroup( +// String deploymentPolicyId, String partitionGroupId) +// throws RemoteException { +// +// Partition[] partitions; +// partitions = stub.getPartitionsOfGroup(deploymentPolicyId, +// partitionGroupId); +// +// return partitions; +// } + +// public Partition[] +// getPartitionsOfDeploymentPolicy( +// String deploymentPolicyId) throws RemoteException { +// +// Partition[] partitions; +// partitions = stub.getPartitionsOfDeploymentPolicy(deploymentPolicyId); +// +// return partitions; +// } public org.apache.stratos.autoscaler.stub.partition.PartitionGroup[] getPartitionGroups( String deploymentPolicyId) throws RemoteException { @@ -215,12 +215,12 @@ public class AutoscalerServiceClient { return stub.updateAutoScalingPolicy(autoScalePolicy); } - public boolean deployPartition(Partition partition) throws RemoteException, - AutoScalerServiceInvalidPartitionExceptionException { - - return stub.addPartition(partition); - - } +// public boolean deployPartition(Partition partition) throws RemoteException, +// AutoScalerServiceInvalidPartitionExceptionException { +// +// return stub.addPartition(partition); +// +// } public String getDefaultLBClusterId(String deploymentPolicy) throws RemoteException { return stub.getDefaultLBClusterId(deploymentPolicy); http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 5424530..8acfa9b 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 @@ -26,6 +26,13 @@ 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.manager.internal.DataHolder; import org.apache.stratos.manager.utils.CartridgeConstants; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 b4b63eb..d33dfd8 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.stub.pojo.CartridgeConfig; +import org.apache.stratos.cloud.controller.domain.xsd.CartridgeConfig; import org.apache.stratos.manager.exception.ADCException; public abstract class CartridgeDeployer { http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 1865c19..1843545 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.stub.pojo.CartridgeConfig; +import org.apache.stratos.cloud.controller.domain.xsd.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/d69569e2/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..d539fa8 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,7 +19,7 @@ package org.apache.stratos.manager.deploy.service; -import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.manager.behaviour.CartridgeMgtBehaviour; import org.apache.stratos.manager.dao.Cluster; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 a6f8e93..22430ba 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,8 +22,8 @@ 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.stub.pojo.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.LoadbalancerConfig; +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.common.constants.StratosConstants; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 b8a468b..d411910 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.stub.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; import org.apache.stratos.manager.deploy.service.Service; public class MultiTenantService extends Service { http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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..dc81b96 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,8 +21,8 @@ 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.stub.pojo.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.ClusterContext; +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.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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..36867e7 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,7 +19,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.domain.xsd.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.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/d69569e2/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..414135b 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,7 +19,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.domain.xsd.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.manager.deploy.service.Service; import org.apache.stratos.manager.exception.ADCException; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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..d232b63 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,7 +19,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.domain.xsd.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.manager.deploy.service.Service; import org.apache.stratos.manager.exception.ADCException; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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..c57cc64 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,8 +21,8 @@ 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.stub.pojo.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.ClusterContext; +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.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 c0f07df..136fa37 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 @@ -20,8 +20,9 @@ package org.apache.stratos.manager.dto; -import org.apache.stratos.cloud.controller.stub.pojo.Persistence; -import org.apache.stratos.cloud.controller.stub.pojo.PortMapping; + +import org.apache.stratos.cloud.controller.domain.xsd.Persistence; +import org.apache.stratos.cloud.controller.domain.xsd.PortMapping; import javax.xml.bind.annotation.XmlRootElement; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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..8dab167 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,9 +21,9 @@ 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.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.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.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 4877046..2af0e6b 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.stub.pojo.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.Persistence; +import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.domain.xsd.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/d69569e2/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..22a8b44 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,7 +20,7 @@ package org.apache.stratos.manager.lb.category; -import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.cloud.controller.stub.pojo.Property; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 3c60907..1914f5a 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.stub.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.domain.xsd.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/d69569e2/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..dd7904f 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,9 +21,9 @@ 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.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.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.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 0a7206d..92b4495 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,6 +21,8 @@ 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.CloudControllerServiceUnregisteredCartridgeExceptionException; import org.apache.stratos.cloud.controller.stub.pojo.*; import org.apache.stratos.cloud.controller.stub.pojo.Properties; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 b7ac165..de2a7fa 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.stub.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; public class ApplicationCartridgeSubscription extends CartridgeSubscription { http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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..de176cb 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,8 +21,8 @@ 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.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.Persistence; +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.manager.dao.CartridgeSubscriptionInfo; import org.apache.stratos.manager.dao.Cluster; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 c6a006d..4962afd 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,7 +19,7 @@ package org.apache.stratos.manager.subscription; -import org.apache.stratos.cloud.controller.stub.pojo.Persistence; +import org.apache.stratos.cloud.controller.domain.xsd.Persistence; import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo; import org.apache.stratos.manager.dao.DataCartridge; @@ -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.stub.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; import java.util.HashMap; import java.util.Map; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 a0aea01..218d362 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.stub.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; public class FrameworkCartridgeSubscription extends CartridgeSubscription { http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 1b698e2..d875ac6 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.stub.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.domain.xsd.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/d69569e2/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 c69abc5..0f5451d 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,8 +21,8 @@ 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.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.Persistence; +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.manager.dao.CartridgeSubscriptionInfo; import org.apache.stratos.manager.exception.*; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 7dd1bf5..3371d3f 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 @@ -18,7 +18,8 @@ */ package org.apache.stratos.manager.subscription; -import org.apache.stratos.cloud.controller.stub.pojo.Persistence; + +import org.apache.stratos.cloud.controller.domain.xsd.Persistence; import org.apache.stratos.cloud.controller.stub.pojo.Properties; import java.util.Collections; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 203ae87..eaa9b3a 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.stub.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.domain.xsd.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/d69569e2/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 457bd75..7c8fc5b 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,8 +23,8 @@ import java.util.Random; 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.LoadbalancerConfig; +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.common.constants.StratosConstants; @@ -91,8 +91,8 @@ public class LBCreationSubscriptionFilter implements SubscriptionFilter { lbConfig); // subscribe to LB - lbCartridgeSubscription = subscribeToLB(subscriptionData, - lbDataCtxt, cartridgeInfo); +// lbCartridgeSubscription = subscribeToLB(subscriptionData, +// lbDataCtxt, cartridgeInfo); if (lbDataCtxt.getLbProperperties() != null && !lbDataCtxt.getLbProperperties().isEmpty()) { List<Property> lbProperperties = lbDataCtxt.getLbProperperties(); @@ -132,90 +132,90 @@ public class LBCreationSubscriptionFilter implements SubscriptionFilter { return filterProperties; } - private CartridgeSubscription subscribeToLB (SubscriptionData subscriptionData, LBDataContext lbDataContext, - CartridgeInfo serviceCartridgeInfo) - - throws ADCException, InvalidCartridgeAliasException, - DuplicateCartridgeAliasException, PolicyException, UnregisteredCartridgeException, RepositoryRequiredException, RepositoryCredentialsRequiredException, - RepositoryTransportException, AlreadySubscribedException, InvalidRepositoryException { - - - if (lbDataContext.getLbCategory() == null || lbDataContext.getLbCategory().equals(StratosConstants.NO_LOAD_BALANCER)) { - // no load balancer subscription required generate SubscriptionKey - log.info("No LB subscription required for the Subscription with alias: " + subscriptionData.getCartridgeAlias() + ", type: " + - subscriptionData.getCartridgeType()); - return null; - } - - LoadBalancerCategory loadBalancerCategory = null; - - String lbAlias = "lb" + lbDataContext.getLbCartridgeInfo().getType() + new Random().nextInt(); - - if (lbDataContext.getLbCategory().equals(StratosConstants.EXISTING_LOAD_BALANCERS)) { - loadBalancerCategory = new ExistingLoadBalancerCategory(); - - } else if (lbDataContext.getLbCategory().equals(StratosConstants.DEFAULT_LOAD_BALANCER)) { - loadBalancerCategory = new DefaultLoadBalancerCategory(); - - } else if (lbDataContext.getLbCategory().equals(StratosConstants.SERVICE_AWARE_LOAD_BALANCER)) { - loadBalancerCategory = new ServiceLevelLoadBalancerCategory(); - } - - if (loadBalancerCategory == null) { - throw new ADCException("The given Load Balancer category " + lbDataContext.getLbCategory() + " not found"); - } - - if(lbDataContext.getLbCartridgeInfo().getMultiTenant()) { - throw new ADCException("LB Cartridge must be single tenant"); - } - // Set the load balanced service type - loadBalancerCategory.setLoadBalancedServiceType(subscriptionData.getCartridgeType()); - - // Set if the load balanced service is multi tenant or not - loadBalancerCategory.setLoadBalancedServiceMultiTenant(serviceCartridgeInfo.getMultiTenant()); - - // set the relevant deployment policy - loadBalancerCategory.setDeploymentPolicyName(lbDataContext.getDeploymentPolicy()); - - // Create the CartridgeSubscription instance - CartridgeSubscription cartridgeSubscription = CartridgeSubscriptionFactory.getLBCartridgeSubscriptionInstance(lbDataContext, loadBalancerCategory); - - // Generate and set the key - String subscriptionKey = CartridgeSubscriptionUtils.generateSubscriptionKey(); - cartridgeSubscription.setSubscriptionKey(subscriptionKey); - - // Create repository - Repository repository = cartridgeSubscription.manageRepository(null, "", "", false); - - // Create subscriber - Subscriber subscriber = new Subscriber(subscriptionData.getTenantAdminUsername(), subscriptionData.getTenantId(), subscriptionData.getTenantDomain()); - - // create subscription - cartridgeSubscription.createSubscription(subscriber, lbAlias, lbDataContext.getAutoscalePolicy(), - lbDataContext.getDeploymentPolicy(), repository); - - // add LB category to the payload - if (cartridgeSubscription.getPayloadData() != null) { - cartridgeSubscription.getPayloadData().add(CartridgeConstants.LB_CATEGORY, lbDataContext.getLbCategory()); - } - - // publishing to bam - CartridgeSubscriptionDataPublisher.publish(subscriptionData.getTenantId(), - subscriptionData.getTenantAdminUsername(), lbAlias, - lbDataContext.getLbCartridgeInfo().getType(), - subscriptionData.getRepositoryURL(), - serviceCartridgeInfo.getMultiTenant(), - lbDataContext.getDeploymentPolicy(), - lbDataContext.getAutoscalePolicy(), - cartridgeSubscription.getCluster().getClusterDomain(), - cartridgeSubscription.getHostName(), - cartridgeSubscription.getMappedDomain(), "Subscribed"); - - log.info("Tenant [" + subscriptionData.getTenantId() + "] with username [" + subscriptionData.getTenantAdminUsername() + - " subscribed to " + "] Cartridge with Alias " + lbAlias + ", Cartridge Type: " + lbDataContext.getLbCartridgeInfo().getType() + - ", Autoscale Policy: " + lbDataContext.getAutoscalePolicy() + ", Deployment Policy: " + lbDataContext.getDeploymentPolicy()); - - return cartridgeSubscription; - } +// private CartridgeSubscription subscribeToLB (SubscriptionData subscriptionData, LBDataContext lbDataContext, +// CartridgeInfo serviceCartridgeInfo) +// +// throws ADCException, InvalidCartridgeAliasException, +// DuplicateCartridgeAliasException, PolicyException, UnregisteredCartridgeException, RepositoryRequiredException, RepositoryCredentialsRequiredException, +// RepositoryTransportException, AlreadySubscribedException, InvalidRepositoryException { +// +// +// if (lbDataContext.getLbCategory() == null || lbDataContext.getLbCategory().equals(StratosConstants.NO_LOAD_BALANCER)) { +// // no load balancer subscription required generate SubscriptionKey +// log.info("No LB subscription required for the Subscription with alias: " + subscriptionData.getCartridgeAlias() + ", type: " + +// subscriptionData.getCartridgeType()); +// return null; +// } +// +// LoadBalancerCategory loadBalancerCategory = null; +// +// String lbAlias = "lb" + lbDataContext.getLbCartridgeInfo().getType() + new Random().nextInt(); +// +// if (lbDataContext.getLbCategory().equals(StratosConstants.EXISTING_LOAD_BALANCERS)) { +// loadBalancerCategory = new ExistingLoadBalancerCategory(); +// +// } else if (lbDataContext.getLbCategory().equals(StratosConstants.DEFAULT_LOAD_BALANCER)) { +// loadBalancerCategory = new DefaultLoadBalancerCategory(); +// +// } else if (lbDataContext.getLbCategory().equals(StratosConstants.SERVICE_AWARE_LOAD_BALANCER)) { +// loadBalancerCategory = new ServiceLevelLoadBalancerCategory(); +// } +// +// if (loadBalancerCategory == null) { +// throw new ADCException("The given Load Balancer category " + lbDataContext.getLbCategory() + " not found"); +// } +// +// if(lbDataContext.getLbCartridgeInfo().getMultiTenant()) { +// throw new ADCException("LB Cartridge must be single tenant"); +// } +// // Set the load balanced service type +// loadBalancerCategory.setLoadBalancedServiceType(subscriptionData.getCartridgeType()); +// +// // Set if the load balanced service is multi tenant or not +// loadBalancerCategory.setLoadBalancedServiceMultiTenant(serviceCartridgeInfo.getMultiTenant()); +// +// // set the relevant deployment policy +// loadBalancerCategory.setDeploymentPolicyName(lbDataContext.getDeploymentPolicy()); +// +// // Create the CartridgeSubscription instance +// CartridgeSubscription cartridgeSubscription = CartridgeSubscriptionFactory.getLBCartridgeSubscriptionInstance(lbDataContext, loadBalancerCategory); +// +// // Generate and set the key +// String subscriptionKey = CartridgeSubscriptionUtils.generateSubscriptionKey(); +// cartridgeSubscription.setSubscriptionKey(subscriptionKey); +// +// // Create repository +// Repository repository = cartridgeSubscription.manageRepository(null, "", "", false); +// +// // Create subscriber +// Subscriber subscriber = new Subscriber(subscriptionData.getTenantAdminUsername(), subscriptionData.getTenantId(), subscriptionData.getTenantDomain()); +// +// // create subscription +// cartridgeSubscription.createSubscription(subscriber, lbAlias, lbDataContext.getAutoscalePolicy(), +// lbDataContext.getDeploymentPolicy(), repository); +// +// // add LB category to the payload +// if (cartridgeSubscription.getPayloadData() != null) { +// cartridgeSubscription.getPayloadData().add(CartridgeConstants.LB_CATEGORY, lbDataContext.getLbCategory()); +// } +// +// // publishing to bam +// CartridgeSubscriptionDataPublisher.publish(subscriptionData.getTenantId(), +// subscriptionData.getTenantAdminUsername(), lbAlias, +// lbDataContext.getLbCartridgeInfo().getType(), +// subscriptionData.getRepositoryURL(), +// serviceCartridgeInfo.getMultiTenant(), +// lbDataContext.getDeploymentPolicy(), +// lbDataContext.getAutoscalePolicy(), +// cartridgeSubscription.getCluster().getClusterDomain(), +// cartridgeSubscription.getHostName(), +// cartridgeSubscription.getMappedDomain(), "Subscribed"); +// +// log.info("Tenant [" + subscriptionData.getTenantId() + "] with username [" + subscriptionData.getTenantAdminUsername() + +// " subscribed to " + "] Cartridge with Alias " + lbAlias + ", Cartridge Type: " + lbDataContext.getLbCartridgeInfo().getType() + +// ", Autoscale Policy: " + lbDataContext.getAutoscalePolicy() + ", Deployment Policy: " + lbDataContext.getDeploymentPolicy()); +// +// return cartridgeSubscription; +// } } http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 0fea5ab..896c789 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,7 +18,7 @@ */ package org.apache.stratos.manager.subscription.filter; -import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.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/d69569e2/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 626e5a3..6f53ba3 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.stub.pojo.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.Persistence; +import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.domain.xsd.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/d69569e2/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 8aa51a4..f9812fa 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 @@ -24,7 +24,12 @@ 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.stub.pojo.*; +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.cloud.controller.stub.pojo.*; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/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 0f1e21f..199a529 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,8 +35,8 @@ 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.stub.pojo.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.Persistence; +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.CloudControllerServiceUnregisteredCartridgeExceptionException; import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.cloud.controller.stub.pojo.Property; @@ -107,7 +107,7 @@ public class ApplicationManagementUtil { List<PortMapping> portMappings = new ArrayList<PortMapping>(); if (cartridgeInfo.getPortMappings() != null) { - for (org.apache.stratos.cloud.controller.stub.pojo.PortMapping portMapping : cartridgeInfo.getPortMappings()) { + for (org.apache.stratos.cloud.controller.domain.xsd.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/d69569e2/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 f7f7990..b519378 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.stub.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.domain.xsd.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/d69569e2/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 8508003..7804758 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.stub.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.domain.xsd.CartridgeInfo; import org.apache.stratos.manager.exception.ADCException; import org.apache.stratos.manager.exception.PersistenceManagerException; import org.apache.stratos.manager.retriever.DataInsertionAndRetrievalManager; http://git-wip-us.apache.org/repos/asf/stratos/blob/d69569e2/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java index bf1d867..17f8bf8 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java @@ -38,7 +38,7 @@ import org.apache.stratos.cloud.controller.stub.pojo.IaasConfig; import org.apache.stratos.cloud.controller.stub.pojo.LoadbalancerConfig; import org.apache.stratos.cloud.controller.stub.pojo.NetworkInterface; import org.apache.stratos.cloud.controller.stub.pojo.NetworkInterfaces; -import org.apache.stratos.cloud.controller.stub.pojo.Persistence; +import org.apache.stratos.cloud.controller.domain.xsd.Persistence; import org.apache.stratos.cloud.controller.stub.pojo.PortMapping; import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.cloud.controller.stub.pojo.Property;
