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/69e36903 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/69e36903 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/69e36903 Branch: refs/heads/master Commit: 69e36903c7277ee6e9ce8ea931348c993c583448 Parents: df9d500 081f9fc Author: Manula Thantriwatte <[email protected]> Authored: Thu Dec 12 18:08:45 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Thu Dec 12 18:08:45 2013 +0530 ---------------------------------------------------------------------- .../src/conf/cartridge-config.properties | 2 + .../manager/CartridgeSubscriptionManager.java | 2 +- .../stratos/adc/mgt/payload/CarbonPayload.java | 8 +- .../apache/stratos/adc/mgt/payload/Payload.java | 7 +- .../adc/mgt/utils/CartridgeConstants.java | 1 + .../impl/CloudControllerServiceImpl.java | 99 +++---- .../cloud/controller/pojo/Cartridge.java | 9 - .../runtime/FasterLookUpDataHolder.java | 4 + .../controller/topology/TopologyBuilder.java | 52 ++-- .../resources/conf/cartridge-config.properties | 2 + .../puppet/etc/puppet/files/cartridge-agent.sh | 108 ++++++++ tools/puppet/etc/puppet/files/environment | 22 ++ .../puppet/etc/puppet/files/event-publisher.sh | 28 ++ .../puppet/etc/puppet/files/event-subscriber.sh | 28 ++ .../etc/puppet/files/get-launch-params.rb | 54 ++++ .../puppet/etc/puppet/files/health-publisher.sh | 33 +++ tools/puppet/etc/puppet/files/healthcheck.sh | 31 +++ tools/puppet/etc/puppet/fileserver.conf | 35 +++ tools/puppet/manifests/classes/apt.pp | 43 ++++ tools/puppet/manifests/classes/hosts.pp | 29 +++ tools/puppet/manifests/classes/java.pp | 65 +++++ tools/puppet/manifests/classes/mcollective.pp | 84 ++++++ tools/puppet/manifests/classes/php_cartridge.pp | 141 ++++++++++ tools/puppet/manifests/classes/ssh.pp | 61 +++++ tools/puppet/manifests/classes/system_config.pp | 77 ++++++ tools/puppet/manifests/nodes.pp | 63 +++++ tools/puppet/manifests/site.pp | 23 ++ tools/puppet/modules/apt/files/90forceyes | 23 ++ .../modules/commons/files/bin/puppet_init.sh | 53 ++++ .../modules/commons/files/bin/sign_jars.sh | 39 +++ .../configs/bin/native/wrapper-linux-x86-32 | Bin 0 -> 111027 bytes .../commons/files/configs/lib/home/favicon.ico | Bin 0 -> 1150 bytes tools/puppet/modules/commons/files/environment | 23 ++ .../java/files/jars/copy_java_patches_here | 22 ++ .../java/files/jdk-7u7-linux-x64.tar.gz.file | 22 ++ .../php_cartridge/etc/apache2/apache2.conf.erb | 256 +++++++++++++++++++ .../etc/apache2/sites-available/default-ssl.erb | 195 ++++++++++++++ .../etc/apache2/sites-available/default.erb | 64 +++++ .../resources/stratos_foundation.sql | 2 +- 39 files changed, 1694 insertions(+), 116 deletions(-) ----------------------------------------------------------------------
