You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/07/12 09:03:14 UTC
[1/2] git commit: change POST rest apis
Repository: stratos
Updated Branches:
refs/heads/master e97b95ce4 -> e28aabd76
change POST rest apis
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c87a434b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c87a434b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c87a434b
Branch: refs/heads/master
Commit: c87a434b1256f6fb35c249b0ea333a0e9a358b0f
Parents: ed82585
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sat Jul 12 09:37:53 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Sat Jul 12 09:37:53 2014 +0530
----------------------------------------------------------------------
.../apache/stratos/rest/endpoint/services/ServiceUtils.java | 6 +-----
.../apache/stratos/rest/endpoint/services/StratosAdmin.java | 5 +++--
2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c87a434b/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 f2cd555..dc8de32 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
@@ -85,7 +85,7 @@ public class ServiceUtils {
private static CartridgeSubscriptionManager cartridgeSubsciptionManager = new CartridgeSubscriptionManager();
private static ServiceDeploymentManager serviceDeploymentManager = new ServiceDeploymentManager();
- static StratosAdminResponse deployCartridge(CartridgeDefinitionBean cartridgeDefinitionBean, ConfigurationContext ctxt,
+ static void deployCartridge(CartridgeDefinitionBean cartridgeDefinitionBean, ConfigurationContext ctxt,
String userName, String tenantDomain) throws RestAPIException {
log.info("Starting to deploy a Cartridge [type] " + cartridgeDefinitionBean.type);
@@ -121,10 +121,6 @@ public class ServiceUtils {
log.info("Successfully deployed Cartridge [type] " + cartridgeDefinitionBean.type);
}
-
- StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
- stratosAdminResponse.setMessage("Successfully deployed cartridge definition with type " + cartridgeDefinitionBean.type);
- return stratosAdminResponse;
}
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/stratos/blob/c87a434b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
index 134f6f9..194c510 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
@@ -117,11 +117,12 @@ public class StratosAdmin extends AbstractAdmin {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public StratosAdminResponse deployCartridgeDefinition(CartridgeDefinitionBean cartridgeDefinitionBean)
+ public Response deployCartridgeDefinition(CartridgeDefinitionBean cartridgeDefinitionBean)
throws RestAPIException {
- return ServiceUtils.deployCartridge(cartridgeDefinitionBean, getConfigContext(), getUsername(),
+ ServiceUtils.deployCartridge(cartridgeDefinitionBean, getConfigContext(), getUsername(),
getTenantDomain());
+ return Response.noContent().build();
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/stratos
Posted by ud...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e28aabd7
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e28aabd7
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e28aabd7
Branch: refs/heads/master
Commit: e28aabd7668800c3def395002f0547872ebe4555
Parents: c87a434 e97b95c
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sat Jul 12 12:32:44 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Sat Jul 12 12:32:44 2014 +0530
----------------------------------------------------------------------
NOTICE | 2 +-
.../src/test/python/README.md | 6 +-
.../console/error.html | 2 +-
.../src/main/resources/META-INF/product.xml | 6 +-
.../haproxy/extension/HAProxyConfigWriter.java | 81 +++++++++++++++-----
.../extension/HAProxyStatisticsReader.java | 39 +++++-----
.../src/main/templates/haproxy.cfg.template | 9 ++-
pom.xml | 24 +++---
products/load-balancer/README.txt | 2 +-
products/stratos-cli/README.txt | 2 +-
tools/stratos-installer/README.txt | 2 +-
11 files changed, 109 insertions(+), 66 deletions(-)
----------------------------------------------------------------------