Move UserDetails interface to net.sf.acegisecurity package.

core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java

@@ -20,6 +20,7 @@ import net.sf.acegisecurity.AuthenticationException;
 import net.sf.acegisecurity.AuthenticationServiceException;
 import net.sf.acegisecurity.BadCredentialsException;
 import net.sf.acegisecurity.DisabledException;
+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;

core/src/main/java/org/acegisecurity/providers/dao/SaltSource.java

@@ -15,6 +15,9 @@
 
 package net.sf.acegisecurity.providers.dao;
 
+import net.sf.acegisecurity.UserDetails;
+
+
 /**
  * Provides alternative sources of the salt to use for encoding passwords.
  *

core/src/main/java/org/acegisecurity/providers/dao/UserCache.java

@@ -15,6 +15,9 @@
 
 package net.sf.acegisecurity.providers.dao;
 
+import net.sf.acegisecurity.UserDetails;
+
+
 /**
  * Provides a cache of {@link User} objects.
  * 

core/src/main/java/org/acegisecurity/providers/dao/cache/EhCacheBasedUserCache.java

@@ -15,8 +15,8 @@
 
 package net.sf.acegisecurity.providers.dao.cache;
 
+import net.sf.acegisecurity.UserDetails;
 import net.sf.acegisecurity.providers.dao.UserCache;
-import net.sf.acegisecurity.providers.dao.UserDetails;
 
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheException;

core/src/main/java/org/acegisecurity/providers/dao/cache/NullUserCache.java

@@ -15,8 +15,8 @@
 
 package net.sf.acegisecurity.providers.dao.cache;
 
+import net.sf.acegisecurity.UserDetails;
 import net.sf.acegisecurity.providers.dao.UserCache;
-import net.sf.acegisecurity.providers.dao.UserDetails;
 
 
 /**

core/src/main/java/org/acegisecurity/providers/dao/event/AuthenticationEvent.java

@@ -16,8 +16,8 @@
 package net.sf.acegisecurity.providers.dao.event;
 
 import net.sf.acegisecurity.Authentication;
+import net.sf.acegisecurity.UserDetails;
 import net.sf.acegisecurity.providers.dao.User;
-import net.sf.acegisecurity.providers.dao.UserDetails;
 
 import org.springframework.context.ApplicationEvent;
 

core/src/main/java/org/acegisecurity/providers/dao/event/AuthenticationFailureDisabledEvent.java

@@ -16,7 +16,7 @@
 package net.sf.acegisecurity.providers.dao.event;
 
 import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.providers.dao.UserDetails;
+import net.sf.acegisecurity.UserDetails;
 
 
 /**

core/src/main/java/org/acegisecurity/providers/dao/event/AuthenticationFailurePasswordEvent.java

@@ -16,7 +16,7 @@
 package net.sf.acegisecurity.providers.dao.event;
 
 import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.providers.dao.UserDetails;
+import net.sf.acegisecurity.UserDetails;
 
 
 /**

core/src/main/java/org/acegisecurity/providers/dao/event/AuthenticationSuccessEvent.java

@@ -16,7 +16,7 @@
 package net.sf.acegisecurity.providers.dao.event;
 
 import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.providers.dao.UserDetails;
+import net.sf.acegisecurity.UserDetails;
 
 
 /**

core/src/main/java/org/acegisecurity/providers/dao/salt/ReflectionSaltSource.java

@@ -16,9 +16,9 @@
 package net.sf.acegisecurity.providers.dao.salt;
 
 import net.sf.acegisecurity.AuthenticationServiceException;
+import net.sf.acegisecurity.UserDetails;
 import net.sf.acegisecurity.providers.dao.SaltSource;
 import net.sf.acegisecurity.providers.dao.User;
-import net.sf.acegisecurity.providers.dao.UserDetails;
 
 import org.springframework.beans.factory.InitializingBean;
 

core/src/main/java/org/acegisecurity/providers/dao/salt/SystemWideSaltSource.java

@@ -15,9 +15,9 @@
 
 package net.sf.acegisecurity.providers.dao.salt;
 
+import net.sf.acegisecurity.UserDetails;
 import net.sf.acegisecurity.providers.dao.SaltSource;
 import net.sf.acegisecurity.providers.dao.User;
-import net.sf.acegisecurity.providers.dao.UserDetails;
 
 import org.springframework.beans.factory.InitializingBean;
 

core/src/main/java/org/acegisecurity/userdetails/User.java

@@ -16,6 +16,7 @@
 package net.sf.acegisecurity.providers.dao;
 
 import net.sf.acegisecurity.GrantedAuthority;
+import net.sf.acegisecurity.UserDetails;
 
 
 /**

core/src/main/java/org/acegisecurity/providers/dao/UserDetails.java → core/src/main/java/org/acegisecurity/userdetails/UserDetails.java

@@ -13,15 +13,23 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao;
+package net.sf.acegisecurity;
 
-import net.sf.acegisecurity.GrantedAuthority;
+import net.sf.acegisecurity.providers.dao.User;
 
 import java.io.Serializable;
 
 
 /**
- * Provides core user information required by the package.
+ * Provides core user information.
+ * 
+ * <P>
+ * Implementations are not used directly by Acegi Security for security
+ * purposes. They simply store user information which is later encapsulated
+ * into {@link Authentication} objects. This allows non-security related user
+ * information (such as email addresses, telephone numbers etc) to be stored
+ * in a convenient location.
+ * </p>
  * 
  * <P>
  * Concrete implementations must take particular care to ensure the non-null

core/src/main/java/org/acegisecurity/userdetails/UserDetailsService.java

@@ -15,6 +15,8 @@
 
 package net.sf.acegisecurity.providers.dao;
 
+import net.sf.acegisecurity.UserDetails;
+
 import org.springframework.dao.DataAccessException;
 
 

core/src/main/java/org/acegisecurity/userdetails/jdbc/JdbcDaoImpl.java

@@ -17,9 +17,9 @@ package net.sf.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.UserDetails;
 import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
 
 import org.apache.commons.logging.Log;

core/src/main/java/org/acegisecurity/userdetails/memory/InMemoryDaoImpl.java

@@ -15,8 +15,8 @@
 
 package net.sf.acegisecurity.providers.dao.memory;
 
+import net.sf.acegisecurity.UserDetails;
 import net.sf.acegisecurity.providers.dao.AuthenticationDao;
-import net.sf.acegisecurity.providers.dao.UserDetails;
 import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
 
 import org.springframework.beans.factory.InitializingBean;

core/src/main/java/org/acegisecurity/userdetails/memory/UserMap.java

@@ -15,8 +15,8 @@
 
 package net.sf.acegisecurity.providers.dao.memory;
 
+import net.sf.acegisecurity.UserDetails;
 import net.sf.acegisecurity.providers.dao.User;
-import net.sf.acegisecurity.providers.dao.UserDetails;
 import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
 
 import org.apache.commons.logging.Log;

core/src/main/java/org/acegisecurity/userdetails/memory/UserMapEditor.java

@@ -15,8 +15,8 @@
 
 package net.sf.acegisecurity.providers.dao.memory;
 
+import net.sf.acegisecurity.UserDetails;
 import net.sf.acegisecurity.providers.dao.User;
-import net.sf.acegisecurity.providers.dao.UserDetails;
 
 import org.springframework.beans.propertyeditors.PropertiesEditor;
 

core/src/test/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulatorTests.java

@@ -19,9 +19,9 @@ 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.UserDetails;
 import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
 
 import org.springframework.dao.DataAccessException;

core/src/test/java/org/acegisecurity/providers/dao/DaoAuthenticationProviderTests.java

@@ -23,6 +23,7 @@ import net.sf.acegisecurity.BadCredentialsException;
 import net.sf.acegisecurity.DisabledException;
 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.dao.cache.EhCacheBasedUserCache;

core/src/test/java/org/acegisecurity/providers/dao/UserTests.java

@@ -19,6 +19,7 @@ import junit.framework.TestCase;
 
 import net.sf.acegisecurity.GrantedAuthority;
 import net.sf.acegisecurity.GrantedAuthorityImpl;
+import net.sf.acegisecurity.UserDetails;
 
 
 /**

core/src/test/java/org/acegisecurity/providers/dao/jdbc/JdbcDaoTests.java

@@ -17,7 +17,7 @@ package net.sf.acegisecurity.providers.dao.jdbc;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.providers.dao.UserDetails;
+import net.sf.acegisecurity.UserDetails;
 import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
 
 import org.springframework.core.io.ClassPathResource;
@@ -166,6 +166,20 @@ public class JdbcDaoTests extends TestCase {
         }
     }
 
+    private DataSource makeDataSource() throws Exception {
+        ClassPathResource dbScript = new ClassPathResource(
+                "acegisecuritytest.script");
+        String path = dbScript.getFile().getParentFile().getAbsolutePath();
+
+        DriverManagerDataSource ds = new DriverManagerDataSource();
+        ds.setDriverClassName("org.hsqldb.jdbcDriver");
+        ds.setUrl("jdbc:hsqldb:" + path + File.separator + "acegisecuritytest");
+        ds.setUsername("sa");
+        ds.setPassword("");
+
+        return ds;
+    }
+
     private JdbcDaoImpl makePopulatedJdbcDao() throws Exception {
         JdbcDaoImpl dao = new JdbcDaoImpl();
         dao.setDataSource(makeDataSource());
@@ -184,20 +198,6 @@ public class JdbcDaoTests extends TestCase {
         return dao;
     }
 
-    private DataSource makeDataSource()
-        throws Exception {
-        ClassPathResource dbScript = new ClassPathResource("acegisecuritytest.script");
-        String path = dbScript.getFile().getParentFile().getAbsolutePath();
-
-        DriverManagerDataSource ds = new DriverManagerDataSource();
-        ds.setDriverClassName("org.hsqldb.jdbcDriver");
-        ds.setUrl("jdbc:hsqldb:" + path + File.separator + "acegisecuritytest");
-        ds.setUsername("sa");
-        ds.setPassword("");
-
-        return ds;
-    }
-
     //~ Inner Classes ==========================================================
 
     private class MockMappingSqlQuery extends MappingSqlQuery {

core/src/test/java/org/acegisecurity/providers/dao/memory/UserMapTests.java

@@ -19,8 +19,8 @@ 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.UserDetails;
 import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
 
 

core/src/test/java/org/acegisecurity/providers/dao/salt/ReflectionSaltSourceTests.java

@@ -20,8 +20,8 @@ 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 net.sf.acegisecurity.providers.dao.UserDetails;
 
 
 /**

core/src/test/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterTests.java

@@ -24,7 +24,7 @@ import net.sf.acegisecurity.MockFilterConfig;
 import net.sf.acegisecurity.MockHttpServletRequest;
 import net.sf.acegisecurity.MockHttpServletResponse;
 import net.sf.acegisecurity.MockHttpSession;
-import net.sf.acegisecurity.providers.dao.UserDetails;
+import net.sf.acegisecurity.UserDetails;
 import net.sf.acegisecurity.ui.webapp.HttpSessionIntegrationFilter;
 
 import org.apache.commons.codec.binary.Base64;

samples/contacts/src/main/java/sample/contact/ContactManagerFacade.java

@@ -17,9 +17,9 @@ package sample.contact;
 
 import net.sf.acegisecurity.AccessDeniedException;
 import net.sf.acegisecurity.Authentication;
+import net.sf.acegisecurity.UserDetails;
 import net.sf.acegisecurity.context.ContextHolder;
 import net.sf.acegisecurity.context.SecureContext;
-import net.sf.acegisecurity.providers.dao.UserDetails;
 
 import org.springframework.beans.factory.InitializingBean;
 

samples/contacts/src/main/java/sample/contact/ContactSecurityVoter.java

@@ -18,7 +18,7 @@ package sample.contact;
 import net.sf.acegisecurity.Authentication;
 import net.sf.acegisecurity.ConfigAttribute;
 import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.providers.dao.UserDetails;
+import net.sf.acegisecurity.UserDetails;
 import net.sf.acegisecurity.vote.AccessDecisionVoter;
 
 import org.aopalliance.intercept.MethodInvocation;

samples/contacts/src/main/java/sample/contact/SecureIndexController.java

@@ -18,9 +18,9 @@ package sample.contact;
 import net.sf.acegisecurity.Authentication;
 import net.sf.acegisecurity.AuthenticationCredentialsNotFoundException;
 import net.sf.acegisecurity.GrantedAuthority;
+import net.sf.acegisecurity.UserDetails;
 import net.sf.acegisecurity.context.ContextHolder;
 import net.sf.acegisecurity.context.SecureContext;
-import net.sf.acegisecurity.providers.dao.UserDetails;
 
 import org.springframework.beans.factory.InitializingBean;
 

samples/contacts/src/main/java/sample/contact/WebContactAddController.java

@@ -16,9 +16,9 @@
 package sample.contact;
 
 import net.sf.acegisecurity.Authentication;
+import net.sf.acegisecurity.UserDetails;
 import net.sf.acegisecurity.context.ContextHolder;
 import net.sf.acegisecurity.context.SecureContext;
-import net.sf.acegisecurity.providers.dao.UserDetails;
 
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.SimpleFormController;