Fixing autoscaler service stub bundle exports and stratos manager import statements
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a9025aab Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a9025aab Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a9025aab Branch: refs/heads/docker-grouping-merge Commit: a9025aab6a820dbf66653220da08b9f85fac9f04 Parents: 8159b5c Author: Imesh Gunaratne <[email protected]> Authored: Mon Nov 3 19:10:16 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Mon Nov 3 19:10:16 2014 +0530 ---------------------------------------------------------------------- .../interfaces/AutoScalerServiceInterface.java | 12 +- .../manager/client/AutoscalerServiceClient.java | 9 +- .../deployer/DefaultServiceGroupDeployer.java | 6 +- .../pom.xml | 3 + .../src/main/resources/AutoScalerService.wsdl | 1666 +++++++++--------- 5 files changed, 854 insertions(+), 842 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/a9025aab/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java index 74c9c8c..0b2bf43 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java @@ -29,6 +29,7 @@ import org.apache.stratos.autoscaler.exception.InvalidPartitionException; import org.apache.stratos.autoscaler.exception.InvalidPolicyException; import org.apache.stratos.autoscaler.exception.NonExistingLBException; import org.apache.stratos.autoscaler.partition.PartitionGroup; +import org.apache.stratos.autoscaler.pojo.ServiceGroup; import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; import org.apache.stratos.cloud.controller.stub.pojo.Properties; @@ -209,5 +210,14 @@ public interface AutoScalerServiceInterface { * @param applicationId Id of the Application to be undeployed * @throws ApplicationDefinitionException if an error is encountered */ - public void unDeployApplicationDefinition (String applicationId, int tenantId, String tenantDomain) throws ApplicationDefinitionException; + public void unDeployApplicationDefinition (String applicationId, int tenantId, String tenantDomain) + throws ApplicationDefinitionException; + + + /** + * Get service group by name + * @param name + * @return + */ + public ServiceGroup getServiceGroup(String name); } http://git-wip-us.apache.org/repos/asf/stratos/blob/a9025aab/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 27c1640..d2737c6 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 @@ -30,11 +30,8 @@ import org.apache.stratos.autoscaler.stub.kubernetes.KubernetesGroup; import org.apache.stratos.autoscaler.stub.kubernetes.KubernetesHost; import org.apache.stratos.autoscaler.stub.kubernetes.KubernetesMaster; import org.apache.stratos.autoscaler.stub.policy.model.AutoscalePolicy; -import org.apache.stratos.autoscaler.applications.pojo.stub.ApplicationContext; -import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy; -import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy; -import org.apache.stratos.autoscaler.stub.*; -import org.apache.stratos.autoscaler.stub.pojo.ServiceGroup; +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.cloud.controller.stub.pojo.Properties; import org.apache.stratos.manager.internal.DataHolder; @@ -304,4 +301,6 @@ public class AutoscalerServiceClient { public void updateClusterMonitor(String clusterId, Properties properties) throws RemoteException, AutoScalerServiceInvalidArgumentExceptionException { stub.updateClusterMonitor(clusterId, properties); } + + } http://git-wip-us.apache.org/repos/asf/stratos/blob/a9025aab/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java index 7244de4..fc6e742 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java @@ -22,11 +22,11 @@ package org.apache.stratos.manager.grouping.deployer; import org.apache.axis2.AxisFault; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.stub.pojo.Dependencies; -import org.apache.stratos.autoscaler.stub.pojo.ServiceGroup; +import org.apache.stratos.autoscaler.pojo.xsd.ServiceGroup; import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidServiceGroupExceptionException; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidServiceGroupExceptionException; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; +import org.apache.stratos.autoscaler.pojo.xsd.Dependencies; import org.apache.stratos.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.exception.ADCException; @@ -276,7 +276,7 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { String [] cartridges = serviceGroup.getCartridges(); String [] subGroups = serviceGroup.getSubGroups(); - Dependencies deps = serviceGroup.getDependencies(); + org.apache.stratos.autoscaler.pojo.xsd.Dependencies deps = serviceGroup.getDependencies(); if (deps != null) { DependencyDefinitions depsDef = new DependencyDefinitions(); http://git-wip-us.apache.org/repos/asf/stratos/blob/a9025aab/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml b/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml index f5966fa..3478791 100644 --- a/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml +++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml @@ -91,12 +91,15 @@ <Bundle-Name>${project.artifactId}</Bundle-Name> <Export-Package> org.apache.stratos.autoscaler.stub.*; version=${project.version}, + org.apache.stratos.autoscaler.stub.pojo.*; version=${project.version}, + org.apache.stratos.autoscaler.applications.pojo.xsd.*; version=${project.version}, org.apache.stratos.autoscaler.deployment.policy.*; version=${project.version}, org.apache.stratos.autoscaler.policy.model.*; version=${project.version}, org.apache.stratos.autoscaler.exception.*; version=${project.version}, org.apache.stratos.autoscaler.partition.*; version=${project.version}, org.apache.stratos.autoscaler.api.*; version=${project.version}, org.apache.stratos.autoscaler.kubernetes.*; version=${project.version}, + org.apache.stratos.autoscaler.pojo.xsd.*; version=${project.version}, </Export-Package> <Private-Package> </Private-Package>
