Merge branch 'master' of https://github.com/apache/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/924a8f62 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/924a8f62 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/924a8f62 Branch: refs/heads/master Commit: 924a8f62577d6e44789da88f5b6713c19beba6b7 Parents: f8e622d 1e7e300 Author: Dinithi <[email protected]> Authored: Wed May 20 09:28:55 2015 +0530 Committer: Dinithi <[email protected]> Committed: Wed May 20 09:28:55 2015 +0530 ---------------------------------------------------------------------- README.md | 49 ++++++------- .../src/main/resources/META-INF/component.xml | 2 +- .../src/main/resources/META-INF/component.xml | 36 ++++------ .../console/controllers/menu/menu.json | 26 +++---- .../manager/utils/PermissionConstants.java | 73 +++++++++++++++----- .../stratos/manager/utils/UserRoleCreator.java | 32 +++------ .../src/main/resources/META-INF/component.xml | 50 +++++++------- .../rest/endpoint/api/StratosApiV41.java | 67 +++++++++--------- .../rest/endpoint/api/StratosApiV41Utils.java | 12 ++++ .../src/main/webapp/api/WEB-INF/cxf-servlet.xml | 2 + 10 files changed, 190 insertions(+), 159 deletions(-) ----------------------------------------------------------------------
