You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/12/11 07:50:54 UTC
[06/18] stratos git commit: fix cartridge definition with REST API
changes
fix cartridge definition with REST API changes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d4da3e89
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d4da3e89
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d4da3e89
Branch: refs/heads/4.1.0-test
Commit: d4da3e89989c3161b9f631262b1f910df0fd1243
Parents: 0d807d9
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Wed Dec 10 16:56:31 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Wed Dec 10 16:56:31 2014 +0530
----------------------------------------------------------------------
.../console/controllers/rest/rest_calls.jag | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4da3e89/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
index cfc8fac..7a403de 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
@@ -23,18 +23,6 @@
RESTCalls = new function(){
var log = new Log('RESTCalls');
- this.getAvailableSingleTenantCartridges = function(){
- return this.sendReceive("GET","/cartridge/list",{});
- };
-
- this.getAvailableMultiTenantCartridges = function(){
- return this.sendReceive("GET","/cartridge/tenanted/list",{});
- };
-
- this.getSubscribedCartridges = function(){
- return this.sendReceive("GET","/cartridge/list/subscribed",{});
- }
-
this.getTenants = function(){
return this.sendReceive("GET","/tenant/list",{});
};
@@ -44,7 +32,7 @@ RESTCalls = new function(){
};
this.deployCartridgeDefinition = function(cartridgeDefinition){
- return this.send("POST","/cartridge/definition",cartridgeDefinition);
+ return this.send("POST","/cartridges", cartridgeDefinition);
};
this.deployServiceDefinition = function(serviceDefinition){
@@ -139,7 +127,7 @@ RESTCalls = new function(){
return this.send("POST","/cartridge/unsubscribe",alias);
};
this.getCartridges = function(){
- return this.sendReceive("GET","/cartridge/available/list",{});
+ return this.sendReceive("GET","/cartridges",{});
};
this.getGroups = function(){
@@ -164,9 +152,6 @@ RESTCalls = new function(){
this.getCartridgeInfo = function(alias){
return this.sendReceive("GET","/cartridge/info/"+alias,{});
};
- this.getCartridgeServiceGroup = function(serviceGroup){
- return this.sendReceive("GET","/cartridge/list/subscribed/group/"+serviceGroup,{});
- };
this.validateCaptcha = function(captchaText){
return this.sendReceive("POST","/captcha",captchaText);
};