From 59e8551279341030d2715f780436d9298c16e864 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@vmware.com>
Date: Tue, 16 Jul 2013 17:08:03 -0500
Subject: [PATCH] Fix package tangles

---
 .../web/context/AbstractSecurityWebApplicationInitializer.java  | 2 +-
 .../AbstractSecurityWebApplicationInitializerTests.groovy       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java b/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java
index d39d113128..f668b5932b 100644
--- a/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java
+++ b/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)
             throws ServletException {
         if(enableHttpSessionEventPublisher()) {
-            servletContext.addListener(HttpSessionEventPublisher.class);
+            servletContext.addListener("org.springframework.security.web.session.HttpSessionEventPublisher");
         }
         insertSpringSecurityFilterChain(servletContext);
         afterSpringSecurityFilterChain(servletContext);
diff --git a/web/src/test/groovy/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializerTests.groovy b/web/src/test/groovy/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializerTests.groovy
index 05b91d32d5..d5ca378261 100644
--- a/web/src/test/groovy/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializerTests.groovy
+++ b/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 * registration.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, "/*");
             1 * registration.setAsyncSupported(true)
-            1 * context.addListener(HttpSessionEventPublisher)
+            1 * context.addListener(HttpSessionEventPublisher.class.name)
     }
 
     def "custom getSecurityDispatcherTypes()"() {