Merge branch 'stratos-4.1.x' of https://git-wip-us.apache.org/repos/asf/stratos into stratos-4.1.x
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/65f8002f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/65f8002f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/65f8002f Branch: refs/heads/stratos-4.1.x Commit: 65f8002f057267e40029f1a72a7d0524c3fb8bc1 Parents: caa3ab2 c5b3f13 Author: Isuru Haththotuwa <[email protected]> Authored: Wed Nov 18 09:19:18 2015 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Wed Nov 18 09:19:18 2015 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.autoscaler/pom.xml | 186 +-- .../networkpartition/AllAtOnceAlgorithm.java | 2 +- .../autoscaler/internal/ASBundleActivater.java | 41 - .../org.apache.stratos.cartridge.agent/pom.xml | 41 +- components/org.apache.stratos.cli/pom.xml | 18 +- .../org.apache.stratos.cloud.controller/pom.xml | 224 ++-- .../internal/ServiceReferenceHolder.java | 4 +- .../controller/registry/RegistryManager.java | 4 +- components/org.apache.stratos.common/pom.xml | 129 +- .../org.apache.stratos.custom.handlers/pom.xml | 67 +- .../pom.xml | 31 +- .../pom.xml | 49 +- .../pom.xml | 4 +- .../org.apache.stratos.load.balancer/pom.xml | 70 +- .../org.apache.stratos.manager.styles/pom.xml | 80 +- components/org.apache.stratos.manager/pom.xml | 99 +- .../src/conf/tenant-resource-policy.xml | 22 - .../manager/context/StratosManagerContext.java | 19 +- .../StratosManagerServiceComponent.java | 1 + .../manager/registry/RegistryManager.java | 2 +- .../src/scripts/append_zone_file.sh | 44 - components/org.apache.stratos.messaging/pom.xml | 69 +- .../org.apache.stratos.metadata.client/pom.xml | 23 +- .../org.apache.stratos.metadata.service/pom.xml | 82 +- .../service/oauth2/ValidationServiceClient.java | 18 +- .../service/registry/MetadataApiRegistry.java | 4 +- .../org.apache.stratos.mock.iaas.api/pom.xml | 65 +- .../org.apache.stratos.mock.iaas.client/pom.xml | 65 +- components/org.apache.stratos.mock.iaas/pom.xml | 40 +- .../pom.xml | 30 +- .../cartridge.agent/subscriber.py | 7 +- .../org.apache.stratos.rest.endpoint/pom.xml | 76 +- .../handlers/ComponentSynchronizerHandler.java | 11 +- .../oauth2/ValidationServiceClient.java | 12 +- dependencies/fabric8/kubernetes-api/pom.xml | 73 +- dependencies/guice-assistedinject/pom.xml | 6 +- dependencies/guice-multibindings/pom.xml | 4 +- dependencies/guice/pom.xml | 4 +- dependencies/jclouds/cloudstack/pom.xml | 5 +- dependencies/jclouds/ec2/pom.xml | 5 +- .../google-cloud-storage/pom.xml | 5 +- .../google-compute-engine/pom.xml | 5 +- .../google-jclouds-labs/googlecloud/pom.xml | 5 +- .../jclouds/google-jclouds-labs/oauth/pom.xml | 5 +- dependencies/jclouds/jclouds-blobstore/pom.xml | 5 +- .../jclouds/jclouds-bouncycastle/pom.xml | 8 +- dependencies/jclouds/jclouds-compute/pom.xml | 5 +- dependencies/jclouds/jclouds-core/pom.xml | 5 +- dependencies/jclouds/jclouds-enterprise/pom.xml | 5 +- dependencies/jclouds/jclouds-joda/pom.xml | 5 +- dependencies/jclouds/jclouds-netty/pom.xml | 7 +- dependencies/jclouds/jclouds-sshj/pom.xml | 5 +- dependencies/jclouds/openstack-common/pom.xml | 5 +- dependencies/jclouds/openstack-keystone/pom.xml | 5 +- dependencies/jclouds/openstack-neutron/pom.xml | 5 +- dependencies/jclouds/openstack-nova/pom.xml | 5 +- dependencies/jclouds/sts/pom.xml | 5 +- dependencies/org.wso2.carbon.ui/pom.xml | 2 +- dependencies/rocoto/pom.xml | 5 +- dependencies/sshj/pom.xml | 9 +- .../stratos-cep-extension/wso2cep-3.0.0/pom.xml | 15 +- .../stratos-cep-extension/wso2cep-3.1.0/pom.xml | 15 +- .../artifacts/metering-dashboard/capps/pom.xml | 8 +- .../metering-dashboard/ues-patch/ues-gadgets.js | 21 + .../monitoring-dashboard/capps/pom.xml | 8 +- extensions/das/pom.xml | 5 +- .../load-balancer/modules/aws-extension/pom.xml | 15 +- .../modules/haproxy-extension/pom.xml | 9 +- .../load-balancer/modules/lvs-extension/pom.xml | 9 +- .../modules/nginx-extension/pom.xml | 9 +- .../pom.xml | 34 +- .../pom.xml | 6 +- .../pom.xml | 8 +- .../pom.xml | 90 +- .../org.apache.stratos.common.feature/pom.xml | 4 +- .../pom.xml | 12 +- .../pom.xml | 15 +- .../pom.xml | 8 +- .../pom.xml | 27 +- .../pom.xml | 19 +- .../pom.xml | 195 --- .../pom.xml | 196 +-- .../pom.xml | 28 +- .../pom.xml | 5 +- .../pom.xml | 20 +- .../pom.xml | 69 +- features/pom.xml | 14 +- pom.xml | 1166 +++++++++++++++++- .../modules/distribution/pom.xml | 3 +- .../load-balancer/modules/distribution/pom.xml | 13 +- .../modules/p2-profile-gen/pom.xml | 40 +- products/load-balancer/pom.xml | 30 +- .../modules/integration/test-common/pom.xml | 14 +- .../integration/test-integration/pom.xml | 10 +- .../resources/ADCExtensionTestCase/agent.conf | 1 + .../ADCMTAppTenantUserTestCase/agent.conf | 1 + .../test/resources/ADCMTAppTestCase/agent.conf | 1 + .../src/test/resources/ADCTestCase/agent.conf | 1 + products/python-cli/pom.xml | 2 +- .../stratos-cli/modules/distribution/pom.xml | 3 +- products/stratos/modules/distribution/pom.xml | 13 +- .../distribution/src/main/conf/etc/launch.ini | 26 +- .../modules/integration/test-common/pom.xml | 23 +- .../integration/test-integration/pom.xml | 18 +- products/stratos/modules/p2-profile-gen/pom.xml | 219 ++-- products/stratos/pom.xml | 30 +- .../kubernetes-cluster-1.json | 8 +- .../kubernetes-cluster-2.json | 8 +- .../kubernetes-cluster-ec2.json | 8 +- service-stubs/pom.xml | 12 +- .../base-image/files/run | 22 +- .../cartridge-docker-images/build.sh | 6 +- .../stratos-docker-images/puppetmaster/run | 3 +- 113 files changed, 2583 insertions(+), 1804 deletions(-) ----------------------------------------------------------------------
