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/b8d7d0c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b8d7d0c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b8d7d0c5 Branch: refs/heads/master Commit: b8d7d0c59fce330f4856602569386bdf808fee4a Parents: b94f586 8adffee Author: Udara Liyanage <[email protected]> Authored: Mon Jan 13 10:17:39 2014 -0500 Committer: Udara Liyanage <[email protected]> Committed: Mon Jan 13 10:17:39 2014 -0500 ---------------------------------------------------------------------- .../console/README.md | 36 +---- .../console/config/console.json | 2 +- .../console/controllers/login.jag | 8 +- .../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 ++ .../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/resources/stratos.sh | 122 ++++++++------- .../distribution/src/main/resources/stratos.sh | 123 ++++++++------- .../distribution/src/main/bin/stratos.sh | 151 ++++++++++--------- .../conf/application-authenticators.xml | 23 +++ .../modules/distribution/src/assembly/bin.xml | 6 + .../modules/distribution/src/bin/stratos.sh | 41 ++--- .../modules/p2-profile-gen/pom.xml | 14 ++ .../stratos-installer/config/cc/bin/stratos.sh | 121 ++++++++------- 24 files changed, 504 insertions(+), 313 deletions(-) ----------------------------------------------------------------------
