From d8497a16425df26a60fb70bcd3e05fb1d3ea4f16 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Sat, 22 Sep 2007 11:38:55 +0000
Subject: [PATCH] SEC-562: Sandbox repackaging.

---
 .../AuthenticationCancelledException.java     |  4 +--
 .../openid/OpenIDAuthenticationProvider.java  | 20 ++++++-------
 .../openid/OpenIDAuthenticationStatus.java    |  2 +-
 .../openid/OpenIDAuthenticationToken.java     | 10 +++----
 .../security/ui/openid/OpenIDConstants.java   |  2 +-
 .../security/ui/openid/OpenIDConsumer.java    |  4 +--
 .../ui/openid/OpenIDConsumerException.java    |  2 +-
 .../openid/OpenIDLoginInitiationServlet.java  |  4 +--
 .../OpenIDResponseProcessingFilter.java       | 18 +++++------
 .../OpenIdAuthenticationProcessingFilter.java | 18 +++++------
 ...OpenIdAuthenticationRequiredException.java |  4 +--
 .../consumers/JanRainOpenIDConsumer.java      | 16 +++++-----
 .../openid/consumers/OpenId4JavaConsumer.java | 10 +++----
 .../openid/MockAuthoritiesPopulator.java      | 14 ++++-----
 .../OpenIDAuthenticationProviderTests.java    | 26 ++++++++--------
 .../OpenIDResponseProcessingFilterTests.java  | 26 ++++++++--------
 .../openid/consumers/MockOpenIDConsumer.java  | 14 ++++-----
 .../ldap/ppolicy/AccountLockedException.java  |  2 +-
 .../OracleIDPasswordPolicyControl.java        |  2 +-
 .../ppolicy/PasswordExpiredException.java     |  2 +-
 .../ppolicy/PasswordInHistoryException.java   |  2 +-
 .../ldap/ppolicy/PasswordPolicyControl.java   |  2 +-
 .../ppolicy/PasswordPolicyControlFactory.java |  4 +--
 .../ldap/ppolicy/PasswordPolicyException.java |  4 +--
 .../PasswordPolicyResponseControl.java        |  8 ++---
 .../OracleIDBindAuthenticator.java            | 12 ++++----
 .../PasswordPolicyResponseControlTests.java   | 11 +++----
 sandbox/spring-security-config/pom.xml        |  6 ++--
 .../config/spring-security-2.0.xsd            | 12 ++++----
 .../applicationContext-acegi-security.xml     | 30 +++++++++----------
 .../authentication-beanRef-attributes.xml     |  6 ++--
 .../config/authentication-dao-defaults.xml    |  6 ++--
 .../config/authentication-defaults.xml        |  2 +-
 .../config/authentication-form-filter.xml     |  2 +-
 .../config/authentication-innerbeans.xml      |  2 +-
 .../config/authorization-http-config.xml      |  8 ++---
 .../authorization-method-annotations.xml      |  2 +-
 .../config/authorization-method-aspectj.xml   |  2 +-
 .../authorization-method-attributes.xml       |  2 +-
 .../config/authorization-method.xml           |  8 ++---
 .../org/acegisecurity/config/auto-config.xml  |  2 +-
 ...ception-translation-autodetect-handler.xml |  6 ++--
 .../config/exception-translation-beanref.xml  |  4 +--
 .../org/acegisecurity/config/ldap-config.xml  |  8 ++---
 .../config/logout-filter-with-handlers.xml    |  2 +-
 .../config/remember-me-autodetect.xml         |  2 +-
 .../config/remember-me-defaults.xml           |  2 +-
 .../session-context-integration-defaults.xml  |  2 +-
 .../webwork/AcegiDispatcherUtils.java         |  4 +--
 .../security/webwork/FilterDispatcher.java    |  4 +--
 50 files changed, 181 insertions(+), 186 deletions(-)

diff --git a/sandbox/openid/src/main/java/org/springframework/security/providers/openid/AuthenticationCancelledException.java b/sandbox/openid/src/main/java/org/springframework/security/providers/openid/AuthenticationCancelledException.java
index 7f68b5ce92..d7d1125a41 100644
--- a/sandbox/openid/src/main/java/org/springframework/security/providers/openid/AuthenticationCancelledException.java
+++ b/sandbox/openid/src/main/java/org/springframework/security/providers/openid/AuthenticationCancelledException.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.providers.openid;
+package org.springframework.security.providers.openid;
 
-import org.acegisecurity.AuthenticationException;
+import org.springframework.security.AuthenticationException;
 
 
 /**
diff --git a/sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationProvider.java b/sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationProvider.java
index 20e87e620b..c2d39e4cad 100644
--- a/sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationProvider.java
+++ b/sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationProvider.java
@@ -12,17 +12,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.providers.openid;
+package org.springframework.security.providers.openid;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.AuthenticationServiceException;
-import org.acegisecurity.BadCredentialsException;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.AuthenticationServiceException;
+import org.springframework.security.BadCredentialsException;
 
-import org.acegisecurity.providers.AuthenticationProvider;
-import org.acegisecurity.providers.cas.CasAuthoritiesPopulator;
+import org.springframework.security.providers.AuthenticationProvider;
+import org.springframework.security.providers.cas.CasAuthoritiesPopulator;
 
-import org.acegisecurity.userdetails.UserDetails;
+import org.springframework.security.userdetails.UserDetails;
 
 import org.springframework.beans.factory.InitializingBean;
 
@@ -46,7 +46,7 @@ public class OpenIDAuthenticationProvider implements AuthenticationProvider, Ini
     }
 
     /* (non-Javadoc)
-     * @see org.acegisecurity.providers.AuthenticationProvider#authenticate(org.acegisecurity.Authentication)
+     * @see org.springframework.security.providers.AuthenticationProvider#authenticate(org.springframework.security.Authentication)
      */
     public Authentication authenticate(Authentication authentication)
         throws AuthenticationException {
@@ -97,7 +97,7 @@ public class OpenIDAuthenticationProvider implements AuthenticationProvider, Ini
     }
 
     /* (non-Javadoc)
-     * @see org.acegisecurity.providers.AuthenticationProvider#supports(java.lang.Class)
+     * @see org.springframework.security.providers.AuthenticationProvider#supports(java.lang.Class)
      */
     public boolean supports(Class authentication) {
         return OpenIDAuthenticationToken.class.isAssignableFrom(authentication);
diff --git a/sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationStatus.java b/sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationStatus.java
index 1ad165d7ce..582927b8ad 100644
--- a/sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationStatus.java
+++ b/sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationStatus.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.providers.openid;
+package org.springframework.security.providers.openid;
 
 import java.io.ObjectStreamException;
 import java.io.Serializable;
diff --git a/sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationToken.java b/sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationToken.java
index 75288b020f..877e2af7a0 100644
--- a/sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationToken.java
+++ b/sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationToken.java
@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.providers.openid;
+package org.springframework.security.providers.openid;
 
-import org.acegisecurity.GrantedAuthority;
+import org.springframework.security.GrantedAuthority;
 
-import org.acegisecurity.providers.AbstractAuthenticationToken;
+import org.springframework.security.providers.AbstractAuthenticationToken;
 
 
 /**
@@ -61,7 +61,7 @@ public class OpenIDAuthenticationToken extends AbstractAuthenticationToken {
     //~ Methods ========================================================================================================
 
     /* (non-Javadoc)
-     * @see org.acegisecurity.Authentication#getCredentials()
+     * @see org.springframework.security.Authentication#getCredentials()
      */
     public Object getCredentials() {
         return null;
@@ -76,7 +76,7 @@ public class OpenIDAuthenticationToken extends AbstractAuthenticationToken {
     }
 
     /* (non-Javadoc)
-     * @see org.acegisecurity.Authentication#getPrincipal()
+     * @see org.springframework.security.Authentication#getPrincipal()
      */
     public Object getPrincipal() {
         return identityUrl;
diff --git a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConstants.java b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConstants.java
index 10920d1728..f441a5387a 100644
--- a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConstants.java
+++ b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConstants.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.ui.openid;
+package org.springframework.security.ui.openid;
 
 /**
  * Constants required by OpenID classes
diff --git a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumer.java b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumer.java
index 0506fb8ec1..2db0816277 100644
--- a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumer.java
+++ b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumer.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.ui.openid;
+package org.springframework.security.ui.openid;
 
-import org.acegisecurity.providers.openid.OpenIDAuthenticationToken;
+import org.springframework.security.providers.openid.OpenIDAuthenticationToken;
 
 import javax.servlet.http.HttpServletRequest;
 
diff --git a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumerException.java b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumerException.java
index 8957dee802..928d5dd8a5 100644
--- a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumerException.java
+++ b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumerException.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.ui.openid;
+package org.springframework.security.ui.openid;
 
 /**
  * Thrown by an OpenIDConsumer if it cannot process a request
diff --git a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDLoginInitiationServlet.java b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDLoginInitiationServlet.java
index 65b620100e..0c90d59ca2 100644
--- a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDLoginInitiationServlet.java
+++ b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDLoginInitiationServlet.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.ui.openid;
+package org.springframework.security.ui.openid;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -34,7 +34,7 @@ import java.io.IOException;
  * <br/>
  * <br/>        &lt;servlet&gt;
  * <br/>        &nbsp;&nbsp; &lt;servlet-name&gt;openid&lt;/servlet-name&gt;
- * <br/>        &nbsp;&nbsp; &lt;servlet-class&gt;org.acegisecurity.ui.openid.OpenIDLoginInitiationServlet&lt;/servlet-class&gt;
+ * <br/>        &nbsp;&nbsp; &lt;servlet-class&gt;org.springframework.security.ui.openid.OpenIDLoginInitiationServlet&lt;/servlet-class&gt;
  * <br/>        &nbsp;&nbsp; &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
  * <br/>        &nbsp;&nbsp; &lt;init-param&gt;
  * <br/>        &nbsp;&nbsp;&nbsp;&nbsp; &lt;description&gt;The error page - will receive error "message"&lt;/description&gt;
diff --git a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilter.java b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilter.java
index 9b369201fc..af8732fdb9 100644
--- a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilter.java
+++ b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilter.java
@@ -12,16 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.ui.openid;
+package org.springframework.security.ui.openid;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.AuthenticationServiceException;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.AuthenticationServiceException;
 
-import org.acegisecurity.providers.openid.OpenIDAuthenticationToken;
+import org.springframework.security.providers.openid.OpenIDAuthenticationToken;
 
-import org.acegisecurity.ui.AbstractProcessingFilter;
-import org.acegisecurity.ui.webapp.AuthenticationProcessingFilter;
+import org.springframework.security.ui.AbstractProcessingFilter;
+import org.springframework.security.ui.webapp.AuthenticationProcessingFilter;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -40,7 +40,7 @@ public class OpenIDResponseProcessingFilter extends AbstractProcessingFilter {
     //~ Methods ========================================================================================================
 
     /* (non-Javadoc)
-     * @see org.acegisecurity.ui.AbstractProcessingFilter#attemptAuthentication(javax.servlet.http.HttpServletRequest)
+     * @see org.springframework.security.ui.AbstractProcessingFilter#attemptAuthentication(javax.servlet.http.HttpServletRequest)
      * @Override
      */
     public Authentication attemptAuthentication(HttpServletRequest req)
@@ -65,7 +65,7 @@ public class OpenIDResponseProcessingFilter extends AbstractProcessingFilter {
     }
 
     /* (non-Javadoc)
-     * @see org.acegisecurity.ui.AbstractProcessingFilter#getDefaultFilterProcessesUrl()
+     * @see org.springframework.security.ui.AbstractProcessingFilter#getDefaultFilterProcessesUrl()
      * @Override
      */
     public String getDefaultFilterProcessesUrl() {
diff --git a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationProcessingFilter.java b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationProcessingFilter.java
index ffef5a212f..051c84635e 100644
--- a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationProcessingFilter.java
+++ b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationProcessingFilter.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.openid;
-
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.AuthenticationServiceException;
-import org.acegisecurity.context.SecurityContextHolder;
-import org.acegisecurity.providers.openid.OpenIDAuthenticationToken;
-import org.acegisecurity.ui.AbstractProcessingFilter;
-import org.acegisecurity.ui.webapp.AuthenticationProcessingFilter;
+package org.springframework.security.ui.openid;
+
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.AuthenticationServiceException;
+import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.providers.openid.OpenIDAuthenticationToken;
+import org.springframework.security.ui.AbstractProcessingFilter;
+import org.springframework.security.ui.webapp.AuthenticationProcessingFilter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.util.StringUtils;
diff --git a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationRequiredException.java b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationRequiredException.java
index 315468057f..0fd21a6cd9 100644
--- a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationRequiredException.java
+++ b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationRequiredException.java
@@ -1,6 +1,6 @@
-package org.acegisecurity.ui.openid;
+package org.springframework.security.ui.openid;
 
-import org.acegisecurity.AuthenticationException;
+import org.springframework.security.AuthenticationException;
 
 /**
  * @author Ray Krueger
diff --git a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/JanRainOpenIDConsumer.java b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/JanRainOpenIDConsumer.java
index 8820cf26a8..9d0a846da9 100644
--- a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/JanRainOpenIDConsumer.java
+++ b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/JanRainOpenIDConsumer.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.ui.openid.consumers;
+package org.springframework.security.ui.openid.consumers;
 
 import com.janrain.openid.consumer.AuthRequest;
 import com.janrain.openid.consumer.Consumer;
@@ -21,12 +21,12 @@ import com.janrain.openid.consumer.Response;
 import com.janrain.openid.consumer.StatusCode;
 import com.janrain.openid.store.OpenIDStore;
 
-import org.acegisecurity.providers.openid.OpenIDAuthenticationStatus;
-import org.acegisecurity.providers.openid.OpenIDAuthenticationToken;
+import org.springframework.security.providers.openid.OpenIDAuthenticationStatus;
+import org.springframework.security.providers.openid.OpenIDAuthenticationToken;
 
-import org.acegisecurity.ui.openid.OpenIDConstants;
-import org.acegisecurity.ui.openid.OpenIDConsumer;
-import org.acegisecurity.ui.openid.OpenIDConsumerException;
+import org.springframework.security.ui.openid.OpenIDConstants;
+import org.springframework.security.ui.openid.OpenIDConsumer;
+import org.springframework.security.ui.openid.OpenIDConsumerException;
 
 import org.springframework.beans.factory.InitializingBean;
 
@@ -64,7 +64,7 @@ public class JanRainOpenIDConsumer implements OpenIDConsumer, InitializingBean {
     }
 
     /* (non-Javadoc)
-     * @see org.acegisecurity.ui.openid.OpenIDConsumer#beginConsumption(java.lang.String)
+     * @see org.springframework.security.ui.openid.OpenIDConsumer#beginConsumption(java.lang.String)
      */
     public String beginConsumption(HttpServletRequest req, String identityUrl, String returnToUrl)
         throws OpenIDConsumerException {
@@ -110,7 +110,7 @@ public class JanRainOpenIDConsumer implements OpenIDConsumer, InitializingBean {
     }
 
     /* (non-Javadoc)
-     * @see org.acegisecurity.ui.openid.OpenIDConsumer#endConsumption(javax.servlet.http.HttpServletRequest)
+     * @see org.springframework.security.ui.openid.OpenIDConsumer#endConsumption(javax.servlet.http.HttpServletRequest)
      */
     public OpenIDAuthenticationToken endConsumption(HttpServletRequest req)
         throws OpenIDConsumerException {
diff --git a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/OpenId4JavaConsumer.java b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/OpenId4JavaConsumer.java
index e0194786ef..b386e0aa55 100644
--- a/sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/OpenId4JavaConsumer.java
+++ b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/OpenId4JavaConsumer.java
@@ -12,13 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.ui.openid.consumers;
+package org.springframework.security.ui.openid.consumers;
 
-import org.acegisecurity.providers.openid.OpenIDAuthenticationStatus;
-import org.acegisecurity.providers.openid.OpenIDAuthenticationToken;
+import org.springframework.security.providers.openid.OpenIDAuthenticationStatus;
+import org.springframework.security.providers.openid.OpenIDAuthenticationToken;
 
-import org.acegisecurity.ui.openid.OpenIDConsumer;
-import org.acegisecurity.ui.openid.OpenIDConsumerException;
+import org.springframework.security.ui.openid.OpenIDConsumer;
+import org.springframework.security.ui.openid.OpenIDConsumerException;
 
 import org.openid4java.association.AssociationException;
 
diff --git a/sandbox/openid/src/test/java/org/springframework/security/providers/openid/MockAuthoritiesPopulator.java b/sandbox/openid/src/test/java/org/springframework/security/providers/openid/MockAuthoritiesPopulator.java
index 5760e978c2..9cb978445e 100644
--- a/sandbox/openid/src/test/java/org/springframework/security/providers/openid/MockAuthoritiesPopulator.java
+++ b/sandbox/openid/src/test/java/org/springframework/security/providers/openid/MockAuthoritiesPopulator.java
@@ -12,16 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.providers.openid;
+package org.springframework.security.providers.openid;
 
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
-import org.acegisecurity.providers.cas.CasAuthoritiesPopulator;
+import org.springframework.security.providers.cas.CasAuthoritiesPopulator;
 
-import org.acegisecurity.userdetails.User;
-import org.acegisecurity.userdetails.UserDetails;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.userdetails.UserDetails;
 
 
 /**
diff --git a/sandbox/openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationProviderTests.java b/sandbox/openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationProviderTests.java
index 4d77d76103..8659ffad28 100644
--- a/sandbox/openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationProviderTests.java
+++ b/sandbox/openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationProviderTests.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.providers.openid;
+package org.springframework.security.providers.openid;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationServiceException;
-import org.acegisecurity.BadCredentialsException;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationServiceException;
+import org.springframework.security.BadCredentialsException;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
@@ -36,7 +36,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase {
     //~ Methods ========================================================================================================
 
     /*
-     * Test method for 'org.acegisecurity.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
+     * Test method for 'org.springframework.security.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
      */
     public void testAuthenticateCancel() {
         OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
@@ -55,7 +55,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase {
     }
 
     /*
-     * Test method for 'org.acegisecurity.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
+     * Test method for 'org.springframework.security.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
      */
     public void testAuthenticateError() {
         OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
@@ -74,7 +74,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase {
     }
 
     /*
-     * Test method for 'org.acegisecurity.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
+     * Test method for 'org.springframework.security.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
      */
     public void testAuthenticateFailure() {
         OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
@@ -93,7 +93,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase {
     }
 
     /*
-     * Test method for 'org.acegisecurity.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
+     * Test method for 'org.springframework.security.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
      */
     public void testAuthenticateSetupNeeded() {
         OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
@@ -112,7 +112,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase {
     }
 
     /*
-     * Test method for 'org.acegisecurity.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
+     * Test method for 'org.springframework.security.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
      */
     public void testAuthenticateSuccess() {
         OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
@@ -147,7 +147,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase {
     }
 
     /*
-     * Test method for 'org.acegisecurity.providers.openid.OpenIDAuthenticationProvider.supports(Class)'
+     * Test method for 'org.springframework.security.providers.openid.OpenIDAuthenticationProvider.supports(Class)'
      */
     public void testDoesntSupport() {
         OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
@@ -157,7 +157,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase {
     }
 
     /*
-     * Test method for 'org.acegisecurity.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
+     * Test method for 'org.springframework.security.providers.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
      */
     public void testIgnoresUserPassAuthToken() {
         OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
@@ -168,7 +168,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase {
     }
 
     /*
-     * Test method for 'org.acegisecurity.providers.openid.OpenIDAuthenticationProvider.supports(Class)'
+     * Test method for 'org.springframework.security.providers.openid.OpenIDAuthenticationProvider.supports(Class)'
      */
     public void testSupports() {
         OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
diff --git a/sandbox/openid/src/test/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilterTests.java b/sandbox/openid/src/test/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilterTests.java
index 6c2046d6e4..17913fb4f4 100644
--- a/sandbox/openid/src/test/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilterTests.java
+++ b/sandbox/openid/src/test/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilterTests.java
@@ -12,21 +12,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.ui.openid;
+package org.springframework.security.ui.openid;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AbstractAuthenticationManager;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.BadCredentialsException;
+import org.springframework.security.AbstractAuthenticationManager;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.BadCredentialsException;
 
-import org.acegisecurity.providers.cas.CasAuthoritiesPopulator;
-import org.acegisecurity.providers.openid.MockAuthoritiesPopulator;
-import org.acegisecurity.providers.openid.OpenIDAuthenticationStatus;
-import org.acegisecurity.providers.openid.OpenIDAuthenticationToken;
+import org.springframework.security.providers.cas.CasAuthoritiesPopulator;
+import org.springframework.security.providers.openid.MockAuthoritiesPopulator;
+import org.springframework.security.providers.openid.OpenIDAuthenticationStatus;
+import org.springframework.security.providers.openid.OpenIDAuthenticationToken;
 
-import org.acegisecurity.ui.openid.consumers.MockOpenIDConsumer;
+import org.springframework.security.ui.openid.consumers.MockOpenIDConsumer;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 
@@ -44,7 +44,7 @@ public class OpenIDResponseProcessingFilterTests extends TestCase {
     //~ Methods ========================================================================================================
 
     /*
-     * Test method for 'org.acegisecurity.ui.openid.OpenIDResponseProcessingFilter.attemptAuthentication(HttpServletRequest)'
+     * Test method for 'org.springframework.security.ui.openid.OpenIDResponseProcessingFilter.attemptAuthentication(HttpServletRequest)'
      */
     public void testAttemptAuthenticationFailure() {
         // set up mock objects
@@ -70,7 +70,7 @@ public class OpenIDResponseProcessingFilterTests extends TestCase {
     }
 
     /*
-     * Test method for 'org.acegisecurity.ui.openid.OpenIDResponseProcessingFilter.attemptAuthentication(HttpServletRequest)'
+     * Test method for 'org.springframework.security.ui.openid.OpenIDResponseProcessingFilter.attemptAuthentication(HttpServletRequest)'
      */
     public void testAttemptAuthenticationHttpServletRequest() {
         // set up mock objects
@@ -102,7 +102,7 @@ public class OpenIDResponseProcessingFilterTests extends TestCase {
     }
 
     /*
-     * Test method for 'org.acegisecurity.ui.openid.OpenIDResponseProcessingFilter.getDefaultFilterProcessesUrl()'
+     * Test method for 'org.springframework.security.ui.openid.OpenIDResponseProcessingFilter.getDefaultFilterProcessesUrl()'
      */
     public void testGetDefaultFilterProcessesUrl() {
         OpenIDResponseProcessingFilter filter = new OpenIDResponseProcessingFilter();
diff --git a/sandbox/openid/src/test/java/org/springframework/security/ui/openid/consumers/MockOpenIDConsumer.java b/sandbox/openid/src/test/java/org/springframework/security/ui/openid/consumers/MockOpenIDConsumer.java
index a0cd667b01..d81a2e1438 100644
--- a/sandbox/openid/src/test/java/org/springframework/security/ui/openid/consumers/MockOpenIDConsumer.java
+++ b/sandbox/openid/src/test/java/org/springframework/security/ui/openid/consumers/MockOpenIDConsumer.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.ui.openid.consumers;
+package org.springframework.security.ui.openid.consumers;
 
-import org.acegisecurity.providers.openid.OpenIDAuthenticationToken;
+import org.springframework.security.providers.openid.OpenIDAuthenticationToken;
 
-import org.acegisecurity.ui.openid.OpenIDConsumer;
-import org.acegisecurity.ui.openid.OpenIDConsumerException;
+import org.springframework.security.ui.openid.OpenIDConsumer;
+import org.springframework.security.ui.openid.OpenIDConsumerException;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -36,7 +36,7 @@ public class MockOpenIDConsumer implements OpenIDConsumer {
     //~ Methods ========================================================================================================
 
     /* (non-Javadoc)
-     * @see org.acegisecurity.ui.openid.OpenIDConsumer#beginConsumption(javax.servlet.http.HttpServletRequest, java.lang.String)
+     * @see org.springframework.security.ui.openid.OpenIDConsumer#beginConsumption(javax.servlet.http.HttpServletRequest, java.lang.String)
      */
     public String beginConsumption(HttpServletRequest req, String identityUrl, String returnToUrl)
         throws OpenIDConsumerException {
@@ -44,7 +44,7 @@ public class MockOpenIDConsumer implements OpenIDConsumer {
     }
 
     /* (non-Javadoc)
-     * @see org.acegisecurity.ui.openid.OpenIDConsumer#endConsumption(javax.servlet.http.HttpServletRequest)
+     * @see org.springframework.security.ui.openid.OpenIDConsumer#endConsumption(javax.servlet.http.HttpServletRequest)
      */
     public OpenIDAuthenticationToken endConsumption(HttpServletRequest req)
         throws OpenIDConsumerException {
@@ -61,7 +61,7 @@ public class MockOpenIDConsumer implements OpenIDConsumer {
     }
 
     /* (non-Javadoc)
-     * @see org.acegisecurity.ui.openid.OpenIDConsumer#setReturnToUrl(java.lang.String)
+     * @see org.springframework.security.ui.openid.OpenIDConsumer#setReturnToUrl(java.lang.String)
      */
     public void setReturnToUrl(String returnToUrl) {
         // TODO Auto-generated method stub
diff --git a/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/AccountLockedException.java b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/AccountLockedException.java
index 6aa12f351f..2fd2f55977 100644
--- a/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/AccountLockedException.java
+++ b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/AccountLockedException.java
@@ -1,4 +1,4 @@
-package org.acegisecurity.ldap.ppolicy;
+package org.springframework.security.ldap.ppolicy;
 
 /**
  * @author Luke
diff --git a/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/OracleIDPasswordPolicyControl.java b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/OracleIDPasswordPolicyControl.java
index 9789994f4e..87f995ce98 100644
--- a/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/OracleIDPasswordPolicyControl.java
+++ b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/OracleIDPasswordPolicyControl.java
@@ -1,4 +1,4 @@
-package org.acegisecurity.ldap.ppolicy;
+package org.springframework.security.ldap.ppolicy;
 
 /**
  * @author Luke
diff --git a/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordExpiredException.java b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordExpiredException.java
index 55c68bb590..dbf96d4f1a 100644
--- a/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordExpiredException.java
+++ b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordExpiredException.java
@@ -1,4 +1,4 @@
-package org.acegisecurity.ldap.ppolicy;
+package org.springframework.security.ldap.ppolicy;
 
 /**
  * @author Luke
diff --git a/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordInHistoryException.java b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordInHistoryException.java
index e00cf51f53..1fd774f0bc 100644
--- a/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordInHistoryException.java
+++ b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordInHistoryException.java
@@ -1,4 +1,4 @@
-package org.acegisecurity.ldap.ppolicy;
+package org.springframework.security.ldap.ppolicy;
 
 /**
  * @author Luke
diff --git a/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java
index 4eccd6cc79..a20962d11b 100644
--- a/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java
+++ b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ldap.ppolicy;
+package org.springframework.security.ldap.ppolicy;
 
 import javax.naming.ldap.Control;
 
diff --git a/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactory.java b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactory.java
index c3a38553b9..8e20eb98fa 100644
--- a/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactory.java
+++ b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactory.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ldap.ppolicy;
+package org.springframework.security.ldap.ppolicy;
 
-import org.acegisecurity.ldap.ppolicy.PasswordPolicyControl;
+import org.springframework.security.ldap.ppolicy.PasswordPolicyControl;
 
 import javax.naming.ldap.Control;
 import javax.naming.ldap.ControlFactory;
diff --git a/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyException.java b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyException.java
index e80e74be4d..bc6e42ce58 100644
--- a/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyException.java
+++ b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyException.java
@@ -1,6 +1,6 @@
-package org.acegisecurity.ldap.ppolicy;
+package org.springframework.security.ldap.ppolicy;
 
-import org.acegisecurity.AuthenticationException;
+import org.springframework.security.AuthenticationException;
 
 /**
  * @author Luke
diff --git a/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java
index 962a1ae8d4..a67583d002 100644
--- a/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java
+++ b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ldap.ppolicy;
+package org.springframework.security.ldap.ppolicy;
 
 import netscape.ldap.ber.stream.BERChoice;
 import netscape.ldap.ber.stream.BERElement;
@@ -28,8 +28,8 @@ import netscape.ldap.ber.stream.BERSequence;
 import netscape.ldap.ber.stream.BERTag;
 import netscape.ldap.ber.stream.BERTagDecoder;
 
-import org.acegisecurity.ldap.LdapDataAccessException;
-import org.acegisecurity.ldap.ppolicy.PasswordPolicyControl;
+import org.springframework.security.ldap.LdapDataAccessException;
+import org.springframework.security.ldap.ppolicy.PasswordPolicyControl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -50,7 +50,7 @@ import java.io.InputStream;
  * @author Luke Taylor
  * @version $Id: PasswordPolicyResponseControl.java 1496 2006-05-23 13:38:33Z benalex $
  *
- * @see org.acegisecurity.ldap.ppolicy.PasswordPolicyControl
+ * @see org.springframework.security.ldap.ppolicy.PasswordPolicyControl
  * @see <a href="http://www.ibm.com/developerworks/tivoli/library/t-ldap-controls/">Stefan Zoerner's IBM developerworks
  *      article on LDAP controls.</a>
  */
diff --git a/sandbox/other/src/main/java/org/springframework/security/providers/ldap/authenticator/OracleIDBindAuthenticator.java b/sandbox/other/src/main/java/org/springframework/security/providers/ldap/authenticator/OracleIDBindAuthenticator.java
index 96ac7bd9e3..7993ab6321 100644
--- a/sandbox/other/src/main/java/org/springframework/security/providers/ldap/authenticator/OracleIDBindAuthenticator.java
+++ b/sandbox/other/src/main/java/org/springframework/security/providers/ldap/authenticator/OracleIDBindAuthenticator.java
@@ -1,11 +1,9 @@
-package org.acegisecurity.providers.ldap.authenticator;
+package org.springframework.security.providers.ldap.authenticator;
 
-import org.acegisecurity.ldap.InitialDirContextFactory;
-import org.acegisecurity.ldap.DefaultInitialDirContextFactory;
-import org.acegisecurity.ldap.ppolicy.PasswordExpiredException;
-import org.acegisecurity.ldap.ppolicy.AccountLockedException;
-import org.acegisecurity.ldap.ppolicy.PasswordPolicyException;
-import org.acegisecurity.ldap.ppolicy.PasswordInHistoryException;
+import org.springframework.security.ldap.InitialDirContextFactory;
+import org.springframework.security.ldap.ppolicy.PasswordExpiredException;
+import org.springframework.security.ldap.ppolicy.AccountLockedException;
+import org.springframework.security.ldap.ppolicy.PasswordPolicyException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/sandbox/other/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java b/sandbox/other/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java
index 2e4c3ecb50..bfa8e114a6 100644
--- a/sandbox/other/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java
+++ b/sandbox/other/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java
@@ -13,16 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ldap.ppolicy;
+package org.springframework.security.ldap.ppolicy;
 
 import junit.framework.TestCase;
 
-import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.naming.ldap.InitialLdapContext;
 import javax.naming.ldap.Control;
-import javax.naming.ldap.LdapContext;
-import java.util.Hashtable;
 
 /**
  * Tests for <tt>PasswordPolicyResponse</tt>.
@@ -41,8 +38,8 @@ public class PasswordPolicyResponseControlTests extends TestCase {
 //        env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
 //        env.put(Context.PROVIDER_URL, "ldap://gorille:389/");
 //        env.put(Context.SECURITY_AUTHENTICATION, "simple");
-//        env.put(Context.SECURITY_PRINCIPAL, "cn=manager,dc=acegisecurity,dc=org");
-//        env.put(Context.SECURITY_CREDENTIALS, "acegisecurity");
+//        env.put(Context.SECURITY_PRINCIPAL, "cn=manager,dc=security,dc=org");
+//        env.put(Context.SECURITY_CREDENTIALS, "security");
 //        env.put(LdapContext.CONTROL_FACTORIES, PasswordPolicyControlFactory.class.getName());
 //
 //        InitialLdapContext ctx = new InitialLdapContext(env, null);
@@ -52,7 +49,7 @@ public class PasswordPolicyResponseControlTests extends TestCase {
 //        ctx.setRequestControls(rctls);
 //
 //        try {
-//            ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, "uid=bob,ou=people,dc=acegisecurity,dc=org" );
+//            ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, "uid=bob,ou=people,dc=security,dc=org" );
 //            ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, "bobspassword");
 //            Object o = ctx.lookup("");
 //
diff --git a/sandbox/spring-security-config/pom.xml b/sandbox/spring-security-config/pom.xml
index fe9224e8f6..0169d5d862 100644
--- a/sandbox/spring-security-config/pom.xml
+++ b/sandbox/spring-security-config/pom.xml
@@ -2,18 +2,18 @@
 <project>
 	<parent>
 		<artifactId>acegi-security-sandbox</artifactId>
-		<groupId>org.acegisecurity</groupId>
+		<groupId>org.springframework.security</groupId>
 		<version>2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.acegisecurity</groupId>
+	<groupId>org.springframework.security</groupId>
 	<artifactId>spring-security-config</artifactId>
 	<name>spring-security-config</name>
 	<version>2.0.0-SNAPSHOT</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
-			<groupId>org.acegisecurity</groupId>
+			<groupId>org.springframework.security</groupId>
 			<artifactId>acegi-security-tiger</artifactId>
 			<version>1.0.6-SNAPSHOT</version>
 		</dependency>
diff --git a/sandbox/spring-security-config/src/main/resources/org/acegisecurity/config/spring-security-2.0.xsd b/sandbox/spring-security-config/src/main/resources/org/acegisecurity/config/spring-security-2.0.xsd
index 76b8eb45cd..755a091e12 100644
--- a/sandbox/spring-security-config/src/main/resources/org/acegisecurity/config/spring-security-2.0.xsd
+++ b/sandbox/spring-security-config/src/main/resources/org/acegisecurity/config/spring-security-2.0.xsd
@@ -91,7 +91,7 @@
 		type="RememberMeFilter">
 		<xsd:annotation>
 			<xsd:documentation
-				source="org.acegisecurity.ui.rememberme.RememberMeProcessingFilter">
+				source="org.springframework.security.ui.rememberme.RememberMeProcessingFilter">
 				<![CDATA[
 	makes the filter, but does little else, as it auto-detects everything
 				]]>
@@ -243,10 +243,10 @@
 		type="AuthenticationManager">
 		<xsd:annotation>
 			<xsd:documentation
-				source="org.acegisecurity.providers.ProviderManager">
+				source="org.springframework.security.providers.ProviderManager">
 				<![CDATA[
-				Resolves to 'org.acegisecurity.providers.ProviderManager'
-				]]>
+				Resolves to 'org.springframework.security.providers.ProviderManager'
+                                                ]]>
 			</xsd:documentation>
 		</xsd:annotation>
 	</xsd:element>
@@ -272,7 +272,7 @@
 	<xsd:element name="authentication-jdbc">
 		<xsd:annotation>
 			<xsd:documentation
-				source="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
+				source="org.springframework.security.providers.dao.DaoAuthenticationProvider">
 				<![CDATA[
 				if not specified will be auto-tetected from the ApplicationContext and tried in order 
 				]]>
@@ -286,7 +286,7 @@
 	<xsd:element name="authentication-ldap">
 		<xsd:annotation>
 			<xsd:documentation
-				source="org.acegisecurity.providers.ldap.LdapAuthenticationProvider">
+				source="org.springframework.security.providers.ldap.LdapAuthenticationProvider">
 				<![CDATA[
 				if not specified will be auto-tetected from the ApplicationContext and tried in order 
 				]]>
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/applicationContext-acegi-security.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/applicationContext-acegi-security.xml
index 1853072345..5650b2c916 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/applicationContext-acegi-security.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/applicationContext-acegi-security.xml
@@ -23,7 +23,7 @@
 
 
 	<bean id="filterChainProxy"
-		class="org.acegisecurity.util.FilterChainProxy">
+		class="org.springframework.security.util.FilterChainProxy">
 		<property name="filterInvocationDefinitionSource">
 			<value>
 				CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
@@ -48,7 +48,7 @@
 
 
 	<bean id="securityContextLogoutHandler"
-		class="org.acegisecurity.ui.logout.SecurityContextLogoutHandler" />
+		class="org.springframework.security.ui.logout.SecurityContextLogoutHandler" />
 
 	<!--  the URLs are all mandatory and have no defaults (well, except authenticationUrl) -->
 	<security:authentication-form id="authenticationProcessingFilter"
@@ -72,14 +72,14 @@
 
 
 	<bean id="securityContextHolderAwareRequestFilter"
-		class="org.acegisecurity.wrapper.SecurityContextHolderAwareRequestFilter" />
+		class="org.springframework.security.wrapper.SecurityContextHolderAwareRequestFilter" />
 
 	<!-- makes the filter, but does little else, as it auto-detects everything -->
 	<security:authentication-remember-me-filter
 		id="rememberMeProcessingFilter" />
 
 	<bean id="anonymousProcessingFilter"
-		class="org.acegisecurity.providers.anonymous.AnonymousProcessingFilter">
+		class="org.springframework.security.providers.anonymous.AnonymousProcessingFilter">
 		<property name="key" value="changeThis" />
 		<property name="userAttribute"
 			value="anonymousUser,ROLE_ANONYMOUS" />
@@ -95,31 +95,31 @@
 
 
 	<bean id="authenticationEntryPoint"
-		class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint">
+		class="org.springframework.security.ui.webapp.AuthenticationProcessingFilterEntryPoint">
 		<property name="loginFormUrl" value="/acegilogin.jsp" />
 		<property name="forceHttps" value="false" />
 	</bean>
 
 
 	<bean id="accessDeniedHandler"
-		class="org.acegisecurity.ui.AccessDeniedHandlerImpl">
+		class="org.springframework.security.ui.AccessDeniedHandlerImpl">
 		<property name="errorPage" value="/accessDenied.jsp" />
 	</bean>
 
 
 	<bean id="filterInvocationInterceptor"
-		class="org.acegisecurity.intercept.web.FilterSecurityInterceptor">
+		class="org.springframework.security.intercept.web.FilterSecurityInterceptor">
 		<property name="authenticationManager"
 			ref="authenticationManager" />
 		<property name="accessDecisionManager">
-			<bean class="org.acegisecurity.vote.AffirmativeBased">
+			<bean class="org.springframework.security.vote.AffirmativeBased">
 				<property name="allowIfAllAbstainDecisions"
 					value="false" />
 				<property name="decisionVoters">
 					<list>
-						<bean class="org.acegisecurity.vote.RoleVoter" />
+						<bean class="org.springframework.security.vote.RoleVoter" />
 						<bean
-							class="org.acegisecurity.vote.AuthenticatedVoter" />
+							class="org.springframework.security.vote.AuthenticatedVoter" />
 					</list>
 				</property>
 			</bean>
@@ -137,16 +137,16 @@
 
 
 	<!--<bean id="authenticationManager"
-		class="org.acegisecurity.providers.ProviderManager">
+		class="org.springframework.security.providers.ProviderManager">
 		<property name="providers">
 		<list>
 		<ref local="daoAuthenticationProvider" />
 		<bean
-		class="org.acegisecurity.providers.anonymous.AnonymousAuthenticationProvider">
+		class="org.springframework.security.providers.anonymous.AnonymousAuthenticationProvider">
 		<property name="key" value="changeThis" />
 		</bean>
 		<bean
-		class="org.acegisecurity.providers.rememberme.RememberMeAuthenticationProvider">
+		class="org.springframework.security.providers.rememberme.RememberMeAuthenticationProvider">
 		<property name="key" value="changeThis" />
 		</bean>
 		</list>
@@ -154,7 +154,7 @@
 		</bean>-->
 
 	<bean id="userCache"
-		class="org.acegisecurity.providers.dao.cache.EhCacheBasedUserCache">
+		class="org.springframework.security.providers.dao.cache.EhCacheBasedUserCache">
 		<property name="cache">
 			<bean
 				class="org.springframework.cache.ehcache.EhCacheFactoryBean">
@@ -169,6 +169,6 @@
 
 	<!-- This bean is optional; it isn't used by any other bean as it only listens and logs -->
 	<bean id="loggerListener"
-		class="org.acegisecurity.event.authentication.LoggerListener" />
+		class="org.springframework.security.event.authentication.LoggerListener" />
 
 </beans>
\ No newline at end of file
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-beanRef-attributes.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-beanRef-attributes.xml
index 9885cdf1dc..ab1b1458ea 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-beanRef-attributes.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-beanRef-attributes.xml
@@ -15,7 +15,7 @@
 	</security:authentication-repository>
 
 	<bean id="refToUserDetailsService"
-		class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl">
+		class="org.springframework.security.userdetails.jdbc.JdbcDaoImpl">
 		<property name="dataSource">
 			<ref bean="dataSource" />
 		</property>
@@ -39,13 +39,13 @@
 	</bean>
 	
 	<bean id="refToSaltSource"
-		class="org.acegisecurity.providers.dao.salt.SystemWideSaltSource">
+		class="org.springframework.security.providers.dao.salt.SystemWideSaltSource">
 		<property name="systemWideSalt">
 			<value>12345</value>
 		</property>
 	</bean>
 
 	<bean id="refToPasswordEncoder"
-		class="org.acegisecurity.providers.encoding.Md5PasswordEncoder" />
+		class="org.springframework.security.providers.encoding.Md5PasswordEncoder" />
 	
 </beans>
\ No newline at end of file
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-dao-defaults.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-dao-defaults.xml
index 6de9406972..1f924cbc5e 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-dao-defaults.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-dao-defaults.xml
@@ -19,7 +19,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
 	</security:authentication-repository>
 
 	<bean id="userDetailsService"
-		class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl">
+		class="org.springframework.security.userdetails.jdbc.JdbcDaoImpl">
 		<property name="dataSource">
 			<ref bean="dataSource" />
 		</property>
@@ -43,12 +43,12 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
 	</bean>
 
 	<bean id="saltSource"
-		class="org.acegisecurity.providers.dao.salt.SystemWideSaltSource">
+		class="org.springframework.security.providers.dao.salt.SystemWideSaltSource">
 		<property name="systemWideSalt">
 			<value>12345</value>
 		</property>
 	</bean>
 
 	<bean id="passwordEncoder"
-		class="org.acegisecurity.providers.encoding.Md5PasswordEncoder" />
+		class="org.springframework.security.providers.encoding.Md5PasswordEncoder" />
 </beans>
\ No newline at end of file
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-defaults.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-defaults.xml
index d4a24931d9..8bec15cc20 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-defaults.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-defaults.xml
@@ -14,7 +14,7 @@
 	<security:authentication-repository id="authenticationRepository"/>
 
 	<bean id="userDetailsService"
-		class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl">
+		class="org.springframework.security.userdetails.jdbc.JdbcDaoImpl">
 		<property name="dataSource">
 			<ref bean="dataSource" />
 		</property>
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-form-filter.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-form-filter.xml
index 3187c14593..b48484627a 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-form-filter.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-form-filter.xml
@@ -29,7 +29,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
 		id="rememberMeServices" key="someValue" />
 
 	<bean id="userDetailsService"
-		class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl">
+		class="org.springframework.security.userdetails.jdbc.JdbcDaoImpl">
 		<property name="dataSource">
 			<ref bean="dataSource" />
 		</property>
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-innerbeans.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-innerbeans.xml
index f096d01e78..88f6493736 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-innerbeans.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authentication-innerbeans.xml
@@ -24,7 +24,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
 	</security:authentication-repository>
 
 	<bean id="AnyBeanIdAsThisBeanWillBeAutoDetectedAndInjectedInauthenticationRepositoryUsingAutoWireByType"
-		class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl">
+		class="org.springframework.security.userdetails.jdbc.JdbcDaoImpl">
 		<property name="dataSource">
 			<ref bean="dataSource" />
 		</property>
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-http-config.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-http-config.xml
index 38efe1b606..a46dda7c4f 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-http-config.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-http-config.xml
@@ -29,18 +29,18 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
 
 
 	<!--<bean id="filterInvocationInterceptor"
-		class="org.acegisecurity.intercept.web.FilterSecurityInterceptor">
+		class="org.springframework.security.intercept.web.FilterSecurityInterceptor">
 		<property name="authenticationManager"
 		ref="authenticationManager" />
 		<property name="accessDecisionManager">
-		<bean class="org.acegisecurity.vote.AffirmativeBased">
+		<bean class="org.springframework.security.vote.AffirmativeBased">
 		<property name="allowIfAllAbstainDecisions"
 		value="false" />
 		<property name="decisionVoters">
 		<list>
-		<bean class="org.acegisecurity.vote.RoleVoter" />
+		<bean class="org.springframework.security.vote.RoleVoter" />
 		<bean
-		class="org.acegisecurity.vote.AuthenticatedVoter" />
+		class="org.springframework.security.vote.AuthenticatedVoter" />
 		</list>
 		</property>
 		</bean>
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method-annotations.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method-annotations.xml
index deeef05543..40d69eed7a 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method-annotations.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method-annotations.xml
@@ -30,7 +30,7 @@
 		springAop="true" >
 		<security:url-mapping source="annotations">
 			<security:method-pattern
-				type="org.acegisecurity.BankServiceImpl.listAccounts">
+				type="org.springframework.security.BankServiceImpl.listAccounts">
 				<security:configuration-attribute attribute="ROLE_A" />
 				<security:configuration-attribute attribute="ROLE_B" />
 			</security:method-pattern>
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method-aspectj.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method-aspectj.xml
index 0f1233dd78..09fe8b4c3c 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method-aspectj.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method-aspectj.xml
@@ -30,7 +30,7 @@
 		aspectj="true" >
 		<security:url-mapping source="annotations">
 			<security:method-pattern
-				type="org.acegisecurity.BankServiceImpl.listAccounts">
+				type="org.springframework.security.BankServiceImpl.listAccounts">
 				<security:configuration-attribute attribute="ROLE_A" />
 				<security:configuration-attribute attribute="ROLE_B" />
 			</security:method-pattern>
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method-attributes.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method-attributes.xml
index ff13e48ec8..e641025249 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method-attributes.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method-attributes.xml
@@ -30,7 +30,7 @@
 		springAop="true" >
 		<security:url-mapping source="attributes">
 			<security:method-pattern
-				type="org.acegisecurity.BankServiceImpl.listAccounts">
+				type="org.springframework.security.BankServiceImpl.listAccounts">
 				<security:configuration-attribute attribute="ROLE_A" />
 				<security:configuration-attribute attribute="ROLE_B" />
 			</security:method-pattern>
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method.xml
index 88d418e26f..6d32409063 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/authorization-method.xml
@@ -30,7 +30,7 @@
 		springAop="true" >
 		<security:url-mapping source="xml">
 			<security:method-pattern
-				type="org.acegisecurity.BankServiceImpl.listAccounts">
+				type="org.springframework.security.BankServiceImpl.listAccounts">
 				<security:configuration-attribute attribute="ROLE_A" />
 			</security:method-pattern>
 		</security:url-mapping>
@@ -38,7 +38,7 @@
 
 
 	<!-- 
-		<bean id="methodSecurity" class="org.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor">
+		<bean id="methodSecurity" class="org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor">
 		<property name="validateConfigAttributes"><value>true</value></property>
 		<property name="authenticationManager"><ref bean="authenticationManager"/></property>
 		<property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property>
@@ -46,8 +46,8 @@
 		<property name="afterInvocationManager"><ref bean="afterInvocationManager"/></property>
 		<property name="objectDefinitionSource">
 		<value>
-		org.acegisecurity.context.BankManager.delete*=ROLE_SUPERVISOR,RUN_AS_SERVER
-		org.acegisecurity.context.BankManager.getBalance=ROLE_TELLER,ROLE_SUPERVISOR,BANKSECURITY_CUSTOMER,RUN_AS_SERVER
+		org.springframework.security.context.BankManager.delete*=ROLE_SUPERVISOR,RUN_AS_SERVER
+		org.springframework.security.context.BankManager.getBalance=ROLE_TELLER,ROLE_SUPERVISOR,BANKSECURITY_CUSTOMER,RUN_AS_SERVER
 		</value>
 		</property>
 		</bean> 
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/auto-config.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/auto-config.xml
index cd932b60b4..aaec66e688 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/auto-config.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/auto-config.xml
@@ -26,7 +26,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
 			resource="classpath:org/acegisecurity/config/user.properties" />
 	</security:principal-repository>
 	
-	<bean id="bankService" class="org.acegisecurity.BankServiceImpl"/>
+	<bean id="bankService" class="org.springframework.security.BankServiceImpl"/>
 	
 	
 </beans>
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/exception-translation-autodetect-handler.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/exception-translation-autodetect-handler.xml
index 9c927be891..b2adc28328 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/exception-translation-autodetect-handler.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/exception-translation-autodetect-handler.xml
@@ -20,17 +20,17 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
 	</security:exception-translation>
 
 	<bean id="theBeanToUse"
-		class="org.acegisecurity.ui.AccessDeniedHandlerImpl">
+		class="org.springframework.security.ui.AccessDeniedHandlerImpl">
 		<property name="errorPage" value="/accessDenied.jsp" />
 	</bean>
 
 	<!--<bean id="anotherBeanToUse"
-		class="org.acegisecurity.ui.AccessDeniedHandlerImpl">
+		class="org.springframework.security.ui.AccessDeniedHandlerImpl">
 		<property name="errorPage" value="/accessDenied.jsp" />
 		</bean>-->
 		
 	<bean id="authenticationProcessingFilterEntryPoint"
-		class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint">
+		class="org.springframework.security.ui.webapp.AuthenticationProcessingFilterEntryPoint">
 		<property name="loginFormUrl">
 			<value>/acegilogin.jsp</value>
 		</property>
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/exception-translation-beanref.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/exception-translation-beanref.xml
index e2427d987b..3b2f1f3155 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/exception-translation-beanref.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/exception-translation-beanref.xml
@@ -22,12 +22,12 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
 	</security:exception-translation>
 
 	<bean id="theBeanToUse"
-		class="org.acegisecurity.ui.AccessDeniedHandlerImpl">
+		class="org.springframework.security.ui.AccessDeniedHandlerImpl">
 		<property name="errorPage" value="/accessDenied.jsp" />
 	</bean>
 
 	<bean id="authenticationProcessingFilterEntryPoint"
-		class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint">
+		class="org.springframework.security.ui.webapp.AuthenticationProcessingFilterEntryPoint">
 		<property name="loginFormUrl">
 			<value>/acegilogin.jsp</value>
 		</property>
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/ldap-config.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/ldap-config.xml
index c73468314d..0f9a3338c1 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/ldap-config.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/ldap-config.xml
@@ -27,7 +27,7 @@
 
 
 	<!--<bean id="initialDirContextFactory"
-		class="org.acegisecurity.ldap.DefaultInitialDirContextFactory">
+		class="org.springframework.security.ldap.DefaultInitialDirContextFactory">
 		<constructor-arg
 		value="ldap://monkeymachine:389/dc=acegisecurity,dc=org" />
 		<property name="managerDn">
@@ -39,10 +39,10 @@
 		</bean>
 		
 		<bean id="ldapAuthProvider"
-		class="org.acegisecurity.providers.ldap.LdapAuthenticationProvider">
+		class="org.springframework.security.providers.ldap.LdapAuthenticationProvider">
 		<constructor-arg>
 		<bean
-		class="org.acegisecurity.providers.ldap.authenticator.BindAuthenticator">
+		class="org.springframework.security.providers.ldap.authenticator.BindAuthenticator">
 		<constructor-arg>
 		<ref local="initialDirContextFactory" />
 		</constructor-arg>
@@ -55,7 +55,7 @@
 		</constructor-arg>
 		<constructor-arg>
 		<bean
-		class="org.acegisecurity.providers.ldap.populator.DefaultLdapAuthoritiesPopulator">
+		class="org.springframework.security.providers.ldap.populator.DefaultLdapAuthoritiesPopulator">
 		<constructor-arg>
 		<ref local="initialDirContextFactory" />
 		</constructor-arg>
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/logout-filter-with-handlers.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/logout-filter-with-handlers.xml
index cf1168fbb1..567e6d324a 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/logout-filter-with-handlers.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/logout-filter-with-handlers.xml
@@ -21,7 +21,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
 		id="rememberMeServices" key="someValue" />
 
 	<bean id="SecurityContextLogoutHandler"
-		class="org.acegisecurity.ui.logout.SecurityContextLogoutHandler" />
+		class="org.springframework.security.ui.logout.SecurityContextLogoutHandler" />
 
 	<security:principal-repository id="userDetailsService">
 		<security:user-definition username="vishal"
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/remember-me-autodetect.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/remember-me-autodetect.xml
index 5cba7707ef..998778368a 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/remember-me-autodetect.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/remember-me-autodetect.xml
@@ -37,7 +37,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
 	<security:authentication-repository id="authenticationRepository" />
 
 	<bean id="userDetailsService"
-		class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl">
+		class="org.springframework.security.userdetails.jdbc.JdbcDaoImpl">
 		<property name="dataSource">
 			<ref bean="dataSource" />
 		</property>
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/remember-me-defaults.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/remember-me-defaults.xml
index 077caf79d6..46f6362418 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/remember-me-defaults.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/remember-me-defaults.xml
@@ -38,7 +38,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
 	<security:authentication-repository id="authenticationRepository" />
 
 	<bean id="userDetailsService"
-		class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl">
+		class="org.springframework.security.userdetails.jdbc.JdbcDaoImpl">
 		<property name="dataSource">
 			<ref bean="dataSource" />
 		</property>
diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/session-context-integration-defaults.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/session-context-integration-defaults.xml
index 1ba0d6483e..d74ed55dd3 100644
--- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/session-context-integration-defaults.xml
+++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/session-context-integration-defaults.xml
@@ -36,7 +36,7 @@
 		 same story here, inner beans allowed 
 	</security:authentication-repository>
 	
-	<bean id="userDetails" class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl">
+	<bean id="userDetails" class="org.springframework.security.userdetails.jdbc.JdbcDaoImpl">
       <property name="dataSource"><ref bean="dataSource"/></property>
     </bean>
     
diff --git a/sandbox/webwork/src/main/java/org/springframework/security/webwork/AcegiDispatcherUtils.java b/sandbox/webwork/src/main/java/org/springframework/security/webwork/AcegiDispatcherUtils.java
index d79badff72..ca5bbf9ada 100644
--- a/sandbox/webwork/src/main/java/org/springframework/security/webwork/AcegiDispatcherUtils.java
+++ b/sandbox/webwork/src/main/java/org/springframework/security/webwork/AcegiDispatcherUtils.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.webwork;
+package org.springframework.security.webwork;
 
 import java.util.Map;
 
@@ -21,7 +21,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.acegisecurity.ui.ExceptionTranslationFilter;
+import org.springframework.security.ui.ExceptionTranslationFilter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/sandbox/webwork/src/main/java/org/springframework/security/webwork/FilterDispatcher.java b/sandbox/webwork/src/main/java/org/springframework/security/webwork/FilterDispatcher.java
index 288168008b..30fdf4542f 100644
--- a/sandbox/webwork/src/main/java/org/springframework/security/webwork/FilterDispatcher.java
+++ b/sandbox/webwork/src/main/java/org/springframework/security/webwork/FilterDispatcher.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.webwork;
+package org.springframework.security.webwork;
 
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 
-import org.acegisecurity.ui.ExceptionTranslationFilter;
+import org.springframework.security.ui.ExceptionTranslationFilter;
 
 import com.opensymphony.webwork.dispatcher.DispatcherUtils;