Updated Branches: refs/heads/develop 5bbd56e4d -> 5fca08c66
fix MARMOTTA-394 by reverting some of the changes introduced in the course of MARMOTTA-196; the order of filters and listeners in web.xml is relevant for Marmotta but cannot be specified using only annotations Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/5fca08c6 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/5fca08c6 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/5fca08c6 Branch: refs/heads/develop Commit: 5fca08c66c12e2b0949629060d3df4b7423fd061 Parents: 5bbd56e Author: Sebastian Schaffert <[email protected]> Authored: Fri Nov 29 15:26:00 2013 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Fri Nov 29 15:26:00 2013 +0100 ---------------------------------------------------------------------- .../src/main/webapp/WEB-INF/web.xml | 76 ++++++++++++++++-- .../src/main/webapp/WEB-INF/web.xml | 83 +++++++++++++++++--- .../core/jndi/MarmottaJndiListener.java | 2 - .../core/servlet/MarmottaH2ConsoleFilter.java | 7 +- .../core/servlet/MarmottaOptionsFilter.java | 9 +-- .../core/servlet/MarmottaPostStartupFilter.java | 13 ++- .../core/servlet/MarmottaPreStartupFilter.java | 9 +-- .../servlet/MarmottaPreStartupListener.java | 8 +- .../core/servlet/MarmottaResourceFilter.java | 4 - 9 files changed, 160 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/5fca08c6/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/web.xml b/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/web.xml index 9a446db..e057134 100644 --- a/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/web.xml +++ b/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/web.xml @@ -23,14 +23,24 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";> + <!-- enable custom JNDI implementation --> + <listener> + <listener-class>org.apache.marmotta.platform.core.jndi.MarmottaJndiListener</listener-class> + </listener> + <!-- enable CDI / Weld for dependency injection --> <listener> - <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class> + <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class> + </listener> + + <!-- Initialise the KiWi system --> + <listener> + <listener-class>org.apache.marmotta.platform.core.servlet.MarmottaPreStartupListener</listener-class> </listener> <!-- RESTeasy Webservices --> <listener> - <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class> + <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class> </listener> <!-- specifies the home directory; overridden by environment variable MARMOTTA_HOME or system property marmotta.home --> @@ -38,29 +48,68 @@ <param-name>marmotta.home</param-name> <param-value>/tmp/marmotta</param-value> </context-param> - + + <!-- handle OPTIONS requests --> + <filter> + <filter-name>MarmottaOptionsFilter</filter-name> + <filter-class>org.apache.marmotta.platform.core.servlet.MarmottaOptionsFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>MarmottaOptionsFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <!-- enables a CORS filter and maps it to any request --> <!-- for more fine grained configuration have a look at http://software.dzhuvinov.com/cors-filter-configuration.html --> <filter> <!-- The CORS filter with parameters --> <filter-name>CORS</filter-name> <filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class> + <init-param> <param-name>cors.supportedMethods</param-name> <param-value>GET, HEAD, POST, PUT, DELETE, OPTIONS</param-value> </init-param> + <init-param> <param-name>cors.supportedHeaders</param-name> <param-value>Origin, Accept, Content-Type</param-value> </init-param> + </filter> <filter-mapping> <filter-name>CORS</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> + <!-- this filter performs startup configurations for first installation --> + <filter> + <filter-name>MarmottaPreStartupFilter</filter-name> + <filter-class>org.apache.marmotta.platform.core.servlet.MarmottaPreStartupFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>MarmottaPreStartupFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <!-- Serve static resources from file system and from .jar files of the respective modules --> + <filter> + <filter-name>MarmottaResourceFilter</filter-name> + <filter-class>org.apache.marmotta.platform.core.servlet.MarmottaResourceFilter</filter-class> + <init-param> + <!-- cache resources loaded from module jar files? --> + <param-name>kiwi.resourceCaching</param-name> + <param-value>true</param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name>MarmottaResourceFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <mime-mapping> - <!-- per http://www.w3.org/TR/2006/PR-xslt20-20061121/ --> + <!-- per http://www.w3.org/TR/2006/PR-xslt20-20061121/ --> <extension>.xsl</extension> <mime-type>application/xslt+xml</mime-type> </mime-mapping> @@ -69,6 +118,7 @@ <servlet-name>ViewStatusMessages</servlet-name> <servlet-class>ch.qos.logback.classic.ViewStatusMessagesServlet</servlet-class> </servlet> + <servlet-mapping> <servlet-name>ViewStatusMessages</servlet-name> <url-pattern>/logging/status</url-pattern> @@ -76,20 +126,34 @@ <filter> <filter-name>MarmottaWebservices</filter-name> - <filter-class>org.jboss.resteasy.plugins.server.servlet.FilterDispatcher</filter-class> + <filter-class> + org.jboss.resteasy.plugins.server.servlet.FilterDispatcher + </filter-class> <init-param> <param-name>javax.ws.rs.Application</param-name> <param-value>org.apache.marmotta.platform.core.webservices.CoreApplication</param-value> </init-param> </filter> + <filter-mapping> <filter-name>MarmottaWebservices</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - + <context-param> <param-name>resteasy.injector.factory</param-name> <param-value>org.jboss.resteasy.cdi.CdiInjectorFactory</param-value> </context-param> + <filter> + <filter-name>MarmottaPostStartupFilter</filter-name> + <filter-class> + org.apache.marmotta.platform.core.servlet.MarmottaPostStartupFilter + </filter-class> + </filter> + <filter-mapping> + <filter-name>MarmottaPostStartupFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + </web-app> http://git-wip-us.apache.org/repos/asf/marmotta/blob/5fca08c6/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml b/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml index cdf98de..d2da2e8 100644 --- a/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml +++ b/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml @@ -23,11 +23,21 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";> + <!-- enable custom JNDI implementation --> + <listener> + <listener-class>org.apache.marmotta.platform.core.jndi.MarmottaJndiListener</listener-class> + </listener> + <!-- enable CDI / Weld for dependency injection --> <listener> <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class> </listener> + <!-- Initialise the KiWi system --> + <listener> + <listener-class>org.apache.marmotta.platform.core.servlet.MarmottaPreStartupListener</listener-class> + </listener> + <!-- RESTeasy Webservices --> <listener> <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class> @@ -38,27 +48,74 @@ <param-name>marmotta.home</param-name> <param-value>/tmp/marmotta</param-value> </context-param> - + + <!-- handle OPTIONS requests --> + <filter> + <filter-name>MarmottaOptionsFilter</filter-name> + <filter-class>org.apache.marmotta.platform.core.servlet.MarmottaOptionsFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>MarmottaOptionsFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <!-- enables a CORS filter and maps it to any request --> <!-- for more fine grained configuration have a look at http://software.dzhuvinov.com/cors-filter-configuration.html --> <filter> <!-- The CORS filter with parameters --> <filter-name>CORS</filter-name> <filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class> + <init-param> <param-name>cors.supportedMethods</param-name> <param-value>GET, HEAD, POST, PUT, DELETE, OPTIONS</param-value> </init-param> + <init-param> <param-name>cors.supportedHeaders</param-name> <param-value>Origin, Accept, Content-Type</param-value> </init-param> + </filter> <filter-mapping> <filter-name>CORS</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - + + <!-- this filter performs startup configurations for first installation --> + <filter> + <filter-name>MarmottaPreStartupFilter</filter-name> + <filter-class>org.apache.marmotta.platform.core.servlet.MarmottaPreStartupFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>MarmottaPreStartupFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <!-- Serve static resources from file system and from .jar files of the respective modules --> + <filter> + <filter-name>MarmottaResourceFilter</filter-name> + <filter-class>org.apache.marmotta.platform.core.servlet.MarmottaResourceFilter</filter-class> + <init-param> + <!-- cache resources loaded from module jar files? --> + <param-name>kiwi.resourceCaching</param-name> + <param-value>true</param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name>MarmottaResourceFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <!-- H2 Configuration --> + <filter> + <filter-name>MarmottaH2ConsoleFilter</filter-name> + <filter-class>org.apache.marmotta.platform.core.servlet.MarmottaH2ConsoleFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>MarmottaH2ConsoleFilter</filter-name> + <url-pattern>/database/*</url-pattern> + </filter-mapping> <servlet> <servlet-name>H2Console</servlet-name> <servlet-class>org.h2.server.web.WebServlet</servlet-class> @@ -81,6 +138,7 @@ <servlet-name>ViewStatusMessages</servlet-name> <servlet-class>ch.qos.logback.classic.ViewStatusMessagesServlet</servlet-class> </servlet> + <servlet-mapping> <servlet-name>ViewStatusMessages</servlet-name> <url-pattern>/logging/status</url-pattern> @@ -88,12 +146,15 @@ <filter> <filter-name>MarmottaWebservices</filter-name> - <filter-class>org.jboss.resteasy.plugins.server.servlet.FilterDispatcher</filter-class> + <filter-class> + org.jboss.resteasy.plugins.server.servlet.FilterDispatcher + </filter-class> <init-param> <param-name>javax.ws.rs.Application</param-name> <param-value>org.apache.marmotta.platform.core.webservices.CoreApplication</param-value> </init-param> </filter> + <filter-mapping> <filter-name>MarmottaWebservices</filter-name> <url-pattern>/*</url-pattern> @@ -104,11 +165,15 @@ <param-value>org.jboss.resteasy.cdi.CdiInjectorFactory</param-value> </context-param> - <resource-env-ref> - <resource-env-ref-name>BeanManager</resource-env-ref-name> - <resource-env-ref-type> - javax.enterprise.inject.spi.BeanManager - </resource-env-ref-type> - </resource-env-ref> + <filter> + <filter-name>MarmottaPostStartupFilter</filter-name> + <filter-class> + org.apache.marmotta.platform.core.servlet.MarmottaPostStartupFilter + </filter-class> + </filter> + <filter-mapping> + <filter-name>MarmottaPostStartupFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> </web-app> http://git-wip-us.apache.org/repos/asf/marmotta/blob/5fca08c6/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaJndiListener.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaJndiListener.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaJndiListener.java index 4d27802..cf70ccb 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaJndiListener.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaJndiListener.java @@ -24,14 +24,12 @@ import javax.naming.NamingException; import javax.naming.spi.NamingManager; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; /** * Listener to enable custom JNDI implementation * * @author Sebastian Schaffert */ -@WebListener public class MarmottaJndiListener implements ServletContextListener { private static Logger log = LoggerFactory.getLogger(MarmottaJndiListener.class); http://git-wip-us.apache.org/repos/asf/marmotta/blob/5fca08c6/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaH2ConsoleFilter.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaH2ConsoleFilter.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaH2ConsoleFilter.java index 0ca497c..ee5b1c9 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaH2ConsoleFilter.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaH2ConsoleFilter.java @@ -17,7 +17,7 @@ */ package org.apache.marmotta.platform.core.servlet; -import java.io.IOException; +import org.apache.marmotta.platform.core.api.config.ConfigurationService; import javax.inject.Inject; import javax.servlet.Filter; @@ -26,18 +26,15 @@ import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import org.apache.marmotta.platform.core.api.config.ConfigurationService; +import java.io.IOException; /** * This filter injects the database configuration into the H2 console using the LMF Configuration settings * <p/> * User: sschaffe */ -@WebFilter("/database/*") public class MarmottaH2ConsoleFilter implements Filter { @Inject http://git-wip-us.apache.org/repos/asf/marmotta/blob/5fca08c6/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaOptionsFilter.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaOptionsFilter.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaOptionsFilter.java index 8d45eb4..192ad7b 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaOptionsFilter.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaOptionsFilter.java @@ -17,7 +17,8 @@ */ package org.apache.marmotta.platform.core.servlet; -import java.io.IOException; +import org.jboss.resteasy.spi.DefaultOptionsMethodException; +import org.jboss.resteasy.spi.ResteasyProviderFactory; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -25,15 +26,12 @@ import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; - -import org.jboss.resteasy.spi.DefaultOptionsMethodException; -import org.jboss.resteasy.spi.ResteasyProviderFactory; +import java.io.IOException; /** * This filter checks for OPTIONS requests. If the response returned by the other filters throws an exception @@ -43,7 +41,6 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory; * <p/> * Author: Sebastian Schaffert */ -@WebFilter("/*") public class MarmottaOptionsFilter implements Filter { /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/5fca08c6/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPostStartupFilter.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPostStartupFilter.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPostStartupFilter.java index 890f423..d2500b3 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPostStartupFilter.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPostStartupFilter.java @@ -17,7 +17,10 @@ */ package org.apache.marmotta.platform.core.servlet; -import java.io.IOException; +import org.apache.marmotta.platform.core.api.config.ConfigurationService; +import org.apache.marmotta.platform.core.events.SystemStartupEvent; +import org.apache.marmotta.platform.core.model.module.ModuleConfiguration; +import org.slf4j.Logger; import javax.enterprise.event.Event; import javax.enterprise.inject.Any; @@ -28,19 +31,13 @@ import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; - -import org.apache.marmotta.platform.core.api.config.ConfigurationService; -import org.apache.marmotta.platform.core.events.SystemStartupEvent; -import org.apache.marmotta.platform.core.model.module.ModuleConfiguration; -import org.slf4j.Logger; +import java.io.IOException; /** * This filter is currently only used to indicate that the LMF server has been started successfully. * <p/> * User: sschaffe */ -@WebFilter("/*") public class MarmottaPostStartupFilter implements Filter { @Inject http://git-wip-us.apache.org/repos/asf/marmotta/blob/5fca08c6/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPreStartupFilter.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPreStartupFilter.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPreStartupFilter.java index 438a8f0..6539edf 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPreStartupFilter.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPreStartupFilter.java @@ -17,7 +17,8 @@ */ package org.apache.marmotta.platform.core.servlet; -import java.io.IOException; +import org.apache.marmotta.platform.core.startup.MarmottaStartupService; +import org.slf4j.Logger; import javax.inject.Inject; import javax.servlet.Filter; @@ -26,11 +27,8 @@ import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; - -import org.apache.marmotta.platform.core.startup.MarmottaStartupService; -import org.slf4j.Logger; +import java.io.IOException; /** * This filter is evaluated when the Apache Marmotta system is accessed for the very first time using an HTTP client (e.g. a @@ -44,7 +42,6 @@ import org.slf4j.Logger; * <p/> * User: Sebastian Schaffert */ -@WebFilter("/*") public class MarmottaPreStartupFilter implements Filter { @Inject http://git-wip-us.apache.org/repos/asf/marmotta/blob/5fca08c6/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPreStartupListener.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPreStartupListener.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPreStartupListener.java index a9b6a77..85a8662 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPreStartupListener.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPreStartupListener.java @@ -17,10 +17,6 @@ */ package org.apache.marmotta.platform.core.servlet; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; - import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; import org.apache.marmotta.platform.core.startup.MarmottaStartupService; @@ -28,13 +24,15 @@ import org.apache.marmotta.platform.core.util.CDIContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + /** * This listener is executed first in the startup chain, initializing the Apache * Marmotta system variables if necessary and starting up the configuration service * * @author Sebastian Schaffert */ -@WebListener public class MarmottaPreStartupListener implements ServletContextListener { private static Logger log = LoggerFactory.getLogger(MarmottaPreStartupListener.class); http://git-wip-us.apache.org/repos/asf/marmotta/blob/5fca08c6/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaResourceFilter.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaResourceFilter.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaResourceFilter.java index 7bafd51..2fb635c 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaResourceFilter.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaResourceFilter.java @@ -31,10 +31,7 @@ import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; -import javax.servlet.annotation.WebInitParam; import javax.servlet.http.HttpServletRequest; - import java.io.IOException; import java.io.Serializable; import java.net.URL; @@ -53,7 +50,6 @@ import java.util.List; * <p/> * User: sschaffe */ -@WebFilter(value="/*", initParams = { @WebInitParam(name="kiwi.resourceCaching", value="true ") }) public class MarmottaResourceFilter implements Filter { @Inject
