Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bd9ce98d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bd9ce98d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bd9ce98d Branch: refs/heads/master Commit: bd9ce98def5d8a5ae964b91ff5d2a65438baf679 Parents: 202707f 4999fa8 Author: Udara Liyanage <[email protected]> Authored: Wed Sep 10 11:39:47 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Wed Sep 10 11:39:47 2014 +0530 ---------------------------------------------------------------------- .../deployment/policy/DeploymentPolicy.java | 31 +- .../org.apache.stratos.cloud.controller/pom.xml | 5 + .../deployment/partition/Partition.java | 32 +- .../bean/autoscaler/partition/Partition.java | 2 + .../policy/deployment/DeploymentPolicy.java | 2 + .../bean/util/converter/PojoConverter.java | 5 + .../stratos-test/WEB-INF/schemas/schema.xsd | 4 + .../webapp/stratos/WEB-INF/schemas/schema.xsd | 4 + .../src/main/resources/AutoScalerService.wsdl | 717 ++++++++++--------- .../main/resources/CloudControllerService.wsdl | 1 + tools/puppet3/manifests/nodes/default.pp | 1 + tools/puppet3/manifests/nodes/haproxy.pp | 5 +- tools/puppet3/manifests/nodes/jboss.pp | 35 + tools/puppet3/manifests/nodes/lb.pp | 5 +- tools/puppet3/manifests/nodes/mysql.pp | 7 +- tools/puppet3/manifests/nodes/nodejs.pp | 7 +- tools/puppet3/manifests/nodes/php.pp | 8 +- tools/puppet3/manifests/nodes/ruby.pp | 6 +- tools/puppet3/manifests/nodes/tomcat.pp | 5 +- tools/puppet3/manifests/nodes/wordpress.pp | 5 +- .../lib/puppet/parser/functions/difference.rb | 21 + tools/puppet3/modules/agent/manifests/init.pp | 50 +- .../modules/agent/manifests/push_templates.pp | 5 +- .../modules/agent/manifests/remove_templates.pp | 24 + .../templates/extensions/addons/_jboss-as.erb | 18 - .../templates/extensions/addons/_mysql.erb | 32 - .../templates/extensions/addons/_nodejs.erb | 21 - .../agent/templates/extensions/addons/_php.erb | 18 - .../agent/templates/extensions/addons/_ruby.erb | 34 - .../templates/extensions/artifacts-copy.sh.erb | 3 +- .../extensions/artifacts-updated.sh.erb | 6 - .../templates/extensions/complete-tenant.sh.erb | 2 - .../extensions/complete-topology.sh.erb | 6 - .../extensions/member-activated.sh.erb | 279 +------- .../templates/extensions/member-started.sh.erb | 17 +- .../extensions/member-suspended.sh.erb | 17 +- .../extensions/member-terminated.sh.erb | 15 - .../templates/extensions/start-servers.sh.erb | 285 +------- .../extensions/subscription-domain-added.sh.erb | 6 - .../subscription-domain-removed.sh.erb | 5 - tools/puppet3/modules/appserver/LICENSE | 13 + tools/puppet3/modules/appserver/Modulefile | 11 + tools/puppet3/modules/appserver/README | 11 + .../modules/appserver/files/configs/README.txt | 5 + .../repository/components/lib/README.txt | 1 + .../modules/appserver/files/patches/README.txt | 3 + .../repository/components/patches/README.txt | 1 + .../modules/appserver/lib/facter/java_home.rb | 5 + .../modules/appserver/manifests/clean.pp | 45 ++ .../modules/appserver/manifests/deploy.pp | 43 ++ .../puppet3/modules/appserver/manifests/init.pp | 137 ++++ .../modules/appserver/manifests/initialize.pp | 59 ++ .../modules/appserver/manifests/params.pp | 74 ++ .../appserver/manifests/push_templates.pp | 26 + .../modules/appserver/manifests/start.pp | 28 + .../agent/extensions/artifacts-copy.sh.erb | 29 + .../agent/extensions/artifacts-updated.sh.erb | 28 + .../templates/agent/extensions/clean.sh.erb | 28 + .../agent/extensions/complete-tenant.sh.erb | 30 + .../agent/extensions/complete-topology.sh.erb | 34 + .../agent/extensions/instance-activated.sh.erb | 28 + .../agent/extensions/instance-started.sh.erb | 27 + .../agent/extensions/member-activated.sh.erb | 303 ++++++++ .../agent/extensions/member-started.sh.erb | 43 ++ .../agent/extensions/member-suspended.sh.erb | 43 ++ .../agent/extensions/member-terminated.sh.erb | 43 ++ .../agent/extensions/mount-volumes.sh.erb | 87 +++ .../agent/extensions/start-servers.sh.erb | 308 ++++++++ .../extensions/subscription-domain-added.sh.erb | 35 + .../subscription-domain-removed.sh.erb | 34 + .../templates/conf/axis2/axis2.xml.erb | 713 ++++++++++++++++++ .../appserver/templates/conf/carbon.xml.erb | 626 ++++++++++++++++ .../conf/datasources/master-datasources.xml.erb | 72 ++ .../datasources/master-datasources/_remote.erb | 68 ++ .../templates/conf/log4j.properties.erb | 175 +++++ .../appserver/templates/conf/registry.xml.erb | 105 +++ .../templates/conf/registry/_remote.erb | 35 + .../conf/security/authenticators.xml.erb | 52 ++ .../conf/tomcat/catalina-server.xml.erb | 98 +++ .../appserver/templates/conf/user-mgt.xml.erb | 356 +++++++++ .../templates/conf/user-mgt/_roldap.erb | 32 + .../templates/conf/user-mgt/_rwldap.erb | 41 ++ tools/puppet3/modules/haproxy/manifests/init.pp | 6 + tools/puppet3/modules/jboss/manifests/init.pp | 10 + .../agent/extensions/artifacts-updated.sh.erb | 30 + tools/puppet3/modules/lb/manifests/init.pp | 7 +- .../puppet3/modules/lb/manifests/initialize.pp | 10 +- tools/puppet3/modules/mysql/manifests/init.pp | 10 + .../agent/extensions/instance-started.sh.erb | 43 ++ tools/puppet3/modules/nodejs/manifests/init.pp | 11 + .../agent/extensions/start-servers.sh.erb | 32 + tools/puppet3/modules/php/manifests/init.pp | 11 + .../agent/extensions/artifacts-updated.sh.erb | 30 + tools/puppet3/modules/ruby/manifests/init.pp | 11 + .../agent/extensions/instance-started.sh.erb | 46 ++ tools/puppet3/modules/tomcat/manifests/init.pp | 6 + .../puppet3/modules/wordpress/manifests/init.pp | 5 + 97 files changed, 4779 insertions(+), 1175 deletions(-) ----------------------------------------------------------------------
