You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/09/17 17:01:53 UTC
[4/9] stratos git commit: Merge branch 'stratos-4.1.x' of
https://git-wip-us.apache.org/repos/asf/stratos into stratos-4.1.x
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/6955c9e6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6955c9e6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6955c9e6
Branch: refs/heads/stratos-4.1.x
Commit: 6955c9e6f4e29f9c542938ccdb816282c5e63e4e
Parents: 3266b4a b5d1020
Author: gayangunarathne <ga...@wso2.com>
Authored: Wed Sep 16 10:21:47 2015 +0530
Committer: gayangunarathne <ga...@wso2.com>
Committed: Wed Sep 16 10:21:47 2015 +0530
----------------------------------------------------------------------
.../autoscaler/registry/RegistryManager.java | 5 +-
.../controller/registry/RegistryManager.java | 17 +-
.../manager/registry/RegistryManager.java | 17 +-
.../service/registry/MetadataApiRegistry.java | 68 ++-
.../mock/iaas/persistence/RegistryManager.java | 16 +-
.../cartridge.agent/cartridge.agent/agent.py | 5 +-
.../cartridge.agent/cartridge.agent/config.py | 15 +-
.../extensions/py/ExtensionExecutor.py | 2 +-
.../thrift/thrift/transport/TSSLSocket.py | 357 ++++++-------
.../cartridge.agent/modules/util/log.py | 2 +-
.../cartridge.agent/publisher.py | 2 +-
.../rest/endpoint/api/StratosApiV41Utils.java | 16 +-
dependencies/org.wso2.carbon.ui/pom.xml | 4 +-
pom.xml | 1 +
.../distribution/src/main/assembly/bin.xml | 5 +-
.../modules/integration/pom.xml | 200 +-------
.../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/integration/test-common/pom.xml | 94 ++++
.../common/DataPublisherTestUtil.java | 54 ++
.../integration/common/ThriftTestServer.java | 215 ++++++++
.../integration/test-integration/pom.xml | 168 ++++++
.../tests/ADCMTAppTenantUserTestCase.java | 217 ++++++++
.../integration/tests/ADCMTAppTestCase.java | 218 ++++++++
.../agent/integration/tests/ADCTestCase.java | 239 +++++++++
.../integration/tests/AgentStartupTestCase.java | 179 +++++++
.../tests/PythonAgentIntegrationTest.java | 506 +++++++++++++++++++
.../ADCMTAppTenantUserTestCase/agent.conf | 45 ++
.../ADCMTAppTenantUserTestCase/logging.ini | 52 ++
.../payload/launch-params | 1 +
.../test/resources/ADCMTAppTestCase/agent.conf | 45 ++
.../test/resources/ADCMTAppTestCase/logging.ini | 52 ++
.../ADCMTAppTestCase/payload/launch-params | 1 +
.../src/test/resources/ADCTestCase/agent.conf | 45 ++
.../src/test/resources/ADCTestCase/logging.ini | 52 ++
.../resources/ADCTestCase/payload/launch-params | 1 +
.../resources/AgentStartupTestCase/agent.conf | 45 ++
.../extensions/py/startup-test-handler.py | 60 +++
.../py/startup-test-handler.yapsy-plugin | 27 +
.../resources/AgentStartupTestCase/logging.ini | 52 ++
.../AgentStartupTestCase/payload/launch-params | 1 +
.../test/resources/common/client-truststore.jks | Bin 0 -> 37935 bytes
.../resources/common/data-bridge-config.xml | 75 +++
.../src/test/resources/common/jndi.properties | 22 +
.../src/test/resources/common/log4j.properties | 41 ++
.../common/stratos-health-stream-def.json | 1 +
.../resources/common/thrift-agent-config.xml | 64 +++
.../src/test/resources/common/wso2carbon.jks | Bin 0 -> 33260 bytes
.../test-conf/integration-test.properties | 27 +
.../src/test/resources/test-suite-all.xml | 36 ++
.../src/test/resources/test-suite-smoke.xml | 37 ++
.../modules/distribution/src/assembly/bin.xml | 4 +
.../application/ApplicationBurstingTest.java | 2 +-
.../application/GroupStartupOrderTest.java | 2 +-
.../PartitionOneAfterAnotherClusterTest.java | 2 +-
.../PartitionRoundRobinClusterTest.java | 2 +-
.../SampleApplicationStartupTestCase.java | 2 +-
.../application/SingleClusterScalingTest.java | 2 +-
83 files changed, 2976 insertions(+), 2383 deletions(-)
----------------------------------------------------------------------