Commit 76861a2c authored by Matija Obreza's avatar Matija Obreza
Browse files

Fixed Hazelcast 3.6 and SpringAwareWebFilter

parent 6ad235a8
......@@ -50,10 +50,9 @@ public class WebAppInitializer implements WebApplicationInitializer {
AnnotationConfigWebApplicationContext rootContext = new AnnotationConfigWebApplicationContext();
rootContext.register(ApplicationConfig.class);
servletContext.addListener(new com.hazelcast.web.SessionListener());
servletContext.addListener(new SessionListener());
servletContext.addListener(new ContextLoaderListener(rootContext));
servletContext.addListener(new org.genesys2.server.config.SessionListener(SESSION_TIMEOUT));
servletContext.addListener(new SessionListener());
// servletContext.setInitParameter("contextConfigLocation", "classpath:spring/application-context.xml");
servletContext.setInitParameter("defaultHtmlEscape", "true");
......@@ -134,15 +133,6 @@ public class WebAppInitializer implements WebApplicationInitializer {
servletContext.addFilter("springSecurityFilterChain", new DelegatingFilterProxy("springSecurityFilterChain"))
.addMappingForUrlPatterns(null, false, "/*");
// Hazelcast web filter configuration
FilterRegistration.Dynamic hazelcastWebFilter = servletContext
.addFilter("hazelcastWebFilter", new DelegatingFilterProxy("hazelcastWebFilter"));
hazelcastWebFilter.setInitParameter("targetFilterLifecycle", "true");
hazelcastWebFilter.addMappingForUrlPatterns(
EnumSet.of(DispatcherType.FORWARD, DispatcherType.INCLUDE, DispatcherType.REQUEST), false, "/*");
// Filter chain proxy configuration
/* FilterRegistration.Dynamic filterChainProxy = servletContext
.addFilter("org.springframework.security.filterChainProxy",
......
......@@ -24,8 +24,8 @@ import com.hazelcast.core.IMap;
import com.hazelcast.core.IQueue;
import com.hazelcast.spring.cache.HazelcastCacheManager;
import com.hazelcast.web.WebFilter;
import com.hazelcast.web.spring.SpringAwareWebFilter;
import org.genesys2.server.security.lockout.AccountLockoutManager.AttemptStatistics;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.EnableCaching;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment