Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/syncope
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2c3107bb Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2c3107bb Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2c3107bb Branch: refs/heads/SYNCOPE-156 Commit: 2c3107bb3623d9834ddf81b1852a19371780ae18 Parents: 1fe1c4b 8a1abd4 Author: Francesco Chicchiriccò <[email protected]> Authored: Wed Sep 2 12:55:28 2015 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Wed Sep 2 12:55:28 2015 +0200 ---------------------------------------------------------------------- .../client/lib/RestClientExceptionMapper.java | 90 ++++++++----- .../common/lib/types/ClientExceptionType.java | 8 +- .../syncope/core/logic/init/LoggerLoader.java | 2 - .../misc/spring/ApplicationContextProvider.java | 11 -- .../DomainTransactionInterceptorInjector.java | 38 ++++++ .../src/main/resources/domains.xml | 4 +- .../rest/cxf/RestServiceExceptionMapper.java | 10 +- .../core/logic/init/CamelRouteLoader.java | 39 ++---- .../resources/jboss/domains/MasterDomain.xml | 4 +- .../main/resources/jboss/domains/TwoDomain.xml | 131 +++++++++++++++++++ 10 files changed, 251 insertions(+), 86 deletions(-) ----------------------------------------------------------------------
