http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/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 c97bcd3..0b4e601 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 @@ -28,7 +28,7 @@ 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.stub.pojo.Properties; +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/fcbb662d/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 c0bd321..5c5efa0 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.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo; import org.apache.stratos.manager.exception.*; import org.apache.stratos.manager.lb.category.LoadBalancerCategory; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/PersistenceContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/PersistenceContext.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/PersistenceContext.java index 63a13a1..7850275 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/PersistenceContext.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/PersistenceContext.java @@ -21,7 +21,7 @@ package org.apache.stratos.manager.subscription; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.xsd.Property; public class PersistenceContext { http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/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 56829e0..ff04ce3 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java @@ -19,8 +19,8 @@ package org.apache.stratos.manager.subscription; import org.apache.stratos.cloud.controller.stub.pojo.Persistence; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.xsd.Properties; +import org.apache.stratos.common.xsd.Property; import java.util.Collections; import java.util.HashSet; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/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 6057243..8a45c68 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 @@ -25,8 +25,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.LoadbalancerConfig; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.xsd.Properties; +import org.apache.stratos.common.xsd.Property; import org.apache.stratos.manager.exception.ADCException; import org.apache.stratos.manager.exception.AlreadySubscribedException; import org.apache.stratos.manager.exception.DuplicateCartridgeAliasException; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/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..6b5a44e 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.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.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/fcbb662d/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 664a2b3..e0783be 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.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.xsd.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/fcbb662d/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 196e897..0f897c2 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 @@ -25,9 +25,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy; 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.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; -import org.apache.stratos.manager.composite.application.utils.ApplicationUtils; import org.apache.stratos.manager.dao.Cluster; 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/fcbb662d/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 7282253..d004a32 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,8 +37,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.Persistence; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.xsd.Properties; +import org.apache.stratos.common.xsd.Property; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/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 212a5d0..4be32e5 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 @@ -20,21 +20,15 @@ package org.apache.stratos.rest.endpoint.bean.util.converter; import org.apache.commons.lang.StringUtils; -import org.apache.stratos.autoscaler.stub.kubernetes.PropertiesE; -import org.apache.stratos.autoscaler.stub.kubernetes.PropertyE; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.pojo.application.xsd.ApplicationContext; -import org.apache.stratos.cloud.controller.pojo.application.xsd.ComponentContext; -import org.apache.stratos.cloud.controller.pojo.application.xsd.DependencyContext; -import org.apache.stratos.cloud.controller.pojo.application.xsd.GroupContext; -import org.apache.stratos.cloud.controller.pojo.application.xsd.SubscribableContext; -import org.apache.stratos.cloud.controller.pojo.application.xsd.SubscribableInfoContext; -import org.apache.stratos.autoscaler.applications.pojo.stub.DependencyContext; -import org.apache.stratos.autoscaler.applications.pojo.stub.GroupContext; -import org.apache.stratos.autoscaler.applications.pojo.stub.SubscribableContext; -import org.apache.stratos.autoscaler.applications.pojo.stub.SubscribableInfoContext; +import org.apache.stratos.autoscaler.applications.pojo.xsd.ApplicationContext; +import org.apache.stratos.autoscaler.applications.pojo.xsd.DependencyContext; +import org.apache.stratos.autoscaler.applications.pojo.xsd.GroupContext; +import org.apache.stratos.autoscaler.applications.pojo.xsd.SubscribableInfoContext; 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.common.xsd.PropertiesE; +import org.apache.stratos.common.xsd.PropertyE; 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; @@ -44,8 +38,8 @@ import org.apache.stratos.manager.grouping.definitions.DependencyDefinitions; import org.apache.stratos.manager.grouping.definitions.ServiceGroupDefinition; import org.apache.stratos.manager.subscription.SubscriptionDomain; import org.apache.stratos.messaging.domain.applications.Application; -import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.messaging.domain.applications.Group; +import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.rest.endpoint.bean.ApplicationBean; import org.apache.stratos.rest.endpoint.bean.GroupBean; import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.Partition; @@ -59,12 +53,9 @@ import org.apache.stratos.rest.endpoint.bean.kubernetes.KubernetesMaster; import org.apache.stratos.rest.endpoint.bean.kubernetes.PortRange; import org.apache.stratos.rest.endpoint.bean.subscription.domain.SubscriptionDomainBean; import org.apache.stratos.rest.endpoint.bean.topology.Member; +import sun.reflect.generics.reflectiveObjects.NotImplementedException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Enumeration; -import java.util.List; +import java.util.*; public class PojoConverter { @@ -251,26 +242,28 @@ public class PojoConverter { } - public static org.apache.stratos.autoscaler.stub.kubernetes.PropertiesE getASProperties(List<PropertyBean> propertyBeans) { - if (propertyBeans == null || propertyBeans.isEmpty()) { - return null; - } - - //convert to an array - PropertyBean[] propertyBeansArray = new PropertyBean[propertyBeans.size()]; - propertyBeans.toArray(propertyBeansArray); - PropertyE[] propertyArray = new PropertyE[propertyBeansArray.length]; - - for (int j = 0; j < propertyBeansArray.length; j++) { - PropertyE property = new PropertyE(); - property.setName(propertyBeansArray[j].name); - property.setValue(propertyBeansArray[j].value); - propertyArray[j] = property; - } - - org.apache.stratos.autoscaler.stub.kubernetes.PropertiesE properties = new PropertiesE(); - properties.setProperties(propertyArray); - return properties; + public static PropertiesE getASProperties(List<PropertyBean> propertyBeans) { + //TODO: To be fixed + throw new NotImplementedException(); +// if (propertyBeans == null || propertyBeans.isEmpty()) { +// return null; +// } +// +// //convert to an array +// PropertyBean[] propertyBeansArray = new PropertyBean[propertyBeans.size()]; +// propertyBeans.toArray(propertyBeansArray); +// PropertyE[] propertyArray = new PropertyE[propertyBeansArray.length]; +// +// for (int j = 0; j < propertyBeansArray.length; j++) { +// PropertyE property = new PropertyE(); +// property.setName(propertyBeansArray[j].name); +// property.setValue(propertyBeansArray[j].value); +// propertyArray[j] = property; +// } +// +// PropertiesE properties = new PropertiesE(); +// properties.setProperties(propertyArray); +// return properties; } private static NetworkInterfaces getNetworkInterfaces(List<NetworkInterfaceBean> networkInterfaceBeans) { @@ -899,13 +892,15 @@ public class PojoConverter { public static ApplicationContext convertApplicationBeanToApplicationContext (ApplicationDefinition compositeAppDefinition) { - org.apache.stratos.autoscaler.applications.pojo.stub.ApplicationContext applicationContext = new org.apache.stratos.autoscaler.applications.pojo.stub.ApplicationContext(); + org.apache.stratos.autoscaler.applications.pojo.xsd.ApplicationContext applicationContext = + new org.apache.stratos.autoscaler.applications.pojo.xsd.ApplicationContext(); applicationContext.setApplicationId(compositeAppDefinition.getApplicationId()); applicationContext.setAlias(compositeAppDefinition.getAlias()); // convert and set components if (compositeAppDefinition.getComponents() != null) { - org.apache.stratos.autoscaler.applications.pojo.stub.ComponentContext componentContext = new org.apache.stratos.autoscaler.applications.pojo.stub.ComponentContext(); + org.apache.stratos.autoscaler.applications.pojo.xsd.ComponentContext componentContext = + new org.apache.stratos.autoscaler.applications.pojo.xsd.ComponentContext(); // top level subscribables if (compositeAppDefinition.getComponents().getSubscribables() != null) { componentContext.setSubscribableContexts(getSubscribableContextArrayFromSubscribableDefinitions( @@ -964,7 +959,8 @@ public class PojoConverter { return dependencyContext; } - private static GroupContext[] getgroupContextArrayFromGroupDefinitions (List<GroupDefinition> groupDefinitions) { + private static org.apache.stratos.autoscaler.applications.pojo.xsd.GroupContext[] + getgroupContextArrayFromGroupDefinitions (List<GroupDefinition> groupDefinitions) { GroupContext[] groupContexts = new GroupContext[groupDefinitions.size()]; int i = 0; @@ -976,7 +972,8 @@ public class PojoConverter { groupContext.setAutoscalingPolicy(groupDefinition.getAutoscalingPolicy()); // nested Subscribables if (groupDefinition.getSubscribables() != null) { - groupContext.setSubscribableContexts(getSubscribableContextArrayFromSubscribableDefinitions(groupDefinition.getSubscribables())); + groupContext.setSubscribableContexts( + getSubscribableContextArrayFromSubscribableDefinitions(groupDefinition.getSubscribables())); } // nested Groups if (groupDefinition.getSubGroups() != null) { @@ -988,12 +985,15 @@ public class PojoConverter { return groupContexts; } - private static org.apache.stratos.autoscaler.applications.pojo.stub.SubscribableContext [] getSubscribableContextArrayFromSubscribableDefinitions(List<SubscribableDefinition> subscribableDefinitions) { + private static org.apache.stratos.autoscaler.applications.pojo.xsd.SubscribableContext [] + getSubscribableContextArrayFromSubscribableDefinitions(List<SubscribableDefinition> subscribableDefinitions) { - SubscribableContext[] subscribableContexts = new SubscribableContext[subscribableDefinitions.size()]; + org.apache.stratos.autoscaler.applications.pojo.xsd.SubscribableContext[] subscribableContexts = + new org.apache.stratos.autoscaler.applications.pojo.xsd.SubscribableContext[subscribableDefinitions.size()]; int i = 0; for (SubscribableDefinition subscribableDefinition : subscribableDefinitions) { - SubscribableContext subscribableContext = new SubscribableContext(); + org.apache.stratos.autoscaler.applications.pojo.xsd.SubscribableContext subscribableContext = + new org.apache.stratos.autoscaler.applications.pojo.xsd.SubscribableContext(); subscribableContext.setType(subscribableDefinition.getType()); subscribableContext.setAlias(subscribableDefinition.getAlias()); subscribableContexts[i++] = subscribableContext; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/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 38880d7..c9de333 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 @@ -23,19 +23,17 @@ import org.apache.axis2.context.ConfigurationContext; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.stratos.autoscaler.applications.pojo.xsd.ApplicationContext; import org.apache.stratos.autoscaler.stub.*; import org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy; -import org.apache.stratos.cloud.controller.pojo.application.xsd.ApplicationContext; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeTypeExceptionException; -import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy; import org.apache.stratos.autoscaler.stub.AutoScalerServiceApplicationDefinitionExceptionException; import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPartitionExceptionException; import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPolicyExceptionException; 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.cloud.controller.stub.pojo.Property; -import org.apache.stratos.cloud.controller.stub.pojo.application.ApplicationContext; +import org.apache.stratos.common.xsd.Property; import org.apache.stratos.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.deploy.cartridge.CartridgeDeploymentManager; @@ -81,6 +79,7 @@ import org.apache.stratos.rest.endpoint.bean.repositoryNotificationInfoBean.Payl import org.apache.stratos.rest.endpoint.bean.subscription.domain.SubscriptionDomainBean; import org.apache.stratos.rest.endpoint.bean.util.converter.PojoConverter; import org.apache.stratos.rest.endpoint.exception.RestAPIException; +import sun.reflect.generics.reflectiveObjects.NotImplementedException; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; @@ -138,21 +137,23 @@ public class ServiceUtils { throw new RestAPIException(e1); } - org.apache.stratos.autoscaler.applications.pojo.stub.ApplicationContext applicationContext = + ApplicationContext applicationContext = PojoConverter.convertApplicationBeanToApplicationContext(appDefinition); applicationContext.setTenantId(ApplicationManagementUtil.getTenantId(ctxt)); applicationContext.setTenantDomain(tenantDomain); applicationContext.setTeantAdminUsername(userName); - Properties properties = new Properties(); if(appDefinition.getProperty() != null) { - for (org.apache.stratos.manager.composite.application.beans.PropertyBean propertyBean : appDefinition.getProperty()) { - Property property = new Property(); - property.setName(propertyBean.getName()); - property.setValue(propertyBean.getValue()); - properties.addProperties(property); - } - applicationContext.setProperties(properties); + //TODO: To be fixed + throw new NotImplementedException(); +// PropertiesE properties = new PropertiesE(); +// for (org.apache.stratos.manager.composite.application.beans.PropertyBean propertyBean : appDefinition.getProperty()) { +// PropertyE property = new PropertyE(); +// property.setName(propertyBean.getName()); +// property.setValue(propertyBean.getValue()); +// properties.addProperties(property); +// } +// applicationContext.setProperties(properties); } try { @@ -161,10 +162,6 @@ public class ServiceUtils { throw new RestAPIException(e); } catch (RemoteException e) { throw new RestAPIException(e); - } catch (CloudControllerServiceInvalidIaasProviderExceptionException e) { - throw new RestAPIException(e); - } catch (CloudControllerServiceApplicationDefinitionExceptionException e) { - throw new RestAPIException(e); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/fcbb662d/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl index 732fe38..bce9910 100644 --- a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl +++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl @@ -1,26 +1,28 @@ -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ns="http://api.autoscaler.stratos.apache.org"; xmlns:ax28="http://partition.autoscaler.stratos.apache.org/xsd"; xmlns:ax25="http://pojo.stub.controller.cloud.stratos.apache.org/xsd"; xmlns:ax23="http://policy.deployment.autoscaler.stratos.apache.org/xsd"; xmlns:ax24="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ax216="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax214="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax220="http://kubernetes.common.stratos.apache.org/xsd"; xmlns:ax212="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax222="http://model.policy.autoscaler.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:mime="http://s chemas.xmlsoap.org/wsdl/mime/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://api.autoscaler.stratos.apache.org";> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ax27="http://pojo.stub.controller.cloud.stratos.apache.org/xsd"; xmlns:ns="http://api.autoscaler.stratos.apache.org"; xmlns:ax25="http://policy.deployment.autoscaler.stratos.apache.org/xsd"; xmlns:ax26="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd"; xmlns:ax23="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax217="http://common.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ax216="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax214="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax222="http://kubernetes.common.stratos.apache.org/xsd"; xmlns:ax210="http://partition.autoscaler.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax225="http://model.policy.autoscaler.stratos.apache.org/xsd"; xmlns:soap="http://s chemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://api.autoscaler.stratos.apache.org";> <wsdl:documentation>AutoScalerService</wsdl:documentation> <wsdl:types> - <xs:schema xmlns:ax27="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd"; xmlns:ax210="http://partition.autoscaler.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.deployment.autoscaler.stratos.apache.org/xsd";> + <xs:schema xmlns:ax29="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd"; xmlns:ax212="http://partition.autoscaler.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.deployment.autoscaler.stratos.apache.org/xsd";> <xs:import namespace="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd";></xs:import> <xs:import namespace="http://partition.autoscaler.stratos.apache.org/xsd";></xs:import> <xs:complexType name="DeploymentPolicy"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="allPartitions" nillable="true" type="ax27:Partition"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="allPartitions" nillable="true" type="ax29:Partition"></xs:element> <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="isPublic" type="xs:boolean"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionGroups" nillable="true" type="ax28:PartitionGroup"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionGroups" nillable="true" type="ax212:PartitionGroup"></xs:element> <xs:element minOccurs="0" name="tenantId" type="xs:int"></xs:element> </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd";> + <xs:schema xmlns:ax218="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd";> + <xs:import namespace="http://common.stratos.apache.org/xsd";></xs:import> <xs:complexType name="ApplicationContext"> <xs:sequence> <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="components" nillable="true" type="ax216:ComponentContext"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax217:Properties"></xs:element> <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax216:SubscribableInfoContext"></xs:element> <xs:element minOccurs="0" name="teantAdminUsername" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="tenantDomain" nillable="true" type="xs:string"></xs:element> @@ -73,7 +75,7 @@ <xs:complexType name="ServiceGroup"> <xs:sequence> <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax212:Dependencies"></xs:element> + <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax23:Dependencies"></xs:element> <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> <xs:element maxOccurs="unbounded" minOccurs="0" name="subGroups" nillable="true" type="xs:string"></xs:element> </xs:sequence> @@ -92,15 +94,15 @@ <xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="isPublic" type="xs:boolean"></xs:element> - <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax222:LoadThresholds"></xs:element> + <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax225:LoadThresholds"></xs:element> <xs:element minOccurs="0" name="tenantId" type="xs:int"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="LoadThresholds"> <xs:sequence> - <xs:element minOccurs="0" name="loadAverage" nillable="true" type="ax222:LoadAverageThresholds"></xs:element> - <xs:element minOccurs="0" name="memoryConsumption" nillable="true" type="ax222:MemoryConsumptionThresholds"></xs:element> - <xs:element minOccurs="0" name="requestsInFlight" nillable="true" type="ax222:RequestsInFlightThresholds"></xs:element> + <xs:element minOccurs="0" name="loadAverage" nillable="true" type="ax225:LoadAverageThresholds"></xs:element> + <xs:element minOccurs="0" name="memoryConsumption" nillable="true" type="ax225:MemoryConsumptionThresholds"></xs:element> + <xs:element minOccurs="0" name="requestsInFlight" nillable="true" type="ax225:RequestsInFlightThresholds"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="LoadAverageThresholds"> @@ -122,17 +124,17 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax29="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.autoscaler.stratos.apache.org/xsd";> + <xs:schema xmlns:ax211="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.autoscaler.stratos.apache.org/xsd";> <xs:import namespace="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd";></xs:import> <xs:complexType name="PartitionGroup"> <xs:sequence> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax29:Partition"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax26:Partition"></xs:element> </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax26="http://pojo.stub.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd";> + <xs:schema xmlns:ax28="http://pojo.stub.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd";> <xs:import namespace="http://pojo.stub.controller.cloud.stratos.apache.org/xsd";></xs:import> <xs:complexType name="Partition"> <xs:sequence> @@ -146,36 +148,26 @@ <xs:element minOccurs="0" name="partitionMaxSpecified" type="xs:boolean"></xs:element> <xs:element minOccurs="0" name="partitionMin" type="xs:int"></xs:element> <xs:element minOccurs="0" name="partitionMinSpecified" type="xs:boolean"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"></xs:element> <xs:element minOccurs="0" name="propertiesSpecified" type="xs:boolean"></xs:element> <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="providerSpecified" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://kubernetes.common.stratos.apache.org/xsd";> + <xs:schema xmlns:ax223="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://kubernetes.common.stratos.apache.org/xsd";> + <xs:import namespace="http://common.stratos.apache.org/xsd";></xs:import> <xs:complexType name="KubernetesHost"> <xs:sequence> <xs:element minOccurs="0" name="hostId" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="hostIpAddress" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="hostname" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax220:Properties"></xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="Properties"> - <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax220:Property"></xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="Property"> - <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax217:Properties"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="KubernetesMaster"> <xs:complexContent> - <xs:extension base="ax220:KubernetesHost"> + <xs:extension base="ax222:KubernetesHost"> <xs:sequence> <xs:element minOccurs="0" name="endpoint" nillable="true" type="xs:string"></xs:element> </xs:sequence> @@ -186,10 +178,10 @@ <xs:sequence> <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="groupId" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="kubernetesHosts" nillable="true" type="ax220:KubernetesHost"></xs:element> - <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax220:KubernetesMaster"></xs:element> - <xs:element minOccurs="0" name="portRange" nillable="true" type="ax220:PortRange"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax220:Properties"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="kubernetesHosts" nillable="true" type="ax222:KubernetesHost"></xs:element> + <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax222:KubernetesMaster"></xs:element> + <xs:element minOccurs="0" name="portRange" nillable="true" type="ax222:PortRange"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax217:Properties"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="PortRange"> @@ -199,9 +191,22 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax215="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax221="http://kubernetes.common.stratos.apache.org/xsd"; xmlns:ax213="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax223="http://model.policy.autoscaler.stratos.apache.org/xsd"; xmlns:ax211="http://policy.deployment.autoscaler.stratos.apache.org/xsd"; xmlns:ax224="http://pojo.stub.controller.cloud.stratos.apache.org/xsd"; xmlns:ax217="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax219="http://partition.autoscaler.stratos.apache.org/xsd"; xmlns:ax218="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://api.autoscaler.stratos.apache.org";> - <xs:import namespace="http://policy.deployment.autoscaler.stratos.apache.org/xsd";></xs:import> + <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://common.stratos.apache.org/xsd";> + <xs:complexType name="Properties"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax217:Property"></xs:element> + </xs:sequence> + </xs:complexType> + <xs:complexType name="Property"> + <xs:sequence> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"></xs:element> + </xs:sequence> + </xs:complexType> + </xs:schema> + <xs:schema xmlns:ax215="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax220="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd"; xmlns:ax221="http://partition.autoscaler.stratos.apache.org/xsd"; xmlns:ax213="http://policy.deployment.autoscaler.stratos.apache.org/xsd"; xmlns:ax224="http://kubernetes.common.stratos.apache.org/xsd"; xmlns:ax226="http://model.policy.autoscaler.stratos.apache.org/xsd"; xmlns:ax24="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax219="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax227="http://pojo.stub.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://api.autoscaler.stratos.apache.org";> <xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd";></xs:import> + <xs:import namespace="http://policy.deployment.autoscaler.stratos.apache.org/xsd";></xs:import> <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd";></xs:import> <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd";></xs:import> <xs:import namespace="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd";></xs:import> @@ -209,31 +214,31 @@ <xs:import namespace="http://kubernetes.common.stratos.apache.org/xsd";></xs:import> <xs:import namespace="http://model.policy.autoscaler.stratos.apache.org/xsd";></xs:import> <xs:import namespace="http://pojo.stub.controller.cloud.stratos.apache.org/xsd";></xs:import> - <xs:element name="getDeploymentPolicy"> + <xs:element name="getServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPolicyResponse"> + <xs:element name="getServiceGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax23:DeploymentPolicy"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax23:ServiceGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroup"> + <xs:element name="getDeploymentPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupResponse"> + <xs:element name="getDeploymentPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax212:ServiceGroup"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax25:DeploymentPolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -247,7 +252,7 @@ <xs:element name="deployApplicationDefinition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax217:ApplicationContext"></xs:element> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax216:ApplicationContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -270,7 +275,7 @@ <xs:element name="getPartitionResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax24:Partition"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax26:Partition"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -284,7 +289,7 @@ <xs:element name="getPartitionGroupsResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax28:PartitionGroup"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax221:PartitionGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -305,7 +310,7 @@ <xs:element name="updateKubernetesMaster"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax220:KubernetesMaster"></xs:element> + <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax222:KubernetesMaster"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -333,7 +338,7 @@ <xs:element name="updateKubernetesHost"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax220:KubernetesHost"></xs:element> + <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax222:KubernetesHost"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -361,7 +366,7 @@ <xs:element name="getKubernetesGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax220:KubernetesGroup"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax222:KubernetesGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -375,7 +380,7 @@ <xs:element name="updateDeploymentPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax23:DeploymentPolicy"></xs:element> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax25:DeploymentPolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -397,7 +402,7 @@ <xs:element name="getPartitionsOfGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:Partition"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:Partition"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -411,7 +416,7 @@ <xs:element name="getPartitionsOfDeploymentPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:Partition"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:Partition"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -423,7 +428,7 @@ <xs:element name="getAllAvailablePartitionsResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:Partition"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:Partition"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -435,7 +440,7 @@ <xs:element name="getAllDeploymentPoliciesResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax23:DeploymentPolicy"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax25:DeploymentPolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -447,7 +452,7 @@ <xs:element name="getAllAutoScalingPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax222:AutoscalePolicy"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax225:AutoscalePolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -461,7 +466,7 @@ <xs:element name="getValidDeploymentPoliciesforCartridgeResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax23:DeploymentPolicy"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax25:DeploymentPolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -475,7 +480,7 @@ <xs:element name="addPartition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="partition" nillable="true" type="ax24:Partition"></xs:element> + <xs:element minOccurs="0" name="partition" nillable="true" type="ax26:Partition"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -489,7 +494,7 @@ <xs:element name="addDeploymentPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax23:DeploymentPolicy"></xs:element> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax25:DeploymentPolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -503,7 +508,7 @@ <xs:element name="addAutoScalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax222:AutoscalePolicy"></xs:element> + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax225:AutoscalePolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -517,7 +522,7 @@ <xs:element name="updateAutoScalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax222:AutoscalePolicy"></xs:element> + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax225:AutoscalePolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -538,7 +543,7 @@ <xs:element name="getAutoscalingPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax222:AutoscalePolicy"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax225:AutoscalePolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -550,7 +555,7 @@ <xs:element name="getAllKubernetesGroupsResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax220:KubernetesGroup"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax222:KubernetesGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -564,7 +569,7 @@ <xs:element name="getMasterForKubernetesGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax220:KubernetesMaster"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax222:KubernetesMaster"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -578,7 +583,7 @@ <xs:element name="getHostsForKubernetesGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax220:KubernetesHost"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax222:KubernetesHost"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -592,7 +597,7 @@ <xs:element name="addKubernetesGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesGroup" nillable="true" type="ax220:KubernetesGroup"></xs:element> + <xs:element minOccurs="0" name="kubernetesGroup" nillable="true" type="ax222:KubernetesGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -607,7 +612,7 @@ <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="groupId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax220:KubernetesHost"></xs:element> + <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax222:KubernetesHost"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -745,7 +750,7 @@ <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -759,7 +764,7 @@ <xs:element name="deployServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax212:ServiceGroup"></xs:element> + <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax23:ServiceGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -795,7 +800,7 @@ <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.stub.controller.cloud.stratos.apache.org/xsd";> <xs:complexType name="Properties"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax25:Property"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax27:Property"></xs:element> <xs:element minOccurs="0" name="propertiesSpecified" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> @@ -2419,22 +2424,22 @@ </wsdl:binding> <wsdl:service name="AutoScalerService"> <wsdl:port name="AutoScalerServiceHttpSoap11Endpoint" binding="ns:AutoScalerServiceSoap11Binding"> - <soap:address location="http://192.168.43.91:9763/services/AutoScalerService.AutoScalerServiceHttpSoap11Endpoint/";></soap:address> + <soap:address location="http://192.168.1.2:9763/services/AutoScalerService.AutoScalerServiceHttpSoap11Endpoint/";></soap:address> </wsdl:port> <wsdl:port name="AutoScalerServiceHttpsSoap11Endpoint" binding="ns:AutoScalerServiceSoap11Binding"> - <soap:address location="https://192.168.43.91:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap11Endpoint/";></soap:address> + <soap:address location="https://192.168.1.2:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap11Endpoint/";></soap:address> </wsdl:port> <wsdl:port name="AutoScalerServiceHttpsSoap12Endpoint" binding="ns:AutoScalerServiceSoap12Binding"> - <soap12:address location="https://192.168.43.91:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap12Endpoint/";></soap12:address> + <soap12:address location="https://192.168.1.2:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap12Endpoint/";></soap12:address> </wsdl:port> <wsdl:port name="AutoScalerServiceHttpSoap12Endpoint" binding="ns:AutoScalerServiceSoap12Binding"> - <soap12:address location="http://192.168.43.91:9763/services/AutoScalerService.AutoScalerServiceHttpSoap12Endpoint/";></soap12:address> + <soap12:address location="http://192.168.1.2:9763/services/AutoScalerService.AutoScalerServiceHttpSoap12Endpoint/";></soap12:address> </wsdl:port> <wsdl:port name="AutoScalerServiceHttpEndpoint" binding="ns:AutoScalerServiceHttpBinding"> - <http:address location="http://192.168.43.91:9763/services/AutoScalerService.AutoScalerServiceHttpEndpoint/";></http:address> + <http:address location="http://192.168.1.2:9763/services/AutoScalerService.AutoScalerServiceHttpEndpoint/";></http:address> </wsdl:port> <wsdl:port name="AutoScalerServiceHttpsEndpoint" binding="ns:AutoScalerServiceHttpBinding"> - <http:address location="https://192.168.43.91:9443/services/AutoScalerService.AutoScalerServiceHttpsEndpoint/";></http:address> + <http:address location="https://192.168.1.2:9443/services/AutoScalerService.AutoScalerServiceHttpsEndpoint/";></http:address> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file
