Merge branch 'stratos-4.1.x' of https://git-wip-us.apache.org/repos/asf/stratos into pr-458
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f4e8570e Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f4e8570e Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f4e8570e Branch: refs/heads/stratos-4.1.x Commit: f4e8570e0159179c7c8e700548f2525f94a85fb0 Parents: 66e4a31 5974371 Author: lasinducharith <[email protected]> Authored: Thu Sep 10 12:03:36 2015 +0530 Committer: lasinducharith <[email protected]> Committed: Thu Sep 10 12:03:36 2015 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.autoscaler/pom.xml | 2 +- .../org.apache.stratos.cartridge.agent/pom.xml | 2 +- components/org.apache.stratos.cli/pom.xml | 2 +- .../org.apache.stratos.cloud.controller/pom.xml | 2 +- .../controller/domain/InstanceMetadata.java | 12 +- .../cloud/controller/iaases/JcloudsIaas.java | 2 +- .../iaases/kubernetes/KubernetesIaas.java | 14 +- components/org.apache.stratos.common/pom.xml | 2 +- .../org.apache.stratos.custom.handlers/pom.xml | 2 +- .../pom.xml | 2 +- .../kubernetes/client/KubernetesApiClient.java | 12 +- .../KubernetesAPIClientInterface.java | 2 +- .../client/live/AbstractLiveTest.java | 7 +- .../live/KubernetesApiClientLiveTest.java | 8 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../org.apache.stratos.load.balancer/pom.xml | 2 +- .../org.apache.stratos.manager.styles/pom.xml | 2 +- components/org.apache.stratos.manager/pom.xml | 2 +- components/org.apache.stratos.messaging/pom.xml | 2 +- .../org.apache.stratos.metadata.client/pom.xml | 2 +- .../org.apache.stratos.metadata.service/pom.xml | 2 +- .../metadata/service/api/MetadataApi.java | 4 +- .../service/registry/CarbonRegistry.java | 307 ------------ .../metadata/service/registry/DataStore.java | 2 - .../service/registry/MetadataApiRegistry.java | 307 ++++++++++++ .../org.apache.stratos.mock.iaas.api/pom.xml | 2 +- .../org.apache.stratos.mock.iaas.client/pom.xml | 2 +- components/org.apache.stratos.mock.iaas/pom.xml | 2 +- .../pom.xml | 2 +- .../org.apache.stratos.rest.endpoint/pom.xml | 2 +- .../rest/endpoint/api/StratosApiV41Utils.java | 35 ++ components/pom.xml | 2 +- dependencies/fabric8/kubernetes-api/pom.xml | 2 +- dependencies/fabric8/pom.xml | 2 +- dependencies/guice-assistedinject/pom.xml | 2 +- dependencies/guice-multibindings/pom.xml | 2 +- dependencies/guice/pom.xml | 2 +- dependencies/jclouds/cloudstack/pom.xml | 2 +- dependencies/jclouds/ec2/pom.xml | 2 +- .../google-cloud-storage/pom.xml | 2 +- .../google-compute-engine/pom.xml | 2 +- .../google-jclouds-labs/googlecloud/pom.xml | 2 +- .../jclouds/google-jclouds-labs/oauth/pom.xml | 2 +- .../jclouds/google-jclouds-labs/pom.xml | 2 +- dependencies/jclouds/jclouds-blobstore/pom.xml | 2 +- .../jclouds/jclouds-bouncycastle/pom.xml | 2 +- dependencies/jclouds/jclouds-compute/pom.xml | 2 +- dependencies/jclouds/jclouds-core/pom.xml | 2 +- dependencies/jclouds/jclouds-enterprise/pom.xml | 2 +- dependencies/jclouds/jclouds-joda/pom.xml | 2 +- dependencies/jclouds/jclouds-netty/pom.xml | 2 +- dependencies/jclouds/jclouds-sshj/pom.xml | 2 +- dependencies/jclouds/openstack-common/pom.xml | 2 +- dependencies/jclouds/openstack-keystone/pom.xml | 2 +- dependencies/jclouds/openstack-neutron/pom.xml | 2 +- dependencies/jclouds/openstack-nova/pom.xml | 2 +- dependencies/jclouds/pom.xml | 2 +- dependencies/jclouds/sts/pom.xml | 2 +- dependencies/org.wso2.carbon.ui/pom.xml | 4 +- dependencies/pom.xml | 2 +- dependencies/rocoto/pom.xml | 2 +- dependencies/sshj/pom.xml | 2 +- extensions/cep/modules/distribution/pom.xml | 2 +- .../cep/modules/stratos-cep-extension/pom.xml | 2 +- extensions/cep/pom.xml | 2 +- .../modules/haproxy-extension/pom.xml | 2 +- .../load-balancer/modules/lvs-extension/pom.xml | 2 +- .../modules/nginx-extension/pom.xml | 2 +- .../nginx/extension/NginxConfigWriter.java | 186 +++++--- extensions/load-balancer/pom.xml | 2 +- extensions/pom.xml | 2 +- .../pom.xml | 2 +- features/autoscaler/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/cep/pom.xml | 2 +- .../pom.xml | 2 +- features/cloud-controller/pom.xml | 2 +- .../org.apache.stratos.common.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/common/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/load-balancer/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/manager/pom.xml | 2 +- .../pom.xml | 2 +- .../org.apache.stratos.manager.feature/pom.xml | 2 +- .../pom.xml | 2 +- features/manager/stratos-mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/messaging/pom.xml | 2 +- .../pom.xml | 2 +- features/mock-iaas/pom.xml | 2 +- features/pom.xml | 2 +- pom.xml | 158 +++++-- .../modules/distribution/pom.xml | 2 +- products/cartridge-agent/pom.xml | 2 +- .../load-balancer/modules/distribution/pom.xml | 2 +- .../modules/p2-profile-gen/pom.xml | 2 +- products/load-balancer/pom.xml | 2 +- products/pom.xml | 2 +- .../python-cartridge-agent/distribution/pom.xml | 59 --- .../distribution/src/main/assembly/bin.xml | 57 --- .../distribution/src/main/license/LICENSE | 202 -------- .../distribution/src/main/notice/NOTICE | 5 - .../distribution/src/main/readme/README | 32 -- .../integration/.gitignore | 1 - .../python-cartridge-agent/integration/pom.xml | 218 --------- .../test/ADCMTAppTenantUserTest.java | 213 --------- .../test/ADCMTAppTest.java | 213 --------- .../python.cartridge.agent/test/ADCTest.java | 235 ---------- .../test/AgentStartupTest.java | 154 ------- .../test/PythonAgentTestManager.java | 461 ------------------- .../src/test/resources/log4j.properties | 41 -- .../src/test/resources/pca-testing1.xml | 29 -- .../src/test/resources/pca-testing2.xml | 29 -- .../src/test/resources/pca-testing3.xml | 29 -- .../src/test/resources/pca-testing4.xml | 29 -- .../src/test/resources/suite-1/agent.conf | 45 -- .../src/test/resources/suite-1/jndi.properties | 22 - .../src/test/resources/suite-1/logging.ini | 52 --- .../resources/suite-1/payload/launch-params | 1 - .../src/test/resources/suite-2/agent.conf | 45 -- .../src/test/resources/suite-2/jndi.properties | 22 - .../src/test/resources/suite-2/logging.ini | 52 --- .../resources/suite-2/payload/launch-params | 1 - .../src/test/resources/suite-3/agent.conf | 45 -- .../src/test/resources/suite-3/jndi.properties | 22 - .../src/test/resources/suite-3/logging.ini | 52 --- .../resources/suite-3/payload/launch-params | 1 - .../src/test/resources/suite-4/agent.conf | 45 -- .../src/test/resources/suite-4/jndi.properties | 22 - .../src/test/resources/suite-4/logging.ini | 52 --- .../resources/suite-4/payload/launch-params | 1 - .../test-conf/integration-test.properties | 26 -- .../modules/distribution/pom.xml | 59 +++ .../distribution/src/main/assembly/bin.xml | 57 +++ .../distribution/src/main/license/LICENSE | 202 ++++++++ .../modules/distribution/src/main/notice/NOTICE | 5 + .../modules/distribution/src/main/readme/README | 32 ++ .../modules/integration/.gitignore | 1 + .../modules/integration/pom.xml | 219 +++++++++ .../test/ADCMTAppTenantUserTest.java | 213 +++++++++ .../test/ADCMTAppTest.java | 213 +++++++++ .../python.cartridge.agent/test/ADCTest.java | 235 ++++++++++ .../test/AgentStartupTest.java | 154 +++++++ .../test/PythonAgentTestManager.java | 461 +++++++++++++++++++ .../src/test/resources/log4j.properties | 41 ++ .../src/test/resources/pca-testing1.xml | 29 ++ .../src/test/resources/pca-testing2.xml | 29 ++ .../src/test/resources/pca-testing3.xml | 29 ++ .../src/test/resources/pca-testing4.xml | 29 ++ .../src/test/resources/suite-1/agent.conf | 45 ++ .../src/test/resources/suite-1/jndi.properties | 22 + .../src/test/resources/suite-1/logging.ini | 52 +++ .../resources/suite-1/payload/launch-params | 1 + .../src/test/resources/suite-2/agent.conf | 45 ++ .../src/test/resources/suite-2/jndi.properties | 22 + .../src/test/resources/suite-2/logging.ini | 52 +++ .../resources/suite-2/payload/launch-params | 1 + .../src/test/resources/suite-3/agent.conf | 45 ++ .../src/test/resources/suite-3/jndi.properties | 22 + .../src/test/resources/suite-3/logging.ini | 52 +++ .../resources/suite-3/payload/launch-params | 1 + .../src/test/resources/suite-4/agent.conf | 45 ++ .../src/test/resources/suite-4/jndi.properties | 22 + .../src/test/resources/suite-4/logging.ini | 52 +++ .../resources/suite-4/payload/launch-params | 1 + .../test-conf/integration-test.properties | 26 ++ products/python-cartridge-agent/pom.xml | 6 +- .../stratos-cli/modules/distribution/pom.xml | 2 +- products/stratos-cli/pom.xml | 2 +- products/stratos/modules/distribution/pom.xml | 2 +- .../modules/distribution/src/assembly/bin.xml | 141 +++--- .../distribution/src/bin/add_entry_zone_file.sh | 70 --- .../src/bin/git-folder-structure.sh | 67 --- .../distribution/src/bin/manage-git-repo.sh | 138 ------ .../src/bin/remove_entry_zone_file.sh | 75 --- .../distribution/src/bin/set-mysql-password.sh | 65 --- .../modules/distribution/src/bin/stratos.bat | 172 ------- .../modules/distribution/src/bin/stratos.sh | 307 ------------ .../distribution/src/bin/update-instance.sh | 54 --- .../distribution/src/main/bin/stratos.bat | 172 +++++++ .../distribution/src/main/bin/stratos.sh | 307 ++++++++++++ products/stratos/modules/integration/pom.xml | 2 +- products/stratos/modules/p2-profile-gen/pom.xml | 2 +- products/stratos/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- service-stubs/pom.xml | 2 +- 196 files changed, 3774 insertions(+), 4089 deletions(-) ----------------------------------------------------------------------
