You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/05/14 11:11:13 UTC
[3/4] stratos git commit: Resolving merge conflicts
Resolving merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e8c6fc88
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e8c6fc88
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e8c6fc88
Branch: refs/heads/master
Commit: e8c6fc88c48a533818ed49d30a6e3526287afc0f
Parents: d2e91d9 9bebcea
Author: anuruddhal <an...@gmail.com>
Authored: Thu May 14 14:09:40 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Thu May 14 14:09:40 2015 +0530
----------------------------------------------------------------------
.../dependency/DependencyBuilder.java | 6 +-
.../applications/dependency/DependencyTree.java | 13 +-
.../applications/topic/ApplicationBuilder.java | 2 -
.../client/CloudControllerClient.java | 4 +-
.../context/cluster/ClusterContext.java | 46 +-
.../partition/ClusterLevelPartitionContext.java | 4 +-
.../context/partition/PartitionContext.java | 10 +-
.../internal/AutoscalerServiceComponent.java | 24 +-
.../autoscaler/monitor/MonitorFactory.java | 18 +-
.../monitor/component/GroupMonitor.java | 44 +-
.../policy/deployment/DeploymentPolicy.java | 36 +-
.../autoscaler/rule/RuleTasksDelegator.java | 6 +
.../services/impl/AutoscalerServiceImpl.java | 56 +-
.../ClusterStatusTerminatedProcessor.java | 3 +-
.../util/AutoscalerObjectConverter.java | 128 +----
.../stratos/autoscaler/util/AutoscalerUtil.java | 4 +-
.../CloudControllerServiceComponent.java | 24 +-
.../impl/CloudControllerServiceImpl.java | 9 +-
.../ComponentStartUpSynchronizerImpl.java | 72 ++-
.../common/partition/NetworkPartition.java | 102 ----
.../common/partition/NetworkPartitionRef.java | 84 +++
.../stratos/common/partition/Partition.java | 151 ------
.../stratos/common/partition/PartitionRef.java | 124 +++++
.../services/ComponentStartUpSynchronizer.java | 2 +
.../console/controllers/login/validator.jag | 20 +
.../console/errorhtml/error-404.html | 21 +
.../console/errorhtml/error.html | 21 +
.../css/bootstrap-3.2.0/bootstrap.min.css | 26 +-
.../fonts/glyphicons-halflings-regular.svg | 18 +
.../console/themes/theme0/css/custom.css | 21 +
.../theme0/css/custom/application_editor.css | 20 +
.../css/custom/application_group_editor.css | 21 +-
.../theme0/css/custom/applications_deploy.css | 20 +
.../console/themes/theme0/css/custom/style.css | 21 +
.../themes/theme0/css/custom/topology.css | 21 +
.../css/font-awesome-4.2.0/font-awesome.min.css | 25 +-
.../fonts/fontawesome-webfont.svg | 18 +
.../theme0/css/font-mfizz-1.2/font-mfizz.css | 30 +-
.../theme0/css/font-mfizz-1.2/font-mfizz.svg | 18 +
.../jquery.contextMenu/jquery.contextMenu.css | 25 +-
.../themes/theme0/css/web-fonts/open_sans.css | 21 +
.../console/themes/theme0/css/wizard/custom.css | 21 +
.../themes/theme0/helpers/applications.js | 22 +-
.../theme0/helpers/applications_deploy.js | 21 +
.../theme0/helpers/applications_editor.js | 21 +
.../themes/theme0/helpers/applications_form.js | 21 +
.../theme0/helpers/applications_group_editor.js | 21 +
.../theme0/helpers/applications_topology.js | 21 +
.../themes/theme0/helpers/applications_view.js | 21 +
.../themes/theme0/helpers/configure_form.js | 21 +
.../console/themes/theme0/helpers/login_body.js | 21 +
.../console/themes/theme0/helpers/users_form.js | 21 +
.../console/themes/theme0/helpers/wizard.js | 21 +
.../js/JSONEditor-0.7.12/jsoneditor-0.7.12.js | 26 +-
.../theme0/js/bootstrap-3.2.0/bootstrap.min.js | 24 +-
.../console/themes/theme0/js/canvg/canvg.js | 22 +-
.../console/themes/theme0/js/canvg/rgbcolor.js | 24 +-
.../console/themes/theme0/js/custom.js | 21 +
.../theme0/js/custom/applications-deploy.js | 21 +
.../theme0/js/custom/applications-editor.js | 21 +
.../theme0/js/custom/applications-view.js | 20 +
.../js/custom/applications_group_editor.js | 21 +
.../theme0/js/custom/applications_topology.js | 21 +
.../console/themes/theme0/js/custom/form.js | 21 +
.../console/themes/theme0/js/custom/script.js | 21 +
.../themes/theme0/js/d3js-v3/d3.v3.min.js | 21 +
.../themes/theme0/js/dagre-v0.7.0/dagre.min.js | 21 +
.../js/jquery-1.11.1/jquery-1.11.1.min.js | 22 +-
.../js/jquery.contextMenu/jquery.contextMenu.js | 23 +-
.../js/jquery.contextMenu/jquery.ui.position.js | 25 +-
.../js/jsplumb-1.7.2/dom.jsPlumb-1.7.2-min.js | 21 +
.../console/themes/theme0/js/login/login.js | 21 +
.../themes/theme0/js/noty-2.2.9/noty-2.2.9.js | 27 +-
.../console/themes/theme0/js/wizard/custom.js | 30 +-
.../console/themes/theme0/pages/index.hbs | 20 +
.../themes/theme0/partials/applications.hbs | 21 +
.../theme0/partials/applications_deploy.hbs | 21 +
.../theme0/partials/applications_editor.hbs | 21 +
.../theme0/partials/applications_form.hbs | 21 +
.../partials/applications_group_editor.hbs | 21 +
.../theme0/partials/applications_topology.hbs | 21 +
.../theme0/partials/applications_view.hbs | 21 +
.../themes/theme0/partials/configure_form.hbs | 21 +
.../themes/theme0/partials/error_page.hbs | 21 +
.../themes/theme0/partials/index_header.hbs | 21 +
.../themes/theme0/partials/index_left_menu.hbs | 21 +
.../theme0/partials/index_right_menu_help.hbs | 21 +
.../theme0/partials/index_right_menu_log.hbs | 21 +
.../themes/theme0/partials/index_sub_header.hbs | 21 +
.../themes/theme0/partials/login_body.hbs | 21 +
.../themes/theme0/partials/login_header.hbs | 21 +
.../themes/theme0/partials/metro_menu.hbs | 21 +
.../themes/theme0/partials/users_form.hbs | 21 +
.../console/themes/theme0/partials/wizard.hbs | 21 +
.../stratos-resources/css/bootstrap-theme.css | 21 +
.../StratosManagerServiceComponent.java | 30 +-
.../rest/endpoint/api/StratosApiV41Utils.java | 39 +-
.../util/converter/ObjectConverter.java | 44 +-
...equestHandlingCapabilityWindowProcessor.java | 21 +-
.../conf/templates/jndi.properties.template | 16 +
.../modules/distribution/src/bin/stratos.bat | 2 +-
.../modules/distribution/src/bin/stratos.sh | 1 +
.../src/main/conf/drools/scaling.drl | 4 +-
.../scripts/common/add-domain-mappings.sh | 21 +
.../scripts/common/add-network-partition.sh | 21 +
.../scripts/common/deploy.sh | 21 +
.../scripts/common/get-application-runtime.sh | 21 +
.../scripts/common/list-domain-mappings.sh | 21 +
.../scripts/common/list-network-partition.sh | 21 +
.../scripts/common/undeploy.sh | 21 +
.../scripts/common/update-deployment-policy.sh | 22 +
.../scripts/mock/deploy.sh | 21 +
.../scripts/mock/undeploy.sh | 21 +
.../scripts/common/deploy.sh | 21 +
.../scripts/common/undeploy.sh | 19 +
.../tomcat-single-signon/scripts/ec2/deploy.sh | 22 +-
.../scripts/ec2/undeploy.sh | 19 +
.../scripts/kubernetes/deploy.sh | 22 +
.../scripts/kubernetes/undeploy.sh | 19 +
.../tomcat-single-signon/scripts/mock/deploy.sh | 21 +
.../scripts/mock/undeploy.sh | 19 +
.../scripts/openstack/deploy.sh | 21 +
.../scripts/openstack/undeploy.sh | 19 +
.../wordpress-app/scripts/common/deploy.sh | 22 +
.../wordpress-app/scripts/common/undeploy.sh | 19 +
.../complex/wordpress-app/scripts/ec2/deploy.sh | 21 +
.../wordpress-app/scripts/ec2/undeploy.sh | 19 +
.../wordpress-app/scripts/kubernetes/deploy.sh | 22 +
.../scripts/kubernetes/undeploy.sh | 19 +
.../wordpress-app/scripts/mock/deploy.sh | 21 +
.../wordpress-app/scripts/mock/undeploy.sh | 20 +
.../wordpress-app/scripts/openstack/deploy.sh | 22 +
.../wordpress-app/scripts/openstack/undeploy.sh | 20 +
.../scripts/common/deploy.sh | 20 +
.../scripts/common/undeploy.sh | 19 +
.../complex-app-with-lb/scripts/ec2/deploy.sh | 20 +
.../complex-app-with-lb/scripts/ec2/undeploy.sh | 20 +
.../scripts/kubernetes/deploy.sh | 20 +
.../scripts/kubernetes/undeploy.sh | 20 +
.../complex-app-with-lb/scripts/mock/deploy.sh | 19 +
.../scripts/mock/undeploy.sh | 20 +
.../scripts/openstack/deploy.sh | 20 +
.../scripts/openstack/undeploy.sh | 20 +
.../scripts/common/deploy.sh | 20 +
.../scripts/common/undeploy.sh | 20 +
.../scripts/ec2/deploy.sh | 20 +
.../scripts/ec2/undeploy.sh | 20 +
.../scripts/kubernetes/deploy.sh | 20 +
.../scripts/kubernetes/undeploy.sh | 20 +
.../scripts/mock/deploy.sh | 20 +
.../scripts/mock/undeploy.sh | 20 +
.../scripts/openstack/deploy.sh | 20 +
.../scripts/openstack/undeploy.sh | 20 +
.../scripts/common/deploy.sh | 22 +
.../scripts/common/undeploy.sh | 21 +
.../scripts/ec2/deploy.sh | 21 +
.../scripts/ec2/undeploy.sh | 22 +
.../scripts/kubernetes/deploy.sh | 21 +
.../scripts/kubernetes/undeploy.sh | 21 +
.../scripts/mock/deploy.sh | 22 +
.../scripts/mock/undeploy.sh | 24 +
.../scripts/openstack/deploy.sh | 22 +
.../scripts/openstack/undeploy.sh | 24 +
.../scripts/common/deploy.sh | 22 +-
.../scripts/common/undeploy.sh | 22 +-
.../scripts/common/update-deployment-policy.sh | 22 +-
.../scripts/common/update-network-partition.sh | 22 +-
.../scripts/ec2/deploy.sh | 22 +-
.../scripts/ec2/undeploy.sh | 22 +-
.../scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../scripts/mock/deploy.sh | 22 +-
.../scripts/mock/undeploy.sh | 22 +-
.../scripts/mock/update-network-partition.sh | 21 +
.../scripts/openstack/deploy.sh | 22 +-
.../scripts/openstack/undeploy.sh | 22 +-
.../openstack/update-network-partition.sh | 21 +
.../scripts/common/deploy.sh | 22 +-
.../scripts/common/undeploy.sh | 22 +-
.../scripts/ec2/deploy.sh | 22 +-
.../scripts/ec2/undeploy.sh | 22 +-
.../scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../scripts/mock/deploy.sh | 22 +-
.../scripts/mock/undeploy.sh | 22 +-
.../scripts/openstack/deploy.sh | 22 +-
.../scripts/openstack/undeploy.sh | 22 +-
.../scripts/common/deploy.sh | 22 +-
.../scripts/common/undeploy.sh | 22 +-
.../app-bursting-pattern/scripts/ec2/deploy.sh | 22 +-
.../scripts/ec2/undeploy.sh | 22 +-
.../scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../app-bursting-pattern/scripts/mock/deploy.sh | 22 +-
.../scripts/mock/undeploy.sh | 22 +-
.../scripts/openstack/deploy.sh | 22 +-
.../scripts/openstack/undeploy.sh | 22 +-
.../sample-cartridges/scripts/common/deploy.sh | 22 +-
.../scripts/common/undeploy.sh | 22 +-
.../sample-cartridges/scripts/ec2/deploy.sh | 22 +-
.../sample-cartridges/scripts/ec2/undeploy.sh | 22 +-
.../scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../sample-cartridges/scripts/mock/deploy.sh | 22 +-
.../sample-cartridges/scripts/mock/undeploy.sh | 22 +-
.../scripts/openstack/deploy.sh | 22 +-
.../scripts/openstack/undeploy.sh | 22 +-
.../sample-groups/scripts/common/deploy.sh | 22 +-
.../sample-groups/scripts/common/undeploy.sh | 22 +-
.../sample-groups/scripts/ec2/deploy.sh | 22 +-
.../sample-groups/scripts/ec2/undeploy.sh | 22 +-
.../sample-groups/scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../sample-groups/scripts/mock/deploy.sh | 22 +-
.../sample-groups/scripts/mock/undeploy.sh | 22 +-
.../sample-groups/scripts/openstack/deploy.sh | 22 +-
.../sample-groups/scripts/openstack/undeploy.sh | 22 +-
.../group-scaling-app/scripts/common/deploy.sh | 22 +-
.../scripts/common/undeploy.sh | 22 +-
.../group-scaling-app/scripts/ec2/deploy.sh | 22 +-
.../group-scaling-app/scripts/ec2/undeploy.sh | 22 +-
.../scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../group-scaling-app/scripts/mock/deploy.sh | 22 +-
.../group-scaling-app/scripts/mock/undeploy.sh | 22 +-
.../scripts/openstack/deploy.sh | 22 +-
.../scripts/openstack/undeploy.sh | 22 +-
.../group-scaling-v1/scripts/common/deploy.sh | 22 +-
.../group-scaling-v1/scripts/common/undeploy.sh | 22 +-
.../group-scaling-v1/scripts/ec2/deploy.sh | 22 +-
.../group-scaling-v1/scripts/ec2/undeploy.sh | 22 +-
.../scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../group-scaling-v1/scripts/mock/deploy.sh | 22 +-
.../group-scaling-v1/scripts/mock/undeploy.sh | 22 +-
.../scripts/openstack/deploy.sh | 22 +-
.../scripts/openstack/undeploy.sh | 22 +-
.../scripts/common/deploy.sh | 22 +-
.../scripts/common/undeploy.sh | 22 +-
.../scripts/ec2/deploy.sh | 22 +-
.../scripts/ec2/undeploy.sh | 22 +-
.../scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../scripts/mock/deploy.sh | 22 +-
.../scripts/mock/undeploy.sh | 22 +-
.../scripts/openstack/deploy.sh | 22 +-
.../scripts/openstack/undeploy.sh | 22 +-
.../scripts/common/add-domain-mappings.sh | 22 +-
.../scripts/common/add-network-partition.sh | 22 +-
.../scripts/common/deploy.sh | 22 +-
.../scripts/common/get-application-runtime.sh | 22 +-
.../scripts/common/list-domain-mappings.sh | 22 +-
.../scripts/common/list-network-partition.sh | 22 +-
.../scripts/common/undeploy.sh | 22 +-
.../scripts/common/update-deployment-policy.sh | 22 +-
.../scripts/common/update-network-partition.sh | 22 +-
.../single-cartridge-app/scripts/ec2/deploy.sh | 22 +-
.../scripts/ec2/undeploy.sh | 22 +-
.../single-cartridge-app/scripts/gce/deploy.sh | 9 +
.../scripts/gce/undeploy.sh | 7 +
.../scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../single-cartridge-app/scripts/mock/deploy.sh | 22 +-
.../scripts/mock/undeploy.sh | 22 +-
.../scripts/openstack/deploy.sh | 22 +-
.../scripts/openstack/undeploy.sh | 22 +-
.../single-group-app/scripts/common/deploy.sh | 22 +-
.../single-group-app/scripts/common/undeploy.sh | 22 +-
.../single-group-app/scripts/ec2/deploy.sh | 22 +-
.../single-group-app/scripts/ec2/undeploy.sh | 22 +-
.../scripts/kubernetes/deploy.sh | 22 +-
.../scripts/kubernetes/undeploy.sh | 22 +-
.../single-group-app/scripts/mock/deploy.sh | 22 +-
.../single-group-app/scripts/mock/undeploy.sh | 22 +-
.../scripts/openstack/deploy.sh | 22 +-
.../scripts/openstack/undeploy.sh | 22 +-
samples/cartridges/mock/postgres | 47 --
.../src/main/resources/AutoscalerService.wsdl | 514 ++++++++++---------
.../main/resources/CloudControllerService.wsdl | 19 +
.../main/resources/StratosManagerService.wsdl | 19 +
.../deployment_script.sh | 20 +
.../service-images/php/files/000-default.conf | 17 +
.../plugins/PhpServerStarterPlugin.yapsy-plugin | 17 +
.../tomcat-saml-sso/files/create-admin-user.sh | 19 +
.../service-images/tomcat-saml-sso/files/env | 17 +
.../TomcatServerStarterPlugin.yapsy-plugin | 17 +
.../TomcatWSO2ISMetadataPublisher.yapsy-plugin | 16 +
.../tomcat/files/create-admin-user.sh | 18 +
.../service-images/tomcat/files/env | 17 +
.../TomcatServerStarterPlugin.yapsy-plugin | 16 +
.../service-images/wso2is-saml-sso/files/env | 17 +
.../plugins/WSO2ISMetaDataHandler.yapsy-plugin | 17 +
.../stratos-docker-images/bind/zone_template | 21 +
.../stratos-docker-images/mysql/my.cnf | 21 +
.../stratos-docker-images/run-nsenter.sh | 20 +
.../conf/templates/jndi.properties.template.erb | 22 +
tools/puppet3/modules/appserver/Modulefile | 21 +
.../modules/appserver/lib/facter/java_home.rb | 17 +
.../conf/datasources/master-datasources.xml.erb | 16 +
.../datasources/master-datasources/_remote.erb | 18 +-
.../templates/conf/registry/_remote.erb | 16 +
.../templates/conf/user-mgt/_roldap.erb | 16 +
.../templates/conf/user-mgt/_rwldap.erb | 16 +
.../modules/jboss/templates/hornetq/run.erb | 21 +
.../conf/templates/jndi.properties.template.erb | 22 +
.../templates/mysql_root_password_setter.sh.erb | 17 +
.../mysql/templates/publish-metadata.py.erb | 17 +
.../plugins/PhpServerStarterPlugin.yapsy-plugin | 17 +
.../python_agent/templates/logging.ini.erb | 17 +
309 files changed, 6414 insertions(+), 1063 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e8c6fc88/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------