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:55 UTC

[07/18] stratos git commit: remove multitenant definition from configuration section

remove multitenant definition from configuration section


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/915b3e3b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/915b3e3b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/915b3e3b

Branch: refs/heads/4.1.0-test
Commit: 915b3e3becebc1e3525975de9d3db92f51f2fbac
Parents: d4da3e8
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Wed Dec 10 17:01:46 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Wed Dec 10 17:01:46 2014 +0530

----------------------------------------------------------------------
 .../console/configure_form.jag                               | 7 -------
 .../console/controllers/configure/configure_requests.jag     | 3 ---
 .../console/controllers/rest/rest_calls.jag                  | 8 --------
 3 files changed, 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/915b3e3b/components/org.apache.stratos.manager.console/console/configure_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/configure_form.jag b/components/org.apache.stratos.manager.console/console/configure_form.jag
index 58b0651..d545d2d 100644
--- a/components/org.apache.stratos.manager.console/console/configure_form.jag
+++ b/components/org.apache.stratos.manager.console/console/configure_form.jag
@@ -105,13 +105,6 @@ switch (formtype) {
         }
         break;
 
-    case "multitenant":
-        list_data = util.RESTCalls.getServices();
-        if (list_data.serviceDefinitionBean && list_data.serviceDefinitionBean.length === 0) {
-            list_data = null;
-        }
-        break;
-
     case "docker":
         list_data = util.RESTCalls.getKubernetesGroups();
         if(list_data.kubernetesGroup && list_data.kubernetesGroup.length === 0){

http://git-wip-us.apache.org/repos/asf/stratos/blob/915b3e3b/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag b/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
index 38717dc..8d6690e 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
@@ -36,9 +36,6 @@ try {
         case "cartridges":
             formSubmit = util.RESTCalls.deployCartridgeDefinition(formPayload);
             break;
-        case "multitenant":
-            formSubmit = util.RESTCalls.deployServiceDefinition(formPayload);
-            break;
         case "docker":
             formSubmit = util.RESTCalls.deployKubernetesGroupDefinition(formPayload);
             break;

http://git-wip-us.apache.org/repos/asf/stratos/blob/915b3e3b/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 7a403de..b8a3176 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
@@ -27,18 +27,10 @@ RESTCalls = new function(){
         return this.sendReceive("GET","/tenant/list",{});
     };
 
-    this.getServices = function(){
-        return this.sendReceive("GET","/service",{});
-    };
-
     this.deployCartridgeDefinition = function(cartridgeDefinition){
         return this.send("POST","/cartridges", cartridgeDefinition);
     };
 
-    this.deployServiceDefinition = function(serviceDefinition){
-        return this.send("POST","/service/definition",serviceDefinition);
-    };
-
     this.activateTenant = function(tenantDomain){
         return this.send("POST","/tenant/activate/" + tenantDomain,{});
     };