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/247a0e9f Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/247a0e9f Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/247a0e9f Branch: refs/heads/master Commit: 247a0e9f0fe8a1c41296b6ab9a8788bb4901e653 Parents: cd2ad40 dac3417 Author: Sajith Kariyawasam <[email protected]> Authored: Mon Feb 3 14:30:49 2014 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Mon Feb 3 14:30:49 2014 +0530 ---------------------------------------------------------------------- .../console/controllers/login.jag | 66 ++++++++------- .../console/controllers/loginSubmit.jag | 25 ++++++ .../console/controllers/router.jag | 4 +- .../console/jaggery.conf | 4 + .../modules/security/security.provider.js | 1 - .../console/themes/theme1/partials/login.hbs | 8 +- .../console/util/utility.jag | 51 ++++++++---- .../org/apache/stratos/rest/endpoint/Utils.java | 13 ++- .../endpoint/context/AuthenticationContext.java | 38 +++++++++ ...tractAuthenticationAuthorizationHandler.java | 4 +- .../CookieBasedAuthenticationHandler.java | 87 ++++++++++++++++++++ .../rest/endpoint/handlers/OAuthHandler.java | 2 + .../handlers/StratosAuthenticationHandler.java | 5 +- .../handlers/StratosAuthorizingHandler.java | 27 +++--- .../endpoint/services/AuthenticationAdmin.java | 67 +++++++++++++++ .../rest/endpoint/services/StratosAdmin.java | 31 +++++-- .../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 6 +- 17 files changed, 363 insertions(+), 76 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/247a0e9f/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java ----------------------------------------------------------------------
