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/03/17 05:57:52 UTC
[1/3] git commit: code clean for serviceutils getavailablecartridges
Repository: incubator-stratos
Updated Branches:
refs/heads/master 418421d2e -> 505dd15aa
code clean for serviceutils getavailablecartridges
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/476682da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/476682da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/476682da
Branch: refs/heads/master
Commit: 476682da03141792f7b1233cb4ae7507e62835f0
Parents: 917bbc6
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu Mar 13 10:13:10 2014 -0400
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Mar 13 10:13:10 2014 -0400
----------------------------------------------------------------------
.../apache/stratos/rest/endpoint/services/ServiceUtils.java | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/476682da/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 61f8568..3a5ef08 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
@@ -505,13 +505,7 @@ public class ServiceUtils {
}
static Cartridge getAvailableCartridgeInfo(String cartridgeType, Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException {
- List<Cartridge> cartridges;
-
- if(multiTenant != null) {
- cartridges = getAvailableCartridges(null, multiTenant, configurationContext);
- } else {
- cartridges = getAvailableCartridges(null, null, configurationContext);
- }
+ List<Cartridge> cartridges = getAvailableCartridges(null, multiTenant, configurationContext);
for(Cartridge cartridge : cartridges) {
if(cartridge.getCartridgeType().equals(cartridgeType)) {
return cartridge;
[2/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ud...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/dbcff2d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/dbcff2d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/dbcff2d2
Branch: refs/heads/master
Commit: dbcff2d2f2f3cf706f2b8170e2b3ac9a78ddaa1f
Parents: 476682d 969ab39
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu Mar 13 10:13:35 2014 -0400
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Mar 13 10:13:35 2014 -0400
----------------------------------------------------------------------
.../console/cartridge_info.jag | 25 +-
.../console/cartridges.jag | 9 +-
.../console/configure_stratos.jag | 52 +-
.../console/configure_stratos_wizard.jag | 50 +-
.../console/dashboard.jag | 13 +
.../console/data/clusters.json | 301 ++++++++++
.../console/data/elbs.json | 20 +
.../console/data/node_mem_cpu.json | 114 ++++
.../console/index.jag | 8 +-
.../console/subscribe_cartridge.jag | 12 +-
.../console/tenant_management.jag | 10 +-
.../console/tenant_new.jag | 5 -
.../console/themes/theme1/pages/index.hbs | 2 +-
.../themes/theme1/partials/dashboard.hbs | 560 ++++++++++++++++++
.../themes/theme1/partials/error_page.hbs | 19 +
.../console/themes/theme1/partials/header.hbs | 2 +-
.../themes/theme1/renderers/cartridge_info.js | 111 ++--
.../themes/theme1/renderers/cartridges.js | 164 ++++--
.../theme1/renderers/configure_stratos.js | 270 +++++----
.../renderers/configure_stratos_wizard.js | 264 +++++----
.../themes/theme1/renderers/dashboard.js | 76 +++
.../console/themes/theme1/renderers/index.js | 167 +++---
.../theme1/renderers/subscribe_cartridge.js | 108 ++--
.../theme1/renderers/tenant_management.js | 105 ++--
.../themes/theme1/renderers/tenant_new.js | 105 ++--
.../theme1/subthemes/theme2/ui/css/main.css | 579 +++++++++++++++++++
.../themes/theme1/ui/fonts/dropped text.txt | 1 +
.../console/themes/theme1/ui/img/btn-down.png | Bin 0 -> 738 bytes
.../themes/theme1/ui/img/btn-restart.png | Bin 0 -> 801 bytes
.../console/themes/theme1/ui/img/btn-start.png | Bin 0 -> 644 bytes
.../console/themes/theme1/ui/img/confirm.gif | Bin 0 -> 2324 bytes
.../console/themes/theme1/ui/img/dash.png | Bin 0 -> 927 bytes
.../console/themes/theme1/ui/img/details.png | Bin 0 -> 21148 bytes
.../console/themes/theme1/ui/img/diagram.png | Bin 0 -> 75441 bytes
.../console/themes/theme1/ui/img/error.gif | Bin 0 -> 2258 bytes
.../console/themes/theme1/ui/img/icon-plus.png | Bin 0 -> 178 bytes
.../themes/theme1/ui/img/icon-problem-dark.png | Bin 0 -> 495 bytes
.../themes/theme1/ui/img/icon-problem-light.png | Bin 0 -> 499 bytes
.../themes/theme1/ui/img/icon-problem.png | Bin 0 -> 499 bytes
.../console/themes/theme1/ui/img/image_10.png | Bin 0 -> 49844 bytes
.../console/themes/theme1/ui/img/info.gif | Bin 0 -> 2349 bytes
.../console/themes/theme1/ui/img/overlay.png | Bin 0 -> 144 bytes
.../console/themes/theme1/ui/img/warning.gif | Bin 0 -> 2345 bytes
.../console/themes/theme1/ui/js/wizard.js | 58 +-
.../console/util/utility.jag | 43 +-
.../lb/category/LoadBalancerCategory.java | 8 +-
.../manager/lookup/LookupDataHolder.java | 13 +-
.../lookup/RepoUrlToCartridgeSubscriptions.java | 116 ++++
.../manager/CartridgeSubscriptionManager.java | 15 +-
.../RepoNotificationServiceClient.java | 84 +++
.../DataInsertionAndRetrievalManager.java | 23 +-
.../manager/subscription/SubscriptionData.java | 9 -
.../repositoryNotificationInfoBean/Payload.java | 34 ++
.../Repository.java | 43 ++
.../stratos/rest/endpoint/mock/MockContext.java | 103 +++-
.../rest/endpoint/mock/StratosTestAdmin.java | 97 +++-
.../rest/endpoint/services/ServiceUtils.java | 27 +
.../rest/endpoint/services/StratosAdmin.java | 18 +-
.../webapp/stratos-test/WEB-INF/cxf-servlet.xml | 6 +-
.../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 4 +
.../modules/agent/templates/bin/stratos.sh.erb | 1 +
61 files changed, 3190 insertions(+), 664 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/dbcff2d2/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ud...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/505dd15a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/505dd15a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/505dd15a
Branch: refs/heads/master
Commit: 505dd15aafbfc183615cb4a5a0310477ecf23e53
Parents: dbcff2d 418421d
Author: Udara Liyanage <ud...@wso2.com>
Authored: Mon Mar 17 00:45:56 2014 -0400
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Mon Mar 17 00:45:56 2014 -0400
----------------------------------------------------------------------
.../stratos/cli/RestCommandLineService.java | 9 +--
.../RepoNotificationServiceClient.java | 84 --------------------
.../repository/RepositoryNotification.java | 71 +++++++++++++++++
.../rest/endpoint/services/ServiceUtils.java | 17 +---
.../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 5 +-
tools/stratos-installer/clean.sh | 34 ++++----
tools/stratos-installer/conf/setup.conf | 2 +-
7 files changed, 98 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/505dd15a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------