Repository: marmotta Updated Branches: refs/heads/develop 9dfc605bd -> bc25e3265
MARMOTTA-562: more debugging to see why the the excepetion mappers get registered twice Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/bc25e326 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/bc25e326 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/bc25e326 Branch: refs/heads/develop Commit: bc25e32651e0021f90e057a73b44c0156342d51d Parents: 41842d0 Author: Sergio Fernández <[email protected]> Authored: Wed Nov 5 15:30:41 2014 +0100 Committer: Sergio Fernández <[email protected]> Committed: Wed Nov 5 15:30:50 2014 +0100 ---------------------------------------------------------------------- .../core/jndi/MarmottaInitialContextFactoryBuilder.java | 2 +- .../core/services/jaxrs/ExceptionMapperServiceImpl.java | 7 +------ .../platform/core/test/base/AbstractMarmotta.java | 11 ++++++----- .../marmotta/platform/core/test/base/JettyMarmotta.java | 1 + .../platform/core/test/base/TestStoreProvider.java | 2 +- .../platform/core/test/base/jetty/TestApplication.java | 1 - .../core/test/base/jetty/TestInjectorFactory.java | 3 +-- .../platform/core/test/jaxrs/ExceptionHandlingTest.java | 4 +--- 8 files changed, 12 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/bc25e326/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaInitialContextFactoryBuilder.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaInitialContextFactoryBuilder.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaInitialContextFactoryBuilder.java index fbd988b..0178204 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaInitialContextFactoryBuilder.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaInitialContextFactoryBuilder.java @@ -35,7 +35,7 @@ public class MarmottaInitialContextFactoryBuilder implements InitialContextFacto @Override public InitialContextFactory createInitialContextFactory(Hashtable<?, ?> hashtable) throws NamingException { - // check if we are inside the LMF or outside; inside the LMF we return our own context factory, + // check if we are inside the Marmotta or outside; inside the Marmotta we return our own context factory, // outside the system default try { return (InitialContextFactory) Thread.currentThread().getContextClassLoader().loadClass(MarmottaContextFactory.class.getName()).getMethod("getInstance").invoke(null); http://git-wip-us.apache.org/repos/asf/marmotta/blob/bc25e326/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 918bd86..0c69b54 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 @@ -53,19 +53,15 @@ public class ExceptionMapperServiceImpl implements ExceptionMapperService { */ @PostConstruct public void initialise() { - ResteasyProviderFactory factory = ResteasyProviderFactory.getInstance(); - register(factory); } - public void register(ResteasyProviderFactory factory) { log.info("initialising JAX-RS exception mappers"); for(CDIExceptionMapper<?> mapper : mappers) { - log.debug("registering exception mapper: {}", mapper.getClass().getName()); - + log.info("registering exception mapper: {}", mapper.getClass().getName()); factory.registerProviderInstance(mapper); } } @@ -75,5 +71,4 @@ public class ExceptionMapperServiceImpl implements ExceptionMapperService { } - } http://git-wip-us.apache.org/repos/asf/marmotta/blob/bc25e326/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/AbstractMarmotta.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/AbstractMarmotta.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/AbstractMarmotta.java index 51ca188..c54cbc7 100644 --- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/AbstractMarmotta.java +++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/AbstractMarmotta.java @@ -70,12 +70,12 @@ public abstract class AbstractMarmotta { // put bean manager into JNDI try { - new InitialContext().bind("java:comp/BeanManager",container.getBeanManager()); + new InitialContext().bind("java:comp/BeanManager", container.getBeanManager()); } catch (NamingException e) { - log.error("error adding bean manager to JNDI",e); + log.error("error adding bean manager to JNDI", e); } - // create temporary LMF home directory + // create temporary marmotta home directory home = Files.createTempDir(); // create a temporary configuration with an in-memory database URL for H2 @@ -84,7 +84,7 @@ public abstract class AbstractMarmotta { override.setProperty("logging.template", "/logback-testing.xml"); override.setProperty("testing.enabled", true); - // initialise LMF using a temporary directory + // initialise marmotta using a temporary directory startupService = getService(MarmottaStartupService.class); } @@ -106,16 +106,17 @@ public abstract class AbstractMarmotta { } } - private void cleanJNDI() { try { new InitialContext().unbind("java:comp/env/BeanManager"); } catch (NamingException e) { } + try { new InitialContext().unbind("java:comp/BeanManager"); } catch (NamingException e) { } + try { new InitialContext().unbind("java:app/BeanManager"); } catch (NamingException e) { http://git-wip-us.apache.org/repos/asf/marmotta/blob/bc25e326/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java index 97a7ef1..b4de8b3 100644 --- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java +++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java @@ -32,6 +32,7 @@ import org.eclipse.jetty.servlet.FilterMapping; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher; +import org.jboss.resteasy.spi.ResteasyProviderFactory; import javax.servlet.DispatcherType; import javax.servlet.ServletException; http://git-wip-us.apache.org/repos/asf/marmotta/blob/bc25e326/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/TestStoreProvider.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/TestStoreProvider.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/TestStoreProvider.java index 5c96803..0f47c7c 100644 --- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/TestStoreProvider.java +++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/TestStoreProvider.java @@ -41,7 +41,6 @@ public class TestStoreProvider implements StoreProvider { private static Logger log = LoggerFactory.getLogger(TestStoreProvider.class); - /** * Create the repository using the sail given as argument. This method is needed because some backends * use custom implementations of SailRepository. @@ -84,4 +83,5 @@ public class TestStoreProvider implements StoreProvider { public boolean isEnabled() { return true; } + } http://git-wip-us.apache.org/repos/asf/marmotta/blob/bc25e326/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/jetty/TestApplication.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/jetty/TestApplication.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/jetty/TestApplication.java index 8e73fa4..cf51cbf 100644 --- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/jetty/TestApplication.java +++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/jetty/TestApplication.java @@ -30,7 +30,6 @@ public class TestApplication extends Application { // this is a hack, since there is no other way to inject a service class into a JAX-RS application private static Set<Class<?>> testedWebService; - @Override public Set<Class<?>> getClasses() { return testedWebService; http://git-wip-us.apache.org/repos/asf/marmotta/blob/bc25e326/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/jetty/TestInjectorFactory.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/jetty/TestInjectorFactory.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/jetty/TestInjectorFactory.java index a322573..e25c965 100644 --- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/jetty/TestInjectorFactory.java +++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/jetty/TestInjectorFactory.java @@ -123,8 +123,7 @@ public class TestInjectorFactory implements InjectorFactory { * * @return ResteasyCdiExtension instance */ - private ResteasyCdiExtension lookupResteasyCdiExtension() - { + private ResteasyCdiExtension lookupResteasyCdiExtension() { Set<Bean<?>> beans = manager.getBeans(ResteasyCdiExtension.class); Bean<?> bean = manager.resolve(beans); if (bean == null) throw new IllegalStateException("Unable to obtain ResteasyCdiExtension instance."); http://git-wip-us.apache.org/repos/asf/marmotta/blob/bc25e326/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 127d937..d50f3d1 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 @@ -2,7 +2,6 @@ package org.apache.marmotta.platform.core.test.jaxrs; import com.jayway.restassured.RestAssured; import com.jayway.restassured.response.ResponseBody; -import org.apache.commons.io.IOUtils; import org.apache.marmotta.platform.core.api.config.ConfigurationService; import org.apache.marmotta.platform.core.exception.MarmottaException; import org.apache.marmotta.platform.core.test.base.JettyMarmotta; @@ -55,7 +54,6 @@ public class ExceptionHandlingTest { getBody(); response.print(); - /* final ResponseBody responseJson = expect(). log().ifError(). statusCode(404). @@ -68,7 +66,7 @@ public class ExceptionHandlingTest { responseJson.print(); Assert.assertEquals(404, responseJson.jsonPath().get("status")); Assert.assertEquals("Not Found", responseJson.jsonPath().get("reason")); - */ + } }
