Repository: marmotta Updated Branches: refs/heads/develop bc25e3265 -> c5e987eac
Sergio's experiments :-) Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/c5e987ea Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/c5e987ea Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/c5e987ea Branch: refs/heads/develop Commit: c5e987eac2f94610eef1cbfccf5b778b5b622cc0 Parents: bc25e32 Author: Sebastian Schaffert <[email protected]> Authored: Wed Nov 5 16:18:45 2014 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Wed Nov 5 16:18:45 2014 +0100 ---------------------------------------------------------------------- .../core/services/jaxrs/ExceptionMapperServiceImpl.java | 10 ++++++++-- .../platform/core/test/jaxrs/ExceptionHandlingTest.java | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/c5e987ea/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/jaxrs/ExceptionMapperServiceImpl.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/jaxrs/ExceptionMapperServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/jaxrs/ExceptionMapperServiceImpl.java index 0c69b54..b017388 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/jaxrs/ExceptionMapperServiceImpl.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/jaxrs/ExceptionMapperServiceImpl.java @@ -17,6 +17,7 @@ package org.apache.marmotta.platform.core.services.jaxrs; +import org.apache.marmotta.platform.core.api.config.ConfigurationService; import org.apache.marmotta.platform.core.api.jaxrs.ExceptionMapperService; import org.apache.marmotta.platform.core.events.SystemStartupEvent; import org.apache.marmotta.platform.core.jaxrs.exceptionmappers.CDIExceptionMapper; @@ -48,13 +49,18 @@ public class ExceptionMapperServiceImpl implements ExceptionMapperService { @Inject private Instance<CDIExceptionMapper<?>> mappers; + @Inject + private ConfigurationService configurationService; + /** * Register Exception Mappers */ @PostConstruct public void initialise() { - ResteasyProviderFactory factory = ResteasyProviderFactory.getInstance(); - register(factory); + if(!configurationService.getBooleanConfiguration("testing.enabled", false)) { + ResteasyProviderFactory factory = ResteasyProviderFactory.getInstance(); + register(factory); + } } public void register(ResteasyProviderFactory factory) { http://git-wip-us.apache.org/repos/asf/marmotta/blob/c5e987ea/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/jaxrs/ExceptionHandlingTest.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/jaxrs/ExceptionHandlingTest.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/jaxrs/ExceptionHandlingTest.java index d50f3d1..d3a0f5b 100644 --- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/jaxrs/ExceptionHandlingTest.java +++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/jaxrs/ExceptionHandlingTest.java @@ -44,7 +44,7 @@ public class ExceptionHandlingTest { public void testNotFound() throws MarmottaException, IOException { final ResponseBody response = expect(). - log().ifError(). + //log().ifError(). statusCode(404). contentType("text/html"). given(). @@ -55,7 +55,7 @@ public class ExceptionHandlingTest { response.print(); final ResponseBody responseJson = expect(). - log().ifError(). + //log().ifError(). statusCode(404). contentType("application/json"). given().
