Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into puppet
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/65d60c7e Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/65d60c7e Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/65d60c7e Branch: refs/heads/master Commit: 65d60c7ec44a3407911934f0126b78fed57ffcb9 Parents: e80dda2 308abed Author: Isuru <[email protected]> Authored: Thu Feb 13 12:47:09 2014 +0530 Committer: Isuru <[email protected]> Committed: Thu Feb 13 12:47:09 2014 +0530 ---------------------------------------------------------------------- .../impl/CloudControllerServiceImpl.java | 6 +- .../validate/AWSEC2PartitionValidator.java | 2 +- .../balancer/algorithm/AlgorithmContext.java | 10 +- .../balancer/cache/AlgorithmContextCache.java | 45 ++ .../load/balancer/cache/LoadBalancerCache.java | 130 ++++ .../stratos/load/balancer/util/Constants.java | 3 + .../balancer/test/RoundRobinAlgorithmTest.java | 70 -- .../partials/configure_stratos_wizard.hbs | 747 ++++++++++--------- .../console/themes/theme1/partials/header.hbs | 58 +- .../renderers/configure_stratos_wizard.js | 5 +- .../console/themes/theme1/ui/js/wizard.js | 2 +- .../console/util/utility.jag | 2 +- .../stratos/rest/endpoint/mock/MockContext.java | 4 + .../rest/endpoint/mock/StratosTestAdmin.java | 11 + .../distribution/src/main/conf/axis2.xml | 125 ++-- .../load-balancer/modules/integration/pom.xml | 19 +- .../tests/AlgorithmContextCacheTest.java | 55 ++ .../tests/LoadBalancerTestServerManager.java | 69 ++ .../tests/RoundRobinAlgorithmTest.java | 70 ++ .../tests/LoadBalancerTestServerManager.java | 53 -- .../src/test/resources/instrumentation.txt | 2 +- .../src/test/resources/loadbalancer.conf | 142 ++++ .../integration/src/test/resources/testng.xml | 31 + tools/stratos-installer/README.txt | 13 +- tools/stratos-installer/conf/setup.conf | 3 +- .../config/cep/repository/conf/jndi.properties | 16 +- tools/stratos-installer/setup.sh | 5 + 27 files changed, 1101 insertions(+), 597 deletions(-) ----------------------------------------------------------------------
