udpating with correct terminology
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bf2c6720 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bf2c6720 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bf2c6720 Branch: refs/heads/master Commit: bf2c672071e69e653a3a2f39af24e8db603b9e9f Parents: 412d5c8 Author: reka <[email protected]> Authored: Wed Dec 3 15:16:49 2014 +0530 Committer: reka <[email protected]> Committed: Wed Dec 3 17:53:35 2014 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/rest/endpoint/api/StratosApiV41.java | 9 ++++----- .../stratos/rest/endpoint/api/StratosApiV41Utils.java | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/bf2c6720/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index 4be676d..a8eab46 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -42,7 +42,6 @@ import org.apache.stratos.rest.endpoint.bean.ApplicationBean; import org.apache.stratos.rest.endpoint.bean.CartridgeInfoBean; import org.apache.stratos.rest.endpoint.bean.StratosApiResponse; import org.apache.stratos.rest.endpoint.bean.SubscriptionDomainRequest; -import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.Partition; import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.AutoscalePolicy; import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.deployment.DeploymentPolicy; import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean; @@ -330,8 +329,8 @@ public class StratosApiV41 extends AbstractApi { @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/add/cartridgeDefinition") - public Response unDeployDeploymentPolicy(@PathParam("applicationId") String applicationId) throws RestAPIException { - StratosApiV41Utils.undeployDeploymentPolicy(applicationId); + public Response unDeployApplication(@PathParam("applicationId") String applicationId) throws RestAPIException { + StratosApiV41Utils.undeployApplication(applicationId); return Response.noContent().build(); } @@ -510,9 +509,9 @@ public class StratosApiV41 extends AbstractApi { @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") @SuperTenantService(true) - public Response unDeployApplicationDefinition(@PathParam("applicationId") String applicationId) + public Response removeApplicationDefinition(@PathParam("applicationId") String applicationId) throws RestAPIException { - StratosApiV41Utils.unDeployApplication(applicationId, getConfigContext(), getUsername(), + StratosApiV41Utils.removeApplication(applicationId, getConfigContext(), getUsername(), getTenantDomain()); return Response.noContent().build(); } http://git-wip-us.apache.org/repos/asf/stratos/blob/bf2c6720/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index 02d23bf..08ef896 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -201,8 +201,8 @@ public class StratosApiV41Utils { } } - public static void unDeployApplication(String appId, ConfigurationContext ctxt, - String userName, String tenantDomain) throws RestAPIException { + public static void removeApplication(String appId, ConfigurationContext ctxt, + String userName, String tenantDomain) throws RestAPIException { try { int tenantId = ApplicationManagementUtil.getTenantId(ctxt); @@ -237,7 +237,7 @@ public class StratosApiV41Utils { return commonPolicies.toArray(new DeploymentPolicy[0]); } - public static void undeployDeploymentPolicy(String applicationId) throws RestAPIException { + public static void undeployApplication(String applicationId) throws RestAPIException { AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { try {
