Add list-service-group command in CLI
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dc0edc91 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dc0edc91 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dc0edc91 Branch: refs/heads/docker-grouping-merge Commit: dc0edc9127170bede644cfbf1dd49fa2203e3e3d Parents: ba533ba Author: Manula Thantriwatte <[email protected]> Authored: Fri Nov 7 10:09:27 2014 +0000 Committer: Manula Thantriwatte <[email protected]> Committed: Fri Nov 7 10:09:27 2014 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/stratos/cli/RestCommandLineService.java | 4 +--- .../cli/beans/grouping/definitions/ServiceGroupDefinition.java | 1 + .../manager/grouping/definitions/ServiceGroupDefinition.java | 2 +- .../java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/dc0edc91/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java index 8bc5770..0699979 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java @@ -188,7 +188,7 @@ public class RestCommandLineService { DefaultHttpClient httpClient = new DefaultHttpClient(); try { if (validateLogin) { - HttpResponse response = restClient.doPost(httpClient, restClient.getBaseURL() + ENDPOINT_INIT, null); + HttpResponse response = restClient.doGet(httpClient, restClient.getBaseURL() + ENDPOINT_INIT); if (response != null) { int responseCode = response.getStatusLine().getStatusCode(); @@ -1826,12 +1826,10 @@ public class RestCommandLineService { public void listServiceGroup (String groupDefinitionName) { try { - ServiceGroupDefinition list = (ServiceGroupDefinition) restClient.listEntity(ENDPOINT_LIST_SERVICE_GROUP.replace("{groupDefinitionName}", groupDefinitionName), ServiceGroupDefinition.class, "serviceGroup"); if ((list == null) || (list.getName() == null)) { - System.out.println("null"); System.out.println("Service group not found: " + groupDefinitionName); return; } http://git-wip-us.apache.org/repos/asf/stratos/blob/dc0edc91/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/definitions/ServiceGroupDefinition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/definitions/ServiceGroupDefinition.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/definitions/ServiceGroupDefinition.java index d3af12f..18b3099 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/definitions/ServiceGroupDefinition.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/grouping/definitions/ServiceGroupDefinition.java @@ -19,6 +19,7 @@ package org.apache.stratos.cli.beans.grouping.definitions; +import javax.xml.bind.annotation.XmlRootElement; import java.util.List; public class ServiceGroupDefinition { http://git-wip-us.apache.org/repos/asf/stratos/blob/dc0edc91/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/ServiceGroupDefinition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/ServiceGroupDefinition.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/ServiceGroupDefinition.java index ac8321f..ac890e8 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/ServiceGroupDefinition.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/ServiceGroupDefinition.java @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement; import java.io.Serializable; import java.util.List; -@XmlRootElement(name = "serviceGroup") +@XmlRootElement public class ServiceGroupDefinition implements Serializable { private String name; http://git-wip-us.apache.org/repos/asf/stratos/blob/dc0edc91/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 a7702c1..e1f41ee 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 @@ -298,7 +298,7 @@ public class StratosApiV41 extends AbstractApi { @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/view/partition") - public Response getPartition(@PathParam("partitionId") String partitionId) throws RestAPIException { + public Response getPartition(@PathParam("partitiotnId") String partitionId) throws RestAPIException { return Response.ok().entity(StratosApiV41Utils.getPartition(partitionId)).build(); }
