Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8adffee2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8adffee2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8adffee2 Branch: refs/heads/master Commit: 8adffee23ae31541c747c391d93fae821776958f Parents: f928c49 f8605c9 Author: M. Isuru Tharanga Chrishantha Perera <[email protected]> Authored: Mon Jan 13 08:57:57 2014 +0530 Committer: M. Isuru Tharanga Chrishantha Perera <[email protected]> Committed: Mon Jan 13 08:57:57 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/PartitionContext.java | 2 +- .../autoscaler/rule/RuleTasksDelegator.java | 2 - .../console/README.md | 36 +--- .../console/config/console.json | 2 +- .../controllers/cartridgeDefintionSubmit.jag | 8 + .../console/controllers/login.jag | 8 +- .../theme1/partials/cartridge_deployments.hbs | 21 ++- .../console/util/utility.jag | 4 + .../sso/views/login.jag | 2 +- .../stratos/manager/deploy/service/Service.java | 13 +- .../service/ServiceDeploymentManager.java | 11 ++ .../manager/lookup/LookupDataHolder.java | 23 +++ .../lookup/TenantIdToSubscriptionContext.java | 6 + .../DataInsertionAndRetrievalManager.java | 14 ++ .../SubscriptionMultiTenantBehaviour.java | 29 +++- .../InstanceNotifierMessageProcessorChain.java | 3 + ...tractAuthenticationAuthorizationHandler.java | 46 +++++ .../rest/endpoint/handlers/OAuthHandler.java | 9 +- .../handlers/StratosAuthenticationHandler.java | 10 +- .../handlers/StratosAuthorizingHandler.java | 8 +- .../rest/endpoint/services/ServiceUtils.java | 14 ++ .../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 11 +- .../distribution/src/main/conf/scaling.drl | 173 +++++++------------ .../conf/application-authenticators.xml | 23 +++ .../modules/distribution/src/assembly/bin.xml | 6 + .../modules/p2-profile-gen/pom.xml | 14 ++ 26 files changed, 324 insertions(+), 174 deletions(-) ----------------------------------------------------------------------
