Browse Source

Fix package tangles

Rob Winch 12 years ago
parent
commit
59e8551279

+ 1 - 1
web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java

@@ -81,7 +81,7 @@ public abstract class AbstractSecurityWebApplicationInitializer implements WebAp
     public final void onStartup(ServletContext servletContext)
     public final void onStartup(ServletContext servletContext)
             throws ServletException {
             throws ServletException {
         if(enableHttpSessionEventPublisher()) {
         if(enableHttpSessionEventPublisher()) {
-            servletContext.addListener(HttpSessionEventPublisher.class);
+            servletContext.addListener("org.springframework.security.web.session.HttpSessionEventPublisher");
         }
         }
         insertSpringSecurityFilterChain(servletContext);
         insertSpringSecurityFilterChain(servletContext);
         afterSpringSecurityFilterChain(servletContext);
         afterSpringSecurityFilterChain(servletContext);

+ 1 - 1
web/src/test/groovy/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializerTests.groovy

@@ -60,7 +60,7 @@ class AbstractSecurityWebApplicationInitializerTests extends Specification {
             1 * context.addFilter("springSecurityFilterChain", {DelegatingFilterProxy f -> f.targetBeanName == "springSecurityFilterChain" && f.contextAttribute == null}) >> registration
             1 * context.addFilter("springSecurityFilterChain", {DelegatingFilterProxy f -> f.targetBeanName == "springSecurityFilterChain" && f.contextAttribute == null}) >> registration
             1 * registration.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, "/*");
             1 * registration.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, "/*");
             1 * registration.setAsyncSupported(true)
             1 * registration.setAsyncSupported(true)
-            1 * context.addListener(HttpSessionEventPublisher)
+            1 * context.addListener(HttpSessionEventPublisher.class.name)
     }
     }
 
 
     def "custom getSecurityDispatcherTypes()"() {
     def "custom getSecurityDispatcherTypes()"() {