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/d5b9564a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d5b9564a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d5b9564a Branch: refs/heads/master Commit: d5b9564aa6ee4e5ca9a650fbdb1819020d83ec80 Parents: 05f05d7 dc11e31 Author: Isuru <[email protected]> Authored: Tue Dec 17 12:23:59 2013 +0530 Committer: Isuru <[email protected]> Committed: Tue Dec 17 12:23:59 2013 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/rest/endpoint/Utils.java | 40 ++++++++++++ .../endpoint/exception/RestAPIException.java | 20 ++++++ .../handlers/CustomExceptionMapper.java | 37 +++++++++++ .../handlers/StratosAuthenticationHandler.java | 19 ++++-- .../handlers/StratosAuthorizingHandler.java | 14 ++++- .../rest/endpoint/services/StratosAdmin.java | 2 +- .../src/main/webapp/WEB-INF/cxf-servlet.xml | 2 + .../src/main/webapp/WEB-INF/web.xml | 4 +- .../FaultMessageEventFormatter.xml | 2 +- .../execution-plans/AverageHeathRequest.xml | 6 +- .../execution-plans/GradientOfHealthRequest.xml | 7 ++- .../stream-manager-config.xml | 6 +- .../src/main/bin/health-publisher.sh | 2 +- .../agent/health/publisher/HealthPublisher.java | 8 ++- tools/stratos-installer/setup.sh | 65 ++++++++++++++++++-- 15 files changed, 209 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
