SEC-104: Move to org.acegisecurity package.

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;

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' <code>web.xml</code> and
  * define the <code>edu.yale.its.tp.cas.authHandler</code> context parameter
  * with the value
- * <code>net.sf.acegisecurity.adapters.cas.CasPasswordHandlerProxy</code>.
+ * <code>org.acegisecurity.adapters.cas.CasPasswordHandlerProxy</code>.
  * </p>
  *
  * @author Ben Alex

adapters/cas/src/main/resources/org/acegisecurity/adapters/cas/applicationContext.xml

@@ -24,7 +24,7 @@
 <beans>
 
 	<!-- Data access object which stores authentication information -->
-	<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
@@ -35,11 +35,11 @@
 		</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"/>
@@ -47,7 +47,7 @@
 		</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>
 </beans>

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",

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;
 

adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-invalid.xml

@@ -20,7 +20,7 @@
 
 <beans>
 
-	<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
@@ -31,11 +31,11 @@
 		</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"/>

adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-valid.xml

@@ -20,7 +20,7 @@
 
 <beans>
 
-	<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
@@ -31,11 +31,11 @@
 		</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"/>
@@ -43,7 +43,7 @@
 		</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>
 </beans>

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;

adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-invalid.xml

@@ -22,7 +22,7 @@
 <beans>
 
 	<!-- Data access object which stores authentication information -->
-	<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

adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-valid.xml

@@ -22,7 +22,7 @@
 <beans>
 
 	<!-- Data access object which stores authentication information -->
-	<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
@@ -34,13 +34,13 @@
 	</bean>
 	
 	<!-- Authentication provider that queries our data access object  -->
-	<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="forcePrincipalAsString"><value>true</value></property>
 	</bean>
 
 	<!-- The authentication manager that iterates through our only authentication provider -->
-	<bean id="authenticationManager" class="net.sf.acegisecurity.providers.ProviderManager">
+	<bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
 		<property name="providers">
 		  <list>
 		    <ref bean="daoAuthenticationProvider"/>

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) {

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;
-
-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;
+package org.acegisecurity.adapters.jboss;
+
+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;

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' <code>java:comp/env/security/subject</code>.
  * 
  * <p>

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");

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;
 

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;
 

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;

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;

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$

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);
     }

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;
 
 
 /**

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;

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"));

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;

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;
  * <p>For example: 
  * <pre>
  * &lt;bean id="attributes" 
- *     class="net.sf.acegisecurity.annotation.SecurityAnnotationAttributes"/>
+ *     class="org.acegisecurity.annotation.SecurityAnnotationAttributes"/>
  * 
  * &lt;bean id="objectDefinitionSource" 
- *     class="net.sf.acegisecurity.intercept.method.MethodDefinitionAttributes">
+ *     class="org.acegisecurity.intercept.method.MethodDefinitionAttributes">
  *     &lt;property name="attributes">
  *         &lt;ref local="attributes"/>
  *     &lt;/property>
  * &lt;/bean>
  * 
  * &lt;bean id="securityInterceptor" 
- *     class="net.sf.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor">
+ *     class="org.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor">
  *      . . .
  *      &lt;property name="objectDefinitionSource">
  *          &lt;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 {
 

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 {

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$

core/project.xml

@@ -22,7 +22,7 @@
         <filtering>false</filtering>
       </resource>
       <resource>
-        <directory>${basedir}/src/main/resources/net/sf/acegisecurity/taglibs</directory>
+        <directory>${basedir}/src/main/resources/org/acegisecurity/taglibs</directory>
         <targetPath>META-INF</targetPath>
         <includes>
           <include>*.tld</include>

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
      * 
      * <p>
      * The contract for this method is documented in the {@link
-     * AuthenticationManager#authenticate(net.sf.acegisecurity.Authentication)}.
+     * AuthenticationManager#authenticate(org.acegisecurity.Authentication)}.
      * </p>
      *
      * @param authentication the authentication request object

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.

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

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

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;
 

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 <code>Object</code> 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 <code>Collection</code> 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.
  * </p>
  * 

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;
  * 
  * <p>
  * Stored in a request {@link
- * net.sf.acegisecurity.context.security.SecurityContext}.
+ * org.acegisecurity.context.security.SecurityContext}.
  * </p>
  *
  * @author Ben Alex

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$

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}

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.

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

core/src/main/java/org/acegisecurity/AuthenticationTrustResolver.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity;
+package org.acegisecurity;
 
 /**
  * Evaluates <code>Authentication</code> tokens

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;
 
 
 /**

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

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

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.
  * 
  * <p>
- * 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

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;
  * 
  * <p>
  * All the <code>ConfigAttributeDefinition</code>s 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}.
  * </p>
  *
  * @author Ben Alex

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;
 

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

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

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.

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;
 

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.
  * 
  * <p>
- * {{@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 <code>AuthenticationEntryPoint</code> to be called, allowing the
  * principal to authenticate with a stronger level of authentication. }
  * </p>

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

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

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
  * <code>Authentication</code> 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 <code>Authentication</code> 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 <code>Authentication</code> object when the callback ends.
  * </p>

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 <code>String</code>.

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;
 

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;
 
 
 /**

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

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;

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;

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;
 

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

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

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;
 
 
 /**

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.

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;
 

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;

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;
 
 
 /**

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;

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;
 

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;

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;
 

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;

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;
 
 
 /**

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;

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;
  * 
  * <p>
  * This implementation works with <code>String</code> 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)}.
  * </p>

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;
 
 
 /**

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;
 
 
 /**

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;

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;
  * </p>
  * 
  * <p>
- * See {@link net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter}
+ * See {@link org.acegisecurity.context.HttpSessionContextIntegrationFilter}
  * for further information.
  * </p>
  *

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

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;
 
 
 /**

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;

core/src/main/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProvider.java

@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package net.sf.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;
+package org.acegisecurity.afterinvocation;
+
+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 <code>Collection</code>  domain
  * object instance element for the current <code>Authentication</code> 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}.
  * </p>
  * 
  * <p>
@@ -64,7 +64,7 @@ import java.util.Set;
  * ConfigAttribute#getAttribute()} matches the {@link
  * #processConfigAttribute}. The provider will then lookup the ACLs from the
  * <code>AclManager</code> 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
  * <code>Collection</code> 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);

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
  * <code>Authentication</code> 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}.
  * </p>
  * 
  * <p>
@@ -55,7 +55,7 @@ import java.util.Iterator;
  * ConfigAttribute#getAttribute()} matches the {@link
  * #processConfigAttribute}. The provider will then lookup the ACLs from the
  * <code>AclManager</code> 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.
  * </p>
  * 

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>

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;
 

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;
  * <ul>
  * <li>
  * a keyword to be mapped to urls in the {@link
- * net.sf.acegisecurity.securechannel.ChannelProcessingFilter} configuration<br>
+ * org.acegisecurity.securechannel.ChannelProcessingFilter} configuration<br>
  * default value provided by sub classes.
  * </li>
  * <li>

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;

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;
 
 
 /**

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;

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;
 
 
 

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;

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;
 
 /**
  * <p>

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;
 
 
 /**

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

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.
  * 
  * <p>
- * By default uses {@link net.sf.acegisecurity.concurrent.SessionRegistryImpl},
+ * By default uses {@link org.acegisecurity.concurrent.SessionRegistryImpl},
  * although any <code>SessionRegistry</code> may be used.
  * </p>
  *

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;
  * 
  * <p>
  * 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
  * <code>SessionRegistry</code> 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 <code>web.xml</code>.
  * </p>
  *

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$