Repository: brooklyn-server Updated Branches: refs/heads/master 9e320b1bc -> 48ff670c0
Load default exception mapper in web.xml and service.xml Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/8b301509 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/8b301509 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/8b301509 Branch: refs/heads/master Commit: 8b301509d28987c6e81c38d1e9176c15df09d78a Parents: a86e605 Author: Andrew Donald Kennedy <[email protected]> Authored: Tue Jul 26 04:00:12 2016 +0100 Committer: Andrew Donald Kennedy <[email protected]> Committed: Thu Aug 11 15:35:42 2016 +0100 ---------------------------------------------------------------------- .../src/main/resources/OSGI-INF/blueprint/service.xml | 4 ++++ rest/rest-server/src/main/webapp/WEB-INF/web.xml | 8 ++++++++ 2 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/8b301509/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml ---------------------------------------------------------------------- diff --git a/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml b/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml index 20a1d71..4137f1f 100644 --- a/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml +++ b/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml @@ -111,6 +111,10 @@ limitations under the License. </bean> </jaxrs:providers> + <jaxrs:properties> + <entry key="default.wae.mapper.least.specific" value="true"/> + </jaxrs:properties> + </jaxrs:server> <bean class="org.apache.brooklyn.rest.util.ScannerInjectHelper"> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/8b301509/rest/rest-server/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/rest/rest-server/src/main/webapp/WEB-INF/web.xml b/rest/rest-server/src/main/webapp/WEB-INF/web.xml index f5f281d..e53649e 100644 --- a/rest/rest-server/src/main/webapp/WEB-INF/web.xml +++ b/rest/rest-server/src/main/webapp/WEB-INF/web.xml @@ -69,6 +69,7 @@ <param-value> io.swagger.jaxrs.listing.SwaggerSerializers, org.apache.brooklyn.rest.util.FormMapProvider, + org.apache.brooklyn.rest.util.DefaultExceptionMapper, com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider, org.apache.brooklyn.rest.filter.RequestTaggingRsFilter, org.apache.brooklyn.rest.filter.NoCacheFilter, @@ -79,6 +80,13 @@ </param-value> </init-param> + <init-param> + <param-name>jaxrs.properties</param-name> + <param-value> + default.wae.mapper.least.specific=true + </param-value> + </init-param> + </servlet> <servlet-mapping> <servlet-name>Brooklyn REST API v1 Servlet</servlet-name>
