You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by me...@apache.org on 2014/02/27 09:40:56 UTC

[08/32] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos

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/7d093fa9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7d093fa9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7d093fa9

Branch: refs/heads/master
Commit: 7d093fa9f355516dffda97d7260cf1f5106ee64d
Parents: 9f7dbd0 dac3417
Author: Melan Nimesh <me...@gmail.com>
Authored: Mon Feb 3 10:07:52 2014 +0530
Committer: Melan Nimesh <me...@gmail.com>
Committed: Mon Feb 3 10:07:52 2014 +0530

----------------------------------------------------------------------
 .../console/app.js                              |   2 +-
 .../console/app.js~                             |  14 ++
 .../console/asset.jag                           |   5 -
 .../console/cartridge_deployments.jag           |  11 +-
 .../console/config/console.json                 |  14 +-
 .../console/configure_stratos.jag               |  48 ++++-
 .../console/configure_stratos_wizard.jag        |  30 ++-
 .../console/console.ipr                         |  59 ------
 .../console/controllers/acs.jag                 |   0
 .../controllers/cartridgeDefintionSubmit.jag    |   0
 .../controllers/cartridgeSubscribeSubmit.jag    |   0
 .../console/controllers/lbDefinitionSubmit.jag  |   0
 .../console/controllers/login.jag               |  66 +++---
 .../console/controllers/loginSubmit.jag         |  25 +++
 .../console/controllers/logout.jag              |   0
 .../console/controllers/newTenantSubmit.jag     |   0
 .../controllers/partitionDefinitionSubmit.jag   |   0
 .../console/controllers/payloadFactory.jag      |   0
 .../controllers/policyDefinitionSubmit.jag      |   0
 .../console/controllers/profileClient.jag       |   0
 .../console/controllers/router.jag              |  22 +-
 .../console/controllers/wizardSubmit.jag        |  33 +++
 .../console/data/partition_deployments.json     |  22 +-
 .../console/default_page.jag                    |   5 +
 .../console/index.jag                           |   2 +-
 .../console/jaggery.conf                        |   4 +
 .../console/lbs.jag                             |  13 +-
 .../modules/security/security.provider.js       |   1 -
 .../console/partition_deployments.jag           |   9 +-
 .../console/policy_deployments.jag              |   9 +-
 .../theme1/partials/cartridge_deployments.hbs   |  15 +-
 .../theme1/partials/configure_stratos.hbs       |  48 ++++-
 .../partials/configure_stratos_wizard.hbs       | 189 +++++++++++++++--
 .../console/themes/theme1/partials/header.hbs   | 201 ++++++++++++++-----
 .../console/themes/theme1/partials/lbs.hbs      |  12 +-
 .../console/themes/theme1/partials/login.hbs    |   8 +-
 .../theme1/partials/mt_service_deployments.hbs  |   5 +-
 .../theme1/partials/partition_deployments.hbs   |  59 +++---
 .../theme1/partials/policy_deployments.hbs      |  76 ++++---
 .../theme1/partials/subscribe_cartridge.hbs     |   4 +-
 .../console/themes/theme1/renderers/asset.js    |  38 ----
 .../theme1/renderers/cartridge_deployments.js   |   4 +-
 .../theme1/renderers/configure_stratos.js       |  60 +++++-
 .../renderers/configure_stratos_wizard.js       |  19 +-
 .../themes/theme1/renderers/default_page.js     |  38 ++++
 .../console/themes/theme1/renderers/lbs.js      |   8 +-
 .../theme1/renderers/mt_service_deployments.js  |   1 +
 .../theme1/renderers/partition_deployments.js   |   5 +-
 .../theme1/renderers/policy_deployments.js      |   7 +-
 .../console/themes/theme1/ui/css/main.css       |  16 +-
 .../themes/theme1/ui/js/configure_stratos.js    |  29 +--
 .../console/themes/theme1/ui/js/wizard.js       |  41 +++-
 .../console/util/utility.jag                    |  90 +++++++--
 .../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 +-
 63 files changed, 1214 insertions(+), 433 deletions(-)
----------------------------------------------------------------------