changes to SM, according to CC changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8cb502cd Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8cb502cd Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8cb502cd Branch: refs/heads/master Commit: 8cb502cd57dd815c3a6021805d49c7b75a9c70f8 Parents: f942c24 Author: Nirmal Fernando <[email protected]> Authored: Thu Nov 28 21:29:24 2013 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Thu Nov 28 21:29:24 2013 +0530 ---------------------------------------------------------------------- .../adc/mgt/client/CloudControllerServiceClient.java | 14 +++++++------- .../adc/mgt/manager/CartridgeSubscriptionManager.java | 4 ++-- .../stratos/adc/mgt/payload/NonCarbonPayload.java | 6 +++--- .../apache/stratos/adc/mgt/payload/PayloadArg.java | 2 +- .../persistence/DatabaseBasedPersistenceManager.java | 2 +- .../adc/mgt/service/ApplicationManagementService.java | 2 +- .../stratos/adc/mgt/service/RepositoryInfoBean.java | 3 +-- .../adc/mgt/subscription/CartridgeSubscription.java | 2 +- .../mgt/subscription/DataCartridgeSubscription.java | 2 +- .../MultiTenantCartridgeSubscription.java | 2 +- .../SingleTenantCartridgeSubscription.java | 2 +- .../factory/CartridgeSubscriptionFactory.java | 2 +- .../adc/mgt/utils/ApplicationManagementUtil.java | 14 ++++++++------ .../adc/mgt/test/CartridgeSubscriptionTest.java | 3 ++- .../org/apache/stratos/adc/mgt/test/PayloadTest.java | 5 +++-- 15 files changed, 34 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cb502cd/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java index 7141467..703f467 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java @@ -26,12 +26,12 @@ import org.apache.commons.logging.LogFactory; import org.apache.stratos.adc.mgt.exception.UnregisteredCartridgeException; import org.apache.stratos.adc.mgt.internal.DataHolder; import org.apache.stratos.adc.mgt.utils.CartridgeConstants; -import org.apache.stratos.cloud.controller.pojo.xsd.Registrant; +import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.pojo.Registrant; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceIllegalArgumentExceptionException; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceStub; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; -import org.apache.stratos.cloud.controller.util.xsd.CartridgeInfo; -import org.apache.stratos.messaging.util.xsd.Property; +import org.apache.stratos.cloud.controller.pojo.Property; import java.rmi.RemoteException; import java.util.Iterator; @@ -83,7 +83,7 @@ public class CloudControllerServiceClient { registrant.setCartridgeType(cartridgeType); registrant.setTenantRange(tenantRange); registrant.setHostName(hostName); - org.apache.stratos.messaging.util.xsd.Properties props = extractProperties(properties); + org.apache.stratos.cloud.controller.pojo.Properties props = extractProperties(properties); registrant.setProperties(props); registrant.setPayload(payload); registrant.setAutoScalerPolicyName(autoscalorPolicyName); @@ -91,10 +91,10 @@ public class CloudControllerServiceClient { } - private org.apache.stratos.messaging.util.xsd.Properties + private org.apache.stratos.cloud.controller.pojo.Properties extractProperties(Properties properties) { - org.apache.stratos.messaging.util.xsd.Properties props = - new org.apache.stratos.messaging.util.xsd.Properties(); + org.apache.stratos.cloud.controller.pojo.Properties props = + new org.apache.stratos.cloud.controller.pojo.Properties(); if (properties != null) { for (Iterator iterator = properties.keySet().iterator(); iterator.hasNext();) { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cb502cd/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java index d846764..d58defb 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java @@ -41,8 +41,8 @@ import org.apache.stratos.adc.mgt.utils.ApplicationManagementUtil; import org.apache.stratos.adc.mgt.utils.CartridgeConstants; import org.apache.stratos.adc.mgt.utils.PersistenceManager; import org.apache.stratos.adc.mgt.utils.PolicyHolder; -import org.apache.stratos.cloud.controller.util.xsd.CartridgeInfo; -import org.apache.stratos.messaging.util.xsd.Property; +import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.pojo.Property; import org.wso2.carbon.context.CarbonContext; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cb502cd/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/NonCarbonPayload.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/NonCarbonPayload.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/NonCarbonPayload.java index e0df759..5ee8c29 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/NonCarbonPayload.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/NonCarbonPayload.java @@ -21,7 +21,7 @@ package org.apache.stratos.adc.mgt.payload; import org.apache.stratos.adc.mgt.dto.Policy; import org.apache.stratos.adc.mgt.utils.CartridgeConstants; -import org.apache.stratos.cloud.controller.util.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; import java.text.DecimalFormat; @@ -69,8 +69,8 @@ public class NonCarbonPayload extends Payload { private String createPortMappingPayloadString(CartridgeInfo cartridgeInfo) { // port mappings StringBuilder portMapBuilder = new StringBuilder(); - org.apache.stratos.cloud.controller.util.xsd.PortMapping[] portMappings = cartridgeInfo.getPortMappings(); - for (org.apache.stratos.cloud.controller.util.xsd.PortMapping portMapping : portMappings) { + org.apache.stratos.cloud.controller.pojo.PortMapping[] portMappings = cartridgeInfo.getPortMappings(); + for (org.apache.stratos.cloud.controller.pojo.PortMapping portMapping : portMappings) { String port = portMapping.getPort(); portMapBuilder.append(port).append("|"); } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cb502cd/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadArg.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadArg.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadArg.java index b7aed36..5729ee7 100755 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadArg.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadArg.java @@ -20,7 +20,7 @@ package org.apache.stratos.adc.mgt.payload; import org.apache.stratos.adc.mgt.dto.Policy; -import org.apache.stratos.cloud.controller.util.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; public class PayloadArg { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cb502cd/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/persistence/DatabaseBasedPersistenceManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/persistence/DatabaseBasedPersistenceManager.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/persistence/DatabaseBasedPersistenceManager.java index eb8ebb0..3059df2 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/persistence/DatabaseBasedPersistenceManager.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/persistence/DatabaseBasedPersistenceManager.java @@ -37,7 +37,7 @@ import org.apache.stratos.adc.mgt.utils.CartridgeConstants; import org.apache.stratos.adc.mgt.utils.PolicyHolder; import org.apache.stratos.adc.mgt.utils.RepoPasswordMgtUtil; import org.apache.stratos.adc.mgt.utils.StratosDBUtils; -import org.apache.stratos.cloud.controller.util.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; import org.wso2.carbon.context.CarbonContext; import java.sql.*; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cb502cd/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/ApplicationManagementService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/ApplicationManagementService.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/ApplicationManagementService.java index 771ed4b..62a1adb 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/ApplicationManagementService.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/ApplicationManagementService.java @@ -35,7 +35,7 @@ import org.apache.stratos.adc.mgt.utils.CartridgeConstants; import org.apache.stratos.adc.mgt.utils.PersistenceManager; import org.apache.stratos.adc.mgt.utils.PolicyHolder; import org.apache.stratos.adc.topology.mgt.service.TopologyManagementService; -import org.apache.stratos.cloud.controller.util.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.core.AbstractAdmin; import org.wso2.carbon.registry.core.exceptions.RegistryException; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cb502cd/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/RepositoryInfoBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/RepositoryInfoBean.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/RepositoryInfoBean.java index 27203f5..53a6f6b 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/RepositoryInfoBean.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/RepositoryInfoBean.java @@ -24,10 +24,9 @@ package org.apache.stratos.adc.mgt.service; */ -import org.apache.stratos.cloud.controller.util.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; /** - * @author wso2 * */ public class RepositoryInfoBean { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cb502cd/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java index 618b3f7..e1a48ce 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java @@ -35,7 +35,7 @@ import org.apache.stratos.adc.mgt.service.RepositoryInfoBean; import org.apache.stratos.adc.mgt.subscriber.Subscriber; import org.apache.stratos.adc.mgt.utils.*; import org.apache.stratos.adc.topology.mgt.service.TopologyManagementService; -import org.apache.stratos.cloud.controller.util.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cb502cd/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription.java index 20df7ab..786450c 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription.java @@ -28,7 +28,7 @@ import org.apache.stratos.adc.mgt.repository.Repository; import org.apache.stratos.adc.mgt.subscriber.Subscriber; import org.apache.stratos.adc.mgt.utils.ApplicationManagementUtil; import org.apache.stratos.adc.mgt.utils.CartridgeConstants; -import org.apache.stratos.cloud.controller.util.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cb502cd/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/MultiTenantCartridgeSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/MultiTenantCartridgeSubscription.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/MultiTenantCartridgeSubscription.java index d9705ef..d14d18b 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/MultiTenantCartridgeSubscription.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/MultiTenantCartridgeSubscription.java @@ -33,7 +33,7 @@ import org.apache.stratos.adc.mgt.utils.CartridgeConstants; import org.apache.stratos.adc.mgt.utils.PersistenceManager; import org.apache.stratos.adc.topology.mgt.service.TopologyManagementService; import org.apache.stratos.adc.topology.mgt.serviceobjects.DomainContext; -import org.apache.stratos.cloud.controller.util.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cb502cd/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/SingleTenantCartridgeSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/SingleTenantCartridgeSubscription.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/SingleTenantCartridgeSubscription.java index 0f17804..830deea 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/SingleTenantCartridgeSubscription.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/SingleTenantCartridgeSubscription.java @@ -31,7 +31,7 @@ import org.apache.stratos.adc.mgt.repository.Repository; import org.apache.stratos.adc.mgt.subscriber.Subscriber; import org.apache.stratos.adc.mgt.utils.ApplicationManagementUtil; import org.apache.stratos.adc.mgt.utils.CartridgeConstants; -import org.apache.stratos.cloud.controller.util.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cb502cd/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/factory/CartridgeSubscriptionFactory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/factory/CartridgeSubscriptionFactory.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/factory/CartridgeSubscriptionFactory.java index 70be3ef..a3883d4 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/factory/CartridgeSubscriptionFactory.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/factory/CartridgeSubscriptionFactory.java @@ -25,7 +25,7 @@ import org.apache.stratos.adc.mgt.subscription.DataCartridgeSubscription; import org.apache.stratos.adc.mgt.subscription.MultiTenantCartridgeSubscription; import org.apache.stratos.adc.mgt.subscription.SingleTenantCartridgeSubscription; import org.apache.stratos.adc.mgt.utils.CartridgeConstants; -import org.apache.stratos.cloud.controller.util.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; public class CartridgeSubscriptionFactory { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cb502cd/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java index 15ab57c..55ba560 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java @@ -22,6 +22,7 @@ package org.apache.stratos.adc.mgt.utils; import com.google.gson.Gson; + import org.apache.axis2.clustering.ClusteringAgent; import org.apache.axis2.clustering.Member; import org.apache.axis2.clustering.management.GroupManagementAgent; @@ -44,10 +45,10 @@ import org.apache.stratos.adc.mgt.repository.Repository; import org.apache.stratos.adc.mgt.service.RepositoryInfoBean; import org.apache.stratos.adc.topology.mgt.service.TopologyManagementService; import org.apache.stratos.adc.topology.mgt.serviceobjects.DomainContext; +import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.pojo.Property; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceIllegalArgumentExceptionException; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; -import org.apache.stratos.cloud.controller.util.xsd.CartridgeInfo; -import org.apache.stratos.messaging.util.xsd.Property; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.LsRemoteCommand; import org.eclipse.jgit.api.errors.GitAPIException; @@ -62,6 +63,7 @@ import org.wso2.carbon.utils.multitenancy.MultitenantUtils; import javax.activation.DataHandler; import javax.activation.FileDataSource; + import java.io.*; import java.net.MalformedURLException; import java.net.URL; @@ -454,8 +456,8 @@ public class ApplicationManagementUtil { private static String createPortMappingPayloadString(CartridgeInfo cartridgeInfo) { // port mappings StringBuilder portMapBuilder = new StringBuilder(); - org.apache.stratos.cloud.controller.util.xsd.PortMapping[] portMappings = cartridgeInfo.getPortMappings(); - for (org.apache.stratos.cloud.controller.util.xsd.PortMapping portMapping : portMappings) { + org.apache.stratos.cloud.controller.pojo.PortMapping[] portMappings = cartridgeInfo.getPortMappings(); + for (org.apache.stratos.cloud.controller.pojo.PortMapping portMapping : portMappings) { String port = portMapping.getPort(); String protocol = portMapping.getProtocol(); String proxyPort = portMapping.getProxyPort(); @@ -581,7 +583,7 @@ public class ApplicationManagementUtil { List<PortMapping> portMappings = new ArrayList<PortMapping>(); if (cartridgeInfo.getPortMappings() != null) { - for (org.apache.stratos.cloud.controller.util.xsd.PortMapping portMapping : cartridgeInfo.getPortMappings()) { + for (org.apache.stratos.cloud.controller.pojo.PortMapping portMapping : cartridgeInfo.getPortMappings()) { PortMapping portMap = new PortMapping(); portMap.setPrimaryPort(portMapping.getPort()); portMap.setProxyPort(portMapping.getProxyPort()); @@ -1018,7 +1020,7 @@ public class ApplicationManagementUtil { List<String> accessURLs = new ArrayList<String>(); if (cartridgeInfo.getPortMappings() != null) { - for (org.apache.stratos.cloud.controller.util.xsd.PortMapping portMapping : cartridgeInfo + for (org.apache.stratos.cloud.controller.pojo.PortMapping portMapping : cartridgeInfo .getPortMappings()) { if (portMapping != null) { try { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cb502cd/components/org.apache.stratos.adc.mgt/src/test/java/org/apache/stratos/adc/mgt/test/CartridgeSubscriptionTest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/test/java/org/apache/stratos/adc/mgt/test/CartridgeSubscriptionTest.java b/components/org.apache.stratos.adc.mgt/src/test/java/org/apache/stratos/adc/mgt/test/CartridgeSubscriptionTest.java index e13ba10..9471635 100644 --- a/components/org.apache.stratos.adc.mgt/src/test/java/org/apache/stratos/adc/mgt/test/CartridgeSubscriptionTest.java +++ b/components/org.apache.stratos.adc.mgt/src/test/java/org/apache/stratos/adc/mgt/test/CartridgeSubscriptionTest.java @@ -20,10 +20,11 @@ package org.apache.stratos.adc.mgt.test; import junit.framework.TestCase; + import org.apache.stratos.adc.mgt.exception.ADCException; import org.apache.stratos.adc.mgt.subscription.CartridgeSubscription; import org.apache.stratos.adc.mgt.subscription.factory.CartridgeSubscriptionFactory; -import org.apache.stratos.cloud.controller.util.xsd.CartridgeInfo; +import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; public class CartridgeSubscriptionTest extends TestCase { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cb502cd/components/org.apache.stratos.adc.mgt/src/test/java/org/apache/stratos/adc/mgt/test/PayloadTest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/test/java/org/apache/stratos/adc/mgt/test/PayloadTest.java b/components/org.apache.stratos.adc.mgt/src/test/java/org/apache/stratos/adc/mgt/test/PayloadTest.java index 564f8d3..a8c81a7 100644 --- a/components/org.apache.stratos.adc.mgt/src/test/java/org/apache/stratos/adc/mgt/test/PayloadTest.java +++ b/components/org.apache.stratos.adc.mgt/src/test/java/org/apache/stratos/adc/mgt/test/PayloadTest.java @@ -20,14 +20,15 @@ package org.apache.stratos.adc.mgt.test; import junit.framework.TestCase; + import org.apache.stratos.adc.mgt.dto.Policy; import org.apache.stratos.adc.mgt.exception.ADCException; import org.apache.stratos.adc.mgt.payload.Payload; import org.apache.stratos.adc.mgt.payload.PayloadArg; import org.apache.stratos.adc.mgt.payload.PayloadFactory; import org.apache.stratos.adc.mgt.utils.CartridgeConstants; -import org.apache.stratos.cloud.controller.util.xsd.CartridgeInfo; -import org.apache.stratos.cloud.controller.util.xsd.PortMapping; +import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; +import org.apache.stratos.cloud.controller.pojo.PortMapping; import java.math.BigDecimal;
