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/0e67bfd7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0e67bfd7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0e67bfd7 Branch: refs/heads/master Commit: 0e67bfd768a01da7d1c51f9060881d6a3d2314e9 Parents: c3e6fea fd928f0 Author: M. Isuru Tharanga Chrishantha Perera <[email protected]> Authored: Fri Mar 21 22:10:08 2014 +0530 Committer: M. Isuru Tharanga Chrishantha Perera <[email protected]> Committed: Fri Mar 21 22:10:08 2014 +0530 ---------------------------------------------------------------------- .../stratos/cartridge/agent/CartridgeAgent.java | 17 +- .../cartridge/agent/RepositoryFileListener.java | 8 +- .../git/impl/GitBasedArtifactRepository.java | 90 +-- .../config/CartridgeAgentConfiguration.java | 21 +- .../publisher/HealthStatisticsNotifier.java | 22 +- .../agent/util/CartridgeAgentConstants.java | 1 + .../agent/util/CartridgeAgentUtils.java | 17 +- .../stratos/cli/RestCommandLineService.java | 7 +- .../cli/beans/cartridge/CartridgeInfoBean.java | 11 + .../stratos/cli/commands/SubscribeCommand.java | 15 +- .../apache/stratos/cli/utils/CliConstants.java | 3 + .../controller/iaases/OpenstackNovaIaas.java | 3 +- .../impl/CloudControllerServiceImpl.java | 5 +- .../balancer/cache/AlgorithmContextCache.java | 10 +- .../console/themes/theme1/pages/index.hbs | 11 +- .../console/themes/theme1/pages/plain.hbs | 2 +- .../console/themes/theme1/partials/login.hbs | 4 +- .../themes/theme1/ui/Open_Sans/LICENSE.txt | 202 +++++ .../theme1/ui/Open_Sans/OpenSans-Bold.ttf | Bin 0 -> 224592 bytes .../theme1/ui/Open_Sans/OpenSans-BoldItalic.ttf | Bin 0 -> 213292 bytes .../theme1/ui/Open_Sans/OpenSans-ExtraBold.ttf | Bin 0 -> 222584 bytes .../ui/Open_Sans/OpenSans-ExtraBoldItalic.ttf | Bin 0 -> 213420 bytes .../theme1/ui/Open_Sans/OpenSans-Italic.ttf | Bin 0 -> 212896 bytes .../theme1/ui/Open_Sans/OpenSans-Light.ttf | Bin 0 -> 222412 bytes .../ui/Open_Sans/OpenSans-LightItalic.ttf | Bin 0 -> 213128 bytes .../theme1/ui/Open_Sans/OpenSans-Regular.ttf | Bin 0 -> 217360 bytes .../theme1/ui/Open_Sans/OpenSans-Semibold.ttf | Bin 0 -> 221328 bytes .../ui/Open_Sans/OpenSans-SemiboldItalic.ttf | Bin 0 -> 212820 bytes .../themes/theme1/ui/Open_Sans/open_sans.css | 18 + .../theme1/ui/custom-font-new/LICENSE.txt | 12 + .../themes/theme1/ui/custom-font-new/README.txt | 75 ++ .../theme1/ui/custom-font-new/config.json | 740 +++++++++++++++++++ .../theme1/ui/custom-font-new/css/animation.css | 85 +++ .../ui/custom-font-new/css/fontello-codes.css | 112 +++ .../custom-font-new/css/fontello-embedded.css | 165 +++++ .../custom-font-new/css/fontello-ie7-codes.css | 112 +++ .../ui/custom-font-new/css/fontello-ie7.css | 123 +++ .../theme1/ui/custom-font-new/css/fontello.css | 163 ++++ .../themes/theme1/ui/custom-font-new/demo.html | 433 +++++++++++ .../theme1/ui/custom-font-new/font/fontello.eot | Bin 0 -> 30296 bytes .../theme1/ui/custom-font-new/font/fontello.svg | 122 +++ .../theme1/ui/custom-font-new/font/fontello.ttf | Bin 0 -> 30128 bytes .../ui/custom-font-new/font/fontello.woff | Bin 0 -> 22732 bytes .../manager/CartridgeSubscriptionManager.java | 15 +- .../manager/subscription/SubscriptionData.java | 10 + .../manager/utils/CartridgeConstants.java | 2 + .../rest/endpoint/bean/CartridgeInfoBean.java | 10 + .../rest/endpoint/services/ServiceUtils.java | 1 + .../modules/distribution/src/bin/stratos.sh | 1 + tools/puppet3/modules/tomcat/manifests/init.pp | 5 + .../modules/tomcat/templates/server.xml.erb | 8 +- .../puppet3/modules/tomcat/templates/tomcat.erb | Bin 0 -> 1364 bytes .../config/sm/repository/conf/carbon.xml | 2 +- tools/stratos-installer/setup.sh | 17 +- 54 files changed, 2542 insertions(+), 138 deletions(-) ----------------------------------------------------------------------
