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/90a0f44f Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/90a0f44f Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/90a0f44f Branch: refs/heads/master Commit: 90a0f44ff28a90d0bdbf2c0914727c5c2567d443 Parents: bf70f20 785efe5 Author: M. Isuru Tharanga Chrishantha Perera <[email protected]> Authored: Thu Mar 27 17:58:35 2014 +0530 Committer: M. Isuru Tharanga Chrishantha Perera <[email protected]> Committed: Thu Mar 27 17:58:35 2014 +0530 ---------------------------------------------------------------------- .../topology/TopologyEventMessageQueue.java | 21 +- .../cloud/controller/pojo/Cartridge.java | 12 + .../cloud/controller/pojo/CartridgeConfig.java | 12 + .../controller/util/CloudControllerUtil.java | 2 +- .../console/controllers/mycartridges.jag | 15 + .../console/data/clusters.json | 391 +++++-------------- .../themes/theme1/partials/cartridges.hbs | 107 +++-- .../themes/theme1/partials/mycartridges.hbs | 86 ++-- .../themes/theme1/renderers/cartridges.js | 30 +- .../console/themes/theme1/renderers/index.js | 45 ++- .../console/themes/theme1/ui/css/main.css | 9 + .../console/themes/theme1/ui/js/mycartridges.js | 11 + .../console/util/utility.jag | 6 + .../apache/stratos/manager/dto/Cartridge.java | 10 + .../manager/service/RepositoryInfoBean.java | 11 +- .../InternalRepoBasedCartridgeSubscription.java | 78 ++++ .../manager/subscription/SubscriptionData.java | 9 + .../factory/CartridgeSubscriptionFactory.java | 3 + .../manager/utils/CartridgeConstants.java | 3 + .../manager/utils/RepositoryCreator.java | 18 +- .../ClusterCreatedMessageProcessor.java | 15 +- .../topology/TopologyMessageProcessorChain.java | 1 + .../topology/TopologyEventMessageDelegator.java | 2 +- .../rest/endpoint/bean/CartridgeInfoBean.java | 9 + .../definition/CartridgeDefinitionBean.java | 2 + .../bean/util/converter/PojoConverter.java | 2 +- .../rest/endpoint/services/ServiceUtils.java | 3 +- .../main/resources/CloudControllerService.wsdl | 1 + tools/puppet3/manifests/nodes.pp | 1 + .../jndi.properties.activemq.template.erb | 25 -- .../conf/templates/jndi.properties.template.erb | 15 +- tools/puppet3/modules/lb/manifests/init.pp | 1 + .../conf/templates/jndi.properties.template.erb | 33 ++ 33 files changed, 576 insertions(+), 413 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/90a0f44f/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ----------------------------------------------------------------------
