You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/05/13 17:15:59 UTC
[07/10] stratos git commit: Merge branch 'master' of
https://github.com/apache/stratos
Merge branch 'master' of https://github.com/apache/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/82c27152
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/82c27152
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/82c27152
Branch: refs/heads/master
Commit: 82c271524daede6df8513f1061430e7a4db4e4b6
Parents: 11e974b 2f3fff5
Author: Dinithi <di...@wso2.com>
Authored: Wed May 13 11:08:44 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Wed May 13 11:08:44 2015 +0530
----------------------------------------------------------------------
.../algorithms/NetworkPartitionAlgorithm.java | 9 +-
.../networkpartition/AllAtOnceAlgorithm.java | 25 +-
.../NetworkPartitionAlgorithmContext.java | 14 +-
.../OneAfterAnotherAlgorithm.java | 169 ++++-
.../applications/topic/ApplicationBuilder.java | 65 +-
.../topic/ApplicationsEventPublisher.java | 18 +
.../AutoScalingPolicyAlreadyExistException.java | 18 +
.../CartridgeGroupNotFoundException.java | 18 +
.../policy/PolicyDoesNotExistException.java | 18 +
.../policy/UnremovablePolicyException.java | 18 +
.../autoscaler/monitor/MonitorFactory.java | 129 +---
.../monitor/cluster/ClusterMonitor.java | 70 +-
.../monitor/component/ApplicationMonitor.java | 59 +-
.../monitor/component/GroupMonitor.java | 10 +-
.../component/ParentComponentMonitor.java | 16 +-
.../services/impl/AutoscalerServiceImpl.java | 25 +-
.../group/GroupStatusActiveProcessor.java | 21 +-
.../group/GroupStatusInactiveProcessor.java | 15 +-
.../group/GroupStatusProcessorChain.java | 17 +-
.../group/GroupStatusTerminatedProcessor.java | 28 +-
.../group/GroupStatusTerminatingProcessor.java | 22 +-
.../stratos/autoscaler/util/AutoscalerUtil.java | 2 +-
.../agent/CartridgeAgentEventListeners.java | 20 +
.../config/configurator/JndiConfigurator.java | 0
.../statistics/publisher/PluginLoader.java | 20 +
.../cli/completer/StratosFileNameCompleter.java | 20 +
.../cloud/controller/iaases/JcloudsIaas.java | 14 +-
.../console/applications_form.jag | 4 +-
.../theme0/js/custom/applications-editor.js | 14 +-
.../js/custom/applications_group_editor.js | 14 +-
.../service/definition/NewProperty.java | 67 --
.../metadata/service/definition/Property.java | 67 ++
.../service/registry/CarbonRegistry.java | 149 ++--
.../metadata/service/registry/DataStore.java | 18 +-
.../service/services/MetaDataAdmin.java | 110 +--
.../cartridge.agent/mdsclient.py | 12 +-
.../plugins/WkaMemberConfigurator.yapsy-plugin | 9 +
.../rest/endpoint/api/StratosApiV41.java | 2 +-
.../README.md | 38 +-
.../artifacts/application.json | 6 +-
.../scripts/common/undeploy.sh | 5 +-
.../complex/tomcat-single-signon/README.md | 38 +-
.../scripts/common/undeploy.sh | 11 +-
.../complex/wordpress-app/README.md | 27 +-
.../nested/complex-app-with-lb/README.md | 31 +-
.../README.md | 43 +-
.../five-levels-nested-groups-app/README.md | 40 ++
.../single-level-nested-group-app/README.md | 29 +-
.../single-level-nested-groups-app/README.md | 34 +-
.../scaling/app-bursting-pattern/README.md | 29 +-
.../sample-cartridges/README.md | 26 +-
.../scripts/common/undeploy.sh | 9 +
.../dependent-scaling/sample-groups/README.md | 28 +-
.../sample-groups/scripts/common/undeploy.sh | 10 +
.../group-scaling/group-scaling-app/README.md | 25 +-
.../group-scaling-app/scripts/common/deploy.sh | 12 +-
.../scripts/common/undeploy.sh | 6 +
.../group-scaling/group-scaling-v1/README.md | 22 +-
.../group-scaling-v1/scripts/common/deploy.sh | 12 +-
.../group-scaling-v1/scripts/common/undeploy.sh | 6 +
.../single-group-group-scaling/README.md | 23 +-
.../scripts/common/undeploy.sh | 8 +
.../simple/single-cartridge-app/README.md | 27 +-
.../simple/single-group-app/README.md | 29 +-
samples/cartridges/gce/php.json | 42 ++
.../gce/network-partition-1.json | 15 +
tools/init-script/README.md | 4 -
tools/init-script/centos/init.sh | 147 ----
tools/init-script/init-gce.sh | 146 ----
tools/init-script/init-vcloud.sh | 80 ---
tools/init-script/init.sh | 165 -----
tools/init-scripts/README.md | 4 +
tools/init-scripts/centos/init.sh | 147 ++++
tools/init-scripts/config-gce.sh | 101 +++
tools/init-scripts/config.sh | 104 +++
tools/init-scripts/init-gce.sh | 146 ++++
tools/init-scripts/init-vcloud.sh | 80 +++
tools/init-scripts/init.sh | 165 +++++
tools/puppet3-agent/config-gce.sh | 101 ---
tools/puppet3-agent/config.sh | 104 ---
tools/stratos-installer/README.md | 7 +
tools/stratos-installer/README.txt | 13 -
.../cartridges/ec2/ec2-mysql.xml | 55 --
.../cartridges/ec2/ec2-php.xml | 54 --
.../cartridges/ec2/ec2-tomcat.xml | 54 --
.../cartridges/openstack/openstack-mysql.xml | 55 --
.../cartridges/openstack/openstack-php.xml | 54 --
.../cartridges/openstack/openstack-tomcat.xml | 55 --
tools/stratos-installer/conf/setup.conf | 2 +-
.../repository/conf/activemq/jndi.properties | 29 -
.../config/all/repository/conf/autoscaler.xml | 56 --
.../repository/conf/cartridge-config.properties | 30 -
.../all/repository/conf/cloud-controller.xml | 104 ---
.../conf/datasources/master-datasources.xml | 129 ----
.../conf/datasources/stratos-datasources.xml | 51 --
.../config/all/repository/conf/identity.xml | 252 -------
.../config/all/repository/conf/jndi.properties | 33 -
.../all/repository/conf/metadataservice.xml | 37 -
.../security/application-authentication.xml | 123 ----
.../all/repository/conf/wso2mb/jndi.properties | 20 -
.../config/as/repository/conf/autoscaler.xml | 33 -
.../config/as/repository/conf/carbon.xml | 586 ---------------
.../config/as/repository/conf/jndi.properties | 24 -
.../config/bam/bin/wso2server.sh | 296 --------
.../config/bam/repository/conf/carbon.xml | 576 ---------------
.../conf/datasources/master-datasources.xml | 128 ----
.../repository/conf/etc/cassandra-component.xml | 28 -
.../bam/repository/conf/etc/cassandra.yaml | 562 ---------------
.../conf/advanced/qpid-virtualhosts.xml | 69 --
.../config/cc/repository/conf/carbon.xml | 586 ---------------
.../cc/repository/conf/cloud-controller.xml | 91 ---
.../config/cc/repository/conf/jndi.properties | 24 -
.../repository/conf/activemq/jndi.properties | 29 -
.../config/cep/repository/conf/jndi.properties | 33 -
.../config/greg/repository/conf/carbon.xml | 609 ----------------
.../config/is/repository/conf/axis2/axis2.xml | 715 -------------------
.../conf/datasources/master-datasources.xml | 89 ---
.../config/is/repository/conf/tenant-mgt.xml | 39 -
.../repository/conf/tomcat/catalina-server.xml | 98 ---
.../config/is/repository/conf/user-mgt.xml | 248 -------
.../config/lb/repository/conf/axis2/axis2.xml | 526 --------------
.../config/lb/repository/conf/loadbalancer.conf | 118 ---
.../config/sm/repository/conf/carbon.xml | 603 ----------------
.../repository/conf/cartridge-config.properties | 29 -
.../conf/datasources/master-datasources.xml | 129 ----
.../conf/datasources/stratos-datasources.xml | 51 --
.../config/sm/repository/conf/jndi.properties | 24 -
tools/stratos-installer/demo.sh | 154 ----
tools/stratos-installer/ec2-cartridge.sh | 132 ----
tools/stratos-installer/ec2-user-data.sh | 141 ----
tools/stratos-installer/imageupload.sh | 101 ---
tools/stratos-installer/openstack-cartridge.sh | 131 ----
.../scripts/add_entry_zone_file.sh | 79 --
.../scripts/copy-private-key.sh | 55 --
tools/stratos-installer/scripts/create-app.sh | 58 --
.../scripts/git-folder-structure.sh | 67 --
tools/stratos-installer/scripts/keygen.sh | 52 --
.../scripts/manage-git-repo.sh | 115 ---
.../scripts/remove_entry_zone_file.sh | 84 ---
.../scripts/set-mysql-password.sh | 55 --
.../scripts/update-instance.sh | 54 --
tools/stratos-installer/setup.sh | 13 +-
.../templates/activemq/jndi.properties | 29 +
.../stratos-installer/templates/autoscaler.xml | 56 ++
.../templates/cartridge-config.properties | 30 +
.../templates/cloud-controller.xml | 104 +++
.../datasources/master-datasources.xml | 129 ++++
.../datasources/stratos-datasources.xml | 51 ++
tools/stratos-installer/templates/identity.xml | 252 +++++++
.../stratos-installer/templates/jndi.properties | 33 +
.../security/application-authentication.xml | 123 ++++
.../templates/wso2mb/jndi.properties | 20 +
152 files changed, 2860 insertions(+), 10265 deletions(-)
----------------------------------------------------------------------