From bd9138d78ad72921b66229c0d28855b3308ec33b Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Fri, 1 Feb 2008 14:38:03 +0000 Subject: [PATCH] Import cleaning. --- .../security/config/UserServiceBeanDefinitionParser.java | 1 - .../security/ldap/InitialDirContextFactory.java | 2 -- .../ldap/populator/DefaultLdapAuthoritiesPopulator.java | 2 -- .../security/ui/switchuser/SwitchUserProcessingFilter.java | 1 - .../decorator/StatusCheckingUserDetailsService.java | 1 - .../security/userdetails/ldap/LdapUserDetails.java | 1 - .../springframework/security/config/DataSourcePopulator.java | 4 ---- .../config/LdapUserServiceBeanDefinitionParserTests.java | 4 ---- .../security/intercept/InterceptorStatusTokenTests.java | 3 --- .../authenticator/PasswordComparisonAuthenticatorTests.java | 1 - .../security/ui/ntlm/NtlmProcessingFilter.java | 1 - 11 files changed, 21 deletions(-) diff --git a/core/src/main/java/org/springframework/security/config/UserServiceBeanDefinitionParser.java b/core/src/main/java/org/springframework/security/config/UserServiceBeanDefinitionParser.java index cea8c76d6b..a5d0a490bf 100644 --- a/core/src/main/java/org/springframework/security/config/UserServiceBeanDefinitionParser.java +++ b/core/src/main/java/org/springframework/security/config/UserServiceBeanDefinitionParser.java @@ -1,7 +1,6 @@ package org.springframework.security.config; import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.beans.factory.config.BeanDefinitionHolder; import org.springframework.beans.factory.config.PropertiesFactoryBean; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.RootBeanDefinition; diff --git a/core/src/main/java/org/springframework/security/ldap/InitialDirContextFactory.java b/core/src/main/java/org/springframework/security/ldap/InitialDirContextFactory.java index f0d84d5046..87111dd15a 100644 --- a/core/src/main/java/org/springframework/security/ldap/InitialDirContextFactory.java +++ b/core/src/main/java/org/springframework/security/ldap/InitialDirContextFactory.java @@ -15,8 +15,6 @@ package org.springframework.security.ldap; -import org.springframework.ldap.core.ContextSource; - import javax.naming.directory.DirContext; diff --git a/core/src/main/java/org/springframework/security/ldap/populator/DefaultLdapAuthoritiesPopulator.java b/core/src/main/java/org/springframework/security/ldap/populator/DefaultLdapAuthoritiesPopulator.java index ebd0892fe0..a71030868c 100644 --- a/core/src/main/java/org/springframework/security/ldap/populator/DefaultLdapAuthoritiesPopulator.java +++ b/core/src/main/java/org/springframework/security/ldap/populator/DefaultLdapAuthoritiesPopulator.java @@ -19,10 +19,8 @@ import org.springframework.security.GrantedAuthority; import org.springframework.security.GrantedAuthorityImpl; import org.springframework.security.ldap.SpringSecurityLdapTemplate; import org.springframework.security.ldap.LdapAuthoritiesPopulator; -import org.springframework.security.ldap.LdapUtils; import org.springframework.ldap.core.ContextSource; import org.springframework.ldap.core.DirContextOperations; -import org.springframework.ldap.core.DistinguishedName; import org.springframework.util.Assert; import org.apache.commons.logging.Log; diff --git a/core/src/main/java/org/springframework/security/ui/switchuser/SwitchUserProcessingFilter.java b/core/src/main/java/org/springframework/security/ui/switchuser/SwitchUserProcessingFilter.java index 8f06db7769..7deec4329f 100644 --- a/core/src/main/java/org/springframework/security/ui/switchuser/SwitchUserProcessingFilter.java +++ b/core/src/main/java/org/springframework/security/ui/switchuser/SwitchUserProcessingFilter.java @@ -25,7 +25,6 @@ import org.springframework.security.DisabledException; import org.springframework.security.GrantedAuthority; import org.springframework.security.LockedException; import org.springframework.security.util.RedirectUtils; -import org.springframework.security.util.AuthorityUtils; import org.springframework.security.context.SecurityContextHolder; diff --git a/core/src/main/java/org/springframework/security/userdetails/decorator/StatusCheckingUserDetailsService.java b/core/src/main/java/org/springframework/security/userdetails/decorator/StatusCheckingUserDetailsService.java index bb8da5295a..33413877fa 100644 --- a/core/src/main/java/org/springframework/security/userdetails/decorator/StatusCheckingUserDetailsService.java +++ b/core/src/main/java/org/springframework/security/userdetails/decorator/StatusCheckingUserDetailsService.java @@ -2,7 +2,6 @@ package org.springframework.security.userdetails.decorator; import org.springframework.security.userdetails.UserDetailsService; import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.UsernameNotFoundException; import org.springframework.security.LockedException; import org.springframework.security.DisabledException; import org.springframework.security.AccountExpiredException; diff --git a/core/src/main/java/org/springframework/security/userdetails/ldap/LdapUserDetails.java b/core/src/main/java/org/springframework/security/userdetails/ldap/LdapUserDetails.java index 5c3a80d1a7..b0fb53a5d7 100644 --- a/core/src/main/java/org/springframework/security/userdetails/ldap/LdapUserDetails.java +++ b/core/src/main/java/org/springframework/security/userdetails/ldap/LdapUserDetails.java @@ -18,7 +18,6 @@ package org.springframework.security.userdetails.ldap; import org.springframework.security.userdetails.UserDetails; import javax.naming.directory.Attributes; -import javax.naming.ldap.Control; /** diff --git a/core/src/test/java/org/springframework/security/config/DataSourcePopulator.java b/core/src/test/java/org/springframework/security/config/DataSourcePopulator.java index 96067ada33..a18b4c466e 100644 --- a/core/src/test/java/org/springframework/security/config/DataSourcePopulator.java +++ b/core/src/test/java/org/springframework/security/config/DataSourcePopulator.java @@ -20,10 +20,6 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.DisposableBean; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.util.Assert; -import org.springframework.context.ApplicationEventPublisherAware; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.context.ApplicationListener; -import org.springframework.context.ApplicationEvent; /** diff --git a/core/src/test/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParserTests.java b/core/src/test/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParserTests.java index f4d72dbd1e..005ffd7a6b 100644 --- a/core/src/test/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParserTests.java +++ b/core/src/test/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParserTests.java @@ -3,10 +3,6 @@ package org.springframework.security.config; import org.springframework.security.util.InMemoryXmlApplicationContext; import org.springframework.security.userdetails.UserDetailsService; import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.AuthenticationManager; -import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.providers.ProviderManager; -import org.springframework.security.providers.dao.DaoAuthenticationProvider; import org.junit.Test; import org.junit.After; diff --git a/core/src/test/java/org/springframework/security/intercept/InterceptorStatusTokenTests.java b/core/src/test/java/org/springframework/security/intercept/InterceptorStatusTokenTests.java index 7bb08c9e82..5b121b665c 100644 --- a/core/src/test/java/org/springframework/security/intercept/InterceptorStatusTokenTests.java +++ b/core/src/test/java/org/springframework/security/intercept/InterceptorStatusTokenTests.java @@ -18,10 +18,7 @@ package org.springframework.security.intercept; import junit.framework.TestCase; import org.springframework.security.ConfigAttributeDefinition; -import org.springframework.security.SecurityConfig; - import org.springframework.security.providers.UsernamePasswordAuthenticationToken; - import org.springframework.security.util.SimpleMethodInvocation; import org.aopalliance.intercept.MethodInvocation; diff --git a/core/src/test/java/org/springframework/security/providers/ldap/authenticator/PasswordComparisonAuthenticatorTests.java b/core/src/test/java/org/springframework/security/providers/ldap/authenticator/PasswordComparisonAuthenticatorTests.java index c7b58caed1..33ee2fd63e 100644 --- a/core/src/test/java/org/springframework/security/providers/ldap/authenticator/PasswordComparisonAuthenticatorTests.java +++ b/core/src/test/java/org/springframework/security/providers/ldap/authenticator/PasswordComparisonAuthenticatorTests.java @@ -26,7 +26,6 @@ import org.springframework.security.providers.UsernamePasswordAuthenticationToke import org.springframework.security.userdetails.UsernameNotFoundException; import org.springframework.ldap.core.DirContextAdapter; import org.springframework.ldap.core.DistinguishedName; -import org.springframework.ldap.core.DirContextOperations; import static org.junit.Assert.*; import org.junit.Test; diff --git a/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilter.java b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilter.java index b1874aa091..67eadab6f7 100755 --- a/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilter.java +++ b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilter.java @@ -25,7 +25,6 @@ import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken; import org.springframework.security.ui.SpringSecurityFilter; -import org.springframework.security.ui.WebAuthenticationDetails; import org.springframework.security.ui.FilterChainOrder; import org.springframework.security.ui.AuthenticationDetailsSource; import org.springframework.security.ui.AuthenticationDetailsSourceImpl;