referring correct Properties in manager
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/cc5aaf5f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/cc5aaf5f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/cc5aaf5f Branch: refs/heads/docker-grouping-merge Commit: cc5aaf5fb4f2e208789f4ccfc5342d0c87fbc6f6 Parents: 070f950 Author: Isuru Haththotuwa <[email protected]> Authored: Tue Nov 4 15:59:40 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Tue Nov 4 16:01:32 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/CloudControllerClient.java | 5 +- .../behaviour/CartridgeMgtBehaviour.java | 5 +- .../manager/client/AutoscalerServiceClient.java | 2 +- .../client/CloudControllerServiceClient.java | 3 +- .../category/DefaultLoadBalancerCategory.java | 2 +- .../category/ExistingLoadBalancerCategory.java | 2 +- .../manager/lb/category/LBDataContext.java | 4 +- .../ServiceLevelLoadBalancerCategory.java | 2 +- .../manager/CartridgeSubscriptionManager.java | 7 +- .../subscription/CartridgeSubscription.java | 2 +- .../subscription/DataCartridgeSubscription.java | 2 +- .../subscription/LBCartridgeSubscription.java | 3 +- .../subscription/PersistenceContext.java | 2 +- .../manager/subscription/SubscriptionData.java | 3 +- .../subscription/filter/SubscriptionFilter.java | 2 +- .../SubscriptionMultiTenantBehaviour.java | 2 +- .../utils/ApplicationManagementUtil.java | 4 +- .../bean/util/converter/PojoConverter.java | 3 +- .../rest/endpoint/services/ServiceUtils.java | 2 +- .../pom.xml | 2 +- .../main/resources/CloudControllerService.wsdl | 686 +++++++++---------- 21 files changed, 367 insertions(+), 378 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/cc5aaf5f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java index 374e092..41c6167 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java @@ -31,10 +31,7 @@ import org.apache.stratos.autoscaler.kubernetes.KubernetesManager; import org.apache.stratos.autoscaler.util.ConfUtil; import org.apache.stratos.cloud.controller.stub.*; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.ApplicationClusterContextDTO; -import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.ContainerClusterContext; -import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.cloud.controller.stub.pojo.*; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.common.kubernetes.KubernetesGroup; import org.apache.stratos.common.kubernetes.KubernetesMaster; http://git-wip-us.apache.org/repos/asf/stratos/blob/cc5aaf5f/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 9c8ce04..12208b9 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/behaviour/CartridgeMgtBehaviour.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/behaviour/CartridgeMgtBehaviour.java @@ -22,8 +22,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.Persistence; -import org.apache.stratos.common.xsd.Properties; -import org.apache.stratos.common.xsd.Property; +import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.dao.Cluster; import org.apache.stratos.manager.exception.ADCException; @@ -92,7 +91,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 (Property property : cartridgeInfo.getProperties()) { + for (org.apache.stratos.cloud.controller.stub.pojo.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/cc5aaf5f/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 b3e092b..8572494 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java @@ -33,7 +33,7 @@ import org.apache.stratos.autoscaler.stub.policy.model.AutoscalePolicy; import org.apache.stratos.autoscaler.applications.pojo.xsd.ApplicationContext; import org.apache.stratos.autoscaler.pojo.xsd.ServiceGroup; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.common.xsd.Properties; +import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.manager.internal.DataHolder; import org.apache.stratos.manager.utils.CartridgeConstants; import sun.reflect.generics.reflectiveObjects.NotImplementedException; http://git-wip-us.apache.org/repos/asf/stratos/blob/cc5aaf5f/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 c2f0176..5424530 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,7 +26,6 @@ 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.common.xsd.Properties; import org.apache.stratos.manager.internal.DataHolder; import org.apache.stratos.manager.utils.CartridgeConstants; @@ -140,7 +139,7 @@ public class CloudControllerServiceClient { String key = (String) iterator.next(); String value = properties.getProperty(key); - org.apache.stratos.common.xsd.Property prop = new org.apache.stratos.common.xsd.Property(); + Property prop = new Property(); prop.setName(key); prop.setValue(value); http://git-wip-us.apache.org/repos/asf/stratos/blob/cc5aaf5f/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 0d45a85..08bd3e1 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/DefaultLoadBalancerCategory.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/DefaultLoadBalancerCategory.java @@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.ClusterContext; import org.apache.stratos.cloud.controller.stub.pojo.Persistence; -import org.apache.stratos.common.xsd.Properties; +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/cc5aaf5f/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 0b41aea..4877046 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ExistingLoadBalancerCategory.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ExistingLoadBalancerCategory.java @@ -21,7 +21,7 @@ package org.apache.stratos.manager.lb.category; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.Persistence; -import org.apache.stratos.common.xsd.Properties; +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/cc5aaf5f/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 23998d7..31cb7b9 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/LBDataContext.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/LBDataContext.java @@ -21,8 +21,8 @@ package org.apache.stratos.manager.lb.category; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; -import org.apache.stratos.common.xsd.Properties; -import org.apache.stratos.common.xsd.Property; +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/cc5aaf5f/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 d374a06..8bc3dad 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ServiceLevelLoadBalancerCategory.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ServiceLevelLoadBalancerCategory.java @@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.ClusterContext; import org.apache.stratos.cloud.controller.stub.pojo.Persistence; -import org.apache.stratos.common.xsd.Properties; +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/cc5aaf5f/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 99ba4c6..9f424a5 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 @@ -22,11 +22,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.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; -import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.LoadbalancerConfig; -import org.apache.stratos.cloud.controller.stub.pojo.Persistence; -import org.apache.stratos.common.xsd.Properties; -import org.apache.stratos.common.xsd.Property; +import org.apache.stratos.cloud.controller.stub.pojo.*; +import org.apache.stratos.cloud.controller.stub.pojo.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/cc5aaf5f/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 80cdee4..a5d901d 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CartridgeSubscription.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CartridgeSubscription.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.Persistence; -import org.apache.stratos.common.xsd.Properties; +import org.apache.stratos.cloud.controller.stub.pojo.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/cc5aaf5f/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 0b4e601..c6a006d 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 @@ -20,6 +20,7 @@ package org.apache.stratos.manager.subscription; import org.apache.stratos.cloud.controller.stub.pojo.Persistence; +import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo; import org.apache.stratos.manager.dao.DataCartridge; import org.apache.stratos.manager.exception.ADCException; @@ -28,7 +29,6 @@ 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.common.xsd.Properties; import java.util.HashMap; import java.util.Map; http://git-wip-us.apache.org/repos/asf/stratos/blob/cc5aaf5f/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 5c5efa0..c69abc5 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 @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.Persistence; -import org.apache.stratos.common.xsd.Properties; +import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo; import org.apache.stratos.manager.exception.*; import org.apache.stratos.manager.lb.category.LoadBalancerCategory; @@ -32,7 +32,6 @@ import org.apache.stratos.manager.subscriber.Subscriber; import org.apache.stratos.manager.subscription.tenancy.SubscriptionTenancyBehaviour; import org.apache.stratos.manager.utils.ApplicationManagementUtil; -import java.util.Set; public class LBCartridgeSubscription extends CartridgeSubscription { http://git-wip-us.apache.org/repos/asf/stratos/blob/cc5aaf5f/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 7850275..63a13a1 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.common.xsd.Property; +import org.apache.stratos.cloud.controller.stub.pojo.Property; public class PersistenceContext { http://git-wip-us.apache.org/repos/asf/stratos/blob/cc5aaf5f/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 ff04ce3..7dd1bf5 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,7 @@ package org.apache.stratos.manager.subscription; import org.apache.stratos.cloud.controller.stub.pojo.Persistence; -import org.apache.stratos.common.xsd.Properties; -import org.apache.stratos.common.xsd.Property; +import org.apache.stratos.cloud.controller.stub.pojo.Properties; import java.util.Collections; import java.util.HashSet; http://git-wip-us.apache.org/repos/asf/stratos/blob/cc5aaf5f/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 6b5a44e..0fea5ab 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 @@ -19,7 +19,7 @@ package org.apache.stratos.manager.subscription.filter; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; -import org.apache.stratos.common.xsd.Properties; +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/cc5aaf5f/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 e0783be..626e5a3 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 @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.Persistence; -import org.apache.stratos.common.xsd.Properties; +import org.apache.stratos.common.Properties; import org.apache.stratos.manager.dao.Cluster; import org.apache.stratos.manager.deploy.service.Service; import org.apache.stratos.manager.exception.*; http://git-wip-us.apache.org/repos/asf/stratos/blob/cc5aaf5f/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 d004a32..0f1e21f 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 @@ -37,9 +37,9 @@ 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.common.xsd.Properties; -import org.apache.stratos.common.xsd.Property; 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.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo; import org.apache.stratos.manager.dao.DataCartridge; http://git-wip-us.apache.org/repos/asf/stratos/blob/cc5aaf5f/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 7995916..9ae6fcb 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 @@ -27,8 +27,7 @@ import org.apache.stratos.autoscaler.applications.pojo.xsd.SubscribableInfoConte import org.apache.stratos.autoscaler.stub.pojo.PropertiesE; import org.apache.stratos.autoscaler.stub.pojo.PropertyE; import org.apache.stratos.cloud.controller.stub.pojo.*; -import org.apache.stratos.common.xsd.Properties; -import org.apache.stratos.common.xsd.Property; +import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.manager.composite.application.beans.ApplicationDefinition; import org.apache.stratos.manager.composite.application.beans.GroupDefinition; import org.apache.stratos.manager.composite.application.beans.SubscribableDefinition; http://git-wip-us.apache.org/repos/asf/stratos/blob/cc5aaf5f/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java index c9de333..0a373cf 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java @@ -33,7 +33,7 @@ import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPolicyExceptio import org.apache.stratos.cloud.controller.stub.*; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeConfig; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; -import org.apache.stratos.common.xsd.Property; +import org.apache.stratos.cloud.controller.stub.pojo.Property; import org.apache.stratos.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.deploy.cartridge.CartridgeDeploymentManager; http://git-wip-us.apache.org/repos/asf/stratos/blob/cc5aaf5f/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml b/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml index 6f61083..1f3c44f 100644 --- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml +++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml @@ -48,7 +48,7 @@ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true"> <arg line="-uri src/main/resources/CloudControllerService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.cloud.controller.stub - -ns2p http://policy.deployment.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.deployment.policy,http://partition.deployment.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.deployment.partition,http://exception.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.exception,http://pojo.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.pojo,http://impl.controller.cloud.stratos.apache.org=org.apache.stratos.cloud.controller.stub.impl"/> + -ns2p http://policy.deployment.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.deployment.policy,http://partition.deployment.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.deployment.partition,http://exception.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.exception,http://pojo.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.pojo,http://impl.controller.cloud.stratos.apache.org=org.apache.stratos.cloud.controller.stub.impl,http://common.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.pojo"/> <classpath refid="maven.dependency.classpath"/> <classpath refid="maven.compile.classpath"/> <classpath refid="maven.runtime.classpath"/>
