diff --git a/adapters/cas/src/main/java/org/acegisecurity/adapters/cas/CasPasswordHandler.java b/adapters/cas/src/main/java/org/acegisecurity/adapters/cas/CasPasswordHandler.java index 36bc94a92a..ac2af4e4c1 100644 --- a/adapters/cas/src/main/java/org/acegisecurity/adapters/cas/CasPasswordHandler.java +++ b/adapters/cas/src/main/java/org/acegisecurity/adapters/cas/CasPasswordHandler.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package net.sf.acegisecurity.adapters.cas; +package org.acegisecurity.adapters.cas; -import net.sf.acegisecurity.Authentication; -import net.sf.acegisecurity.AuthenticationException; -import net.sf.acegisecurity.AuthenticationManager; -import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken; +import org.acegisecurity.Authentication; +import org.acegisecurity.AuthenticationException; +import org.acegisecurity.AuthenticationManager; +import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/adapters/cas/src/main/java/org/acegisecurity/adapters/cas/CasPasswordHandlerProxy.java b/adapters/cas/src/main/java/org/acegisecurity/adapters/cas/CasPasswordHandlerProxy.java index a5dbd27dfe..b1cb782c4b 100644 --- a/adapters/cas/src/main/java/org/acegisecurity/adapters/cas/CasPasswordHandlerProxy.java +++ b/adapters/cas/src/main/java/org/acegisecurity/adapters/cas/CasPasswordHandlerProxy.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package net.sf.acegisecurity.adapters.cas; +package org.acegisecurity.adapters.cas; import edu.yale.its.tp.cas.auth.PasswordHandler; @@ -63,7 +63,7 @@ import javax.servlet.http.HttpServletRequest; * To configure CAS to use this class, edit CAS' web.xml and * define the edu.yale.its.tp.cas.authHandler context parameter * with the value - * net.sf.acegisecurity.adapters.cas.CasPasswordHandlerProxy. + * org.acegisecurity.adapters.cas.CasPasswordHandlerProxy. *

* * @author Ben Alex diff --git a/adapters/cas/src/main/resources/org/acegisecurity/adapters/cas/applicationContext.xml b/adapters/cas/src/main/resources/org/acegisecurity/adapters/cas/applicationContext.xml index 78cf5216dc..c1379b0daa 100644 --- a/adapters/cas/src/main/resources/org/acegisecurity/adapters/cas/applicationContext.xml +++ b/adapters/cas/src/main/resources/org/acegisecurity/adapters/cas/applicationContext.xml @@ -24,7 +24,7 @@ - + marissa=koala,ROLES_IGNORED_BY_CAS @@ -35,11 +35,11 @@ - + - + @@ -47,7 +47,7 @@ - + diff --git a/adapters/cas/src/test/java/org/acegisecurity/adapters/cas/CasPasswordHandlerProxyTests.java b/adapters/cas/src/test/java/org/acegisecurity/adapters/cas/CasPasswordHandlerProxyTests.java index 1a12f97e6e..aa6323d9a6 100644 --- a/adapters/cas/src/test/java/org/acegisecurity/adapters/cas/CasPasswordHandlerProxyTests.java +++ b/adapters/cas/src/test/java/org/acegisecurity/adapters/cas/CasPasswordHandlerProxyTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package net.sf.acegisecurity.adapters.cas; +package org.acegisecurity.adapters.cas; import junit.framework.TestCase; @@ -54,7 +54,7 @@ public class CasPasswordHandlerProxyTests extends TestCase { public void testDetectsIfHttpServletRequestNotPassed() { CasPasswordHandlerProxy proxy = new MockCasPasswordHandlerProxy( - "net/sf/acegisecurity/adapters/cas/applicationContext-valid.xml"); + "org/acegisecurity/adapters/cas/applicationContext-valid.xml"); try { proxy.authenticate(null, "x", "y"); @@ -67,7 +67,7 @@ public class CasPasswordHandlerProxyTests extends TestCase { public void testDetectsMissingDelegate() { CasPasswordHandlerProxy proxy = new MockCasPasswordHandlerProxy( - "net/sf/acegisecurity/adapters/cas/applicationContext-invalid.xml"); + "org/acegisecurity/adapters/cas/applicationContext-invalid.xml"); try { proxy.authenticate(new MockHttpServletRequest(), "x", "y"); @@ -80,7 +80,7 @@ public class CasPasswordHandlerProxyTests extends TestCase { public void testNormalOperation() { CasPasswordHandlerProxy proxy = new MockCasPasswordHandlerProxy( - "net/sf/acegisecurity/adapters/cas/applicationContext-valid.xml"); + "org/acegisecurity/adapters/cas/applicationContext-valid.xml"); assertTrue(proxy.authenticate(new MockHttpServletRequest(), "marissa", "koala")); assertFalse(proxy.authenticate(new MockHttpServletRequest(), "marissa", diff --git a/adapters/cas/src/test/java/org/acegisecurity/adapters/cas/CasPasswordHandlerTests.java b/adapters/cas/src/test/java/org/acegisecurity/adapters/cas/CasPasswordHandlerTests.java index e500fd6f59..3272028d22 100644 --- a/adapters/cas/src/test/java/org/acegisecurity/adapters/cas/CasPasswordHandlerTests.java +++ b/adapters/cas/src/test/java/org/acegisecurity/adapters/cas/CasPasswordHandlerTests.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package net.sf.acegisecurity.adapters.cas; +package org.acegisecurity.adapters.cas; import junit.framework.TestCase; -import net.sf.acegisecurity.MockAuthenticationManager; +import org.acegisecurity.MockAuthenticationManager; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-invalid.xml b/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-invalid.xml index 872d1f5977..4b0037023b 100644 --- a/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-invalid.xml +++ b/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-invalid.xml @@ -20,7 +20,7 @@ - + marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR @@ -31,11 +31,11 @@ - + - + diff --git a/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-valid.xml b/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-valid.xml index 33132386f3..d1572d7728 100644 --- a/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-valid.xml +++ b/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-valid.xml @@ -20,7 +20,7 @@ - + marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR @@ -31,11 +31,11 @@ - + - + @@ -43,7 +43,7 @@ - + diff --git a/adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealm.java b/adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealm.java index 2b9920a3fc..5f41def26a 100644 --- a/adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealm.java +++ b/adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealm.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package net.sf.acegisecurity.adapters.catalina; +package org.acegisecurity.adapters.catalina; -import net.sf.acegisecurity.Authentication; -import net.sf.acegisecurity.AuthenticationException; -import net.sf.acegisecurity.AuthenticationManager; -import net.sf.acegisecurity.adapters.PrincipalAcegiUserToken; -import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken; +import org.acegisecurity.Authentication; +import org.acegisecurity.AuthenticationException; +import org.acegisecurity.AuthenticationManager; +import org.acegisecurity.adapters.PrincipalAcegiUserToken; +import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; import org.apache.catalina.Container; import org.apache.catalina.LifecycleException; diff --git a/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-invalid.xml b/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-invalid.xml index d2d53302fa..822dfa84e5 100644 --- a/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-invalid.xml +++ b/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-invalid.xml @@ -22,7 +22,7 @@ - + marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR diff --git a/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-valid.xml b/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-valid.xml index 0c3ce24b6e..279e841de8 100644 --- a/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-valid.xml +++ b/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-valid.xml @@ -22,7 +22,7 @@ - + marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR @@ -34,13 +34,13 @@ - + true - + diff --git a/adapters/catalina/src/test/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealmTests.java b/adapters/catalina/src/test/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealmTests.java index cc2d73282c..1a187b29ca 100644 --- a/adapters/catalina/src/test/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealmTests.java +++ b/adapters/catalina/src/test/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealmTests.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package net.sf.acegisecurity.adapters.catalina; +package org.acegisecurity.adapters.catalina; import junit.framework.TestCase; -import net.sf.acegisecurity.GrantedAuthority; -import net.sf.acegisecurity.GrantedAuthorityImpl; -import net.sf.acegisecurity.adapters.PrincipalAcegiUserToken; +import org.acegisecurity.GrantedAuthority; +import org.acegisecurity.GrantedAuthorityImpl; +import org.acegisecurity.adapters.PrincipalAcegiUserToken; import org.apache.catalina.LifecycleException; @@ -271,7 +271,7 @@ public class CatalinaAcegiUserRealmTests extends TestCase { throws Exception { CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm(); - URL url = Thread.currentThread().getContextClassLoader().getResource("net/sf/acegisecurity/adapters/" + URL url = Thread.currentThread().getContextClassLoader().getResource("org/acegisecurity/adapters/" + fileName); if (url == null) { diff --git a/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModule.java b/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModule.java index d8144f31bc..0f9c55acdc 100644 --- a/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModule.java +++ b/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModule.java @@ -12,15 +12,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package net.sf.acegisecurity.adapters.jboss; +package org.acegisecurity.adapters.jboss; -import net.sf.acegisecurity.AccountExpiredException; -import net.sf.acegisecurity.Authentication; -import net.sf.acegisecurity.AuthenticationException; -import net.sf.acegisecurity.AuthenticationManager; -import net.sf.acegisecurity.CredentialsExpiredException; -import net.sf.acegisecurity.adapters.PrincipalAcegiUserToken; -import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken; +import org.acegisecurity.AccountExpiredException; +import org.acegisecurity.Authentication; +import org.acegisecurity.AuthenticationException; +import org.acegisecurity.AuthenticationManager; +import org.acegisecurity.CredentialsExpiredException; +import org.acegisecurity.adapters.PrincipalAcegiUserToken; +import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; import org.jboss.security.SimpleGroup; import org.jboss.security.SimplePrincipal; diff --git a/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilter.java b/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilter.java index 4b35313110..de85938443 100644 --- a/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilter.java +++ b/adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilter.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package net.sf.acegisecurity.adapters.jboss; +package org.acegisecurity.adapters.jboss; -import net.sf.acegisecurity.Authentication; -import net.sf.acegisecurity.context.SecurityContextHolder; +import org.acegisecurity.Authentication; +import org.acegisecurity.context.SecurityContextHolder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,7 +42,7 @@ import javax.servlet.ServletResponse; /** - * Populates a {@link net.sf.acegisecurity.context.security.SecureContext} from + * Populates a {@link org.acegisecurity.context.security.SecureContext} from * JBoss' java:comp/env/security/subject. * *

diff --git a/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModuleTests.java b/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModuleTests.java index 46a3fd4d51..0d07ab4b56 100644 --- a/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModuleTests.java +++ b/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModuleTests.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package net.sf.acegisecurity.adapters.jboss; +package org.acegisecurity.adapters.jboss; import junit.framework.TestCase; -import net.sf.acegisecurity.adapters.PrincipalAcegiUserToken; +import org.acegisecurity.adapters.PrincipalAcegiUserToken; import org.jboss.security.SimplePrincipal; @@ -75,7 +75,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { Properties props = new Properties(); props.put("key", ADAPTER_KEY); props.put("appContextLocation", - "net/sf/acegisecurity/adapters/adaptertest-invalid.xml"); + "org/acegisecurity/adapters/adaptertest-invalid.xml"); try { adapter.initialize(null, null, null, props); @@ -118,7 +118,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { Properties props = new Properties(); props.put("appContextLocation", - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); try { adapter.initialize(null, null, null, props); @@ -130,7 +130,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { props = new Properties(); props.put("key", ""); props.put("appContextLocation", - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); try { adapter.initialize(null, null, null, props); @@ -163,7 +163,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { Properties props = new Properties(); props.put("key", ADAPTER_KEY); props.put("appContextLocation", - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); Subject subject = new Subject(); @@ -182,7 +182,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { Properties props = new Properties(); props.put("key", ADAPTER_KEY); props.put("appContextLocation", - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); adapter.initialize(null, null, null, props); assertTrue(true); } @@ -193,7 +193,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { Properties props = new Properties(); props.put("key", ADAPTER_KEY); props.put("appContextLocation", - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); Subject subject = new Subject(); CallbackHandler callback = new MockCallbackHandler("marissa", "kangaroo"); @@ -214,7 +214,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { Properties props = new Properties(); props.put("key", ADAPTER_KEY); props.put("appContextLocation", - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); Subject subject = new Subject(); CallbackHandler callback = new MockCallbackHandler("melissa", "koala"); @@ -234,7 +234,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { Properties props = new Properties(); props.put("key", ADAPTER_KEY); props.put("appContextLocation", - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); Subject subject = new Subject(); CallbackHandler callback = new MockCallbackHandler("marissa", "koala"); @@ -264,7 +264,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { Properties props = new Properties(); props.put("key", ADAPTER_KEY); props.put("appContextLocation", - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); Subject subject = new Subject(); CallbackHandler callback = new MockCallbackHandler("marissa", null); @@ -285,7 +285,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { Properties props = new Properties(); props.put("key", ADAPTER_KEY); props.put("appContextLocation", - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); Subject subject = new Subject(); CallbackHandler callback = new MockCallbackHandler(null, null); @@ -306,7 +306,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { Properties props = new Properties(); props.put("key", ADAPTER_KEY); props.put("appContextLocation", - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); Subject subject = new Subject(); CallbackHandler callback = new MockCallbackHandler(null, "kangaroo"); @@ -326,7 +326,7 @@ public class JbossAcegiLoginModuleTests extends TestCase { Properties props = new Properties(); props.put("key", ADAPTER_KEY); props.put("appContextLocation", - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); Subject subject = new Subject(); CallbackHandler callback = new MockCallbackHandler("marissa", "koala"); diff --git a/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilterTests.java b/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilterTests.java index b82cc467e2..8a1b84169e 100644 --- a/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilterTests.java +++ b/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilterTests.java @@ -13,15 +13,15 @@ * limitations under the License. */ -package net.sf.acegisecurity.adapters.jboss; +package org.acegisecurity.adapters.jboss; import junit.framework.TestCase; -import net.sf.acegisecurity.GrantedAuthority; -import net.sf.acegisecurity.GrantedAuthorityImpl; -import net.sf.acegisecurity.adapters.PrincipalAcegiUserToken; -import net.sf.acegisecurity.context.SecurityContextHolder; -import net.sf.acegisecurity.context.SecurityContextImpl; +import org.acegisecurity.GrantedAuthority; +import org.acegisecurity.GrantedAuthorityImpl; +import org.acegisecurity.adapters.PrincipalAcegiUserToken; +import org.acegisecurity.context.SecurityContextHolder; +import org.acegisecurity.context.SecurityContextImpl; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/MockInitialContext.java b/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/MockInitialContext.java index eadc6614d3..05da9b8532 100644 --- a/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/MockInitialContext.java +++ b/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/MockInitialContext.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package net.sf.acegisecurity.adapters.jboss; +package org.acegisecurity.adapters.jboss; import java.util.Hashtable; diff --git a/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/MockJbossIntegrationFilter.java b/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/MockJbossIntegrationFilter.java index 24be99f68e..47565a6d22 100644 --- a/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/MockJbossIntegrationFilter.java +++ b/adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/MockJbossIntegrationFilter.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package net.sf.acegisecurity.adapters.jboss; +package org.acegisecurity.adapters.jboss; import javax.naming.Context; import javax.naming.NamingException; diff --git a/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealm.java b/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealm.java index ae2b941695..3b872bdbc8 100644 --- a/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealm.java +++ b/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealm.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package net.sf.acegisecurity.adapters.jetty; +package org.acegisecurity.adapters.jetty; -import net.sf.acegisecurity.Authentication; -import net.sf.acegisecurity.AuthenticationException; -import net.sf.acegisecurity.AuthenticationManager; -import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken; +import org.acegisecurity.Authentication; +import org.acegisecurity.AuthenticationException; +import org.acegisecurity.AuthenticationManager; +import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserToken.java b/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserToken.java index ff7a297081..d8e70c0ac0 100644 --- a/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserToken.java +++ b/adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserToken.java @@ -13,16 +13,16 @@ * limitations under the License. */ -package net.sf.acegisecurity.adapters.jetty; +package org.acegisecurity.adapters.jetty; -import net.sf.acegisecurity.GrantedAuthority; -import net.sf.acegisecurity.adapters.AbstractAdapterAuthenticationToken; +import org.acegisecurity.GrantedAuthority; +import org.acegisecurity.adapters.AbstractAdapterAuthenticationToken; import org.mortbay.http.UserPrincipal; /** - * A Jetty compatible {@link net.sf.acegisecurity.Authentication} object. + * A Jetty compatible {@link org.acegisecurity.Authentication} object. * * @author Ben Alex * @version $Id$ diff --git a/adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealmTests.java b/adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealmTests.java index 16e89b354f..c6590b9711 100644 --- a/adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealmTests.java +++ b/adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealmTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package net.sf.acegisecurity.adapters.jetty; +package org.acegisecurity.adapters.jetty; import junit.framework.TestCase; @@ -219,7 +219,7 @@ public class JettyAcegiUserRealmTests extends TestCase { private JettyAcegiUserRealm makeAdapter(String fileName) throws Exception { - String useFile = "net/sf/acegisecurity/adapters/" + fileName; + String useFile = "org/acegisecurity/adapters/" + fileName; return new JettyAcegiUserRealm(REALM_NAME, ADAPTER_KEY, useFile); } diff --git a/adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserTokenTests.java b/adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserTokenTests.java index bbe3a3c7b5..bfa611c0f3 100644 --- a/adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserTokenTests.java +++ b/adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserTokenTests.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package net.sf.acegisecurity.adapters.jetty; +package org.acegisecurity.adapters.jetty; import junit.framework.TestCase; -import net.sf.acegisecurity.GrantedAuthority; -import net.sf.acegisecurity.GrantedAuthorityImpl; +import org.acegisecurity.GrantedAuthority; +import org.acegisecurity.GrantedAuthorityImpl; /** diff --git a/adapters/resin/src/main/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticator.java b/adapters/resin/src/main/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticator.java index 0e680c11e9..450abd62af 100644 --- a/adapters/resin/src/main/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticator.java +++ b/adapters/resin/src/main/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticator.java @@ -13,15 +13,15 @@ * limitations under the License. */ -package net.sf.acegisecurity.adapters.resin; +package org.acegisecurity.adapters.resin; import com.caucho.http.security.AbstractAuthenticator; -import net.sf.acegisecurity.Authentication; -import net.sf.acegisecurity.AuthenticationException; -import net.sf.acegisecurity.AuthenticationManager; -import net.sf.acegisecurity.adapters.PrincipalAcegiUserToken; -import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken; +import org.acegisecurity.Authentication; +import org.acegisecurity.AuthenticationException; +import org.acegisecurity.AuthenticationManager; +import org.acegisecurity.adapters.PrincipalAcegiUserToken; +import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/adapters/resin/src/test/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticatorTests.java b/adapters/resin/src/test/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticatorTests.java index ced4f95f0a..7a15482e59 100644 --- a/adapters/resin/src/test/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticatorTests.java +++ b/adapters/resin/src/test/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticatorTests.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package net.sf.acegisecurity.adapters.resin; +package org.acegisecurity.adapters.resin; import junit.framework.TestCase; -import net.sf.acegisecurity.GrantedAuthority; -import net.sf.acegisecurity.GrantedAuthorityImpl; -import net.sf.acegisecurity.adapters.PrincipalAcegiUserToken; +import org.acegisecurity.GrantedAuthority; +import org.acegisecurity.GrantedAuthorityImpl; +import org.acegisecurity.adapters.PrincipalAcegiUserToken; import java.security.Principal; @@ -61,7 +61,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); adapter.setAppContextLocation( - "net/sf/acegisecurity/adapters/adaptertest-invalid.xml"); + "org/acegisecurity/adapters/adaptertest-invalid.xml"); adapter.setKey(ADAPTER_KEY); try { @@ -100,7 +100,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { public void testAdapterAbortsIfNoKeySpecified() throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); adapter.setAppContextLocation( - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); try { adapter.init(); @@ -136,7 +136,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { public void testAdapterStartsUpSuccess() throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); adapter.setAppContextLocation( - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); assertTrue(true); @@ -146,7 +146,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); adapter.setAppContextLocation( - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); assertEquals(null, adapter.loginImpl("marissa", "kangaroo")); @@ -156,7 +156,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); adapter.setAppContextLocation( - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); assertEquals(null, adapter.loginImpl("melissa", "koala")); @@ -165,7 +165,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { public void testAuthenticationSuccess() throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); adapter.setAppContextLocation( - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); @@ -189,7 +189,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); adapter.setAppContextLocation( - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); @@ -214,7 +214,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); adapter.setAppContextLocation( - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); assertEquals(null, adapter.loginImpl("marissa", null)); @@ -224,7 +224,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); adapter.setAppContextLocation( - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); assertEquals(null, adapter.loginImpl(null, "koala")); @@ -233,17 +233,17 @@ public class ResinAcegiAuthenticatorTests extends TestCase { public void testGetters() throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); adapter.setAppContextLocation( - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); assertEquals(ADAPTER_KEY, adapter.getKey()); - assertEquals("net/sf/acegisecurity/adapters/adaptertest-valid.xml", + assertEquals("org/acegisecurity/adapters/adaptertest-valid.xml", adapter.getAppContextLocation()); } public void testHasRoleWithANullPrincipalFails() throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); adapter.setAppContextLocation( - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); assertTrue(!adapter.isUserInRole(null, null, null, null, "ROLE_ONE")); @@ -253,7 +253,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { throws Exception { ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); adapter.setAppContextLocation( - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); assertTrue(!adapter.isUserInRole(null, null, null, @@ -272,7 +272,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase { "ROLE_TWO")}); ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator(); adapter.setAppContextLocation( - "net/sf/acegisecurity/adapters/adaptertest-valid.xml"); + "org/acegisecurity/adapters/adaptertest-valid.xml"); adapter.setKey(ADAPTER_KEY); adapter.init(); assertTrue(adapter.isUserInRole(null, null, null, token, "ROLE_ONE")); diff --git a/core-tiger/src/main/java/org/acegisecurity/annotation/Secured.java b/core-tiger/src/main/java/org/acegisecurity/annotation/Secured.java index 988668287a..250baace93 100644 --- a/core-tiger/src/main/java/org/acegisecurity/annotation/Secured.java +++ b/core-tiger/src/main/java/org/acegisecurity/annotation/Secured.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package net.sf.acegisecurity.annotation; +package org.acegisecurity.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core-tiger/src/main/java/org/acegisecurity/annotation/SecurityAnnotationAttributes.java b/core-tiger/src/main/java/org/acegisecurity/annotation/SecurityAnnotationAttributes.java index 7122c6380f..b619a13936 100644 --- a/core-tiger/src/main/java/org/acegisecurity/annotation/SecurityAnnotationAttributes.java +++ b/core-tiger/src/main/java/org/acegisecurity/annotation/SecurityAnnotationAttributes.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package net.sf.acegisecurity.annotation; +package org.acegisecurity.annotation; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -21,7 +21,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import net.sf.acegisecurity.SecurityConfig; +import org.acegisecurity.SecurityConfig; import org.springframework.metadata.Attributes; @@ -40,17 +40,17 @@ import org.springframework.metadata.Attributes; *

For example: * 

  * <bean id="attributes" 
- *     class="net.sf.acegisecurity.annotation.SecurityAnnotationAttributes"/>
+ *     class="org.acegisecurity.annotation.SecurityAnnotationAttributes"/>
  * 
  * <bean id="objectDefinitionSource" 
- *     class="net.sf.acegisecurity.intercept.method.MethodDefinitionAttributes">
+ *     class="org.acegisecurity.intercept.method.MethodDefinitionAttributes">
  *     <property name="attributes">
  *         <ref local="attributes"/>
  *     </property>
  * </bean>
  * 
  * <bean id="securityInterceptor" 
- *     class="net.sf.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor">
+ *     class="org.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor">
  *      . . .
  *      <property name="objectDefinitionSource">
  *          <ref local="objectDefinitionSource"/>
@@ -64,7 +64,7 @@ import org.springframework.metadata.Attributes;
  * @author Mark St.Godard
  * @version $Id$
  *
- * @see net.sf.acegisecurity.annotation.Secured
+ * @see org.acegisecurity.annotation.Secured
  */
 public class SecurityAnnotationAttributes implements Attributes {
 
diff --git a/core-tiger/src/test/java/org/acegisecurity/annotation/BusinessService.java b/core-tiger/src/test/java/org/acegisecurity/annotation/BusinessService.java
index c01d4c7ee7..61de4cc4e6 100644
--- a/core-tiger/src/test/java/org/acegisecurity/annotation/BusinessService.java
+++ b/core-tiger/src/test/java/org/acegisecurity/annotation/BusinessService.java
@@ -1,4 +1,4 @@
-package net.sf.acegisecurity.annotation;
+package org.acegisecurity.annotation;
 
 @Secured ({"ROLE_USER"})
 public interface BusinessService {
diff --git a/core-tiger/src/test/java/org/acegisecurity/annotation/SecurityAnnotationAttributesTests.java b/core-tiger/src/test/java/org/acegisecurity/annotation/SecurityAnnotationAttributesTests.java
index a352b31dc3..fab499c60f 100644
--- a/core-tiger/src/test/java/org/acegisecurity/annotation/SecurityAnnotationAttributesTests.java
+++ b/core-tiger/src/test/java/org/acegisecurity/annotation/SecurityAnnotationAttributesTests.java
@@ -13,20 +13,20 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.annotation;
+package org.acegisecurity.annotation;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Collection;
 
 import junit.framework.TestCase;
-import net.sf.acegisecurity.SecurityConfig;
+import org.acegisecurity.SecurityConfig;
 
 import org.springframework.metadata.Attributes;
 
 
 /**
- * Tests for {@link net.sf.acegisecurity.annotation.SecurityAnnotationAttributes}
+ * Tests for {@link org.acegisecurity.annotation.SecurityAnnotationAttributes}
  *
  * @author Mark St.Godard
  * @version $Revision$
diff --git a/core/project.xml b/core/project.xml
index 7ce9e68184..24cc4355b2 100644
--- a/core/project.xml
+++ b/core/project.xml
@@ -22,7 +22,7 @@
         false
       
       
-        ${basedir}/src/main/resources/net/sf/acegisecurity/taglibs
+        ${basedir}/src/main/resources/org/acegisecurity/taglibs
         META-INF
         
           *.tld
diff --git a/core/src/main/java/org/acegisecurity/AbstractAuthenticationManager.java b/core/src/main/java/org/acegisecurity/AbstractAuthenticationManager.java
index c56aa63d13..af8066fc7a 100644
--- a/core/src/main/java/org/acegisecurity/AbstractAuthenticationManager.java
+++ b/core/src/main/java/org/acegisecurity/AbstractAuthenticationManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * An abstract implementation of the {@link AuthenticationManager}.
@@ -61,7 +61,7 @@ public abstract class AbstractAuthenticationManager
      * 
      * 

      * The contract for this method is documented in the {@link
-     * AuthenticationManager#authenticate(net.sf.acegisecurity.Authentication)}.
+     * AuthenticationManager#authenticate(org.acegisecurity.Authentication)}.
      * 

      *
      * @param authentication the authentication request object
diff --git a/core/src/main/java/org/acegisecurity/AccessDecisionManager.java b/core/src/main/java/org/acegisecurity/AccessDecisionManager.java
index e53f60ade9..280014cba9 100644
--- a/core/src/main/java/org/acegisecurity/AccessDecisionManager.java
+++ b/core/src/main/java/org/acegisecurity/AccessDecisionManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Makes a final access control (authorization) decision.
diff --git a/core/src/main/java/org/acegisecurity/AccessDeniedException.java b/core/src/main/java/org/acegisecurity/AccessDeniedException.java
index 1ecfafdee1..c3c688156d 100644
--- a/core/src/main/java/org/acegisecurity/AccessDeniedException.java
+++ b/core/src/main/java/org/acegisecurity/AccessDeniedException.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Thrown if an {@link Authentication} object does not hold a required
diff --git a/core/src/main/java/org/acegisecurity/AccountExpiredException.java b/core/src/main/java/org/acegisecurity/AccountExpiredException.java
index b2dce386f9..69cf450097 100644
--- a/core/src/main/java/org/acegisecurity/AccountExpiredException.java
+++ b/core/src/main/java/org/acegisecurity/AccountExpiredException.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Thrown if an authentication request is rejected because the account has
diff --git a/core/src/main/java/org/acegisecurity/AcegiSecurityException.java b/core/src/main/java/org/acegisecurity/AcegiSecurityException.java
index af7f7d43f6..ef1ad9da90 100644
--- a/core/src/main/java/org/acegisecurity/AcegiSecurityException.java
+++ b/core/src/main/java/org/acegisecurity/AcegiSecurityException.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import org.springframework.core.NestedRuntimeException;
 
diff --git a/core/src/main/java/org/acegisecurity/AfterInvocationManager.java b/core/src/main/java/org/acegisecurity/AfterInvocationManager.java
index a4ffde4447..2937425409 100644
--- a/core/src/main/java/org/acegisecurity/AfterInvocationManager.java
+++ b/core/src/main/java/org/acegisecurity/AfterInvocationManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Reviews the Object returned from a secure object invocation,
@@ -25,7 +25,7 @@ package net.sf.acegisecurity;
  * object instance returned by a service layer bean. Can also be used to
  * mutate the domain object instance so the principal is only able to access
  * authorised bean properties or Collection elements. Often used
- * in conjunction with an {@link net.sf.acegisecurity.acl.AclManager} to
+ * in conjunction with an {@link org.acegisecurity.acl.AclManager} to
  * obtain the access control list applicable for the domain object instance.
  * 

  * 
diff --git a/core/src/main/java/org/acegisecurity/Authentication.java b/core/src/main/java/org/acegisecurity/Authentication.java
index f1ad1e8d00..a3fd32c27c 100644
--- a/core/src/main/java/org/acegisecurity/Authentication.java
+++ b/core/src/main/java/org/acegisecurity/Authentication.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import java.io.Serializable;
 
@@ -30,7 +30,7 @@ import java.security.Principal;
  * 
  * 

  * Stored in a request {@link
- * net.sf.acegisecurity.context.security.SecurityContext}.
+ * org.acegisecurity.context.security.SecurityContext}.
  * 

  *
  * @author Ben Alex
diff --git a/core/src/main/java/org/acegisecurity/AuthenticationCredentialsNotFoundException.java b/core/src/main/java/org/acegisecurity/AuthenticationCredentialsNotFoundException.java
index c63f3862fb..db868a3cf5 100644
--- a/core/src/main/java/org/acegisecurity/AuthenticationCredentialsNotFoundException.java
+++ b/core/src/main/java/org/acegisecurity/AuthenticationCredentialsNotFoundException.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Thrown if an authentication request is rejected because there is no {@link
- * Authentication} object in the  {@link net.sf.acegisecurity.context.SecurityContext SecurityContext}.
+ * Authentication} object in the  {@link org.acegisecurity.context.SecurityContext SecurityContext}.
  *
  * @author Ben Alex
  * @version $Id$
diff --git a/core/src/main/java/org/acegisecurity/AuthenticationException.java b/core/src/main/java/org/acegisecurity/AuthenticationException.java
index d82d053662..f9a17565d6 100644
--- a/core/src/main/java/org/acegisecurity/AuthenticationException.java
+++ b/core/src/main/java/org/acegisecurity/AuthenticationException.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Abstract superclass for all exceptions related an {@link Authentication}
diff --git a/core/src/main/java/org/acegisecurity/AuthenticationManager.java b/core/src/main/java/org/acegisecurity/AuthenticationManager.java
index 86d149f607..70188f6291 100644
--- a/core/src/main/java/org/acegisecurity/AuthenticationManager.java
+++ b/core/src/main/java/org/acegisecurity/AuthenticationManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Processes an {@link Authentication} request.
diff --git a/core/src/main/java/org/acegisecurity/AuthenticationServiceException.java b/core/src/main/java/org/acegisecurity/AuthenticationServiceException.java
index 808acdded5..590aa62531 100644
--- a/core/src/main/java/org/acegisecurity/AuthenticationServiceException.java
+++ b/core/src/main/java/org/acegisecurity/AuthenticationServiceException.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Thrown if an authentication request could not be processed due to a system
diff --git a/core/src/main/java/org/acegisecurity/AuthenticationTrustResolver.java b/core/src/main/java/org/acegisecurity/AuthenticationTrustResolver.java
index 34f26efe23..c912a743c7 100644
--- a/core/src/main/java/org/acegisecurity/AuthenticationTrustResolver.java
+++ b/core/src/main/java/org/acegisecurity/AuthenticationTrustResolver.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Evaluates Authentication tokens
diff --git a/core/src/main/java/org/acegisecurity/AuthenticationTrustResolverImpl.java b/core/src/main/java/org/acegisecurity/AuthenticationTrustResolverImpl.java
index 5aa92ea290..f58985531b 100644
--- a/core/src/main/java/org/acegisecurity/AuthenticationTrustResolverImpl.java
+++ b/core/src/main/java/org/acegisecurity/AuthenticationTrustResolverImpl.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
-import net.sf.acegisecurity.providers.anonymous.AnonymousAuthenticationToken;
-import net.sf.acegisecurity.providers.rememberme.RememberMeAuthenticationToken;
+import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken;
+import org.acegisecurity.providers.rememberme.RememberMeAuthenticationToken;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/AuthorizationServiceException.java b/core/src/main/java/org/acegisecurity/AuthorizationServiceException.java
index dde0dc0ab9..a6463f344a 100644
--- a/core/src/main/java/org/acegisecurity/AuthorizationServiceException.java
+++ b/core/src/main/java/org/acegisecurity/AuthorizationServiceException.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Thrown if an authorization request could not be processed due to a system
diff --git a/core/src/main/java/org/acegisecurity/BadCredentialsException.java b/core/src/main/java/org/acegisecurity/BadCredentialsException.java
index 9c6603e0ed..75e25f1555 100644
--- a/core/src/main/java/org/acegisecurity/BadCredentialsException.java
+++ b/core/src/main/java/org/acegisecurity/BadCredentialsException.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Thrown if an authentication request is rejected because the credentials are
diff --git a/core/src/main/java/org/acegisecurity/ConfigAttribute.java b/core/src/main/java/org/acegisecurity/ConfigAttribute.java
index 748cd40d58..dd2c407561 100644
--- a/core/src/main/java/org/acegisecurity/ConfigAttribute.java
+++ b/core/src/main/java/org/acegisecurity/ConfigAttribute.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import java.io.Serializable;
 
@@ -22,7 +22,7 @@ import java.io.Serializable;
  * Stores a security system related configuration attribute.
  * 
  * 

- * When an {@link net.sf.acegisecurity.intercept.AbstractSecurityInterceptor}
+ * When an {@link org.acegisecurity.intercept.AbstractSecurityInterceptor}
  * is setup, a list of configuration attributes is defined for secure object
  * patterns. These configuration attributes have special meaning to a {@link
  * RunAsManager}, {@link AccessDecisionManager} or
diff --git a/core/src/main/java/org/acegisecurity/ConfigAttributeDefinition.java b/core/src/main/java/org/acegisecurity/ConfigAttributeDefinition.java
index 9c5eed8e7b..b7fc07a358 100644
--- a/core/src/main/java/org/acegisecurity/ConfigAttributeDefinition.java
+++ b/core/src/main/java/org/acegisecurity/ConfigAttributeDefinition.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import java.io.Serializable;
 
@@ -28,8 +28,8 @@ import java.util.Vector;
  * 
  * 

  * All the ConfigAttributeDefinitions associated with a given
- * {@link net.sf.acegisecurity.intercept.AbstractSecurityInterceptor} are
- * stored in an {@link net.sf.acegisecurity.intercept.ObjectDefinitionSource}.
+ * {@link org.acegisecurity.intercept.AbstractSecurityInterceptor} are
+ * stored in an {@link org.acegisecurity.intercept.ObjectDefinitionSource}.
  * 

  *
  * @author Ben Alex
diff --git a/core/src/main/java/org/acegisecurity/ConfigAttributeEditor.java b/core/src/main/java/org/acegisecurity/ConfigAttributeEditor.java
index 789840aef5..6093a1ea73 100644
--- a/core/src/main/java/org/acegisecurity/ConfigAttributeEditor.java
+++ b/core/src/main/java/org/acegisecurity/ConfigAttributeEditor.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import org.springframework.util.StringUtils;
 
diff --git a/core/src/main/java/org/acegisecurity/CredentialsExpiredException.java b/core/src/main/java/org/acegisecurity/CredentialsExpiredException.java
index 5cdba82878..b65e1448d0 100644
--- a/core/src/main/java/org/acegisecurity/CredentialsExpiredException.java
+++ b/core/src/main/java/org/acegisecurity/CredentialsExpiredException.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Thrown if an authentication request is rejected because the account's
diff --git a/core/src/main/java/org/acegisecurity/DisabledException.java b/core/src/main/java/org/acegisecurity/DisabledException.java
index 748472b5eb..dbfb5e335f 100644
--- a/core/src/main/java/org/acegisecurity/DisabledException.java
+++ b/core/src/main/java/org/acegisecurity/DisabledException.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Thrown if an authentication request is rejected because the account is
diff --git a/core/src/main/java/org/acegisecurity/GrantedAuthority.java b/core/src/main/java/org/acegisecurity/GrantedAuthority.java
index 9c487456ef..5b5374213e 100644
--- a/core/src/main/java/org/acegisecurity/GrantedAuthority.java
+++ b/core/src/main/java/org/acegisecurity/GrantedAuthority.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Represents an authority granted to an {@link Authentication} object.
diff --git a/core/src/main/java/org/acegisecurity/GrantedAuthorityImpl.java b/core/src/main/java/org/acegisecurity/GrantedAuthorityImpl.java
index b4a8476bbf..d936a28832 100644
--- a/core/src/main/java/org/acegisecurity/GrantedAuthorityImpl.java
+++ b/core/src/main/java/org/acegisecurity/GrantedAuthorityImpl.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/org/acegisecurity/InsufficientAuthenticationException.java b/core/src/main/java/org/acegisecurity/InsufficientAuthenticationException.java
index aac2abb6c7..05b0e59999 100644
--- a/core/src/main/java/org/acegisecurity/InsufficientAuthenticationException.java
+++ b/core/src/main/java/org/acegisecurity/InsufficientAuthenticationException.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Thrown if an authentication request is rejected because the credentials are
  * not sufficiently trusted.
  * 
  * 

- * {{@link net.sf.acegisecurity.vote.AccessDecisionVoter}s will typically throw
+ * {{@link org.acegisecurity.vote.AccessDecisionVoter}s will typically throw
  * this exception if they are dissatisfied with the level of the
  * authentication, such as if performed using a remember-me mechnanism or
  * anonymously. The commonly used {@link
- * net.sf.acegisecurity.intercept.web.SecurityEnforcementFilter} will thus
+ * org.acegisecurity.intercept.web.SecurityEnforcementFilter} will thus
  * cause the AuthenticationEntryPoint to be called, allowing the
  * principal to authenticate with a stronger level of authentication. }
  * 

diff --git a/core/src/main/java/org/acegisecurity/LockedException.java b/core/src/main/java/org/acegisecurity/LockedException.java
index 8bbb563bed..965136791c 100644
--- a/core/src/main/java/org/acegisecurity/LockedException.java
+++ b/core/src/main/java/org/acegisecurity/LockedException.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Thrown if an authentication request is rejected because the account is
diff --git a/core/src/main/java/org/acegisecurity/MockAuthenticationManager.java b/core/src/main/java/org/acegisecurity/MockAuthenticationManager.java
index 54f3bd8cd4..9766dbe238 100644
--- a/core/src/main/java/org/acegisecurity/MockAuthenticationManager.java
+++ b/core/src/main/java/org/acegisecurity/MockAuthenticationManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Simply accepts as valid whatever is passed to it, if
diff --git a/core/src/main/java/org/acegisecurity/RunAsManager.java b/core/src/main/java/org/acegisecurity/RunAsManager.java
index b2e36ab36a..840a96349b 100644
--- a/core/src/main/java/org/acegisecurity/RunAsManager.java
+++ b/core/src/main/java/org/acegisecurity/RunAsManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Creates a new temporary {@link Authentication} object for the current secure
@@ -23,9 +23,9 @@ package net.sf.acegisecurity;
  * This interface permits implementations to replace the
  * Authentication object that applies to the current secure
  * object invocation only. The {@link
- * net.sf.acegisecurity.intercept.AbstractSecurityInterceptor} will replace
+ * org.acegisecurity.intercept.AbstractSecurityInterceptor} will replace
  * the Authentication object held in the
- * {@link net.sf.acegisecurity.context.SecurityContext SecurityContext}
+ * {@link org.acegisecurity.context.SecurityContext SecurityContext}
  * for the duration of  the secure object callback only, returning it to
  * the original Authentication object when the callback ends.
  * 

diff --git a/core/src/main/java/org/acegisecurity/SecurityConfig.java b/core/src/main/java/org/acegisecurity/SecurityConfig.java
index e289c09de3..7b1a8158fb 100644
--- a/core/src/main/java/org/acegisecurity/SecurityConfig.java
+++ b/core/src/main/java/org/acegisecurity/SecurityConfig.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Stores a {@link ConfigAttribute} as a String.
diff --git a/core/src/main/java/org/acegisecurity/acl/AclEntry.java b/core/src/main/java/org/acegisecurity/acl/AclEntry.java
index 117c0b0f68..1c2e6af3e8 100644
--- a/core/src/main/java/org/acegisecurity/acl/AclEntry.java
+++ b/core/src/main/java/org/acegisecurity/acl/AclEntry.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl;
+package org.acegisecurity.acl;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/org/acegisecurity/acl/AclManager.java b/core/src/main/java/org/acegisecurity/acl/AclManager.java
index fe880ae31e..c167ebe86c 100644
--- a/core/src/main/java/org/acegisecurity/acl/AclManager.java
+++ b/core/src/main/java/org/acegisecurity/acl/AclManager.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl;
+package org.acegisecurity.acl;
 
-import net.sf.acegisecurity.Authentication;
+import org.acegisecurity.Authentication;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/acl/AclProvider.java b/core/src/main/java/org/acegisecurity/acl/AclProvider.java
index 0b7f08ba13..b866f0d7e6 100644
--- a/core/src/main/java/org/acegisecurity/acl/AclProvider.java
+++ b/core/src/main/java/org/acegisecurity/acl/AclProvider.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl;
+package org.acegisecurity.acl;
 
-import net.sf.acegisecurity.Authentication;
+import org.acegisecurity.Authentication;
 
 /**
  * Indicates a class can process a given domain object instance and
diff --git a/core/src/main/java/org/acegisecurity/acl/AclProviderManager.java b/core/src/main/java/org/acegisecurity/acl/AclProviderManager.java
index ab4efa535a..508a757ddf 100644
--- a/core/src/main/java/org/acegisecurity/acl/AclProviderManager.java
+++ b/core/src/main/java/org/acegisecurity/acl/AclProviderManager.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl;
+package org.acegisecurity.acl;
 
-import net.sf.acegisecurity.Authentication;
+import org.acegisecurity.Authentication;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/acl/basic/AbstractBasicAclEntry.java b/core/src/main/java/org/acegisecurity/acl/basic/AbstractBasicAclEntry.java
index 8c62534cee..99fa2810fb 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/AbstractBasicAclEntry.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/AbstractBasicAclEntry.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic;
+package org.acegisecurity.acl.basic;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/acl/basic/AclObjectIdentity.java b/core/src/main/java/org/acegisecurity/acl/basic/AclObjectIdentity.java
index 8b7385fb4c..6472af01a6 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/AclObjectIdentity.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/AclObjectIdentity.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic;
+package org.acegisecurity.acl.basic;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/org/acegisecurity/acl/basic/AclObjectIdentityAware.java b/core/src/main/java/org/acegisecurity/acl/basic/AclObjectIdentityAware.java
index e25c5506d0..4d1fbb502d 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/AclObjectIdentityAware.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/AclObjectIdentityAware.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic;
+package org.acegisecurity.acl.basic;
 
 /**
  * Indicates a domain object instance is able to provide {@link
diff --git a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclDao.java b/core/src/main/java/org/acegisecurity/acl/basic/BasicAclDao.java
index e9f94b2ef6..7da5e16448 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclDao.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/BasicAclDao.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic;
+package org.acegisecurity.acl.basic;
 
 /**
  * Represents a data access object that can return the {@link BasicAclEntry}s
diff --git a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclEntry.java b/core/src/main/java/org/acegisecurity/acl/basic/BasicAclEntry.java
index a5815fb764..ac2a7131a3 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclEntry.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/BasicAclEntry.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic;
+package org.acegisecurity.acl.basic;
 
-import net.sf.acegisecurity.acl.AclEntry;
+import org.acegisecurity.acl.AclEntry;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclEntryCache.java b/core/src/main/java/org/acegisecurity/acl/basic/BasicAclEntryCache.java
index d143f2bdc4..e6c6d1cd3c 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclEntryCache.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/BasicAclEntryCache.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic;
+package org.acegisecurity.acl.basic;
 
 /**
  * Provides a cache of {@link BasicAclEntry} objects.
diff --git a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclExtendedDao.java b/core/src/main/java/org/acegisecurity/acl/basic/BasicAclExtendedDao.java
index aee42cfed7..67fd6ff0f9 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclExtendedDao.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/BasicAclExtendedDao.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic;
+package org.acegisecurity.acl.basic;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclProvider.java b/core/src/main/java/org/acegisecurity/acl/basic/BasicAclProvider.java
index 635c1b1c07..1f643f923e 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclProvider.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/BasicAclProvider.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic;
+package org.acegisecurity.acl.basic;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.acl.AclEntry;
-import net.sf.acegisecurity.acl.AclProvider;
-import net.sf.acegisecurity.acl.basic.cache.NullAclEntryCache;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.acl.AclEntry;
+import org.acegisecurity.acl.AclProvider;
+import org.acegisecurity.acl.basic.cache.NullAclEntryCache;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/acl/basic/EffectiveAclsResolver.java b/core/src/main/java/org/acegisecurity/acl/basic/EffectiveAclsResolver.java
index 4d8e17efdd..4519130627 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/EffectiveAclsResolver.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/EffectiveAclsResolver.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic;
+package org.acegisecurity.acl.basic;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.acl.AclEntry;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.acl.AclEntry;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/acl/basic/GrantedAuthorityEffectiveAclsResolver.java b/core/src/main/java/org/acegisecurity/acl/basic/GrantedAuthorityEffectiveAclsResolver.java
index 2fd80df75c..e539049a7b 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/GrantedAuthorityEffectiveAclsResolver.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/GrantedAuthorityEffectiveAclsResolver.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic;
+package org.acegisecurity.acl.basic;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.acl.AclEntry;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.acl.AclEntry;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/acl/basic/NamedEntityObjectIdentity.java b/core/src/main/java/org/acegisecurity/acl/basic/NamedEntityObjectIdentity.java
index dae667fcdf..b38e265387 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/NamedEntityObjectIdentity.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/NamedEntityObjectIdentity.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic;
+package org.acegisecurity.acl.basic;
 
 import org.springframework.util.Assert;
 
diff --git a/core/src/main/java/org/acegisecurity/acl/basic/SimpleAclEntry.java b/core/src/main/java/org/acegisecurity/acl/basic/SimpleAclEntry.java
index f6d4b94dc3..6ff5e0d2bd 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/SimpleAclEntry.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/SimpleAclEntry.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic;
+package org.acegisecurity.acl.basic;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/acl/basic/cache/BasicAclEntryHolder.java b/core/src/main/java/org/acegisecurity/acl/basic/cache/BasicAclEntryHolder.java
index 76314b920e..ed352ed8d9 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/cache/BasicAclEntryHolder.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/cache/BasicAclEntryHolder.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic.cache;
+package org.acegisecurity.acl.basic.cache;
 
-import net.sf.acegisecurity.acl.basic.BasicAclEntry;
+import org.acegisecurity.acl.basic.BasicAclEntry;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/org/acegisecurity/acl/basic/cache/EhCacheBasedAclEntryCache.java b/core/src/main/java/org/acegisecurity/acl/basic/cache/EhCacheBasedAclEntryCache.java
index 6061db0cc8..8e8bcf75df 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/cache/EhCacheBasedAclEntryCache.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/cache/EhCacheBasedAclEntryCache.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic.cache;
+package org.acegisecurity.acl.basic.cache;
 
-import net.sf.acegisecurity.acl.basic.AclObjectIdentity;
-import net.sf.acegisecurity.acl.basic.BasicAclEntry;
-import net.sf.acegisecurity.acl.basic.BasicAclEntryCache;
+import org.acegisecurity.acl.basic.AclObjectIdentity;
+import org.acegisecurity.acl.basic.BasicAclEntry;
+import org.acegisecurity.acl.basic.BasicAclEntryCache;
 
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheException;
diff --git a/core/src/main/java/org/acegisecurity/acl/basic/cache/NullAclEntryCache.java b/core/src/main/java/org/acegisecurity/acl/basic/cache/NullAclEntryCache.java
index d7d94f8464..c95f90bac0 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/cache/NullAclEntryCache.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/cache/NullAclEntryCache.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic.cache;
+package org.acegisecurity.acl.basic.cache;
 
-import net.sf.acegisecurity.acl.basic.AclObjectIdentity;
-import net.sf.acegisecurity.acl.basic.BasicAclEntry;
-import net.sf.acegisecurity.acl.basic.BasicAclEntryCache;
+import org.acegisecurity.acl.basic.AclObjectIdentity;
+import org.acegisecurity.acl.basic.BasicAclEntry;
+import org.acegisecurity.acl.basic.BasicAclEntryCache;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/acl/basic/jdbc/JdbcDaoImpl.java b/core/src/main/java/org/acegisecurity/acl/basic/jdbc/JdbcDaoImpl.java
index d83c6bc5b7..a25e73071a 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/jdbc/JdbcDaoImpl.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/jdbc/JdbcDaoImpl.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic.jdbc;
+package org.acegisecurity.acl.basic.jdbc;
 
-import net.sf.acegisecurity.acl.basic.AclObjectIdentity;
-import net.sf.acegisecurity.acl.basic.BasicAclDao;
-import net.sf.acegisecurity.acl.basic.BasicAclEntry;
-import net.sf.acegisecurity.acl.basic.NamedEntityObjectIdentity;
+import org.acegisecurity.acl.basic.AclObjectIdentity;
+import org.acegisecurity.acl.basic.BasicAclDao;
+import org.acegisecurity.acl.basic.BasicAclEntry;
+import org.acegisecurity.acl.basic.NamedEntityObjectIdentity;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/acl/basic/jdbc/JdbcExtendedDaoImpl.java b/core/src/main/java/org/acegisecurity/acl/basic/jdbc/JdbcExtendedDaoImpl.java
index a66696d0d3..3ce2f3644d 100644
--- a/core/src/main/java/org/acegisecurity/acl/basic/jdbc/JdbcExtendedDaoImpl.java
+++ b/core/src/main/java/org/acegisecurity/acl/basic/jdbc/JdbcExtendedDaoImpl.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic.jdbc;
+package org.acegisecurity.acl.basic.jdbc;
 
-import net.sf.acegisecurity.acl.basic.AclObjectIdentity;
-import net.sf.acegisecurity.acl.basic.BasicAclEntry;
-import net.sf.acegisecurity.acl.basic.BasicAclExtendedDao;
+import org.acegisecurity.acl.basic.AclObjectIdentity;
+import org.acegisecurity.acl.basic.BasicAclEntry;
+import org.acegisecurity.acl.basic.BasicAclExtendedDao;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -55,7 +55,7 @@ import javax.sql.DataSource;
  * 
  * 

  * This implementation works with String based recipients and
- * {@link net.sf.acegisecurity.acl.basic.NamedEntityObjectIdentity} only. The
+ * {@link org.acegisecurity.acl.basic.NamedEntityObjectIdentity} only. The
  * latter can be changed by overriding {@link
  * #convertAclObjectIdentityToString(AclObjectIdentity)}.
  * 

diff --git a/core/src/main/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationToken.java b/core/src/main/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationToken.java
index 43bc3b9723..6c7f8c5d79 100644
--- a/core/src/main/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationToken.java
+++ b/core/src/main/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationToken.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.adapters;
+package org.acegisecurity.adapters;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.providers.AbstractAuthenticationToken;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.providers.AbstractAuthenticationToken;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/adapters/AuthByAdapter.java b/core/src/main/java/org/acegisecurity/adapters/AuthByAdapter.java
index 782b2f29c5..01747f0147 100644
--- a/core/src/main/java/org/acegisecurity/adapters/AuthByAdapter.java
+++ b/core/src/main/java/org/acegisecurity/adapters/AuthByAdapter.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.adapters;
+package org.acegisecurity.adapters;
 
-import net.sf.acegisecurity.Authentication;
+import org.acegisecurity.Authentication;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/adapters/AuthByAdapterProvider.java b/core/src/main/java/org/acegisecurity/adapters/AuthByAdapterProvider.java
index 84e249bd74..e10fcaec2a 100644
--- a/core/src/main/java/org/acegisecurity/adapters/AuthByAdapterProvider.java
+++ b/core/src/main/java/org/acegisecurity/adapters/AuthByAdapterProvider.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.adapters;
+package org.acegisecurity.adapters;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.providers.AuthenticationProvider;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.providers.AuthenticationProvider;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/acegisecurity/adapters/HttpRequestIntegrationFilter.java b/core/src/main/java/org/acegisecurity/adapters/HttpRequestIntegrationFilter.java
index d78ab5fe87..6ae1f0cebc 100644
--- a/core/src/main/java/org/acegisecurity/adapters/HttpRequestIntegrationFilter.java
+++ b/core/src/main/java/org/acegisecurity/adapters/HttpRequestIntegrationFilter.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.adapters;
+package org.acegisecurity.adapters;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.context.SecurityContextHolder;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -49,7 +49,7 @@ import javax.servlet.http.HttpServletRequest;
  * 

  * 
  * 

- * See {@link net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter}
+ * See {@link org.acegisecurity.context.HttpSessionContextIntegrationFilter}
  * for further information.
  * 

  *
diff --git a/core/src/main/java/org/acegisecurity/adapters/PrincipalAcegiUserToken.java b/core/src/main/java/org/acegisecurity/adapters/PrincipalAcegiUserToken.java
index 39ecf3fa9f..e1b2b1bcb7 100644
--- a/core/src/main/java/org/acegisecurity/adapters/PrincipalAcegiUserToken.java
+++ b/core/src/main/java/org/acegisecurity/adapters/PrincipalAcegiUserToken.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.adapters;
+package org.acegisecurity.adapters;
 
-import net.sf.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthority;
 
 import java.security.Principal;
 
 
 /**
- * A {@link Principal} compatible  {@link net.sf.acegisecurity.Authentication}
+ * A {@link Principal} compatible  {@link org.acegisecurity.Authentication}
  * object.
  *
  * @author Ben Alex
diff --git a/core/src/main/java/org/acegisecurity/afterinvocation/AfterInvocationProvider.java b/core/src/main/java/org/acegisecurity/afterinvocation/AfterInvocationProvider.java
index 143426aa17..91068eb42c 100644
--- a/core/src/main/java/org/acegisecurity/afterinvocation/AfterInvocationProvider.java
+++ b/core/src/main/java/org/acegisecurity/afterinvocation/AfterInvocationProvider.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.afterinvocation;
+package org.acegisecurity.afterinvocation;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/afterinvocation/AfterInvocationProviderManager.java b/core/src/main/java/org/acegisecurity/afterinvocation/AfterInvocationProviderManager.java
index 3ddf6b5bc2..70a3836c29 100644
--- a/core/src/main/java/org/acegisecurity/afterinvocation/AfterInvocationProviderManager.java
+++ b/core/src/main/java/org/acegisecurity/afterinvocation/AfterInvocationProviderManager.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.afterinvocation;
+package org.acegisecurity.afterinvocation;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.AfterInvocationManager;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.AfterInvocationManager;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProvider.java b/core/src/main/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProvider.java
index ead1053ac3..fa833b0dcf 100644
--- a/core/src/main/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProvider.java
+++ b/core/src/main/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProvider.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.afterinvocation;
+package org.acegisecurity.afterinvocation;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthorizationServiceException;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.acl.AclEntry;
-import net.sf.acegisecurity.acl.AclManager;
-import net.sf.acegisecurity.acl.basic.BasicAclEntry;
-import net.sf.acegisecurity.acl.basic.SimpleAclEntry;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthorizationServiceException;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.acl.AclEntry;
+import org.acegisecurity.acl.AclManager;
+import org.acegisecurity.acl.basic.BasicAclEntry;
+import org.acegisecurity.acl.basic.SimpleAclEntry;
 
 import org.apache.commons.collections.iterators.ArrayIterator;
 import org.apache.commons.logging.Log;
@@ -54,9 +54,9 @@ import java.util.Set;
  * (ACL) permissions associated with each Collection  domain
  * object instance element for the current Authentication object.
  * This class is designed to process {@link AclEntry}s that are subclasses of
- * {@link net.sf.acegisecurity.acl.basic.BasicAclEntry} only.
+ * {@link org.acegisecurity.acl.basic.BasicAclEntry} only.
  * Generally these are obtained by using the {@link
- * net.sf.acegisecurity.acl.basic.BasicAclProvider}.
+ * org.acegisecurity.acl.basic.BasicAclProvider}.
  * 

  * 
  * 

@@ -64,7 +64,7 @@ import java.util.Set;
  * ConfigAttribute#getAttribute()} matches the {@link
  * #processConfigAttribute}. The provider will then lookup the ACLs from the
  * AclManager and ensure the principal is {@link
- * net.sf.acegisecurity.acl.basic.BasicAclEntry#isPermitted(int)} for
+ * org.acegisecurity.acl.basic.BasicAclEntry#isPermitted(int)} for
  * at least one of the {@link #requirePermission}s for each
  * Collection element. If the principal does not have at least
  * one of the permissions, that element will not be included in the returned
@@ -330,7 +330,7 @@ class CollectionFilterer implements Filterer {
     //~ Methods ================================================================
 
     /**
-     * @see net.sf.acegisecurity.afterinvocation.Filterer#getFilteredObject()
+     * @see org.acegisecurity.afterinvocation.Filterer#getFilteredObject()
      */
     public Object getFilteredObject() {
         // Now the Iterator has ended, remove Objects from Collection
@@ -351,7 +351,7 @@ class CollectionFilterer implements Filterer {
     }
 
     /**
-     * @see net.sf.acegisecurity.afterinvocation.Filterer#iterator()
+     * @see org.acegisecurity.afterinvocation.Filterer#iterator()
      */
     public Iterator iterator() {
         collectionIter = collection.iterator();
@@ -360,7 +360,7 @@ class CollectionFilterer implements Filterer {
     }
 
     /**
-     * @see net.sf.acegisecurity.afterinvocation.Filterer#remove(java.lang.Object)
+     * @see org.acegisecurity.afterinvocation.Filterer#remove(java.lang.Object)
      */
     public void remove(Object object) {
         collectionIter.remove();
@@ -395,7 +395,7 @@ class ArrayFilterer implements Filterer {
     //~ Methods ================================================================
 
     /**
-     * @see net.sf.acegisecurity.afterinvocation.Filterer#getFilteredObject()
+     * @see org.acegisecurity.afterinvocation.Filterer#getFilteredObject()
      */
     public Object getFilteredObject() {
         // Recreate an array of same type and filter the removed objects.
@@ -424,14 +424,14 @@ class ArrayFilterer implements Filterer {
     }
 
     /**
-     * @see net.sf.acegisecurity.afterinvocation.Filterer#iterator()
+     * @see org.acegisecurity.afterinvocation.Filterer#iterator()
      */
     public Iterator iterator() {
         return new ArrayIterator(list);
     }
 
     /**
-     * @see net.sf.acegisecurity.afterinvocation.Filterer#remove(java.lang.Object)
+     * @see org.acegisecurity.afterinvocation.Filterer#remove(java.lang.Object)
      */
     public void remove(Object object) {
         removeList.add(object);
diff --git a/core/src/main/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationProvider.java b/core/src/main/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationProvider.java
index 1d264f76c6..f250c03efa 100644
--- a/core/src/main/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationProvider.java
+++ b/core/src/main/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationProvider.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.afterinvocation;
+package org.acegisecurity.afterinvocation;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.acl.AclEntry;
-import net.sf.acegisecurity.acl.AclManager;
-import net.sf.acegisecurity.acl.basic.BasicAclEntry;
-import net.sf.acegisecurity.acl.basic.SimpleAclEntry;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.acl.AclEntry;
+import org.acegisecurity.acl.AclManager;
+import org.acegisecurity.acl.basic.BasicAclEntry;
+import org.acegisecurity.acl.basic.SimpleAclEntry;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -45,9 +45,9 @@ import java.util.Iterator;
  * (ACL) permissions associated with a domain object instance for the current
  * Authentication object. This class is designed to process
  * {@link AclEntry}s that are subclasses of {@link
- * net.sf.acegisecurity.acl.basic.BasicAclEntry} only. Generally these
+ * org.acegisecurity.acl.basic.BasicAclEntry} only. Generally these
  * are obtained by using the {@link
- * net.sf.acegisecurity.acl.basic.BasicAclProvider}.
+ * org.acegisecurity.acl.basic.BasicAclProvider}.
  * 

  * 
  * 

@@ -55,7 +55,7 @@ import java.util.Iterator;
  * ConfigAttribute#getAttribute()} matches the {@link
  * #processConfigAttribute}. The provider will then lookup the ACLs from the
  * AclManager and ensure the principal is {@link
- * net.sf.acegisecurity.acl.basic.BasicAclEntry#isPermitted(int)} for
+ * org.acegisecurity.acl.basic.BasicAclEntry#isPermitted(int)} for
  * at least one of the {@link #requirePermission}s.
  * 

  * 
diff --git a/core/src/main/java/org/acegisecurity/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessor.java b/core/src/main/java/org/acegisecurity/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessor.java
index 63f9b3ed13..901e45ae2f 100644
--- a/core/src/main/java/org/acegisecurity/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessor.java
+++ b/core/src/main/java/org/acegisecurity/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessor.java
@@ -16,7 +16,7 @@
 /*
  * Copyright (c) 2005 Your Corporation. All Rights Reserved.
  */
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
 /**
  * 

diff --git a/core/src/main/java/org/acegisecurity/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessor.java b/core/src/main/java/org/acegisecurity/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessor.java
index 208fe0ae83..4282396c23 100644
--- a/core/src/main/java/org/acegisecurity/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessor.java
+++ b/core/src/main/java/org/acegisecurity/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessor.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
 /**
  * 

diff --git a/core/src/main/java/org/acegisecurity/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessor.java b/core/src/main/java/org/acegisecurity/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessor.java
index 6ef02114ac..fadb1f2eb5 100644
--- a/core/src/main/java/org/acegisecurity/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessor.java
+++ b/core/src/main/java/org/acegisecurity/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessor.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
 import org.springframework.util.Assert;
 
diff --git a/core/src/main/java/org/acegisecurity/captcha/CaptchaChannelProcessorTemplate.java b/core/src/main/java/org/acegisecurity/captcha/CaptchaChannelProcessorTemplate.java
index 1e7f5e9f82..744751c9fa 100644
--- a/core/src/main/java/org/acegisecurity/captcha/CaptchaChannelProcessorTemplate.java
+++ b/core/src/main/java/org/acegisecurity/captcha/CaptchaChannelProcessorTemplate.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.intercept.web.FilterInvocation;
-import net.sf.acegisecurity.securechannel.ChannelEntryPoint;
-import net.sf.acegisecurity.securechannel.ChannelProcessor;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.intercept.web.FilterInvocation;
+import org.acegisecurity.securechannel.ChannelEntryPoint;
+import org.acegisecurity.securechannel.ChannelProcessor;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -50,7 +50,7 @@ import javax.servlet.ServletException;
  * 
    
  * 
  • 
  * a keyword to be mapped to urls in the {@link
- * net.sf.acegisecurity.securechannel.ChannelProcessingFilter} configuration
    
+ * org.acegisecurity.securechannel.ChannelProcessingFilter} configuration
    
  * default value provided by sub classes.
  * 
    • 
  * 
  • 
diff --git a/core/src/main/java/org/acegisecurity/captcha/CaptchaEntryPoint.java b/core/src/main/java/org/acegisecurity/captcha/CaptchaEntryPoint.java
index 9e30b80a24..8238cb8367 100644
--- a/core/src/main/java/org/acegisecurity/captcha/CaptchaEntryPoint.java
+++ b/core/src/main/java/org/acegisecurity/captcha/CaptchaEntryPoint.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
-import net.sf.acegisecurity.securechannel.ChannelEntryPoint;
-import net.sf.acegisecurity.util.PortMapper;
-import net.sf.acegisecurity.util.PortMapperImpl;
-import net.sf.acegisecurity.util.PortResolver;
-import net.sf.acegisecurity.util.PortResolverImpl;
+import org.acegisecurity.securechannel.ChannelEntryPoint;
+import org.acegisecurity.util.PortMapper;
+import org.acegisecurity.util.PortMapperImpl;
+import org.acegisecurity.util.PortResolver;
+import org.acegisecurity.util.PortResolverImpl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/captcha/CaptchaSecurityContext.java b/core/src/main/java/org/acegisecurity/captcha/CaptchaSecurityContext.java
index 769f1ee7d6..14f37ca536 100644
--- a/core/src/main/java/org/acegisecurity/captcha/CaptchaSecurityContext.java
+++ b/core/src/main/java/org/acegisecurity/captcha/CaptchaSecurityContext.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
-import net.sf.acegisecurity.context.SecurityContext;
+import org.acegisecurity.context.SecurityContext;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/captcha/CaptchaSecurityContextImpl.java b/core/src/main/java/org/acegisecurity/captcha/CaptchaSecurityContextImpl.java
index 68dbbc0aac..52aa95efe3 100644
--- a/core/src/main/java/org/acegisecurity/captcha/CaptchaSecurityContextImpl.java
+++ b/core/src/main/java/org/acegisecurity/captcha/CaptchaSecurityContextImpl.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
-import net.sf.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.context.SecurityContextImpl;
 
 
 /**
@@ -57,7 +57,7 @@ public class CaptchaSecurityContextImpl extends SecurityContextImpl
     /*
      * (non-Javadoc)
      *
-     * @see net.sf.acegisecurity.context.CaptchaSecurityContext#isHuman()
+     * @see org.acegisecurity.context.CaptchaSecurityContext#isHuman()
      */
     public boolean isHuman() {
         return human;
@@ -66,7 +66,7 @@ public class CaptchaSecurityContextImpl extends SecurityContextImpl
     /*
      * (non-Javadoc)
      *
-     * @see net.sf.acegisecurity.context.CaptchaSecurityContext#getHumanRestrictedResourcesRequestsCount()
+     * @see org.acegisecurity.context.CaptchaSecurityContext#getHumanRestrictedResourcesRequestsCount()
      */
     public int getHumanRestrictedResourcesRequestsCount() {
         return humanRestrictedResourcesRequestsCount;
@@ -75,7 +75,7 @@ public class CaptchaSecurityContextImpl extends SecurityContextImpl
     /*
      * (non-Javadoc)
      *
-     * @see net.sf.acegisecurity.context.CaptchaSecurityContext#getLastPassedCaptchaDateInMillis()
+     * @see org.acegisecurity.context.CaptchaSecurityContext#getLastPassedCaptchaDateInMillis()
      */
     public long getLastPassedCaptchaDateInMillis() {
         return lastPassedCaptchaDate;
diff --git a/core/src/main/java/org/acegisecurity/captcha/CaptchaServiceProxy.java b/core/src/main/java/org/acegisecurity/captcha/CaptchaServiceProxy.java
index 5d450a44b9..bce9d921dd 100644
--- a/core/src/main/java/org/acegisecurity/captcha/CaptchaServiceProxy.java
+++ b/core/src/main/java/org/acegisecurity/captcha/CaptchaServiceProxy.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
 
 
diff --git a/core/src/main/java/org/acegisecurity/captcha/CaptchaValidationProcessingFilter.java b/core/src/main/java/org/acegisecurity/captcha/CaptchaValidationProcessingFilter.java
index 167eb39ab4..c467d9aea2 100644
--- a/core/src/main/java/org/acegisecurity/captcha/CaptchaValidationProcessingFilter.java
+++ b/core/src/main/java/org/acegisecurity/captcha/CaptchaValidationProcessingFilter.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
-import net.sf.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextHolder;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessor.java b/core/src/main/java/org/acegisecurity/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessor.java
index c9ff09624e..901ca1406c 100644
--- a/core/src/main/java/org/acegisecurity/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessor.java
+++ b/core/src/main/java/org/acegisecurity/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessor.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
 /**
  * 
    
diff --git a/core/src/main/java/org/acegisecurity/concurrent/ConcurrentLoginException.java b/core/src/main/java/org/acegisecurity/concurrent/ConcurrentLoginException.java
index 6a9121389c..a4e53c9428 100644
--- a/core/src/main/java/org/acegisecurity/concurrent/ConcurrentLoginException.java
+++ b/core/src/main/java/org/acegisecurity/concurrent/ConcurrentLoginException.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sf.acegisecurity.concurrent;
+package org.acegisecurity.concurrent;
 
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/concurrent/ConcurrentSessionController.java b/core/src/main/java/org/acegisecurity/concurrent/ConcurrentSessionController.java
index db94ca4694..136d7d85c2 100644
--- a/core/src/main/java/org/acegisecurity/concurrent/ConcurrentSessionController.java
+++ b/core/src/main/java/org/acegisecurity/concurrent/ConcurrentSessionController.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.concurrent;
+package org.acegisecurity.concurrent;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
  * Provides two methods that can be called by an {@link
- * net.sf.acegisecurity.AuthenticationManager} to integrate with the
+ * org.acegisecurity.AuthenticationManager} to integrate with the
  * concurrent session handling infrastructure.
  *
  * @author Ben Alex
diff --git a/core/src/main/java/org/acegisecurity/concurrent/ConcurrentSessionControllerImpl.java b/core/src/main/java/org/acegisecurity/concurrent/ConcurrentSessionControllerImpl.java
index 5ea1864143..f487fbee25 100644
--- a/core/src/main/java/org/acegisecurity/concurrent/ConcurrentSessionControllerImpl.java
+++ b/core/src/main/java/org/acegisecurity/concurrent/ConcurrentSessionControllerImpl.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.concurrent;
+package org.acegisecurity.concurrent;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
@@ -27,7 +27,7 @@ import org.springframework.util.Assert;
  * prohibits simultaneous logins.
  * 
  * 
    
- * By default uses {@link net.sf.acegisecurity.concurrent.SessionRegistryImpl},
+ * By default uses {@link org.acegisecurity.concurrent.SessionRegistryImpl},
  * although any SessionRegistry may be used.
  * 
    
  *
diff --git a/core/src/main/java/org/acegisecurity/concurrent/ConcurrentSessionFilter.java b/core/src/main/java/org/acegisecurity/concurrent/ConcurrentSessionFilter.java
index 3f07e1b60b..3f75dfe415 100644
--- a/core/src/main/java/org/acegisecurity/concurrent/ConcurrentSessionFilter.java
+++ b/core/src/main/java/org/acegisecurity/concurrent/ConcurrentSessionFilter.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.concurrent;
+package org.acegisecurity.concurrent;
 
 import org.springframework.beans.factory.InitializingBean;
 
@@ -37,16 +37,16 @@ import javax.servlet.http.HttpSession;
  * 
  * 
    
  * This filter performs two functions. First, it calls {@link
- * net.sf.acegisecurity.concurrent.SessionRegistry#refreshLastRequest(String)}
+ * org.acegisecurity.concurrent.SessionRegistry#refreshLastRequest(String)}
  * for each request. That way, registered sessions always have a correct "last
  * update" date/time. Second, it retrieves {@link
- * net.sf.acegisecurity.concurrent.SessionInformation} from the
+ * org.acegisecurity.concurrent.SessionInformation} from the
  * SessionRegistry for each request and checks if the session has
  * been marked as expired. If it has been marked as expired, the session is
  * invalidated. The invalidation of the session will also cause the request to
  * redirect to the URL specified, and a {@link
- * net.sf.acegisecurity.ui.session.HttpSessionDestroyedEvent} to be published
- * via the {@link net.sf.acegisecurity.ui.session.HttpSessionEventPublisher}
+ * org.acegisecurity.ui.session.HttpSessionDestroyedEvent} to be published
+ * via the {@link org.acegisecurity.ui.session.HttpSessionEventPublisher}
  * registered in web.xml.
  * 
    
  *
diff --git a/core/src/main/java/org/acegisecurity/concurrent/NullConcurrentSessionController.java b/core/src/main/java/org/acegisecurity/concurrent/NullConcurrentSessionController.java
index 0af8d36d38..b5b88d80ea 100644
--- a/core/src/main/java/org/acegisecurity/concurrent/NullConcurrentSessionController.java
+++ b/core/src/main/java/org/acegisecurity/concurrent/NullConcurrentSessionController.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.concurrent;
+package org.acegisecurity.concurrent;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
  * No-op implementation of {@link
- * net.sf.acegisecurity.concurrent.ConcurrentSessionController}.
+ * org.acegisecurity.concurrent.ConcurrentSessionController}.
  *
  * @author Ben Alex
  * @version $Id$
diff --git a/core/src/main/java/org/acegisecurity/concurrent/SessionAlreadyUsedException.java b/core/src/main/java/org/acegisecurity/concurrent/SessionAlreadyUsedException.java
index 91cd85f6a6..09fe896693 100644
--- a/core/src/main/java/org/acegisecurity/concurrent/SessionAlreadyUsedException.java
+++ b/core/src/main/java/org/acegisecurity/concurrent/SessionAlreadyUsedException.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sf.acegisecurity.concurrent;
+package org.acegisecurity.concurrent;
 
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/concurrent/SessionInformation.java b/core/src/main/java/org/acegisecurity/concurrent/SessionInformation.java
index f50273db5f..1d274ddb6a 100644
--- a/core/src/main/java/org/acegisecurity/concurrent/SessionInformation.java
+++ b/core/src/main/java/org/acegisecurity/concurrent/SessionInformation.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.concurrent;
+package org.acegisecurity.concurrent;
 
 import org.springframework.util.Assert;
 
diff --git a/core/src/main/java/org/acegisecurity/concurrent/SessionRegistry.java b/core/src/main/java/org/acegisecurity/concurrent/SessionRegistry.java
index 57eebc3e42..110fb88c82 100644
--- a/core/src/main/java/org/acegisecurity/concurrent/SessionRegistry.java
+++ b/core/src/main/java/org/acegisecurity/concurrent/SessionRegistry.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.concurrent;
+package org.acegisecurity.concurrent;
 
 /**
  * Maintains a registry of SessionInformation instances.
diff --git a/core/src/main/java/org/acegisecurity/concurrent/SessionRegistryImpl.java b/core/src/main/java/org/acegisecurity/concurrent/SessionRegistryImpl.java
index 022533619d..efd9a88299 100644
--- a/core/src/main/java/org/acegisecurity/concurrent/SessionRegistryImpl.java
+++ b/core/src/main/java/org/acegisecurity/concurrent/SessionRegistryImpl.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.concurrent;
+package org.acegisecurity.concurrent;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -27,7 +27,7 @@ import java.util.Set;
 
 import javax.servlet.http.HttpSession;
 
-import net.sf.acegisecurity.ui.session.HttpSessionDestroyedEvent;
+import org.acegisecurity.ui.session.HttpSessionDestroyedEvent;
 
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
@@ -36,13 +36,13 @@ import org.springframework.util.Assert;
 
 /**
  * Base implementation of {@link
- * net.sf.acegisecurity.concurrent.SessionRegistry} which also listens for
- * {@link net.sf.acegisecurity.ui.session.HttpSessionDestroyedEvent}s
+ * org.acegisecurity.concurrent.SessionRegistry} which also listens for
+ * {@link org.acegisecurity.ui.session.HttpSessionDestroyedEvent}s
  * published in the Spring application context.
  * 
  * 
    
  * NB: It is important that you register the {@link
- * net.sf.acegisecurity.ui.session.HttpSessionEventPublisher} in
+ * org.acegisecurity.ui.session.HttpSessionEventPublisher} in
  * web.xml so that this class is notified of sessions that
  * expire.
  * 
    
diff --git a/core/src/main/java/org/acegisecurity/concurrent/SessionRegistryUtils.java b/core/src/main/java/org/acegisecurity/concurrent/SessionRegistryUtils.java
index f04a54581d..69df951075 100644
--- a/core/src/main/java/org/acegisecurity/concurrent/SessionRegistryUtils.java
+++ b/core/src/main/java/org/acegisecurity/concurrent/SessionRegistryUtils.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.concurrent;
+package org.acegisecurity.concurrent;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.ui.WebAuthenticationDetails;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.ui.WebAuthenticationDetails;
 
 import org.springframework.util.Assert;
 
diff --git a/core/src/main/java/org/acegisecurity/context/HttpSessionContextIntegrationFilter.java b/core/src/main/java/org/acegisecurity/context/HttpSessionContextIntegrationFilter.java
index 494fd9ddcc..8887c660a6 100644
--- a/core/src/main/java/org/acegisecurity/context/HttpSessionContextIntegrationFilter.java
+++ b/core/src/main/java/org/acegisecurity/context/HttpSessionContextIntegrationFilter.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.context;
+package org.acegisecurity.context;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -53,7 +53,7 @@ import javax.servlet.http.HttpSession;
  * SecurityContext will be created and used instead.  The created
  * object will be of the instance defined by the {@link #setContext(Class)}
  * method (which defaults to {@link
- * net.sf.acegisecurity.context.SecurityContextImpl}.
+ * org.acegisecurity.context.SecurityContextImpl}.
  * 
    
  * 
  * 
    
@@ -137,7 +137,7 @@ public class HttpSessionContextIntegrationFilter implements InitializingBean,
         if ((this.context == null)
             || (!SecurityContext.class.isAssignableFrom(this.context))) {
             throw new IllegalArgumentException(
-                "context must be defined and implement SecurityContext (typically use net.sf.acegisecurity.context.SecurityContextImpl; existing class is "
+                "context must be defined and implement SecurityContext (typically use org.acegisecurity.context.SecurityContextImpl; existing class is "
                 + this.context + ")");
         }
 
diff --git a/core/src/main/java/org/acegisecurity/context/SecurityContext.java b/core/src/main/java/org/acegisecurity/context/SecurityContext.java
index c8d4d8f059..8fa0b8b5a9 100644
--- a/core/src/main/java/org/acegisecurity/context/SecurityContext.java
+++ b/core/src/main/java/org/acegisecurity/context/SecurityContext.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.context;
+package org.acegisecurity.context;
 
-import net.sf.acegisecurity.Authentication;
+import org.acegisecurity.Authentication;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/org/acegisecurity/context/SecurityContextHolder.java b/core/src/main/java/org/acegisecurity/context/SecurityContextHolder.java
index 15ed3fab5c..c3974c7147 100644
--- a/core/src/main/java/org/acegisecurity/context/SecurityContextHolder.java
+++ b/core/src/main/java/org/acegisecurity/context/SecurityContextHolder.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.context;
+package org.acegisecurity.context;
 
 import org.springframework.util.Assert;
 
@@ -36,7 +36,7 @@ import org.springframework.util.Assert;
  * @version $Id$
  *
  * @see java.lang.ThreadLocal
- * @see net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter
+ * @see org.acegisecurity.context.HttpSessionContextIntegrationFilter
  */
 public class SecurityContextHolder {
     //~ Static fields/initializers =============================================
diff --git a/core/src/main/java/org/acegisecurity/context/SecurityContextImpl.java b/core/src/main/java/org/acegisecurity/context/SecurityContextImpl.java
index 0a43460a81..85fb55744a 100644
--- a/core/src/main/java/org/acegisecurity/context/SecurityContextImpl.java
+++ b/core/src/main/java/org/acegisecurity/context/SecurityContextImpl.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sf.acegisecurity.context;
+package org.acegisecurity.context;
 
-import net.sf.acegisecurity.Authentication;
+import org.acegisecurity.Authentication;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/context/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java b/core/src/main/java/org/acegisecurity/context/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java
index c9a75f5d56..8f149c4966 100644
--- a/core/src/main/java/org/acegisecurity/context/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java
+++ b/core/src/main/java/org/acegisecurity/context/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.context.httpinvoker;
+package org.acegisecurity.context.httpinvoker;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationCredentialsNotFoundException;
-import net.sf.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationCredentialsNotFoundException;
+import org.acegisecurity.context.SecurityContextHolder;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;
diff --git a/core/src/main/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocation.java b/core/src/main/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocation.java
index 7c7683781d..95132c78c2 100644
--- a/core/src/main/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocation.java
+++ b/core/src/main/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocation.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.context.rmi;
+package org.acegisecurity.context.rmi;
 
-import net.sf.acegisecurity.context.SecurityContext;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.context.SecurityContext;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextImpl;
 
 import org.aopalliance.intercept.MethodInvocation;
 
@@ -36,7 +36,7 @@ import java.lang.reflect.InvocationTargetException;
  * 
  * 
    
  * When constructed on the client via {@link
- * net.sf.acegisecurity.context.rmi.ContextPropagatingRemoteInvocationFactory},
+ * org.acegisecurity.context.rmi.ContextPropagatingRemoteInvocationFactory},
  * the contents of the SecurityContext are stored inside the
  * object. The object is then passed to the server that is processing the
  * remote invocation. Upon the server invoking the remote invocation, it will
@@ -85,7 +85,7 @@ public class ContextPropagatingRemoteInvocation extends RemoteInvocation {
      * 
      * 
    
      * Invocations will always have their {@link
-     * net.sf.acegisecurity.Authentication#setAuthenticated(boolean)} set to
+     * org.acegisecurity.Authentication#setAuthenticated(boolean)} set to
      * false, which is guaranteed to always be accepted by
      * Authentication implementations. This ensures that even
      * remotely authenticated Authentications will be untrusted
diff --git a/core/src/main/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocationFactory.java b/core/src/main/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocationFactory.java
index 91946789ab..ec1b92c65c 100644
--- a/core/src/main/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocationFactory.java
+++ b/core/src/main/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocationFactory.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.context.rmi;
+package org.acegisecurity.context.rmi;
 
 import org.aopalliance.intercept.MethodInvocation;
 
diff --git a/core/src/main/java/org/acegisecurity/event/authentication/AbstractAuthenticationEvent.java b/core/src/main/java/org/acegisecurity/event/authentication/AbstractAuthenticationEvent.java
index 8d22e6c9f5..775dfaf9eb 100644
--- a/core/src/main/java/org/acegisecurity/event/authentication/AbstractAuthenticationEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authentication/AbstractAuthenticationEvent.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authentication;
+package org.acegisecurity.event.authentication;
 
-import net.sf.acegisecurity.Authentication;
+import org.acegisecurity.Authentication;
 
 import org.springframework.context.ApplicationEvent;
 
diff --git a/core/src/main/java/org/acegisecurity/event/authentication/AbstractAuthenticationFailureEvent.java b/core/src/main/java/org/acegisecurity/event/authentication/AbstractAuthenticationFailureEvent.java
index 4c5067c518..173ede5d0d 100644
--- a/core/src/main/java/org/acegisecurity/event/authentication/AbstractAuthenticationFailureEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authentication/AbstractAuthenticationFailureEvent.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authentication;
+package org.acegisecurity.event.authentication;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
 
 import org.springframework.util.Assert;
 
diff --git a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureBadCredentialsEvent.java b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureBadCredentialsEvent.java
index 11107c7aff..a03f8a9b0f 100644
--- a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureBadCredentialsEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureBadCredentialsEvent.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authentication;
+package org.acegisecurity.event.authentication;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureConcurrentLoginEvent.java b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureConcurrentLoginEvent.java
index 754fa84f50..a130b00151 100644
--- a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureConcurrentLoginEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureConcurrentLoginEvent.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authentication;
+package org.acegisecurity.event.authentication;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureCredentialsExpiredEvent.java b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureCredentialsExpiredEvent.java
index f6e7907511..b889fd239f 100644
--- a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureCredentialsExpiredEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureCredentialsExpiredEvent.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authentication;
+package org.acegisecurity.event.authentication;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureDisabledEvent.java b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureDisabledEvent.java
index be8fc56889..793d9593e6 100644
--- a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureDisabledEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureDisabledEvent.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authentication;
+package org.acegisecurity.event.authentication;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureExpiredEvent.java b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureExpiredEvent.java
index eb2c20b160..d467ee3afc 100644
--- a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureExpiredEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureExpiredEvent.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authentication;
+package org.acegisecurity.event.authentication;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureLockedEvent.java b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureLockedEvent.java
index 7bc7328d5d..6e5486fedb 100644
--- a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureLockedEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureLockedEvent.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authentication;
+package org.acegisecurity.event.authentication;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureProviderNotFoundEvent.java b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureProviderNotFoundEvent.java
index 43de20b6a5..18bba14526 100644
--- a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureProviderNotFoundEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureProviderNotFoundEvent.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authentication;
+package org.acegisecurity.event.authentication;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureProxyUntrustedEvent.java b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureProxyUntrustedEvent.java
index 5bc7bb921c..e2f174a3b7 100644
--- a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureProxyUntrustedEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureProxyUntrustedEvent.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authentication;
+package org.acegisecurity.event.authentication;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureServiceExceptionEvent.java b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureServiceExceptionEvent.java
index 2b8b2f9292..3538860603 100644
--- a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureServiceExceptionEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationFailureServiceExceptionEvent.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authentication;
+package org.acegisecurity.event.authentication;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationSuccessEvent.java b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationSuccessEvent.java
index d567659156..93b6e00095 100644
--- a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationSuccessEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationSuccessEvent.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authentication;
+package org.acegisecurity.event.authentication;
 
-import net.sf.acegisecurity.Authentication;
+import org.acegisecurity.Authentication;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationSwitchUserEvent.java b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationSwitchUserEvent.java
index a445b5e735..a3c8ac4862 100644
--- a/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationSwitchUserEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authentication/AuthenticationSwitchUserEvent.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authentication;
+package org.acegisecurity.event.authentication;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.UserDetails;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.UserDetails;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/event/authentication/InteractiveAuthenticationSuccessEvent.java b/core/src/main/java/org/acegisecurity/event/authentication/InteractiveAuthenticationSuccessEvent.java
index 806eb0407d..fa5780f909 100644
--- a/core/src/main/java/org/acegisecurity/event/authentication/InteractiveAuthenticationSuccessEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authentication/InteractiveAuthenticationSuccessEvent.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authentication;
+package org.acegisecurity.event.authentication;
 
-import net.sf.acegisecurity.Authentication;
+import org.acegisecurity.Authentication;
 
 import org.springframework.util.Assert;
 
diff --git a/core/src/main/java/org/acegisecurity/event/authentication/LoggerListener.java b/core/src/main/java/org/acegisecurity/event/authentication/LoggerListener.java
index 9401ac4c73..84ccd0d311 100644
--- a/core/src/main/java/org/acegisecurity/event/authentication/LoggerListener.java
+++ b/core/src/main/java/org/acegisecurity/event/authentication/LoggerListener.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authentication;
+package org.acegisecurity.event.authentication;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/event/authorization/AbstractAuthorizationEvent.java b/core/src/main/java/org/acegisecurity/event/authorization/AbstractAuthorizationEvent.java
index f47c2dee79..70ea9f90e3 100644
--- a/core/src/main/java/org/acegisecurity/event/authorization/AbstractAuthorizationEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authorization/AbstractAuthorizationEvent.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authorization;
+package org.acegisecurity.event.authorization;
 
 import org.springframework.context.ApplicationEvent;
 
diff --git a/core/src/main/java/org/acegisecurity/event/authorization/AuthenticationCredentialsNotFoundEvent.java b/core/src/main/java/org/acegisecurity/event/authorization/AuthenticationCredentialsNotFoundEvent.java
index f5be7f295e..83b89597f6 100644
--- a/core/src/main/java/org/acegisecurity/event/authorization/AuthenticationCredentialsNotFoundEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authorization/AuthenticationCredentialsNotFoundEvent.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authorization;
+package org.acegisecurity.event.authorization;
 
-import net.sf.acegisecurity.AuthenticationCredentialsNotFoundException;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.AuthenticationCredentialsNotFoundException;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/event/authorization/AuthorizationFailureEvent.java b/core/src/main/java/org/acegisecurity/event/authorization/AuthorizationFailureEvent.java
index 160f88f28d..d296c0d144 100644
--- a/core/src/main/java/org/acegisecurity/event/authorization/AuthorizationFailureEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authorization/AuthorizationFailureEvent.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authorization;
+package org.acegisecurity.event.authorization;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/event/authorization/AuthorizedEvent.java b/core/src/main/java/org/acegisecurity/event/authorization/AuthorizedEvent.java
index abcab5a768..ddf6e082ec 100644
--- a/core/src/main/java/org/acegisecurity/event/authorization/AuthorizedEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authorization/AuthorizedEvent.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authorization;
+package org.acegisecurity.event.authorization;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/event/authorization/LoggerListener.java b/core/src/main/java/org/acegisecurity/event/authorization/LoggerListener.java
index e114d2ed87..8af4b2fa59 100644
--- a/core/src/main/java/org/acegisecurity/event/authorization/LoggerListener.java
+++ b/core/src/main/java/org/acegisecurity/event/authorization/LoggerListener.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authorization;
+package org.acegisecurity.event.authorization;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/event/authorization/PublicInvocationEvent.java b/core/src/main/java/org/acegisecurity/event/authorization/PublicInvocationEvent.java
index d1d268915b..ad651780e7 100644
--- a/core/src/main/java/org/acegisecurity/event/authorization/PublicInvocationEvent.java
+++ b/core/src/main/java/org/acegisecurity/event/authorization/PublicInvocationEvent.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authorization;
+package org.acegisecurity.event.authorization;
 
 /**
  * Event that is generated whenever a public secure object is invoked.
diff --git a/core/src/main/java/org/acegisecurity/intercept/AbstractSecurityInterceptor.java b/core/src/main/java/org/acegisecurity/intercept/AbstractSecurityInterceptor.java
index 74b7e513a1..46e827ef8a 100644
--- a/core/src/main/java/org/acegisecurity/intercept/AbstractSecurityInterceptor.java
+++ b/core/src/main/java/org/acegisecurity/intercept/AbstractSecurityInterceptor.java
@@ -13,24 +13,24 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept;
+package org.acegisecurity.intercept;
 
-import net.sf.acegisecurity.AccessDecisionManager;
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.AfterInvocationManager;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationCredentialsNotFoundException;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.AuthenticationManager;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.RunAsManager;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.event.authorization.AuthenticationCredentialsNotFoundEvent;
-import net.sf.acegisecurity.event.authorization.AuthorizationFailureEvent;
-import net.sf.acegisecurity.event.authorization.AuthorizedEvent;
-import net.sf.acegisecurity.event.authorization.PublicInvocationEvent;
-import net.sf.acegisecurity.runas.NullRunAsManager;
+import org.acegisecurity.AccessDecisionManager;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.AfterInvocationManager;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationCredentialsNotFoundException;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationManager;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.RunAsManager;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.event.authorization.AuthenticationCredentialsNotFoundEvent;
+import org.acegisecurity.event.authorization.AuthorizationFailureEvent;
+import org.acegisecurity.event.authorization.AuthorizedEvent;
+import org.acegisecurity.event.authorization.PublicInvocationEvent;
+import org.acegisecurity.runas.NullRunAsManager;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -71,7 +71,7 @@ import java.util.Set;
  * 
  * 
      
  * 
    1. 
- * If either the {@link net.sf.acegisecurity.Authentication#isAuthenticated()}
+ * If either the {@link org.acegisecurity.Authentication#isAuthenticated()}
  * returns false, or the {@link #alwaysReauthenticate} is
  * true,  authenticate the request against the configured {@link
  * AuthenticationManager}. When authenticated, replace the
diff --git a/core/src/main/java/org/acegisecurity/intercept/InterceptorStatusToken.java b/core/src/main/java/org/acegisecurity/intercept/InterceptorStatusToken.java
index 95eda0e501..23f82a7e21 100644
--- a/core/src/main/java/org/acegisecurity/intercept/InterceptorStatusToken.java
+++ b/core/src/main/java/org/acegisecurity/intercept/InterceptorStatusToken.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept;
+package org.acegisecurity.intercept;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 
 /**
@@ -25,7 +25,7 @@ import net.sf.acegisecurity.ConfigAttributeDefinition;
  * 
      
  * This class reflects the status of the security interception, so that the
  * final call to {@link
- * net.sf.acegisecurity.intercept.AbstractSecurityInterceptor#afterInvocation(InterceptorStatusToken,
+ * org.acegisecurity.intercept.AbstractSecurityInterceptor#afterInvocation(InterceptorStatusToken,
  * Object)} can tidy up correctly.
  * 
      
  *
diff --git a/core/src/main/java/org/acegisecurity/intercept/ObjectDefinitionSource.java b/core/src/main/java/org/acegisecurity/intercept/ObjectDefinitionSource.java
index 6c095689c1..b6fa907115 100644
--- a/core/src/main/java/org/acegisecurity/intercept/ObjectDefinitionSource.java
+++ b/core/src/main/java/org/acegisecurity/intercept/ObjectDefinitionSource.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept;
+package org.acegisecurity.intercept;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 import java.util.Iterator;
 
diff --git a/core/src/main/java/org/acegisecurity/intercept/method/AbstractMethodDefinitionSource.java b/core/src/main/java/org/acegisecurity/intercept/method/AbstractMethodDefinitionSource.java
index c6a5271950..7bb6a7282d 100644
--- a/core/src/main/java/org/acegisecurity/intercept/method/AbstractMethodDefinitionSource.java
+++ b/core/src/main/java/org/acegisecurity/intercept/method/AbstractMethodDefinitionSource.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.method;
+package org.acegisecurity.intercept.method;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 import org.aopalliance.intercept.MethodInvocation;
 
diff --git a/core/src/main/java/org/acegisecurity/intercept/method/MethodDefinitionAttributes.java b/core/src/main/java/org/acegisecurity/intercept/method/MethodDefinitionAttributes.java
index aa42aa9a2c..87d237cae2 100644
--- a/core/src/main/java/org/acegisecurity/intercept/method/MethodDefinitionAttributes.java
+++ b/core/src/main/java/org/acegisecurity/intercept/method/MethodDefinitionAttributes.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.method;
+package org.acegisecurity.intercept.method;
 
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 import org.springframework.metadata.Attributes;
 
diff --git a/core/src/main/java/org/acegisecurity/intercept/method/MethodDefinitionMap.java b/core/src/main/java/org/acegisecurity/intercept/method/MethodDefinitionMap.java
index e7dfe9000a..3ad5bf1621 100644
--- a/core/src/main/java/org/acegisecurity/intercept/method/MethodDefinitionMap.java
+++ b/core/src/main/java/org/acegisecurity/intercept/method/MethodDefinitionMap.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.method;
+package org.acegisecurity.intercept.method;
 
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/intercept/method/MethodDefinitionSource.java b/core/src/main/java/org/acegisecurity/intercept/method/MethodDefinitionSource.java
index 4c86de100b..05c71e6623 100644
--- a/core/src/main/java/org/acegisecurity/intercept/method/MethodDefinitionSource.java
+++ b/core/src/main/java/org/acegisecurity/intercept/method/MethodDefinitionSource.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.method;
+package org.acegisecurity.intercept.method;
 
-import net.sf.acegisecurity.intercept.ObjectDefinitionSource;
+import org.acegisecurity.intercept.ObjectDefinitionSource;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/intercept/method/MethodDefinitionSourceEditor.java b/core/src/main/java/org/acegisecurity/intercept/method/MethodDefinitionSourceEditor.java
index 7d05d1345a..a0a1e9e57c 100644
--- a/core/src/main/java/org/acegisecurity/intercept/method/MethodDefinitionSourceEditor.java
+++ b/core/src/main/java/org/acegisecurity/intercept/method/MethodDefinitionSourceEditor.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.method;
+package org.acegisecurity.intercept.method;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.ConfigAttributeEditor;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.ConfigAttributeEditor;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/intercept/method/aopalliance/MethodDefinitionSourceAdvisor.java b/core/src/main/java/org/acegisecurity/intercept/method/aopalliance/MethodDefinitionSourceAdvisor.java
index 94c5de8ab0..bf4e406017 100644
--- a/core/src/main/java/org/acegisecurity/intercept/method/aopalliance/MethodDefinitionSourceAdvisor.java
+++ b/core/src/main/java/org/acegisecurity/intercept/method/aopalliance/MethodDefinitionSourceAdvisor.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.method.aopalliance;
+package org.acegisecurity.intercept.method.aopalliance;
 
-import net.sf.acegisecurity.intercept.method.MethodDefinitionSource;
+import org.acegisecurity.intercept.method.MethodDefinitionSource;
 
 import org.aopalliance.intercept.MethodInvocation;
 
diff --git a/core/src/main/java/org/acegisecurity/intercept/method/aopalliance/MethodSecurityInterceptor.java b/core/src/main/java/org/acegisecurity/intercept/method/aopalliance/MethodSecurityInterceptor.java
index f6460b76b4..8561876f24 100644
--- a/core/src/main/java/org/acegisecurity/intercept/method/aopalliance/MethodSecurityInterceptor.java
+++ b/core/src/main/java/org/acegisecurity/intercept/method/aopalliance/MethodSecurityInterceptor.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.method.aopalliance;
+package org.acegisecurity.intercept.method.aopalliance;
 
-import net.sf.acegisecurity.intercept.AbstractSecurityInterceptor;
-import net.sf.acegisecurity.intercept.InterceptorStatusToken;
-import net.sf.acegisecurity.intercept.ObjectDefinitionSource;
-import net.sf.acegisecurity.intercept.method.MethodDefinitionSource;
+import org.acegisecurity.intercept.AbstractSecurityInterceptor;
+import org.acegisecurity.intercept.InterceptorStatusToken;
+import org.acegisecurity.intercept.ObjectDefinitionSource;
+import org.acegisecurity.intercept.method.MethodDefinitionSource;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
diff --git a/core/src/main/java/org/acegisecurity/intercept/method/aspectj/AspectJCallback.java b/core/src/main/java/org/acegisecurity/intercept/method/aspectj/AspectJCallback.java
index cf82edcfb4..1a3086eb0e 100644
--- a/core/src/main/java/org/acegisecurity/intercept/method/aspectj/AspectJCallback.java
+++ b/core/src/main/java/org/acegisecurity/intercept/method/aspectj/AspectJCallback.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.method.aspectj;
+package org.acegisecurity.intercept.method.aspectj;
 
 /**
  * Called by the {@link AspectJSecurityInterceptor} when it wishes for the
diff --git a/core/src/main/java/org/acegisecurity/intercept/method/aspectj/AspectJSecurityInterceptor.java b/core/src/main/java/org/acegisecurity/intercept/method/aspectj/AspectJSecurityInterceptor.java
index ce9c3e7796..8c88e89a91 100644
--- a/core/src/main/java/org/acegisecurity/intercept/method/aspectj/AspectJSecurityInterceptor.java
+++ b/core/src/main/java/org/acegisecurity/intercept/method/aspectj/AspectJSecurityInterceptor.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.method.aspectj;
+package org.acegisecurity.intercept.method.aspectj;
 
-import net.sf.acegisecurity.intercept.AbstractSecurityInterceptor;
-import net.sf.acegisecurity.intercept.InterceptorStatusToken;
-import net.sf.acegisecurity.intercept.ObjectDefinitionSource;
-import net.sf.acegisecurity.intercept.method.MethodDefinitionSource;
+import org.acegisecurity.intercept.AbstractSecurityInterceptor;
+import org.acegisecurity.intercept.InterceptorStatusToken;
+import org.acegisecurity.intercept.ObjectDefinitionSource;
+import org.acegisecurity.intercept.method.MethodDefinitionSource;
 
 import org.aspectj.lang.JoinPoint;
 
diff --git a/core/src/main/java/org/acegisecurity/intercept/web/AbstractFilterInvocationDefinitionSource.java b/core/src/main/java/org/acegisecurity/intercept/web/AbstractFilterInvocationDefinitionSource.java
index f8761e2ebc..9233544d93 100644
--- a/core/src/main/java/org/acegisecurity/intercept/web/AbstractFilterInvocationDefinitionSource.java
+++ b/core/src/main/java/org/acegisecurity/intercept/web/AbstractFilterInvocationDefinitionSource.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/intercept/web/AuthenticationEntryPoint.java b/core/src/main/java/org/acegisecurity/intercept/web/AuthenticationEntryPoint.java
index b9f59d0638..103ff0b285 100644
--- a/core/src/main/java/org/acegisecurity/intercept/web/AuthenticationEntryPoint.java
+++ b/core/src/main/java/org/acegisecurity/intercept/web/AuthenticationEntryPoint.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationException;
 
 import java.io.IOException;
 
diff --git a/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocation.java b/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocation.java
index a5400923b6..8b059756b7 100644
--- a/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocation.java
+++ b/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocation.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletRequest;
@@ -86,7 +86,7 @@ public class FilterInvocation {
      * 
      * 
      
      * The returned URL does not reflect the port number determined from
-     * a {@link net.sf.acegisecurity.util.PortResolver}.
+     * a {@link org.acegisecurity.util.PortResolver}.
      * 
      
      *
      * @return the full URL of this request
diff --git a/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionMap.java b/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionMap.java
index bcdf4d6e75..3172284559 100644
--- a/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionMap.java
+++ b/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionMap.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSource.java b/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSource.java
index 58729be8d5..9f10239619 100644
--- a/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSource.java
+++ b/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSource.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
-import net.sf.acegisecurity.intercept.ObjectDefinitionSource;
+import org.acegisecurity.intercept.ObjectDefinitionSource;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSourceEditor.java b/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSourceEditor.java
index 58c75f1f24..2946f7c20f 100644
--- a/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSourceEditor.java
+++ b/core/src/main/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSourceEditor.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.ConfigAttributeEditor;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.ConfigAttributeEditor;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/intercept/web/FilterSecurityInterceptor.java b/core/src/main/java/org/acegisecurity/intercept/web/FilterSecurityInterceptor.java
index 39bf223f3e..7d349be608 100644
--- a/core/src/main/java/org/acegisecurity/intercept/web/FilterSecurityInterceptor.java
+++ b/core/src/main/java/org/acegisecurity/intercept/web/FilterSecurityInterceptor.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
-import net.sf.acegisecurity.intercept.AbstractSecurityInterceptor;
-import net.sf.acegisecurity.intercept.InterceptorStatusToken;
-import net.sf.acegisecurity.intercept.ObjectDefinitionSource;
+import org.acegisecurity.intercept.AbstractSecurityInterceptor;
+import org.acegisecurity.intercept.InterceptorStatusToken;
+import org.acegisecurity.intercept.ObjectDefinitionSource;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/intercept/web/PathBasedFilterInvocationDefinitionMap.java b/core/src/main/java/org/acegisecurity/intercept/web/PathBasedFilterInvocationDefinitionMap.java
index 587bb21a06..07ef2ee908 100644
--- a/core/src/main/java/org/acegisecurity/intercept/web/PathBasedFilterInvocationDefinitionMap.java
+++ b/core/src/main/java/org/acegisecurity/intercept/web/PathBasedFilterInvocationDefinitionMap.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/intercept/web/RegExpBasedFilterInvocationDefinitionMap.java b/core/src/main/java/org/acegisecurity/intercept/web/RegExpBasedFilterInvocationDefinitionMap.java
index 77f683d6b9..1ca1aa4a9c 100644
--- a/core/src/main/java/org/acegisecurity/intercept/web/RegExpBasedFilterInvocationDefinitionMap.java
+++ b/core/src/main/java/org/acegisecurity/intercept/web/RegExpBasedFilterInvocationDefinitionMap.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/intercept/web/SecurityEnforcementFilter.java b/core/src/main/java/org/acegisecurity/intercept/web/SecurityEnforcementFilter.java
index 60371b9935..e562d00931 100644
--- a/core/src/main/java/org/acegisecurity/intercept/web/SecurityEnforcementFilter.java
+++ b/core/src/main/java/org/acegisecurity/intercept/web/SecurityEnforcementFilter.java
@@ -12,17 +12,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.AuthenticationTrustResolver;
-import net.sf.acegisecurity.AuthenticationTrustResolverImpl;
-import net.sf.acegisecurity.InsufficientAuthenticationException;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.ui.AbstractProcessingFilter;
-import net.sf.acegisecurity.util.PortResolver;
-import net.sf.acegisecurity.util.PortResolverImpl;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationTrustResolver;
+import org.acegisecurity.AuthenticationTrustResolverImpl;
+import org.acegisecurity.InsufficientAuthenticationException;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.ui.AbstractProcessingFilter;
+import org.acegisecurity.util.PortResolver;
+import org.acegisecurity.util.PortResolverImpl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -55,7 +55,7 @@ import javax.servlet.http.HttpServletResponse;
  * If an {@link AuthenticationException} is detected, the filter will launch
  * the authenticationEntryPoint. This allows common handling of
  * authentication failures originating from any subclass of {@link
- * net.sf.acegisecurity.intercept.AbstractSecurityInterceptor}.
+ * org.acegisecurity.intercept.AbstractSecurityInterceptor}.
  * 
      
  *
  * 
      
@@ -96,7 +96,7 @@ import javax.servlet.http.HttpServletResponse;
  * 
      
  * Do not use this class directly. Instead configure
  * web.xml to use the {@link
- * net.sf.acegisecurity.util.FilterToBeanProxy}.
+ * org.acegisecurity.util.FilterToBeanProxy}.
  * 
      
  *
  * @author Ben Alex
@@ -132,7 +132,7 @@ public class SecurityEnforcementFilter implements Filter, InitializingBean {
      * default). In situations where you do not wish to unnecessarily create HttpSessions
      * - because the user agent will know the failed URL, such as with BASIC or Digest authentication
      * - you may wish to set this property to false. Remember to also set the
-     * {@link net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter#allowSessionCreation}
+     * {@link org.acegisecurity.context.HttpSessionContextIntegrationFilter#allowSessionCreation}
      * to false if you set this property to false.
      *
      * @return true if the HttpSession will be used to store information
diff --git a/core/src/main/java/org/acegisecurity/providers/AbstractAuthenticationToken.java b/core/src/main/java/org/acegisecurity/providers/AbstractAuthenticationToken.java
index 7ee52fb2ff..946ea5fddf 100644
--- a/core/src/main/java/org/acegisecurity/providers/AbstractAuthenticationToken.java
+++ b/core/src/main/java/org/acegisecurity/providers/AbstractAuthenticationToken.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers;
+package org.acegisecurity.providers;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.UserDetails;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.UserDetails;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/providers/AuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/AuthenticationProvider.java
index 78025ebb8f..52cb6f58a8 100644
--- a/core/src/main/java/org/acegisecurity/providers/AuthenticationProvider.java
+++ b/core/src/main/java/org/acegisecurity/providers/AuthenticationProvider.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers;
+package org.acegisecurity.providers;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
  * Indicates a class can process a specific  {@link
- * net.sf.acegisecurity.Authentication} implementation.
+ * org.acegisecurity.Authentication} implementation.
  *
  * @author Ben Alex
  * @version $Id$
@@ -31,7 +31,7 @@ public interface AuthenticationProvider {
 
     /**
      * Performs authentication with the same contract as {@link
-     * net.sf.acegisecurity.AuthenticationManager#authenticate(Authentication)}.
+     * org.acegisecurity.AuthenticationManager#authenticate(Authentication)}.
      *
      * @param authentication the authentication request object.
      *
diff --git a/core/src/main/java/org/acegisecurity/providers/ProviderManager.java b/core/src/main/java/org/acegisecurity/providers/ProviderManager.java
index d14fbf324f..d6194804cb 100644
--- a/core/src/main/java/org/acegisecurity/providers/ProviderManager.java
+++ b/core/src/main/java/org/acegisecurity/providers/ProviderManager.java
@@ -13,33 +13,33 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers;
+package org.acegisecurity.providers;
 
-import net.sf.acegisecurity.AbstractAuthenticationManager;
-import net.sf.acegisecurity.AccountExpiredException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.AuthenticationServiceException;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.CredentialsExpiredException;
-import net.sf.acegisecurity.DisabledException;
-import net.sf.acegisecurity.LockedException;
-import net.sf.acegisecurity.concurrent.ConcurrentLoginException;
-import net.sf.acegisecurity.concurrent.ConcurrentSessionController;
-import net.sf.acegisecurity.concurrent.NullConcurrentSessionController;
-import net.sf.acegisecurity.event.authentication.AbstractAuthenticationEvent;
-import net.sf.acegisecurity.event.authentication.AuthenticationFailureBadCredentialsEvent;
-import net.sf.acegisecurity.event.authentication.AuthenticationFailureConcurrentLoginEvent;
-import net.sf.acegisecurity.event.authentication.AuthenticationFailureCredentialsExpiredEvent;
-import net.sf.acegisecurity.event.authentication.AuthenticationFailureDisabledEvent;
-import net.sf.acegisecurity.event.authentication.AuthenticationFailureExpiredEvent;
-import net.sf.acegisecurity.event.authentication.AuthenticationFailureLockedEvent;
-import net.sf.acegisecurity.event.authentication.AuthenticationFailureProviderNotFoundEvent;
-import net.sf.acegisecurity.event.authentication.AuthenticationFailureProxyUntrustedEvent;
-import net.sf.acegisecurity.event.authentication.AuthenticationFailureServiceExceptionEvent;
-import net.sf.acegisecurity.event.authentication.AuthenticationSuccessEvent;
-import net.sf.acegisecurity.providers.cas.ProxyUntrustedException;
-import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
+import org.acegisecurity.AbstractAuthenticationManager;
+import org.acegisecurity.AccountExpiredException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationServiceException;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.CredentialsExpiredException;
+import org.acegisecurity.DisabledException;
+import org.acegisecurity.LockedException;
+import org.acegisecurity.concurrent.ConcurrentLoginException;
+import org.acegisecurity.concurrent.ConcurrentSessionController;
+import org.acegisecurity.concurrent.NullConcurrentSessionController;
+import org.acegisecurity.event.authentication.AbstractAuthenticationEvent;
+import org.acegisecurity.event.authentication.AuthenticationFailureBadCredentialsEvent;
+import org.acegisecurity.event.authentication.AuthenticationFailureConcurrentLoginEvent;
+import org.acegisecurity.event.authentication.AuthenticationFailureCredentialsExpiredEvent;
+import org.acegisecurity.event.authentication.AuthenticationFailureDisabledEvent;
+import org.acegisecurity.event.authentication.AuthenticationFailureExpiredEvent;
+import org.acegisecurity.event.authentication.AuthenticationFailureLockedEvent;
+import org.acegisecurity.event.authentication.AuthenticationFailureProviderNotFoundEvent;
+import org.acegisecurity.event.authentication.AuthenticationFailureProxyUntrustedEvent;
+import org.acegisecurity.event.authentication.AuthenticationFailureServiceExceptionEvent;
+import org.acegisecurity.event.authentication.AuthenticationSuccessEvent;
+import org.acegisecurity.providers.cas.ProxyUntrustedException;
+import org.acegisecurity.providers.dao.UsernameNotFoundException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -85,7 +85,7 @@ import java.util.Properties;
  * If a valid Authentication is returned by an
  * AuthenticationProvider, the ProviderManager will
  * publish an {@link
- * net.sf.acegisecurity.event.authentication.AuthenticationSuccessEvent}. If
+ * org.acegisecurity.event.authentication.AuthenticationSuccessEvent}. If
  * an AuthenticationException is detected, the final
  * AuthenticationException thrown will be used to publish an
  * appropriate failure event. By default ProviderManager maps
@@ -94,7 +94,7 @@ import java.util.Properties;
  * the properties object, each of the keys represent the fully qualified
  * classname of the exception, and each of the values represent the name of an
  * event class which subclasses {@link
- * net.sf.acegisecurity.event.authentication.AbstractAuthenticationFailureEvent}
+ * org.acegisecurity.event.authentication.AbstractAuthenticationFailureEvent}
  * and provides its constructor.
  * 
      
  *
diff --git a/core/src/main/java/org/acegisecurity/providers/ProviderNotFoundException.java b/core/src/main/java/org/acegisecurity/providers/ProviderNotFoundException.java
index ba82fd0924..4d81022d39 100644
--- a/core/src/main/java/org/acegisecurity/providers/ProviderNotFoundException.java
+++ b/core/src/main/java/org/acegisecurity/providers/ProviderNotFoundException.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers;
+package org.acegisecurity.providers;
 
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
  * Thrown by {@link ProviderManager} if no  {@link AuthenticationProvider}
  * could be found that supports the presented {@link
- * net.sf.acegisecurity.Authentication} object.
+ * org.acegisecurity.Authentication} object.
  *
  * @author Ben Alex
  * @version $Id$
diff --git a/core/src/main/java/org/acegisecurity/providers/TestingAuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/TestingAuthenticationProvider.java
index 2cb5ea7255..7330325243 100644
--- a/core/src/main/java/org/acegisecurity/providers/TestingAuthenticationProvider.java
+++ b/core/src/main/java/org/acegisecurity/providers/TestingAuthenticationProvider.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers;
+package org.acegisecurity.providers;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/providers/TestingAuthenticationToken.java b/core/src/main/java/org/acegisecurity/providers/TestingAuthenticationToken.java
index d54cee41da..3ea1d66c86 100644
--- a/core/src/main/java/org/acegisecurity/providers/TestingAuthenticationToken.java
+++ b/core/src/main/java/org/acegisecurity/providers/TestingAuthenticationToken.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers;
+package org.acegisecurity.providers;
 
-import net.sf.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthority;
 
 
 /**
- * An {@link net.sf.acegisecurity.Authentication} implementation that is
+ * An {@link org.acegisecurity.Authentication} implementation that is
  * designed for use whilst unit testing.
  * 
  * 
      
diff --git a/core/src/main/java/org/acegisecurity/providers/UsernamePasswordAuthenticationToken.java b/core/src/main/java/org/acegisecurity/providers/UsernamePasswordAuthenticationToken.java
index ce155a22ed..cca837d677 100644
--- a/core/src/main/java/org/acegisecurity/providers/UsernamePasswordAuthenticationToken.java
+++ b/core/src/main/java/org/acegisecurity/providers/UsernamePasswordAuthenticationToken.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers;
+package org.acegisecurity.providers;
 
-import net.sf.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthority;
 
 
 /**
- * An {@link net.sf.acegisecurity.Authentication} implementation that is
+ * An {@link org.acegisecurity.Authentication} implementation that is
  * designed for simple presentation of a username and password.
  * 
  * 
      
@@ -111,7 +111,7 @@ public class UsernamePasswordAuthenticationToken
     }
 
     /**
-     * Usually a {@link net.sf.acegisecurity.ui.WebAuthenticationDetails}.
+     * Usually a {@link org.acegisecurity.ui.WebAuthenticationDetails}.
      *
      * @return the authentication request details, or null
      */
diff --git a/core/src/main/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationProvider.java
index 137f4d8507..c69f85a5a8 100644
--- a/core/src/main/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationProvider.java
+++ b/core/src/main/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationProvider.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.anonymous;
+package org.acegisecurity.providers.anonymous;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.providers.AuthenticationProvider;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.providers.AuthenticationProvider;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -30,11 +30,11 @@ import org.springframework.util.Assert;
 
 /**
  * An {@link AuthenticationProvider} implementation that validates {@link
- * net.sf.acegisecurity.providers.anonymous.AnonymousAuthenticationToken}s.
+ * org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken}s.
  * 
  * 
      
  * To be successfully validated, the  {@link
- * net.sf.acegisecurity.providers.anonymous.AnonymousAuthenticationToken#getKeyHash()}
+ * org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken#getKeyHash()}
  * must match this class' {@link #getKey()}.
  * 
      
  *
diff --git a/core/src/main/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationToken.java b/core/src/main/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationToken.java
index f1d9cff43f..4016b74944 100644
--- a/core/src/main/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationToken.java
+++ b/core/src/main/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationToken.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.anonymous;
+package org.acegisecurity.providers.anonymous;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.providers.AbstractAuthenticationToken;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.providers.AbstractAuthenticationToken;
 
 import org.springframework.util.Assert;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilter.java b/core/src/main/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilter.java
index f27676295f..cfe4e2e060 100644
--- a/core/src/main/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilter.java
+++ b/core/src/main/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilter.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.anonymous;
+package org.acegisecurity.providers.anonymous;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.providers.dao.memory.UserAttribute;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.providers.dao.memory.UserAttribute;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -43,7 +43,7 @@ import javax.servlet.ServletResponse;
  * 
      
  * Do not use this class directly. Instead configure
  * web.xml to use the {@link
- * net.sf.acegisecurity.util.FilterToBeanProxy}.
+ * org.acegisecurity.util.FilterToBeanProxy}.
  * 
      
  *
  * @author Ben Alex
@@ -74,7 +74,7 @@ public class AnonymousProcessingFilter implements Filter, InitializingBean {
      * Controls whether the filter will remove the Anonymous token after the
      * request is complete. Generally this is desired to avoid the expense of
      * a session being created by {@link
-     * net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter
+     * org.acegisecurity.context.HttpSessionContextIntegrationFilter
      * HttpSessionContextIntegrationFilter} simply to store the Anonymous
      * authentication token.
      * 
diff --git a/core/src/main/java/org/acegisecurity/providers/cas/CasAuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/cas/CasAuthenticationProvider.java
index e58b7fa7d0..503407bc0a 100644
--- a/core/src/main/java/org/acegisecurity/providers/cas/CasAuthenticationProvider.java
+++ b/core/src/main/java/org/acegisecurity/providers/cas/CasAuthenticationProvider.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas;
+package org.acegisecurity.providers.cas;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.AuthenticationProvider;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.ui.cas.CasProcessingFilter;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.AuthenticationProvider;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.ui.cas.CasProcessingFilter;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/providers/cas/CasAuthenticationToken.java b/core/src/main/java/org/acegisecurity/providers/cas/CasAuthenticationToken.java
index dc22ef8272..cffaa05e13 100644
--- a/core/src/main/java/org/acegisecurity/providers/cas/CasAuthenticationToken.java
+++ b/core/src/main/java/org/acegisecurity/providers/cas/CasAuthenticationToken.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas;
+package org.acegisecurity.providers.cas;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.AbstractAuthenticationToken;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.AbstractAuthenticationToken;
 
 import org.springframework.util.Assert;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/cas/CasAuthoritiesPopulator.java b/core/src/main/java/org/acegisecurity/providers/cas/CasAuthoritiesPopulator.java
index 81fac9cac6..2c99a74083 100644
--- a/core/src/main/java/org/acegisecurity/providers/cas/CasAuthoritiesPopulator.java
+++ b/core/src/main/java/org/acegisecurity/providers/cas/CasAuthoritiesPopulator.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas;
+package org.acegisecurity.providers.cas;
 
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.UserDetails;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.UserDetails;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/providers/cas/CasProxyDecider.java b/core/src/main/java/org/acegisecurity/providers/cas/CasProxyDecider.java
index 59783973d2..ec239027ee 100644
--- a/core/src/main/java/org/acegisecurity/providers/cas/CasProxyDecider.java
+++ b/core/src/main/java/org/acegisecurity/providers/cas/CasProxyDecider.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas;
+package org.acegisecurity.providers.cas;
 
 import java.util.List;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/cas/ProxyUntrustedException.java b/core/src/main/java/org/acegisecurity/providers/cas/ProxyUntrustedException.java
index 66733ba960..20b581be49 100644
--- a/core/src/main/java/org/acegisecurity/providers/cas/ProxyUntrustedException.java
+++ b/core/src/main/java/org/acegisecurity/providers/cas/ProxyUntrustedException.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas;
+package org.acegisecurity.providers.cas;
 
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/providers/cas/StatelessTicketCache.java b/core/src/main/java/org/acegisecurity/providers/cas/StatelessTicketCache.java
index 36523b83dc..1149d842e6 100644
--- a/core/src/main/java/org/acegisecurity/providers/cas/StatelessTicketCache.java
+++ b/core/src/main/java/org/acegisecurity/providers/cas/StatelessTicketCache.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas;
+package org.acegisecurity.providers.cas;
 
 /**
  * Caches CAS service tickets and CAS proxy tickets for stateless connections.
diff --git a/core/src/main/java/org/acegisecurity/providers/cas/TicketResponse.java b/core/src/main/java/org/acegisecurity/providers/cas/TicketResponse.java
index d7600c744c..dbf6673ad9 100644
--- a/core/src/main/java/org/acegisecurity/providers/cas/TicketResponse.java
+++ b/core/src/main/java/org/acegisecurity/providers/cas/TicketResponse.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas;
+package org.acegisecurity.providers.cas;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/main/java/org/acegisecurity/providers/cas/TicketValidator.java b/core/src/main/java/org/acegisecurity/providers/cas/TicketValidator.java
index c9be4d38cb..3c1d10cfbc 100644
--- a/core/src/main/java/org/acegisecurity/providers/cas/TicketValidator.java
+++ b/core/src/main/java/org/acegisecurity/providers/cas/TicketValidator.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas;
+package org.acegisecurity.providers.cas;
 
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/providers/cas/cache/EhCacheBasedTicketCache.java b/core/src/main/java/org/acegisecurity/providers/cas/cache/EhCacheBasedTicketCache.java
index 7fff47ed79..1828187b89 100644
--- a/core/src/main/java/org/acegisecurity/providers/cas/cache/EhCacheBasedTicketCache.java
+++ b/core/src/main/java/org/acegisecurity/providers/cas/cache/EhCacheBasedTicketCache.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas.cache;
+package org.acegisecurity.providers.cas.cache;
 
-import net.sf.acegisecurity.providers.cas.CasAuthenticationToken;
-import net.sf.acegisecurity.providers.cas.StatelessTicketCache;
+import org.acegisecurity.providers.cas.CasAuthenticationToken;
+import org.acegisecurity.providers.cas.StatelessTicketCache;
 
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheException;
diff --git a/core/src/main/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulator.java b/core/src/main/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulator.java
index b1cc53f625..e8221e7614 100644
--- a/core/src/main/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulator.java
+++ b/core/src/main/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulator.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas.populator;
+package org.acegisecurity.providers.cas.populator;
 
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.cas.CasAuthoritiesPopulator;
-import net.sf.acegisecurity.providers.dao.AuthenticationDao;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.cas.CasAuthoritiesPopulator;
+import org.acegisecurity.providers.dao.AuthenticationDao;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/acegisecurity/providers/cas/proxy/AcceptAnyCasProxy.java b/core/src/main/java/org/acegisecurity/providers/cas/proxy/AcceptAnyCasProxy.java
index 359fb3c650..9bcb4b6424 100644
--- a/core/src/main/java/org/acegisecurity/providers/cas/proxy/AcceptAnyCasProxy.java
+++ b/core/src/main/java/org/acegisecurity/providers/cas/proxy/AcceptAnyCasProxy.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas.proxy;
+package org.acegisecurity.providers.cas.proxy;
 
-import net.sf.acegisecurity.providers.cas.CasProxyDecider;
-import net.sf.acegisecurity.providers.cas.ProxyUntrustedException;
+import org.acegisecurity.providers.cas.CasProxyDecider;
+import org.acegisecurity.providers.cas.ProxyUntrustedException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/providers/cas/proxy/NamedCasProxyDecider.java b/core/src/main/java/org/acegisecurity/providers/cas/proxy/NamedCasProxyDecider.java
index 9875fc455a..19867f7014 100644
--- a/core/src/main/java/org/acegisecurity/providers/cas/proxy/NamedCasProxyDecider.java
+++ b/core/src/main/java/org/acegisecurity/providers/cas/proxy/NamedCasProxyDecider.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas.proxy;
+package org.acegisecurity.providers.cas.proxy;
 
-import net.sf.acegisecurity.providers.cas.CasProxyDecider;
-import net.sf.acegisecurity.providers.cas.ProxyUntrustedException;
+import org.acegisecurity.providers.cas.CasProxyDecider;
+import org.acegisecurity.providers.cas.ProxyUntrustedException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/providers/cas/proxy/RejectProxyTickets.java b/core/src/main/java/org/acegisecurity/providers/cas/proxy/RejectProxyTickets.java
index 13864f617e..5cbf957fb1 100644
--- a/core/src/main/java/org/acegisecurity/providers/cas/proxy/RejectProxyTickets.java
+++ b/core/src/main/java/org/acegisecurity/providers/cas/proxy/RejectProxyTickets.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas.proxy;
+package org.acegisecurity.providers.cas.proxy;
 
-import net.sf.acegisecurity.providers.cas.CasProxyDecider;
-import net.sf.acegisecurity.providers.cas.ProxyUntrustedException;
+import org.acegisecurity.providers.cas.CasProxyDecider;
+import org.acegisecurity.providers.cas.ProxyUntrustedException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/providers/cas/ticketvalidator/AbstractTicketValidator.java b/core/src/main/java/org/acegisecurity/providers/cas/ticketvalidator/AbstractTicketValidator.java
index aa6122fe17..3a8f5997c4 100644
--- a/core/src/main/java/org/acegisecurity/providers/cas/ticketvalidator/AbstractTicketValidator.java
+++ b/core/src/main/java/org/acegisecurity/providers/cas/ticketvalidator/AbstractTicketValidator.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas.ticketvalidator;
+package org.acegisecurity.providers.cas.ticketvalidator;
 
-import net.sf.acegisecurity.providers.cas.TicketValidator;
-import net.sf.acegisecurity.ui.cas.ServiceProperties;
+import org.acegisecurity.providers.cas.TicketValidator;
+import org.acegisecurity.ui.cas.ServiceProperties;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/providers/cas/ticketvalidator/CasProxyTicketValidator.java b/core/src/main/java/org/acegisecurity/providers/cas/ticketvalidator/CasProxyTicketValidator.java
index 17a405bd58..a0bf3255d5 100644
--- a/core/src/main/java/org/acegisecurity/providers/cas/ticketvalidator/CasProxyTicketValidator.java
+++ b/core/src/main/java/org/acegisecurity/providers/cas/ticketvalidator/CasProxyTicketValidator.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas.ticketvalidator;
+package org.acegisecurity.providers.cas.ticketvalidator;
 
 import edu.yale.its.tp.cas.client.ProxyTicketValidator;
 
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.AuthenticationServiceException;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.providers.cas.TicketResponse;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationServiceException;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.providers.cas.TicketResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/providers/dao/AbstractUserDetailsAuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/dao/AbstractUserDetailsAuthenticationProvider.java
index 8153fc80fc..7e593a47bb 100644
--- a/core/src/main/java/org/acegisecurity/providers/dao/AbstractUserDetailsAuthenticationProvider.java
+++ b/core/src/main/java/org/acegisecurity/providers/dao/AbstractUserDetailsAuthenticationProvider.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao;
+package org.acegisecurity.providers.dao;
 
-import net.sf.acegisecurity.AccountExpiredException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.CredentialsExpiredException;
-import net.sf.acegisecurity.DisabledException;
-import net.sf.acegisecurity.LockedException;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.AuthenticationProvider;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.providers.dao.cache.NullUserCache;
+import org.acegisecurity.AccountExpiredException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.CredentialsExpiredException;
+import org.acegisecurity.DisabledException;
+import org.acegisecurity.LockedException;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.AuthenticationProvider;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.providers.dao.cache.NullUserCache;
 
 import org.springframework.beans.factory.InitializingBean;
 
@@ -33,7 +33,7 @@ import org.springframework.util.Assert;
 
 /**
  * A base {@link AuthenticationProvider} that allows subclasses to override and
- * work with {@link net.sf.acegisecurity.UserDetails} objects. The class is
+ * work with {@link org.acegisecurity.UserDetails} objects. The class is
  * designed to respond to {@link UsernamePasswordAuthenticationToken}
  * authentication requests.
  * 
diff --git a/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java
index 13c01b67f9..f54f926108 100644
--- a/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java
+++ b/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao;
+package org.acegisecurity.providers.dao;
 
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.AuthenticationServiceException;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.AuthenticationProvider;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.providers.encoding.PasswordEncoder;
-import net.sf.acegisecurity.providers.encoding.PlaintextPasswordEncoder;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationServiceException;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.AuthenticationProvider;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.providers.encoding.PasswordEncoder;
+import org.acegisecurity.providers.encoding.PlaintextPasswordEncoder;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/dao/SaltSource.java b/core/src/main/java/org/acegisecurity/providers/dao/SaltSource.java
index cfa8ccfe29..4cbda50fd3 100644
--- a/core/src/main/java/org/acegisecurity/providers/dao/SaltSource.java
+++ b/core/src/main/java/org/acegisecurity/providers/dao/SaltSource.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao;
+package org.acegisecurity.providers.dao;
 
-import net.sf.acegisecurity.UserDetails;
+import org.acegisecurity.UserDetails;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/providers/dao/UserCache.java b/core/src/main/java/org/acegisecurity/providers/dao/UserCache.java
index d06b9328ef..e4c8a91953 100644
--- a/core/src/main/java/org/acegisecurity/providers/dao/UserCache.java
+++ b/core/src/main/java/org/acegisecurity/providers/dao/UserCache.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao;
+package org.acegisecurity.providers.dao;
 
-import net.sf.acegisecurity.UserDetails;
+import org.acegisecurity.UserDetails;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/providers/dao/UsernameNotFoundException.java b/core/src/main/java/org/acegisecurity/providers/dao/UsernameNotFoundException.java
index a0362a621f..fbbbb2b828 100644
--- a/core/src/main/java/org/acegisecurity/providers/dao/UsernameNotFoundException.java
+++ b/core/src/main/java/org/acegisecurity/providers/dao/UsernameNotFoundException.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao;
+package org.acegisecurity.providers.dao;
 
-import net.sf.acegisecurity.BadCredentialsException;
+import org.acegisecurity.BadCredentialsException;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/providers/dao/cache/EhCacheBasedUserCache.java b/core/src/main/java/org/acegisecurity/providers/dao/cache/EhCacheBasedUserCache.java
index e4cc1ba448..7b025f28ba 100644
--- a/core/src/main/java/org/acegisecurity/providers/dao/cache/EhCacheBasedUserCache.java
+++ b/core/src/main/java/org/acegisecurity/providers/dao/cache/EhCacheBasedUserCache.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.cache;
+package org.acegisecurity.providers.dao.cache;
 
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.dao.UserCache;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.dao.UserCache;
 
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheException;
diff --git a/core/src/main/java/org/acegisecurity/providers/dao/cache/NullUserCache.java b/core/src/main/java/org/acegisecurity/providers/dao/cache/NullUserCache.java
index 623d3d03d4..aefbad9fe3 100644
--- a/core/src/main/java/org/acegisecurity/providers/dao/cache/NullUserCache.java
+++ b/core/src/main/java/org/acegisecurity/providers/dao/cache/NullUserCache.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.cache;
+package org.acegisecurity.providers.dao.cache;
 
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.dao.UserCache;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.dao.UserCache;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/providers/dao/salt/ReflectionSaltSource.java b/core/src/main/java/org/acegisecurity/providers/dao/salt/ReflectionSaltSource.java
index a87180ba3c..7d915424eb 100644
--- a/core/src/main/java/org/acegisecurity/providers/dao/salt/ReflectionSaltSource.java
+++ b/core/src/main/java/org/acegisecurity/providers/dao/salt/ReflectionSaltSource.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.salt;
+package org.acegisecurity.providers.dao.salt;
 
-import net.sf.acegisecurity.AuthenticationServiceException;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.dao.SaltSource;
+import org.acegisecurity.AuthenticationServiceException;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.dao.SaltSource;
 
 import org.springframework.beans.factory.InitializingBean;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/dao/salt/SystemWideSaltSource.java b/core/src/main/java/org/acegisecurity/providers/dao/salt/SystemWideSaltSource.java
index 50bf139bd4..bfc93bf904 100644
--- a/core/src/main/java/org/acegisecurity/providers/dao/salt/SystemWideSaltSource.java
+++ b/core/src/main/java/org/acegisecurity/providers/dao/salt/SystemWideSaltSource.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.salt;
+package org.acegisecurity.providers.dao.salt;
 
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.dao.SaltSource;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.dao.SaltSource;
 
 import org.springframework.beans.factory.InitializingBean;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/encoding/BaseDigestPasswordEncoder.java b/core/src/main/java/org/acegisecurity/providers/encoding/BaseDigestPasswordEncoder.java
index 859c2b1e8e..ca769efb54 100644
--- a/core/src/main/java/org/acegisecurity/providers/encoding/BaseDigestPasswordEncoder.java
+++ b/core/src/main/java/org/acegisecurity/providers/encoding/BaseDigestPasswordEncoder.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.encoding;
+package org.acegisecurity.providers.encoding;
 
 /**
  * 
      
diff --git a/core/src/main/java/org/acegisecurity/providers/encoding/BasePasswordEncoder.java b/core/src/main/java/org/acegisecurity/providers/encoding/BasePasswordEncoder.java
index 5f3b74f003..bc73b08745 100644
--- a/core/src/main/java/org/acegisecurity/providers/encoding/BasePasswordEncoder.java
+++ b/core/src/main/java/org/acegisecurity/providers/encoding/BasePasswordEncoder.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.encoding;
+package org.acegisecurity.providers.encoding;
 
 /**
  * 
      
diff --git a/core/src/main/java/org/acegisecurity/providers/encoding/Md5PasswordEncoder.java b/core/src/main/java/org/acegisecurity/providers/encoding/Md5PasswordEncoder.java
index 9502f412ad..f6f63f6bbf 100644
--- a/core/src/main/java/org/acegisecurity/providers/encoding/Md5PasswordEncoder.java
+++ b/core/src/main/java/org/acegisecurity/providers/encoding/Md5PasswordEncoder.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.encoding;
+package org.acegisecurity.providers.encoding;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
diff --git a/core/src/main/java/org/acegisecurity/providers/encoding/PasswordEncoder.java b/core/src/main/java/org/acegisecurity/providers/encoding/PasswordEncoder.java
index a158cfe6b0..391709908e 100644
--- a/core/src/main/java/org/acegisecurity/providers/encoding/PasswordEncoder.java
+++ b/core/src/main/java/org/acegisecurity/providers/encoding/PasswordEncoder.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.encoding;
+package org.acegisecurity.providers.encoding;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/encoding/PlaintextPasswordEncoder.java b/core/src/main/java/org/acegisecurity/providers/encoding/PlaintextPasswordEncoder.java
index a9cec42a45..bacaed6b28 100644
--- a/core/src/main/java/org/acegisecurity/providers/encoding/PlaintextPasswordEncoder.java
+++ b/core/src/main/java/org/acegisecurity/providers/encoding/PlaintextPasswordEncoder.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.encoding;
+package org.acegisecurity.providers.encoding;
 
 /**
  * 
      
diff --git a/core/src/main/java/org/acegisecurity/providers/encoding/ShaPasswordEncoder.java b/core/src/main/java/org/acegisecurity/providers/encoding/ShaPasswordEncoder.java
index 913751705e..e48fcf95fc 100644
--- a/core/src/main/java/org/acegisecurity/providers/encoding/ShaPasswordEncoder.java
+++ b/core/src/main/java/org/acegisecurity/providers/encoding/ShaPasswordEncoder.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.encoding;
+package org.acegisecurity.providers.encoding;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/AuthorityGranter.java b/core/src/main/java/org/acegisecurity/providers/jaas/AuthorityGranter.java
index 532cde8bef..852136f940 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/AuthorityGranter.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/AuthorityGranter.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.jaas;
+package org.acegisecurity.providers.jaas;
 
 import java.security.Principal;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/DefaultLoginExceptionResolver.java b/core/src/main/java/org/acegisecurity/providers/jaas/DefaultLoginExceptionResolver.java
index 46884e451d..45407f7270 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/DefaultLoginExceptionResolver.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/DefaultLoginExceptionResolver.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.jaas;
+package org.acegisecurity.providers.jaas;
 
-import net.sf.acegisecurity.AcegiSecurityException;
-import net.sf.acegisecurity.AuthenticationServiceException;
+import org.acegisecurity.AcegiSecurityException;
+import org.acegisecurity.AuthenticationServiceException;
 
 import javax.security.auth.login.LoginException;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/JaasAuthenticationCallbackHandler.java b/core/src/main/java/org/acegisecurity/providers/jaas/JaasAuthenticationCallbackHandler.java
index 754c30200d..c4722f947c 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/JaasAuthenticationCallbackHandler.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/JaasAuthenticationCallbackHandler.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.jaas;
+package org.acegisecurity.providers.jaas;
 
-import net.sf.acegisecurity.Authentication;
+import org.acegisecurity.Authentication;
 
 import java.io.IOException;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/JaasAuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/jaas/JaasAuthenticationProvider.java
index d29179dc42..3bf523413f 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/JaasAuthenticationProvider.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/JaasAuthenticationProvider.java
@@ -13,19 +13,19 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.jaas;
+package org.acegisecurity.providers.jaas;
 
-import net.sf.acegisecurity.AcegiSecurityException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter;
-import net.sf.acegisecurity.context.SecurityContext;
-import net.sf.acegisecurity.providers.AuthenticationProvider;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.providers.jaas.event.JaasAuthenticationFailedEvent;
-import net.sf.acegisecurity.providers.jaas.event.JaasAuthenticationSuccessEvent;
-import net.sf.acegisecurity.ui.session.HttpSessionDestroyedEvent;
+import org.acegisecurity.AcegiSecurityException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.context.HttpSessionContextIntegrationFilter;
+import org.acegisecurity.context.SecurityContext;
+import org.acegisecurity.providers.AuthenticationProvider;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.providers.jaas.event.JaasAuthenticationFailedEvent;
+import org.acegisecurity.providers.jaas.event.JaasAuthenticationSuccessEvent;
+import org.acegisecurity.ui.session.HttpSessionDestroyedEvent;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.BeansException;
@@ -58,7 +58,7 @@ import java.util.Set;
  *
  * 
      
  * This AuthenticationProvider is capable of validating {@link
- * net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken}
+ * org.acegisecurity.providers.UsernamePasswordAuthenticationToken}
  * requests contain the correct username and password.
  * 
      
  *
@@ -89,7 +89,7 @@ import java.util.Set;
  * following...
  * 
        *  JAASTest {
- *  net.sf.acegisecurity.providers.jaas.TestLoginModule required;
+ *  org.acegisecurity.providers.jaas.TestLoginModule required;
  *  };
  *  
      
  * Using the example login configuration above, the loginContextName property
@@ -116,14 +116,14 @@ import java.util.Set;
  * 
      
  * {{@link JaasAuthenticationCallbackHandler}s are passed to the
  * JaasAuthenticationProvider through the {@link
- * #setCallbackHandlers(net.sf.acegisecurity.providers.jaas.JaasAuthenticationCallbackHandler[])
+ * #setCallbackHandlers(org.acegisecurity.providers.jaas.JaasAuthenticationCallbackHandler[])
  * callbackHandlers} property. }
  * 
        *  <property name="callbackHandlers">
  *  <list>
- *  <bean class="net.sf.acegisecurity.providers.jaas.TestCallbackHandler"/>
- *  <bean class="{@link JaasNameCallbackHandler net.sf.acegisecurity.providers.jaas.JaasNameCallbackHandler}"/>
- *  <bean class="{@link JaasPasswordCallbackHandler net.sf.acegisecurity.providers.jaas.JaasPasswordCallbackHandler}"/>
+ *  <bean class="org.acegisecurity.providers.jaas.TestCallbackHandler"/>
+ *  <bean class="{@link JaasNameCallbackHandler org.acegisecurity.providers.jaas.JaasNameCallbackHandler}"/>
+ *  <bean class="{@link JaasPasswordCallbackHandler org.acegisecurity.providers.jaas.JaasPasswordCallbackHandler}"/>
  *  </list>
  *  </property>
  *  
      
@@ -146,7 +146,7 @@ import java.util.Set;
  * 
        *  <property name="authorityGranters">
  *  <list>
- *  <bean class="net.sf.acegisecurity.providers.jaas.TestAuthorityGranter"/>
+ *  <bean class="org.acegisecurity.providers.jaas.TestAuthorityGranter"/>
  *  </list>
  *  </property>
  *  
      
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/JaasAuthenticationToken.java b/core/src/main/java/org/acegisecurity/providers/jaas/JaasAuthenticationToken.java
index fb993da6a8..d9abb958b2 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/JaasAuthenticationToken.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/JaasAuthenticationToken.java
@@ -1,9 +1,9 @@
-package net.sf.acegisecurity.providers.jaas;
+package org.acegisecurity.providers.jaas;
 
 import javax.security.auth.login.LoginContext;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 /**
  * UsernamePasswordAuthenticationToken extension to carry the Jaas LoginContext that the user was logged into
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/JaasGrantedAuthority.java b/core/src/main/java/org/acegisecurity/providers/jaas/JaasGrantedAuthority.java
index 01c28199db..a47ca39558 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/JaasGrantedAuthority.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/JaasGrantedAuthority.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.jaas;
+package org.acegisecurity.providers.jaas;
 
-import net.sf.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.GrantedAuthorityImpl;
 
 import java.security.Principal;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/JaasNameCallbackHandler.java b/core/src/main/java/org/acegisecurity/providers/jaas/JaasNameCallbackHandler.java
index fec990aa07..f870064178 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/JaasNameCallbackHandler.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/JaasNameCallbackHandler.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.jaas;
+package org.acegisecurity.providers.jaas;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.UserDetails;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.UserDetails;
 
 import java.io.IOException;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/JaasPasswordCallbackHandler.java b/core/src/main/java/org/acegisecurity/providers/jaas/JaasPasswordCallbackHandler.java
index b0e4346ddd..eae6377c04 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/JaasPasswordCallbackHandler.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/JaasPasswordCallbackHandler.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.jaas;
+package org.acegisecurity.providers.jaas;
 
-import net.sf.acegisecurity.Authentication;
+import org.acegisecurity.Authentication;
 
 import java.io.IOException;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/LoginExceptionResolver.java b/core/src/main/java/org/acegisecurity/providers/jaas/LoginExceptionResolver.java
index fc64533671..924453e4f3 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/LoginExceptionResolver.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/LoginExceptionResolver.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.jaas;
+package org.acegisecurity.providers.jaas;
 
-import net.sf.acegisecurity.AcegiSecurityException;
+import org.acegisecurity.AcegiSecurityException;
 
 import javax.security.auth.login.LoginException;
 
@@ -26,7 +26,7 @@ import javax.security.auth.login.LoginException;
  * instance, a configured login module could throw a
  * ScrewedUpPasswordException that extends LoginException, in this instance
  * the LoginExceptionResolver implementation would return a {@link
- * net.sf.acegisecurity.BadCredentialsException}.
+ * org.acegisecurity.BadCredentialsException}.
  *
  * @author Ray Krueger
  * @version $Revision$
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/SecurityContextLoginModule.java b/core/src/main/java/org/acegisecurity/providers/jaas/SecurityContextLoginModule.java
index 372dad522f..82e02b9531 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/SecurityContextLoginModule.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/SecurityContextLoginModule.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.jaas;
+package org.acegisecurity.providers.jaas;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.context.SecurityContextHolder;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -31,7 +31,7 @@ import javax.security.auth.spi.LoginModule;
 
 /**
  * An implementation of {@link LoginModule} that uses an Acegi Security
- * {@link net.sf.acegisecurity.context.SecurityContext SecurityContext}
+ * {@link org.acegisecurity.context.SecurityContext SecurityContext}
  * to provide authentication. 
      
  * This LoginModule provides opposite functionality to the {@link
  * JaasAuthenticationProvider} API, and should not really be used in
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/event/JaasAuthenticationEvent.java b/core/src/main/java/org/acegisecurity/providers/jaas/event/JaasAuthenticationEvent.java
index 3468d57474..ec33c33578 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/event/JaasAuthenticationEvent.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/event/JaasAuthenticationEvent.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.jaas.event;
+package org.acegisecurity.providers.jaas.event;
 
-import net.sf.acegisecurity.Authentication;
+import org.acegisecurity.Authentication;
 
 import org.springframework.context.ApplicationEvent;
 
 
 /**
  * Parent class for events fired by the {@link
- * net.sf.acegisecurity.providers.jaas.JaasAuthenticationProvider
+ * org.acegisecurity.providers.jaas.JaasAuthenticationProvider
  * JaasAuthenticationProvider}.
  *
  * @author Ray Krueger
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/event/JaasAuthenticationFailedEvent.java b/core/src/main/java/org/acegisecurity/providers/jaas/event/JaasAuthenticationFailedEvent.java
index 81d9444ad5..a476e7a962 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/event/JaasAuthenticationFailedEvent.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/event/JaasAuthenticationFailedEvent.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.jaas.event;
+package org.acegisecurity.providers.jaas.event;
 
-import net.sf.acegisecurity.Authentication;
+import org.acegisecurity.Authentication;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/event/JaasAuthenticationSuccessEvent.java b/core/src/main/java/org/acegisecurity/providers/jaas/event/JaasAuthenticationSuccessEvent.java
index 74f835f888..99a4d3a42d 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/event/JaasAuthenticationSuccessEvent.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/event/JaasAuthenticationSuccessEvent.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.jaas.event;
+package org.acegisecurity.providers.jaas.event;
 
-import net.sf.acegisecurity.Authentication;
+import org.acegisecurity.Authentication;
 
 
 /**
  * Fired by the {@link
- * net.sf.acegisecurity.providers.jaas.JaasAuthenticationProvider
+ * org.acegisecurity.providers.jaas.JaasAuthenticationProvider
  * JaasAuthenticationProvider} after successfully logging the user into the
  * LoginContext, handling all callbacks, and calling all AuthorityGranters.
  *
diff --git a/core/src/main/java/org/acegisecurity/providers/rcp/RemoteAuthenticationException.java b/core/src/main/java/org/acegisecurity/providers/rcp/RemoteAuthenticationException.java
index b914f90291..b733c2ebd1 100644
--- a/core/src/main/java/org/acegisecurity/providers/rcp/RemoteAuthenticationException.java
+++ b/core/src/main/java/org/acegisecurity/providers/rcp/RemoteAuthenticationException.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.rcp;
+package org.acegisecurity.providers.rcp;
 
-import net.sf.acegisecurity.AcegiSecurityException;
+import org.acegisecurity.AcegiSecurityException;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/providers/rcp/RemoteAuthenticationManager.java b/core/src/main/java/org/acegisecurity/providers/rcp/RemoteAuthenticationManager.java
index 12e51bc3b3..27f30742c8 100644
--- a/core/src/main/java/org/acegisecurity/providers/rcp/RemoteAuthenticationManager.java
+++ b/core/src/main/java/org/acegisecurity/providers/rcp/RemoteAuthenticationManager.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.rcp;
+package org.acegisecurity.providers.rcp;
 
-import net.sf.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthority;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/providers/rcp/RemoteAuthenticationManagerImpl.java b/core/src/main/java/org/acegisecurity/providers/rcp/RemoteAuthenticationManagerImpl.java
index 800d629370..611c7fa28c 100644
--- a/core/src/main/java/org/acegisecurity/providers/rcp/RemoteAuthenticationManagerImpl.java
+++ b/core/src/main/java/org/acegisecurity/providers/rcp/RemoteAuthenticationManagerImpl.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.rcp;
+package org.acegisecurity.providers.rcp;
 
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.AuthenticationManager;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationManager;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/acegisecurity/providers/rcp/RemoteAuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/rcp/RemoteAuthenticationProvider.java
index 3f90bccee7..34d4eab9ee 100644
--- a/core/src/main/java/org/acegisecurity/providers/rcp/RemoteAuthenticationProvider.java
+++ b/core/src/main/java/org/acegisecurity/providers/rcp/RemoteAuthenticationProvider.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.rcp;
+package org.acegisecurity.providers.rcp;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.providers.AuthenticationProvider;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.providers.AuthenticationProvider;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationProvider.java
index 6445601956..f49f53e0d3 100644
--- a/core/src/main/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationProvider.java
+++ b/core/src/main/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationProvider.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.rememberme;
+package org.acegisecurity.providers.rememberme;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.providers.AuthenticationProvider;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.providers.AuthenticationProvider;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -30,11 +30,11 @@ import org.springframework.util.Assert;
 
 /**
  * An {@link AuthenticationProvider} implementation that validates {@link
- * net.sf.acegisecurity.providers.rememberme.RememberMeAuthenticationToken}s.
+ * org.acegisecurity.providers.rememberme.RememberMeAuthenticationToken}s.
  * 
  * 
      
  * To be successfully validated, the  {@link{@link
- * net.sf.acegisecurity.providers.rememberme.RememberMeAuthenticationToken#getKeyHash()}
+ * org.acegisecurity.providers.rememberme.RememberMeAuthenticationToken#getKeyHash()}
  * must match this class' {@link #getKey()}.
  * 
      
  *
diff --git a/core/src/main/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationToken.java b/core/src/main/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationToken.java
index 1618d8748c..f460561f1d 100644
--- a/core/src/main/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationToken.java
+++ b/core/src/main/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationToken.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.rememberme;
+package org.acegisecurity.providers.rememberme;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.providers.AbstractAuthenticationToken;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.providers.AbstractAuthenticationToken;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/x509/X509AuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/x509/X509AuthenticationProvider.java
index e183a3af08..360ae5b630 100644
--- a/core/src/main/java/org/acegisecurity/providers/x509/X509AuthenticationProvider.java
+++ b/core/src/main/java/org/acegisecurity/providers/x509/X509AuthenticationProvider.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.x509;
+package org.acegisecurity.providers.x509;
 
-import net.sf.acegisecurity.providers.AuthenticationProvider;
-import net.sf.acegisecurity.providers.x509.cache.NullX509UserCache;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.BadCredentialsException;
+import org.acegisecurity.providers.AuthenticationProvider;
+import org.acegisecurity.providers.x509.cache.NullX509UserCache;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.BadCredentialsException;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 import org.apache.commons.logging.Log;
@@ -32,7 +32,7 @@ import java.security.cert.X509Certificate;
  * Processes an X.509 authentication request.
  * 
      
  * The request will typically originate from
- * {@link net.sf.acegisecurity.ui.x509.X509ProcessingFilter}).
+ * {@link org.acegisecurity.ui.x509.X509ProcessingFilter}).
  * 
      
  *
  * @author Luke Taylor
diff --git a/core/src/main/java/org/acegisecurity/providers/x509/X509AuthenticationToken.java b/core/src/main/java/org/acegisecurity/providers/x509/X509AuthenticationToken.java
index 6e73a0bdfe..b98cce57b6 100644
--- a/core/src/main/java/org/acegisecurity/providers/x509/X509AuthenticationToken.java
+++ b/core/src/main/java/org/acegisecurity/providers/x509/X509AuthenticationToken.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.x509;
+package org.acegisecurity.providers.x509;
 
-import net.sf.acegisecurity.providers.AbstractAuthenticationToken;
-import net.sf.acegisecurity.GrantedAuthority;
+import org.acegisecurity.providers.AbstractAuthenticationToken;
+import org.acegisecurity.GrantedAuthority;
 
 import java.security.cert.X509Certificate;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/x509/X509AuthoritiesPopulator.java b/core/src/main/java/org/acegisecurity/providers/x509/X509AuthoritiesPopulator.java
index aff27076e6..1a090ba658 100644
--- a/core/src/main/java/org/acegisecurity/providers/x509/X509AuthoritiesPopulator.java
+++ b/core/src/main/java/org/acegisecurity/providers/x509/X509AuthoritiesPopulator.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.x509;
+package org.acegisecurity.providers.x509;
 
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.AuthenticationException;
 
 import java.security.cert.X509Certificate;
 
@@ -27,7 +27,7 @@ import java.security.cert.X509Certificate;
  * Although the certificate will already have been validated by the web container,
  * implementations may choose to perform additional application-specific checks on
  * the certificate content here. If an implementation chooses to reject the certificate,
- * it should throw a {@link net.sf.acegisecurity.BadCredentialsException}.
+ * it should throw a {@link org.acegisecurity.BadCredentialsException}.
  * 
      
  *
  * @author Luke
@@ -46,7 +46,7 @@ public interface X509AuthoritiesPopulator {
      * @return the details of the indicated user (at minimum the granted
      *         authorities and the username)
      *
-     * @throws net.sf.acegisecurity.AuthenticationException if the user details are not available
+     * @throws org.acegisecurity.AuthenticationException if the user details are not available
      *  or the certificate isn't valid for the application's purpose.
      */
     UserDetails getUserDetails(X509Certificate userCertificate)
diff --git a/core/src/main/java/org/acegisecurity/providers/x509/X509UserCache.java b/core/src/main/java/org/acegisecurity/providers/x509/X509UserCache.java
index 67c378334e..2ddfc65d98 100644
--- a/core/src/main/java/org/acegisecurity/providers/x509/X509UserCache.java
+++ b/core/src/main/java/org/acegisecurity/providers/x509/X509UserCache.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.x509;
+package org.acegisecurity.providers.x509;
 
-import net.sf.acegisecurity.UserDetails;
+import org.acegisecurity.UserDetails;
 
 import java.security.cert.X509Certificate;
 
@@ -23,7 +23,7 @@ import java.security.cert.X509Certificate;
  * Provides a cache of {@link UserDetails} objects for the
  * {@link X509AuthenticationProvider}.
  * 
      
- * Similar in function to the {@link net.sf.acegisecurity.providers.dao.UserCache}
+ * Similar in function to the {@link org.acegisecurity.providers.dao.UserCache}
  * used by the Dao provider, but the cache is keyed with the user's certificate
  * rather than the user name.  
  * 
      
diff --git a/core/src/main/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCache.java b/core/src/main/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCache.java
index 6959b45f41..3fc170cc0e 100644
--- a/core/src/main/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCache.java
+++ b/core/src/main/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCache.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.x509.cache;
+package org.acegisecurity.providers.x509.cache;
 
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.x509.X509UserCache;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.x509.X509UserCache;
 
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheException;
diff --git a/core/src/main/java/org/acegisecurity/providers/x509/cache/NullX509UserCache.java b/core/src/main/java/org/acegisecurity/providers/x509/cache/NullX509UserCache.java
index 80df5170a4..79da1abc73 100644
--- a/core/src/main/java/org/acegisecurity/providers/x509/cache/NullX509UserCache.java
+++ b/core/src/main/java/org/acegisecurity/providers/x509/cache/NullX509UserCache.java
@@ -1,7 +1,7 @@
-package net.sf.acegisecurity.providers.x509.cache;
+package org.acegisecurity.providers.x509.cache;
 
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.x509.X509UserCache;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.x509.X509UserCache;
 
 import java.security.cert.X509Certificate;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulator.java b/core/src/main/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulator.java
index 7b44ee73f2..d5d9269dbc 100644
--- a/core/src/main/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulator.java
+++ b/core/src/main/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulator.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.x509.populator;
+package org.acegisecurity.providers.x509.populator;
 
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.providers.dao.AuthenticationDao;
-import net.sf.acegisecurity.providers.x509.X509AuthoritiesPopulator;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.providers.dao.AuthenticationDao;
+import org.acegisecurity.providers.x509.X509AuthoritiesPopulator;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
@@ -32,7 +32,7 @@ import java.security.cert.X509Certificate;
 
 
 /**
- * Populates the X509 authorities via an {@link net.sf.acegisecurity.providers.dao.AuthenticationDao}.
+ * Populates the X509 authorities via an {@link org.acegisecurity.providers.dao.AuthenticationDao}.
  *
  * @author Luke Taylor
  * @version $Id$
diff --git a/core/src/main/java/org/acegisecurity/runas/NullRunAsManager.java b/core/src/main/java/org/acegisecurity/runas/NullRunAsManager.java
index d6e8549d56..1480d51a31 100644
--- a/core/src/main/java/org/acegisecurity/runas/NullRunAsManager.java
+++ b/core/src/main/java/org/acegisecurity/runas/NullRunAsManager.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.runas;
+package org.acegisecurity.runas;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.RunAsManager;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.RunAsManager;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/runas/RunAsImplAuthenticationProvider.java b/core/src/main/java/org/acegisecurity/runas/RunAsImplAuthenticationProvider.java
index e49a8d12f5..3101983023 100644
--- a/core/src/main/java/org/acegisecurity/runas/RunAsImplAuthenticationProvider.java
+++ b/core/src/main/java/org/acegisecurity/runas/RunAsImplAuthenticationProvider.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.runas;
+package org.acegisecurity.runas;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.providers.AuthenticationProvider;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.providers.AuthenticationProvider;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/acegisecurity/runas/RunAsManagerImpl.java b/core/src/main/java/org/acegisecurity/runas/RunAsManagerImpl.java
index 9d462292b8..f016d4dc8d 100644
--- a/core/src/main/java/org/acegisecurity/runas/RunAsManagerImpl.java
+++ b/core/src/main/java/org/acegisecurity/runas/RunAsManagerImpl.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.runas;
+package org.acegisecurity.runas;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.RunAsManager;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.RunAsManager;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
@@ -51,13 +51,13 @@ import java.util.Vector;
  * elsewhere, for example when using an existing role database with another
  * prefix. An empty role prefix may also be specified. Note however that there
  * are potential issues with using an empty role prefix since different
- * categories of  {@link net.sf.acegisecurity.ConfigAttribute} can not be
+ * categories of  {@link org.acegisecurity.ConfigAttribute} can not be
  * properly discerned based on the prefix, with possible consequences when
  * performing voting and other actions. However, this option may be of some
  * use when using preexisting role names without a prefix, and no ability
  * exists to prefix them with a role prefix on reading them in, such as
  * provided for example in  {@link
- * net.sf.acegisecurity.providers.dao.jdbc.JdbcDaoImpl}.
+ * org.acegisecurity.providers.dao.jdbc.JdbcDaoImpl}.
  * 
      
  *
  * @author Ben Alex
diff --git a/core/src/main/java/org/acegisecurity/runas/RunAsUserToken.java b/core/src/main/java/org/acegisecurity/runas/RunAsUserToken.java
index ed6c256596..79689a1911 100644
--- a/core/src/main/java/org/acegisecurity/runas/RunAsUserToken.java
+++ b/core/src/main/java/org/acegisecurity/runas/RunAsUserToken.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.runas;
+package org.acegisecurity.runas;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.providers.AbstractAuthenticationToken;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.providers.AbstractAuthenticationToken;
 
 
 /**
- * An immutable {@link net.sf.acegisecurity.Authentication}  implementation
+ * An immutable {@link org.acegisecurity.Authentication}  implementation
  * that supports {@link RunAsManagerImpl}.
  *
  * @author Ben Alex
diff --git a/core/src/main/java/org/acegisecurity/securechannel/ChannelDecisionManager.java b/core/src/main/java/org/acegisecurity/securechannel/ChannelDecisionManager.java
index 311ee5c489..eee2c5e861 100644
--- a/core/src/main/java/org/acegisecurity/securechannel/ChannelDecisionManager.java
+++ b/core/src/main/java/org/acegisecurity/securechannel/ChannelDecisionManager.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.securechannel;
+package org.acegisecurity.securechannel;
 
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.intercept.web.FilterInvocation;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.intercept.web.FilterInvocation;
 
 import java.io.IOException;
 
@@ -30,7 +30,7 @@ import javax.servlet.ServletException;
  * 
      
  * If necessary due to the nature of the redirection, implementations should
  * store the original destination of the request in {@link
- * net.sf.acegisecurity.ui.AbstractProcessingFilter#ACEGI_SECURITY_TARGET_URL_KEY}.
+ * org.acegisecurity.ui.AbstractProcessingFilter#ACEGI_SECURITY_TARGET_URL_KEY}.
  * 
      
  *
  * @author Ben Alex
diff --git a/core/src/main/java/org/acegisecurity/securechannel/ChannelDecisionManagerImpl.java b/core/src/main/java/org/acegisecurity/securechannel/ChannelDecisionManagerImpl.java
index a1277033ec..4d876a1550 100644
--- a/core/src/main/java/org/acegisecurity/securechannel/ChannelDecisionManagerImpl.java
+++ b/core/src/main/java/org/acegisecurity/securechannel/ChannelDecisionManagerImpl.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.securechannel;
+package org.acegisecurity.securechannel;
 
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.intercept.web.FilterInvocation;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.intercept.web.FilterInvocation;
 
 import org.springframework.beans.factory.InitializingBean;
 
diff --git a/core/src/main/java/org/acegisecurity/securechannel/ChannelEntryPoint.java b/core/src/main/java/org/acegisecurity/securechannel/ChannelEntryPoint.java
index bcb8881249..40f3fd6dcd 100644
--- a/core/src/main/java/org/acegisecurity/securechannel/ChannelEntryPoint.java
+++ b/core/src/main/java/org/acegisecurity/securechannel/ChannelEntryPoint.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.securechannel;
+package org.acegisecurity.securechannel;
 
 import java.io.IOException;
 
diff --git a/core/src/main/java/org/acegisecurity/securechannel/ChannelProcessingFilter.java b/core/src/main/java/org/acegisecurity/securechannel/ChannelProcessingFilter.java
index 8f9223f62d..4ce8bf79a6 100644
--- a/core/src/main/java/org/acegisecurity/securechannel/ChannelProcessingFilter.java
+++ b/core/src/main/java/org/acegisecurity/securechannel/ChannelProcessingFilter.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.securechannel;
+package org.acegisecurity.securechannel;
 
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.intercept.web.FilterInvocation;
-import net.sf.acegisecurity.intercept.web.FilterInvocationDefinitionSource;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.intercept.web.FilterInvocation;
+import org.acegisecurity.intercept.web.FilterInvocationDefinitionSource;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -60,7 +60,7 @@ import javax.servlet.http.HttpServletResponse;
  * 
      
  * Do not use this class directly. Instead configure
  * web.xml to use the {@link
- * net.sf.acegisecurity.util.FilterToBeanProxy}.
+ * org.acegisecurity.util.FilterToBeanProxy}.
  * 
      
  *
  * @author Ben Alex
diff --git a/core/src/main/java/org/acegisecurity/securechannel/ChannelProcessor.java b/core/src/main/java/org/acegisecurity/securechannel/ChannelProcessor.java
index 82e072cb51..7b5467c276 100644
--- a/core/src/main/java/org/acegisecurity/securechannel/ChannelProcessor.java
+++ b/core/src/main/java/org/acegisecurity/securechannel/ChannelProcessor.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.securechannel;
+package org.acegisecurity.securechannel;
 
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.intercept.web.FilterInvocation;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.intercept.web.FilterInvocation;
 
 import java.io.IOException;
 
diff --git a/core/src/main/java/org/acegisecurity/securechannel/InsecureChannelProcessor.java b/core/src/main/java/org/acegisecurity/securechannel/InsecureChannelProcessor.java
index 0966850ec9..d055f3b12a 100644
--- a/core/src/main/java/org/acegisecurity/securechannel/InsecureChannelProcessor.java
+++ b/core/src/main/java/org/acegisecurity/securechannel/InsecureChannelProcessor.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.securechannel;
+package org.acegisecurity.securechannel;
 
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.intercept.web.FilterInvocation;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.intercept.web.FilterInvocation;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/acegisecurity/securechannel/RetryWithHttpEntryPoint.java b/core/src/main/java/org/acegisecurity/securechannel/RetryWithHttpEntryPoint.java
index 44525b749c..45e7c439e6 100644
--- a/core/src/main/java/org/acegisecurity/securechannel/RetryWithHttpEntryPoint.java
+++ b/core/src/main/java/org/acegisecurity/securechannel/RetryWithHttpEntryPoint.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.securechannel;
+package org.acegisecurity.securechannel;
 
-import net.sf.acegisecurity.util.PortMapper;
-import net.sf.acegisecurity.util.PortMapperImpl;
-import net.sf.acegisecurity.util.PortResolver;
-import net.sf.acegisecurity.util.PortResolverImpl;
+import org.acegisecurity.util.PortMapper;
+import org.acegisecurity.util.PortMapperImpl;
+import org.acegisecurity.util.PortResolver;
+import org.acegisecurity.util.PortResolverImpl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPoint.java b/core/src/main/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPoint.java
index 26fe9e9438..1870a26a95 100644
--- a/core/src/main/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPoint.java
+++ b/core/src/main/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPoint.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.securechannel;
+package org.acegisecurity.securechannel;
 
-import net.sf.acegisecurity.util.PortMapper;
-import net.sf.acegisecurity.util.PortMapperImpl;
-import net.sf.acegisecurity.util.PortResolver;
-import net.sf.acegisecurity.util.PortResolverImpl;
+import org.acegisecurity.util.PortMapper;
+import org.acegisecurity.util.PortMapperImpl;
+import org.acegisecurity.util.PortResolver;
+import org.acegisecurity.util.PortResolverImpl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/securechannel/SecureChannelProcessor.java b/core/src/main/java/org/acegisecurity/securechannel/SecureChannelProcessor.java
index 6e1e4d68ae..a59672e3f1 100644
--- a/core/src/main/java/org/acegisecurity/securechannel/SecureChannelProcessor.java
+++ b/core/src/main/java/org/acegisecurity/securechannel/SecureChannelProcessor.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.securechannel;
+package org.acegisecurity.securechannel;
 
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.intercept.web.FilterInvocation;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.intercept.web.FilterInvocation;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/acegisecurity/taglibs/authz/AclTag.java b/core/src/main/java/org/acegisecurity/taglibs/authz/AclTag.java
index e7353cc5c6..8e53906223 100644
--- a/core/src/main/java/org/acegisecurity/taglibs/authz/AclTag.java
+++ b/core/src/main/java/org/acegisecurity/taglibs/authz/AclTag.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.taglibs.authz;
+package org.acegisecurity.taglibs.authz;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.acl.AclEntry;
-import net.sf.acegisecurity.acl.AclManager;
-import net.sf.acegisecurity.acl.basic.BasicAclEntry;
-import net.sf.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.acl.AclEntry;
+import org.acegisecurity.acl.AclManager;
+import org.acegisecurity.acl.basic.BasicAclEntry;
+import org.acegisecurity.context.SecurityContextHolder;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -47,7 +47,7 @@ import javax.servlet.jsp.tagext.TagSupport;
  * 
  * 
      
  * Only works with permissions that are subclasses of {@link
- * net.sf.acegisecurity.acl.basic.BasicAclEntry}.
+ * org.acegisecurity.acl.basic.BasicAclEntry}.
  * 
      
  * 
  * 
      
diff --git a/core/src/main/java/org/acegisecurity/taglibs/authz/AuthenticationTag.java b/core/src/main/java/org/acegisecurity/taglibs/authz/AuthenticationTag.java
index b150bb157b..bb1ec7966c 100644
--- a/core/src/main/java/org/acegisecurity/taglibs/authz/AuthenticationTag.java
+++ b/core/src/main/java/org/acegisecurity/taglibs/authz/AuthenticationTag.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.taglibs.authz;
+package org.acegisecurity.taglibs.authz;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.context.SecurityContext;
-import net.sf.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.context.SecurityContext;
+import org.acegisecurity.context.SecurityContextHolder;
 
 import java.io.IOException;
 
diff --git a/core/src/main/java/org/acegisecurity/taglibs/authz/AuthorizeTag.java b/core/src/main/java/org/acegisecurity/taglibs/authz/AuthorizeTag.java
index 1f35f1295d..9d45374084 100644
--- a/core/src/main/java/org/acegisecurity/taglibs/authz/AuthorizeTag.java
+++ b/core/src/main/java/org/acegisecurity/taglibs/authz/AuthorizeTag.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.taglibs.authz;
+package org.acegisecurity.taglibs.authz;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.context.SecurityContextHolder;
 
 import org.springframework.util.StringUtils;
 
@@ -196,7 +196,7 @@ public class AuthorizeTag extends TagSupport {
      * CAVEAT:  This method will not work if
      * the granted authorities returns a null string as the
      * return value of {@link
-     * net.sf.acegisecurity.GrantedAuthority#getAuthority()}.
+     * org.acegisecurity.GrantedAuthority#getAuthority()}.
      * 
      
      * 
      * 
      
@@ -207,7 +207,7 @@ public class AuthorizeTag extends TagSupport {
      * @param granted The authorities granted by the authentication. May be any
      *        implementation of {@link GrantedAuthority} that does
      *        not return null from {@link
-     *        net.sf.acegisecurity.GrantedAuthority#getAuthority()}.
+     *        org.acegisecurity.GrantedAuthority#getAuthority()}.
      * @param required A {@link Set} of {@link GrantedAuthorityImpl}s that have
      *        been built using ifAny, ifAll or ifNotGranted.
      *
diff --git a/core/src/main/java/org/acegisecurity/ui/AbstractProcessingFilter.java b/core/src/main/java/org/acegisecurity/ui/AbstractProcessingFilter.java
index 77ea8ec8fa..46957b0251 100644
--- a/core/src/main/java/org/acegisecurity/ui/AbstractProcessingFilter.java
+++ b/core/src/main/java/org/acegisecurity/ui/AbstractProcessingFilter.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui;
+package org.acegisecurity.ui;
 
 import java.io.IOException;
 import java.util.Properties;
@@ -27,13 +27,13 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.AuthenticationManager;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.event.authentication.InteractiveAuthenticationSuccessEvent;
-import net.sf.acegisecurity.ui.rememberme.NullRememberMeServices;
-import net.sf.acegisecurity.ui.rememberme.RememberMeServices;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationManager;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.event.authentication.InteractiveAuthenticationSuccessEvent;
+import org.acegisecurity.ui.rememberme.NullRememberMeServices;
+import org.acegisecurity.ui.rememberme.RememberMeServices;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -98,12 +98,12 @@ import org.springframework.util.Assert;
  * For example:
      
  *  <property name="exceptionMappings">
      
  *   <props>
      
- *     <prop> key="net.sf.acegisecurity.BadCredentialsException">/bad_credentials.jsp</prop>
      
+ *     <prop> key="org.acegisecurity.BadCredentialsException">/bad_credentials.jsp</prop>
      
  *   </props>
      
  * </property>
      
  * 
      
  * The example above would redirect all {@link
- * net.sf.acegisecurity.BadCredentialsException}s thrown, to a page in the
+ * org.acegisecurity.BadCredentialsException}s thrown, to a page in the
  * web-application called /bad_credentials.jsp.
  * 
      
  * 
@@ -115,7 +115,7 @@ import org.springframework.util.Assert;
  * 
  * 
      
  * If authentication is successful, an {@link
- * net.sf.acegisecurity.event.authentication.InteractiveAuthenticationSuccessEvent} will be
+ * org.acegisecurity.event.authentication.InteractiveAuthenticationSuccessEvent} will be
  * published to the application context. No events will be published if
  * authentication was unsuccessful, because this would generally be recorded
  * via an AuthenticationManager-specific application event.
diff --git a/core/src/main/java/org/acegisecurity/ui/WebAuthenticationDetails.java b/core/src/main/java/org/acegisecurity/ui/WebAuthenticationDetails.java
index 75433bde6b..4184e2ec70 100644
--- a/core/src/main/java/org/acegisecurity/ui/WebAuthenticationDetails.java
+++ b/core/src/main/java/org/acegisecurity/ui/WebAuthenticationDetails.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sf.acegisecurity.ui;
+package org.acegisecurity.ui;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/org/acegisecurity/ui/basicauth/BasicProcessingFilter.java b/core/src/main/java/org/acegisecurity/ui/basicauth/BasicProcessingFilter.java
index bf43def67f..18eda7de59 100644
--- a/core/src/main/java/org/acegisecurity/ui/basicauth/BasicProcessingFilter.java
+++ b/core/src/main/java/org/acegisecurity/ui/basicauth/BasicProcessingFilter.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.basicauth;
+package org.acegisecurity.ui.basicauth;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.AuthenticationManager;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.intercept.web.AuthenticationEntryPoint;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.ui.WebAuthenticationDetails;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationManager;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.intercept.web.AuthenticationEntryPoint;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.ui.WebAuthenticationDetails;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;
@@ -89,13 +89,13 @@ import javax.servlet.http.HttpServletResponse;
  * as such is undesirable in many situations. Digest authentication is also
  * provided by Acegi Security and should be used instead of Basic
  * authentication wherever possible. See {@link
- * net.sf.acegisecurity.ui.digestauth.DigestProcessingFilter}.
+ * org.acegisecurity.ui.digestauth.DigestProcessingFilter}.
  * 
      
  * 
  * 
      
  * Do not use this class directly. Instead configure
  * web.xml to use the {@link
- * net.sf.acegisecurity.util.FilterToBeanProxy}.
+ * org.acegisecurity.util.FilterToBeanProxy}.
  * 
      
  *
  * @author Ben Alex
diff --git a/core/src/main/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterEntryPoint.java b/core/src/main/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterEntryPoint.java
index 285d45efb7..35a40d4c70 100644
--- a/core/src/main/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterEntryPoint.java
+++ b/core/src/main/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterEntryPoint.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.basicauth;
+package org.acegisecurity.ui.basicauth;
 
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.intercept.web.AuthenticationEntryPoint;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.intercept.web.AuthenticationEntryPoint;
 
 import org.springframework.beans.factory.InitializingBean;
 
diff --git a/core/src/main/java/org/acegisecurity/ui/cas/CasProcessingFilter.java b/core/src/main/java/org/acegisecurity/ui/cas/CasProcessingFilter.java
index a75873bdbc..79c2352f0d 100644
--- a/core/src/main/java/org/acegisecurity/ui/cas/CasProcessingFilter.java
+++ b/core/src/main/java/org/acegisecurity/ui/cas/CasProcessingFilter.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.cas;
+package org.acegisecurity.ui.cas;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.ui.AbstractProcessingFilter;
-import net.sf.acegisecurity.ui.WebAuthenticationDetails;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.ui.AbstractProcessingFilter;
+import org.acegisecurity.ui.WebAuthenticationDetails;
 
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
@@ -57,7 +57,7 @@ import javax.servlet.http.HttpServletRequest;
  * 
      
  * Do not use this class directly. Instead configure
  * web.xml to use the {@link
- * net.sf.acegisecurity.util.FilterToBeanProxy}.
+ * org.acegisecurity.util.FilterToBeanProxy}.
  * 
      
  *
  * @author Ben Alex
diff --git a/core/src/main/java/org/acegisecurity/ui/cas/CasProcessingFilterEntryPoint.java b/core/src/main/java/org/acegisecurity/ui/cas/CasProcessingFilterEntryPoint.java
index c74eb36675..ee635fbfae 100644
--- a/core/src/main/java/org/acegisecurity/ui/cas/CasProcessingFilterEntryPoint.java
+++ b/core/src/main/java/org/acegisecurity/ui/cas/CasProcessingFilterEntryPoint.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.cas;
+package org.acegisecurity.ui.cas;
 
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.intercept.web.AuthenticationEntryPoint;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.intercept.web.AuthenticationEntryPoint;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/acegisecurity/ui/cas/ServiceProperties.java b/core/src/main/java/org/acegisecurity/ui/cas/ServiceProperties.java
index 6c8a1624bf..32cc887487 100644
--- a/core/src/main/java/org/acegisecurity/ui/cas/ServiceProperties.java
+++ b/core/src/main/java/org/acegisecurity/ui/cas/ServiceProperties.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.cas;
+package org.acegisecurity.ui.cas;
 
 import org.springframework.beans.factory.InitializingBean;
 
diff --git a/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilter.java b/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilter.java
index 039a3b98a7..fb78ee414e 100644
--- a/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilter.java
+++ b/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilter.java
@@ -13,20 +13,20 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.digestauth;
+package org.acegisecurity.ui.digestauth;
 
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.AuthenticationServiceException;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.providers.dao.AuthenticationDao;
-import net.sf.acegisecurity.providers.dao.UserCache;
-import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
-import net.sf.acegisecurity.providers.dao.cache.NullUserCache;
-import net.sf.acegisecurity.ui.WebAuthenticationDetails;
-import net.sf.acegisecurity.util.StringSplitUtils;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationServiceException;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.providers.dao.AuthenticationDao;
+import org.acegisecurity.providers.dao.UserCache;
+import org.acegisecurity.providers.dao.UsernameNotFoundException;
+import org.acegisecurity.providers.dao.cache.NullUserCache;
+import org.acegisecurity.ui.WebAuthenticationDetails;
+import org.acegisecurity.util.StringSplitUtils;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -76,13 +76,13 @@ import javax.servlet.http.HttpServletResponse;
  * 
      
  * 
  * 
      
- * If authentication is successful, the resulting {@link net.sf.acegisecurity.Authentication Authentication}
+ * If authentication is successful, the resulting {@link org.acegisecurity.Authentication Authentication}
  * object will be placed into the SecurityContextHolder.
  * 
      
  * 
  * 
      
  * If authentication fails, an
- * {@link net.sf.acegisecurity.intercept.web.AuthenticationEntryPoint AuthenticationEntryPoint}
+ * {@link org.acegisecurity.intercept.web.AuthenticationEntryPoint AuthenticationEntryPoint}
  * implementation is called. This must always be {@link DigestProcessingFilterEntryPoint},
  * which will prompt the user to authenticate again via Digest authentication.
  * 
      
@@ -98,7 +98,7 @@ import javax.servlet.http.HttpServletResponse;
  * 
      
  * Do not use this class directly. Instead configure
  * web.xml to use the {@link
- * net.sf.acegisecurity.util.FilterToBeanProxy}.
+ * org.acegisecurity.util.FilterToBeanProxy}.
  * 
      
  *
  * @author Ben Alex
diff --git a/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterEntryPoint.java b/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterEntryPoint.java
index 5815ab56b0..a71086ceb3 100644
--- a/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterEntryPoint.java
+++ b/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterEntryPoint.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.digestauth;
+package org.acegisecurity.ui.digestauth;
 
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.intercept.web.AuthenticationEntryPoint;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.intercept.web.AuthenticationEntryPoint;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
diff --git a/core/src/main/java/org/acegisecurity/ui/digestauth/NonceExpiredException.java b/core/src/main/java/org/acegisecurity/ui/digestauth/NonceExpiredException.java
index 3604733d7a..525ba87080 100644
--- a/core/src/main/java/org/acegisecurity/ui/digestauth/NonceExpiredException.java
+++ b/core/src/main/java/org/acegisecurity/ui/digestauth/NonceExpiredException.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.digestauth;
+package org.acegisecurity.ui.digestauth;
 
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/ui/rememberme/NullRememberMeServices.java b/core/src/main/java/org/acegisecurity/ui/rememberme/NullRememberMeServices.java
index 6299662bc0..9a33882487 100644
--- a/core/src/main/java/org/acegisecurity/ui/rememberme/NullRememberMeServices.java
+++ b/core/src/main/java/org/acegisecurity/ui/rememberme/NullRememberMeServices.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.rememberme;
+package org.acegisecurity.ui.rememberme;
 
-import net.sf.acegisecurity.Authentication;
+import org.acegisecurity.Authentication;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilter.java b/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilter.java
index 85a855efa2..0bb9a8ec70 100644
--- a/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilter.java
+++ b/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilter.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.rememberme;
+package org.acegisecurity.ui.rememberme;
 
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.event.authentication.InteractiveAuthenticationSuccessEvent;
-import net.sf.acegisecurity.Authentication;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.event.authentication.InteractiveAuthenticationSuccessEvent;
+import org.acegisecurity.Authentication;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -45,13 +45,13 @@ import javax.servlet.http.HttpServletResponse;
  * Detects if there is no Authentication object in the
  * SecurityContext, and populates it with a remember-me
  * authentication token if a {@link
- * net.sf.acegisecurity.ui.rememberme.RememberMeServices} implementation so
+ * org.acegisecurity.ui.rememberme.RememberMeServices} implementation so
  * requests.
  * 
  * 
      
  * Concrete RememberMeServices implementations will have their
  * {@link
- * net.sf.acegisecurity.ui.rememberme.RememberMeServices#autoLogin(HttpServletRequest,
+ * org.acegisecurity.ui.rememberme.RememberMeServices#autoLogin(HttpServletRequest,
  * HttpServletResponse)} method called by this filter. The
  * Authentication or null returned by that method
  * will be placed into the SecurityContext.
@@ -59,7 +59,7 @@ import javax.servlet.http.HttpServletResponse;
  * 
  * 
      
  * If authentication is successful, an {@link
- * net.sf.acegisecurity.event.authentication.InteractiveAuthenticationSuccessEvent} will be
+ * org.acegisecurity.event.authentication.InteractiveAuthenticationSuccessEvent} will be
  * published to the application context. No events will be published if
  * authentication was unsuccessful, because this would generally be recorded
  * via an AuthenticationManager-specific application event.
@@ -68,7 +68,7 @@ import javax.servlet.http.HttpServletResponse;
  * 
      
  * Do not use this class directly. Instead configure
  * web.xml to use the {@link
- * net.sf.acegisecurity.util.FilterToBeanProxy}.
+ * org.acegisecurity.util.FilterToBeanProxy}.
  * 
      
  *
  * @author Ben Alex
diff --git a/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServices.java b/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServices.java
index 2fa4d4d171..144d1aef1a 100644
--- a/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServices.java
+++ b/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServices.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.rememberme;
+package org.acegisecurity.ui.rememberme;
 
-import net.sf.acegisecurity.Authentication;
+import org.acegisecurity.Authentication;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -26,8 +26,8 @@ import javax.servlet.http.HttpServletResponse;
  * 
  * 
      
  * Acegi Security filters (namely {@link
- * net.sf.acegisecurity.ui.AbstractProcessingFilter} and {@link
- * net.sf.acegisecurity.ui.rememberme.RememberMeProcessingFilter} will call
+ * org.acegisecurity.ui.AbstractProcessingFilter} and {@link
+ * org.acegisecurity.ui.rememberme.RememberMeProcessingFilter} will call
  * the methods provided by an implementation of this interface.
  * 
      
  * 
@@ -67,10 +67,10 @@ public interface RememberMeServices {
      * 
      * 
      
      * The returned Authentication must be acceptable to  {@link
-     * net.sf.acegisecurity.AuthenticationManager} or {@link
-     * net.sf.acegisecurity.providers.AuthenticationProvider} defined by the
+     * org.acegisecurity.AuthenticationManager} or {@link
+     * org.acegisecurity.providers.AuthenticationProvider} defined by the
      * web application. It is recommended {@link
-     * net.sf.acegisecurity.providers.rememberme.RememberMeAuthenticationToken}
+     * org.acegisecurity.providers.rememberme.RememberMeAuthenticationToken}
      * be used in most cases, as it has a corresponding authentication
      * provider.
      * 
      
diff --git a/core/src/main/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServices.java b/core/src/main/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServices.java
index 9bcbe0e29e..f7fafe25a8 100644
--- a/core/src/main/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServices.java
+++ b/core/src/main/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServices.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.rememberme;
+package org.acegisecurity.ui.rememberme;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.dao.AuthenticationDao;
-import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
-import net.sf.acegisecurity.providers.rememberme.RememberMeAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.dao.AuthenticationDao;
+import org.acegisecurity.providers.dao.UsernameNotFoundException;
+import org.acegisecurity.providers.rememberme.RememberMeAuthenticationToken;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -57,10 +57,10 @@ import javax.servlet.http.HttpServletResponse;
  * 
      
  * 
  * 
      
- * An {@link net.sf.acegisecurity.providers.dao.AuthenticationDao} is required
+ * An {@link org.acegisecurity.providers.dao.AuthenticationDao} is required
  * by this implementation, so that it can construct a valid
  * Authentication from the returned {@link
- * net.sf.acegisecurity.UserDetails}. This is also necessary so that the
+ * org.acegisecurity.UserDetails}. This is also necessary so that the
  * user's password is available and can be checked as part of the encoded
  * cookie.
  * 
      
diff --git a/core/src/main/java/org/acegisecurity/ui/session/HttpSessionApplicationEvent.java b/core/src/main/java/org/acegisecurity/ui/session/HttpSessionApplicationEvent.java
index fbf860658b..e0d1fae2cb 100644
--- a/core/src/main/java/org/acegisecurity/ui/session/HttpSessionApplicationEvent.java
+++ b/core/src/main/java/org/acegisecurity/ui/session/HttpSessionApplicationEvent.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.session;
+package org.acegisecurity.ui.session;
 
 import org.springframework.context.ApplicationEvent;
 
diff --git a/core/src/main/java/org/acegisecurity/ui/session/HttpSessionCreatedEvent.java b/core/src/main/java/org/acegisecurity/ui/session/HttpSessionCreatedEvent.java
index cf61f59d16..788631a15d 100644
--- a/core/src/main/java/org/acegisecurity/ui/session/HttpSessionCreatedEvent.java
+++ b/core/src/main/java/org/acegisecurity/ui/session/HttpSessionCreatedEvent.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.session;
+package org.acegisecurity.ui.session;
 
 import javax.servlet.http.HttpSession;
 
diff --git a/core/src/main/java/org/acegisecurity/ui/session/HttpSessionDestroyedEvent.java b/core/src/main/java/org/acegisecurity/ui/session/HttpSessionDestroyedEvent.java
index 9b26fe2fc4..36e199bff1 100644
--- a/core/src/main/java/org/acegisecurity/ui/session/HttpSessionDestroyedEvent.java
+++ b/core/src/main/java/org/acegisecurity/ui/session/HttpSessionDestroyedEvent.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.session;
+package org.acegisecurity.ui.session;
 
 import javax.servlet.http.HttpSession;
 
diff --git a/core/src/main/java/org/acegisecurity/ui/session/HttpSessionEventPublisher.java b/core/src/main/java/org/acegisecurity/ui/session/HttpSessionEventPublisher.java
index f1da2d8e30..6b7e6c38ab 100644
--- a/core/src/main/java/org/acegisecurity/ui/session/HttpSessionEventPublisher.java
+++ b/core/src/main/java/org/acegisecurity/ui/session/HttpSessionEventPublisher.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.session;
+package org.acegisecurity.ui.session;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpSessionListener;
 /**
  * Declared in web.xml as 
      
  *  <listener>
      
- * <listener-class>net.sf.acegisecurity.ui.session.HttpSessionEventPublisher</listener-class>
      
+ * <listener-class>org.acegisecurity.ui.session.HttpSessionEventPublisher</listener-class>
      
  * </listener>
      
  *        Publishes HttpSessionApplicationEvents to the Spring
  * Root WebApplicationContext. 
      
diff --git a/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserGrantedAuthority.java b/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserGrantedAuthority.java
index 5295d196e7..472e18ac23 100644
--- a/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserGrantedAuthority.java
+++ b/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserGrantedAuthority.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.switchuser;
+package org.acegisecurity.ui.switchuser;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.GrantedAuthorityImpl;
 
 
 /**
  * Custom GrantedAuthority used by {@link
- * net.sf.acegisecurity.ui.switchuser.SwitchUserProcessingFilter}
+ * org.acegisecurity.ui.switchuser.SwitchUserProcessingFilter}
  * 
  * 
      
  * Stores the Authentication object of the original user to be
@@ -31,7 +31,7 @@ import net.sf.acegisecurity.GrantedAuthorityImpl;
  * @author Mark St.Godard
  * @version $Id$
  *
- * @see net.sf.acegisecurity.ui.switchuser.SwitchUserProcessingFilter
+ * @see org.acegisecurity.ui.switchuser.SwitchUserProcessingFilter
  */
 public class SwitchUserGrantedAuthority extends GrantedAuthorityImpl {
     //~ Instance fields ========================================================
diff --git a/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java b/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java
index 595edd4aa9..d26f8cd2d1 100644
--- a/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java
+++ b/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java
@@ -13,22 +13,22 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.switchuser;
+package org.acegisecurity.ui.switchuser;
 
-import net.sf.acegisecurity.AccountExpiredException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationCredentialsNotFoundException;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.CredentialsExpiredException;
-import net.sf.acegisecurity.DisabledException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.event.authentication.AuthenticationSwitchUserEvent;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.providers.dao.AuthenticationDao;
-import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
-import net.sf.acegisecurity.ui.WebAuthenticationDetails;
+import org.acegisecurity.AccountExpiredException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationCredentialsNotFoundException;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.CredentialsExpiredException;
+import org.acegisecurity.DisabledException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.event.authentication.AuthenticationSwitchUserEvent;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.providers.dao.AuthenticationDao;
+import org.acegisecurity.providers.dao.UsernameNotFoundException;
+import org.acegisecurity.ui.WebAuthenticationDetails;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -80,7 +80,7 @@ import javax.servlet.http.HttpServletResponse;
  * 
      
  * On successful switch, the user's  SecurityContextHolder will be
  * updated to reflect the specified user and will also contain an additinal
- * {@link net.sf.acegisecurity.ui.switchuser.SwitchUserGrantedAuthority }
+ * {@link org.acegisecurity.ui.switchuser.SwitchUserGrantedAuthority }
  * which contains the original user.
  * 
      
  * 
@@ -95,7 +95,7 @@ import javax.servlet.http.HttpServletResponse;
  * the Switch User processing filter and add to the filterChainProxy. 
      
  * Example:
  * 
      - * <bean id="switchUserProcessingFilter" class="net.sf.acegisecurity.ui.switchuser.SwitchUserProcessingFilter">
+ * <bean id="switchUserProcessingFilter" class="org.acegisecurity.ui.switchuser.SwitchUserProcessingFilter">
  *    <property name="authenticationDao" ref="jdbcDaoImpl" />
  *    <property name="switchUserUrl"><value>/j_acegi_switch_user</value></property>
  *    <property name="exitUserUrl"><value>/j_acegi_exit_user</value></property>
@@ -107,7 +107,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author Mark St.Godard
  * @version $Id$
  *
- * @see net.sf.acegisecurity.ui.switchuser.SwitchUserGrantedAuthority
+ * @see org.acegisecurity.ui.switchuser.SwitchUserGrantedAuthority
  */
 public class SwitchUserProcessingFilter implements Filter, InitializingBean,
         ApplicationEventPublisherAware {
diff --git a/core/src/main/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilter.java b/core/src/main/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilter.java
index bfe266cd09..8fdd24705f 100644
--- a/core/src/main/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilter.java
+++ b/core/src/main/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilter.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.webapp;
+package org.acegisecurity.ui.webapp;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.ui.AbstractProcessingFilter;
-import net.sf.acegisecurity.ui.WebAuthenticationDetails;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.ui.AbstractProcessingFilter;
+import org.acegisecurity.ui.WebAuthenticationDetails;
 
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
@@ -39,7 +39,7 @@ import javax.servlet.http.HttpServletRequest;
  * 
      
  * Do not use this class directly. Instead configure
  * web.xml to use the {@link
- * net.sf.acegisecurity.util.FilterToBeanProxy}.
+ * org.acegisecurity.util.FilterToBeanProxy}.
  * 
      
  *
  * @author Ben Alex
diff --git a/core/src/main/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPoint.java b/core/src/main/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPoint.java
index 335c47b819..376c158991 100644
--- a/core/src/main/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPoint.java
+++ b/core/src/main/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPoint.java
@@ -12,14 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sf.acegisecurity.ui.webapp;
+package org.acegisecurity.ui.webapp;
 
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.intercept.web.AuthenticationEntryPoint;
-import net.sf.acegisecurity.util.PortMapper;
-import net.sf.acegisecurity.util.PortMapperImpl;
-import net.sf.acegisecurity.util.PortResolver;
-import net.sf.acegisecurity.util.PortResolverImpl;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.intercept.web.AuthenticationEntryPoint;
+import org.acegisecurity.util.PortMapper;
+import org.acegisecurity.util.PortMapperImpl;
+import org.acegisecurity.util.PortResolver;
+import org.acegisecurity.util.PortResolverImpl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/ui/webapp/SiteminderAuthenticationProcessingFilter.java b/core/src/main/java/org/acegisecurity/ui/webapp/SiteminderAuthenticationProcessingFilter.java
index 0191037eb4..14b50c6bc6 100644
--- a/core/src/main/java/org/acegisecurity/ui/webapp/SiteminderAuthenticationProcessingFilter.java
+++ b/core/src/main/java/org/acegisecurity/ui/webapp/SiteminderAuthenticationProcessingFilter.java
@@ -1,13 +1,13 @@
-package net.sf.acegisecurity.ui.webapp;
+package org.acegisecurity.ui.webapp;
 
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.ui.WebAuthenticationDetails;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.ui.WebAuthenticationDetails;
 
 /**
  * Extends Acegi's AuthenticationProcessingFilter to pick up Netegrity
@@ -38,7 +38,7 @@ import net.sf.acegisecurity.ui.WebAuthenticationDetails;
  * 
      
  * Do not use this class directly. Instead, configure
  * web.xml to use the
- * {@link net.sf.acegisecurity.util.FilterToBeanProxy}.
+ * {@link org.acegisecurity.util.FilterToBeanProxy}.
  * 
      
  * 
  * @author Scott McCrory
@@ -84,7 +84,7 @@ public class SiteminderAuthenticationProcessingFilter extends
 	}
 
 	/**
-	 * @see net.sf.acegisecurity.ui.AbstractProcessingFilter#attemptAuthentication(javax.servlet.http.HttpServletRequest)
+	 * @see org.acegisecurity.ui.AbstractProcessingFilter#attemptAuthentication(javax.servlet.http.HttpServletRequest)
 	 */
 	public Authentication attemptAuthentication(HttpServletRequest request)
 			throws AuthenticationException {
diff --git a/core/src/main/java/org/acegisecurity/ui/x509/X509ProcessingFilter.java b/core/src/main/java/org/acegisecurity/ui/x509/X509ProcessingFilter.java
index 2865012757..7d5a0b88f6 100644
--- a/core/src/main/java/org/acegisecurity/ui/x509/X509ProcessingFilter.java
+++ b/core/src/main/java/org/acegisecurity/ui/x509/X509ProcessingFilter.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.x509;
+package org.acegisecurity.ui.x509;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.AuthenticationManager;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.event.authentication.InteractiveAuthenticationSuccessEvent;
-import net.sf.acegisecurity.providers.x509.X509AuthenticationToken;
-import net.sf.acegisecurity.ui.AbstractProcessingFilter;
-import net.sf.acegisecurity.ui.WebAuthenticationDetails;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationManager;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.event.authentication.InteractiveAuthenticationSuccessEvent;
+import org.acegisecurity.providers.x509.X509AuthenticationToken;
+import org.acegisecurity.ui.AbstractProcessingFilter;
+import org.acegisecurity.ui.WebAuthenticationDetails;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -55,12 +55,12 @@ import javax.servlet.http.HttpServletResponse;
  * 
      
  * The configured authentication manager is expected to supply a provider which
  * can handle this token (usually an instance of {@link
- * net.sf.acegisecurity.providers.x509.X509AuthenticationProvider}).
+ * org.acegisecurity.providers.x509.X509AuthenticationProvider}).
  * 
      
  * 
  * 
      
  * If authentication is successful, an {@link
- * net.sf.acegisecurity.event.authentication.InteractiveAuthenticationSuccessEvent} will be
+ * org.acegisecurity.event.authentication.InteractiveAuthenticationSuccessEvent} will be
  * published to the application context. No events will be published if
  * authentication was unsuccessful, because this would generally be recorded
  * via an AuthenticationManager-specific application event.
@@ -69,7 +69,7 @@ import javax.servlet.http.HttpServletResponse;
  * 
      
  * Do not use this class directly. Instead configure
  * web.xml to use the {@link
- * net.sf.acegisecurity.util.FilterToBeanProxy}.
+ * org.acegisecurity.util.FilterToBeanProxy}.
  * 
      
  *
  * @author Luke Taylor
diff --git a/core/src/main/java/org/acegisecurity/ui/x509/X509ProcessingFilterEntryPoint.java b/core/src/main/java/org/acegisecurity/ui/x509/X509ProcessingFilterEntryPoint.java
index 0d3954c887..ed71c024a3 100644
--- a/core/src/main/java/org/acegisecurity/ui/x509/X509ProcessingFilterEntryPoint.java
+++ b/core/src/main/java/org/acegisecurity/ui/x509/X509ProcessingFilterEntryPoint.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.x509;
+package org.acegisecurity.ui.x509;
 
-import net.sf.acegisecurity.intercept.web.AuthenticationEntryPoint;
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.intercept.web.AuthenticationEntryPoint;
+import org.acegisecurity.AuthenticationException;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFactory;
  *
  * @author Luke Taylor
  * @version $Id$
- * @see net.sf.acegisecurity.intercept.web.SecurityEnforcementFilter
+ * @see org.acegisecurity.intercept.web.SecurityEnforcementFilter
  */
 public class X509ProcessingFilterEntryPoint implements AuthenticationEntryPoint {
     //~ Static fields/initializers =============================================
diff --git a/core/src/main/java/org/acegisecurity/userdetails/User.java b/core/src/main/java/org/acegisecurity/userdetails/User.java
index 98120fe1ab..db38f476ee 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/User.java
+++ b/core/src/main/java/org/acegisecurity/userdetails/User.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao;
+package org.acegisecurity.providers.dao;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.UserDetails;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.UserDetails;
 
 import org.springframework.util.Assert;
 
diff --git a/core/src/main/java/org/acegisecurity/userdetails/UserDetails.java b/core/src/main/java/org/acegisecurity/userdetails/UserDetails.java
index 3dcf4d57da..7ea72f0804 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/UserDetails.java
+++ b/core/src/main/java/org/acegisecurity/userdetails/UserDetails.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import java.io.Serializable;
 
@@ -32,7 +32,7 @@ import java.io.Serializable;
  * 
      
  * Concrete implementations must take particular care to ensure the non-null
  * contract detailed for each method is enforced. See
- * {@link net.sf.acegisecurity.providers.dao.User} for a
+ * {@link org.acegisecurity.providers.dao.User} for a
  * reference implementation (which you might like to extend).
  * 
      
  *
diff --git a/core/src/main/java/org/acegisecurity/userdetails/UserDetailsService.java b/core/src/main/java/org/acegisecurity/userdetails/UserDetailsService.java
index 6bbf9d0558..2849df8327 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/UserDetailsService.java
+++ b/core/src/main/java/org/acegisecurity/userdetails/UserDetailsService.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao;
+package org.acegisecurity.providers.dao;
 
-import net.sf.acegisecurity.UserDetails;
+import org.acegisecurity.UserDetails;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/core/src/main/java/org/acegisecurity/userdetails/jdbc/JdbcDaoImpl.java b/core/src/main/java/org/acegisecurity/userdetails/jdbc/JdbcDaoImpl.java
index 14179dd7d1..8852032271 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/jdbc/JdbcDaoImpl.java
+++ b/core/src/main/java/org/acegisecurity/userdetails/jdbc/JdbcDaoImpl.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.jdbc;
+package org.acegisecurity.providers.dao.jdbc;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.dao.AuthenticationDao;
-import net.sf.acegisecurity.providers.dao.User;
-import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.dao.AuthenticationDao;
+import org.acegisecurity.providers.dao.User;
+import org.acegisecurity.providers.dao.UsernameNotFoundException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/userdetails/memory/InMemoryDaoImpl.java b/core/src/main/java/org/acegisecurity/userdetails/memory/InMemoryDaoImpl.java
index b15b251ee4..f293ec1ee9 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/memory/InMemoryDaoImpl.java
+++ b/core/src/main/java/org/acegisecurity/userdetails/memory/InMemoryDaoImpl.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.memory;
+package org.acegisecurity.providers.dao.memory;
 
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.dao.AuthenticationDao;
-import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.dao.AuthenticationDao;
+import org.acegisecurity.providers.dao.UsernameNotFoundException;
 
 import org.springframework.beans.factory.InitializingBean;
 
diff --git a/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttribute.java b/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttribute.java
index e42ec4be8f..acfb26b0e3 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttribute.java
+++ b/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttribute.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.memory;
+package org.acegisecurity.providers.dao.memory;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttributeEditor.java b/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttributeEditor.java
index a584782beb..a4deda5964 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttributeEditor.java
+++ b/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttributeEditor.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.memory;
+package org.acegisecurity.providers.dao.memory;
 
-import net.sf.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.GrantedAuthorityImpl;
 
 import org.springframework.util.StringUtils;
 
diff --git a/core/src/main/java/org/acegisecurity/userdetails/memory/UserMap.java b/core/src/main/java/org/acegisecurity/userdetails/memory/UserMap.java
index cb7710fdeb..1669eb4eb4 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/memory/UserMap.java
+++ b/core/src/main/java/org/acegisecurity/userdetails/memory/UserMap.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.memory;
+package org.acegisecurity.providers.dao.memory;
 
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.dao.User;
-import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.dao.User;
+import org.acegisecurity.providers.dao.UsernameNotFoundException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/core/src/main/java/org/acegisecurity/userdetails/memory/UserMapEditor.java b/core/src/main/java/org/acegisecurity/userdetails/memory/UserMapEditor.java
index 7250c0cfff..69c6000bce 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/memory/UserMapEditor.java
+++ b/core/src/main/java/org/acegisecurity/userdetails/memory/UserMapEditor.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.memory;
+package org.acegisecurity.providers.dao.memory;
 
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.dao.User;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.dao.User;
 
 import org.springframework.beans.propertyeditors.PropertiesEditor;
 
diff --git a/core/src/main/java/org/acegisecurity/util/FilterChainProxy.java b/core/src/main/java/org/acegisecurity/util/FilterChainProxy.java
index ad8b68b891..eb40f62cab 100644
--- a/core/src/main/java/org/acegisecurity/util/FilterChainProxy.java
+++ b/core/src/main/java/org/acegisecurity/util/FilterChainProxy.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.util;
+package org.acegisecurity.util;
 
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.intercept.web.FilterInvocation;
-import net.sf.acegisecurity.intercept.web.FilterInvocationDefinitionSource;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.intercept.web.FilterInvocation;
+import org.acegisecurity.intercept.web.FilterInvocationDefinitionSource;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -51,7 +51,7 @@ import javax.servlet.ServletResponse;
  * 
  * 
      
  * The FilterChainProxy is loaded via a standard {@link
- * net.sf.acegisecurity.util.FilterToBeanProxy} declaration in
+ * org.acegisecurity.util.FilterToBeanProxy} declaration in
  * web.xml. FilterChainProxy will then pass {@link
  * #init(FilterConfig)}, {@link #destroy()}, {@link #doInit()} and {@link
  * #doFilter(ServletRequest, ServletResponse, FilterChain)} invocations
@@ -61,7 +61,7 @@ import javax.servlet.ServletResponse;
  * 
  * 
      
  * FilterChainProxy is configured using a standard {@link
- * net.sf.acegisecurity.intercept.web.FilterInvocationDefinitionSource}. Each
+ * org.acegisecurity.intercept.web.FilterInvocationDefinitionSource}. Each
  * possible URI pattern that FilterChainProxy should service must
  * be entered. The first matching URI pattern located by
  * FilterInvocationDefinitionSource for a given request will be
@@ -74,7 +74,7 @@ import javax.servlet.ServletResponse;
  * FilterInvocationDefinitionSource described the applicable URI
  * pattern to fire the filter chain, followed by a list of configuration
  * attributes. Each configuration attribute's {@link
- * net.sf.acegisecurity.ConfigAttribute#getAttribute()} corresponds to a bean
+ * org.acegisecurity.ConfigAttribute#getAttribute()} corresponds to a bean
  * name that is available from the application context.
  * 
      
  * 
@@ -90,7 +90,7 @@ import javax.servlet.ServletResponse;
  * 
      
  * It is particularly noted the Filter lifecycle mismatch between
  * the servlet container and IoC container. As per {@link
- * net.sf.acegisecurity.util.FilterToBeanProxy} JavaDocs, we recommend you
+ * org.acegisecurity.util.FilterToBeanProxy} JavaDocs, we recommend you
  * allow the IoC container to manage lifecycle instead of the servlet
  * container. By default the FilterToBeanProxy will never call
  * this class' {@link #init(FilterConfig)} and {@link #destroy()} methods,
diff --git a/core/src/main/java/org/acegisecurity/util/FilterToBeanProxy.java b/core/src/main/java/org/acegisecurity/util/FilterToBeanProxy.java
index e578ad23d3..5d9cf1cb96 100644
--- a/core/src/main/java/org/acegisecurity/util/FilterToBeanProxy.java
+++ b/core/src/main/java/org/acegisecurity/util/FilterToBeanProxy.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sf.acegisecurity.util;
+package org.acegisecurity.util;
 
 import org.springframework.beans.factory.BeanFactoryUtils;
 
diff --git a/core/src/main/java/org/acegisecurity/util/InMemoryResource.java b/core/src/main/java/org/acegisecurity/util/InMemoryResource.java
index 2446b9eedf..55f323390c 100644
--- a/core/src/main/java/org/acegisecurity/util/InMemoryResource.java
+++ b/core/src/main/java/org/acegisecurity/util/InMemoryResource.java
@@ -1,4 +1,4 @@
-package net.sf.acegisecurity.util;
+package org.acegisecurity.util;
 
 import org.springframework.core.io.AbstractResource;
 
diff --git a/core/src/main/java/org/acegisecurity/util/PortMapper.java b/core/src/main/java/org/acegisecurity/util/PortMapper.java
index 8a5d8349c5..e5590c3aa9 100644
--- a/core/src/main/java/org/acegisecurity/util/PortMapper.java
+++ b/core/src/main/java/org/acegisecurity/util/PortMapper.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.util;
+package org.acegisecurity.util;
 
 /**
  * PortMapper implementations provide callers with information
diff --git a/core/src/main/java/org/acegisecurity/util/PortMapperImpl.java b/core/src/main/java/org/acegisecurity/util/PortMapperImpl.java
index 15842d18d5..89d173cee9 100644
--- a/core/src/main/java/org/acegisecurity/util/PortMapperImpl.java
+++ b/core/src/main/java/org/acegisecurity/util/PortMapperImpl.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.util;
+package org.acegisecurity.util;
 
 import org.springframework.util.Assert;
 
diff --git a/core/src/main/java/org/acegisecurity/util/PortResolver.java b/core/src/main/java/org/acegisecurity/util/PortResolver.java
index 92ca9cc40e..6c7d3bc880 100644
--- a/core/src/main/java/org/acegisecurity/util/PortResolver.java
+++ b/core/src/main/java/org/acegisecurity/util/PortResolver.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.util;
+package org.acegisecurity.util;
 
 import javax.servlet.ServletRequest;
 
diff --git a/core/src/main/java/org/acegisecurity/util/PortResolverImpl.java b/core/src/main/java/org/acegisecurity/util/PortResolverImpl.java
index a3915a5802..f2a227c505 100644
--- a/core/src/main/java/org/acegisecurity/util/PortResolverImpl.java
+++ b/core/src/main/java/org/acegisecurity/util/PortResolverImpl.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.util;
+package org.acegisecurity.util;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/acegisecurity/util/StringSplitUtils.java b/core/src/main/java/org/acegisecurity/util/StringSplitUtils.java
index f07e7266de..60792e8dbe 100644
--- a/core/src/main/java/org/acegisecurity/util/StringSplitUtils.java
+++ b/core/src/main/java/org/acegisecurity/util/StringSplitUtils.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.util;
+package org.acegisecurity.util;
 
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
diff --git a/core/src/main/java/org/acegisecurity/vote/AbstractAccessDecisionManager.java b/core/src/main/java/org/acegisecurity/vote/AbstractAccessDecisionManager.java
index cbb8e517ac..268b2020ec 100644
--- a/core/src/main/java/org/acegisecurity/vote/AbstractAccessDecisionManager.java
+++ b/core/src/main/java/org/acegisecurity/vote/AbstractAccessDecisionManager.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
-import net.sf.acegisecurity.AccessDecisionManager;
-import net.sf.acegisecurity.ConfigAttribute;
+import org.acegisecurity.AccessDecisionManager;
+import org.acegisecurity.ConfigAttribute;
 
 import org.springframework.beans.factory.InitializingBean;
 
diff --git a/core/src/main/java/org/acegisecurity/vote/AbstractAclVoter.java b/core/src/main/java/org/acegisecurity/vote/AbstractAclVoter.java
index 66033e0c00..078929a49d 100644
--- a/core/src/main/java/org/acegisecurity/vote/AbstractAclVoter.java
+++ b/core/src/main/java/org/acegisecurity/vote/AbstractAclVoter.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
-import net.sf.acegisecurity.AuthorizationServiceException;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.acl.AclEntry;
-import net.sf.acegisecurity.acl.AclManager;
+import org.acegisecurity.AuthorizationServiceException;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.acl.AclEntry;
+import org.acegisecurity.acl.AclManager;
 
 import org.aopalliance.intercept.MethodInvocation;
 
@@ -38,9 +38,9 @@ import java.lang.reflect.Method;
  * (ACL) permissions associated with a domain object instance for the current
  * Authentication object. This class is designed to process
  * {@link AclEntry}s that are subclasses of {@link
- * net.sf.acegisecurity.acl.basic.BasicAclEntry} only. Generally these are
+ * org.acegisecurity.acl.basic.BasicAclEntry} only. Generally these are
  * obtained by using the {@link
- * net.sf.acegisecurity.acl.basic.BasicAclProvider}.
+ * org.acegisecurity.acl.basic.BasicAclProvider}.
  * 
      
  * 
  * 
      
@@ -49,14 +49,14 @@ import java.lang.reflect.Method;
  * first method argument of type {@link #processDomainObjectClass}. Assuming
  * that method argument is non-null, the provider will then lookup the ACLs
  * from the AclManager and ensure the principal is {@link
- * net.sf.acegisecurity.acl.basic.BasicAclEntry#isPermitted(int)} for at least
+ * org.acegisecurity.acl.basic.BasicAclEntry#isPermitted(int)} for at least
  * one of the {@link #requirePermission}s.
  * 
      
  * 
  * 
      
  * If the method argument is null, the voter will abstain from
  * voting. If the method argument could not be found, an {@link
- * net.sf.acegisecurity.AuthorizationServiceException} will be thrown.
+ * org.acegisecurity.AuthorizationServiceException} will be thrown.
  * 
      
  * 
  * 
      
diff --git a/core/src/main/java/org/acegisecurity/vote/AccessDecisionVoter.java b/core/src/main/java/org/acegisecurity/vote/AccessDecisionVoter.java
index 2d7bdec0b4..fe76750d87 100644
--- a/core/src/main/java/org/acegisecurity/vote/AccessDecisionVoter.java
+++ b/core/src/main/java/org/acegisecurity/vote/AccessDecisionVoter.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 
 /**
@@ -26,7 +26,7 @@ import net.sf.acegisecurity.ConfigAttributeDefinition;
  * 
      
  * The coordination of voting (ie polling AccessDecisionVoters,
  * tallying their responses, and making the final authorization decision) is
- * performed by an {@link net.sf.acegisecurity.AccessDecisionManager}.
+ * performed by an {@link org.acegisecurity.AccessDecisionManager}.
  * 
      
  *
  * @author Ben Alex
@@ -80,7 +80,7 @@ public interface AccessDecisionVoter {
      * can abstain (ACCESS_ABSTAIN) from voting. Under no
      * circumstances should implementing classes return any other value. If a
      * weighting of results is desired, this should be handled in a custom
-     * {@link net.sf.acegisecurity.AccessDecisionManager} instead.
+     * {@link org.acegisecurity.AccessDecisionManager} instead.
      * 
      
      * 
      * 
      
diff --git a/core/src/main/java/org/acegisecurity/vote/AffirmativeBased.java b/core/src/main/java/org/acegisecurity/vote/AffirmativeBased.java
index 3c258e368f..c686b8d3a8 100644
--- a/core/src/main/java/org/acegisecurity/vote/AffirmativeBased.java
+++ b/core/src/main/java/org/acegisecurity/vote/AffirmativeBased.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -27,7 +27,7 @@ import java.util.Iterator;
 
 /**
  * Simple concrete implementation of  {@link
- * net.sf.acegisecurity.AccessDecisionManager} that grants access if any
+ * org.acegisecurity.AccessDecisionManager} that grants access if any
  * AccessDecisionVoter returns an affirmative response.
  *
  * @author Ben Alex
diff --git a/core/src/main/java/org/acegisecurity/vote/AuthenticatedVoter.java b/core/src/main/java/org/acegisecurity/vote/AuthenticatedVoter.java
index 7ee05b7420..78432dc80e 100644
--- a/core/src/main/java/org/acegisecurity/vote/AuthenticatedVoter.java
+++ b/core/src/main/java/org/acegisecurity/vote/AuthenticatedVoter.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationTrustResolver;
-import net.sf.acegisecurity.AuthenticationTrustResolverImpl;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationTrustResolver;
+import org.acegisecurity.AuthenticationTrustResolverImpl;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 import org.springframework.util.Assert;
 
@@ -39,9 +39,9 @@ import java.util.Iterator;
  * The current Authentication will be inspected to determine if
  * the principal has a particular level of authentication. The "FULLY"
  * authenticated option means the user is authenticated fully (ie {@link
- * net.sf.acegisecurity.AuthenticationTrustResolver#isAnonymous(Authentication)}
+ * org.acegisecurity.AuthenticationTrustResolver#isAnonymous(Authentication)}
  * is false and {@link
- * net.sf.acegisecurity.AuthenticationTrustResolver#isRememberMe(Authentication)}
+ * org.acegisecurity.AuthenticationTrustResolver#isRememberMe(Authentication)}
  * is false. The "REMEMBERED" will grant access if the principal was either
  * authenticated via remember-me OR is fully authenticated. The "ANONYMOUSLY"
  * will grant access if the principal was authenticated via remember-me, OR
diff --git a/core/src/main/java/org/acegisecurity/vote/BasicAclEntryVoter.java b/core/src/main/java/org/acegisecurity/vote/BasicAclEntryVoter.java
index 78454affdd..7664678501 100644
--- a/core/src/main/java/org/acegisecurity/vote/BasicAclEntryVoter.java
+++ b/core/src/main/java/org/acegisecurity/vote/BasicAclEntryVoter.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthorizationServiceException;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.acl.AclEntry;
-import net.sf.acegisecurity.acl.AclManager;
-import net.sf.acegisecurity.acl.basic.BasicAclEntry;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthorizationServiceException;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.acl.AclEntry;
+import org.acegisecurity.acl.AclManager;
+import org.acegisecurity.acl.basic.BasicAclEntry;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -47,9 +47,9 @@ import java.util.Iterator;
  * (ACL) permissions associated with a domain object instance for the current
  * Authentication object. This class is designed to process
  * {@link AclEntry}s that are subclasses of {@link
- * net.sf.acegisecurity.acl.basic.BasicAclEntry} only. Generally these are
+ * org.acegisecurity.acl.basic.BasicAclEntry} only. Generally these are
  * obtained by using the {@link
- * net.sf.acegisecurity.acl.basic.BasicAclProvider}.
+ * org.acegisecurity.acl.basic.BasicAclProvider}.
  * 
      
  * 
  * 
      
@@ -58,14 +58,14 @@ import java.util.Iterator;
  * first method argument of type {@link #processDomainObjectClass}. Assuming
  * that method argument is non-null, the provider will then lookup the ACLs
  * from the AclManager and ensure the principal is {@link
- * net.sf.acegisecurity.acl.basic.BasicAclEntry#isPermitted(int)} for at least
+ * org.acegisecurity.acl.basic.BasicAclEntry#isPermitted(int)} for at least
  * one of the {@link #requirePermission}s.
  * 
      
  * 
  * 
      
  * If the method argument is null, the voter will abstain from
  * voting. If the method argument could not be found, an {@link
- * net.sf.acegisecurity.AuthorizationServiceException} will be thrown.
+ * org.acegisecurity.AuthorizationServiceException} will be thrown.
  * 
      
  * 
  * 
      
diff --git a/core/src/main/java/org/acegisecurity/vote/ConsensusBased.java b/core/src/main/java/org/acegisecurity/vote/ConsensusBased.java
index 9e7dfd37a3..3339f64b90 100644
--- a/core/src/main/java/org/acegisecurity/vote/ConsensusBased.java
+++ b/core/src/main/java/org/acegisecurity/vote/ConsensusBased.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -27,7 +27,7 @@ import java.util.Iterator;
 
 /**
  * Simple concrete implementation of  {@link
- * net.sf.acegisecurity.AccessDecisionManager} that uses a  consensus-based
+ * org.acegisecurity.AccessDecisionManager} that uses a  consensus-based
  * approach.
  *
  * @author Ben Alex
diff --git a/core/src/main/java/org/acegisecurity/vote/RoleVoter.java b/core/src/main/java/org/acegisecurity/vote/RoleVoter.java
index 8dc961d914..b990be47be 100644
--- a/core/src/main/java/org/acegisecurity/vote/RoleVoter.java
+++ b/core/src/main/java/org/acegisecurity/vote/RoleVoter.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 import java.util.Iterator;
 
@@ -35,7 +35,7 @@ import java.util.Iterator;
  * 
      
  * Abstains from voting if no configuration attribute commences with the  role
  * prefix. Votes to grant access if there is an exact matching {@link
- * net.sf.acegisecurity.GrantedAuthority} to a ConfigAttribute
+ * org.acegisecurity.GrantedAuthority} to a ConfigAttribute
  * starting with the role prefix. Votes to deny access if there is no exact
  * matching GrantedAuthority  to a ConfigAttribute
  * starting with the role prefix.
@@ -49,7 +49,7 @@ import java.util.Iterator;
  * some use when using preexisting role names without a prefix, and no ability
  * exists to prefix them with a role prefix on reading them in, such as
  * provided for example in  {@link
- * net.sf.acegisecurity.providers.dao.jdbc.JdbcDaoImpl}.
+ * org.acegisecurity.providers.dao.jdbc.JdbcDaoImpl}.
  * 
      
  * 
  * 
      
diff --git a/core/src/main/java/org/acegisecurity/vote/UnanimousBased.java b/core/src/main/java/org/acegisecurity/vote/UnanimousBased.java
index 62ed101c49..642c537a5b 100644
--- a/core/src/main/java/org/acegisecurity/vote/UnanimousBased.java
+++ b/core/src/main/java/org/acegisecurity/vote/UnanimousBased.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -28,7 +28,7 @@ import java.util.Iterator;
 
 /**
  * Simple concrete implementation of  {@link
- * net.sf.acegisecurity.AccessDecisionManager} that  requires all voters to
+ * org.acegisecurity.AccessDecisionManager} that  requires all voters to
  * abstain or grant access.
  *
  * @author Ben Alex
diff --git a/core/src/main/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestFilter.java b/core/src/main/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestFilter.java
index 77b3e666e8..ae19ea52af 100644
--- a/core/src/main/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestFilter.java
+++ b/core/src/main/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestFilter.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.wrapper;
+package org.acegisecurity.wrapper;
 
 import java.io.IOException;
 
diff --git a/core/src/main/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestWrapper.java b/core/src/main/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestWrapper.java
index 85242c7351..3c210263ed 100644
--- a/core/src/main/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestWrapper.java
+++ b/core/src/main/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestWrapper.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.wrapper;
+package org.acegisecurity.wrapper;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationTrustResolver;
-import net.sf.acegisecurity.AuthenticationTrustResolverImpl;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationTrustResolver;
+import org.acegisecurity.AuthenticationTrustResolverImpl;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.context.SecurityContextHolder;
 
 import java.security.Principal;
 
diff --git a/core/src/main/resources/org/acegisecurity/adapters/acegisecurity.xml b/core/src/main/resources/org/acegisecurity/adapters/acegisecurity.xml
index 0c3ce24b6e..279e841de8 100644
--- a/core/src/main/resources/org/acegisecurity/adapters/acegisecurity.xml
+++ b/core/src/main/resources/org/acegisecurity/adapters/acegisecurity.xml
@@ -22,7 +22,7 @@
 
 
 	
-	
+	
   		
 			
 				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
@@ -34,13 +34,13 @@
 	
 	
 	
-	
+	
      	
      	true
 	
 
 	
-	
+	
 		
 		  
 		    
diff --git a/core/src/main/resources/org/acegisecurity/adapters/adaptertest-invalid.xml b/core/src/main/resources/org/acegisecurity/adapters/adaptertest-invalid.xml
index d2d53302fa..822dfa84e5 100644
--- a/core/src/main/resources/org/acegisecurity/adapters/adaptertest-invalid.xml
+++ b/core/src/main/resources/org/acegisecurity/adapters/adaptertest-invalid.xml
@@ -22,7 +22,7 @@
 
 
 	
-	
+	
   		
 			
 				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
diff --git a/core/src/main/resources/org/acegisecurity/adapters/adaptertest-valid.xml b/core/src/main/resources/org/acegisecurity/adapters/adaptertest-valid.xml
index 0c3ce24b6e..279e841de8 100644
--- a/core/src/main/resources/org/acegisecurity/adapters/adaptertest-valid.xml
+++ b/core/src/main/resources/org/acegisecurity/adapters/adaptertest-valid.xml
@@ -22,7 +22,7 @@
 
 
 	
-	
+	
   		
 			
 				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
@@ -34,13 +34,13 @@
 	
 	
 	
-	
+	
      	
      	true
 	
 
 	
-	
+	
 		
 		  
 		    
diff --git a/core/src/main/resources/org/acegisecurity/providers/dao/jdbc/acegisecurity-jdbc.xml b/core/src/main/resources/org/acegisecurity/providers/dao/jdbc/acegisecurity-jdbc.xml
index 51b8ae4078..321076b2f1 100644
--- a/core/src/main/resources/org/acegisecurity/providers/dao/jdbc/acegisecurity-jdbc.xml
+++ b/core/src/main/resources/org/acegisecurity/providers/dao/jdbc/acegisecurity-jdbc.xml
@@ -18,17 +18,17 @@
 	
 
 	
-	
+	
   		
 	
 	
 	
-	
+	
      	
 	
 
 	
-	
+	
 		
 		  
 		    
diff --git a/core/src/main/resources/org/acegisecurity/taglibs/authz.tld b/core/src/main/resources/org/acegisecurity/taglibs/authz.tld
index 4b298cec4b..b87b169650 100644
--- a/core/src/main/resources/org/acegisecurity/taglibs/authz.tld
+++ b/core/src/main/resources/org/acegisecurity/taglibs/authz.tld
@@ -6,7 +6,7 @@
 	1.0
 	1.2
 	authz
-	http://acegisecurity.sf.net/authz
+	http://acegisecurity.org/authz
 	
         Acegi Security Systems Authorization Tag Library
 		$Id$
@@ -14,7 +14,7 @@
 
 	
 		authorize
-		net.sf.acegisecurity.taglibs.authz.AuthorizeTag
+		org.acegisecurity.taglibs.authz.AuthorizeTag
 		
             A simple tag to output or not the body of the tag if the principal
             has or doesn't have certain authorities.
@@ -53,7 +53,7 @@
 
 	
 		authentication
-		net.sf.acegisecurity.taglibs.authz.AuthenticationTag
+		org.acegisecurity.taglibs.authz.AuthenticationTag
 		
             Allows access to the current Authentication object.
 		
@@ -83,7 +83,7 @@
 
 	
 		acl
-		net.sf.acegisecurity.taglibs.authz.AclTag
+		org.acegisecurity.taglibs.authz.AclTag
 		
             Allows inclusion of a tag body if the current Authentication
 			has one of the specified permissions to the presented
@@ -99,7 +99,7 @@
 			
                 A comma separated list of integers, each representing a
 				required bit mask permission from a subclass of
-				net.sf.acegisecurity.acl.basic.AbstractBasicAclEntry.
+				org.acegisecurity.acl.basic.AbstractBasicAclEntry.
 			
 		
 		
diff --git a/core/src/test/java/org/acegisecurity/AuthenticationTrustResolverImplTests.java b/core/src/test/java/org/acegisecurity/AuthenticationTrustResolverImplTests.java
index 659859dd69..7591a1a129 100644
--- a/core/src/test/java/org/acegisecurity/AuthenticationTrustResolverImplTests.java
+++ b/core/src/test/java/org/acegisecurity/AuthenticationTrustResolverImplTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
-import net.sf.acegisecurity.providers.anonymous.AnonymousAuthenticationToken;
-import net.sf.acegisecurity.providers.rememberme.RememberMeAuthenticationToken;
+import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken;
+import org.acegisecurity.providers.rememberme.RememberMeAuthenticationToken;
 
 
 /**
- * Tests {@link net.sf.acegisecurity.AuthenticationTrustResolverImpl}.
+ * Tests {@link org.acegisecurity.AuthenticationTrustResolverImpl}.
  *
  * @author Ben Alex
  * @version $Id$
diff --git a/core/src/test/java/org/acegisecurity/ConfigAttributeEditorTests.java b/core/src/test/java/org/acegisecurity/ConfigAttributeEditorTests.java
index 2502534f46..27a9da8d65 100644
--- a/core/src/test/java/org/acegisecurity/ConfigAttributeEditorTests.java
+++ b/core/src/test/java/org/acegisecurity/ConfigAttributeEditorTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/GrantedAuthorityImplTests.java b/core/src/test/java/org/acegisecurity/GrantedAuthorityImplTests.java
index df905f2847..1571e00816 100644
--- a/core/src/test/java/org/acegisecurity/GrantedAuthorityImplTests.java
+++ b/core/src/test/java/org/acegisecurity/GrantedAuthorityImplTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/ITargetObject.java b/core/src/test/java/org/acegisecurity/ITargetObject.java
index 37f0f889c4..ba4b7e8f0b 100644
--- a/core/src/test/java/org/acegisecurity/ITargetObject.java
+++ b/core/src/test/java/org/acegisecurity/ITargetObject.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Represents the interface of a secured object.
diff --git a/core/src/test/java/org/acegisecurity/MockAccessDecisionManager.java b/core/src/test/java/org/acegisecurity/MockAccessDecisionManager.java
index ec1ace30dc..d3ddea6872 100644
--- a/core/src/test/java/org/acegisecurity/MockAccessDecisionManager.java
+++ b/core/src/test/java/org/acegisecurity/MockAccessDecisionManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import java.util.Iterator;
 
diff --git a/core/src/test/java/org/acegisecurity/MockAclManager.java b/core/src/test/java/org/acegisecurity/MockAclManager.java
index 3264a5dae5..d75459d586 100644
--- a/core/src/test/java/org/acegisecurity/MockAclManager.java
+++ b/core/src/test/java/org/acegisecurity/MockAclManager.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
-import net.sf.acegisecurity.acl.AclEntry;
-import net.sf.acegisecurity.acl.AclManager;
+import org.acegisecurity.acl.AclEntry;
+import org.acegisecurity.acl.AclManager;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/MockAfterInvocationManager.java b/core/src/test/java/org/acegisecurity/MockAfterInvocationManager.java
index 104fa92212..fb2935e72d 100644
--- a/core/src/test/java/org/acegisecurity/MockAfterInvocationManager.java
+++ b/core/src/test/java/org/acegisecurity/MockAfterInvocationManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import java.util.Iterator;
 
diff --git a/core/src/test/java/org/acegisecurity/MockApplicationContext.java b/core/src/test/java/org/acegisecurity/MockApplicationContext.java
index cb3200d5b3..8bd4c309e2 100644
--- a/core/src/test/java/org/acegisecurity/MockApplicationContext.java
+++ b/core/src/test/java/org/acegisecurity/MockApplicationContext.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -31,6 +31,6 @@ public class MockApplicationContext {
 
     public static ConfigurableApplicationContext getContext() {
         return new ClassPathXmlApplicationContext(
-            "net/sf/acegisecurity/applicationContext.xml");
+            "org/acegisecurity/applicationContext.xml");
     }
 }
diff --git a/core/src/test/java/org/acegisecurity/MockAuthenticationEntryPoint.java b/core/src/test/java/org/acegisecurity/MockAuthenticationEntryPoint.java
index 70023ee65d..af470e1049 100644
--- a/core/src/test/java/org/acegisecurity/MockAuthenticationEntryPoint.java
+++ b/core/src/test/java/org/acegisecurity/MockAuthenticationEntryPoint.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
-import net.sf.acegisecurity.intercept.web.AuthenticationEntryPoint;
+import org.acegisecurity.intercept.web.AuthenticationEntryPoint;
 
 import java.io.IOException;
 
diff --git a/core/src/test/java/org/acegisecurity/MockFilterChain.java b/core/src/test/java/org/acegisecurity/MockFilterChain.java
index b2139bc19c..ab141e973f 100644
--- a/core/src/test/java/org/acegisecurity/MockFilterChain.java
+++ b/core/src/test/java/org/acegisecurity/MockFilterChain.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import java.io.IOException;
 
diff --git a/core/src/test/java/org/acegisecurity/MockFilterConfig.java b/core/src/test/java/org/acegisecurity/MockFilterConfig.java
index ea36eb5644..7f8371e470 100644
--- a/core/src/test/java/org/acegisecurity/MockFilterConfig.java
+++ b/core/src/test/java/org/acegisecurity/MockFilterConfig.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import java.util.Enumeration;
 import java.util.HashMap;
diff --git a/core/src/test/java/org/acegisecurity/MockJoinPoint.java b/core/src/test/java/org/acegisecurity/MockJoinPoint.java
index a5c56a6a39..39545a6c0e 100644
--- a/core/src/test/java/org/acegisecurity/MockJoinPoint.java
+++ b/core/src/test/java/org/acegisecurity/MockJoinPoint.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.Signature;
diff --git a/core/src/test/java/org/acegisecurity/MockMethodInvocation.java b/core/src/test/java/org/acegisecurity/MockMethodInvocation.java
index 8f9676c032..497d6b32a0 100644
--- a/core/src/test/java/org/acegisecurity/MockMethodInvocation.java
+++ b/core/src/test/java/org/acegisecurity/MockMethodInvocation.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import org.aopalliance.intercept.MethodInvocation;
 
diff --git a/core/src/test/java/org/acegisecurity/MockPortResolver.java b/core/src/test/java/org/acegisecurity/MockPortResolver.java
index e22bf73a4a..18022a953d 100644
--- a/core/src/test/java/org/acegisecurity/MockPortResolver.java
+++ b/core/src/test/java/org/acegisecurity/MockPortResolver.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
-import net.sf.acegisecurity.util.PortResolver;
+import org.acegisecurity.util.PortResolver;
 
 import javax.servlet.ServletRequest;
 
diff --git a/core/src/test/java/org/acegisecurity/MockRunAsAuthenticationToken.java b/core/src/test/java/org/acegisecurity/MockRunAsAuthenticationToken.java
index 9424150ffa..37067616fa 100644
--- a/core/src/test/java/org/acegisecurity/MockRunAsAuthenticationToken.java
+++ b/core/src/test/java/org/acegisecurity/MockRunAsAuthenticationToken.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
-import net.sf.acegisecurity.providers.AbstractAuthenticationToken;
+import org.acegisecurity.providers.AbstractAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/MockRunAsManager.java b/core/src/test/java/org/acegisecurity/MockRunAsManager.java
index 9926e8df61..e2288c6061 100644
--- a/core/src/test/java/org/acegisecurity/MockRunAsManager.java
+++ b/core/src/test/java/org/acegisecurity/MockRunAsManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import java.util.Iterator;
 
diff --git a/core/src/test/java/org/acegisecurity/OtherTargetObject.java b/core/src/test/java/org/acegisecurity/OtherTargetObject.java
index 58a45f6c05..8982430dd5 100644
--- a/core/src/test/java/org/acegisecurity/OtherTargetObject.java
+++ b/core/src/test/java/org/acegisecurity/OtherTargetObject.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Simply extends {@link TargetObject} so we have a different object to put
diff --git a/core/src/test/java/org/acegisecurity/PopulatedDatabase.java b/core/src/test/java/org/acegisecurity/PopulatedDatabase.java
index 477365a2a1..e4769ae3af 100644
--- a/core/src/test/java/org/acegisecurity/PopulatedDatabase.java
+++ b/core/src/test/java/org/acegisecurity/PopulatedDatabase.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
@@ -83,21 +83,21 @@ public class PopulatedDatabase {
         template.execute(
             "INSERT INTO AUTHORITIES VALUES('peter','ROLE_TELLER')");
         template.execute(
-            "INSERT INTO acl_object_identity VALUES (1, 'net.sf.acegisecurity.acl.DomainObject:1', null, 'net.sf.acegisecurity.acl.basic.SimpleAclEntry');");
+            "INSERT INTO acl_object_identity VALUES (1, 'org.acegisecurity.acl.DomainObject:1', null, 'org.acegisecurity.acl.basic.SimpleAclEntry');");
         template.execute(
-            "INSERT INTO acl_object_identity VALUES (2, 'net.sf.acegisecurity.acl.DomainObject:2', 1, 'net.sf.acegisecurity.acl.basic.SimpleAclEntry');");
+            "INSERT INTO acl_object_identity VALUES (2, 'org.acegisecurity.acl.DomainObject:2', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');");
         template.execute(
-            "INSERT INTO acl_object_identity VALUES (3, 'net.sf.acegisecurity.acl.DomainObject:3', 1, 'net.sf.acegisecurity.acl.basic.SimpleAclEntry');");
+            "INSERT INTO acl_object_identity VALUES (3, 'org.acegisecurity.acl.DomainObject:3', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');");
         template.execute(
-            "INSERT INTO acl_object_identity VALUES (4, 'net.sf.acegisecurity.acl.DomainObject:4', 1, 'net.sf.acegisecurity.acl.basic.SimpleAclEntry');");
+            "INSERT INTO acl_object_identity VALUES (4, 'org.acegisecurity.acl.DomainObject:4', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');");
         template.execute(
-            "INSERT INTO acl_object_identity VALUES (5, 'net.sf.acegisecurity.acl.DomainObject:5', 3, 'net.sf.acegisecurity.acl.basic.SimpleAclEntry');");
+            "INSERT INTO acl_object_identity VALUES (5, 'org.acegisecurity.acl.DomainObject:5', 3, 'org.acegisecurity.acl.basic.SimpleAclEntry');");
         template.execute(
-            "INSERT INTO acl_object_identity VALUES (6, 'net.sf.acegisecurity.acl.DomainObject:6', 3, 'net.sf.acegisecurity.acl.basic.SimpleAclEntry');");
+            "INSERT INTO acl_object_identity VALUES (6, 'org.acegisecurity.acl.DomainObject:6', 3, 'org.acegisecurity.acl.basic.SimpleAclEntry');");
 
         // ----- BEGIN deviation from normal sample data load script -----
         template.execute(
-            "INSERT INTO acl_object_identity VALUES (7, 'net.sf.acegisecurity.acl.DomainObject:7', 3, 'some.invalid.acl.entry.class');");
+            "INSERT INTO acl_object_identity VALUES (7, 'org.acegisecurity.acl.DomainObject:7', 3, 'some.invalid.acl.entry.class');");
 
         // ----- FINISH deviation from normal sample data load script -----
         template.execute(
diff --git a/core/src/test/java/org/acegisecurity/SecurityConfigTests.java b/core/src/test/java/org/acegisecurity/SecurityConfigTests.java
index f95e1b4a47..6b50abc56e 100644
--- a/core/src/test/java/org/acegisecurity/SecurityConfigTests.java
+++ b/core/src/test/java/org/acegisecurity/SecurityConfigTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/TargetObject.java b/core/src/test/java/org/acegisecurity/TargetObject.java
index 5c8b8e66eb..ba2730f0b6 100644
--- a/core/src/test/java/org/acegisecurity/TargetObject.java
+++ b/core/src/test/java/org/acegisecurity/TargetObject.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
-import net.sf.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextHolder;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/acl/AclProviderManagerTests.java b/core/src/test/java/org/acegisecurity/acl/AclProviderManagerTests.java
index a8da196711..d9f411d656 100644
--- a/core/src/test/java/org/acegisecurity/acl/AclProviderManagerTests.java
+++ b/core/src/test/java/org/acegisecurity/acl/AclProviderManagerTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl;
+package org.acegisecurity.acl;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.acl.basic.NamedEntityObjectIdentity;
-import net.sf.acegisecurity.acl.basic.SimpleAclEntry;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.acl.basic.NamedEntityObjectIdentity;
+import org.acegisecurity.acl.basic.SimpleAclEntry;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/BasicAclProviderTests.java b/core/src/test/java/org/acegisecurity/acl/basic/BasicAclProviderTests.java
index b4e7b03ee9..1395492501 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/BasicAclProviderTests.java
+++ b/core/src/test/java/org/acegisecurity/acl/basic/BasicAclProviderTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic;
+package org.acegisecurity.acl.basic;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.PopulatedDatabase;
-import net.sf.acegisecurity.acl.AclEntry;
-import net.sf.acegisecurity.acl.basic.cache.BasicAclEntryHolder;
-import net.sf.acegisecurity.acl.basic.cache.NullAclEntryCache;
-import net.sf.acegisecurity.acl.basic.jdbc.JdbcDaoImpl;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.PopulatedDatabase;
+import org.acegisecurity.acl.AclEntry;
+import org.acegisecurity.acl.basic.cache.BasicAclEntryHolder;
+import org.acegisecurity.acl.basic.cache.NullAclEntryCache;
+import org.acegisecurity.acl.basic.jdbc.JdbcDaoImpl;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -38,7 +38,7 @@ import java.util.Map;
 public class BasicAclProviderTests extends TestCase {
     //~ Static fields/initializers =============================================
 
-    public static final String OBJECT_IDENTITY = "net.sf.acegisecurity.acl.DomainObject";
+    public static final String OBJECT_IDENTITY = "org.acegisecurity.acl.DomainObject";
 
     //~ Constructors ===========================================================
 
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/GrantedAuthorityEffectiveAclsResolverTests.java b/core/src/test/java/org/acegisecurity/acl/basic/GrantedAuthorityEffectiveAclsResolverTests.java
index 0477d11fae..701647d54b 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/GrantedAuthorityEffectiveAclsResolverTests.java
+++ b/core/src/test/java/org/acegisecurity/acl/basic/GrantedAuthorityEffectiveAclsResolverTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic;
+package org.acegisecurity.acl.basic;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.acl.AclEntry;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.providers.dao.User;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.acl.AclEntry;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.providers.dao.User;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/MockAclObjectIdentity.java b/core/src/test/java/org/acegisecurity/acl/basic/MockAclObjectIdentity.java
index 3e57c705a6..5e6d98b5d0 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/MockAclObjectIdentity.java
+++ b/core/src/test/java/org/acegisecurity/acl/basic/MockAclObjectIdentity.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic;
+package org.acegisecurity.acl.basic;
 
 /**
  * Implements AclObjectIdentity but is incompatible with
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/NamedEntityObjectIdentityTests.java b/core/src/test/java/org/acegisecurity/acl/basic/NamedEntityObjectIdentityTests.java
index 0d99e4c8e0..81107ff14d 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/NamedEntityObjectIdentityTests.java
+++ b/core/src/test/java/org/acegisecurity/acl/basic/NamedEntityObjectIdentityTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic;
+package org.acegisecurity.acl.basic;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/SimpleAclEntryTests.java b/core/src/test/java/org/acegisecurity/acl/basic/SimpleAclEntryTests.java
index a7e2d26565..926aa81579 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/SimpleAclEntryTests.java
+++ b/core/src/test/java/org/acegisecurity/acl/basic/SimpleAclEntryTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic;
+package org.acegisecurity.acl.basic;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/SomeDomain.java b/core/src/test/java/org/acegisecurity/acl/basic/SomeDomain.java
index 36c56f1888..4494e847ef 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/SomeDomain.java
+++ b/core/src/test/java/org/acegisecurity/acl/basic/SomeDomain.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic;
+package org.acegisecurity.acl.basic;
 
 /**
  * Simple object to use when testing NamedEntityObjectIdentity.
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/cache/BasicAclEntryHolderTests.java b/core/src/test/java/org/acegisecurity/acl/basic/cache/BasicAclEntryHolderTests.java
index e75a562a62..20f961b3e5 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/cache/BasicAclEntryHolderTests.java
+++ b/core/src/test/java/org/acegisecurity/acl/basic/cache/BasicAclEntryHolderTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic.cache;
+package org.acegisecurity.acl.basic.cache;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.acl.basic.BasicAclEntry;
-import net.sf.acegisecurity.acl.basic.SimpleAclEntry;
+import org.acegisecurity.acl.basic.BasicAclEntry;
+import org.acegisecurity.acl.basic.SimpleAclEntry;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/cache/EhCacheBasedAclEntryCacheTests.java b/core/src/test/java/org/acegisecurity/acl/basic/cache/EhCacheBasedAclEntryCacheTests.java
index 3e8cf0d809..f87e78cbdd 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/cache/EhCacheBasedAclEntryCacheTests.java
+++ b/core/src/test/java/org/acegisecurity/acl/basic/cache/EhCacheBasedAclEntryCacheTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic.cache;
+package org.acegisecurity.acl.basic.cache;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.MockApplicationContext;
-import net.sf.acegisecurity.acl.basic.AclObjectIdentity;
-import net.sf.acegisecurity.acl.basic.BasicAclEntry;
-import net.sf.acegisecurity.acl.basic.NamedEntityObjectIdentity;
-import net.sf.acegisecurity.acl.basic.SimpleAclEntry;
+import org.acegisecurity.MockApplicationContext;
+import org.acegisecurity.acl.basic.AclObjectIdentity;
+import org.acegisecurity.acl.basic.BasicAclEntry;
+import org.acegisecurity.acl.basic.NamedEntityObjectIdentity;
+import org.acegisecurity.acl.basic.SimpleAclEntry;
 
 import net.sf.ehcache.Cache;
 
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/cache/NullAclEntryCacheTests.java b/core/src/test/java/org/acegisecurity/acl/basic/cache/NullAclEntryCacheTests.java
index 8713d90e52..507f4ff4b4 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/cache/NullAclEntryCacheTests.java
+++ b/core/src/test/java/org/acegisecurity/acl/basic/cache/NullAclEntryCacheTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic.cache;
+package org.acegisecurity.acl.basic.cache;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.acl.basic.BasicAclEntry;
-import net.sf.acegisecurity.acl.basic.NamedEntityObjectIdentity;
-import net.sf.acegisecurity.acl.basic.SimpleAclEntry;
+import org.acegisecurity.acl.basic.BasicAclEntry;
+import org.acegisecurity.acl.basic.NamedEntityObjectIdentity;
+import org.acegisecurity.acl.basic.SimpleAclEntry;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/jdbc/JdbcDaoImplTests.java b/core/src/test/java/org/acegisecurity/acl/basic/jdbc/JdbcDaoImplTests.java
index d96354a6fd..c0759aee2b 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/jdbc/JdbcDaoImplTests.java
+++ b/core/src/test/java/org/acegisecurity/acl/basic/jdbc/JdbcDaoImplTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic.jdbc;
+package org.acegisecurity.acl.basic.jdbc;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.PopulatedDatabase;
-import net.sf.acegisecurity.acl.basic.AclObjectIdentity;
-import net.sf.acegisecurity.acl.basic.BasicAclEntry;
-import net.sf.acegisecurity.acl.basic.NamedEntityObjectIdentity;
+import org.acegisecurity.PopulatedDatabase;
+import org.acegisecurity.acl.basic.AclObjectIdentity;
+import org.acegisecurity.acl.basic.BasicAclEntry;
+import org.acegisecurity.acl.basic.NamedEntityObjectIdentity;
 
 import org.springframework.jdbc.object.MappingSqlQuery;
 
@@ -37,7 +37,7 @@ import java.sql.SQLException;
 public class JdbcDaoImplTests extends TestCase {
     //~ Static fields/initializers =============================================
 
-    public static final String OBJECT_IDENTITY = "net.sf.acegisecurity.acl.DomainObject";
+    public static final String OBJECT_IDENTITY = "org.acegisecurity.acl.DomainObject";
 
     //~ Constructors ===========================================================
 
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/jdbc/JdbcExtendedDaoImplTests.java b/core/src/test/java/org/acegisecurity/acl/basic/jdbc/JdbcExtendedDaoImplTests.java
index 7f1605432c..4b1c50b8cd 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/jdbc/JdbcExtendedDaoImplTests.java
+++ b/core/src/test/java/org/acegisecurity/acl/basic/jdbc/JdbcExtendedDaoImplTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.acl.basic.jdbc;
+package org.acegisecurity.acl.basic.jdbc;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.PopulatedDatabase;
-import net.sf.acegisecurity.acl.basic.AclObjectIdentity;
-import net.sf.acegisecurity.acl.basic.BasicAclEntry;
-import net.sf.acegisecurity.acl.basic.NamedEntityObjectIdentity;
-import net.sf.acegisecurity.acl.basic.SimpleAclEntry;
+import org.acegisecurity.PopulatedDatabase;
+import org.acegisecurity.acl.basic.AclObjectIdentity;
+import org.acegisecurity.acl.basic.BasicAclEntry;
+import org.acegisecurity.acl.basic.NamedEntityObjectIdentity;
+import org.acegisecurity.acl.basic.SimpleAclEntry;
 
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.DataRetrievalFailureException;
@@ -41,7 +41,7 @@ import java.sql.SQLException;
 public class JdbcExtendedDaoImplTests extends TestCase {
     //~ Static fields/initializers =============================================
 
-    public static final String OBJECT_IDENTITY = "net.sf.acegisecurity.acl.DomainObject";
+    public static final String OBJECT_IDENTITY = "org.acegisecurity.acl.DomainObject";
 
     //~ Constructors ===========================================================
 
diff --git a/core/src/test/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationTokenTests.java b/core/src/test/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationTokenTests.java
index a406cf064d..7f4da5871d 100644
--- a/core/src/test/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationTokenTests.java
+++ b/core/src/test/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationTokenTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.adapters;
+package org.acegisecurity.adapters;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/adapters/AuthByAdapterTests.java b/core/src/test/java/org/acegisecurity/adapters/AuthByAdapterTests.java
index 2d73d5fa2d..679c19f71c 100644
--- a/core/src/test/java/org/acegisecurity/adapters/AuthByAdapterTests.java
+++ b/core/src/test/java/org/acegisecurity/adapters/AuthByAdapterTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.adapters;
+package org.acegisecurity.adapters;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/adapters/HttpRequestIntegrationFilterTests.java b/core/src/test/java/org/acegisecurity/adapters/HttpRequestIntegrationFilterTests.java
index b8346882cb..ba96edb0c1 100644
--- a/core/src/test/java/org/acegisecurity/adapters/HttpRequestIntegrationFilterTests.java
+++ b/core/src/test/java/org/acegisecurity/adapters/HttpRequestIntegrationFilterTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.adapters;
+package org.acegisecurity.adapters;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.util.MockFilterChain;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.util.MockFilterChain;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/adapters/MockPrincipal.java b/core/src/test/java/org/acegisecurity/adapters/MockPrincipal.java
index 566a810a9d..65485caff6 100644
--- a/core/src/test/java/org/acegisecurity/adapters/MockPrincipal.java
+++ b/core/src/test/java/org/acegisecurity/adapters/MockPrincipal.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.adapters;
+package org.acegisecurity.adapters;
 
 import java.security.Principal;
 
diff --git a/core/src/test/java/org/acegisecurity/adapters/PrincipalAcegiUserTokenTests.java b/core/src/test/java/org/acegisecurity/adapters/PrincipalAcegiUserTokenTests.java
index c80fa5e959..352ffb18e1 100644
--- a/core/src/test/java/org/acegisecurity/adapters/PrincipalAcegiUserTokenTests.java
+++ b/core/src/test/java/org/acegisecurity/adapters/PrincipalAcegiUserTokenTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.adapters;
+package org.acegisecurity.adapters;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/afterinvocation/AfterInvocationProviderManagerTests.java b/core/src/test/java/org/acegisecurity/afterinvocation/AfterInvocationProviderManagerTests.java
index 5010bf8db3..85eec45250 100644
--- a/core/src/test/java/org/acegisecurity/afterinvocation/AfterInvocationProviderManagerTests.java
+++ b/core/src/test/java/org/acegisecurity/afterinvocation/AfterInvocationProviderManagerTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.afterinvocation;
+package org.acegisecurity.afterinvocation;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.MockMethodInvocation;
-import net.sf.acegisecurity.SecurityConfig;
-import net.sf.acegisecurity.intercept.web.FilterInvocation;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.MockMethodInvocation;
+import org.acegisecurity.SecurityConfig;
+import org.acegisecurity.intercept.web.FilterInvocation;
 
 import org.aopalliance.intercept.MethodInvocation;
 
diff --git a/core/src/test/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProviderTests.java b/core/src/test/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProviderTests.java
index 339d527af6..31523c1275 100644
--- a/core/src/test/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProviderTests.java
+++ b/core/src/test/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProviderTests.java
@@ -13,20 +13,20 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.afterinvocation;
+package org.acegisecurity.afterinvocation;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AuthorizationServiceException;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.MockAclManager;
-import net.sf.acegisecurity.MockMethodInvocation;
-import net.sf.acegisecurity.SecurityConfig;
-import net.sf.acegisecurity.acl.AclEntry;
-import net.sf.acegisecurity.acl.AclManager;
-import net.sf.acegisecurity.acl.basic.MockAclObjectIdentity;
-import net.sf.acegisecurity.acl.basic.SimpleAclEntry;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.AuthorizationServiceException;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.MockAclManager;
+import org.acegisecurity.MockMethodInvocation;
+import org.acegisecurity.SecurityConfig;
+import org.acegisecurity.acl.AclEntry;
+import org.acegisecurity.acl.AclManager;
+import org.acegisecurity.acl.basic.MockAclObjectIdentity;
+import org.acegisecurity.acl.basic.SimpleAclEntry;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationProviderTests.java b/core/src/test/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationProviderTests.java
index 724b77c341..0bacf8f955 100644
--- a/core/src/test/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationProviderTests.java
+++ b/core/src/test/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationProviderTests.java
@@ -13,20 +13,20 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.afterinvocation;
+package org.acegisecurity.afterinvocation;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.MockAclManager;
-import net.sf.acegisecurity.MockMethodInvocation;
-import net.sf.acegisecurity.SecurityConfig;
-import net.sf.acegisecurity.acl.AclEntry;
-import net.sf.acegisecurity.acl.AclManager;
-import net.sf.acegisecurity.acl.basic.MockAclObjectIdentity;
-import net.sf.acegisecurity.acl.basic.SimpleAclEntry;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.MockAclManager;
+import org.acegisecurity.MockMethodInvocation;
+import org.acegisecurity.SecurityConfig;
+import org.acegisecurity.acl.AclEntry;
+import org.acegisecurity.acl.AclManager;
+import org.acegisecurity.acl.basic.MockAclObjectIdentity;
+import org.acegisecurity.acl.basic.SimpleAclEntry;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessorTests.java b/core/src/test/java/org/acegisecurity/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessorTests.java
index c48b667691..ec5021530b 100644
--- a/core/src/test/java/org/acegisecurity/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessorTests.java
+++ b/core/src/test/java/org/acegisecurity/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessorTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
 import junit.framework.*;
 
-import net.sf.acegisecurity.captcha.AlwaysTestAfterMaxRequestsCaptchaChannelProcessor;
+import org.acegisecurity.captcha.AlwaysTestAfterMaxRequestsCaptchaChannelProcessor;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessorTests.java b/core/src/test/java/org/acegisecurity/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessorTests.java
index 7e6ef6c781..15fbaaee1b 100644
--- a/core/src/test/java/org/acegisecurity/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessorTests.java
+++ b/core/src/test/java/org/acegisecurity/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessorTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
 import junit.framework.*;
 
-import net.sf.acegisecurity.captcha.AlwaysTestAfterTimeInMillisCaptchaChannelProcessor;
+import org.acegisecurity.captcha.AlwaysTestAfterTimeInMillisCaptchaChannelProcessor;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessorTests.java b/core/src/test/java/org/acegisecurity/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessorTests.java
index 06cc40e61f..7bf6c6d54c 100644
--- a/core/src/test/java/org/acegisecurity/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessorTests.java
+++ b/core/src/test/java/org/acegisecurity/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessorTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/captcha/CaptchaChannelProcessorTemplateTests.java b/core/src/test/java/org/acegisecurity/captcha/CaptchaChannelProcessorTemplateTests.java
index 5b570accbe..8fb2088f5a 100644
--- a/core/src/test/java/org/acegisecurity/captcha/CaptchaChannelProcessorTemplateTests.java
+++ b/core/src/test/java/org/acegisecurity/captcha/CaptchaChannelProcessorTemplateTests.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.MockFilterChain;
-import net.sf.acegisecurity.SecurityConfig;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.intercept.web.FilterInvocation;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.MockFilterChain;
+import org.acegisecurity.SecurityConfig;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.intercept.web.FilterInvocation;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
@@ -31,7 +31,7 @@ import javax.servlet.ServletException;
 
 
 /**
- * Tests {@link net.sf.acegisecurity.captcha.CaptchaChannelProcessorTemplate}
+ * Tests {@link org.acegisecurity.captcha.CaptchaChannelProcessorTemplate}
  *
  * @author marc antoine Garrigue
  * @version $Id$
diff --git a/core/src/test/java/org/acegisecurity/captcha/CaptchaEntryPointTests.java b/core/src/test/java/org/acegisecurity/captcha/CaptchaEntryPointTests.java
index ceaacf2ef4..010d40dfaf 100644
--- a/core/src/test/java/org/acegisecurity/captcha/CaptchaEntryPointTests.java
+++ b/core/src/test/java/org/acegisecurity/captcha/CaptchaEntryPointTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.MockPortResolver;
-import net.sf.acegisecurity.util.PortMapperImpl;
+import org.acegisecurity.MockPortResolver;
+import org.acegisecurity.util.PortMapperImpl;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/captcha/CaptchaSecurityContextImplTests.java b/core/src/test/java/org/acegisecurity/captcha/CaptchaSecurityContextImplTests.java
index 8352f1bc7f..b0408517ec 100644
--- a/core/src/test/java/org/acegisecurity/captcha/CaptchaSecurityContextImplTests.java
+++ b/core/src/test/java/org/acegisecurity/captcha/CaptchaSecurityContextImplTests.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
-import net.sf.acegisecurity.context.SecurityContextImplTests;
+import org.acegisecurity.context.SecurityContextImplTests;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/captcha/CaptchaValidationProcessingFilterTests.java b/core/src/test/java/org/acegisecurity/captcha/CaptchaValidationProcessingFilterTests.java
index e965890c59..9f1ae58fda 100644
--- a/core/src/test/java/org/acegisecurity/captcha/CaptchaValidationProcessingFilterTests.java
+++ b/core/src/test/java/org/acegisecurity/captcha/CaptchaValidationProcessingFilterTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.util.MockFilterChain;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.util.MockFilterChain;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 
@@ -60,7 +60,7 @@ public class CaptchaValidationProcessingFilterTests extends TestCase {
 
     /*
      * Test method for
-     * 'net.sf.acegisecurity.captcha.CaptchaValidationProcessingFilter.doFilter(ServletRequest,
+     * 'org.acegisecurity.captcha.CaptchaValidationProcessingFilter.doFilter(ServletRequest,
      * ServletResponse, FilterChain)'
      */
     public void testDoFilterWithRequestParameter() throws Exception {
@@ -88,7 +88,7 @@ public class CaptchaValidationProcessingFilterTests extends TestCase {
 
     /*
      * Test method for
-     * 'net.sf.acegisecurity.captcha.CaptchaValidationProcessingFilter.doFilter(ServletRequest,
+     * 'org.acegisecurity.captcha.CaptchaValidationProcessingFilter.doFilter(ServletRequest,
      * ServletResponse, FilterChain)'
      */
     public void testDoFilterWithoutRequestParameter() throws Exception {
diff --git a/core/src/test/java/org/acegisecurity/captcha/MockCaptchaServiceProxy.java b/core/src/test/java/org/acegisecurity/captcha/MockCaptchaServiceProxy.java
index d1cf9c2a05..a0cb53c631 100644
--- a/core/src/test/java/org/acegisecurity/captcha/MockCaptchaServiceProxy.java
+++ b/core/src/test/java/org/acegisecurity/captcha/MockCaptchaServiceProxy.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
 /**
  * DOCUMENT ME!
diff --git a/core/src/test/java/org/acegisecurity/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessorTests.java b/core/src/test/java/org/acegisecurity/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessorTests.java
index 7ac277750c..f55bb02954 100644
--- a/core/src/test/java/org/acegisecurity/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessorTests.java
+++ b/core/src/test/java/org/acegisecurity/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessorTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.captcha;
+package org.acegisecurity.captcha;
 
 import junit.framework.*;
 
-import net.sf.acegisecurity.captcha.TestOnceAfterMaxRequestsCaptchaChannelProcessor;
+import org.acegisecurity.captcha.TestOnceAfterMaxRequestsCaptchaChannelProcessor;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/concurrent/ConcurrentSessionControllerImplTests.java b/core/src/test/java/org/acegisecurity/concurrent/ConcurrentSessionControllerImplTests.java
index 4ed6f2de97..58caed15c3 100644
--- a/core/src/test/java/org/acegisecurity/concurrent/ConcurrentSessionControllerImplTests.java
+++ b/core/src/test/java/org/acegisecurity/concurrent/ConcurrentSessionControllerImplTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.concurrent;
+package org.acegisecurity.concurrent;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.ui.WebAuthenticationDetails;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.ui.WebAuthenticationDetails;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpSession;
diff --git a/core/src/test/java/org/acegisecurity/concurrent/ConcurrentSessionFilterTests.java b/core/src/test/java/org/acegisecurity/concurrent/ConcurrentSessionFilterTests.java
index 79c66e0268..b2eff83b55 100644
--- a/core/src/test/java/org/acegisecurity/concurrent/ConcurrentSessionFilterTests.java
+++ b/core/src/test/java/org/acegisecurity/concurrent/ConcurrentSessionFilterTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.concurrent;
+package org.acegisecurity.concurrent;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/concurrent/SessionInformationTests.java b/core/src/test/java/org/acegisecurity/concurrent/SessionInformationTests.java
index 31791f82bd..2af9de9c38 100644
--- a/core/src/test/java/org/acegisecurity/concurrent/SessionInformationTests.java
+++ b/core/src/test/java/org/acegisecurity/concurrent/SessionInformationTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.concurrent;
+package org.acegisecurity.concurrent;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/concurrent/SessionRegistryImplTests.java b/core/src/test/java/org/acegisecurity/concurrent/SessionRegistryImplTests.java
index 545c82c338..bc6a276ad1 100644
--- a/core/src/test/java/org/acegisecurity/concurrent/SessionRegistryImplTests.java
+++ b/core/src/test/java/org/acegisecurity/concurrent/SessionRegistryImplTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.concurrent;
+package org.acegisecurity.concurrent;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.ui.session.HttpSessionDestroyedEvent;
+import org.acegisecurity.ui.session.HttpSessionDestroyedEvent;
 
 import org.springframework.mock.web.MockHttpSession;
 
diff --git a/core/src/test/java/org/acegisecurity/context/HttpSessionContextIntegrationFilterTests.java b/core/src/test/java/org/acegisecurity/context/HttpSessionContextIntegrationFilterTests.java
index 54be636684..6f81f63984 100644
--- a/core/src/test/java/org/acegisecurity/context/HttpSessionContextIntegrationFilterTests.java
+++ b/core/src/test/java/org/acegisecurity/context/HttpSessionContextIntegrationFilterTests.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sf.acegisecurity.context;
+package org.acegisecurity.context;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.MockFilterConfig;
-import net.sf.acegisecurity.adapters.PrincipalAcegiUserToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.MockFilterConfig;
+import org.acegisecurity.adapters.PrincipalAcegiUserToken;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/context/SecurityContextHolderTests.java b/core/src/test/java/org/acegisecurity/context/SecurityContextHolderTests.java
index a889819ed8..4067441942 100644
--- a/core/src/test/java/org/acegisecurity/context/SecurityContextHolderTests.java
+++ b/core/src/test/java/org/acegisecurity/context/SecurityContextHolderTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.context;
+package org.acegisecurity.context;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/context/SecurityContextImplTests.java b/core/src/test/java/org/acegisecurity/context/SecurityContextImplTests.java
index 87a819f6a3..5ce414da2a 100644
--- a/core/src/test/java/org/acegisecurity/context/SecurityContextImplTests.java
+++ b/core/src/test/java/org/acegisecurity/context/SecurityContextImplTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.context;
+package org.acegisecurity.context;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/context/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java b/core/src/test/java/org/acegisecurity/context/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java
index b0b610adb1..c3ed17a4d5 100644
--- a/core/src/test/java/org/acegisecurity/context/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java
+++ b/core/src/test/java/org/acegisecurity/context/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.context.httpinvoker;
+package org.acegisecurity.context.httpinvoker;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.context.httpinvoker.AuthenticationSimpleHttpInvokerRequestExecutor;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.httpinvoker.AuthenticationSimpleHttpInvokerRequestExecutor;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 import java.io.IOException;
 
diff --git a/core/src/test/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocationTests.java b/core/src/test/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocationTests.java
index fd9043acab..29308342c2 100644
--- a/core/src/test/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocationTests.java
+++ b/core/src/test/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocationTests.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.context.rmi;
+package org.acegisecurity.context.rmi;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.MockMethodInvocation;
-import net.sf.acegisecurity.TargetObject;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.context.SecurityContextImpl;
-import net.sf.acegisecurity.context.rmi.ContextPropagatingRemoteInvocation;
-import net.sf.acegisecurity.context.rmi.ContextPropagatingRemoteInvocationFactory;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.MockMethodInvocation;
+import org.acegisecurity.TargetObject;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.context.rmi.ContextPropagatingRemoteInvocation;
+import org.acegisecurity.context.rmi.ContextPropagatingRemoteInvocationFactory;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 import org.aopalliance.intercept.MethodInvocation;
 
@@ -70,7 +70,7 @@ public class ContextPropagatingRemoteInvocationTests extends TestCase {
 
         // The result from invoking the TargetObject should contain the
         // Authentication class delivered via the SecurityContextHolder
-        assertEquals("some_string net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken false",
+        assertEquals("some_string org.acegisecurity.providers.UsernamePasswordAuthenticationToken false",
             remoteInvocation.invoke(new TargetObject()));
     }
 
diff --git a/core/src/test/java/org/acegisecurity/event/authentication/AuthenticationEventTests.java b/core/src/test/java/org/acegisecurity/event/authentication/AuthenticationEventTests.java
index d2168e9b40..06915814eb 100644
--- a/core/src/test/java/org/acegisecurity/event/authentication/AuthenticationEventTests.java
+++ b/core/src/test/java/org/acegisecurity/event/authentication/AuthenticationEventTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authentication;
+package org.acegisecurity.event.authentication;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.DisabledException;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.DisabledException;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/event/authentication/LoggerListenerTests.java b/core/src/test/java/org/acegisecurity/event/authentication/LoggerListenerTests.java
index 009fcd420a..f5b33aad0a 100644
--- a/core/src/test/java/org/acegisecurity/event/authentication/LoggerListenerTests.java
+++ b/core/src/test/java/org/acegisecurity/event/authentication/LoggerListenerTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authentication;
+package org.acegisecurity.event.authentication;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.LockedException;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.LockedException;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/event/authorization/AuthenticationCredentialsNotFoundEventTests.java b/core/src/test/java/org/acegisecurity/event/authorization/AuthenticationCredentialsNotFoundEventTests.java
index f8658cec34..22a2a33b55 100644
--- a/core/src/test/java/org/acegisecurity/event/authorization/AuthenticationCredentialsNotFoundEventTests.java
+++ b/core/src/test/java/org/acegisecurity/event/authorization/AuthenticationCredentialsNotFoundEventTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authorization;
+package org.acegisecurity.event.authorization;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AuthenticationCredentialsNotFoundException;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.MockMethodInvocation;
+import org.acegisecurity.AuthenticationCredentialsNotFoundException;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.MockMethodInvocation;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/event/authorization/AuthorizationFailureEventTests.java b/core/src/test/java/org/acegisecurity/event/authorization/AuthorizationFailureEventTests.java
index ab33085a42..c2c82192be 100644
--- a/core/src/test/java/org/acegisecurity/event/authorization/AuthorizationFailureEventTests.java
+++ b/core/src/test/java/org/acegisecurity/event/authorization/AuthorizationFailureEventTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authorization;
+package org.acegisecurity.event.authorization;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.MockMethodInvocation;
-import net.sf.acegisecurity.event.authorization.AuthorizationFailureEvent;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.MockMethodInvocation;
+import org.acegisecurity.event.authorization.AuthorizationFailureEvent;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/event/authorization/AuthorizedEventTests.java b/core/src/test/java/org/acegisecurity/event/authorization/AuthorizedEventTests.java
index 55d00444de..296e14323d 100644
--- a/core/src/test/java/org/acegisecurity/event/authorization/AuthorizedEventTests.java
+++ b/core/src/test/java/org/acegisecurity/event/authorization/AuthorizedEventTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.event.authorization;
+package org.acegisecurity.event.authorization;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.MockMethodInvocation;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.MockMethodInvocation;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/intercept/AbstractSecurityInterceptorTests.java b/core/src/test/java/org/acegisecurity/intercept/AbstractSecurityInterceptorTests.java
index 2ca2a40dbf..c0eeca6355 100644
--- a/core/src/test/java/org/acegisecurity/intercept/AbstractSecurityInterceptorTests.java
+++ b/core/src/test/java/org/acegisecurity/intercept/AbstractSecurityInterceptorTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept;
+package org.acegisecurity.intercept;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.MockAccessDecisionManager;
-import net.sf.acegisecurity.MockAfterInvocationManager;
-import net.sf.acegisecurity.MockAuthenticationManager;
-import net.sf.acegisecurity.MockMethodInvocation;
-import net.sf.acegisecurity.MockRunAsManager;
-import net.sf.acegisecurity.intercept.method.MockMethodDefinitionSource;
+import org.acegisecurity.MockAccessDecisionManager;
+import org.acegisecurity.MockAfterInvocationManager;
+import org.acegisecurity.MockAuthenticationManager;
+import org.acegisecurity.MockMethodInvocation;
+import org.acegisecurity.MockRunAsManager;
+import org.acegisecurity.intercept.method.MockMethodDefinitionSource;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/intercept/InterceptorStatusTokenTests.java b/core/src/test/java/org/acegisecurity/intercept/InterceptorStatusTokenTests.java
index 720b73ab4e..2058aae2f5 100644
--- a/core/src/test/java/org/acegisecurity/intercept/InterceptorStatusTokenTests.java
+++ b/core/src/test/java/org/acegisecurity/intercept/InterceptorStatusTokenTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept;
+package org.acegisecurity.intercept;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.MockMethodInvocation;
-import net.sf.acegisecurity.SecurityConfig;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.MockMethodInvocation;
+import org.acegisecurity.SecurityConfig;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 import org.aopalliance.intercept.MethodInvocation;
 
diff --git a/core/src/test/java/org/acegisecurity/intercept/method/AbstractMethodDefinitionSourceTests.java b/core/src/test/java/org/acegisecurity/intercept/method/AbstractMethodDefinitionSourceTests.java
index ad2f387217..28849bfaf5 100644
--- a/core/src/test/java/org/acegisecurity/intercept/method/AbstractMethodDefinitionSourceTests.java
+++ b/core/src/test/java/org/acegisecurity/intercept/method/AbstractMethodDefinitionSourceTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.method;
+package org.acegisecurity.intercept.method;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.MockMethodInvocation;
+import org.acegisecurity.MockMethodInvocation;
 
 import org.aopalliance.intercept.MethodInvocation;
 
diff --git a/core/src/test/java/org/acegisecurity/intercept/method/MethodDefinitionAttributesTests.java b/core/src/test/java/org/acegisecurity/intercept/method/MethodDefinitionAttributesTests.java
index a57ad7456e..9d98781142 100644
--- a/core/src/test/java/org/acegisecurity/intercept/method/MethodDefinitionAttributesTests.java
+++ b/core/src/test/java/org/acegisecurity/intercept/method/MethodDefinitionAttributesTests.java
@@ -13,22 +13,22 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.method;
+package org.acegisecurity.intercept.method;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.ITargetObject;
-import net.sf.acegisecurity.MockMethodInvocation;
-import net.sf.acegisecurity.OtherTargetObject;
-import net.sf.acegisecurity.SecurityConfig;
-import net.sf.acegisecurity.TargetObject;
-import net.sf.acegisecurity.acl.basic.SomeDomain;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.ITargetObject;
+import org.acegisecurity.MockMethodInvocation;
+import org.acegisecurity.OtherTargetObject;
+import org.acegisecurity.SecurityConfig;
+import org.acegisecurity.TargetObject;
+import org.acegisecurity.acl.basic.SomeDomain;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -172,7 +172,7 @@ public class MethodDefinitionAttributesTests extends TestCase {
 
         ITargetObject target = makeInterceptedTarget();
         String result = target.makeUpperCase("hello");
-        assertEquals("HELLO net.sf.acegisecurity.MockRunAsAuthenticationToken true",
+        assertEquals("HELLO org.acegisecurity.MockRunAsAuthenticationToken true",
             result);
 
         SecurityContextHolder.getContext().setAuthentication(null);
@@ -188,7 +188,7 @@ public class MethodDefinitionAttributesTests extends TestCase {
         ITargetObject target = makeInterceptedTarget();
         String result = target.makeLowerCase("HELLO");
 
-        assertEquals("hello net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken true",
+        assertEquals("hello org.acegisecurity.providers.UsernamePasswordAuthenticationToken true",
             result);
 
         SecurityContextHolder.getContext().setAuthentication(null);
@@ -220,7 +220,7 @@ public class MethodDefinitionAttributesTests extends TestCase {
 
     private ITargetObject makeInterceptedTarget() {
         ApplicationContext context = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/intercept/method/applicationContext.xml");
+                "org/acegisecurity/intercept/method/applicationContext.xml");
 
         return (ITargetObject) context.getBean("target");
     }
diff --git a/core/src/test/java/org/acegisecurity/intercept/method/MethodDefinitionSourceEditorTests.java b/core/src/test/java/org/acegisecurity/intercept/method/MethodDefinitionSourceEditorTests.java
index 8607577b00..6bc0609b3c 100644
--- a/core/src/test/java/org/acegisecurity/intercept/method/MethodDefinitionSourceEditorTests.java
+++ b/core/src/test/java/org/acegisecurity/intercept/method/MethodDefinitionSourceEditorTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.method;
+package org.acegisecurity.intercept.method;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.MockJoinPoint;
-import net.sf.acegisecurity.SecurityConfig;
-import net.sf.acegisecurity.TargetObject;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.MockJoinPoint;
+import org.acegisecurity.SecurityConfig;
+import org.acegisecurity.TargetObject;
 
 import org.aopalliance.intercept.MethodInvocation;
 
@@ -61,7 +61,7 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
     public void testAspectJJointPointLookup() throws Exception {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
         editor.setAsText(
-            "net.sf.acegisecurity.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY");
+            "org.acegisecurity.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
 
@@ -84,7 +84,7 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
 
         try {
-            editor.setAsText("net.sf.acegisecurity.DOES_NOT_EXIST_NAME=FOO,BAR");
+            editor.setAsText("org.acegisecurity.DOES_NOT_EXIST_NAME=FOO,BAR");
             fail("Should have given IllegalArgumentException");
         } catch (IllegalArgumentException expected) {
             assertTrue(true);
@@ -107,7 +107,7 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
 
         try {
             editor.setAsText(
-                "net.sf.acegisecurity.TargetObject.INVALID_METHOD=FOO,BAR");
+                "org.acegisecurity.TargetObject.INVALID_METHOD=FOO,BAR");
             fail("Should have given IllegalArgumentException");
         } catch (IllegalArgumentException expected) {
             assertTrue(true);
@@ -118,7 +118,7 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
         throws Exception {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
         editor.setAsText(
-            "net.sf.acegisecurity.ITargetObject.makeLower*=ROLE_FROM_INTERFACE\r\nnet.sf.acegisecurity.ITargetObject.makeUpper*=ROLE_FROM_INTERFACE\r\nnet.sf.acegisecurity.TargetObject.makeUpper*=ROLE_FROM_IMPLEMENTATION");
+            "org.acegisecurity.ITargetObject.makeLower*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.ITargetObject.makeUpper*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.TargetObject.makeUpper*=ROLE_FROM_IMPLEMENTATION");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
         assertEquals(3, map.getMethodMapSize());
@@ -153,7 +153,7 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
     public void testIterator() {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
         editor.setAsText(
-            "net.sf.acegisecurity.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY\r\nnet.sf.acegisecurity.TargetObject.make*=ROLE_NINE,ROLE_SUPERVISOR");
+            "org.acegisecurity.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY\r\norg.acegisecurity.TargetObject.make*=ROLE_NINE,ROLE_SUPERVISOR");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
         Iterator iter = map.getConfigAttributeDefinitions();
@@ -170,7 +170,7 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
     public void testMultiMethodParsing() {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
         editor.setAsText(
-            "net.sf.acegisecurity.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY\r\nnet.sf.acegisecurity.TargetObject.make*=ROLE_NINE,ROLE_SUPERVISOR");
+            "org.acegisecurity.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY\r\norg.acegisecurity.TargetObject.make*=ROLE_NINE,ROLE_SUPERVISOR");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
         assertEquals(3, map.getMethodMapSize());
@@ -180,7 +180,7 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
         throws Exception {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
         editor.setAsText(
-            "net.sf.acegisecurity.TargetObject.*=ROLE_GENERAL\r\nnet.sf.acegisecurity.TargetObject.makeLower*=ROLE_LOWER\r\nnet.sf.acegisecurity.TargetObject.make*=ROLE_MAKE\r\nnet.sf.acegisecurity.TargetObject.makeUpper*=ROLE_UPPER");
+            "org.acegisecurity.TargetObject.*=ROLE_GENERAL\r\norg.acegisecurity.TargetObject.makeLower*=ROLE_LOWER\r\norg.acegisecurity.TargetObject.make*=ROLE_MAKE\r\norg.acegisecurity.TargetObject.makeUpper*=ROLE_UPPER");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
         assertEquals(5, map.getMethodMapSize());
@@ -212,7 +212,7 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
         throws Exception {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
         editor.setAsText(
-            "net.sf.acegisecurity.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY");
+            "org.acegisecurity.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
 
@@ -233,7 +233,7 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
     public void testSingleMethodParsing() throws Exception {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
         editor.setAsText(
-            "net.sf.acegisecurity.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY");
+            "org.acegisecurity.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
 
diff --git a/core/src/test/java/org/acegisecurity/intercept/method/MockAttributes.java b/core/src/test/java/org/acegisecurity/intercept/method/MockAttributes.java
index e3b3664bca..8fb99e82bd 100644
--- a/core/src/test/java/org/acegisecurity/intercept/method/MockAttributes.java
+++ b/core/src/test/java/org/acegisecurity/intercept/method/MockAttributes.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.method;
+package org.acegisecurity.intercept.method;
 
-import net.sf.acegisecurity.ITargetObject;
-import net.sf.acegisecurity.OtherTargetObject;
-import net.sf.acegisecurity.SecurityConfig;
-import net.sf.acegisecurity.TargetObject;
+import org.acegisecurity.ITargetObject;
+import org.acegisecurity.OtherTargetObject;
+import org.acegisecurity.SecurityConfig;
+import org.acegisecurity.TargetObject;
 
 import org.springframework.metadata.Attributes;
 
diff --git a/core/src/test/java/org/acegisecurity/intercept/method/MockMethodDefinitionSource.java b/core/src/test/java/org/acegisecurity/intercept/method/MockMethodDefinitionSource.java
index 94f824ccdc..4d4bda92d1 100644
--- a/core/src/test/java/org/acegisecurity/intercept/method/MockMethodDefinitionSource.java
+++ b/core/src/test/java/org/acegisecurity/intercept/method/MockMethodDefinitionSource.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.method;
+package org.acegisecurity.intercept.method;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.SecurityConfig;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.SecurityConfig;
 
 import java.lang.reflect.Method;
 
diff --git a/core/src/test/java/org/acegisecurity/intercept/method/aopalliance/MethodDefinitionSourceAdvisorTests.java b/core/src/test/java/org/acegisecurity/intercept/method/aopalliance/MethodDefinitionSourceAdvisorTests.java
index b433d3ef0f..64119c89ae 100644
--- a/core/src/test/java/org/acegisecurity/intercept/method/aopalliance/MethodDefinitionSourceAdvisorTests.java
+++ b/core/src/test/java/org/acegisecurity/intercept/method/aopalliance/MethodDefinitionSourceAdvisorTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.method.aopalliance;
+package org.acegisecurity.intercept.method.aopalliance;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.TargetObject;
-import net.sf.acegisecurity.intercept.method.MethodDefinitionMap;
-import net.sf.acegisecurity.intercept.method.MethodDefinitionSourceEditor;
+import org.acegisecurity.TargetObject;
+import org.acegisecurity.intercept.method.MethodDefinitionMap;
+import org.acegisecurity.intercept.method.MethodDefinitionSourceEditor;
 
 import org.springframework.aop.framework.AopConfigException;
 
@@ -131,7 +131,7 @@ public class MethodDefinitionSourceAdvisorTests extends TestCase {
     private MethodSecurityInterceptor getInterceptor() {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
         editor.setAsText(
-            "net.sf.acegisecurity.TargetObject.countLength=ROLE_NOT_USED");
+            "org.acegisecurity.TargetObject.countLength=ROLE_NOT_USED");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
 
diff --git a/core/src/test/java/org/acegisecurity/intercept/method/aopalliance/MethodSecurityInterceptorTests.java b/core/src/test/java/org/acegisecurity/intercept/method/aopalliance/MethodSecurityInterceptorTests.java
index 0fdf4f313b..504c8178ac 100644
--- a/core/src/test/java/org/acegisecurity/intercept/method/aopalliance/MethodSecurityInterceptorTests.java
+++ b/core/src/test/java/org/acegisecurity/intercept/method/aopalliance/MethodSecurityInterceptorTests.java
@@ -13,31 +13,31 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.method.aopalliance;
+package org.acegisecurity.intercept.method.aopalliance;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AccessDecisionManager;
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.AfterInvocationManager;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationCredentialsNotFoundException;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.ITargetObject;
-import net.sf.acegisecurity.MockAccessDecisionManager;
-import net.sf.acegisecurity.MockAfterInvocationManager;
-import net.sf.acegisecurity.MockAuthenticationManager;
-import net.sf.acegisecurity.MockRunAsManager;
-import net.sf.acegisecurity.RunAsManager;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.intercept.method.AbstractMethodDefinitionSource;
-import net.sf.acegisecurity.intercept.method.MockMethodDefinitionSource;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.runas.RunAsManagerImpl;
+import org.acegisecurity.AccessDecisionManager;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.AfterInvocationManager;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationCredentialsNotFoundException;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.ITargetObject;
+import org.acegisecurity.MockAccessDecisionManager;
+import org.acegisecurity.MockAfterInvocationManager;
+import org.acegisecurity.MockAuthenticationManager;
+import org.acegisecurity.MockRunAsManager;
+import org.acegisecurity.RunAsManager;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.intercept.method.AbstractMethodDefinitionSource;
+import org.acegisecurity.intercept.method.MockMethodDefinitionSource;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.runas.RunAsManagerImpl;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -92,7 +92,7 @@ public class MethodSecurityInterceptorTests extends TestCase {
         // The associated MockAuthenticationManager WILL accept the above UsernamePasswordAuthenticationToken
         ITargetObject target = makeInterceptedTarget();
         String result = target.publicMakeLowerCase("HELLO");
-        assertEquals("hello net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken false",
+        assertEquals("hello org.acegisecurity.providers.UsernamePasswordAuthenticationToken false",
             result);
     }
 
@@ -142,7 +142,7 @@ public class MethodSecurityInterceptorTests extends TestCase {
 
         ITargetObject target = makeInterceptedTarget();
         String result = target.makeUpperCase("hello");
-        assertEquals("HELLO net.sf.acegisecurity.MockRunAsAuthenticationToken true",
+        assertEquals("HELLO org.acegisecurity.MockRunAsAuthenticationToken true",
             result);
     }
 
@@ -158,7 +158,7 @@ public class MethodSecurityInterceptorTests extends TestCase {
         String result = target.makeLowerCase("HELLO");
 
         // Note we check the isAuthenticated remained true in following line
-        assertEquals("hello net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken true",
+        assertEquals("hello org.acegisecurity.providers.UsernamePasswordAuthenticationToken true",
             result);
     }
 
@@ -388,14 +388,14 @@ public class MethodSecurityInterceptorTests extends TestCase {
 
     private ITargetObject makeInterceptedTarget() {
         ApplicationContext context = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/intercept/method/aopalliance/applicationContext.xml");
+                "org/acegisecurity/intercept/method/aopalliance/applicationContext.xml");
 
         return (ITargetObject) context.getBean("target");
     }
 
     private ITargetObject makeInterceptedTargetRejectsAuthentication() {
         ApplicationContext context = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/intercept/method/aopalliance/applicationContext.xml");
+                "org/acegisecurity/intercept/method/aopalliance/applicationContext.xml");
 
         MockAuthenticationManager authenticationManager = new MockAuthenticationManager(false);
         MethodSecurityInterceptor si = (MethodSecurityInterceptor) context
@@ -407,7 +407,7 @@ public class MethodSecurityInterceptorTests extends TestCase {
 
     private ITargetObject makeInterceptedTargetWithoutAnAfterInvocationManager() {
         ApplicationContext context = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/intercept/method/aopalliance/applicationContext.xml");
+                "org/acegisecurity/intercept/method/aopalliance/applicationContext.xml");
 
         MethodSecurityInterceptor si = (MethodSecurityInterceptor) context
             .getBean("securityInterceptor");
diff --git a/core/src/test/java/org/acegisecurity/intercept/method/aspectj/AspectJSecurityInterceptorTests.java b/core/src/test/java/org/acegisecurity/intercept/method/aspectj/AspectJSecurityInterceptorTests.java
index 0f334e76bf..543a9caa95 100644
--- a/core/src/test/java/org/acegisecurity/intercept/method/aspectj/AspectJSecurityInterceptorTests.java
+++ b/core/src/test/java/org/acegisecurity/intercept/method/aspectj/AspectJSecurityInterceptorTests.java
@@ -13,23 +13,23 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.method.aspectj;
+package org.acegisecurity.intercept.method.aspectj;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.MockAccessDecisionManager;
-import net.sf.acegisecurity.MockApplicationContext;
-import net.sf.acegisecurity.MockAuthenticationManager;
-import net.sf.acegisecurity.MockJoinPoint;
-import net.sf.acegisecurity.MockRunAsManager;
-import net.sf.acegisecurity.TargetObject;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.intercept.method.MethodDefinitionMap;
-import net.sf.acegisecurity.intercept.method.MethodDefinitionSourceEditor;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.MockAccessDecisionManager;
+import org.acegisecurity.MockApplicationContext;
+import org.acegisecurity.MockAuthenticationManager;
+import org.acegisecurity.MockJoinPoint;
+import org.acegisecurity.MockRunAsManager;
+import org.acegisecurity.TargetObject;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.intercept.method.MethodDefinitionMap;
+import org.acegisecurity.intercept.method.MethodDefinitionSourceEditor;
+import org.acegisecurity.providers.TestingAuthenticationToken;
 
 import java.lang.reflect.Method;
 
@@ -71,7 +71,7 @@ public class AspectJSecurityInterceptorTests extends TestCase {
 
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
         editor.setAsText(
-            "net.sf.acegisecurity.TargetObject.countLength=MOCK_ONE,MOCK_TWO");
+            "org.acegisecurity.TargetObject.countLength=MOCK_ONE,MOCK_TWO");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
         si.setObjectDefinitionSource(map);
@@ -107,7 +107,7 @@ public class AspectJSecurityInterceptorTests extends TestCase {
 
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
         editor.setAsText(
-            "net.sf.acegisecurity.TargetObject.countLength=MOCK_ONE,MOCK_TWO");
+            "org.acegisecurity.TargetObject.countLength=MOCK_ONE,MOCK_TWO");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
         si.setObjectDefinitionSource(map);
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/AbstractFilterInvocationDefinitionSourceTests.java b/core/src/test/java/org/acegisecurity/intercept/web/AbstractFilterInvocationDefinitionSourceTests.java
index ae3a146831..3d83117264 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/AbstractFilterInvocationDefinitionSourceTests.java
+++ b/core/src/test/java/org/acegisecurity/intercept/web/AbstractFilterInvocationDefinitionSourceTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSourceEditorTests.java b/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSourceEditorTests.java
index 7d5abae6ca..de0ab2d2dc 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSourceEditorTests.java
+++ b/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSourceEditorTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.MockFilterChain;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.MockFilterChain;
 
 
-import net.sf.acegisecurity.SecurityConfig;
+import org.acegisecurity.SecurityConfig;
 
 import java.util.Iterator;
 
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSourceEditorWithPathsTests.java b/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSourceEditorWithPathsTests.java
index 6e1ce0dfbc..939e8bdf21 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSourceEditorWithPathsTests.java
+++ b/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSourceEditorWithPathsTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.MockFilterChain;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.MockFilterChain;
 
 
-import net.sf.acegisecurity.SecurityConfig;
+import org.acegisecurity.SecurityConfig;
 
 import java.util.Iterator;
 
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationTests.java b/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationTests.java
index 6c5a027e39..19cb03ab28 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationTests.java
+++ b/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.MockFilterChain;
+import org.acegisecurity.MockFilterChain;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/FilterSecurityInterceptorTests.java b/core/src/test/java/org/acegisecurity/intercept/web/FilterSecurityInterceptorTests.java
index d6b6095093..69f3b6421f 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/FilterSecurityInterceptorTests.java
+++ b/core/src/test/java/org/acegisecurity/intercept/web/FilterSecurityInterceptorTests.java
@@ -13,26 +13,26 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AccessDecisionManager;
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.MockAccessDecisionManager;
-import net.sf.acegisecurity.MockApplicationContext;
-import net.sf.acegisecurity.MockAuthenticationManager;
-import net.sf.acegisecurity.MockRunAsManager;
-import net.sf.acegisecurity.RunAsManager;
-import net.sf.acegisecurity.SecurityConfig;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.context.SecurityContextImpl;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.AccessDecisionManager;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.MockAccessDecisionManager;
+import org.acegisecurity.MockApplicationContext;
+import org.acegisecurity.MockAuthenticationManager;
+import org.acegisecurity.MockRunAsManager;
+import org.acegisecurity.RunAsManager;
+import org.acegisecurity.SecurityConfig;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
@@ -102,7 +102,7 @@ public class FilterSecurityInterceptorTests extends TestCase {
             interceptor.afterPropertiesSet();
             fail("Should have thrown IllegalArgumentException");
         } catch (IllegalArgumentException expected) {
-            assertEquals("AccessDecisionManager does not support secure object class: class net.sf.acegisecurity.intercept.web.FilterInvocation",
+            assertEquals("AccessDecisionManager does not support secure object class: class org.acegisecurity.intercept.web.FilterInvocation",
                 expected.getMessage());
         }
     }
@@ -135,7 +135,7 @@ public class FilterSecurityInterceptorTests extends TestCase {
             interceptor.afterPropertiesSet();
             fail("Should have thrown IllegalArgumentException");
         } catch (IllegalArgumentException expected) {
-            assertEquals("RunAsManager does not support secure object class: class net.sf.acegisecurity.intercept.web.FilterInvocation",
+            assertEquals("RunAsManager does not support secure object class: class org.acegisecurity.intercept.web.FilterInvocation",
                 expected.getMessage());
         }
     }
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/MockFilterInvocationDefinitionSource.java b/core/src/test/java/org/acegisecurity/intercept/web/MockFilterInvocationDefinitionSource.java
index 414661170b..efc08d1e8f 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/MockFilterInvocationDefinitionSource.java
+++ b/core/src/test/java/org/acegisecurity/intercept/web/MockFilterInvocationDefinitionSource.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.SecurityConfig;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.SecurityConfig;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/PathBasedFilterDefinitionMapTests.java b/core/src/test/java/org/acegisecurity/intercept/web/PathBasedFilterDefinitionMapTests.java
index e06b40535a..a2e2c73aa4 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/PathBasedFilterDefinitionMapTests.java
+++ b/core/src/test/java/org/acegisecurity/intercept/web/PathBasedFilterDefinitionMapTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.MockFilterChain;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.MockFilterChain;
 
 
-import net.sf.acegisecurity.SecurityConfig;
+import org.acegisecurity.SecurityConfig;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/RegExpBasedFilterDefinitionMapTests.java b/core/src/test/java/org/acegisecurity/intercept/web/RegExpBasedFilterDefinitionMapTests.java
index 3cb083c7aa..9790587c69 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/RegExpBasedFilterDefinitionMapTests.java
+++ b/core/src/test/java/org/acegisecurity/intercept/web/RegExpBasedFilterDefinitionMapTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.MockFilterChain;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.MockFilterChain;
 
 
-import net.sf.acegisecurity.SecurityConfig;
+import org.acegisecurity.SecurityConfig;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/SecurityEnforcementFilterTests.java b/core/src/test/java/org/acegisecurity/intercept/web/SecurityEnforcementFilterTests.java
index 91eb086a88..5112bb155a 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/SecurityEnforcementFilterTests.java
+++ b/core/src/test/java/org/acegisecurity/intercept/web/SecurityEnforcementFilterTests.java
@@ -13,20 +13,20 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.MockAuthenticationEntryPoint;
-import net.sf.acegisecurity.MockPortResolver;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.context.SecurityContextImpl;
-import net.sf.acegisecurity.providers.anonymous.AnonymousAuthenticationToken;
-import net.sf.acegisecurity.ui.webapp.AuthenticationProcessingFilter;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.MockAuthenticationEntryPoint;
+import org.acegisecurity.MockPortResolver;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken;
+import org.acegisecurity.ui.webapp.AuthenticationProcessingFilter;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/providers/AbstractAuthenticationTokenTests.java b/core/src/test/java/org/acegisecurity/providers/AbstractAuthenticationTokenTests.java
index 171dd9f460..44f94770dd 100644
--- a/core/src/test/java/org/acegisecurity/providers/AbstractAuthenticationTokenTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/AbstractAuthenticationTokenTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers;
+package org.acegisecurity.providers;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/ProviderManagerTests.java b/core/src/test/java/org/acegisecurity/providers/ProviderManagerTests.java
index 41171637e6..d1356cd264 100644
--- a/core/src/test/java/org/acegisecurity/providers/ProviderManagerTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/ProviderManagerTests.java
@@ -13,19 +13,19 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers;
+package org.acegisecurity.providers;
 
 import java.util.List;
 import java.util.Vector;
 
 import junit.framework.TestCase;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.AuthenticationServiceException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.concurrent.ConcurrentSessionControllerImpl;
-import net.sf.acegisecurity.concurrent.NullConcurrentSessionController;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationServiceException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.concurrent.ConcurrentSessionControllerImpl;
+import org.acegisecurity.concurrent.NullConcurrentSessionController;
 
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
diff --git a/core/src/test/java/org/acegisecurity/providers/TestingAuthenticationProviderTests.java b/core/src/test/java/org/acegisecurity/providers/TestingAuthenticationProviderTests.java
index 4179c463d0..b903a5eef4 100644
--- a/core/src/test/java/org/acegisecurity/providers/TestingAuthenticationProviderTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/TestingAuthenticationProviderTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers;
+package org.acegisecurity.providers;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/TestingAuthenticationTokenTests.java b/core/src/test/java/org/acegisecurity/providers/TestingAuthenticationTokenTests.java
index edd6de76be..5f4d6117ea 100644
--- a/core/src/test/java/org/acegisecurity/providers/TestingAuthenticationTokenTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/TestingAuthenticationTokenTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers;
+package org.acegisecurity.providers;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/UsernamePasswordAuthenticationTokenTests.java b/core/src/test/java/org/acegisecurity/providers/UsernamePasswordAuthenticationTokenTests.java
index 5f15296de0..dc39f20635 100644
--- a/core/src/test/java/org/acegisecurity/providers/UsernamePasswordAuthenticationTokenTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/UsernamePasswordAuthenticationTokenTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers;
+package org.acegisecurity.providers;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationProviderTests.java b/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationProviderTests.java
index 4dd3efab71..22e8257f48 100644
--- a/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationProviderTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationProviderTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.anonymous;
+package org.acegisecurity.providers.anonymous;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.providers.TestingAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationTokenTests.java b/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationTokenTests.java
index d76f91290c..9c1f45f494 100644
--- a/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationTokenTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationTokenTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.anonymous;
+package org.acegisecurity.providers.anonymous;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilterTests.java b/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilterTests.java
index 39986a047b..1e8c3f811f 100644
--- a/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilterTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilterTests.java
@@ -12,18 +12,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sf.acegisecurity.providers.anonymous;
+package org.acegisecurity.providers.anonymous;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.MockFilterConfig;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.context.SecurityContextImpl;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
-import net.sf.acegisecurity.providers.dao.memory.UserAttribute;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.MockFilterConfig;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.providers.dao.memory.UserAttribute;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/CasAuthenticationProviderTests.java b/core/src/test/java/org/acegisecurity/providers/cas/CasAuthenticationProviderTests.java
index c92158edf4..85ce5cdb60 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/CasAuthenticationProviderTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/cas/CasAuthenticationProviderTests.java
@@ -13,21 +13,21 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas;
+package org.acegisecurity.providers.cas;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.providers.cas.ticketvalidator.AbstractTicketValidator;
-import net.sf.acegisecurity.providers.dao.User;
-import net.sf.acegisecurity.ui.cas.CasProcessingFilter;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.providers.cas.ticketvalidator.AbstractTicketValidator;
+import org.acegisecurity.providers.dao.User;
+import org.acegisecurity.ui.cas.CasProcessingFilter;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/CasAuthenticationTokenTests.java b/core/src/test/java/org/acegisecurity/providers/cas/CasAuthenticationTokenTests.java
index 9cb9d231ca..520a46f530 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/CasAuthenticationTokenTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/cas/CasAuthenticationTokenTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas;
+package org.acegisecurity.providers.cas;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.providers.dao.User;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.providers.dao.User;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/TicketResponseTests.java b/core/src/test/java/org/acegisecurity/providers/cas/TicketResponseTests.java
index ed2d121900..f7a9a49a43 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/TicketResponseTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/cas/TicketResponseTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas;
+package org.acegisecurity.providers.cas;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/cache/EhCacheBasedTicketCacheTests.java b/core/src/test/java/org/acegisecurity/providers/cas/cache/EhCacheBasedTicketCacheTests.java
index d077a5d51a..5bfc84712a 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/cache/EhCacheBasedTicketCacheTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/cas/cache/EhCacheBasedTicketCacheTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas.cache;
+package org.acegisecurity.providers.cas.cache;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.MockApplicationContext;
-import net.sf.acegisecurity.providers.cas.CasAuthenticationToken;
-import net.sf.acegisecurity.providers.dao.User;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.MockApplicationContext;
+import org.acegisecurity.providers.cas.CasAuthenticationToken;
+import org.acegisecurity.providers.dao.User;
 
 import net.sf.ehcache.Cache;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulatorTests.java b/core/src/test/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulatorTests.java
index 250b5dfc45..0b0c88577a 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulatorTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulatorTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas.populator;
+package org.acegisecurity.providers.cas.populator;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.dao.AuthenticationDao;
-import net.sf.acegisecurity.providers.dao.User;
-import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.dao.AuthenticationDao;
+import org.acegisecurity.providers.dao.User;
+import org.acegisecurity.providers.dao.UsernameNotFoundException;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataRetrievalFailureException;
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/proxy/AcceptAnyCasProxyTests.java b/core/src/test/java/org/acegisecurity/providers/cas/proxy/AcceptAnyCasProxyTests.java
index 57667badc7..80d76b0a7f 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/proxy/AcceptAnyCasProxyTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/cas/proxy/AcceptAnyCasProxyTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas.proxy;
+package org.acegisecurity.providers.cas.proxy;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/proxy/NamedCasProxyDeciderTests.java b/core/src/test/java/org/acegisecurity/providers/cas/proxy/NamedCasProxyDeciderTests.java
index f4074f3e2d..5680933a8b 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/proxy/NamedCasProxyDeciderTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/cas/proxy/NamedCasProxyDeciderTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas.proxy;
+package org.acegisecurity.providers.cas.proxy;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.providers.cas.ProxyUntrustedException;
+import org.acegisecurity.providers.cas.ProxyUntrustedException;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/proxy/RejectProxyTicketsTests.java b/core/src/test/java/org/acegisecurity/providers/cas/proxy/RejectProxyTicketsTests.java
index 0fed184111..e971943ae0 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/proxy/RejectProxyTicketsTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/cas/proxy/RejectProxyTicketsTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas.proxy;
+package org.acegisecurity.providers.cas.proxy;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.providers.cas.ProxyUntrustedException;
+import org.acegisecurity.providers.cas.ProxyUntrustedException;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/ticketvalidator/AbstractTicketValidatorTests.java b/core/src/test/java/org/acegisecurity/providers/cas/ticketvalidator/AbstractTicketValidatorTests.java
index d24e2ffecc..4a1cb1125c 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/ticketvalidator/AbstractTicketValidatorTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/cas/ticketvalidator/AbstractTicketValidatorTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas.ticketvalidator;
+package org.acegisecurity.providers.cas.ticketvalidator;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.providers.cas.TicketResponse;
-import net.sf.acegisecurity.ui.cas.ServiceProperties;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.providers.cas.TicketResponse;
+import org.acegisecurity.ui.cas.ServiceProperties;
 
 import java.util.Vector;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/ticketvalidator/CasProxyTicketValidatorTests.java b/core/src/test/java/org/acegisecurity/providers/cas/ticketvalidator/CasProxyTicketValidatorTests.java
index 92170205a7..3b685d860e 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/ticketvalidator/CasProxyTicketValidatorTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/cas/ticketvalidator/CasProxyTicketValidatorTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.cas.ticketvalidator;
+package org.acegisecurity.providers.cas.ticketvalidator;
 
 import edu.yale.its.tp.cas.client.ProxyTicketValidator;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AuthenticationServiceException;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.providers.cas.TicketResponse;
-import net.sf.acegisecurity.ui.cas.ServiceProperties;
+import org.acegisecurity.AuthenticationServiceException;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.providers.cas.TicketResponse;
+import org.acegisecurity.ui.cas.ServiceProperties;
 
 import java.util.Vector;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/DaoAuthenticationProviderTests.java b/core/src/test/java/org/acegisecurity/providers/dao/DaoAuthenticationProviderTests.java
index 6c2f6e9161..d634b16dde 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/DaoAuthenticationProviderTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/dao/DaoAuthenticationProviderTests.java
@@ -13,26 +13,26 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao;
+package org.acegisecurity.providers.dao;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AccountExpiredException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationServiceException;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.CredentialsExpiredException;
-import net.sf.acegisecurity.DisabledException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.LockedException;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.providers.dao.cache.EhCacheBasedUserCache;
-import net.sf.acegisecurity.providers.dao.cache.NullUserCache;
-import net.sf.acegisecurity.providers.dao.salt.SystemWideSaltSource;
-import net.sf.acegisecurity.providers.encoding.ShaPasswordEncoder;
+import org.acegisecurity.AccountExpiredException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationServiceException;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.CredentialsExpiredException;
+import org.acegisecurity.DisabledException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.LockedException;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.providers.dao.cache.EhCacheBasedUserCache;
+import org.acegisecurity.providers.dao.cache.NullUserCache;
+import org.acegisecurity.providers.dao.salt.SystemWideSaltSource;
+import org.acegisecurity.providers.encoding.ShaPasswordEncoder;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataRetrievalFailureException;
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/UserTests.java b/core/src/test/java/org/acegisecurity/providers/dao/UserTests.java
index e510de58cf..9f1570290a 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/UserTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/dao/UserTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao;
+package org.acegisecurity.providers.dao;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.UserDetails;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.UserDetails;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/cache/EhCacheBasedUserCacheTests.java b/core/src/test/java/org/acegisecurity/providers/dao/cache/EhCacheBasedUserCacheTests.java
index f2cab603a0..4fd9318577 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/cache/EhCacheBasedUserCacheTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/dao/cache/EhCacheBasedUserCacheTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.cache;
+package org.acegisecurity.providers.dao.cache;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.MockApplicationContext;
-import net.sf.acegisecurity.providers.dao.User;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.MockApplicationContext;
+import org.acegisecurity.providers.dao.User;
 
 import net.sf.ehcache.Cache;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/cache/NullUserCacheTests.java b/core/src/test/java/org/acegisecurity/providers/dao/cache/NullUserCacheTests.java
index b7e97c083c..83880b4813 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/cache/NullUserCacheTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/dao/cache/NullUserCacheTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.cache;
+package org.acegisecurity.providers.dao.cache;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.providers.dao.User;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.providers.dao.User;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/jdbc/JdbcDaoTests.java b/core/src/test/java/org/acegisecurity/providers/dao/jdbc/JdbcDaoTests.java
index 533375fff3..a22bc67269 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/jdbc/JdbcDaoTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/dao/jdbc/JdbcDaoTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.jdbc;
+package org.acegisecurity.providers.dao.jdbc;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.PopulatedDatabase;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
+import org.acegisecurity.PopulatedDatabase;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.dao.UsernameNotFoundException;
 
 import org.springframework.jdbc.object.MappingSqlQuery;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/memory/InMemoryDaoTests.java b/core/src/test/java/org/acegisecurity/providers/dao/memory/InMemoryDaoTests.java
index 9633f0985a..e366772398 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/memory/InMemoryDaoTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/dao/memory/InMemoryDaoTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.memory;
+package org.acegisecurity.providers.dao.memory;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
+import org.acegisecurity.providers.dao.UsernameNotFoundException;
 
 import java.util.Properties;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/memory/UserAttributeEditorTests.java b/core/src/test/java/org/acegisecurity/providers/dao/memory/UserAttributeEditorTests.java
index 5e1d1d90b0..22c1e75d49 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/memory/UserAttributeEditorTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/dao/memory/UserAttributeEditorTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.memory;
+package org.acegisecurity.providers.dao.memory;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/memory/UserMapEditorTests.java b/core/src/test/java/org/acegisecurity/providers/dao/memory/UserMapEditorTests.java
index b29d00fc78..e6f5ae9682 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/memory/UserMapEditorTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/dao/memory/UserMapEditorTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.memory;
+package org.acegisecurity.providers.dao.memory;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/memory/UserMapTests.java b/core/src/test/java/org/acegisecurity/providers/dao/memory/UserMapTests.java
index f8aaab20af..e31a05bab0 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/memory/UserMapTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/dao/memory/UserMapTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.memory;
+package org.acegisecurity.providers.dao.memory;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.dao.User;
-import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.dao.User;
+import org.acegisecurity.providers.dao.UsernameNotFoundException;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/salt/ReflectionSaltSourceTests.java b/core/src/test/java/org/acegisecurity/providers/dao/salt/ReflectionSaltSourceTests.java
index ca165f08b5..607848f03c 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/salt/ReflectionSaltSourceTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/dao/salt/ReflectionSaltSourceTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.salt;
+package org.acegisecurity.providers.dao.salt;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AuthenticationServiceException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.dao.User;
+import org.acegisecurity.AuthenticationServiceException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.dao.User;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/salt/SystemWideSaltSourceTests.java b/core/src/test/java/org/acegisecurity/providers/dao/salt/SystemWideSaltSourceTests.java
index f2d00ac872..ae88f3b352 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/salt/SystemWideSaltSourceTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/dao/salt/SystemWideSaltSourceTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.salt;
+package org.acegisecurity.providers.dao.salt;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/encoding/BasePasswordEncoderTests.java b/core/src/test/java/org/acegisecurity/providers/encoding/BasePasswordEncoderTests.java
index 116d1d2061..d306c4cd14 100644
--- a/core/src/test/java/org/acegisecurity/providers/encoding/BasePasswordEncoderTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/encoding/BasePasswordEncoderTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.encoding;
+package org.acegisecurity.providers.encoding;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/encoding/Md5PasswordEncoderTests.java b/core/src/test/java/org/acegisecurity/providers/encoding/Md5PasswordEncoderTests.java
index cd1f02786b..e2824334a8 100644
--- a/core/src/test/java/org/acegisecurity/providers/encoding/Md5PasswordEncoderTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/encoding/Md5PasswordEncoderTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.encoding;
+package org.acegisecurity.providers.encoding;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/encoding/PlaintextPasswordEncoderTests.java b/core/src/test/java/org/acegisecurity/providers/encoding/PlaintextPasswordEncoderTests.java
index e7d919551d..35d7fbea55 100644
--- a/core/src/test/java/org/acegisecurity/providers/encoding/PlaintextPasswordEncoderTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/encoding/PlaintextPasswordEncoderTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.encoding;
+package org.acegisecurity.providers.encoding;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/encoding/ShaPasswordEncoderTests.java b/core/src/test/java/org/acegisecurity/providers/encoding/ShaPasswordEncoderTests.java
index 20531cebff..05f4e4b31e 100644
--- a/core/src/test/java/org/acegisecurity/providers/encoding/ShaPasswordEncoderTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/encoding/ShaPasswordEncoderTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.encoding;
+package org.acegisecurity.providers.encoding;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.java b/core/src/test/java/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.java
index d53a1d4344..dd14a8396a 100644
--- a/core/src/test/java/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.jaas;
+package org.acegisecurity.providers.jaas;
 
 import junit.framework.TestCase;
-import net.sf.acegisecurity.*;
-import net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter;
-import net.sf.acegisecurity.context.SecurityContextImpl;
-import net.sf.acegisecurity.ui.session.HttpSessionDestroyedEvent;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.*;
+import org.acegisecurity.context.HttpSessionContextIntegrationFilter;
+import org.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.ui.session.HttpSessionDestroyedEvent;
+import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.mock.web.MockHttpSession;
diff --git a/core/src/test/java/org/acegisecurity/providers/jaas/JaasEventCheck.java b/core/src/test/java/org/acegisecurity/providers/jaas/JaasEventCheck.java
index 1300467c49..221eea9fd9 100644
--- a/core/src/test/java/org/acegisecurity/providers/jaas/JaasEventCheck.java
+++ b/core/src/test/java/org/acegisecurity/providers/jaas/JaasEventCheck.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.jaas;
+package org.acegisecurity.providers.jaas;
 
-import net.sf.acegisecurity.providers.jaas.event.JaasAuthenticationFailedEvent;
-import net.sf.acegisecurity.providers.jaas.event.JaasAuthenticationSuccessEvent;
+import org.acegisecurity.providers.jaas.event.JaasAuthenticationFailedEvent;
+import org.acegisecurity.providers.jaas.event.JaasAuthenticationSuccessEvent;
 
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
diff --git a/core/src/test/java/org/acegisecurity/providers/jaas/SecurityContextLoginModuleTests.java b/core/src/test/java/org/acegisecurity/providers/jaas/SecurityContextLoginModuleTests.java
index a838dc90c0..f77d0b157c 100644
--- a/core/src/test/java/org/acegisecurity/providers/jaas/SecurityContextLoginModuleTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/jaas/SecurityContextLoginModuleTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.jaas;
+package org.acegisecurity.providers.jaas;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.context.SecurityContextImpl;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 import java.util.HashSet;
 import java.util.Map;
diff --git a/core/src/test/java/org/acegisecurity/providers/jaas/TestAuthorityGranter.java b/core/src/test/java/org/acegisecurity/providers/jaas/TestAuthorityGranter.java
index 7421299cbc..197125d147 100644
--- a/core/src/test/java/org/acegisecurity/providers/jaas/TestAuthorityGranter.java
+++ b/core/src/test/java/org/acegisecurity/providers/jaas/TestAuthorityGranter.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.jaas;
+package org.acegisecurity.providers.jaas;
 
 import java.security.Principal;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/jaas/TestCallbackHandler.java b/core/src/test/java/org/acegisecurity/providers/jaas/TestCallbackHandler.java
index 5b67ca6d65..730c17dffb 100644
--- a/core/src/test/java/org/acegisecurity/providers/jaas/TestCallbackHandler.java
+++ b/core/src/test/java/org/acegisecurity/providers/jaas/TestCallbackHandler.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.jaas;
+package org.acegisecurity.providers.jaas;
 
-import net.sf.acegisecurity.Authentication;
+import org.acegisecurity.Authentication;
 
 import java.io.IOException;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/jaas/TestLoginModule.java b/core/src/test/java/org/acegisecurity/providers/jaas/TestLoginModule.java
index 95957a05c3..e4f422c149 100644
--- a/core/src/test/java/org/acegisecurity/providers/jaas/TestLoginModule.java
+++ b/core/src/test/java/org/acegisecurity/providers/jaas/TestLoginModule.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.jaas;
+package org.acegisecurity.providers.jaas;
 
 import java.security.Principal;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/rcp/RemoteAuthenticationManagerImplTests.java b/core/src/test/java/org/acegisecurity/providers/rcp/RemoteAuthenticationManagerImplTests.java
index e6c4ecc8f7..1d0f9f978a 100644
--- a/core/src/test/java/org/acegisecurity/providers/rcp/RemoteAuthenticationManagerImplTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/rcp/RemoteAuthenticationManagerImplTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.rcp;
+package org.acegisecurity.providers.rcp;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.MockAuthenticationManager;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.MockAuthenticationManager;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/rcp/RemoteAuthenticationProviderTests.java b/core/src/test/java/org/acegisecurity/providers/rcp/RemoteAuthenticationProviderTests.java
index 060bcbfb36..29e9aa0913 100644
--- a/core/src/test/java/org/acegisecurity/providers/rcp/RemoteAuthenticationProviderTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/rcp/RemoteAuthenticationProviderTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.rcp;
+package org.acegisecurity.providers.rcp;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationProviderTests.java b/core/src/test/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationProviderTests.java
index 586ca384d8..0d5acb6166 100644
--- a/core/src/test/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationProviderTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationProviderTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.rememberme;
+package org.acegisecurity.providers.rememberme;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.providers.TestingAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationTokenTests.java b/core/src/test/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationTokenTests.java
index 845737f664..834b2d00b5 100644
--- a/core/src/test/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationTokenTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationTokenTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.rememberme;
+package org.acegisecurity.providers.rememberme;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationProviderTests.java b/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationProviderTests.java
index 930cf98367..371ebba15e 100644
--- a/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationProviderTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationProviderTests.java
@@ -13,19 +13,19 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.x509;
+package org.acegisecurity.providers.x509;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.*;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.providers.dao.User;
+import org.acegisecurity.*;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.providers.dao.User;
 
 import java.security.cert.X509Certificate;
 
 
 /**
- * Tests {@link net.sf.acegisecurity.providers.x509.X509AuthenticationProvider}
+ * Tests {@link org.acegisecurity.providers.x509.X509AuthenticationProvider}
  *
  * @author Luke Taylor
  * @version $Id$
diff --git a/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationTokenTests.java b/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationTokenTests.java
index 5f672dda4a..e43e1addf5 100644
--- a/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationTokenTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationTokenTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.x509;
+package org.acegisecurity.providers.x509;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/x509/X509TestUtils.java b/core/src/test/java/org/acegisecurity/providers/x509/X509TestUtils.java
index 51f59300e6..0fa1b15495 100644
--- a/core/src/test/java/org/acegisecurity/providers/x509/X509TestUtils.java
+++ b/core/src/test/java/org/acegisecurity/providers/x509/X509TestUtils.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.x509;
+package org.acegisecurity.providers.x509;
 
 import java.security.cert.X509Certificate;
 import java.security.cert.CertificateFactory;
diff --git a/core/src/test/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCacheTests.java b/core/src/test/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCacheTests.java
index 0efbf367ba..f7c7a2fecd 100644
--- a/core/src/test/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCacheTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCacheTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.x509.cache;
+package org.acegisecurity.providers.x509.cache;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.MockApplicationContext;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.dao.User;
-import net.sf.acegisecurity.providers.x509.X509TestUtils;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.MockApplicationContext;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.dao.User;
+import org.acegisecurity.providers.x509.X509TestUtils;
 
 import net.sf.ehcache.Cache;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulatorTests.java b/core/src/test/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulatorTests.java
index f1058c517c..e43fa85ec6 100644
--- a/core/src/test/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulatorTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulatorTests.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.x509.populator;
+package org.acegisecurity.providers.x509.populator;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.dao.AuthenticationDao;
-import net.sf.acegisecurity.providers.dao.User;
-import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
-import net.sf.acegisecurity.providers.x509.X509TestUtils;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.dao.AuthenticationDao;
+import org.acegisecurity.providers.dao.User;
+import org.acegisecurity.providers.dao.UsernameNotFoundException;
+import org.acegisecurity.providers.x509.X509TestUtils;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/core/src/test/java/org/acegisecurity/runas/NullRunAsManagerTests.java b/core/src/test/java/org/acegisecurity/runas/NullRunAsManagerTests.java
index 6f1fed6a90..ddab1bf308 100644
--- a/core/src/test/java/org/acegisecurity/runas/NullRunAsManagerTests.java
+++ b/core/src/test/java/org/acegisecurity/runas/NullRunAsManagerTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.runas;
+package org.acegisecurity.runas;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.SecurityConfig;
+import org.acegisecurity.SecurityConfig;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/runas/RunAsImplAuthenticationProviderTests.java b/core/src/test/java/org/acegisecurity/runas/RunAsImplAuthenticationProviderTests.java
index 75447c0752..6ecd1106cf 100644
--- a/core/src/test/java/org/acegisecurity/runas/RunAsImplAuthenticationProviderTests.java
+++ b/core/src/test/java/org/acegisecurity/runas/RunAsImplAuthenticationProviderTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.runas;
+package org.acegisecurity.runas;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/runas/RunAsManagerImplTests.java b/core/src/test/java/org/acegisecurity/runas/RunAsManagerImplTests.java
index 6a55ae4ae4..4c332cdd19 100644
--- a/core/src/test/java/org/acegisecurity/runas/RunAsManagerImplTests.java
+++ b/core/src/test/java/org/acegisecurity/runas/RunAsManagerImplTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.runas;
+package org.acegisecurity.runas;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.RunAsManager;
-import net.sf.acegisecurity.SecurityConfig;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.RunAsManager;
+import org.acegisecurity.SecurityConfig;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/runas/RunAsUserTokenTests.java b/core/src/test/java/org/acegisecurity/runas/RunAsUserTokenTests.java
index 7d31edc48c..3aa7b7a377 100644
--- a/core/src/test/java/org/acegisecurity/runas/RunAsUserTokenTests.java
+++ b/core/src/test/java/org/acegisecurity/runas/RunAsUserTokenTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.runas;
+package org.acegisecurity.runas;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/securechannel/ChannelDecisionManagerImplTests.java b/core/src/test/java/org/acegisecurity/securechannel/ChannelDecisionManagerImplTests.java
index e7c403bddb..0c9433364a 100644
--- a/core/src/test/java/org/acegisecurity/securechannel/ChannelDecisionManagerImplTests.java
+++ b/core/src/test/java/org/acegisecurity/securechannel/ChannelDecisionManagerImplTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.securechannel;
+package org.acegisecurity.securechannel;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.MockFilterChain;
-import net.sf.acegisecurity.SecurityConfig;
-import net.sf.acegisecurity.intercept.web.FilterInvocation;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.MockFilterChain;
+import org.acegisecurity.SecurityConfig;
+import org.acegisecurity.intercept.web.FilterInvocation;
 
 import java.io.IOException;
 
diff --git a/core/src/test/java/org/acegisecurity/securechannel/ChannelProcessingFilterTests.java b/core/src/test/java/org/acegisecurity/securechannel/ChannelProcessingFilterTests.java
index 25a8dbf80a..fa111b6d64 100644
--- a/core/src/test/java/org/acegisecurity/securechannel/ChannelProcessingFilterTests.java
+++ b/core/src/test/java/org/acegisecurity/securechannel/ChannelProcessingFilterTests.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.securechannel;
+package org.acegisecurity.securechannel;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 
-import net.sf.acegisecurity.SecurityConfig;
+import org.acegisecurity.SecurityConfig;
 
-import net.sf.acegisecurity.intercept.web.FilterInvocation;
-import net.sf.acegisecurity.intercept.web.FilterInvocationDefinitionSource;
+import org.acegisecurity.intercept.web.FilterInvocation;
+import org.acegisecurity.intercept.web.FilterInvocationDefinitionSource;
 
 import java.io.IOException;
 
diff --git a/core/src/test/java/org/acegisecurity/securechannel/InsecureChannelProcessorTests.java b/core/src/test/java/org/acegisecurity/securechannel/InsecureChannelProcessorTests.java
index 66c5124239..8ea645ca98 100644
--- a/core/src/test/java/org/acegisecurity/securechannel/InsecureChannelProcessorTests.java
+++ b/core/src/test/java/org/acegisecurity/securechannel/InsecureChannelProcessorTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.securechannel;
+package org.acegisecurity.securechannel;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.MockFilterChain;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.MockFilterChain;
 
 
-import net.sf.acegisecurity.SecurityConfig;
+import org.acegisecurity.SecurityConfig;
 
-import net.sf.acegisecurity.intercept.web.FilterInvocation;
+import org.acegisecurity.intercept.web.FilterInvocation;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
diff --git a/core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpEntryPointTests.java b/core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpEntryPointTests.java
index 743cc33c15..f03c9dc391 100644
--- a/core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpEntryPointTests.java
+++ b/core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpEntryPointTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.securechannel;
+package org.acegisecurity.securechannel;
 
 import junit.framework.TestCase;
 
 
 
-import net.sf.acegisecurity.MockPortResolver;
+import org.acegisecurity.MockPortResolver;
 
-import net.sf.acegisecurity.util.PortMapperImpl;
+import org.acegisecurity.util.PortMapperImpl;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPointTests.java b/core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPointTests.java
index 70c4e416a9..18e3a20330 100644
--- a/core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPointTests.java
+++ b/core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPointTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.securechannel;
+package org.acegisecurity.securechannel;
 
 import junit.framework.TestCase;
 
 
 
-import net.sf.acegisecurity.MockPortResolver;
+import org.acegisecurity.MockPortResolver;
 
-import net.sf.acegisecurity.util.PortMapperImpl;
+import org.acegisecurity.util.PortMapperImpl;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core/src/test/java/org/acegisecurity/securechannel/SecureChannelProcessorTests.java b/core/src/test/java/org/acegisecurity/securechannel/SecureChannelProcessorTests.java
index a53667b19b..ef4f0fe75e 100644
--- a/core/src/test/java/org/acegisecurity/securechannel/SecureChannelProcessorTests.java
+++ b/core/src/test/java/org/acegisecurity/securechannel/SecureChannelProcessorTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.securechannel;
+package org.acegisecurity.securechannel;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.MockFilterChain;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.MockFilterChain;
 
 
-import net.sf.acegisecurity.SecurityConfig;
+import org.acegisecurity.SecurityConfig;
 
-import net.sf.acegisecurity.intercept.web.FilterInvocation;
+import org.acegisecurity.intercept.web.FilterInvocation;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
diff --git a/core/src/test/java/org/acegisecurity/taglibs/authz/AclTagTests.java b/core/src/test/java/org/acegisecurity/taglibs/authz/AclTagTests.java
index 2f750a8e43..fe4ce296de 100644
--- a/core/src/test/java/org/acegisecurity/taglibs/authz/AclTagTests.java
+++ b/core/src/test/java/org/acegisecurity/taglibs/authz/AclTagTests.java
@@ -13,20 +13,20 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.taglibs.authz;
+package org.acegisecurity.taglibs.authz;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.MockAclManager;
-import net.sf.acegisecurity.MockApplicationContext;
-import net.sf.acegisecurity.acl.AclEntry;
-import net.sf.acegisecurity.acl.AclManager;
-import net.sf.acegisecurity.acl.basic.MockAclObjectIdentity;
-import net.sf.acegisecurity.acl.basic.SimpleAclEntry;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.MockAclManager;
+import org.acegisecurity.MockApplicationContext;
+import org.acegisecurity.acl.AclEntry;
+import org.acegisecurity.acl.AclManager;
+import org.acegisecurity.acl.basic.MockAclObjectIdentity;
+import org.acegisecurity.acl.basic.SimpleAclEntry;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.providers.TestingAuthenticationToken;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
diff --git a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthenticationTagTests.java b/core/src/test/java/org/acegisecurity/taglibs/authz/AuthenticationTagTests.java
index 646a4b17bf..dd80519acc 100644
--- a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthenticationTagTests.java
+++ b/core/src/test/java/org/acegisecurity/taglibs/authz/AuthenticationTagTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.taglibs.authz;
+package org.acegisecurity.taglibs.authz;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
-import net.sf.acegisecurity.providers.dao.User;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.providers.dao.User;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.Tag;
diff --git a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagAttributeTests.java b/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagAttributeTests.java
index c554fef5f6..c2a94535ba 100644
--- a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagAttributeTests.java
+++ b/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagAttributeTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.taglibs.authz;
+package org.acegisecurity.taglibs.authz;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.context.SecurityContextImpl;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.providers.TestingAuthenticationToken;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.Tag;
diff --git a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagCustomGrantedAuthorityTests.java b/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagCustomGrantedAuthorityTests.java
index 0025a9c02b..431b52bb75 100644
--- a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagCustomGrantedAuthorityTests.java
+++ b/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagCustomGrantedAuthorityTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.taglibs.authz;
+package org.acegisecurity.taglibs.authz;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.context.SecurityContextImpl;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.providers.TestingAuthenticationToken;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.Tag;
diff --git a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagExpressionLanguageTests.java b/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagExpressionLanguageTests.java
index 808fed65b8..f846fb5aaf 100644
--- a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagExpressionLanguageTests.java
+++ b/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagExpressionLanguageTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.taglibs.authz;
+package org.acegisecurity.taglibs.authz;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.context.SecurityContextImpl;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.providers.TestingAuthenticationToken;
 
 import org.springframework.mock.web.MockPageContext;
 
diff --git a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagTests.java b/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagTests.java
index e6bc8be12f..34e6d6f70b 100644
--- a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagTests.java
+++ b/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.taglibs.authz;
+package org.acegisecurity.taglibs.authz;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.context.SecurityContextImpl;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.providers.TestingAuthenticationToken;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.Tag;
diff --git a/core/src/test/java/org/acegisecurity/ui/AbstractProcessingFilterTests.java b/core/src/test/java/org/acegisecurity/ui/AbstractProcessingFilterTests.java
index 1ea3d6037a..492c29f36d 100644
--- a/core/src/test/java/org/acegisecurity/ui/AbstractProcessingFilterTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/AbstractProcessingFilterTests.java
@@ -13,21 +13,21 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui;
+package org.acegisecurity.ui;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AccountExpiredException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.MockAuthenticationManager;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.context.SecurityContextImpl;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.ui.rememberme.TokenBasedRememberMeServices;
+import org.acegisecurity.AccountExpiredException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.MockAuthenticationManager;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.ui.rememberme.TokenBasedRememberMeServices;
 
 import org.springframework.mock.web.MockFilterConfig;
 import org.springframework.mock.web.MockHttpServletRequest;
diff --git a/core/src/test/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterEntryPointTests.java b/core/src/test/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterEntryPointTests.java
index a1684b28e4..f79f52adbe 100644
--- a/core/src/test/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterEntryPointTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterEntryPointTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.basicauth;
+package org.acegisecurity.ui.basicauth;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.DisabledException;
+import org.acegisecurity.DisabledException;
 
 
 
diff --git a/core/src/test/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterTests.java b/core/src/test/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterTests.java
index b27af1846c..5f2e8e2782 100644
--- a/core/src/test/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.basicauth;
+package org.acegisecurity.ui.basicauth;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.MockAuthenticationEntryPoint;
-import net.sf.acegisecurity.MockAuthenticationManager;
-import net.sf.acegisecurity.MockFilterConfig;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.MockAuthenticationEntryPoint;
+import org.acegisecurity.MockAuthenticationManager;
+import org.acegisecurity.MockFilterConfig;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextImpl;
 
 import org.apache.commons.codec.binary.Base64;
 
@@ -102,7 +102,7 @@ public class BasicProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/basicauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/basicauth/filtertest-valid.xml");
         BasicProcessingFilter filter = (BasicProcessingFilter) ctx.getBean(
                 "basicProcessingFilter");
 
@@ -142,7 +142,7 @@ public class BasicProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/basicauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/basicauth/filtertest-valid.xml");
         BasicProcessingFilter filter = (BasicProcessingFilter) ctx.getBean(
                 "basicProcessingFilter");
 
@@ -171,7 +171,7 @@ public class BasicProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/basicauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/basicauth/filtertest-valid.xml");
         BasicProcessingFilter filter = (BasicProcessingFilter) ctx.getBean(
                 "basicProcessingFilter");
 
@@ -202,7 +202,7 @@ public class BasicProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/basicauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/basicauth/filtertest-valid.xml");
         BasicProcessingFilter filter = (BasicProcessingFilter) ctx.getBean(
                 "basicProcessingFilter");
 
@@ -259,7 +259,7 @@ public class BasicProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/basicauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/basicauth/filtertest-valid.xml");
         BasicProcessingFilter filter = (BasicProcessingFilter) ctx.getBean(
                 "basicProcessingFilter");
 
@@ -311,7 +311,7 @@ public class BasicProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/basicauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/basicauth/filtertest-valid.xml");
         BasicProcessingFilter filter = (BasicProcessingFilter) ctx.getBean(
                 "basicProcessingFilter");
 
diff --git a/core/src/test/java/org/acegisecurity/ui/cas/CasProcessingFilterEntryPointTests.java b/core/src/test/java/org/acegisecurity/ui/cas/CasProcessingFilterEntryPointTests.java
index 8bf2f80342..3a26421bc9 100644
--- a/core/src/test/java/org/acegisecurity/ui/cas/CasProcessingFilterEntryPointTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/cas/CasProcessingFilterEntryPointTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.cas;
+package org.acegisecurity.ui.cas;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/ui/cas/CasProcessingFilterTests.java b/core/src/test/java/org/acegisecurity/ui/cas/CasProcessingFilterTests.java
index 43ed7c9c27..a57f1337b9 100644
--- a/core/src/test/java/org/acegisecurity/ui/cas/CasProcessingFilterTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/cas/CasProcessingFilterTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.cas;
+package org.acegisecurity.ui.cas;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.MockAuthenticationManager;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.MockAuthenticationManager;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 
diff --git a/core/src/test/java/org/acegisecurity/ui/cas/ServicePropertiesTests.java b/core/src/test/java/org/acegisecurity/ui/cas/ServicePropertiesTests.java
index f0605311f1..3671dbcfcd 100644
--- a/core/src/test/java/org/acegisecurity/ui/cas/ServicePropertiesTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/cas/ServicePropertiesTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.cas;
+package org.acegisecurity.ui.cas;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterEntryPointTests.java b/core/src/test/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterEntryPointTests.java
index 5695d5d4ac..2bdc4c7143 100644
--- a/core/src/test/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterEntryPointTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterEntryPointTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.digestauth;
+package org.acegisecurity.ui.digestauth;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.DisabledException;
+import org.acegisecurity.DisabledException;
 
 
 
-import net.sf.acegisecurity.util.StringSplitUtils;
+import org.acegisecurity.util.StringSplitUtils;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
diff --git a/core/src/test/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterTests.java b/core/src/test/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterTests.java
index 99e763308a..b2ad230f69 100644
--- a/core/src/test/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterTests.java
@@ -13,19 +13,19 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.digestauth;
+package org.acegisecurity.ui.digestauth;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.DisabledException;
-import net.sf.acegisecurity.MockFilterConfig;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.context.SecurityContextImpl;
-import net.sf.acegisecurity.providers.dao.AuthenticationDao;
-import net.sf.acegisecurity.providers.dao.UserCache;
-import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
-import net.sf.acegisecurity.util.StringSplitUtils;
+import org.acegisecurity.DisabledException;
+import org.acegisecurity.MockFilterConfig;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.providers.dao.AuthenticationDao;
+import org.acegisecurity.providers.dao.UserCache;
+import org.acegisecurity.providers.dao.UsernameNotFoundException;
+import org.acegisecurity.util.StringSplitUtils;
 
 import org.apache.commons.codec.binary.Base64;
 
@@ -126,7 +126,7 @@ public class DigestProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/digestauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/digestauth/filtertest-valid.xml");
         DigestProcessingFilter filter = (DigestProcessingFilter) ctx.getBean(
                 "digestProcessingFilter");
 
@@ -161,7 +161,7 @@ public class DigestProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/digestauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/digestauth/filtertest-valid.xml");
         DigestProcessingFilter filter = (DigestProcessingFilter) ctx.getBean(
                 "digestProcessingFilter");
 
@@ -205,7 +205,7 @@ public class DigestProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/digestauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/digestauth/filtertest-valid.xml");
         DigestProcessingFilter filter = (DigestProcessingFilter) ctx.getBean(
                 "digestProcessingFilter");
 
@@ -232,7 +232,7 @@ public class DigestProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/digestauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/digestauth/filtertest-valid.xml");
         DigestProcessingFilter filter = (DigestProcessingFilter) ctx.getBean(
                 "digestProcessingFilter");
 
@@ -275,7 +275,7 @@ public class DigestProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/digestauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/digestauth/filtertest-valid.xml");
         DigestProcessingFilter filter = (DigestProcessingFilter) ctx.getBean(
                 "digestProcessingFilter");
 
@@ -319,7 +319,7 @@ public class DigestProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/digestauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/digestauth/filtertest-valid.xml");
         DigestProcessingFilter filter = (DigestProcessingFilter) ctx.getBean(
                 "digestProcessingFilter");
 
@@ -363,7 +363,7 @@ public class DigestProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/digestauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/digestauth/filtertest-valid.xml");
         DigestProcessingFilter filter = (DigestProcessingFilter) ctx.getBean(
                 "digestProcessingFilter");
 
@@ -407,7 +407,7 @@ public class DigestProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/digestauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/digestauth/filtertest-valid.xml");
         DigestProcessingFilter filter = (DigestProcessingFilter) ctx.getBean(
                 "digestProcessingFilter");
 
@@ -449,7 +449,7 @@ public class DigestProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/digestauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/digestauth/filtertest-valid.xml");
         DigestProcessingFilter filter = (DigestProcessingFilter) ctx.getBean(
                 "digestProcessingFilter");
 
@@ -479,7 +479,7 @@ public class DigestProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/digestauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/digestauth/filtertest-valid.xml");
         DigestProcessingFilter filter = (DigestProcessingFilter) ctx.getBean(
                 "digestProcessingFilter");
 
@@ -547,7 +547,7 @@ public class DigestProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/digestauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/digestauth/filtertest-valid.xml");
         DigestProcessingFilter filter = (DigestProcessingFilter) ctx.getBean(
                 "digestProcessingFilter");
 
@@ -605,7 +605,7 @@ public class DigestProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/digestauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/digestauth/filtertest-valid.xml");
         DigestProcessingFilter filter = (DigestProcessingFilter) ctx.getBean(
                 "digestProcessingFilter");
 
@@ -647,7 +647,7 @@ public class DigestProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/digestauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/digestauth/filtertest-valid.xml");
         DigestProcessingFilter filter = (DigestProcessingFilter) ctx.getBean(
                 "digestProcessingFilter");
 
@@ -689,7 +689,7 @@ public class DigestProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/digestauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/digestauth/filtertest-valid.xml");
         DigestProcessingFilter filter = (DigestProcessingFilter) ctx.getBean(
                 "digestProcessingFilter");
 
@@ -731,7 +731,7 @@ public class DigestProcessingFilterTests extends TestCase {
 
         // Launch an application context and access our bean
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/digestauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/digestauth/filtertest-valid.xml");
         DigestProcessingFilter filter = (DigestProcessingFilter) ctx.getBean(
                 "digestProcessingFilter");
 
@@ -780,7 +780,7 @@ public class DigestProcessingFilterTests extends TestCase {
     private Map generateValidHeaders(int nonceValidityPeriod)
         throws Exception {
         ApplicationContext ctx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/ui/digestauth/filtertest-valid.xml");
+                "org/acegisecurity/ui/digestauth/filtertest-valid.xml");
         DigestProcessingFilterEntryPoint ep = (DigestProcessingFilterEntryPoint) ctx
             .getBean("digestProcessingFilterEntryPoint");
         ep.setNonceValiditySeconds(nonceValidityPeriod);
diff --git a/core/src/test/java/org/acegisecurity/ui/rememberme/NullRememberMeServicesTests.java b/core/src/test/java/org/acegisecurity/ui/rememberme/NullRememberMeServicesTests.java
index 2dc9694306..58dd19d230 100644
--- a/core/src/test/java/org/acegisecurity/ui/rememberme/NullRememberMeServicesTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/rememberme/NullRememberMeServicesTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.rememberme;
+package org.acegisecurity.ui.rememberme;
 
 import junit.framework.TestCase;
 
 
 /**
- * Tests {@link net.sf.acegisecurity.ui.rememberme.NullRememberMeServices}.
+ * Tests {@link org.acegisecurity.ui.rememberme.NullRememberMeServices}.
  *
  * @author Ben Alex
  * @version $Id$
diff --git a/core/src/test/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilterTests.java b/core/src/test/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilterTests.java
index 575c569d67..ff8a6bf14d 100644
--- a/core/src/test/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilterTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilterTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.rememberme;
+package org.acegisecurity.ui.rememberme;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.MockFilterConfig;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.context.SecurityContextImpl;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.MockFilterConfig;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.providers.TestingAuthenticationToken;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServicesTests.java b/core/src/test/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServicesTests.java
index 4bf70c6660..1bf3749995 100644
--- a/core/src/test/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServicesTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServicesTests.java
@@ -13,20 +13,20 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.rememberme;
+package org.acegisecurity.ui.rememberme;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
 
 
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
-import net.sf.acegisecurity.providers.dao.AuthenticationDao;
-import net.sf.acegisecurity.providers.dao.User;
-import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.providers.dao.AuthenticationDao;
+import org.acegisecurity.providers.dao.User;
+import org.acegisecurity.providers.dao.UsernameNotFoundException;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -44,7 +44,7 @@ import javax.servlet.http.Cookie;
 
 /**
  * Tests {@link
- * net.sf.acegisecurity.ui.rememberme.TokenBasedRememberMeServices}.
+ * org.acegisecurity.ui.rememberme.TokenBasedRememberMeServices}.
  *
  * @author Ben Alex
  * @version $Id$
diff --git a/core/src/test/java/org/acegisecurity/ui/session/HttpSessionEventPublisherTests.java b/core/src/test/java/org/acegisecurity/ui/session/HttpSessionEventPublisherTests.java
index 3f02eaef58..34b68a731b 100644
--- a/core/src/test/java/org/acegisecurity/ui/session/HttpSessionEventPublisherTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/session/HttpSessionEventPublisherTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.session;
+package org.acegisecurity.ui.session;
 
 import junit.framework.TestCase;
 
@@ -25,7 +25,7 @@ import org.springframework.context.ConfigurableApplicationContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.http.HttpSessionEvent;
 
-import net.sf.acegisecurity.MockApplicationContext;
+import org.acegisecurity.MockApplicationContext;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/ui/session/TestListener.java b/core/src/test/java/org/acegisecurity/ui/session/TestListener.java
index bc02b3367a..9d825d8f8e 100644
--- a/core/src/test/java/org/acegisecurity/ui/session/TestListener.java
+++ b/core/src/test/java/org/acegisecurity/ui/session/TestListener.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.session;
+package org.acegisecurity.ui.session;
 
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
diff --git a/core/src/test/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilterTests.java b/core/src/test/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilterTests.java
index 8d9c08fe72..d43e3f3a83 100644
--- a/core/src/test/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilterTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilterTests.java
@@ -13,23 +13,23 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.switchuser;
+package org.acegisecurity.ui.switchuser;
 
 import junit.framework.TestCase;
-import net.sf.acegisecurity.AccountExpiredException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.CredentialsExpiredException;
-import net.sf.acegisecurity.DisabledException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.providers.dao.AuthenticationDao;
-import net.sf.acegisecurity.providers.dao.User;
-import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
-import net.sf.acegisecurity.util.MockFilterChain;
+import org.acegisecurity.AccountExpiredException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.CredentialsExpiredException;
+import org.acegisecurity.DisabledException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.providers.dao.AuthenticationDao;
+import org.acegisecurity.providers.dao.User;
+import org.acegisecurity.providers.dao.UsernameNotFoundException;
+import org.acegisecurity.util.MockFilterChain;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.mock.web.MockHttpServletRequest;
@@ -37,7 +37,7 @@ import org.springframework.mock.web.MockHttpServletResponse;
 
 
 /**
- * Tests {@link net.sf.acegisecurity.ui.switchuser.SwitchUserProcessingFilter}.
+ * Tests {@link org.acegisecurity.ui.switchuser.SwitchUserProcessingFilter}.
  *
  * @author Mark St.Godard
  * @version $Id$
diff --git a/core/src/test/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPointTests.java b/core/src/test/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPointTests.java
index 2a4174ffff..0b6e972d58 100644
--- a/core/src/test/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPointTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPointTests.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sf.acegisecurity.ui.webapp;
+package org.acegisecurity.ui.webapp;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.MockPortResolver;
-import net.sf.acegisecurity.util.PortMapperImpl;
+import org.acegisecurity.MockPortResolver;
+import org.acegisecurity.util.PortMapperImpl;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterTests.java b/core/src/test/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterTests.java
index 03cc3e6494..e5d5d0d738 100644
--- a/core/src/test/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.webapp;
+package org.acegisecurity.ui.webapp;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.MockAuthenticationManager;
-import net.sf.acegisecurity.ui.WebAuthenticationDetails;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.MockAuthenticationManager;
+import org.acegisecurity.ui.WebAuthenticationDetails;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 
diff --git a/core/src/test/java/org/acegisecurity/ui/webapp/SiteminderAuthenticationProcessingFilterTests.java b/core/src/test/java/org/acegisecurity/ui/webapp/SiteminderAuthenticationProcessingFilterTests.java
index a09029c859..b4e68d9114 100644
--- a/core/src/test/java/org/acegisecurity/ui/webapp/SiteminderAuthenticationProcessingFilterTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/webapp/SiteminderAuthenticationProcessingFilterTests.java
@@ -1,9 +1,9 @@
-package net.sf.acegisecurity.ui.webapp;
+package org.acegisecurity.ui.webapp;
 
 import junit.framework.TestCase;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.MockAuthenticationManager;
-import net.sf.acegisecurity.ui.WebAuthenticationDetails;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.MockAuthenticationManager;
+import org.acegisecurity.ui.WebAuthenticationDetails;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 
diff --git a/core/src/test/java/org/acegisecurity/ui/x509/X509ProcessingFilterEntryPointTests.java b/core/src/test/java/org/acegisecurity/ui/x509/X509ProcessingFilterEntryPointTests.java
index c43e92a3f4..5df19ae68e 100644
--- a/core/src/test/java/org/acegisecurity/ui/x509/X509ProcessingFilterEntryPointTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/x509/X509ProcessingFilterEntryPointTests.java
@@ -1,8 +1,8 @@
-package net.sf.acegisecurity.ui.x509;
+package org.acegisecurity.ui.x509;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.BadCredentialsException;
+import org.acegisecurity.BadCredentialsException;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
diff --git a/core/src/test/java/org/acegisecurity/ui/x509/X509ProcessingFilterTests.java b/core/src/test/java/org/acegisecurity/ui/x509/X509ProcessingFilterTests.java
index a7e27bc285..3a087cc2c6 100644
--- a/core/src/test/java/org/acegisecurity/ui/x509/X509ProcessingFilterTests.java
+++ b/core/src/test/java/org/acegisecurity/ui/x509/X509ProcessingFilterTests.java
@@ -13,19 +13,19 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.x509;
+package org.acegisecurity.ui.x509;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationManager;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.MockAuthenticationManager;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.providers.x509.X509AuthenticationToken;
-import net.sf.acegisecurity.providers.x509.X509TestUtils;
-import net.sf.acegisecurity.ui.AbstractProcessingFilter;
-import net.sf.acegisecurity.util.MockFilterChain;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationManager;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.MockAuthenticationManager;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.providers.x509.X509AuthenticationToken;
+import org.acegisecurity.providers.x509.X509TestUtils;
+import org.acegisecurity.ui.AbstractProcessingFilter;
+import org.acegisecurity.util.MockFilterChain;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
@@ -37,7 +37,7 @@ import javax.servlet.ServletException;
 
 
 /**
- * Tests {@link net.sf.acegisecurity.ui.x509.X509ProcessingFilter}.
+ * Tests {@link org.acegisecurity.ui.x509.X509ProcessingFilter}.
  *
  * @author Luke Taylor
  * @version $Id$
diff --git a/core/src/test/java/org/acegisecurity/util/FilterChainProxyTests.java b/core/src/test/java/org/acegisecurity/util/FilterChainProxyTests.java
index 8866963789..d40f5fac34 100644
--- a/core/src/test/java/org/acegisecurity/util/FilterChainProxyTests.java
+++ b/core/src/test/java/org/acegisecurity/util/FilterChainProxyTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.util;
+package org.acegisecurity.util;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.MockApplicationContext;
-import net.sf.acegisecurity.MockFilterConfig;
-import net.sf.acegisecurity.intercept.web.FilterInvocationDefinitionSource;
-import net.sf.acegisecurity.intercept.web.MockFilterInvocationDefinitionSource;
-import net.sf.acegisecurity.intercept.web.PathBasedFilterInvocationDefinitionMap;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.MockApplicationContext;
+import org.acegisecurity.MockFilterConfig;
+import org.acegisecurity.intercept.web.FilterInvocationDefinitionSource;
+import org.acegisecurity.intercept.web.MockFilterInvocationDefinitionSource;
+import org.acegisecurity.intercept.web.PathBasedFilterInvocationDefinitionMap;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -123,7 +123,7 @@ public class FilterChainProxyTests extends TestCase {
 
     public void testNormalOperation() throws Exception {
         ApplicationContext appCtx = new ClassPathXmlApplicationContext(
-                "net/sf/acegisecurity/util/filtertest-valid.xml");
+                "org/acegisecurity/util/filtertest-valid.xml");
         FilterChainProxy filterChainProxy = (FilterChainProxy) appCtx.getBean("filterChain",
                 FilterChainProxy.class);
         MockFilter filter = (MockFilter) appCtx.getBean("mockFilter",
diff --git a/core/src/test/java/org/acegisecurity/util/FilterToBeanProxyTests.java b/core/src/test/java/org/acegisecurity/util/FilterToBeanProxyTests.java
index eadf5c33f6..1e7e570129 100644
--- a/core/src/test/java/org/acegisecurity/util/FilterToBeanProxyTests.java
+++ b/core/src/test/java/org/acegisecurity/util/FilterToBeanProxyTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.util;
+package org.acegisecurity.util;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.MockFilterConfig;
+import org.acegisecurity.MockFilterConfig;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -67,7 +67,7 @@ public class FilterToBeanProxyTests extends TestCase {
         config.setInitParmeter("targetClass", "net.sf.DOES.NOT.EXIST");
 
         FilterToBeanProxy filter = new MockFilterToBeanProxy(
-                "net/sf/acegisecurity/util/filtertest-valid.xml");
+                "org/acegisecurity/util/filtertest-valid.xml");
 
         try {
             filter.init(config);
@@ -83,7 +83,7 @@ public class FilterToBeanProxyTests extends TestCase {
         MockFilterConfig config = new MockFilterConfig();
 
         FilterToBeanProxy filter = new MockFilterToBeanProxy(
-                "net/sf/acegisecurity/util/filtertest-valid.xml");
+                "org/acegisecurity/util/filtertest-valid.xml");
 
         try {
             filter.init(config);
@@ -98,10 +98,10 @@ public class FilterToBeanProxyTests extends TestCase {
         // Setup our filter
         MockFilterConfig config = new MockFilterConfig();
         config.setInitParmeter("targetClass",
-            "net.sf.acegisecurity.util.MockNotAFilter");
+            "org.acegisecurity.util.MockNotAFilter");
 
         FilterToBeanProxy filter = new MockFilterToBeanProxy(
-                "net/sf/acegisecurity/util/filtertest-valid.xml");
+                "org/acegisecurity/util/filtertest-valid.xml");
 
         try {
             filter.init(config);
@@ -119,7 +119,7 @@ public class FilterToBeanProxyTests extends TestCase {
         config.setInitParmeter("targetBean", "WRONG_NAME");
 
         FilterToBeanProxy filter = new MockFilterToBeanProxy(
-                "net/sf/acegisecurity/util/filtertest-valid.xml");
+                "org/acegisecurity/util/filtertest-valid.xml");
 
         try {
             filter.init(config);
@@ -135,16 +135,16 @@ public class FilterToBeanProxyTests extends TestCase {
         // Setup our filter
         MockFilterConfig config = new MockFilterConfig();
         config.setInitParmeter("targetClass",
-            "net.sf.acegisecurity.util.FilterToBeanProxyTests");
+            "org.acegisecurity.util.FilterToBeanProxyTests");
 
         FilterToBeanProxy filter = new MockFilterToBeanProxy(
-                "net/sf/acegisecurity/util/filtertest-valid.xml");
+                "org/acegisecurity/util/filtertest-valid.xml");
 
         try {
             filter.init(config);
             fail("Should have thrown ServletException");
         } catch (ServletException expected) {
-            assertEquals("Bean context must contain at least one bean of type net.sf.acegisecurity.util.FilterToBeanProxyTests",
+            assertEquals("Bean context must contain at least one bean of type org.acegisecurity.util.FilterToBeanProxyTests",
                 expected.getMessage());
         }
     }
@@ -153,7 +153,7 @@ public class FilterToBeanProxyTests extends TestCase {
         // Setup our filter
         MockFilterConfig config = new MockFilterConfig();
         config.setInitParmeter("targetClass",
-            "net.sf.acegisecurity.util.MockFilter");
+            "org.acegisecurity.util.MockFilter");
         config.setInitParmeter("targetBean", "");
 
         // Setup our expectation that the filter chain will be invoked
@@ -163,7 +163,7 @@ public class FilterToBeanProxyTests extends TestCase {
         MockHttpServletRequest request = new MockHttpServletRequest();
 
         FilterToBeanProxy filter = new MockFilterToBeanProxy(
-                "net/sf/acegisecurity/util/filtertest-valid.xml");
+                "org/acegisecurity/util/filtertest-valid.xml");
 
         executeFilterInContainerSimulator(config, filter, request, response,
             chain);
@@ -182,7 +182,7 @@ public class FilterToBeanProxyTests extends TestCase {
         MockHttpServletRequest request = new MockHttpServletRequest();
 
         FilterToBeanProxy filter = new MockFilterToBeanProxy(
-                "net/sf/acegisecurity/util/filtertest-valid.xml");
+                "org/acegisecurity/util/filtertest-valid.xml");
 
         executeFilterInContainerSimulator(config, filter, request, response,
             chain);
@@ -201,7 +201,7 @@ public class FilterToBeanProxyTests extends TestCase {
         MockHttpServletRequest request = new MockHttpServletRequest();
 
         FilterToBeanProxy filter = new MockFilterToBeanProxy(
-                "net/sf/acegisecurity/util/filtertest-valid.xml");
+                "org/acegisecurity/util/filtertest-valid.xml");
 
         executeFilterInContainerSimulator(config, filter, request, response,
             chain);
@@ -211,7 +211,7 @@ public class FilterToBeanProxyTests extends TestCase {
         // Setup our filter
         MockFilterConfig config = new MockFilterConfig();
         config.setInitParmeter("targetClass",
-            "net.sf.acegisecurity.util.MockFilter");
+            "org.acegisecurity.util.MockFilter");
 
         // Setup our expectation that the filter chain will be invoked
         MockFilterChain chain = new MockFilterChain(true);
@@ -220,7 +220,7 @@ public class FilterToBeanProxyTests extends TestCase {
         MockHttpServletRequest request = new MockHttpServletRequest();
 
         FilterToBeanProxy filter = new MockFilterToBeanProxy(
-                "net/sf/acegisecurity/util/filtertest-valid.xml");
+                "org/acegisecurity/util/filtertest-valid.xml");
 
         executeFilterInContainerSimulator(config, filter, request, response,
             chain);
@@ -240,7 +240,7 @@ public class FilterToBeanProxyTests extends TestCase {
         MockHttpServletRequest request = new MockHttpServletRequest();
 
         FilterToBeanProxy filter = new MockFilterToBeanProxy(
-                "net/sf/acegisecurity/util/filtertest-valid.xml");
+                "org/acegisecurity/util/filtertest-valid.xml");
 
         // do not init (which would hapen if called .doFilter)
         filter.destroy();
diff --git a/core/src/test/java/org/acegisecurity/util/MockFilter.java b/core/src/test/java/org/acegisecurity/util/MockFilter.java
index 0bab8dd06e..f637e8247d 100644
--- a/core/src/test/java/org/acegisecurity/util/MockFilter.java
+++ b/core/src/test/java/org/acegisecurity/util/MockFilter.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.util;
+package org.acegisecurity.util;
 
 import java.io.IOException;
 
diff --git a/core/src/test/java/org/acegisecurity/util/MockFilterChain.java b/core/src/test/java/org/acegisecurity/util/MockFilterChain.java
index 14925ed110..a4b5642ea5 100644
--- a/core/src/test/java/org/acegisecurity/util/MockFilterChain.java
+++ b/core/src/test/java/org/acegisecurity/util/MockFilterChain.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.util;
+package org.acegisecurity.util;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/util/MockNotAFilter.java b/core/src/test/java/org/acegisecurity/util/MockNotAFilter.java
index 338ae5dc49..5f14f56823 100644
--- a/core/src/test/java/org/acegisecurity/util/MockNotAFilter.java
+++ b/core/src/test/java/org/acegisecurity/util/MockNotAFilter.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.util;
+package org.acegisecurity.util;
 
 /**
  * A class that is not a filter.
diff --git a/core/src/test/java/org/acegisecurity/util/PortMapperImplTests.java b/core/src/test/java/org/acegisecurity/util/PortMapperImplTests.java
index 048a09401c..f558c985b4 100644
--- a/core/src/test/java/org/acegisecurity/util/PortMapperImplTests.java
+++ b/core/src/test/java/org/acegisecurity/util/PortMapperImplTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.util;
+package org.acegisecurity.util;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/util/PortResolverImplTests.java b/core/src/test/java/org/acegisecurity/util/PortResolverImplTests.java
index 9f98e15cee..0cb1b7fafb 100644
--- a/core/src/test/java/org/acegisecurity/util/PortResolverImplTests.java
+++ b/core/src/test/java/org/acegisecurity/util/PortResolverImplTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.util;
+package org.acegisecurity.util;
 
 import junit.framework.TestCase;
 import org.springframework.mock.web.MockHttpServletRequest;
diff --git a/core/src/test/java/org/acegisecurity/util/StringSplitUtilsTests.java b/core/src/test/java/org/acegisecurity/util/StringSplitUtilsTests.java
index e5ad73f18b..286caf028b 100644
--- a/core/src/test/java/org/acegisecurity/util/StringSplitUtilsTests.java
+++ b/core/src/test/java/org/acegisecurity/util/StringSplitUtilsTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.util;
+package org.acegisecurity.util;
 
 import junit.framework.TestCase;
 
@@ -23,7 +23,7 @@ import java.util.Map;
 
 
 /**
- * Tests {@link net.sf.acegisecurity.util.StringSplitUtils}.
+ * Tests {@link org.acegisecurity.util.StringSplitUtils}.
  *
  * @author Ben Alex
  * @version $Id$
diff --git a/core/src/test/java/org/acegisecurity/vote/AbstractAccessDecisionManagerTests.java b/core/src/test/java/org/acegisecurity/vote/AbstractAccessDecisionManagerTests.java
index b3c4851915..ac4f60c7b8 100644
--- a/core/src/test/java/org/acegisecurity/vote/AbstractAccessDecisionManagerTests.java
+++ b/core/src/test/java/org/acegisecurity/vote/AbstractAccessDecisionManagerTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.SecurityConfig;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.SecurityConfig;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/vote/AffirmativeBasedTests.java b/core/src/test/java/org/acegisecurity/vote/AffirmativeBasedTests.java
index acda9633e2..a4f2e64803 100644
--- a/core/src/test/java/org/acegisecurity/vote/AffirmativeBasedTests.java
+++ b/core/src/test/java/org/acegisecurity/vote/AffirmativeBasedTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.SecurityConfig;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.SecurityConfig;
+import org.acegisecurity.providers.TestingAuthenticationToken;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/vote/AuthenticatedVoterTests.java b/core/src/test/java/org/acegisecurity/vote/AuthenticatedVoterTests.java
index b40dfa8010..79fb13d936 100644
--- a/core/src/test/java/org/acegisecurity/vote/AuthenticatedVoterTests.java
+++ b/core/src/test/java/org/acegisecurity/vote/AuthenticatedVoterTests.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.SecurityConfig;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.providers.anonymous.AnonymousAuthenticationToken;
-import net.sf.acegisecurity.providers.rememberme.RememberMeAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.SecurityConfig;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken;
+import org.acegisecurity.providers.rememberme.RememberMeAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/vote/BasicAclEntryVoterTests.java b/core/src/test/java/org/acegisecurity/vote/BasicAclEntryVoterTests.java
index 9f5c2e4c18..94dc4d7f42 100644
--- a/core/src/test/java/org/acegisecurity/vote/BasicAclEntryVoterTests.java
+++ b/core/src/test/java/org/acegisecurity/vote/BasicAclEntryVoterTests.java
@@ -13,20 +13,20 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AuthorizationServiceException;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.MockAclManager;
-import net.sf.acegisecurity.MockMethodInvocation;
-import net.sf.acegisecurity.SecurityConfig;
-import net.sf.acegisecurity.acl.AclEntry;
-import net.sf.acegisecurity.acl.AclManager;
-import net.sf.acegisecurity.acl.basic.MockAclObjectIdentity;
-import net.sf.acegisecurity.acl.basic.SimpleAclEntry;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.AuthorizationServiceException;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.MockAclManager;
+import org.acegisecurity.MockMethodInvocation;
+import org.acegisecurity.SecurityConfig;
+import org.acegisecurity.acl.AclEntry;
+import org.acegisecurity.acl.AclManager;
+import org.acegisecurity.acl.basic.MockAclObjectIdentity;
+import org.acegisecurity.acl.basic.SimpleAclEntry;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 import org.aopalliance.intercept.MethodInvocation;
 
diff --git a/core/src/test/java/org/acegisecurity/vote/ConsensusBasedTests.java b/core/src/test/java/org/acegisecurity/vote/ConsensusBasedTests.java
index 874fac9e42..57bdaf4f8a 100644
--- a/core/src/test/java/org/acegisecurity/vote/ConsensusBasedTests.java
+++ b/core/src/test/java/org/acegisecurity/vote/ConsensusBasedTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.SecurityConfig;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.SecurityConfig;
+import org.acegisecurity.providers.TestingAuthenticationToken;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/vote/DenyAgainVoter.java b/core/src/test/java/org/acegisecurity/vote/DenyAgainVoter.java
index 8165d06627..65d8ee38fa 100644
--- a/core/src/test/java/org/acegisecurity/vote/DenyAgainVoter.java
+++ b/core/src/test/java/org/acegisecurity/vote/DenyAgainVoter.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 import java.util.Iterator;
 
diff --git a/core/src/test/java/org/acegisecurity/vote/DenyVoter.java b/core/src/test/java/org/acegisecurity/vote/DenyVoter.java
index 0165dedfc4..29b90063b1 100644
--- a/core/src/test/java/org/acegisecurity/vote/DenyVoter.java
+++ b/core/src/test/java/org/acegisecurity/vote/DenyVoter.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ConfigAttribute;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
 
 import java.util.Iterator;
 
diff --git a/core/src/test/java/org/acegisecurity/vote/SomeDomainObject.java b/core/src/test/java/org/acegisecurity/vote/SomeDomainObject.java
index 85582d90c3..7f85760ac9 100644
--- a/core/src/test/java/org/acegisecurity/vote/SomeDomainObject.java
+++ b/core/src/test/java/org/acegisecurity/vote/SomeDomainObject.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
 /**
  * Simple domain object, used by {@link BasicAclEntryVoterTests}.
diff --git a/core/src/test/java/org/acegisecurity/vote/SomeDomainObjectManager.java b/core/src/test/java/org/acegisecurity/vote/SomeDomainObjectManager.java
index 127b0c6b33..741f3963cd 100644
--- a/core/src/test/java/org/acegisecurity/vote/SomeDomainObjectManager.java
+++ b/core/src/test/java/org/acegisecurity/vote/SomeDomainObjectManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
 /**
  * Used by {@link BasicAclEntryVoterTests} so it can create a
diff --git a/core/src/test/java/org/acegisecurity/vote/UnanimousBasedTests.java b/core/src/test/java/org/acegisecurity/vote/UnanimousBasedTests.java
index c8e1a711ed..a1c986bde5 100644
--- a/core/src/test/java/org/acegisecurity/vote/UnanimousBasedTests.java
+++ b/core/src/test/java/org/acegisecurity/vote/UnanimousBasedTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.vote;
+package org.acegisecurity.vote;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.SecurityConfig;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.SecurityConfig;
+import org.acegisecurity.providers.TestingAuthenticationToken;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestFilterTests.java b/core/src/test/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestFilterTests.java
index 08c4c06aa6..fe3f2b0fb3 100644
--- a/core/src/test/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestFilterTests.java
+++ b/core/src/test/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestFilterTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.wrapper;
+package org.acegisecurity.wrapper;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.MockFilterConfig;
+import org.acegisecurity.MockFilterConfig;
 
-import net.sf.acegisecurity.wrapper.SecurityContextHolderAwareRequestFilter;
-import net.sf.acegisecurity.wrapper.SecurityContextHolderAwareRequestWrapper;
+import org.acegisecurity.wrapper.SecurityContextHolderAwareRequestFilter;
+import org.acegisecurity.wrapper.SecurityContextHolderAwareRequestWrapper;
 
 import java.io.IOException;
 
diff --git a/core/src/test/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestWrapperTests.java b/core/src/test/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestWrapperTests.java
index 28b9144f12..99d608d1e0 100644
--- a/core/src/test/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestWrapperTests.java
+++ b/core/src/test/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestWrapperTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.wrapper;
+package org.acegisecurity.wrapper;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
-import net.sf.acegisecurity.providers.dao.User;
-import net.sf.acegisecurity.wrapper.SecurityContextHolderAwareRequestWrapper;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.providers.dao.User;
+import org.acegisecurity.wrapper.SecurityContextHolderAwareRequestWrapper;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 
diff --git a/core/src/test/resources/org/acegisecurity/applicationContext.xml b/core/src/test/resources/org/acegisecurity/applicationContext.xml
index 157200b574..290ff6f467 100644
--- a/core/src/test/resources/org/acegisecurity/applicationContext.xml
+++ b/core/src/test/resources/org/acegisecurity/applicationContext.xml
@@ -21,10 +21,10 @@
 
 
    
-   
+   
 
    
-   
+   
 
    
    
diff --git a/core/src/test/resources/org/acegisecurity/intercept/method/aopalliance/applicationContext.xml b/core/src/test/resources/org/acegisecurity/intercept/method/aopalliance/applicationContext.xml
index b79f1af8a5..5cb60fde4d 100644
--- a/core/src/test/resources/org/acegisecurity/intercept/method/aopalliance/applicationContext.xml
+++ b/core/src/test/resources/org/acegisecurity/intercept/method/aopalliance/applicationContext.xml
@@ -20,31 +20,31 @@
 
 
 
-	
-	
-	
-	
+	
+	
+	
+	
 
-   
+   
 
-	
+	
 		
 		
 		
 		
 		
 			
-				net.sf.acegisecurity.ITargetObject.makeLower*=MOCK_LOWER
-				net.sf.acegisecurity.ITargetObject.makeUpper*=MOCK_UPPER,RUN_AS
-				net.sf.acegisecurity.ITargetObject.computeHashCode*=MOCK_HASH,AFTER_INVOCATION_MOCK
+				org.acegisecurity.ITargetObject.makeLower*=MOCK_LOWER
+				org.acegisecurity.ITargetObject.makeUpper*=MOCK_UPPER,RUN_AS
+				org.acegisecurity.ITargetObject.computeHashCode*=MOCK_HASH,AFTER_INVOCATION_MOCK
 			
 		
 	
 	
-	
+	
 
     
-      net.sf.acegisecurity.ITargetObject
+      org.acegisecurity.ITargetObject
       
          
             
diff --git a/core/src/test/resources/org/acegisecurity/intercept/method/applicationContext.xml b/core/src/test/resources/org/acegisecurity/intercept/method/applicationContext.xml
index d5579d4a63..608028eec7 100644
--- a/core/src/test/resources/org/acegisecurity/intercept/method/applicationContext.xml
+++ b/core/src/test/resources/org/acegisecurity/intercept/method/applicationContext.xml
@@ -20,16 +20,16 @@
 
 
 
-	
-	
-	
-	
+	
+	
+	
+	
 
-	
+	
 		
 	
 	
-	
+	
 		
 		
 		
@@ -38,10 +38,10 @@
 		
 	
 	
-	
+	
 
     
-      net.sf.acegisecurity.ITargetObject
+      org.acegisecurity.ITargetObject
       
          
             
@@ -50,6 +50,6 @@
       
     
 
-   
+   
 
 
diff --git a/core/src/test/resources/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.conf b/core/src/test/resources/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.conf
index 272ca7c1af..0de33f9462 100644
--- a/core/src/test/resources/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.conf
+++ b/core/src/test/resources/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.conf
@@ -1,3 +1,3 @@
 JAASTest2 {
-    net.sf.acegisecurity.providers.jaas.TestLoginModule required;
+    org.acegisecurity.providers.jaas.TestLoginModule required;
 };
\ No newline at end of file
diff --git a/core/src/test/resources/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.xml b/core/src/test/resources/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.xml
index 8f243755ef..4b2dc16ff5 100644
--- a/core/src/test/resources/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.xml
+++ b/core/src/test/resources/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.xml
@@ -5,25 +5,25 @@
 
 
 
-    
+    
 
-    
+    
         
             JAASTest
         
         
-            classpath:net/sf/acegisecurity/providers/jaas/login.conf
+            classpath:org/acegisecurity/providers/jaas/login.conf
         
         
             
-                
-                
-                
+                
+                
+                
             
         
         
             
-                
+                
             
         
     
diff --git a/core/src/test/resources/org/acegisecurity/providers/jaas/login.conf b/core/src/test/resources/org/acegisecurity/providers/jaas/login.conf
index e8e36f32ac..f9ccb89597 100644
--- a/core/src/test/resources/org/acegisecurity/providers/jaas/login.conf
+++ b/core/src/test/resources/org/acegisecurity/providers/jaas/login.conf
@@ -1,3 +1,3 @@
 JAASTest {
-    net.sf.acegisecurity.providers.jaas.TestLoginModule required;
+    org.acegisecurity.providers.jaas.TestLoginModule required;
 };
\ No newline at end of file
diff --git a/core/src/test/resources/org/acegisecurity/ui/basicauth/filtertest-valid.xml b/core/src/test/resources/org/acegisecurity/ui/basicauth/filtertest-valid.xml
index 08c20c8af0..bb2c2e9c57 100644
--- a/core/src/test/resources/org/acegisecurity/ui/basicauth/filtertest-valid.xml
+++ b/core/src/test/resources/org/acegisecurity/ui/basicauth/filtertest-valid.xml
@@ -22,7 +22,7 @@
 
 
 	
-	
+	
   		
 			
 				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
@@ -34,12 +34,12 @@
 	
 	
 	
-	
+	
      	
 	
 
 	
-	
+	
 		
 		  
 		    
@@ -47,12 +47,12 @@
 		
 	
 
-	
+	
 		
 		
 	
 
-	
+	
 		Test Suite Realm
 	
 
diff --git a/core/src/test/resources/org/acegisecurity/ui/digestauth/filtertest-valid.xml b/core/src/test/resources/org/acegisecurity/ui/digestauth/filtertest-valid.xml
index eb1d789d9f..d55282918e 100644
--- a/core/src/test/resources/org/acegisecurity/ui/digestauth/filtertest-valid.xml
+++ b/core/src/test/resources/org/acegisecurity/ui/digestauth/filtertest-valid.xml
@@ -22,7 +22,7 @@
 
 
 	
-	
+	
   		
 			
 				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
@@ -34,12 +34,12 @@
 	
 	
 	
-	
+	
      	
 	
 
 	
-	
+	
 		
 		  
 		    
@@ -47,12 +47,12 @@
 		
 	
 
-   
+   
       
       
    
 
-   
+   
       Contacts Realm via Digest Authentication
       acegi
       1000
diff --git a/core/src/test/resources/org/acegisecurity/ui/webapp/filtertest-valid.xml b/core/src/test/resources/org/acegisecurity/ui/webapp/filtertest-valid.xml
index a13d85cd8b..047d67cb8d 100644
--- a/core/src/test/resources/org/acegisecurity/ui/webapp/filtertest-valid.xml
+++ b/core/src/test/resources/org/acegisecurity/ui/webapp/filtertest-valid.xml
@@ -22,7 +22,7 @@
 
 
 	
-	
+	
   		
 			
 				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
@@ -34,12 +34,12 @@
 	
 	
 	
-	
+	
      	
 	
 
 	
-	
+	
 		
 		  
 		    
@@ -47,7 +47,7 @@
 		
 	
 
-	
+	
 		
 		/failed.jsp
 		/
diff --git a/core/src/test/resources/org/acegisecurity/util/filtertest-valid.xml b/core/src/test/resources/org/acegisecurity/util/filtertest-valid.xml
index 9dec34f55e..5e312a5dab 100644
--- a/core/src/test/resources/org/acegisecurity/util/filtertest-valid.xml
+++ b/core/src/test/resources/org/acegisecurity/util/filtertest-valid.xml
@@ -21,13 +21,13 @@
 
 
 
-	
+	
 
-	
+	
 
-	
+	
 
-	
+	
       
          
 		    CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
diff --git a/doc/docbook/acegi.xml b/doc/docbook/acegi.xml
index aa2e6c73b8..1850412e2d 100644
--- a/doc/docbook/acegi.xml
+++ b/doc/docbook/acegi.xml
@@ -218,8 +218,8 @@
         be written so this becomes possible.
 
         Each secure object has its own package under
-        net.sf.acegisecurity.intercept. Every other package
-        in the security system is secure object independent, in that it can
+        org.acegisecurity.intercept. Every other package in
+        the security system is secure object independent, in that it can
         support any type of secure object presented.
 
         Only developers contemplating an entirely new way of
@@ -519,7 +519,7 @@
         MethodSecurityInterceptor itself is configured as
         follows:
 
-        <bean id="bankManagerSecurity" class="net.sf.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor">
+        <bean id="bankManagerSecurity" class="org.acegisecurity.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>
@@ -527,8 +527,8 @@
   <property name="afterInvocationManager"><ref bean="afterInvocationManager"/></property>
   <property name="objectDefinitionSource">
     <value>
-      net.sf.acegisecurity.context.BankManager.delete*=ROLE_SUPERVISOR,RUN_AS_SERVER
-      net.sf.acegisecurity.context.BankManager.getBalance=ROLE_TELLER,ROLE_SUPERVISOR,BANKSECURITY_CUSTOMER,RUN_AS_SERVER
+      org.acegisecurity.context.BankManager.delete*=ROLE_SUPERVISOR,RUN_AS_SERVER
+      org.acegisecurity.context.BankManager.getBalance=ROLE_TELLER,ROLE_SUPERVISOR,BANKSECURITY_CUSTOMER,RUN_AS_SERVER
     </value>
   </property>
 </bean>
@@ -582,11 +582,11 @@
         bean context will be configured differently:
 
         <bean id="attributes" class="org.springframework.metadata.commons.CommonsAttributes"/>
-<bean id="objectDefinitionSource" class="net.sf.acegisecurity.intercept.method.MethodDefinitionAttributes">
+<bean id="objectDefinitionSource" class="org.acegisecurity.intercept.method.MethodDefinitionAttributes">
   <property name="attributes"><ref local="attributes"/></property>
 </bean>
 
-<bean id="bankManagerSecurity" class="net.sf.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor">
+<bean id="bankManagerSecurity" class="org.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor">
   <property name="validateConfigAttributes"><value>false</value></property>
   <property name="authenticationManager"><ref bean="authenticationManager"/></property>
   <property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property>
@@ -628,12 +628,12 @@
         If you are using the Spring Security Java 5 Annotations
         approach, your bean context will be configured as follows:
 
-        <bean id="attributes" class="net.sf.acegisecurity.annotation.SecurityAnnotationAttributes"/>
-<bean id="objectDefinitionSource" class="net.sf.acegisecurity.intercept.method.MethodDefinitionAttributes">
+        <bean id="attributes" class="org.acegisecurity.annotation.SecurityAnnotationAttributes"/>
+<bean id="objectDefinitionSource" class="org.acegisecurity.intercept.method.MethodDefinitionAttributes">
   <property name="attributes"><ref local="attributes"/></property>
 </bean>
 
-<bean id="bankManagerSecurity" class="net.sf.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor">
+<bean id="bankManagerSecurity" class="org.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor">
   <property name="validateConfigAttributes"><value>false</value></property>
   <property name="authenticationManager"><ref bean="authenticationManager"/></property>
   <property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property>
@@ -648,7 +648,7 @@
         attributes, and results in the same security configuration as provided
         by the property editor approach:
 
-        import net.sf.acegisecurity.annotation.Secured;
+        import org.acegisecurity.annotation.Secured;
 
 public interface BankManager {
 
@@ -709,7 +709,7 @@ public interface BankManager {
         AspectJSecurityInterceptor is configured in the
         Spring application context:
 
-        <bean id="bankManagerSecurity" class="net.sf.acegisecurity.intercept.method.aspectj.AspectJSecurityInterceptor">
+        <bean id="bankManagerSecurity" class="org.acegisecurity.intercept.method.aspectj.AspectJSecurityInterceptor">
   <property name="validateConfigAttributes"><value>true</value></property>
   <property name="authenticationManager"><ref bean="authenticationManager"/></property>
   <property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property>
@@ -717,8 +717,8 @@ public interface BankManager {
   <property name="afterInvocationManager"><ref bean="afterInvocationManager"/></property>
   <property name="objectDefinitionSource">
     <value>
-      net.sf.acegisecurity.context.BankManager.delete*=ROLE_SUPERVISOR,RUN_AS_SERVER
-      net.sf.acegisecurity.context.BankManager.getBalance=ROLE_TELLER,ROLE_SUPERVISOR,BANKSECURITY_CUSTOMER,RUN_AS_SERVER
+      org.acegisecurity.context.BankManager.delete*=ROLE_SUPERVISOR,RUN_AS_SERVER
+      org.acegisecurity.context.BankManager.getBalance=ROLE_TELLER,ROLE_SUPERVISOR,BANKSECURITY_CUSTOMER,RUN_AS_SERVER
     </value>
   </property>
 </bean>
@@ -738,10 +738,10 @@ public interface BankManager {
         Next you'll need to define an AspectJ aspect.
         For example:
 
-        package net.sf.acegisecurity.samples.aspectj;
+        package org.acegisecurity.samples.aspectj;
 
-import net.sf.acegisecurity.intercept.method.aspectj.AspectJSecurityInterceptor;
-import net.sf.acegisecurity.intercept.method.aspectj.AspectJCallback;
+import org.acegisecurity.intercept.method.aspectj.AspectJSecurityInterceptor;
+import org.acegisecurity.intercept.method.aspectj.AspectJCallback;
 import org.springframework.beans.factory.InitializingBean;
 
 public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
@@ -794,7 +794,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
         declaration which achieves this is shown below:
 
         <bean id="domainObjectInstanceSecurityAspect" 
-    class="net.sf.acegisecurity.samples.aspectj.DomainObjectInstanceSecurityAspect"
+    class="org.acegisecurity.samples.aspectj.DomainObjectInstanceSecurityAspect"
     factory-method="aspectOf">
   <property name="securityInterceptor"><ref bean="aspectJSecurityInterceptor"/></property>
 </bean>
@@ -813,10 +813,10 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
         the SecurityEnforcementFilter. A typical
         configuration example is provided below: <filter>
   <filter-name>Acegi HTTP Request Security Filter</filter-name>
-  <filter-class>net.sf.acegisecurity.util.FilterToBeanProxy</filter-class>
+  <filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class>
   <init-param>
     <param-name>targetClass</param-name>
-    <param-value>net.sf.acegisecurity.intercept.web.SecurityEnforcementFilter</param-value>
+    <param-value>org.acegisecurity.intercept.web.SecurityEnforcementFilter</param-value>
   </init-param>
 </filter>
 
@@ -833,17 +833,17 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
         In the application context you will need to configure three
         beans:
 
-        <bean id="securityEnforcementFilter" class="net.sf.acegisecurity.intercept.web.SecurityEnforcementFilter">
+        <bean id="securityEnforcementFilter" class="org.acegisecurity.intercept.web.SecurityEnforcementFilter">
   <property name="filterSecurityInterceptor"><ref bean="filterInvocationInterceptor"/></property>
   <property name="authenticationEntryPoint"><ref bean="authenticationEntryPoint"/></property>
 </bean>
 
-<bean id="authenticationEntryPoint" class="net.sf.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint">
+<bean id="authenticationEntryPoint" class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint">
   <property name="loginFormUrl"><value>/acegilogin.jsp</value></property>
   <property name="forceHttps"><value>false</value></property>
 </bean>
 
-<bean id="filterInvocationInterceptor" class="net.sf.acegisecurity.intercept.web.FilterSecurityInterceptor">
+<bean id="filterInvocationInterceptor" class="org.acegisecurity.intercept.web.FilterSecurityInterceptor">
   <property name="authenticationManager"><ref bean="authenticationManager"/></property>
   <property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property>
   <property name="runAsManager"><ref bean="runAsManager"/></property>
@@ -938,7 +938,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
         earlier configuration could be generated using Apache Ant paths as
         follows:
 
-        <bean id="filterInvocationInterceptor" class="net.sf.acegisecurity.intercept.web.FilterSecurityInterceptor">
+        <bean id="filterInvocationInterceptor" class="org.acegisecurity.intercept.web.FilterSecurityInterceptor">
   <property name="authenticationManager"><ref bean="authenticationManager"/></property>
   <property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property>
   <property name="runAsManager"><ref bean="runAsManager"/></property>
@@ -1115,7 +1115,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
         ProviderManager, is configured via the bean context
         with a list of AuthenticationProviders:
 
-        <bean id="authenticationManager" class="net.sf.acegisecurity.providers.ProviderManager">
+        <bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
   <property name="providers">
     <list>
       <ref bean="daoAuthenticationProvider"/>
@@ -1145,8 +1145,8 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
         supoprt, and it also converts any exceptions thrown by an
         AuthenticationProvider and publishes a suitable
         event. The events that are published are located in the
-        net.sf.acegisecurity.event.authentication package
-        and advanced users can map different exceptions to different events by
+        org.acegisecurity.event.authentication package and
+        advanced users can map different exceptions to different events by
         configuring the ProviderManager.exceptionMappings
         property (generally this is not required and the default event
         propagation is appropriate - especially as events will simply be
@@ -1227,11 +1227,11 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
         following to web.xml:
 
         <listener>
-  <listener-class>net.sf.acegisecurity.ui.session.HttpSessionEventPublisher</listener-class>
+  <listener-class>org.acegisecurity.ui.session.HttpSessionEventPublisher</listener-class>
 </listener>
 
         In addition, you will need to add the
-        net.sf.acegisecurity.concurrent.ConcurrentSessionFilter
+        org.acegisecurity.concurrent.ConcurrentSessionFilter
         to your FilterChainProxy. The
         ConcurrentSessionFilter requires only one property, sessionRegistry,
         which generally points to an instance of
@@ -1249,19 +1249,19 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
         ConcurrentSessionControllerImpl and refer to it
         from your ProviderManager bean:
 
-        <bean id="authenticationManager" class="net.sf.acegisecurity.providers.ProviderManager">
+        <bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
   <property name="providers">
     <!-- your providers go here -->
   </property>
   <property name="sessionController"><ref bean="concurrentSessionController"/></property>
 </bean>
 
-<bean id="concurrentSessionController" class="net.sf.acegisecurity.concurrent.ConcurrentSessionControllerImpl">
+<bean id="concurrentSessionController" class="org.acegisecurity.concurrent.ConcurrentSessionControllerImpl">
   <property name="maxSessions"><value>1</value></property>
   <property name="sessionRegistry"><ref local="sessionRegistry"/></property>
 </bean>
 
-<bean id="sessionRegistry" class="net.sf.acegisecurity.concurrent.SessionRegistryImpl"/>
+<bean id="sessionRegistry" class="org.acegisecurity.concurrent.SessionRegistryImpl"/>
       
 
       
@@ -1275,7 +1275,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
         authentication details from a data access object configured at bean
         creation time:
 
-        <bean id="daoAuthenticationProvider" class="net.sf.acegisecurity.providers.dao.DaoAuthenticationProvider">
+        <bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
   <property name="authenticationDao"><ref bean="inMemoryDaoImpl"/></property>
   <property name="saltSource"><ref bean="saltSource"/></property>
   <property name="passwordEncoder"><ref bean="passwordEncoder"/></property>
@@ -1310,7 +1310,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
         EhCacheBasedUserCache, which is configured as
         follows:
 
-        <bean id="daoAuthenticationProvider" class="net.sf.acegisecurity.providers.dao.DaoAuthenticationProvider">
+        <bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
   <property name="authenticationDao"><ref bean="authenticationDao"/></property>
   <property name="userCache"><ref bean="userCache"/></property>
 </bean>
@@ -1330,7 +1330,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
   </property>
 </bean>
    
-<bean id="userCache" class="net.sf.acegisecurity.providers.dao.cache.EhCacheBasedUserCache">
+<bean id="userCache" class="org.acegisecurity.providers.dao.cache.EhCacheBasedUserCache">
   <property name="cache"><ref local="userCacheBackend"/></property>
 </bean>
 
@@ -1405,7 +1405,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
         authentication repository in the application context itself using the
         InMemoryDaoImpl:
 
-        <bean id="inMemoryDaoImpl" class="net.sf.acegisecurity.providers.dao.memory.InMemoryDaoImpl">
+        <bean id="inMemoryDaoImpl" class="org.acegisecurity.providers.dao.memory.InMemoryDaoImpl">
   <property name="userMap">
     <value>
       marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
@@ -1454,7 +1454,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
   <property name="password"><value></value></property>
 </bean>
 
-<bean id="jdbcDaoImpl" class="net.sf.acegisecurity.providers.dao.jdbc.JdbcDaoImpl">
+<bean id="jdbcDaoImpl" class="org.acegisecurity.providers.dao.jdbc.JdbcDaoImpl">
   <property name="dataSource"><ref bean="dataSource"/></property>
 </bean>
 
@@ -1502,7 +1502,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
           application context. The following definitions would correspond to
           the above JAAS login configuration file:
 
-          <bean id="jaasAuthenticationProvider" class="net.sf.acegisecurity.providers.jaas.JaasAuthenticationProvider">
+          <bean id="jaasAuthenticationProvider" class="org.acegisecurity.providers.jaas.JaasAuthenticationProvider">
   <property name="loginConfig">
     <value>/WEB-INF/login.conf</value>
   </property>
@@ -1511,13 +1511,13 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
   </property>
   <property name="callbackHandlers">
     <list>
-      <bean class="net.sf.acegisecurity.providers.jaas.JaasNameCallbackHandler"/>
-      <bean class="net.sf.acegisecurity.providers.jaas.JaasPasswordCallbackHandler"/>
+      <bean class="org.acegisecurity.providers.jaas.JaasNameCallbackHandler"/>
+      <bean class="org.acegisecurity.providers.jaas.JaasPasswordCallbackHandler"/>
     </list>
   </property>
   <property name="authorityGranters">
     <list>
-      <bean class="net.sf.acegisecurity.providers.jaas.TestAuthorityGranter"/>
+      <bean class="org.acegisecurity.providers.jaas.TestAuthorityGranter"/>
     </list>
   </property>
 </bean>
@@ -1597,7 +1597,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
         Siteminder Authentication
 
         Acegi Security provides a web filter
-        (net.sf.acegisecurity.ui.webapp.SiteminderAuthenticationProcessingFilter)
+        (org.acegisecurity.ui.webapp.SiteminderAuthenticationProcessingFilter)
         that can be used to process requests that have been pre-authenticated
         by Computer Associates' Siteminder. This filter assumes that you're
         using Siteminder for authentication, and your
@@ -1630,7 +1630,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
           both.
 
              <!-- ======================== SITEMINDER AUTHENTICATION PROCESSING FILTER ======================= --> 
-   <bean id="authenticationProcessingFilter" class="net.sf.acegisecurity.ui.webapp.SiteminderAuthenticationProcessingFilter">
+   <bean id="authenticationProcessingFilter" class="org.acegisecurity.ui.webapp.SiteminderAuthenticationProcessingFilter">
       <property name="authenticationManager"><ref bean="authenticationManager"/></property>
       <property name="authenticationFailureUrl"><value>/login.jsp?login_error=1</value></property>
       <property name="defaultTargetUrl"><value>/security.do?method=getMainMenu</value></property>
@@ -1648,7 +1648,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
       - The top-level Authentication Manager is responsible for all application AUTHENTICATION
       - operations.  Note that it must reference one or more provider(s) defined below.
       -->
-    <bean id="authenticationManager" class="net.sf.acegisecurity.providers.ProviderManager">
+    <bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
         <property name="providers">
             <list>
                 <ref local="daoAuthenticationProvider"/>
@@ -1679,7 +1679,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
       - The web.xml file has a single filter reference to this top-level bean, which
       - invokes the chain of sub-filters specified below.
       --> 
-    <bean id="filterChainProxy" class="net.sf.acegisecurity.util.FilterChainProxy">
+    <bean id="filterChainProxy" class="org.acegisecurity.util.FilterChainProxy">
       <property name="filterInvocationDefinitionSource">
          <value>
              CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
@@ -1942,26 +1942,26 @@ public boolean supports(Class clazz);
         designed to have multiple instances in the same application context,
         such as:
 
-        <bean id="aclContactReadVoter" class="net.sf.acegisecurity.vote.BasicAclEntryVoter">
+        <bean id="aclContactReadVoter" class="org.acegisecurity.vote.BasicAclEntryVoter">
   <property name="processConfigAttribute"><value>ACL_CONTACT_READ</value></property>
   <property name="processDomainObjectClass"><value>sample.contact.Contact</value></property>
   <property name="aclManager"><ref local="aclManager"/></property>
   <property name="requirePermission">
     <list>
-      <ref local="net.sf.acegisecurity.acl.basic.SimpleAclEntry.ADMINISTRATION"/>
-      <ref local="net.sf.acegisecurity.acl.basic.SimpleAclEntry.READ"/>
+      <ref local="org.acegisecurity.acl.basic.SimpleAclEntry.ADMINISTRATION"/>
+      <ref local="org.acegisecurity.acl.basic.SimpleAclEntry.READ"/>
     </list>
   </property>
 </bean>
 
-<bean id="aclContactDeleteVoter" class="net.sf.acegisecurity.vote.BasicAclEntryVoter">
+<bean id="aclContactDeleteVoter" class="org.acegisecurity.vote.BasicAclEntryVoter">
   <property name="processConfigAttribute"><value>ACL_CONTACT_DELETE</value></property>
   <property name="processDomainObjectClass"><value>sample.contact.Contact</value></property>
   <property name="aclManager"><ref local="aclManager"/></property>
   <property name="requirePermission">
     <list>
-      <ref local="net.sf.acegisecurity.acl.basic.SimpleAclEntry.ADMINISTRATION"/>
-      <ref local="net.sf.acegisecurity.acl.basic.SimpleAclEntry.DELETE"/>
+      <ref local="org.acegisecurity.acl.basic.SimpleAclEntry.ADMINISTRATION"/>
+      <ref local="org.acegisecurity.acl.basic.SimpleAclEntry.DELETE"/>
     </list>
   </property>
 </bean>
@@ -2257,12 +2257,12 @@ public boolean supports(Class clazz);
         BasicAclAfterInvocationProvider delivers a
         solution, and is configured as follows:
 
-        <bean id="afterAclRead" class="net.sf.acegisecurity.afterinvocation.BasicAclEntryAfterInvocationProvider">
+        <bean id="afterAclRead" class="org.acegisecurity.afterinvocation.BasicAclEntryAfterInvocationProvider">
   <property name="aclManager"><ref local="aclManager"/></property>
   <property name="requirePermission">
     <list>
-      <ref local="net.sf.acegisecurity.acl.basic.SimpleAclEntry.ADMINISTRATION"/>
-      <ref local="net.sf.acegisecurity.acl.basic.SimpleAclEntry.READ"/>
+      <ref local="org.acegisecurity.acl.basic.SimpleAclEntry.ADMINISTRATION"/>
+      <ref local="org.acegisecurity.acl.basic.SimpleAclEntry.READ"/>
     </list>
   </property>
 </bean>
@@ -2285,12 +2285,12 @@ public boolean supports(Class clazz);
         an AccessDeniedException - simply silently removes
         the offending elements. The provider is configured as follows:
 
-        <bean id="afterAclCollectionRead" class="net.sf.acegisecurity.afterinvocation.BasicAclEntryAfterInvocationCollectionFilteringProvider">
+        <bean id="afterAclCollectionRead" class="org.acegisecurity.afterinvocation.BasicAclEntryAfterInvocationCollectionFilteringProvider">
   <property name="aclManager"><ref local="aclManager"/></property>
   <property name="requirePermission">
     <list>
-      <ref local="net.sf.acegisecurity.acl.basic.SimpleAclEntry.ADMINISTRATION"/>
-      <ref local="net.sf.acegisecurity.acl.basic.SimpleAclEntry.READ"/>
+      <ref local="org.acegisecurity.acl.basic.SimpleAclEntry.ADMINISTRATION"/>
+      <ref local="org.acegisecurity.acl.basic.SimpleAclEntry.READ"/>
     </list>
   </property>
 </bean>
@@ -2395,9 +2395,9 @@ public boolean supports(Class clazz);
         RunAsImplAuthenticationProvider is created in the
         bean context with the same key:
 
-        <bean id="runAsManager" class="net.sf.acegisecurity.runas.RunAsManagerImpl">
+        <bean id="runAsManager" class="org.acegisecurity.runas.RunAsManagerImpl">
   <property name="key"><value>my_run_as_password</value></property>
-</bean><bean id="runAsAuthenticationProvider" class="net.sf.acegisecurity.runas.RunAsImplAuthenticationProvider">
+</bean><bean id="runAsAuthenticationProvider" class="org.acegisecurity.runas.RunAsImplAuthenticationProvider">
   <property name="key"><value>my_run_as_password</value></property>
 </bean>
 
@@ -2424,7 +2424,7 @@ public boolean supports(Class clazz);
         make this process transparent in many situations. We call these
         classes "authentication mechanisms".
 
-        The net.sf.acegisecurity.ui package provides
+        The org.acegisecurity.ui package provides
         what we call "authentication processing mechanisms". An authentication
         processing mechanism is solely concerned with received an
         authentication request from the principal, testing if it seems valid,
@@ -2475,10 +2475,10 @@ public boolean supports(Class clazz);
 
         <filter>
   <filter-name>Acegi Authentication Processing Filter</filter-name>
-  <filter-class>net.sf.acegisecurity.util.FilterToBeanProxy</filter-class>
+  <filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class>
   <init-param>
     <param-name>targetClass</param-name>
-    <param-value>net.sf.acegisecurity.ui.webapp.AuthenticationProcessingFilter</param-value>
+    <param-value>org.acegisecurity.ui.webapp.AuthenticationProcessingFilter</param-value>
   </init-param>
 </filter>
 
@@ -2491,7 +2491,7 @@ public boolean supports(Class clazz);
         refer to the Filters section. The application context will need to
         define the AuthenticationProcessingFilter:
 
-        <bean id="authenticationProcessingFilter" class="net.sf.acegisecurity.ui.webapp.AuthenticationProcessingFilter">
+        <bean id="authenticationProcessingFilter" class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilter">
   <property name="authenticationManager"><ref bean="authenticationManager"/></property>
   <property name="authenticationFailureUrl"><value>/acegilogin.jsp?login_error=1</value></property>
   <property name="defaultTargetUrl"><value>/</value></property>
@@ -2551,12 +2551,12 @@ public boolean supports(Class clazz);
         BasicProcessingFilter and its required
         collaborator:
 
-        <bean id="basicProcessingFilter" class="net.sf.acegisecurity.ui.basicauth.BasicProcessingFilter">
+        <bean id="basicProcessingFilter" class="org.acegisecurity.ui.basicauth.BasicProcessingFilter">
   <property name="authenticationManager"><ref bean="authenticationManager"/></property>
   <property name="authenticationEntryPoint"><ref bean="authenticationEntryPoint"/></property>
 </bean>
 
-<bean id="authenticationEntryPoint" class="net.sf.acegisecurity.ui.basicauth.BasicProcessingFilterEntryPoint">
+<bean id="authenticationEntryPoint" class="org.acegisecurity.ui.basicauth.BasicProcessingFilterEntryPoint">
   <property name="realmName"><value>Name Of Your Realm</value></property>
 </bean>
 
@@ -2661,13 +2661,13 @@ key:              A private key to prevent modification of the nonce token
         DigestProcessingFilter and its required
         collaborators:
 
-        <bean id="digestProcessingFilter" class="net.sf.acegisecurity.ui.digestauth.DigestProcessingFilter">
+        <bean id="digestProcessingFilter" class="org.acegisecurity.ui.digestauth.DigestProcessingFilter">
   <property name="authenticationDao"><ref local="jdbcDaoImpl"/></property>
   <property name="authenticationEntryPoint"><ref local="digestProcessingFilterEntryPoint"/></property>
   <property name="userCache"><ref local="userCache"/></property>
 </bean>
 
-<bean id="digestProcessingFilterEntryPoint" class="net.sf.acegisecurity.ui.digestauth.DigestProcessingFilterEntryPoint">
+<bean id="digestProcessingFilterEntryPoint" class="org.acegisecurity.ui.digestauth.DigestProcessingFilterEntryPoint">
   <property name="realmName"><value>Contacts Realm via Digest Authentication</value></property>
   <property name="key"><value>acegi</value></property>
   <property name="nonceValiditySeconds"><value>10</value></property>
@@ -2742,12 +2742,12 @@ key:              A private key to prevent modification of the nonce token
         Authentication held there. The definition of the
         filter and authentication provider appears as follows:
 
-        <bean id="anonymousProcessingFilter" class="net.sf.acegisecurity.providers.anonymous.AnonymousProcessingFilter">
+        <bean id="anonymousProcessingFilter" class="org.acegisecurity.providers.anonymous.AnonymousProcessingFilter">
   <property name="key"><value>foobar</value></property>
   <property name="userAttribute"><value>anonymousUser,ROLE_ANONYMOUS</value></property>
 </bean>
 
-<bean id="anonymousAuthenticationProvider" class="net.sf.acegisecurity.providers.anonymous.AnonymousAuthenticationProvider">
+<bean id="anonymousAuthenticationProvider" class="org.acegisecurity.providers.anonymous.AnonymousAuthenticationProvider">
   <property name="key"><value>foobar</value></property>
 </bean>
 
@@ -2764,7 +2764,7 @@ key:              A private key to prevent modification of the nonce token
         that all URI patterns can have security applied to them. For
         example:
 
-        <bean id="filterInvocationInterceptor" class="net.sf.acegisecurity.intercept.web.FilterSecurityInterceptor">
+        <bean id="filterInvocationInterceptor" class="org.acegisecurity.intercept.web.FilterSecurityInterceptor">
   <property name="authenticationManager"><ref bean="authenticationManager"/></property>
   <property name="accessDecisionManager"><ref local="httpRequestAccessDecisionManager"/></property>
   <property name="objectDefinitionSource">
@@ -2881,16 +2881,16 @@ key:              A private key to prevent modification of the remember-me token
         The beans required in an application context to enable
         remember-me services are as follows:
 
-        <bean id="rememberMeProcessingFilter" class="net.sf.acegisecurity.ui.rememberme.RememberMeProcessingFilter">
+        <bean id="rememberMeProcessingFilter" class="org.acegisecurity.ui.rememberme.RememberMeProcessingFilter">
   <property name="rememberMeServices"><ref local="rememberMeServices"/></property>
 </bean>
 
-<bean id="rememberMeServices" class="net.sf.acegisecurity.ui.rememberme.TokenBasedRememberMeServices">
+<bean id="rememberMeServices" class="org.acegisecurity.ui.rememberme.TokenBasedRememberMeServices">
   <property name="authenticationDao"><ref local="jdbcDaoImpl"/></property>
   <property name="key"><value>springRocks</value></property>
 </bean>
    
-<bean id="rememberMeAuthenticationProvider" class="net.sf.acegisecurity.providers.rememberme.RememberMeAuthenticationProvider">
+<bean id="rememberMeAuthenticationProvider" class="org.acegisecurity.providers.rememberme.RememberMeAuthenticationProvider">
   <property name="key"><value>springRocks</value></property>
 </bean>Don't forget to add your
         RememberMeServices implementation to your
@@ -2991,7 +2991,7 @@ key:              A private key to prevent modification of the remember-me token
         to be validated by the AuthByAdapterProvider. This
         authentication provider is defined as follows:
 
-        <bean id="authByAdapterProvider" class="net.sf.acegisecurity.adapters.AuthByAdapterProvider">
+        <bean id="authByAdapterProvider" class="org.acegisecurity.adapters.AuthByAdapterProvider">
   <property name="key"><value>my_password</value></property>
 </bean>
 
@@ -3043,7 +3043,7 @@ key:              A private key to prevent modification of the remember-me token
         active <Realm> entry. An example realm
         entry:
 
-              <Realm className="net.sf.acegisecurity.adapters.catalina.CatalinaAcegiUserRealm"
+              <Realm className="org.acegisecurity.adapters.catalina.CatalinaAcegiUserRealm"
              appContextLocation="conf/acegisecurity.xml"
              key="my_password" />
 
@@ -3112,7 +3112,7 @@ $CATALINA_HOME/bin/startup.sh
 
           <Call name="addRealm">
     <Arg>
-      <New class="net.sf.acegisecurity.adapters.jetty.JettyAcegiUserRealm">
+      <New class="org.acegisecurity.adapters.jetty.JettyAcegiUserRealm">
         <Arg>Spring Powered Realm</Arg>
         <Arg>my_password</Arg>
         <Arg>etc/acegisecurity.xml</Arg>
@@ -3182,7 +3182,7 @@ $CATALINA_HOME/bin/startup.sh
 
             <application-policy name = "SpringPoweredRealm">
        <authentication>
-          <login-module code = "net.sf.acegisecurity.adapters.jboss.JbossSpringLoginModule"
+          <login-module code = "org.acegisecurity.adapters.jboss.JbossSpringLoginModule"
             flag = "required">
             <module-option name = "appContextLocation">acegisecurity.xml</module-option>
             <module-option name = "key">my_password</module-option>
@@ -3205,7 +3205,7 @@ $CATALINA_HOME/bin/startup.sh
 
             <application-policy name = "SpringPoweredRealm">
        <authentication>
-          <login-module code = "net.sf.acegisecurity.adapters.jboss.JbossSpringLoginModule"
+          <login-module code = "org.acegisecurity.adapters.jboss.JbossSpringLoginModule"
             flag = "required">
             <module-option name = "singletonId">springRealm</module-option>
             <module-option name = "key">my_password</module-option>
@@ -3336,7 +3336,7 @@ $CATALINA_HOME/bin/startup.sh
 
         <web-app>
   <authenticator>
-    <type>net.sf.acegisecurity.adapters.resin.ResinAcegiAuthenticator</type>
+    <type>org.acegisecurity.adapters.resin.ResinAcegiAuthenticator</type>
     <init>
       <app-context-location>WEB-INF/resin-acegisecurity.xml</app-context-location>
       <key>my_password</key>
@@ -3646,7 +3646,7 @@ $CATALINA_HOME/bin/startup.sh
         /web/WEB-INF directory. A sample
         applicationContext.xml is included below:
 
-        <bean id="inMemoryDaoImpl" class="net.sf.acegisecurity.providers.dao.memory.InMemoryDaoImpl">
+        <bean id="inMemoryDaoImpl" class="org.acegisecurity.providers.dao.memory.InMemoryDaoImpl">
   <property name="userMap">
     <value>
       marissa=koala,ROLES_IGNORED_BY_CAS
@@ -3657,11 +3657,11 @@ $CATALINA_HOME/bin/startup.sh
   </property>
 </bean>
 
-<bean id="daoAuthenticationProvider" class="net.sf.acegisecurity.providers.dao.DaoAuthenticationProvider">
+<bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
   <property name="authenticationDao"><ref bean="inMemoryDaoImpl"/></property>
 </bean>
 
-<bean id="authenticationManager" class="net.sf.acegisecurity.providers.ProviderManager">
+<bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
   <property name="providers">
     <list>
       <ref bean="daoAuthenticationProvider"/>
@@ -3669,7 +3669,7 @@ $CATALINA_HOME/bin/startup.sh
   </property>
 </bean>
 
-<bean id="casPasswordHandler" class="net.sf.acegisecurity.adapters.cas.CasPasswordHandler">
+<bean id="casPasswordHandler" class="org.acegisecurity.adapters.cas.CasPasswordHandler">
   <property name="authenticationManager"><ref bean="authenticationManager"/></property>
 </bean>
 
@@ -3685,7 +3685,7 @@ $CATALINA_HOME/bin/startup.sh
 
         <context-param>
   <param-name>edu.yale.its.tp.cas.authHandler</param-name>
-  <param-value>net.sf.acegisecurity.adapters.cas.CasPasswordHandlerProxy</param-value>
+  <param-value>org.acegisecurity.adapters.cas.CasPasswordHandlerProxy</param-value>
 </context-param>
 
 <context-param>
@@ -3723,7 +3723,7 @@ $CATALINA_HOME/bin/startup.sh
         You will need to add a ServiceProperties bean
         to your application context. This represents your service:
 
-        <bean id="serviceProperties" class="net.sf.acegisecurity.ui.cas.ServiceProperties">
+        <bean id="serviceProperties" class="org.acegisecurity.ui.cas.ServiceProperties">
   <property name="service"><value>https://localhost:8443/contacts-cas/j_acegi_cas_security_check</value></property>
   <property name="sendRenew"><value>false</value></property>
 </bean>
@@ -3739,19 +3739,19 @@ $CATALINA_HOME/bin/startup.sh
         The following beans should be configured to commence the CAS
         authentication process:
 
-        <bean id="casProcessingFilter" class="net.sf.acegisecurity.ui.cas.CasProcessingFilter">
+        <bean id="casProcessingFilter" class="org.acegisecurity.ui.cas.CasProcessingFilter">
   <property name="authenticationManager"><ref bean="authenticationManager"/></property>
   <property name="authenticationFailureUrl"><value>/casfailed.jsp</value></property>
   <property name="defaultTargetUrl"><value>/</value></property>
   <property name="filterProcessesUrl"><value>/j_acegi_cas_security_check</value></property>
 </bean>
 
-<bean id="securityEnforcementFilter" class="net.sf.acegisecurity.intercept.web.SecurityEnforcementFilter">
+<bean id="securityEnforcementFilter" class="org.acegisecurity.intercept.web.SecurityEnforcementFilter">
   <property name="filterSecurityInterceptor"><ref bean="filterInvocationInterceptor"/></property>
   <property name="authenticationEntryPoint"><ref bean="casProcessingFilterEntryPoint"/></property>
 </bean>
 
-<bean id="casProcessingFilterEntryPoint" class="net.sf.acegisecurity.ui.cas.CasProcessingFilterEntryPoint">
+<bean id="casProcessingFilterEntryPoint" class="org.acegisecurity.ui.cas.CasProcessingFilterEntryPoint">
   <property name="loginUrl"><value>https://localhost:8443/cas/login</value></property>
   <property name="serviceProperties"><ref bean="serviceProperties"/></property>
 </bean>
@@ -3761,10 +3761,10 @@ $CATALINA_HOME/bin/startup.sh
 
         <filter>
   <filter-name>Acegi CAS Processing Filter</filter-name>
-  <filter-class>net.sf.acegisecurity.util.FilterToBeanProxy</filter-class>
+  <filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class>
   <init-param>
     <param-name>targetClass</param-name>
-    <param-value>net.sf.acegisecurity.ui.cas.CasProcessingFilter</param-value>
+    <param-value>org.acegisecurity.ui.cas.CasProcessingFilter</param-value>
   </init-param>
 </filter>
 
@@ -3792,7 +3792,7 @@ $CATALINA_HOME/bin/startup.sh
         that uses CasAuthenticationProvider and its
         collaborators:
 
-        <bean id="authenticationManager" class="net.sf.acegisecurity.providers.ProviderManager">
+        <bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
   <property name="providers">
     <list>
       <ref bean="casAuthenticationProvider"/>
@@ -3800,7 +3800,7 @@ $CATALINA_HOME/bin/startup.sh
   </property>
 </bean>
 
-<bean id="casAuthenticationProvider" class="net.sf.acegisecurity.providers.cas.CasAuthenticationProvider">
+<bean id="casAuthenticationProvider" class="org.acegisecurity.providers.cas.CasAuthenticationProvider">
   <property name="casAuthoritiesPopulator"><ref bean="casAuthoritiesPopulator"/></property>
   <property name="casProxyDecider"><ref bean="casProxyDecider"/></property>
   <property name="ticketValidator"><ref bean="casProxyTicketValidator"/></property>
@@ -3808,7 +3808,7 @@ $CATALINA_HOME/bin/startup.sh
   <property name="key"><value>my_password_for_this_auth_provider_only</value></property>
 </bean>
 
-<bean id="casProxyTicketValidator" class="net.sf.acegisecurity.providers.cas.ticketvalidator.CasProxyTicketValidator">
+<bean id="casProxyTicketValidator" class="org.acegisecurity.providers.cas.ticketvalidator.CasProxyTicketValidator">
   <property name="casValidate"><value>https://localhost:8443/cas/proxyValidate</value></property>
   <property name="proxyCallbackUrl"><value>https://localhost:8443/contacts-cas/casProxy/receptor</value></property>
   <property name="serviceProperties"><ref bean="serviceProperties"/></property>
@@ -3830,15 +3830,15 @@ $CATALINA_HOME/bin/startup.sh
   </property>
 </bean>
    
-<bean id="statelessTicketCache" class="net.sf.acegisecurity.providers.cas.cache.EhCacheBasedTicketCache">
+<bean id="statelessTicketCache" class="org.acegisecurity.providers.cas.cache.EhCacheBasedTicketCache">
   <property name="cache"><ref local="ticketCacheBackend"/></property>
 </bean>
 
-<bean id="casAuthoritiesPopulator" class="net.sf.acegisecurity.providers.cas.populator.DaoCasAuthoritiesPopulator">
+<bean id="casAuthoritiesPopulator" class="org.acegisecurity.providers.cas.populator.DaoCasAuthoritiesPopulator">
   <property name="authenticationDao"><ref bean="inMemoryDaoImpl"/></property>
 </bean>
 
-<bean id="casProxyDecider" class="net.sf.acegisecurity.providers.cas.proxy.RejectProxyTickets"/>
+<bean id="casProxyDecider" class="org.acegisecurity.providers.cas.proxy.RejectProxyTickets"/>
 
         The beans are all reasonable self-explanatory if you refer back
         to the "How CAS Works" section. Careful readers might notice one
@@ -4140,10 +4140,10 @@ $CATALINA_HOME/bin/startup.sh
 
         <filter>
   <filter-name>Acegi Channel Processing Filter</filter-name>
-  <filter-class>net.sf.acegisecurity.util.FilterToBeanProxy</filter-class>
+  <filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class>
   <init-param>
     <param-name>targetClass</param-name>
-    <param-value>net.sf.acegisecurity.securechannel.ChannelProcessingFilter</param-value>
+    <param-value>org.acegisecurity.securechannel.ChannelProcessingFilter</param-value>
   </init-param>
 </filter>
 
@@ -4156,7 +4156,7 @@ $CATALINA_HOME/bin/startup.sh
         will also need to configure the filter in your application
         context:
 
-        <bean id="channelProcessingFilter" class="net.sf.acegisecurity.securechannel.ChannelProcessingFilter">
+        <bean id="channelProcessingFilter" class="org.acegisecurity.securechannel.ChannelProcessingFilter">
   <property name="channelDecisionManager"><ref bean="channelDecisionManager"/></property>
   <property name="filterInvocationDefinitionSource">
     <value>
@@ -4169,7 +4169,7 @@ $CATALINA_HOME/bin/startup.sh
   </property>
 </bean>
 
-<bean id="channelDecisionManager" class="net.sf.acegisecurity.securechannel.ChannelDecisionManagerImpl">
+<bean id="channelDecisionManager" class="org.acegisecurity.securechannel.ChannelDecisionManagerImpl">
   <property name="channelProcessors">
     <list>
       <ref bean="secureChannelProcessor"/>
@@ -4178,8 +4178,8 @@ $CATALINA_HOME/bin/startup.sh
   </property>
 </bean>
 
-<bean id="secureChannelProcessor" class="net.sf.acegisecurity.securechannel.SecureChannelProcessor"/>
-<bean id="insecureChannelProcessor" class="net.sf.acegisecurity.securechannel.InsecureChannelProcessor"/>
+<bean id="secureChannelProcessor" class="org.acegisecurity.securechannel.SecureChannelProcessor"/>
+<bean id="insecureChannelProcessor" class="org.acegisecurity.securechannel.InsecureChannelProcessor"/>
 
         Like FilterSecurityInterceptor, Apache Ant
         style paths are also supported by the
@@ -4349,9 +4349,9 @@ $CATALINA_HOME/bin/startup.sh
       
 
       
-        The net.sf.acegisecurity.acl Package
+        The org.acegisecurity.acl Package
 
-        The net.sf.acegisecurity.acl package is very
+        The org.acegisecurity.acl package is very
         simple, comprising only a handful of interfaces and a single class, as
         shown in Figure 6. It provides the basic foundation for access control
         list (ACL) lookups.
@@ -4396,7 +4396,7 @@ public AclEntry[] getAcls(java.lang.Object domainInstance, Authentication authen
         need to provide an implementation that reflects that ACL permissions
         for your application.
 
-        Rounding out the net.sf.acegisecurity.acl
+        Rounding out the org.acegisecurity.acl
         package is an AclProviderManager class, with a
         corresponding AclProvider interface.
         AclProviderManager is a concrete implementation of
@@ -4435,7 +4435,7 @@ public AclEntry[] getAcls(java.lang.Object domainInstance, Authentication authen
         all about this type of permission masking (eg chmod
         777). You'll find the classes and interfaces for the integer
         masking ACL package under
-        net.sf.acegisecurity.acl.basic.
+        org.acegisecurity.acl.basic.
 
         Extending the AclEntry interface is a
         BasicAclEntry interface, with the main methods
@@ -4526,12 +4526,12 @@ CREATE TABLE acl_permission (
      FOREIGN KEY (acl_object_identity) REFERENCES acl_object_identity(id)
 );
 
-INSERT INTO acl_object_identity VALUES (1, 'corp.DomainObject:1', null, 'net.sf.acegisecurity.acl.basic.SimpleAclEntry');
-INSERT INTO acl_object_identity VALUES (2, 'corp.DomainObject:2', 1, 'net.sf.acegisecurity.acl.basic.SimpleAclEntry');
-INSERT INTO acl_object_identity VALUES (3, 'corp.DomainObject:3', 1, 'net.sf.acegisecurity.acl.basic.SimpleAclEntry');
-INSERT INTO acl_object_identity VALUES (4, 'corp.DomainObject:4', 1, 'net.sf.acegisecurity.acl.basic.SimpleAclEntry');
-INSERT INTO acl_object_identity VALUES (5, 'corp.DomainObject:5', 3, 'net.sf.acegisecurity.acl.basic.SimpleAclEntry');
-INSERT INTO acl_object_identity VALUES (6, 'corp.DomainObject:6', 3, 'net.sf.acegisecurity.acl.basic.SimpleAclEntry');
+INSERT INTO acl_object_identity VALUES (1, 'corp.DomainObject:1', null, 'org.acegisecurity.acl.basic.SimpleAclEntry');
+INSERT INTO acl_object_identity VALUES (2, 'corp.DomainObject:2', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');
+INSERT INTO acl_object_identity VALUES (3, 'corp.DomainObject:3', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');
+INSERT INTO acl_object_identity VALUES (4, 'corp.DomainObject:4', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');
+INSERT INTO acl_object_identity VALUES (5, 'corp.DomainObject:5', 3, 'org.acegisecurity.acl.basic.SimpleAclEntry');
+INSERT INTO acl_object_identity VALUES (6, 'corp.DomainObject:6', 3, 'org.acegisecurity.acl.basic.SimpleAclEntry');
 
 INSERT INTO acl_permission VALUES (null, 1, 'ROLE_SUPERVISOR', 1);
 INSERT INTO acl_permission VALUES (null, 2, 'ROLE_SUPERVISOR', 0);
@@ -4703,10 +4703,10 @@ INSERT INTO acl_permission VALUES (null, 6, 'scott', 1);
 
         <filter>
   <filter-name>Acegi HTTP Request Security Filter</filter-name>
-  <filter-class>net.sf.acegisecurity.util.FilterToBeanProxy</filter-class>
+  <filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class>
   <init-param>
     <param-name>targetClass</param-name>
-    <param-value>net.sf.acegisecurity.ClassThatImplementsFilter</param-value>
+    <param-value>org.acegisecurity.ClassThatImplementsFilter</param-value>
   </init-param>
 </filter>
 
@@ -4774,11 +4774,11 @@ INSERT INTO acl_permission VALUES (null, 6, 'scott', 1);
         FilterChainProxy class. It is wired using a
         FilterToBeanProxy (just like in the example above),
         but the target class is
-        net.sf.acegisecurity.util.FilterChainProxy. The
-        filter chain is then declared in the application context, using code
-        such as this:
+        org.acegisecurity.util.FilterChainProxy. The filter
+        chain is then declared in the application context, using code such as
+        this:
 
-        <bean id="filterChainProxy" class="net.sf.acegisecurity.util.FilterChainProxy">
+        <bean id="filterChainProxy" class="org.acegisecurity.util.FilterChainProxy">
   <property name="filterInvocationDefinitionSource">
     <value>
       CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
@@ -4976,16 +4976,16 @@ INSERT INTO acl_permission VALUES (null, 6, 'scott', 1);
 
       
      
         Context on SecurityContextHolder is of type:
-        net.sf.acegisecurity.context.secure.SecureContextImpl
+        org.acegisecurity.context.secure.SecureContextImpl
 
         The Context implements SecureContext.
 
         Authentication object is of type:
-        net.sf.acegisecurity.adapters.PrincipalAcegiUserToken
+        org.acegisecurity.adapters.PrincipalAcegiUserToken
 
         Authentication object as a String:
-        net.sf.acegisecurity.adapters.PrincipalAcegiUserToken@e9a7c2:
-        Username: marissa; Password: [PROTECTED]; Authenticated: true; Granted
+        org.acegisecurity.adapters.PrincipalAcegiUserToken@e9a7c2: Username:
+        marissa; Password: [PROTECTED]; Authenticated: true; Granted
         Authorities: ROLE_TELLER, ROLE_SUPERVISOR
 
         Authentication object holds the following granted
diff --git a/domain/src/main/java/org/acegisecurity/domain/DomainException.java b/domain/src/main/java/org/acegisecurity/domain/DomainException.java
index 83bfbeb893..387c04c42c 100644
--- a/domain/src/main/java/org/acegisecurity/domain/DomainException.java
+++ b/domain/src/main/java/org/acegisecurity/domain/DomainException.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain;
+package org.acegisecurity.domain;
 
-import net.sf.acegisecurity.AcegiSecurityException;
+import org.acegisecurity.AcegiSecurityException;
 
 
 /**
diff --git a/domain/src/main/java/org/acegisecurity/domain/PersistableEntity.java b/domain/src/main/java/org/acegisecurity/domain/PersistableEntity.java
index b9402265f1..9726bbfcf6 100644
--- a/domain/src/main/java/org/acegisecurity/domain/PersistableEntity.java
+++ b/domain/src/main/java/org/acegisecurity/domain/PersistableEntity.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain;
+package org.acegisecurity.domain;
 
 import java.io.Serializable;
 
@@ -23,7 +23,7 @@ import java.io.Serializable;
  * 
  * 
      
  * A persistable entity is any object that is capable of being persisted,
- * typically via a {@link net.sf.acegisecurity.domain.dao.Dao} implementation.
+ * typically via a {@link org.acegisecurity.domain.dao.Dao} implementation.
  * 
      
  *
  * @author Ben Alex
diff --git a/domain/src/main/java/org/acegisecurity/domain/dao/Dao.java b/domain/src/main/java/org/acegisecurity/domain/dao/Dao.java
index 8640ee9020..42b69fa80c 100644
--- a/domain/src/main/java/org/acegisecurity/domain/dao/Dao.java
+++ b/domain/src/main/java/org/acegisecurity/domain/dao/Dao.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.dao;
+package org.acegisecurity.domain.dao;
 
-import net.sf.acegisecurity.domain.PersistableEntity;
+import org.acegisecurity.domain.PersistableEntity;
 
 import java.io.Serializable;
 
@@ -45,7 +45,7 @@ import java.util.List;
  * persistence layer should only respond to requests from the services layer.
  * The services layer is where all transaction demarcation, security
  * authorization, casting to and from concrete {@link
- * net.sf.acegisecurity.domain.PersistableEntity}s, workflow and business
+ * org.acegisecurity.domain.PersistableEntity}s, workflow and business
  * logic should take place.
  * 
      
  * 
diff --git a/domain/src/main/java/org/acegisecurity/domain/dao/DetachmentContextHolder.java b/domain/src/main/java/org/acegisecurity/domain/dao/DetachmentContextHolder.java
index f0056066b1..aa0498cadb 100644
--- a/domain/src/main/java/org/acegisecurity/domain/dao/DetachmentContextHolder.java
+++ b/domain/src/main/java/org/acegisecurity/domain/dao/DetachmentContextHolder.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.dao;
+package org.acegisecurity.domain.dao;
 
 
 /**
diff --git a/domain/src/main/java/org/acegisecurity/domain/dao/EvictionCapable.java b/domain/src/main/java/org/acegisecurity/domain/dao/EvictionCapable.java
index a430d693a4..e498afe507 100644
--- a/domain/src/main/java/org/acegisecurity/domain/dao/EvictionCapable.java
+++ b/domain/src/main/java/org/acegisecurity/domain/dao/EvictionCapable.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.dao;
+package org.acegisecurity.domain.dao;
 
-import net.sf.acegisecurity.domain.PersistableEntity;
+import org.acegisecurity.domain.PersistableEntity;
 
 
 /**
  * Indicates an implementation capable of evicting {@link
- * net.sf.acegisecurity.domain.PersistableEntity}s.
+ * org.acegisecurity.domain.PersistableEntity}s.
  * 
  * 
      
  * Structured as a separate interface (rather than a subclass of
diff --git a/domain/src/main/java/org/acegisecurity/domain/dao/EvictionUtils.java b/domain/src/main/java/org/acegisecurity/domain/dao/EvictionUtils.java
index 4f5049c5ad..48612de0b7 100644
--- a/domain/src/main/java/org/acegisecurity/domain/dao/EvictionUtils.java
+++ b/domain/src/main/java/org/acegisecurity/domain/dao/EvictionUtils.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.dao;
+package org.acegisecurity.domain.dao;
 
-import net.sf.acegisecurity.domain.PersistableEntity;
+import org.acegisecurity.domain.PersistableEntity;
 
 import org.springframework.util.Assert;
 
diff --git a/domain/src/main/java/org/acegisecurity/domain/dao/InitializationCapable.java b/domain/src/main/java/org/acegisecurity/domain/dao/InitializationCapable.java
index 0f01b5e053..acc1eac242 100644
--- a/domain/src/main/java/org/acegisecurity/domain/dao/InitializationCapable.java
+++ b/domain/src/main/java/org/acegisecurity/domain/dao/InitializationCapable.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.dao;
+package org.acegisecurity.domain.dao;
 
 /**
  * Indicates an implementation capable of initializing an object, such that
diff --git a/domain/src/main/java/org/acegisecurity/domain/dao/InitializationUtils.java b/domain/src/main/java/org/acegisecurity/domain/dao/InitializationUtils.java
index e90ad4a705..5d24342025 100644
--- a/domain/src/main/java/org/acegisecurity/domain/dao/InitializationUtils.java
+++ b/domain/src/main/java/org/acegisecurity/domain/dao/InitializationUtils.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.dao;
+package org.acegisecurity.domain.dao;
 
 import org.springframework.util.Assert;
 
@@ -22,7 +22,7 @@ import org.springframework.util.Assert;
 /**
  * Convenience methods that support initialization of lazily loaded collections
  * and associations using DAOs and other objects that implement
- * {@link net.sf.acegisecurity.domain.dao.InitializationCapable}.
+ * {@link org.acegisecurity.domain.dao.InitializationCapable}.
  *
  * @author Ben Alex
  * @version $Id$
diff --git a/domain/src/main/java/org/acegisecurity/domain/dao/PaginatedList.java b/domain/src/main/java/org/acegisecurity/domain/dao/PaginatedList.java
index d2852611b7..dee47b05fc 100644
--- a/domain/src/main/java/org/acegisecurity/domain/dao/PaginatedList.java
+++ b/domain/src/main/java/org/acegisecurity/domain/dao/PaginatedList.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.dao;
+package org.acegisecurity.domain.dao;
 
-import net.sf.acegisecurity.domain.PersistableEntity;
+import org.acegisecurity.domain.PersistableEntity;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/domain/src/main/java/org/acegisecurity/domain/hibernate/DaoHibernate.java b/domain/src/main/java/org/acegisecurity/domain/hibernate/DaoHibernate.java
index 5a368b037b..8099ffdbc6 100644
--- a/domain/src/main/java/org/acegisecurity/domain/hibernate/DaoHibernate.java
+++ b/domain/src/main/java/org/acegisecurity/domain/hibernate/DaoHibernate.java
@@ -13,21 +13,21 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.hibernate;
+package org.acegisecurity.domain.hibernate;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.List;
 
-import net.sf.acegisecurity.domain.PersistableEntity;
-import net.sf.acegisecurity.domain.dao.Dao;
-import net.sf.acegisecurity.domain.dao.DetachmentContextHolder;
-import net.sf.acegisecurity.domain.dao.EvictionCapable;
-import net.sf.acegisecurity.domain.dao.InitializationCapable;
-import net.sf.acegisecurity.domain.dao.PaginatedList;
-import net.sf.acegisecurity.domain.util.GenericsUtils;
-import net.sf.acegisecurity.domain.validation.ValidationManager;
+import org.acegisecurity.domain.PersistableEntity;
+import org.acegisecurity.domain.dao.Dao;
+import org.acegisecurity.domain.dao.DetachmentContextHolder;
+import org.acegisecurity.domain.dao.EvictionCapable;
+import org.acegisecurity.domain.dao.InitializationCapable;
+import org.acegisecurity.domain.dao.PaginatedList;
+import org.acegisecurity.domain.util.GenericsUtils;
+import org.acegisecurity.domain.validation.ValidationManager;
 
 import org.hibernate.Criteria;
 import org.hibernate.EntityMode;
diff --git a/domain/src/main/java/org/acegisecurity/domain/hibernate/EnumUserType.java b/domain/src/main/java/org/acegisecurity/domain/hibernate/EnumUserType.java
index 1a973083e5..8678d85f03 100644
--- a/domain/src/main/java/org/acegisecurity/domain/hibernate/EnumUserType.java
+++ b/domain/src/main/java/org/acegisecurity/domain/hibernate/EnumUserType.java
@@ -13,7 +13,7 @@
 * limitations under the License.
 */
 
-package net.sf.acegisecurity.domain.hibernate;
+package org.acegisecurity.domain.hibernate;
 
 import java.io.Serializable; 
 import java.sql.PreparedStatement; 
diff --git a/domain/src/main/java/org/acegisecurity/domain/hibernate/IntrospectionManagerHibernate.java b/domain/src/main/java/org/acegisecurity/domain/hibernate/IntrospectionManagerHibernate.java
index 718fff8ab3..c91e210419 100644
--- a/domain/src/main/java/org/acegisecurity/domain/hibernate/IntrospectionManagerHibernate.java
+++ b/domain/src/main/java/org/acegisecurity/domain/hibernate/IntrospectionManagerHibernate.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.hibernate;
+package org.acegisecurity.domain.hibernate;
 
-import net.sf.acegisecurity.domain.validation.IntrospectionManager;
-import net.sf.acegisecurity.domain.validation.ValidationRegistryManager;
+import org.acegisecurity.domain.validation.IntrospectionManager;
+import org.acegisecurity.domain.validation.ValidationRegistryManager;
 
 import org.hibernate.EntityMode;
 import org.hibernate.Hibernate;
diff --git a/domain/src/main/java/org/acegisecurity/domain/impl/AbstractPersistableEntity.java b/domain/src/main/java/org/acegisecurity/domain/impl/AbstractPersistableEntity.java
index 5e5d4d656b..34afee30bc 100644
--- a/domain/src/main/java/org/acegisecurity/domain/impl/AbstractPersistableEntity.java
+++ b/domain/src/main/java/org/acegisecurity/domain/impl/AbstractPersistableEntity.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.impl;
+package org.acegisecurity.domain.impl;
 
-import net.sf.acegisecurity.domain.PersistableEntity;
+import org.acegisecurity.domain.PersistableEntity;
 
 /**
  * An abstract implementation of {@link
- * net.sf.acegisecurity.domain.PersistableEntity}.
+ * org.acegisecurity.domain.PersistableEntity}.
  *
  * @author Ben Alex
  * @version $Id$
diff --git a/domain/src/main/java/org/acegisecurity/domain/impl/BusinessObject.java b/domain/src/main/java/org/acegisecurity/domain/impl/BusinessObject.java
index 64d7272700..d2545b16ce 100644
--- a/domain/src/main/java/org/acegisecurity/domain/impl/BusinessObject.java
+++ b/domain/src/main/java/org/acegisecurity/domain/impl/BusinessObject.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.impl;
+package org.acegisecurity.domain.impl;
 
-import net.sf.acegisecurity.domain.util.ReflectionToStringBuilder;
+import org.acegisecurity.domain.util.ReflectionToStringBuilder;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.logging.Log;
diff --git a/domain/src/main/java/org/acegisecurity/domain/impl/PersistableEntityInteger.java b/domain/src/main/java/org/acegisecurity/domain/impl/PersistableEntityInteger.java
index b4d9d7b750..8fe08ad00a 100644
--- a/domain/src/main/java/org/acegisecurity/domain/impl/PersistableEntityInteger.java
+++ b/domain/src/main/java/org/acegisecurity/domain/impl/PersistableEntityInteger.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.impl;
+package org.acegisecurity.domain.impl;
 
 import java.io.Serializable;
 
@@ -58,7 +58,7 @@ public abstract class PersistableEntityInteger extends AbstractPersistableEntity
      * 
      
      * Use {@link #getId()} instead, as it provides the correct return type.
      * This method is only provided for use by the persistence layer and to
-     * satisfy the {@link net.sf.acegisecurity.domain.PersistableEntity}
+     * satisfy the {@link org.acegisecurity.domain.PersistableEntity}
      * interface contract.
      * 
      
      * 
diff --git a/domain/src/main/java/org/acegisecurity/domain/impl/PersistableEntityLong.java b/domain/src/main/java/org/acegisecurity/domain/impl/PersistableEntityLong.java
index d8f1e38706..7be2ec5bad 100644
--- a/domain/src/main/java/org/acegisecurity/domain/impl/PersistableEntityLong.java
+++ b/domain/src/main/java/org/acegisecurity/domain/impl/PersistableEntityLong.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.impl;
+package org.acegisecurity.domain.impl;
 
 import java.io.Serializable;
 
@@ -58,7 +58,7 @@ public abstract class PersistableEntityLong extends AbstractPersistableEntity {
      * 
      
      * Use {@link #getId()} instead, as it provides the correct return type.
      * This method is only provided for use by the persistence layer and to
-     * satisfy the {@link net.sf.acegisecurity.domain.PersistableEntity}
+     * satisfy the {@link org.acegisecurity.domain.PersistableEntity}
      * interface contract.
      * 
      
      * 
diff --git a/domain/src/main/java/org/acegisecurity/domain/impl/PersistableValue.java b/domain/src/main/java/org/acegisecurity/domain/impl/PersistableValue.java
index 51c3f4f789..dfe7656bb2 100644
--- a/domain/src/main/java/org/acegisecurity/domain/impl/PersistableValue.java
+++ b/domain/src/main/java/org/acegisecurity/domain/impl/PersistableValue.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.impl;
+package org.acegisecurity.domain.impl;
 
 /**
  * A value object, which means a persistable business object  that does
@@ -21,7 +21,7 @@ package net.sf.acegisecurity.domain.impl;
  * 
  * 
      
  * Every value object belongs to a single {@link
- * net.sf.acegisecurity.domain.impl.AbstractPersistableEntity}. This is
+ * org.acegisecurity.domain.impl.AbstractPersistableEntity}. This is
  * necessary so that the value object has some sort of persistence
  * relationship/ownership.
  * 
      
diff --git a/domain/src/main/java/org/acegisecurity/domain/service/CreatableManager.java b/domain/src/main/java/org/acegisecurity/domain/service/CreatableManager.java
index 830d5172e7..be4fb1dd8f 100644
--- a/domain/src/main/java/org/acegisecurity/domain/service/CreatableManager.java
+++ b/domain/src/main/java/org/acegisecurity/domain/service/CreatableManager.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.service;
+package org.acegisecurity.domain.service;
 
-import net.sf.acegisecurity.domain.PersistableEntity;
+import org.acegisecurity.domain.PersistableEntity;
 
 /**
  * Adds a creation method to the ImmutableManager.
diff --git a/domain/src/main/java/org/acegisecurity/domain/service/CreatableManagerImpl.java b/domain/src/main/java/org/acegisecurity/domain/service/CreatableManagerImpl.java
index 05a993c078..1b816e2104 100644
--- a/domain/src/main/java/org/acegisecurity/domain/service/CreatableManagerImpl.java
+++ b/domain/src/main/java/org/acegisecurity/domain/service/CreatableManagerImpl.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.service;
+package org.acegisecurity.domain.service;
 
-import net.sf.acegisecurity.domain.PersistableEntity;
+import org.acegisecurity.domain.PersistableEntity;
 
 import org.springframework.util.Assert;
 
diff --git a/domain/src/main/java/org/acegisecurity/domain/service/ImmutableManager.java b/domain/src/main/java/org/acegisecurity/domain/service/ImmutableManager.java
index cb52b77c2e..a35056ae45 100644
--- a/domain/src/main/java/org/acegisecurity/domain/service/ImmutableManager.java
+++ b/domain/src/main/java/org/acegisecurity/domain/service/ImmutableManager.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.service;
+package org.acegisecurity.domain.service;
 
-import net.sf.acegisecurity.domain.PersistableEntity;
-import net.sf.acegisecurity.domain.dao.PaginatedList;
+import org.acegisecurity.domain.PersistableEntity;
+import org.acegisecurity.domain.dao.PaginatedList;
 
 import java.io.Serializable;
 
@@ -62,9 +62,9 @@ import java.util.List;
  * 
  * 
      
  * A single ImmutableManager implementation will typically exist for each
- * {@link net.sf.acegisecurity.domain.PersistableEntity}, particularly given
+ * {@link org.acegisecurity.domain.PersistableEntity}, particularly given
  * a PersistableEntity is allowed to manage multiple
- * {@link net.sf.acegisecurity.domain.impl.PersistableValue}s.
+ * {@link org.acegisecurity.domain.impl.PersistableValue}s.
  * The particular PersistableEntity an implementation supports
  * will be expressed by the {@link #supports(Class)} method.
  * 
      
diff --git a/domain/src/main/java/org/acegisecurity/domain/service/ImmutableManagerImpl.java b/domain/src/main/java/org/acegisecurity/domain/service/ImmutableManagerImpl.java
index c941336fb0..4ad3521d20 100644
--- a/domain/src/main/java/org/acegisecurity/domain/service/ImmutableManagerImpl.java
+++ b/domain/src/main/java/org/acegisecurity/domain/service/ImmutableManagerImpl.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.service;
+package org.acegisecurity.domain.service;
 
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
 
-import net.sf.acegisecurity.domain.PersistableEntity;
-import net.sf.acegisecurity.domain.dao.Dao;
-import net.sf.acegisecurity.domain.dao.PaginatedList;
-import net.sf.acegisecurity.domain.util.GenericsUtils;
+import org.acegisecurity.domain.PersistableEntity;
+import org.acegisecurity.domain.dao.Dao;
+import org.acegisecurity.domain.dao.PaginatedList;
+import org.acegisecurity.domain.util.GenericsUtils;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.support.ApplicationObjectSupport;
diff --git a/domain/src/main/java/org/acegisecurity/domain/service/Manager.java b/domain/src/main/java/org/acegisecurity/domain/service/Manager.java
index 4f00ad140e..65b2552a94 100644
--- a/domain/src/main/java/org/acegisecurity/domain/service/Manager.java
+++ b/domain/src/main/java/org/acegisecurity/domain/service/Manager.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.service;
+package org.acegisecurity.domain.service;
 
-import net.sf.acegisecurity.domain.PersistableEntity;
+import org.acegisecurity.domain.PersistableEntity;
 
 /**
  * Adds a deletion method to UpdatableManager, thus providing CRUD
diff --git a/domain/src/main/java/org/acegisecurity/domain/service/ManagerImpl.java b/domain/src/main/java/org/acegisecurity/domain/service/ManagerImpl.java
index 4c8d7b3466..e043a3b540 100644
--- a/domain/src/main/java/org/acegisecurity/domain/service/ManagerImpl.java
+++ b/domain/src/main/java/org/acegisecurity/domain/service/ManagerImpl.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.service;
+package org.acegisecurity.domain.service;
 
-import net.sf.acegisecurity.domain.PersistableEntity;
+import org.acegisecurity.domain.PersistableEntity;
 
 import org.springframework.util.Assert;
 
diff --git a/domain/src/main/java/org/acegisecurity/domain/service/UpdatableManager.java b/domain/src/main/java/org/acegisecurity/domain/service/UpdatableManager.java
index e9baa79fc9..15d832df01 100644
--- a/domain/src/main/java/org/acegisecurity/domain/service/UpdatableManager.java
+++ b/domain/src/main/java/org/acegisecurity/domain/service/UpdatableManager.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.service;
+package org.acegisecurity.domain.service;
 
-import net.sf.acegisecurity.domain.PersistableEntity;
+import org.acegisecurity.domain.PersistableEntity;
 
 /**
  * Adds update (but no delete) methods to the CreatableManager.
diff --git a/domain/src/main/java/org/acegisecurity/domain/service/UpdatableManagerImpl.java b/domain/src/main/java/org/acegisecurity/domain/service/UpdatableManagerImpl.java
index 48fd2b0588..18f4a5cdb7 100644
--- a/domain/src/main/java/org/acegisecurity/domain/service/UpdatableManagerImpl.java
+++ b/domain/src/main/java/org/acegisecurity/domain/service/UpdatableManagerImpl.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.service;
+package org.acegisecurity.domain.service;
 
-import net.sf.acegisecurity.domain.PersistableEntity;
+import org.acegisecurity.domain.PersistableEntity;
 
 import org.springframework.util.Assert;
 
diff --git a/domain/src/main/java/org/acegisecurity/domain/util/CollectionUtils.java b/domain/src/main/java/org/acegisecurity/domain/util/CollectionUtils.java
index b38026e7c0..c6aa7736b1 100644
--- a/domain/src/main/java/org/acegisecurity/domain/util/CollectionUtils.java
+++ b/domain/src/main/java/org/acegisecurity/domain/util/CollectionUtils.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.util;
+package org.acegisecurity.domain.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/domain/src/main/java/org/acegisecurity/domain/util/GenericsUtils.java b/domain/src/main/java/org/acegisecurity/domain/util/GenericsUtils.java
index 8e97bcc3ed..36749b49ef 100644
--- a/domain/src/main/java/org/acegisecurity/domain/util/GenericsUtils.java
+++ b/domain/src/main/java/org/acegisecurity/domain/util/GenericsUtils.java
@@ -1,4 +1,4 @@
-package net.sf.acegisecurity.domain.util;
+package org.acegisecurity.domain.util;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/domain/src/main/java/org/acegisecurity/domain/util/ReflectionToStringBuilder.java b/domain/src/main/java/org/acegisecurity/domain/util/ReflectionToStringBuilder.java
index 5e2c0996df..7b711a2051 100644
--- a/domain/src/main/java/org/acegisecurity/domain/util/ReflectionToStringBuilder.java
+++ b/domain/src/main/java/org/acegisecurity/domain/util/ReflectionToStringBuilder.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.util;
+package org.acegisecurity.domain.util;
 
 import java.io.Serializable;
 import java.lang.reflect.Field;
@@ -21,7 +21,7 @@ import java.text.DateFormat;
 import java.util.Calendar;
 import java.util.Collection;
 
-import net.sf.acegisecurity.domain.PersistableEntity;
+import org.acegisecurity.domain.PersistableEntity;
 
 import org.apache.commons.lang.builder.ToStringStyle;
 import org.apache.commons.logging.Log;
diff --git a/domain/src/main/java/org/acegisecurity/domain/validation/BindBeforeValidation.java b/domain/src/main/java/org/acegisecurity/domain/validation/BindBeforeValidation.java
index 471f19d8b6..88a58fb6c3 100644
--- a/domain/src/main/java/org/acegisecurity/domain/validation/BindBeforeValidation.java
+++ b/domain/src/main/java/org/acegisecurity/domain/validation/BindBeforeValidation.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.validation;
+package org.acegisecurity.domain.validation;
 
 import org.springframework.validation.BindException;
 
diff --git a/domain/src/main/java/org/acegisecurity/domain/validation/BindBeforeValidationUtils.java b/domain/src/main/java/org/acegisecurity/domain/validation/BindBeforeValidationUtils.java
index ac2dded432..bcf97ea82c 100644
--- a/domain/src/main/java/org/acegisecurity/domain/validation/BindBeforeValidationUtils.java
+++ b/domain/src/main/java/org/acegisecurity/domain/validation/BindBeforeValidationUtils.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.validation;
+package org.acegisecurity.domain.validation;
 
 import org.springframework.util.Assert;
 
diff --git a/domain/src/main/java/org/acegisecurity/domain/validation/IntrospectionManager.java b/domain/src/main/java/org/acegisecurity/domain/validation/IntrospectionManager.java
index 34f1b79530..e78cb2c546 100644
--- a/domain/src/main/java/org/acegisecurity/domain/validation/IntrospectionManager.java
+++ b/domain/src/main/java/org/acegisecurity/domain/validation/IntrospectionManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.validation;
+package org.acegisecurity.domain.validation;
 
 import java.util.List;
 
diff --git a/domain/src/main/java/org/acegisecurity/domain/validation/ValidationAdvisor.java b/domain/src/main/java/org/acegisecurity/domain/validation/ValidationAdvisor.java
index 1dd44bd571..eb8a13fdf5 100644
--- a/domain/src/main/java/org/acegisecurity/domain/validation/ValidationAdvisor.java
+++ b/domain/src/main/java/org/acegisecurity/domain/validation/ValidationAdvisor.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.validation;
+package org.acegisecurity.domain.validation;
 
 import org.springframework.aop.framework.AopConfigException;
 import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor;
diff --git a/domain/src/main/java/org/acegisecurity/domain/validation/ValidationInterceptor.java b/domain/src/main/java/org/acegisecurity/domain/validation/ValidationInterceptor.java
index 38c796e289..9f67e73ef0 100644
--- a/domain/src/main/java/org/acegisecurity/domain/validation/ValidationInterceptor.java
+++ b/domain/src/main/java/org/acegisecurity/domain/validation/ValidationInterceptor.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.validation;
+package org.acegisecurity.domain.validation;
 
-import net.sf.acegisecurity.domain.PersistableEntity;
-import net.sf.acegisecurity.domain.impl.BusinessObject;
+import org.acegisecurity.domain.PersistableEntity;
+import org.acegisecurity.domain.impl.BusinessObject;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
@@ -35,7 +35,7 @@ import org.springframework.util.Assert;
  * 
      
  * For each method invocation, any argument that is assignable from {@link
  * #argumentClasses} and is non-null will be passed to the
- * {@link net.sf.acegisecurity.domain.validation.ValidationManager} for
+ * {@link org.acegisecurity.domain.validation.ValidationManager} for
  * processing.
  * 
      
  *
diff --git a/domain/src/main/java/org/acegisecurity/domain/validation/ValidationManager.java b/domain/src/main/java/org/acegisecurity/domain/validation/ValidationManager.java
index b3b6d16ef2..e6dcad1384 100644
--- a/domain/src/main/java/org/acegisecurity/domain/validation/ValidationManager.java
+++ b/domain/src/main/java/org/acegisecurity/domain/validation/ValidationManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.validation;
+package org.acegisecurity.domain.validation;
 
 import org.springframework.validation.BindException;
 
diff --git a/domain/src/main/java/org/acegisecurity/domain/validation/ValidationManagerImpl.java b/domain/src/main/java/org/acegisecurity/domain/validation/ValidationManagerImpl.java
index c730a1fd95..8f21244a51 100644
--- a/domain/src/main/java/org/acegisecurity/domain/validation/ValidationManagerImpl.java
+++ b/domain/src/main/java/org/acegisecurity/domain/validation/ValidationManagerImpl.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.validation;
+package org.acegisecurity.domain.validation;
 
-import net.sf.acegisecurity.domain.dao.DetachmentContextHolder;
+import org.acegisecurity.domain.dao.DetachmentContextHolder;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/domain/src/main/java/org/acegisecurity/domain/validation/ValidationRegistryManager.java b/domain/src/main/java/org/acegisecurity/domain/validation/ValidationRegistryManager.java
index 85467d96a2..882ff945ee 100644
--- a/domain/src/main/java/org/acegisecurity/domain/validation/ValidationRegistryManager.java
+++ b/domain/src/main/java/org/acegisecurity/domain/validation/ValidationRegistryManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.validation;
+package org.acegisecurity.domain.validation;
 
 import org.springframework.validation.Validator;
 
diff --git a/domain/src/main/java/org/acegisecurity/domain/validation/ValidationRegistryManagerImpl.java b/domain/src/main/java/org/acegisecurity/domain/validation/ValidationRegistryManagerImpl.java
index 5dce03f1ad..f93db2d7e7 100644
--- a/domain/src/main/java/org/acegisecurity/domain/validation/ValidationRegistryManagerImpl.java
+++ b/domain/src/main/java/org/acegisecurity/domain/validation/ValidationRegistryManagerImpl.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.validation;
+package org.acegisecurity.domain.validation;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/domain/src/main/java/org/acegisecurity/domain/validation/ValidatorNotFoundException.java b/domain/src/main/java/org/acegisecurity/domain/validation/ValidatorNotFoundException.java
index 2f0a7a4873..9b5b73d51d 100644
--- a/domain/src/main/java/org/acegisecurity/domain/validation/ValidatorNotFoundException.java
+++ b/domain/src/main/java/org/acegisecurity/domain/validation/ValidatorNotFoundException.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.domain.validation;
+package org.acegisecurity.domain.validation;
 
-import net.sf.acegisecurity.domain.DomainException;
+import org.acegisecurity.domain.DomainException;
 
 
 /**
diff --git a/project.xml b/project.xml
index 9a8e4bde59..7edb181c6d 100644
--- a/project.xml
+++ b/project.xml
@@ -22,7 +22,7 @@
   3
   acegisecurity
   1.0.0-SNAPSHOT
-  net.sf.acegisecurity
+  org.acegisecurity
   Acegi Security System for Spring
   Acegi Security System for Spring
   
diff --git a/samples/acegifier/src/test/test-web.xml b/samples/acegifier/src/test/test-web.xml
index 452b2b9b3c..bd133ce6a2 100644
--- a/samples/acegifier/src/test/test-web.xml
+++ b/samples/acegifier/src/test/test-web.xml
@@ -36,7 +36,7 @@
       to the WebApplicationContext
   -->
   
-    net.sf.acegisecurity.ui.session.HttpSessionEventPublisher
+    org.acegisecurity.ui.session.HttpSessionEventPublisher
   
   
 	
 	
-	
+	
      	my_run_as_password
  	
 
 	
 
 	
-	
+	
 
 	
-	
+	
 		
 		  
 		    
@@ -45,10 +45,10 @@
 	
 
 	
-	
+	
 
 	
-	
+	
    		false
 		
 		  
@@ -59,14 +59,14 @@
 	
 	
 	
-	
+	
 	
-	
+	
 		
 	
 
 	
-	
+	
     	false
     	
     	
@@ -91,7 +91,7 @@
 		above configuration is a JDK 5 Annotations Attributes-based source.
 	-->
 	
 	
 	
diff --git a/samples/annotations/src/test/java/samples/annotations/BankTests.java b/samples/annotations/src/test/java/samples/annotations/BankTests.java
index 2ba91ce54e..1c5f737b32 100644
--- a/samples/annotations/src/test/java/samples/annotations/BankTests.java
+++ b/samples/annotations/src/test/java/samples/annotations/BankTests.java
@@ -1,12 +1,12 @@
 package samples.annotations;
 
 import junit.framework.TestCase;
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.context.SecurityContextImpl;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.providers.TestingAuthenticationToken;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/samples/attributes/src/main/java/sample/attributes/Main.java b/samples/attributes/src/main/java/sample/attributes/Main.java
index 1dcff8283d..2e68891eb4 100644
--- a/samples/attributes/src/main/java/sample/attributes/Main.java
+++ b/samples/attributes/src/main/java/sample/attributes/Main.java
@@ -15,12 +15,12 @@
 
 package sample.attributes;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.context.SecurityContextImpl;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.providers.TestingAuthenticationToken;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/samples/attributes/src/main/resources/applicationContext.xml b/samples/attributes/src/main/resources/applicationContext.xml
index eec98f2ede..b20dbc834f 100644
--- a/samples/attributes/src/main/resources/applicationContext.xml
+++ b/samples/attributes/src/main/resources/applicationContext.xml
@@ -24,17 +24,17 @@
 	
 	
 	
-	
+	
      	my_run_as_password
  	
 
 	
 
 	
-	
+	
 
 	
-	
+	
 		
 		  
 		    
@@ -45,10 +45,10 @@
 	
 
 	
-	
+	
 
 	
-	
+	
    		false
 		
 		  
@@ -60,12 +60,12 @@
 	
 	
 	
-	
+	
 		
 	
 
 	
-	
+	
     	false
     	
     	
@@ -90,7 +90,7 @@
 		above configuration is a Commons Attributes-based source.
 	-->
 	
 	
 
diff --git a/samples/attributes/src/test/java/sample/attributes/BankTests.java b/samples/attributes/src/test/java/sample/attributes/BankTests.java
index ab08598045..713de2daa2 100644
--- a/samples/attributes/src/test/java/sample/attributes/BankTests.java
+++ b/samples/attributes/src/test/java/sample/attributes/BankTests.java
@@ -17,12 +17,12 @@ package sample.attributes;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.context.SecurityContextImpl;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.context.SecurityContextImpl;
+import org.acegisecurity.providers.TestingAuthenticationToken;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/samples/contacts-tiger/src/main/java/sample/contact/annotation/ContactManagerBackend.java b/samples/contacts-tiger/src/main/java/sample/contact/annotation/ContactManagerBackend.java
index 6a55652cfd..f11d07b84c 100644
--- a/samples/contacts-tiger/src/main/java/sample/contact/annotation/ContactManagerBackend.java
+++ b/samples/contacts-tiger/src/main/java/sample/contact/annotation/ContactManagerBackend.java
@@ -18,14 +18,14 @@ package sample.contact.annotation;
 import java.util.List;
 import java.util.Random;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.acl.basic.AclObjectIdentity;
-import net.sf.acegisecurity.acl.basic.BasicAclExtendedDao;
-import net.sf.acegisecurity.acl.basic.NamedEntityObjectIdentity;
-import net.sf.acegisecurity.acl.basic.SimpleAclEntry;
-import net.sf.acegisecurity.annotation.Secured;
-import net.sf.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.acl.basic.AclObjectIdentity;
+import org.acegisecurity.acl.basic.BasicAclExtendedDao;
+import org.acegisecurity.acl.basic.NamedEntityObjectIdentity;
+import org.acegisecurity.acl.basic.SimpleAclEntry;
+import org.acegisecurity.annotation.Secured;
+import org.acegisecurity.context.SecurityContextHolder;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.support.ApplicationObjectSupport;
diff --git a/samples/contacts/client/clientContext.xml b/samples/contacts/client/clientContext.xml
index a2b839d8fb..814408c801 100644
--- a/samples/contacts/client/clientContext.xml
+++ b/samples/contacts/client/clientContext.xml
@@ -28,7 +28,7 @@
 		
 	
 	 
-	
+	
 	-->
 	
 	
@@ -47,7 +47,7 @@
 
 	
-	
+	
 
 	
-	
+	
       
          
 		    CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
@@ -32,7 +32,7 @@
 		 process BASIC authentication requests, but this has been
 		 left out given container adapters aren't recommended and
 		 it would increase the number of bean declarations required -->
-   
+   
       
          
 		    
@@ -40,13 +40,13 @@
       
    
 
-   
+   
   		my_password
    
 
-   
+   
 
-   
+   
    
 
 	
diff --git a/samples/contacts/src/main/webapp/ca/WEB-INF/classes/resin-acegisecurity.xml b/samples/contacts/src/main/webapp/ca/WEB-INF/classes/resin-acegisecurity.xml
index 90280d781f..d98154f521 100644
--- a/samples/contacts/src/main/webapp/ca/WEB-INF/classes/resin-acegisecurity.xml
+++ b/samples/contacts/src/main/webapp/ca/WEB-INF/classes/resin-acegisecurity.xml
@@ -19,7 +19,7 @@
 	
 	
 	
-	
+	
   		
 			
 				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
@@ -31,13 +31,13 @@
 	
 	
 	
-	
+	
      	
      	true
 	
 
 	
-	
+	
 		
 		  
 		    
diff --git a/samples/contacts/src/main/webapp/ca/WEB-INF/resin-web.xml b/samples/contacts/src/main/webapp/ca/WEB-INF/resin-web.xml
index bb38a0c312..4dd24b2559 100644
--- a/samples/contacts/src/main/webapp/ca/WEB-INF/resin-web.xml
+++ b/samples/contacts/src/main/webapp/ca/WEB-INF/resin-web.xml
@@ -4,7 +4,7 @@
   -->
 
       
-        net.sf.acegisecurity.adapters.resin.ResinAcegiAuthenticator
+        org.acegisecurity.adapters.resin.ResinAcegiAuthenticator
         
           resin-acegisecurity.xml
            my_password
diff --git a/samples/contacts/src/main/webapp/ca/WEB-INF/web.xml b/samples/contacts/src/main/webapp/ca/WEB-INF/web.xml
index 533bfb06f7..f414d221fd 100644
--- a/samples/contacts/src/main/webapp/ca/WEB-INF/web.xml
+++ b/samples/contacts/src/main/webapp/ca/WEB-INF/web.xml
@@ -33,10 +33,10 @@
     
     
         Acegi Filter Chain Proxy
-        net.sf.acegisecurity.util.FilterToBeanProxy
+        org.acegisecurity.util.FilterToBeanProxy
         
             targetClass
-            net.sf.acegisecurity.util.FilterChainProxy
+            org.acegisecurity.util.FilterChainProxy
         
     
 
diff --git a/samples/contacts/src/main/webapp/cas/WEB-INF/applicationContext-acegi-security.xml b/samples/contacts/src/main/webapp/cas/WEB-INF/applicationContext-acegi-security.xml
index f65d479811..7b6e338243 100644
--- a/samples/contacts/src/main/webapp/cas/WEB-INF/applicationContext-acegi-security.xml
+++ b/samples/contacts/src/main/webapp/cas/WEB-INF/applicationContext-acegi-security.xml
@@ -14,7 +14,7 @@
 
    
 
-	
+	
       
          
 		    CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
@@ -26,7 +26,7 @@
 
    
 
-   
+   
       
          
 		    
@@ -34,23 +34,23 @@
       
    
 
-   
+   
       
    
 
-   
+   
       
       
    
 
-   
+   
       Contacts Realm
    
 
-   
+   
    
 
-	
+	
 		
 		
 		
@@ -58,7 +58,7 @@
 		my_password_for_this_auth_provider_only
 	
 
-	
+	
 		https://localhost:8443/cas/proxyValidate
 		https://localhost:8443/contacts-cas/casProxy/receptor
 		
@@ -76,18 +76,18 @@
        
     
    
-	
+	
       
 	
 
-	
+	
 		
 	
 
-	
+	
 	
 
-	
+	
 		https://localhost:8443/contacts-cas/j_acegi_cas_security_check
 		false
 	
@@ -95,7 +95,7 @@
 	
 	
 	
-	
+	
 		
  		
 			
@@ -107,7 +107,7 @@
 		
 	
 
-	
+	
 	    
       		
  	        	
@@ -116,29 +116,29 @@
 	    
 	
 
-	
-	
+	
+	
 
 	
 
-	
+	
 		
 		
 	
 
-	
+	
 		
 		/casfailed.jsp
 		/
 		/j_acegi_cas_security_check
 	
 
-	
+	
 		https://localhost:8443/cas/login
 		
 	
 
-	
+	
    		false
 		
 		  
@@ -150,7 +150,7 @@
 	
-	
+	
     	
     	
  		
diff --git a/samples/contacts/src/main/webapp/cas/WEB-INF/web.xml b/samples/contacts/src/main/webapp/cas/WEB-INF/web.xml
index cbf38f96da..86f72e3926 100644
--- a/samples/contacts/src/main/webapp/cas/WEB-INF/web.xml
+++ b/samples/contacts/src/main/webapp/cas/WEB-INF/web.xml
@@ -42,10 +42,10 @@
 
     
         Acegi Filter Chain Proxy
-        net.sf.acegisecurity.util.FilterToBeanProxy
+        org.acegisecurity.util.FilterToBeanProxy
         
             targetClass
-            net.sf.acegisecurity.util.FilterChainProxy
+            org.acegisecurity.util.FilterChainProxy
         
     
 
diff --git a/samples/contacts/src/main/webapp/common/WEB-INF/applicationContext-common-authorization.xml b/samples/contacts/src/main/webapp/common/WEB-INF/applicationContext-common-authorization.xml
index 57c4d3b318..2852afc6c8 100644
--- a/samples/contacts/src/main/webapp/common/WEB-INF/applicationContext-common-authorization.xml
+++ b/samples/contacts/src/main/webapp/common/WEB-INF/applicationContext-common-authorization.xml
@@ -14,60 +14,60 @@
    
 
    
-   
-      net.sf.acegisecurity.acl.basic.SimpleAclEntry.ADMINISTRATION
+   
+      org.acegisecurity.acl.basic.SimpleAclEntry.ADMINISTRATION
    
-   
-      net.sf.acegisecurity.acl.basic.SimpleAclEntry.READ
+   
+      org.acegisecurity.acl.basic.SimpleAclEntry.READ
    
-   
-      net.sf.acegisecurity.acl.basic.SimpleAclEntry.DELETE
+   
+      org.acegisecurity.acl.basic.SimpleAclEntry.DELETE
    
 
 
    
-   
+   
 
    
-   
+   
       ACL_CONTACT_READ
       sample.contact.Contact
       
       
         
-          
-          
+          
+          
         
       
    
 
    
-   
+   
       ACL_CONTACT_DELETE
       sample.contact.Contact
       
       
         
-          
-          
+          
+          
         
       
    
 
    
-   
+   
       ACL_CONTACT_ADMIN
       sample.contact.Contact
       
       
         
-          
+          
         
       
    
 
    
-   
+   
       false
       
          
@@ -81,7 +81,7 @@
 
    
 
-   
+   
       
          
             
@@ -89,17 +89,17 @@
       
    
 
-   
+   
       
    
 
-   
+   
       
    
 
    
 
-   
+   
       
          
             
@@ -109,23 +109,23 @@
    
    
    
-   
+   
       
       
         
-          
-          
+          
+          
         
       
    
    
    
-   
+   
       
       
         
-          
-          
+          
+          
         
       
    
@@ -143,7 +143,7 @@
     ACL_CONTACT_READ attribute, which also ensures the user has permission
     to the Contact presented as a method argument.
     -->
-   
+   
       
       
       
diff --git a/samples/contacts/src/main/webapp/common/WEB-INF/jsp/adminPermission.jsp b/samples/contacts/src/main/webapp/common/WEB-INF/jsp/adminPermission.jsp
index 81bddb07ba..86bc15afee 100644
--- a/samples/contacts/src/main/webapp/common/WEB-INF/jsp/adminPermission.jsp
+++ b/samples/contacts/src/main/webapp/common/WEB-INF/jsp/adminPermission.jsp
@@ -1,4 +1,4 @@
-<%@ page import="net.sf.acegisecurity.acl.basic.SimpleAclEntry" %>
+<%@ page import="org.acegisecurity.acl.basic.SimpleAclEntry" %>
 <%@ include file="/WEB-INF/jsp/include.jsp" %>
 
 
@@ -12,7 +12,7 @@
 
      
 
-  
+  
     
      
 
      
       
         
diff --git a/samples/contacts/src/main/webapp/common/WEB-INF/jsp/deletePermission.jsp b/samples/contacts/src/main/webapp/common/WEB-INF/jsp/deletePermission.jsp
index aa0c8eeee4..73fd169d41 100644
--- a/samples/contacts/src/main/webapp/common/WEB-INF/jsp/deletePermission.jsp
+++ b/samples/contacts/src/main/webapp/common/WEB-INF/jsp/deletePermission.jsp
@@ -1,4 +1,4 @@
-<%@ page import="net.sf.acegisecurity.acl.basic.SimpleAclEntry" %>
+<%@ page import="org.acegisecurity.acl.basic.SimpleAclEntry" %>
 <%@ include file="/WEB-INF/jsp/include.jsp" %>
 
 
diff --git a/samples/contacts/src/main/webapp/common/WEB-INF/jsp/include.jsp b/samples/contacts/src/main/webapp/common/WEB-INF/jsp/include.jsp
index 96a45ec08f..f9bcd96703 100644
--- a/samples/contacts/src/main/webapp/common/WEB-INF/jsp/include.jsp
+++ b/samples/contacts/src/main/webapp/common/WEB-INF/jsp/include.jsp
@@ -1,5 +1,5 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="authz" uri="http://acegisecurity.sf.net/authz" %>
+<%@ taglib prefix="authz" uri="http://acegisecurity.org/authz" %>
 
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
diff --git a/samples/contacts/src/main/webapp/common/logoff.jsp b/samples/contacts/src/main/webapp/common/logoff.jsp
index 1b291a5bab..7002eac627 100644
--- a/samples/contacts/src/main/webapp/common/logoff.jsp
+++ b/samples/contacts/src/main/webapp/common/logoff.jsp
@@ -1,5 +1,5 @@
 <%@ page import="javax.servlet.http.Cookie" %>
-<%@ page import="net.sf.acegisecurity.ui.rememberme.TokenBasedRememberMeServices" %>
+<%@ page import="org.acegisecurity.ui.rememberme.TokenBasedRememberMeServices" %>
 <%
 session.invalidate();
 Cookie terminate = new Cookie(TokenBasedRememberMeServices.ACEGI_SECURITY_HASHED_REMEMBER_ME_COOKIE_KEY, null);
diff --git a/samples/contacts/src/main/webapp/common/secure/debug.jsp b/samples/contacts/src/main/webapp/common/secure/debug.jsp
index 50433fab66..2d59a4d6ab 100644
--- a/samples/contacts/src/main/webapp/common/secure/debug.jsp
+++ b/samples/contacts/src/main/webapp/common/secure/debug.jsp
@@ -1,7 +1,7 @@
-<%@ page import="net.sf.acegisecurity.context.SecurityContextHolder" %>
-<%@ page import="net.sf.acegisecurity.Authentication" %>
-<%@ page import="net.sf.acegisecurity.GrantedAuthority" %>
-<%@ page import="net.sf.acegisecurity.adapters.AuthByAdapter" %>
+<%@ page import="org.acegisecurity.context.SecurityContextHolder" %>
+<%@ page import="org.acegisecurity.Authentication" %>
+<%@ page import="org.acegisecurity.GrantedAuthority" %>
+<%@ page import="org.acegisecurity.adapters.AuthByAdapter" %>
 
 <% 
 		Authentication auth = SecurityContextHolder.getContext().getAuthentication();
diff --git a/samples/contacts/src/main/webapp/filter/WEB-INF/applicationContext-acegi-security.xml b/samples/contacts/src/main/webapp/filter/WEB-INF/applicationContext-acegi-security.xml
index a6ee157899..53c2945c82 100644
--- a/samples/contacts/src/main/webapp/filter/WEB-INF/applicationContext-acegi-security.xml
+++ b/samples/contacts/src/main/webapp/filter/WEB-INF/applicationContext-acegi-security.xml
@@ -16,7 +16,7 @@
 
 	
-	
+	
       
          
 		    CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
@@ -28,7 +28,7 @@
 
    
 
-   
+   
       
          
             
@@ -38,13 +38,13 @@
       
    
 
-   
+   
       
    
 
-   
+   
 
-   
+   
       
       
       
@@ -61,44 +61,44 @@
       
    
    
-   
+   
       
    
 
    
-   
+   
 
-   
+   
       
       
    
 
-   
+   
       Contacts Realm
    
 
-   
+   
       foobar
       anonymousUser,ROLE_ANONYMOUS
    
 
-   
+   
       foobar
    
 
-   
+   
    
 
-   
+   
       
    
 
-   
+   
       
       springRocks
    
    
-   
+   
       springRocks
    
 
@@ -107,7 +107,7 @@
    
 
-   
+   
       
       
          
@@ -120,7 +120,7 @@
       
    
 
-   
+   
       
          
             
@@ -129,17 +129,17 @@
       
    
 
-   
-   
+   
+   
 
    
 
-   
+   
       
       
    
 
-   
+   
       
       /acegilogin.jsp?login_error=1
       /
@@ -147,12 +147,12 @@
       
    
 
-   
+   
       /acegilogin.jsp
       false
    
 
-   
+   
       false
       
          
@@ -164,7 +164,7 @@
    
-   
+   
       
       
       
@@ -185,7 +185,7 @@
    
    
-   
+   
       
 	  /j_acegi_switch_user
 	  /j_acegi_exit_user
diff --git a/samples/contacts/src/main/webapp/filter/WEB-INF/web.xml b/samples/contacts/src/main/webapp/filter/WEB-INF/web.xml
index 386b8a906c..5da5284a29 100644
--- a/samples/contacts/src/main/webapp/filter/WEB-INF/web.xml
+++ b/samples/contacts/src/main/webapp/filter/WEB-INF/web.xml
@@ -33,10 +33,10 @@
 
    
         Acegi Filter Chain Proxy
-        net.sf.acegisecurity.util.FilterToBeanProxy
+        org.acegisecurity.util.FilterToBeanProxy
         
             targetClass
-            net.sf.acegisecurity.util.FilterChainProxy
+            org.acegisecurity.util.FilterChainProxy
         
    
 
@@ -64,7 +64,7 @@
         to the WebApplicationContext
  -->  
     
-        net.sf.acegisecurity.ui.session.HttpSessionEventPublisher
+        org.acegisecurity.ui.session.HttpSessionEventPublisher
     
  
   
 
-	
+	
       
          
 		    CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
@@ -26,7 +26,7 @@
 
    
 
-   
+   
       
          
 		    
@@ -34,23 +34,23 @@
       
    
 
-   
+   
       
    
 
-   
+   
       
       
    
 
-   
+   
       Contacts Realm
    
 
-   
+   
    
 
-	
+	
 		
         
 	
@@ -66,11 +66,11 @@
        
     
 
-	
+	
       
 	
 
-	
+	
 		
       
 	
@@ -78,7 +78,7 @@
 	
 	
 	
-	
+	
 		
  		
 			
@@ -89,7 +89,7 @@
 		
 	
 
-	
+	
 	    
       		
  	        	
@@ -98,24 +98,24 @@
 	    
 	
 
-	
-	
+	
+	
 
 	
 
-	
+	
 		
 		
 	
 
-	
+	
 		
 	
 
-	
+	
 	
 
-	
+	
    		false
 		
 		  
@@ -127,7 +127,7 @@
 	
-	
+	
     	
     	
  		
diff --git a/samples/contacts/src/main/webapp/x509/WEB-INF/web.xml b/samples/contacts/src/main/webapp/x509/WEB-INF/web.xml
index c47a74adc8..04fe330ebd 100644
--- a/samples/contacts/src/main/webapp/x509/WEB-INF/web.xml
+++ b/samples/contacts/src/main/webapp/x509/WEB-INF/web.xml
@@ -34,10 +34,10 @@
 
     
         Acegi Filter Chain Proxy
-        net.sf.acegisecurity.util.FilterToBeanProxy
+        org.acegisecurity.util.FilterToBeanProxy
         
             targetClass
-            net.sf.acegisecurity.util.FilterChainProxy
+            org.acegisecurity.util.FilterChainProxy
         
     
 
diff --git a/sandbox/src/main/java/org/acegisecurity/intercept/web/SandboxSecurityEnforcementFilter.java b/sandbox/src/main/java/org/acegisecurity/intercept/web/SandboxSecurityEnforcementFilter.java
index b9d44762ec..b90044125c 100644
--- a/sandbox/src/main/java/org/acegisecurity/intercept/web/SandboxSecurityEnforcementFilter.java
+++ b/sandbox/src/main/java/org/acegisecurity/intercept/web/SandboxSecurityEnforcementFilter.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sf.acegisecurity.intercept.web;
+package org.acegisecurity.intercept.web;
 
 import java.io.IOException;
 
@@ -25,16 +25,16 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import net.sf.acegisecurity.AccessDeniedException;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.AuthenticationTrustResolver;
-import net.sf.acegisecurity.AuthenticationTrustResolverImpl;
-import net.sf.acegisecurity.InsufficientAuthenticationException;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.ui.AbstractProcessingFilter;
-import net.sf.acegisecurity.util.PortResolver;
-import net.sf.acegisecurity.util.PortResolverImpl;
-import net.sf.acegisecurity.wrapper.redirect.SavedHttpServletRequest;
+import org.acegisecurity.AccessDeniedException;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationTrustResolver;
+import org.acegisecurity.AuthenticationTrustResolverImpl;
+import org.acegisecurity.InsufficientAuthenticationException;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.ui.AbstractProcessingFilter;
+import org.acegisecurity.util.PortResolver;
+import org.acegisecurity.util.PortResolverImpl;
+import org.acegisecurity.wrapper.redirect.SavedHttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -53,7 +53,7 @@ import org.springframework.util.Assert;
  * If an {@link AuthenticationException} is detected, the filter will launch
  * the authenticationEntryPoint. This allows common handling of
  * authentication failures originating from any subclass of {@link
- * net.sf.acegisecurity.intercept.AbstractSecurityInterceptor}.
+ * org.acegisecurity.intercept.AbstractSecurityInterceptor}.
  * 
      
  *
  * 
      
@@ -94,7 +94,7 @@ import org.springframework.util.Assert;
  * 
      
  * Do not use this class directly. Instead configure
  * web.xml to use the {@link
- * net.sf.acegisecurity.util.FilterToBeanProxy}.
+ * org.acegisecurity.util.FilterToBeanProxy}.
  * 
      
  *
  * @author Ben Alex
@@ -107,7 +107,7 @@ public class SandboxSecurityEnforcementFilter implements Filter, InitializingBea
     private static final Log logger = LogFactory.getLog(SecurityEnforcementFilter.class);
     
     public static final String ACEGI_SECURITY_ACCESS_DENIED_EXCEPTION_KEY = "ACEGI_SECURITY_403_EXCEPTION";
-    public static final String SAVED_REQUEST_SESSION_ATTRIBUTE = "net.sf.acegisecurity.intercept.web.SAVED_REQUEST_SESSION_ATTRIBUTE";
+    public static final String SAVED_REQUEST_SESSION_ATTRIBUTE = "org.acegisecurity.intercept.web.SAVED_REQUEST_SESSION_ATTRIBUTE";
     
     private AuthenticationEntryPoint authenticationEntryPoint;
     private AuthenticationTrustResolver authenticationTrustResolver = new AuthenticationTrustResolverImpl();
@@ -147,7 +147,7 @@ public class SandboxSecurityEnforcementFilter implements Filter, InitializingBea
      * default). In situations where you do not wish to unnecessarily create HttpSessions
      * - because the user agent will know the failed URL, such as with BASIC or Digest authentication
      * - you may wish to set this property to false. Remember to also set the
-     * {@link net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter#allowSessionCreation}
+     * {@link org.acegisecurity.context.HttpSessionContextIntegrationFilter#allowSessionCreation}
      * to false if you set this property to false.
      *
      * @return true if the HttpSession will be used to store information
diff --git a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/InitialDirContextFactoryBean.java b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/InitialDirContextFactoryBean.java
index eed8897fdd..33a00a609c 100644
--- a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/InitialDirContextFactoryBean.java
+++ b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/InitialDirContextFactoryBean.java
@@ -1,4 +1,4 @@
-package net.sf.acegisecurity.providers.dao.ldap;
+package org.acegisecurity.providers.dao.ldap;
 
 import java.util.Hashtable;
 import java.util.Map;
@@ -16,7 +16,7 @@ import org.springframework.dao.DataAccessResourceFailureException;
  * 
      
  * Eample: 
      
  *       
      
+ *      class="org.acegisecurity.providers.dao.ldap.InitialDirContextFactoryBean">     
      
  *      ldap://myserver.com:389/           
      
  *      cn=UserWithSearchPermissions,dc=mycompany,dc=com  
      
  *      PasswordForUser        
      
diff --git a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/LdapPasswordAuthenticationDao.java b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/LdapPasswordAuthenticationDao.java
index bd4ef4ffe3..a3bc4bad13 100644
--- a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/LdapPasswordAuthenticationDao.java
+++ b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/LdapPasswordAuthenticationDao.java
@@ -1,4 +1,4 @@
-package net.sf.acegisecurity.providers.dao.ldap;
+package org.acegisecurity.providers.dao.ldap;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -11,11 +11,11 @@ import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
 
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.dao.User;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.dao.User;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -34,7 +34,7 @@ import org.springframework.dao.DataAccessResourceFailureException;
  * 
      The following examples would be linked into the main Acegi 
  *    configuration by: 
      
  *       
      
+ *       class="org.acegisecurity.providers.dao.PasswordDaoAuthenticationProvider">   
      
  *                                            
      
  *                                                
      
  *                                                                                  
      
@@ -44,7 +44,7 @@ import org.springframework.dao.DataAccessResourceFailureException;
  * 
      'Standard' LDAP Settings
      
  * 
      
  *         
      
+ *       class="org.acegisecurity.providers.dao.ldap.LdapPasswordAuthenticationDao">      
      
  *       ldap://localhost:389/ou=system      
      
  *       uid={0},ou=users,ou=system      
      
  *       uid={0},ou=users      
      
@@ -56,7 +56,7 @@ import org.springframework.dao.DataAccessResourceFailureException;
  * 	I haven't been able to test this directly, 
  *  but something like the following should do the trick:     
      
  *         
      
+ *       class="org.acegisecurity.providers.dao.ldap.LdapPasswordAuthenticationDao">      
      
  *       ldap://localhost:389/ou=system      
      
  *       {0}@adDomainName      
      
  *               
      
diff --git a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/PasswordAuthenticationDao.java b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/PasswordAuthenticationDao.java
index 11f802dbef..e216b0145d 100644
--- a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/PasswordAuthenticationDao.java
+++ b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/PasswordAuthenticationDao.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.ldap;
+package org.acegisecurity.providers.dao.ldap;
 
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.UserDetails;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.UserDetails;
 
 import org.springframework.dao.DataAccessException;
 
@@ -34,7 +34,7 @@ import org.springframework.dao.DataAccessException;
  * of new data access strategies.
  * 
      
  * 
- * @deprecated instead subclass {@link net.sf.acegisecurity.providers.dao.AbstractUserDetailsAuthenticationProvider}
+ * @deprecated instead subclass {@link org.acegisecurity.providers.dao.AbstractUserDetailsAuthenticationProvider}
  * @author Karel Miarka
  */
 public interface PasswordAuthenticationDao {
diff --git a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/PasswordDaoAuthenticationProvider.java b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/PasswordDaoAuthenticationProvider.java
index 86158d0c76..e66c558ff0 100644
--- a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/PasswordDaoAuthenticationProvider.java
+++ b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/PasswordDaoAuthenticationProvider.java
@@ -13,21 +13,21 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.ldap;
+package org.acegisecurity.providers.dao.ldap;
 
-import net.sf.acegisecurity.AccountExpiredException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.AuthenticationServiceException;
-import net.sf.acegisecurity.CredentialsExpiredException;
-import net.sf.acegisecurity.DisabledException;
-import net.sf.acegisecurity.LockedException;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.AuthenticationProvider;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.providers.dao.DaoAuthenticationProvider;
-import net.sf.acegisecurity.providers.dao.UserCache;
-import net.sf.acegisecurity.providers.dao.cache.NullUserCache;
+import org.acegisecurity.AccountExpiredException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationServiceException;
+import org.acegisecurity.CredentialsExpiredException;
+import org.acegisecurity.DisabledException;
+import org.acegisecurity.LockedException;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.AuthenticationProvider;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.providers.dao.DaoAuthenticationProvider;
+import org.acegisecurity.providers.dao.UserCache;
+import org.acegisecurity.providers.dao.cache.NullUserCache;
 
 import org.springframework.beans.factory.InitializingBean;
 
@@ -81,11 +81,11 @@ import org.springframework.util.Assert;
  * If an application context is detected (which is automatically the case when
  * the bean is started within a Spring container), application events will be
  * published to the context. See {@link
- * net.sf.acegisecurity.event.authentication.AbstractAuthenticationEvent} for
+ * org.acegisecurity.event.authentication.AbstractAuthenticationEvent} for
  * further information.
  * 
      
  *
- * @deprecated instead subclass {@link net.sf.acegisecurity.providers.dao.AbstractUserDetailsAuthenticationProvider}
+ * @deprecated instead subclass {@link org.acegisecurity.providers.dao.AbstractUserDetailsAuthenticationProvider}
  * @author Karel Miarka
  */
 public class PasswordDaoAuthenticationProvider implements AuthenticationProvider,
diff --git a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/InitialDirContextFactory.java b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/InitialDirContextFactory.java
index 648c344207..386a262b5d 100644
--- a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/InitialDirContextFactory.java
+++ b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/InitialDirContextFactory.java
@@ -1,4 +1,4 @@
-package net.sf.acegisecurity.providers.dao.ldap.revised;
+package org.acegisecurity.providers.dao.ldap.revised;
 
 import java.util.Hashtable;
 import java.util.Map;
diff --git a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/LdapPassword2AuthenticationDao.java b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/LdapPassword2AuthenticationDao.java
index 766d919e33..c8d01ab8a5 100644
--- a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/LdapPassword2AuthenticationDao.java
+++ b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/LdapPassword2AuthenticationDao.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package net.sf.acegisecurity.providers.dao.ldap.revised;
+package org.acegisecurity.providers.dao.ldap.revised;
 
 import java.util.ArrayList;
 import java.util.Hashtable;
@@ -15,12 +15,12 @@ import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
 import javax.naming.directory.SearchResult;
 
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.dao.User;
-import net.sf.acegisecurity.providers.dao.ldap.PasswordAuthenticationDao;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.dao.User;
+import org.acegisecurity.providers.dao.ldap.PasswordAuthenticationDao;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/SearchControlsFactory.java b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/SearchControlsFactory.java
index 114bcc3d10..e85287e389 100644
--- a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/SearchControlsFactory.java
+++ b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/SearchControlsFactory.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package net.sf.acegisecurity.providers.dao.ldap.revised;
+package org.acegisecurity.providers.dao.ldap.revised;
 
 
 import javax.naming.directory.SearchControls;
diff --git a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/UserSearchBean.java b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/UserSearchBean.java
index 3382978a9c..99ee48b02a 100644
--- a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/UserSearchBean.java
+++ b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/UserSearchBean.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package net.sf.acegisecurity.providers.dao.ldap.revised;
+package org.acegisecurity.providers.dao.ldap.revised;
 
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
diff --git a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/UserSearchResults.java b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/UserSearchResults.java
index 5555165e96..6523bd5353 100644
--- a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/UserSearchResults.java
+++ b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/UserSearchResults.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package net.sf.acegisecurity.providers.dao.ldap.revised;
+package org.acegisecurity.providers.dao.ldap.revised;
 
 import javax.naming.directory.Attributes;
 import javax.naming.directory.SearchResult;
diff --git a/sandbox/src/main/java/org/acegisecurity/providers/smb/AbstractSmbAuthenticationProvider.java b/sandbox/src/main/java/org/acegisecurity/providers/smb/AbstractSmbAuthenticationProvider.java
index 7c8d1866a9..3a62605205 100644
--- a/sandbox/src/main/java/org/acegisecurity/providers/smb/AbstractSmbAuthenticationProvider.java
+++ b/sandbox/src/main/java/org/acegisecurity/providers/smb/AbstractSmbAuthenticationProvider.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.smb;
+package org.acegisecurity.providers.smb;
 
 import jcifs.UniAddress;
 
@@ -22,11 +22,11 @@ import jcifs.smb.SmbAuthException;
 import jcifs.smb.SmbException;
 import jcifs.smb.SmbSession;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.AuthenticationServiceException;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.providers.AuthenticationProvider;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationServiceException;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.providers.AuthenticationProvider;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/sandbox/src/main/java/org/acegisecurity/providers/smb/ChallengeExpiredException.java b/sandbox/src/main/java/org/acegisecurity/providers/smb/ChallengeExpiredException.java
index 698c8cac11..fcff3df791 100644
--- a/sandbox/src/main/java/org/acegisecurity/providers/smb/ChallengeExpiredException.java
+++ b/sandbox/src/main/java/org/acegisecurity/providers/smb/ChallengeExpiredException.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.smb;
+package org.acegisecurity.providers.smb;
 
-import net.sf.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationException;
 
 
 /**
diff --git a/sandbox/src/main/java/org/acegisecurity/providers/smb/NtlmAuthenticationToken.java b/sandbox/src/main/java/org/acegisecurity/providers/smb/NtlmAuthenticationToken.java
index a5721ca6a9..49effaedc0 100644
--- a/sandbox/src/main/java/org/acegisecurity/providers/smb/NtlmAuthenticationToken.java
+++ b/sandbox/src/main/java/org/acegisecurity/providers/smb/NtlmAuthenticationToken.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.smb;
+package org.acegisecurity.providers.smb;
 
 import jcifs.UniAddress;
 
 import jcifs.smb.NtlmPasswordAuthentication;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.providers.AbstractAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.providers.AbstractAuthenticationToken;
 
 
 /**
@@ -30,8 +30,8 @@ import net.sf.acegisecurity.providers.AbstractAuthenticationToken;
  * @author Davide Baroncelli
  * @version $Id$
  *
- * @see net.sf.acegisecurity.ui.ntlm.NtlmProcessingFilter
- * @see net.sf.acegisecurity.providers.smb.SmbNtlmAuthenticationProvider
+ * @see org.acegisecurity.ui.ntlm.NtlmProcessingFilter
+ * @see org.acegisecurity.providers.smb.SmbNtlmAuthenticationProvider
  */
 public class NtlmAuthenticationToken extends AbstractAuthenticationToken {
     //~ Instance fields ========================================================
diff --git a/sandbox/src/main/java/org/acegisecurity/providers/smb/SmbBasicAuthenticationProvider.java b/sandbox/src/main/java/org/acegisecurity/providers/smb/SmbBasicAuthenticationProvider.java
index 77adc25c70..f1019eaa10 100644
--- a/sandbox/src/main/java/org/acegisecurity/providers/smb/SmbBasicAuthenticationProvider.java
+++ b/sandbox/src/main/java/org/acegisecurity/providers/smb/SmbBasicAuthenticationProvider.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.smb;
+package org.acegisecurity.providers.smb;
 
 import jcifs.Config;
 import jcifs.UniAddress;
 
 import jcifs.smb.NtlmPasswordAuthentication;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 
 import java.net.UnknownHostException;
 
diff --git a/sandbox/src/main/java/org/acegisecurity/providers/smb/SmbNtlmAuthenticationProvider.java b/sandbox/src/main/java/org/acegisecurity/providers/smb/SmbNtlmAuthenticationProvider.java
index 077794ab27..799242c3e2 100644
--- a/sandbox/src/main/java/org/acegisecurity/providers/smb/SmbNtlmAuthenticationProvider.java
+++ b/sandbox/src/main/java/org/acegisecurity/providers/smb/SmbNtlmAuthenticationProvider.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.smb;
+package org.acegisecurity.providers.smb;
 
 import jcifs.UniAddress;
 
 import jcifs.smb.NtlmPasswordAuthentication;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.ui.ntlm.NtlmProcessingFilter;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ui.ntlm.NtlmProcessingFilter;
 
 
 /**
@@ -31,7 +31,7 @@ import net.sf.acegisecurity.ui.ntlm.NtlmProcessingFilter;
  * @author Davide Baroncelli
  * @version $Id$
  *
- * @see net.sf.acegisecurity.ui.ntlm.NtlmProcessingFilter
+ * @see org.acegisecurity.ui.ntlm.NtlmProcessingFilter
  */
 public class SmbNtlmAuthenticationProvider
     extends AbstractSmbAuthenticationProvider {
diff --git a/sandbox/src/main/java/org/acegisecurity/ui/ntlm/NtlmProcessingFilter.java b/sandbox/src/main/java/org/acegisecurity/ui/ntlm/NtlmProcessingFilter.java
index 41b3c99d4f..7587598663 100644
--- a/sandbox/src/main/java/org/acegisecurity/ui/ntlm/NtlmProcessingFilter.java
+++ b/sandbox/src/main/java/org/acegisecurity/ui/ntlm/NtlmProcessingFilter.java
@@ -1,7 +1,7 @@
 /*
  * LICENSE IS UNKNOWN (SEE TODO COMMENT LATER IN SOURCE CODE)
  */
-package net.sf.acegisecurity.ui.ntlm;
+package org.acegisecurity.ui.ntlm;
 
 import jcifs.Config;
 import jcifs.UniAddress;
@@ -12,13 +12,13 @@ import jcifs.smb.NtlmChallenge;
 import jcifs.smb.NtlmPasswordAuthentication;
 import jcifs.smb.SmbSession;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.AuthenticationManager;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.intercept.web.AuthenticationEntryPoint;
-import net.sf.acegisecurity.providers.smb.NtlmAuthenticationToken;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.AuthenticationManager;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.intercept.web.AuthenticationEntryPoint;
+import org.acegisecurity.providers.smb.NtlmAuthenticationToken;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/sandbox/src/main/java/org/acegisecurity/ui/ntlm/NtlmProcessingFilterEntryPoint.java b/sandbox/src/main/java/org/acegisecurity/ui/ntlm/NtlmProcessingFilterEntryPoint.java
index 20baa26792..b783b2b953 100644
--- a/sandbox/src/main/java/org/acegisecurity/ui/ntlm/NtlmProcessingFilterEntryPoint.java
+++ b/sandbox/src/main/java/org/acegisecurity/ui/ntlm/NtlmProcessingFilterEntryPoint.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.ui.ntlm;
+package org.acegisecurity.ui.ntlm;
 
-import net.sf.acegisecurity.AuthenticationException;
-import net.sf.acegisecurity.intercept.web.AuthenticationEntryPoint;
+import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.intercept.web.AuthenticationEntryPoint;
 
 import java.io.IOException;
 
diff --git a/sandbox/src/main/java/org/acegisecurity/wrapper/SandboxSecurityContextHolderAwareRequestWrapper.java b/sandbox/src/main/java/org/acegisecurity/wrapper/SandboxSecurityContextHolderAwareRequestWrapper.java
index 0e4982c0d1..eceba90b2a 100644
--- a/sandbox/src/main/java/org/acegisecurity/wrapper/SandboxSecurityContextHolderAwareRequestWrapper.java
+++ b/sandbox/src/main/java/org/acegisecurity/wrapper/SandboxSecurityContextHolderAwareRequestWrapper.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.wrapper;
+package org.acegisecurity.wrapper;
 
 import java.security.Principal;
 import java.text.SimpleDateFormat;
@@ -30,16 +30,16 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpSession;
 
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationTrustResolver;
-import net.sf.acegisecurity.AuthenticationTrustResolverImpl;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.context.SecurityContextHolder;
-import net.sf.acegisecurity.intercept.web.SandboxSecurityEnforcementFilter;
-import net.sf.acegisecurity.wrapper.redirect.Enumerator;
-import net.sf.acegisecurity.wrapper.redirect.FastHttpDateFormat;
-import net.sf.acegisecurity.wrapper.redirect.SavedHttpServletRequest;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationTrustResolver;
+import org.acegisecurity.AuthenticationTrustResolverImpl;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.context.SecurityContextHolder;
+import org.acegisecurity.intercept.web.SandboxSecurityEnforcementFilter;
+import org.acegisecurity.wrapper.redirect.Enumerator;
+import org.acegisecurity.wrapper.redirect.FastHttpDateFormat;
+import org.acegisecurity.wrapper.redirect.SavedHttpServletRequest;
 
 /**
  * An Acegi Security-aware HttpServletRequestWrapper, which uses
diff --git a/sandbox/src/main/java/org/acegisecurity/wrapper/redirect/Enumerator.java b/sandbox/src/main/java/org/acegisecurity/wrapper/redirect/Enumerator.java
index 4828e7397d..e36f1e065d 100644
--- a/sandbox/src/main/java/org/acegisecurity/wrapper/redirect/Enumerator.java
+++ b/sandbox/src/main/java/org/acegisecurity/wrapper/redirect/Enumerator.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.wrapper.redirect;
+package org.acegisecurity.wrapper.redirect;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/sandbox/src/main/java/org/acegisecurity/wrapper/redirect/FastHttpDateFormat.java b/sandbox/src/main/java/org/acegisecurity/wrapper/redirect/FastHttpDateFormat.java
index 4f8f8d4cf1..340c0fde98 100644
--- a/sandbox/src/main/java/org/acegisecurity/wrapper/redirect/FastHttpDateFormat.java
+++ b/sandbox/src/main/java/org/acegisecurity/wrapper/redirect/FastHttpDateFormat.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.wrapper.redirect;
+package org.acegisecurity.wrapper.redirect;
 
 import java.text.DateFormat;
 import java.text.ParseException;
diff --git a/sandbox/src/main/java/org/acegisecurity/wrapper/redirect/SavedHttpServletRequest.java b/sandbox/src/main/java/org/acegisecurity/wrapper/redirect/SavedHttpServletRequest.java
index f6bffbd315..84ba6b9950 100644
--- a/sandbox/src/main/java/org/acegisecurity/wrapper/redirect/SavedHttpServletRequest.java
+++ b/sandbox/src/main/java/org/acegisecurity/wrapper/redirect/SavedHttpServletRequest.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.wrapper.redirect;
+package org.acegisecurity.wrapper.redirect;
 
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -26,8 +26,8 @@ import java.util.Map;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 
-import net.sf.acegisecurity.intercept.web.SecurityEnforcementFilter;
-import net.sf.acegisecurity.wrapper.SecurityContextHolderAwareRequestWrapper;
+import org.acegisecurity.intercept.web.SecurityEnforcementFilter;
+import org.acegisecurity.wrapper.SecurityContextHolderAwareRequestWrapper;
 
 /**
  * 
      
diff --git a/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/DirSetupTestCase.java b/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/DirSetupTestCase.java
index 7f13d98be1..9b5b1755b8 100644
--- a/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/DirSetupTestCase.java
+++ b/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/DirSetupTestCase.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sf.acegisecurity.providers.dao.ldap;
+package org.acegisecurity.providers.dao.ldap;
 
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
-import net.sf.acegisecurity.providers.dao.ldap.support.BaseLdapTestCase;
+import org.acegisecurity.providers.dao.ldap.support.BaseLdapTestCase;
 
 /** Tests to ensure the directory server we are running against is 
  *   configured as expected.
diff --git a/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/LdapPasswordAuthenticationDaoTests.java b/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/LdapPasswordAuthenticationDaoTests.java
index b6b9ac71db..5942b1fe32 100644
--- a/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/LdapPasswordAuthenticationDaoTests.java
+++ b/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/LdapPasswordAuthenticationDaoTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.ldap;
+package org.acegisecurity.providers.dao.ldap;
 
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.dao.ldap.support.BaseLdapTestCase;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.dao.ldap.support.BaseLdapTestCase;
 
 import javax.naming.NamingException;
 
diff --git a/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/PasswordDaoAuthenticationProviderTests.java b/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/PasswordDaoAuthenticationProviderTests.java
index 008fe490e5..bef3383efb 100644
--- a/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/PasswordDaoAuthenticationProviderTests.java
+++ b/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/PasswordDaoAuthenticationProviderTests.java
@@ -13,29 +13,29 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.ldap;
+package org.acegisecurity.providers.dao.ldap;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import junit.framework.TestCase;
-import net.sf.acegisecurity.AccountExpiredException;
-import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.AuthenticationServiceException;
-import net.sf.acegisecurity.BadCredentialsException;
-import net.sf.acegisecurity.CredentialsExpiredException;
-import net.sf.acegisecurity.DisabledException;
-import net.sf.acegisecurity.GrantedAuthority;
-import net.sf.acegisecurity.GrantedAuthorityImpl;
-import net.sf.acegisecurity.LockedException;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.providers.TestingAuthenticationToken;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.providers.dao.User;
-import net.sf.acegisecurity.providers.dao.UserCache;
-import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
-import net.sf.acegisecurity.providers.dao.cache.EhCacheBasedUserCache;
-import net.sf.acegisecurity.providers.dao.cache.NullUserCache;
+import org.acegisecurity.AccountExpiredException;
+import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationServiceException;
+import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.CredentialsExpiredException;
+import org.acegisecurity.DisabledException;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.GrantedAuthorityImpl;
+import org.acegisecurity.LockedException;
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.acegisecurity.providers.dao.User;
+import org.acegisecurity.providers.dao.UserCache;
+import org.acegisecurity.providers.dao.UsernameNotFoundException;
+import org.acegisecurity.providers.dao.cache.EhCacheBasedUserCache;
+import org.acegisecurity.providers.dao.cache.NullUserCache;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataRetrievalFailureException;
diff --git a/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/BaseLdapTestCase.java b/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/BaseLdapTestCase.java
index ce14303556..1e96dcdbe1 100644
--- a/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/BaseLdapTestCase.java
+++ b/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/BaseLdapTestCase.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao.ldap.support;
+package org.acegisecurity.providers.dao.ldap.support;
 
 import junit.framework.TestCase;
 
@@ -71,8 +71,8 @@ public class BaseLdapTestCase extends TestCase {
      * reference it (with the possible exception of comparing return values 
      * between the Server Context and the Client Context).
      * 
-     * @see net.sf.acegisecurity.providers.dao.ldap.support.EmbeddedLdapServerController
-     * @see net.sf.acegisecurity.providers.dao.ldap.support.LdapDirInitializer
+     * @see org.acegisecurity.providers.dao.ldap.support.EmbeddedLdapServerController
+     * @see org.acegisecurity.providers.dao.ldap.support.LdapDirInitializer
      *
      * @return The server context for LDAP operations; used for things like
      *         addding/removing users to to test against.
diff --git a/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/EmbeddedLdapServerController.java b/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/EmbeddedLdapServerController.java
index c452632894..8bc2f8b71a 100644
--- a/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/EmbeddedLdapServerController.java
+++ b/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/EmbeddedLdapServerController.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sf.acegisecurity.providers.dao.ldap.support;
+package org.acegisecurity.providers.dao.ldap.support;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/LdapDirInitializer.java b/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/LdapDirInitializer.java
index 459d436706..e1d087403f 100644
--- a/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/LdapDirInitializer.java
+++ b/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/LdapDirInitializer.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sf.acegisecurity.providers.dao.ldap.support;
+package org.acegisecurity.providers.dao.ldap.support;
 
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;