From f221920a1990f458b26b185c8fbe5b3623dbd8c1 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Sun, 13 Mar 2016 12:14:32 -0500 Subject: [PATCH] Clean up code to conform to basic checkstyle Issue gh-3746 --- .../security/acls/AclEntryVoter.java | 5 +- .../acls/AclPermissionCacheOptimizer.java | 15 ++ .../security/acls/AclPermissionEvaluator.java | 15 ++ .../afterinvocation/AbstractAclProvider.java | 5 +- ...InvocationCollectionFilteringProvider.java | 5 +- .../AclEntryAfterInvocationProvider.java | 5 +- .../acls/afterinvocation/ArrayFilterer.java | 5 +- .../afterinvocation/CollectionFilterer.java | 5 +- .../acls/afterinvocation/Filterer.java | 5 +- .../acls/afterinvocation/package-info.java | 15 ++ .../acls/domain/AbstractPermission.java | 15 ++ .../acls/domain/AccessControlEntryImpl.java | 5 +- .../acls/domain/AclAuthorizationStrategy.java | 5 +- .../domain/AclAuthorizationStrategyImpl.java | 5 +- .../acls/domain/AclFormattingUtils.java | 5 +- .../security/acls/domain/AclImpl.java | 5 +- .../security/acls/domain/AuditLogger.java | 5 +- .../security/acls/domain/BasePermission.java | 5 +- .../acls/domain/ConsoleAuditLogger.java | 5 +- .../acls/domain/CumulativePermission.java | 5 +- .../acls/domain/DefaultPermissionFactory.java | 15 ++ .../DefaultPermissionGrantingStrategy.java | 15 ++ .../acls/domain/EhCacheBasedAclCache.java | 5 +- .../acls/domain/GrantedAuthoritySid.java | 5 +- .../domain/IdentityUnavailableException.java | 5 +- .../acls/domain/ObjectIdentityImpl.java | 5 +- .../ObjectIdentityRetrievalStrategyImpl.java | 5 +- .../acls/domain/PermissionFactory.java | 15 ++ .../security/acls/domain/PrincipalSid.java | 5 +- .../acls/domain/SidRetrievalStrategyImpl.java | 5 +- .../security/acls/domain/package-info.java | 15 ++ .../acls/jdbc/BasicLookupStrategy.java | 5 +- .../security/acls/jdbc/JdbcAclService.java | 5 +- .../acls/jdbc/JdbcMutableAclService.java | 5 +- .../security/acls/jdbc/LookupStrategy.java | 5 +- .../security/acls/jdbc/package-info.java | 15 ++ .../acls/model/AccessControlEntry.java | 5 +- .../security/acls/model/Acl.java | 5 +- .../security/acls/model/AclCache.java | 5 +- .../acls/model/AclDataAccessException.java | 15 ++ .../security/acls/model/AclService.java | 5 +- .../acls/model/AlreadyExistsException.java | 5 +- .../model/AuditableAccessControlEntry.java | 5 +- .../security/acls/model/AuditableAcl.java | 5 +- .../acls/model/ChildrenExistException.java | 5 +- .../security/acls/model/MutableAcl.java | 5 +- .../acls/model/MutableAclService.java | 5 +- .../acls/model/NotFoundException.java | 5 +- .../security/acls/model/ObjectIdentity.java | 5 +- .../acls/model/ObjectIdentityGenerator.java | 15 ++ .../ObjectIdentityRetrievalStrategy.java | 5 +- .../security/acls/model/OwnershipAcl.java | 5 +- .../security/acls/model/Permission.java | 5 +- .../model/PermissionGrantingStrategy.java | 15 ++ .../security/acls/model/Sid.java | 5 +- .../acls/model/SidRetrievalStrategy.java | 5 +- .../acls/model/UnloadedSidException.java | 5 +- .../security/acls/model/package-info.java | 15 ++ .../security/acls/package-info.java | 15 ++ .../acls/AclFormattingUtilsTests.java | 16 +- .../AclPermissionCacheOptimizerTests.java | 15 ++ .../acls/AclPermissionEvaluatorTests.java | 15 ++ .../security/acls/TargetObject.java | 15 ++ ...ationCollectionFilteringProviderTests.java | 15 ++ .../AclEntryAfterInvocationProviderTests.java | 15 ++ .../domain/AccessControlImplEntryTests.java | 15 ++ .../security/acls/domain/AclImplTests.java | 15 ++ .../AclImplementationSecurityCheckTests.java | 15 ++ .../acls/domain/AuditLoggerTests.java | 15 ++ .../acls/domain/ObjectIdentityImplTests.java | 15 ++ ...ectIdentityRetrievalStrategyImplTests.java | 16 +- .../security/acls/domain/PermissionTests.java | 5 +- .../acls/domain/SpecialPermission.java | 5 +- .../acls/jdbc/BasicLookupStrategyTests.java | 15 ++ .../security/acls/jdbc/DatabaseSeeder.java | 5 +- .../acls/jdbc/EhCacheBasedAclCacheTests.java | 15 ++ .../acls/jdbc/JdbcAclServiceTests.java | 15 ++ .../acls/jdbc/JdbcMutableAclServiceTests.java | 5 +- .../jdbc/SpringCacheBasedAclCacheTests.java | 15 ++ .../security/acls/sid/CustomSid.java | 15 ++ .../acls/sid/SidRetrievalStrategyTests.java | 15 ++ .../security/acls/sid/SidTests.java | 16 +- .../aspect/AnnotationSecurityAspect.aj | 102 ++++---- .../aspect/AnnotationSecurityAspectTests.java | 15 ++ .../security/cas/SamlServiceProperties.java | 5 +- .../security/cas/ServiceProperties.java | 14 +- .../CasAssertionAuthenticationToken.java | 5 +- .../CasAuthenticationProvider.java | 5 +- .../CasAuthenticationToken.java | 5 +- .../EhCacheBasedTicketCache.java | 5 +- .../NullStatelessTicketCache.java | 5 +- .../authentication/StatelessTicketCache.java | 5 +- .../cas/authentication/package-info.java | 15 ++ .../security/cas/package-info.java | 15 ++ ...bstractCasAssertionUserDetailsService.java | 5 +- ...AssertionAttributesUserDetailsService.java | 5 +- .../cas/web/CasAuthenticationEntryPoint.java | 5 +- .../cas/web/CasAuthenticationFilter.java | 5 +- .../DefaultServiceAuthenticationDetails.java | 2 +- .../ServiceAuthenticationDetails.java | 8 +- .../ServiceAuthenticationDetailsSource.java | 2 +- .../cas/web/authentication/package-info.java | 15 ++ .../security/cas/web/package-info.java | 15 ++ .../AbstractStatelessTicketCacheTests.java | 15 ++ .../CasAuthenticationProviderTests.java | 5 +- .../CasAuthenticationTokenTests.java | 5 +- .../EhCacheBasedTicketCacheTests.java | 5 +- .../NullStatelessTicketCacheTests.java | 5 +- .../SpringCacheBasedTicketCacheTests.java | 5 +- ...tionAttributesUserDetailsServiceTests.java | 15 ++ .../web/CasAuthenticationEntryPointTests.java | 5 +- .../cas/web/CasAuthenticationFilterTests.java | 5 +- .../cas/web/ServicePropertiesTests.java | 5 +- ...aultServiceAuthenticationDetailsTests.java | 120 +++++---- .../LdapServerBeanDefinitionParserTests.java | 17 +- ...pUserServiceBeanDefinitionParserTests.java | 17 +- .../security/config/BeanIds.java | 15 ++ .../config/DebugBeanDefinitionParser.java | 15 ++ .../security/config/Elements.java | 15 ++ .../annotation/AbstractSecurityBuilder.java | 12 +- .../EnableGlobalAuthentication.java | 12 +- ...utowireBeanFactoryObjectPostProcessor.java | 24 +- .../Jsr250MetadataSourceConfiguration.java | 15 ++ .../web/configuration/EnableWebSecurity.java | 8 +- .../SpringWebMvcImportSelector.java | 15 +- .../web/configurers/FormLoginConfigurer.java | 14 +- .../openid/OpenIDLoginConfigurer.java | 56 ++--- ...MessageSecurityMetadataSourceRegistry.java | 18 +- ...urityWebSocketMessageBrokerConfigurer.java | 18 +- ...serDetailsServiceBeanDefinitionParser.java | 15 ++ ...enticationManagerBeanDefinitionParser.java | 15 ++ .../AuthenticationManagerFactoryBean.java | 15 ++ ...nticationProviderBeanDefinitionParser.java | 15 ++ .../CachingUserDetailsService.java | 15 ++ .../JdbcUserServiceBeanDefinitionParser.java | 15 ++ .../authentication/PasswordEncoderParser.java | 15 ++ .../SaltSourceBeanDefinitionParser.java | 15 ++ .../UserServiceBeanDefinitionParser.java | 15 ++ .../config/authentication/package-info.java | 15 ++ .../config/http/ChannelAttributeFactory.java | 15 ++ .../http/DefaultFilterChainValidator.java | 15 ++ .../http/FilterChainBeanDefinitionParser.java | 15 ++ ...FilterChainMapBeanDefinitionDecorator.java | 15 ++ ...nvocationSecurityMetadataSourceParser.java | 15 ++ .../HttpFirewallBeanDefinitionParser.java | 15 ++ .../security/config/http/MatcherType.java | 15 ++ .../PortMappingsBeanDefinitionParser.java | 15 ++ .../security/config/http/SecurityFilters.java | 17 +- .../config/http/SessionCreationPolicy.java | 15 ++ .../http/UserDetailsServiceFactoryBean.java | 15 ++ .../security/config/http/package-info.java | 15 ++ .../ContextSourceSettingPostProcessor.java | 15 ++ .../LdapProviderBeanDefinitionParser.java | 15 ++ .../ldap/LdapServerBeanDefinitionParser.java | 15 ++ .../LdapUserServiceBeanDefinitionParser.java | 15 ++ .../security/config/ldap/package-info.java | 15 ++ ...terceptMethodsBeanDefinitionDecorator.java | 15 ++ ...ityMetadataSourceBeanDefinitionParser.java | 15 ++ .../method/ProtectPointcutPostProcessor.java | 15 ++ .../security/config/method/package-info.java | 15 ++ .../security/config/package-info.java | 15 ++ .../BeanNameCollectingPostProcessor.java | 15 ++ .../security/CollectingAppListener.java | 15 ++ .../security/config/ConfigTestUtils.java | 15 ++ .../security/config/DataSourcePopulator.java | 5 +- .../config/FilterChainProxyConfigTests.java | 5 +- .../config/InvalidConfigurationTests.java | 15 ++ .../config/MockAfterInvocationProvider.java | 15 ++ .../config/MockTransactionManager.java | 15 ++ .../MockUserServiceBeanPostProcessor.java | 15 ++ .../PostProcessedMockUserDetailsService.java | 15 ++ .../config/SecurityNamespaceHandlerTests.java | 15 ++ .../security/config/TestBusinessBean.java | 15 ++ .../security/config/TestBusinessBeanImpl.java | 15 ++ .../config/TransactionalTestBusinessBean.java | 15 ++ .../WebMvcSecurityConfigurationTests.java | 18 +- ...geSecurityMetadataSourceRegistryTests.java | 18 +- ...SocketMessageBrokerConfigurerDocTests.java | 18 +- ...WebSocketMessageBrokerConfigurerTests.java | 17 +- ...cutorSubscribableChannelPostProcessor.java | 18 +- ...ationManagerBeanDefinitionParserTests.java | 15 ++ ...tionProviderBeanDefinitionParserTests.java | 15 ++ ...cUserServiceBeanDefinitionParserTests.java | 15 ++ .../UserServiceBeanDefinitionParserTests.java | 15 ++ .../DefaultFilterChainValidatorTests.java | 17 +- ...tadataSourceBeanDefinitionParserTests.java | 57 +++-- ...thodSecurityBeanDefinitionParserTests.java | 15 ++ ...ptMethodsBeanDefinitionDecoratorTests.java | 15 ++ ...tationDrivenBeanDefinitionParserTests.java | 15 ++ ...tationDrivenBeanDefinitionParserTests.java | 15 ++ .../method/TestPermissionEvaluator.java | 15 ++ .../config/method/sec2136/Sec2136Tests.java | 18 +- ...SecurityInterceptorWithAopConfigTests.java | 15 ++ .../access/AccessDecisionManager.java | 5 +- .../security/access/AccessDecisionVoter.java | 5 +- .../access/AccessDeniedException.java | 5 +- .../access/AfterInvocationProvider.java | 5 +- .../access/AuthorizationServiceException.java | 5 +- .../security/access/ConfigAttribute.java | 5 +- .../access/PermissionCacheOptimizer.java | 15 ++ .../security/access/PermissionEvaluator.java | 15 ++ .../security/access/SecurityConfig.java | 5 +- .../access/SecurityMetadataSource.java | 5 +- .../AnnotationMetadataExtractor.java | 15 ++ .../Jsr250MethodSecurityMetadataSource.java | 5 +- .../annotation/Jsr250SecurityConfig.java | 15 ++ .../access/annotation/Jsr250Voter.java | 15 ++ .../security/access/annotation/Secured.java | 13 +- ...curedAnnotationSecurityMetadataSource.java | 5 +- .../access/annotation/package-info.java | 18 +- .../event/AbstractAuthorizationEvent.java | 5 +- ...uthenticationCredentialsNotFoundEvent.java | 5 +- .../event/AuthorizationFailureEvent.java | 5 +- .../access/event/AuthorizedEvent.java | 5 +- .../security/access/event/LoggerListener.java | 5 +- .../access/event/PublicInvocationEvent.java | 5 +- .../security/access/event/package-info.java | 15 ++ .../AbstractSecurityExpressionHandler.java | 15 ++ .../DenyAllPermissionEvaluator.java | 15 ++ .../access/expression/ExpressionUtils.java | 15 ++ .../expression/SecurityExpressionHandler.java | 15 ++ .../SecurityExpressionOperations.java | 15 ++ .../expression/SecurityExpressionRoot.java | 15 ++ ...tExpressionBasedMethodConfigAttribute.java | 15 ++ ...efaultMethodSecurityExpressionHandler.java | 15 ++ ...essionBasedAnnotationAttributeFactory.java | 18 +- .../ExpressionBasedPostInvocationAdvice.java | 15 ++ .../ExpressionBasedPreInvocationAdvice.java | 15 ++ .../MethodSecurityEvaluationContext.java | 15 ++ .../MethodSecurityExpressionHandler.java | 15 ++ .../MethodSecurityExpressionOperations.java | 17 +- .../method/MethodSecurityExpressionRoot.java | 15 ++ .../PostInvocationExpressionAttribute.java | 15 ++ .../PreInvocationExpressionAttribute.java | 15 ++ .../expression/method/package-info.java | 15 ++ .../access/expression/package-info.java | 15 ++ .../CycleInRoleHierarchyException.java | 5 +- .../hierarchicalroles/NullRoleHierarchy.java | 15 ++ .../hierarchicalroles/RoleHierarchy.java | 5 +- .../RoleHierarchyAuthoritiesMapper.java | 15 ++ .../hierarchicalroles/RoleHierarchyImpl.java | 60 +++-- .../hierarchicalroles/package-info.java | 15 ++ .../AbstractSecurityInterceptor.java | 5 +- .../intercept/AfterInvocationManager.java | 5 +- .../AfterInvocationProviderManager.java | 5 +- .../intercept/InterceptorStatusToken.java | 5 +- .../MethodInvocationPrivilegeEvaluator.java | 5 +- .../access/intercept/NullRunAsManager.java | 5 +- .../RunAsImplAuthenticationProvider.java | 5 +- .../access/intercept/RunAsManager.java | 5 +- .../access/intercept/RunAsManagerImpl.java | 5 +- .../access/intercept/RunAsUserToken.java | 5 +- .../MethodSecurityInterceptor.java | 5 +- .../MethodSecurityMetadataSourceAdvisor.java | 5 +- .../intercept/aopalliance/package-info.java | 15 ++ .../intercept/aspectj/AspectJCallback.java | 5 +- .../AspectJMethodSecurityInterceptor.java | 15 ++ .../aspectj/MethodInvocationAdapter.java | 15 ++ .../intercept/aspectj/package-info.java | 15 ++ .../access/intercept/package-info.java | 15 ++ ...tFallbackMethodSecurityMetadataSource.java | 15 ++ .../AbstractMethodSecurityMetadataSource.java | 5 +- ...elegatingMethodSecurityMetadataSource.java | 15 ++ .../MapBasedMethodSecurityMetadataSource.java | 5 +- .../method/MethodSecurityMetadataSource.java | 5 +- .../security/access/method/P.java | 18 +- .../security/access/method/package-info.java | 15 ++ .../security/access/package-info.java | 15 ++ .../access/prepost/PostAuthorize.java | 15 ++ .../security/access/prepost/PostFilter.java | 15 ++ .../prepost/PostInvocationAdviceProvider.java | 15 ++ .../prepost/PostInvocationAttribute.java | 15 ++ .../PostInvocationAuthorizationAdvice.java | 15 ++ .../security/access/prepost/PreAuthorize.java | 15 ++ .../security/access/prepost/PreFilter.java | 15 ++ .../prepost/PreInvocationAttribute.java | 15 ++ .../PreInvocationAuthorizationAdvice.java | 15 ++ ...PreInvocationAuthorizationAdviceVoter.java | 15 ++ ...ePostAnnotationSecurityMetadataSource.java | 15 ++ .../PrePostInvocationAttributeFactory.java | 15 ++ .../security/access/prepost/package-info.java | 15 ++ .../vote/AbstractAccessDecisionManager.java | 5 +- .../access/vote/AbstractAclVoter.java | 5 +- .../access/vote/AffirmativeBased.java | 5 +- .../access/vote/AuthenticatedVoter.java | 5 +- .../security/access/vote/ConsensusBased.java | 5 +- .../access/vote/RoleHierarchyVoter.java | 15 ++ .../security/access/vote/RoleVoter.java | 5 +- .../security/access/vote/UnanimousBased.java | 5 +- .../security/access/vote/package-info.java | 15 ++ .../AbstractAuthenticationToken.java | 5 +- .../AccountExpiredException.java | 5 +- .../AccountStatusException.java | 15 ++ .../AccountStatusUserDetailsChecker.java | 15 ++ .../AnonymousAuthenticationProvider.java | 5 +- .../AnonymousAuthenticationToken.java | 5 +- ...nticationCredentialsNotFoundException.java | 5 +- .../AuthenticationDetailsSource.java | 5 +- .../AuthenticationEventPublisher.java | 15 ++ .../authentication/AuthenticationManager.java | 5 +- .../AuthenticationProvider.java | 5 +- .../AuthenticationServiceException.java | 5 +- .../AuthenticationTrustResolver.java | 5 +- .../AuthenticationTrustResolverImpl.java | 5 +- .../BadCredentialsException.java | 5 +- .../CredentialsExpiredException.java | 5 +- .../DefaultAuthenticationEventPublisher.java | 15 ++ .../authentication/DisabledException.java | 5 +- .../InsufficientAuthenticationException.java | 5 +- ...nternalAuthenticationServiceException.java | 17 +- .../authentication/LockedException.java | 5 +- .../authentication/ProviderManager.java | 5 +- .../ProviderNotFoundException.java | 5 +- .../RememberMeAuthenticationProvider.java | 5 +- .../RememberMeAuthenticationToken.java | 5 +- .../TestingAuthenticationProvider.java | 5 +- .../TestingAuthenticationToken.java | 5 +- .../UsernamePasswordAuthenticationToken.java | 5 +- ...ractUserDetailsAuthenticationProvider.java | 5 +- .../dao/DaoAuthenticationProvider.java | 5 +- .../dao/ReflectionSaltSource.java | 5 +- .../authentication/dao/SaltSource.java | 5 +- .../dao/SystemWideSaltSource.java | 5 +- .../authentication/dao/package-info.java | 15 ++ .../encoding/BaseDigestPasswordEncoder.java | 5 +- .../encoding/BasePasswordEncoder.java | 5 +- .../encoding/LdapShaPasswordEncoder.java | 5 +- .../security/authentication/encoding/Md4.java | 5 +- .../encoding/Md4PasswordEncoder.java | 5 +- .../encoding/Md5PasswordEncoder.java | 5 +- .../MessageDigestPasswordEncoder.java | 37 ++- .../encoding/PasswordEncoder.java | 5 +- .../encoding/PasswordEncoderUtils.java | 15 ++ .../encoding/PlaintextPasswordEncoder.java | 5 +- .../encoding/ShaPasswordEncoder.java | 7 +- .../authentication/encoding/package-info.java | 15 ++ .../event/AbstractAuthenticationEvent.java | 5 +- .../AbstractAuthenticationFailureEvent.java | 5 +- ...henticationFailureBadCredentialsEvent.java | 5 +- ...icationFailureCredentialsExpiredEvent.java | 5 +- .../AuthenticationFailureDisabledEvent.java | 5 +- .../AuthenticationFailureExpiredEvent.java | 5 +- .../AuthenticationFailureLockedEvent.java | 5 +- ...nticationFailureProviderNotFoundEvent.java | 5 +- ...henticationFailureProxyUntrustedEvent.java | 5 +- ...nticationFailureServiceExceptionEvent.java | 5 +- .../event/AuthenticationSuccessEvent.java | 5 +- ...InteractiveAuthenticationSuccessEvent.java | 5 +- .../authentication/event/LoggerListener.java | 5 +- .../authentication/event/package-info.java | 15 ++ .../AbstractJaasAuthenticationProvider.java | 90 ++++--- .../authentication/jaas/AuthorityGranter.java | 5 +- .../DefaultJaasAuthenticationProvider.java | 19 +- .../jaas/DefaultLoginExceptionResolver.java | 5 +- .../JaasAuthenticationCallbackHandler.java | 5 +- .../jaas/JaasAuthenticationProvider.java | 86 ++++--- .../jaas/JaasAuthenticationToken.java | 5 +- .../jaas/JaasGrantedAuthority.java | 5 +- .../jaas/JaasNameCallbackHandler.java | 5 +- .../jaas/JaasPasswordCallbackHandler.java | 5 +- .../jaas/LoginExceptionResolver.java | 5 +- .../jaas/SecurityContextLoginModule.java | 5 +- .../jaas/event/JaasAuthenticationEvent.java | 5 +- .../event/JaasAuthenticationFailedEvent.java | 5 +- .../event/JaasAuthenticationSuccessEvent.java | 5 +- .../jaas/event/package-info.java | 15 ++ .../jaas/memory/InMemoryConfiguration.java | 20 +- .../jaas/memory/package-info.java | 15 ++ .../authentication/jaas/package-info.java | 15 ++ .../security/authentication/package-info.java | 15 ++ .../rcp/RemoteAuthenticationException.java | 5 +- .../rcp/RemoteAuthenticationManager.java | 5 +- .../rcp/RemoteAuthenticationManagerImpl.java | 5 +- .../rcp/RemoteAuthenticationProvider.java | 5 +- .../authentication/rcp/package-info.java | 15 ++ ...tractDelegatingSecurityContextSupport.java | 17 +- .../DelegatingSecurityContextCallable.java | 17 +- .../DelegatingSecurityContextExecutor.java | 17 +- ...egatingSecurityContextExecutorService.java | 17 +- .../DelegatingSecurityContextRunnable.java | 17 +- ...curityContextScheduledExecutorService.java | 17 +- .../DelegatingApplicationListener.java | 18 +- .../security/core/Authentication.java | 8 +- .../core/AuthenticationException.java | 5 +- .../security/core/ComparableVersion.java | 15 ++ .../security/core/CredentialsContainer.java | 15 ++ .../security/core/GrantedAuthority.java | 5 +- .../core/SpringSecurityCoreVersion.java | 15 ++ .../core/SpringSecurityMessageSource.java | 5 +- .../core/authority/AuthorityUtils.java | 15 ++ .../GrantedAuthoritiesContainer.java | 15 ++ .../authority/SimpleGrantedAuthority.java | 15 ++ .../Attributes2GrantedAuthoritiesMapper.java | 15 ++ .../mapping/GrantedAuthoritiesMapper.java | 15 ++ ...edAttributes2GrantedAuthoritiesMapper.java | 15 ++ .../mapping/MappableAttributesRetriever.java | 15 ++ .../mapping/NullAuthoritiesMapper.java | 15 ++ ...leAttributes2GrantedAuthoritiesMapper.java | 15 ++ .../mapping/SimpleAuthorityMapper.java | 15 ++ .../SimpleMappableAttributesRetriever.java | 25 +- .../core/authority/mapping/package-info.java | 15 ++ .../security/core/authority/package-info.java | 15 ++ .../GlobalSecurityContextHolderStrategy.java | 5 +- ...eadLocalSecurityContextHolderStrategy.java | 5 +- .../core/context/SecurityContext.java | 5 +- .../core/context/SecurityContextHolder.java | 5 +- .../SecurityContextHolderStrategy.java | 5 +- .../core/context/SecurityContextImpl.java | 5 +- ...eadLocalSecurityContextHolderStrategy.java | 5 +- .../security/core/context/package-info.java | 15 ++ .../security/core/package-info.java | 15 ++ ...efaultSecurityParameterNameDiscoverer.java | 18 +- .../core/session/SessionCreationEvent.java | 15 ++ .../core/session/SessionDestroyedEvent.java | 15 ++ .../core/session/SessionInformation.java | 5 +- .../core/session/SessionRegistry.java | 5 +- .../core/session/SessionRegistryImpl.java | 5 +- .../security/core/session/package-info.java | 15 ++ .../security/core/token/DefaultToken.java | 15 ++ .../KeyBasedPersistenceTokenService.java | 15 ++ .../core/token/SecureRandomFactoryBean.java | 15 ++ .../core/token/Sha512DigestUtils.java | 15 ++ .../security/core/token/Token.java | 15 ++ .../security/core/token/TokenService.java | 15 ++ .../security/core/token/package-info.java | 15 ++ .../AuthenticationUserDetailsService.java | 15 ++ .../security/core/userdetails/User.java | 5 +- .../security/core/userdetails/UserCache.java | 5 +- .../core/userdetails/UserDetails.java | 5 +- .../UserDetailsByNameServiceWrapper.java | 15 ++ .../core/userdetails/UserDetailsChecker.java | 15 ++ .../core/userdetails/UserDetailsService.java | 5 +- .../UsernameNotFoundException.java | 5 +- .../cache/EhCacheBasedUserCache.java | 5 +- .../core/userdetails/cache/NullUserCache.java | 5 +- .../cache/SpringCacheBasedUserCache.java | 15 ++ .../core/userdetails/cache/package-info.java | 15 ++ .../core/userdetails/jdbc/JdbcDaoImpl.java | 79 +++--- .../core/userdetails/jdbc/package-info.java | 15 ++ .../userdetails/memory/UserAttribute.java | 5 +- .../memory/UserAttributeEditor.java | 5 +- .../core/userdetails/memory/package-info.java | 15 ++ .../core/userdetails/package-info.java | 15 ++ .../security/provisioning/GroupManager.java | 15 ++ .../InMemoryUserDetailsManager.java | 15 ++ .../provisioning/JdbcUserDetailsManager.java | 15 ++ .../security/provisioning/MutableUser.java | 15 ++ .../provisioning/MutableUserDetails.java | 15 ++ .../provisioning/UserDetailsManager.java | 15 ++ .../security/provisioning/package-info.java | 15 ++ ...SecurityContextSchedulingTaskExecutor.java | 17 +- ...atingSecurityContextAsyncTaskExecutor.java | 17 +- ...DelegatingSecurityContextTaskExecutor.java | 17 +- .../security/util/FieldUtils.java | 5 +- .../security/util/InMemoryResource.java | 5 +- .../security/util/MethodInvocationUtils.java | 5 +- .../security/util/SimpleMethodInvocation.java | 5 +- .../security/util/package-info.java | 15 ++ .../security/ITargetObject.java | 5 +- .../security/OtherTargetObject.java | 5 +- .../security/PopulatedDatabase.java | 5 +- .../security/TargetObject.java | 5 +- .../security/TestDataSource.java | 15 ++ ...ticationCredentialsNotFoundEventTests.java | 5 +- .../AuthorizationFailureEventTests.java | 5 +- .../security/access/AuthorizedEventTests.java | 5 +- .../security/access/SecurityConfigTests.java | 5 +- .../access/annotation/BusinessService.java | 5 +- .../annotation/BusinessServiceImpl.java | 15 ++ .../security/access/annotation/Entity.java | 15 ++ ...xpressionProtectedBusinessServiceImpl.java | 15 ++ .../annotation/Jsr250BusinessServiceImpl.java | 15 ++ ...r250MethodSecurityMetadataSourceTests.java | 75 +++--- .../access/annotation/Jsr250VoterTests.java | 15 ++ ...AnnotationSecurityMetadataSourceTests.java | 5 +- ...bstractSecurityExpressionHandlerTests.java | 15 ++ .../SecurityExpressionRootTests.java | 15 ++ ...tMethodSecurityExpressionHandlerTests.java | 15 ++ .../method/MethodExpressionVoterTests.java | 15 ++ .../MethodSecurityExpressionRootTests.java | 15 ++ ...AnnotationSecurityMetadataSourceTests.java | 15 ++ .../expression/method/SecurityRules.java | 15 ++ .../HierarchicalRolesTestHelper.java | 5 +- .../RoleHierarchyAuthoritiesMapperTests.java | 15 ++ .../RoleHierarchyImplTests.java | 5 +- .../hierarchicalroles/TestHelperTests.java | 5 +- .../AbstractSecurityInterceptorTests.java | 5 +- .../AfterInvocationProviderManagerTests.java | 5 +- .../InterceptorStatusTokenTests.java | 5 +- .../intercept/NullRunAsManagerTests.java | 5 +- .../RunAsImplAuthenticationProviderTests.java | 5 +- .../intercept/RunAsManagerImplTests.java | 5 +- .../access/intercept/RunAsUserTokenTests.java | 5 +- .../MethodSecurityInterceptorTests.java | 5 +- ...hodSecurityMetadataSourceAdvisorTests.java | 5 +- ...AspectJMethodSecurityInterceptorTests.java | 5 +- ...asedMethodSecurityMetadataSourceTests.java | 15 ++ ...thodInvocationPrivilegeEvaluatorTests.java | 5 +- .../method/MockMethodInvocation.java | 15 ++ ...tingMethodSecurityMetadataSourceTests.java | 15 ++ ...vocationAuthorizationAdviceVoterTests.java | 15 ++ .../AbstractAccessDecisionManagerTests.java | 5 +- .../access/vote/AbstractAclVoterTests.java | 15 ++ .../access/vote/AffirmativeBasedTests.java | 5 +- .../access/vote/AuthenticatedVoterTests.java | 5 +- .../access/vote/ConsensusBasedTests.java | 5 +- .../security/access/vote/DenyAgainVoter.java | 5 +- .../security/access/vote/DenyVoter.java | 5 +- .../access/vote/RoleHierarchyVoterTests.java | 15 ++ .../security/access/vote/RoleVoterTests.java | 15 ++ .../access/vote/SomeDomainObject.java | 5 +- .../access/vote/SomeDomainObjectManager.java | 5 +- .../access/vote/UnanimousBasedTests.java | 5 +- .../AbstractAuthenticationTokenTests.java | 5 +- .../AuthenticationTrustResolverImplTests.java | 5 +- ...aultAuthenticationEventPublisherTests.java | 15 ++ .../authentication/ProviderManagerTests.java | 5 +- .../TestingAuthenticationProviderTests.java | 5 +- ...rnamePasswordAuthenticationTokenTests.java | 5 +- .../AnonymousAuthenticationProviderTests.java | 5 +- .../AnonymousAuthenticationTokenTests.java | 5 +- .../dao/DaoAuthenticationProviderTests.java | 5 +- .../authentication/dao/MockUserCache.java | 15 ++ .../dao/salt/ReflectionSaltSourceTests.java | 5 +- .../dao/salt/SystemWideSaltSourceTests.java | 5 +- .../encoding/BasePasswordEncoderTests.java | 5 +- .../encoding/Md4PasswordEncoderTests.java | 5 +- .../encoding/Md5PasswordEncoderTests.java | 5 +- .../encoding/PasswordEncoderUtilsTests.java | 15 ++ .../PlaintextPasswordEncoderTests.java | 5 +- .../encoding/ShaPasswordEncoderTests.java | 5 +- .../event/AuthenticationEventTests.java | 5 +- .../event/LoggerListenerTests.java | 5 +- ...efaultJaasAuthenticationProviderTests.java | 2 +- .../jaas/JaasAuthenticationProviderTests.java | 5 +- .../authentication/jaas/JaasEventCheck.java | 5 +- .../authentication/jaas/Sec760Tests.java | 15 ++ .../jaas/SecurityContextLoginModuleTests.java | 104 ++++---- .../jaas/TestAuthorityGranter.java | 5 +- .../jaas/TestCallbackHandler.java | 5 +- .../authentication/jaas/TestLoginModule.java | 5 +- .../memory/InMemoryConfigurationTests.java | 45 ++-- .../RemoteAuthenticationManagerImplTests.java | 5 +- .../RemoteAuthenticationProviderTests.java | 37 +-- ...RememberMeAuthenticationProviderTests.java | 19 +- .../RememberMeAuthenticationTokenTests.java | 5 +- ...ngSecurityContextExecutorServiceTests.java | 17 +- ...elegatingSecurityContextExecutorTests.java | 17 +- ...yContextScheduledExecutorServiceTests.java | 17 +- ...tDelegatingSecurityContextTestSupport.java | 17 +- ...ngSecurityContextExecutorServiceTests.java | 17 +- ...elegatingSecurityContextExecutorTests.java | 17 +- ...yContextScheduledExecutorServiceTests.java | 17 +- ...elegatingSecurityContextCallableTests.java | 17 +- ...elegatingSecurityContextRunnableTests.java | 17 +- ...DelegatingSecurityContextSupportTests.java | 17 +- ...ngSecurityContextExecutorServiceTests.java | 17 +- ...elegatingSecurityContextExecutorTests.java | 17 +- ...yContextScheduledExecutorServiceTests.java | 17 +- .../DelegatingApplicationListenerTests.java | 15 ++ .../security/core/JavaVersionTests.java | 17 +- .../SpringSecurityMessageSourceTests.java | 5 +- .../core/authority/AuthorityUtilsTests.java | 15 ++ .../SimpleGrantedAuthorityTests.java | 5 +- ...ributes2GrantedAuthoritiesMapperTests.java | 15 ++ .../mapping/SimpleAuthoritiesMapperTests.java | 15 ++ .../SimpleMappableRolesRetrieverTests.java | 16 +- ...leRoles2GrantedAuthoritiesMapperTests.java | 15 ++ .../context/SecurityContextHolderTests.java | 5 +- .../context/SecurityContextImplTests.java | 5 +- ...nnotationParameterNameDiscovererTests.java | 15 ++ ...tSecurityParameterNameDiscovererTests.java | 18 +- .../core/session/SessionInformationTests.java | 5 +- .../session/SessionRegistryImplTests.java | 5 +- .../core/token/DefaultTokenTests.java | 15 ++ .../KeyBasedPersistenceTokenServiceTests.java | 15 ++ .../token/SecureRandomFactoryBeanTests.java | 15 ++ .../userdetails/MockUserDetailsService.java | 15 ++ .../UserDetailsByNameServiceWrapperTests.java | 15 ++ .../security/core/userdetails/UserTests.java | 5 +- .../cache/EhCacheBasedUserCacheTests.java | 5 +- .../userdetails/cache/NullUserCacheTests.java | 5 +- .../cache/SpringCacheBasedUserCacheTests.java | 5 +- .../userdetails/jdbc/JdbcDaoImplTests.java | 5 +- .../memory/UserAttributeEditorTests.java | 5 +- .../JdbcUserDetailsManagerTests.java | 15 ++ ...ityContextSchedulingTaskExecutorTests.java | 15 ++ ...ityContextSchedulingTaskExecutorTests.java | 15 ++ ...ityContextSchedulingTaskExecutorTests.java | 17 +- ...SecurityContextAsyncTaskExecutorTests.java | 17 +- ...SecurityContextAsyncTaskExecutorTests.java | 15 ++ ...atingSecurityContextTaskExecutorTests.java | 17 +- ...SecurityContextAsyncTaskExecutorTests.java | 15 ++ ...atingSecurityContextTaskExecutorTests.java | 17 +- .../security/util/FieldUtilsTests.java | 15 ++ .../security/util/InMemoryResourceTests.java | 15 ++ .../util/MethodInvocationUtilsTests.java | 15 ++ .../security/crypto/codec/Base64.java | 15 ++ .../security/crypto/codec/Hex.java | 15 ++ .../security/crypto/codec/Utf8.java | 15 ++ .../security/crypto/codec/package-info.java | 15 ++ .../crypto/encrypt/AesBytesEncryptor.java | 2 +- .../crypto/encrypt/BytesEncryptor.java | 2 +- .../security/crypto/encrypt/CipherUtils.java | 2 +- .../security/crypto/encrypt/Encryptors.java | 2 +- .../encrypt/HexEncodingTextEncryptor.java | 2 +- .../crypto/encrypt/TextEncryptor.java | 2 +- .../crypto/keygen/BytesKeyGenerator.java | 2 +- .../keygen/HexEncodingStringKeyGenerator.java | 2 +- .../security/crypto/keygen/KeyGenerators.java | 2 +- .../keygen/SecureRandomBytesKeyGenerator.java | 2 +- .../crypto/keygen/SharedKeyGenerator.java | 2 +- .../crypto/keygen/StringKeyGenerator.java | 2 +- .../security/crypto/password/Digester.java | 2 +- .../crypto/password/NoOpPasswordEncoder.java | 2 +- .../crypto/password/PasswordEncoder.java | 2 +- .../password/StandardPasswordEncoder.java | 2 +- .../security/crypto/util/EncodingUtils.java | 2 +- .../security/crypto/codec/Base64Tests.java | 15 ++ .../security/crypto/codec/Utf8Tests.java | 15 ++ .../crypto/encrypt/EncryptorsTests.java | 16 +- .../crypto/keygen/KeyGeneratorsTests.java | 15 ++ .../crypto/password/DigesterTests.java | 15 ++ .../StandardPasswordEncoderTests.java | 15 ++ .../crypto/util/EncodingUtilsTests.java | 16 +- .../SecurityEvaluationContextExtension.java | 37 ++- ...curityEvaluationContextExtensionTests.java | 18 +- ...amespaceWithMultipleInterceptorsTests.java | 15 ++ .../HttpPathParameterStrippingTests.java | 15 ++ .../integration/MultiAnnotationTests.java | 15 ++ .../SEC933ApplicationContextTests.java | 15 ++ .../SEC936ApplicationContextTests.java | 15 ++ .../integration/StubUserRepository.java | 15 ++ .../PythonInterpreterBasedSecurityTests.java | 15 ++ .../FilterChainPerformanceTests.java | 15 ++ .../ProtectPointcutPerformanceTests.java | 16 +- .../integration/UserDetailsServiceImpl.java | 15 ++ .../security/integration/UserRepository.java | 15 ++ .../MultiAnnotationService.java | 15 ++ .../MultiAnnotationServiceImpl.java | 15 ++ .../multiannotation/PreAuthorizeService.java | 15 ++ .../PreAuthorizeServiceImpl.java | 15 ++ .../multiannotation/SecuredService.java | 15 ++ .../multiannotation/SecuredServiceImpl.java | 15 ++ ...PythonInterpreterPostInvocationAdvice.java | 15 ++ .../PythonInterpreterPreInvocationAdvice.java | 15 ++ ...thonInterpreterPreInvocationAttribute.java | 15 ++ ...eterPrePostInvocationAttributeFactory.java | 15 ++ .../integration/python/TestService.java | 15 ++ .../integration/python/TestServiceImpl.java | 15 ++ .../SessionRegistryImplMTTests.java | 5 +- .../context/SecurityContextHolderMTTests.java | 15 ++ .../AbstractWebServerIntegrationTests.java | 15 ++ .../integration/BasicAuthenticationTests.java | 15 ++ .../ConcurrentSessionManagementTests.java | 15 ++ ...ustomConcurrentSessionManagementTests.java | 15 ++ .../InMemoryProviderWebAppTests.java | 15 ++ .../security/integration/JspTaglibTests.java | 15 ++ .../security/integration/LdapWebAppTests.java | 15 ++ .../security/itest/web/TestController.java | 15 ++ .../ldap/AbstractLdapIntegrationTests.java | 5 +- .../ldap/ApacheDSServerIntegrationTests.java | 38 ++- ...faultSpringSecurityContextSourceTests.java | 15 ++ .../SpringSecurityLdapTemplateITests.java | 5 +- .../BindAuthenticatorTests.java | 78 +++--- .../PasswordComparisonAuthenticatorTests.java | 5 +- .../FilterBasedLdapUserSearchTests.java | 5 +- .../DefaultLdapAuthoritiesPopulatorTests.java | 5 +- .../LdapUserDetailsManagerTests.java | 5 +- .../NestedLdapAuthoritiesPopulatorTests.java | 5 +- .../ldap/DefaultLdapUsernameToDnMapper.java | 15 ++ .../DefaultSpringSecurityContextSource.java | 47 ++-- .../security/ldap/LdapEncoder.java | 28 ++- .../security/ldap/LdapUsernameToDnMapper.java | 15 ++ .../security/ldap/LdapUtils.java | 5 +- .../AbstractLdapAuthenticationProvider.java | 37 +-- .../AbstractLdapAuthenticator.java | 5 +- .../authentication/BindAuthenticator.java | 5 +- .../LdapAuthenticationProvider.java | 50 ++-- .../authentication/LdapAuthenticator.java | 5 +- .../ldap/authentication/LdapEncoder.java | 28 ++- .../NullLdapAuthoritiesPopulator.java | 15 ++ .../PasswordComparisonAuthenticator.java | 5 +- .../SpringSecurityAuthenticationSource.java | 15 ++ ...etailsServiceLdapAuthoritiesPopulator.java | 15 ++ ...ctiveDirectoryAuthenticationException.java | 17 +- ...veDirectoryLdapAuthenticationProvider.java | 17 +- .../ldap/authentication/package-info.java | 15 ++ .../security/ldap/package-info.java | 15 ++ .../PasswordPolicyAwareContextSource.java | 15 ++ .../ldap/ppolicy/PasswordPolicyControl.java | 5 +- .../PasswordPolicyControlExtractor.java | 15 ++ .../ppolicy/PasswordPolicyControlFactory.java | 5 +- .../ldap/ppolicy/PasswordPolicyData.java | 15 ++ .../ppolicy/PasswordPolicyErrorStatus.java | 15 ++ .../ldap/ppolicy/PasswordPolicyException.java | 15 ++ .../PasswordPolicyResponseControl.java | 69 +++--- .../security/ldap/ppolicy/package-info.java | 15 ++ .../search/FilterBasedLdapUserSearch.java | 5 +- .../security/ldap/search/LdapUserSearch.java | 5 +- .../security/ldap/search/package-info.java | 15 ++ .../security/ldap/server/package-info.java | 15 ++ .../DefaultLdapAuthoritiesPopulator.java | 5 +- .../ldap/userdetails/InetOrgPerson.java | 5 +- .../InetOrgPersonContextMapper.java | 5 +- .../userdetails/LdapAuthoritiesPopulator.java | 5 +- .../ldap/userdetails/LdapUserDetails.java | 5 +- .../ldap/userdetails/LdapUserDetailsImpl.java | 5 +- .../userdetails/LdapUserDetailsManager.java | 5 +- .../userdetails/LdapUserDetailsMapper.java | 5 +- .../userdetails/LdapUserDetailsService.java | 15 ++ .../NestedLdapAuthoritiesPopulator.java | 46 ++-- .../security/ldap/userdetails/Person.java | 5 +- .../ldap/userdetails/PersonContextMapper.java | 15 ++ .../userdetails/UserDetailsContextMapper.java | 5 +- .../ldap/userdetails/package-info.java | 15 ++ .../security/ldap/LdapUtilsTests.java | 5 +- ...ringSecurityAuthenticationSourceTests.java | 15 ++ .../LdapAuthenticationProviderTests.java | 5 +- .../LdapShaPasswordEncoderTests.java | 5 +- .../ldap/authentication/MockUserSearch.java | 5 +- ...swordComparisonAuthenticatorMockTests.java | 5 +- ...ectoryLdapAuthenticationProviderTests.java | 17 +- .../ppolicy/OpenLDAPIntegrationTestSuite.java | 24 +- ...PasswordPolicyAwareContextSourceTests.java | 15 ++ .../PasswordPolicyControlFactoryTests.java | 15 ++ .../PasswordPolicyResponseControlTests.java | 5 +- .../ldap/userdetails/InetOrgPersonTests.java | 15 ++ .../ldap/userdetails/LdapAuthorityTests.java | 15 ++ .../LdapUserDetailsMapperTests.java | 5 +- .../LdapUserDetailsServiceTests.java | 15 ++ ...sServiceLdapAuthoritiesPopulatorTests.java | 15 ++ ...faultMessageSecurityExpressionHandler.java | 18 +- ...dMessageSecurityMetadataSourceFactory.java | 18 +- .../MessageExpressionConfigAttribute.java | 18 +- .../expression/MessageExpressionVoter.java | 18 +- .../MessageSecurityExpressionRoot.java | 18 +- .../intercept/ChannelSecurityInterceptor.java | 18 +- .../DefaultMessageSecurityMetadataSource.java | 18 +- .../MessageSecurityMetadataSource.java | 18 +- ...thenticationPrincipalArgumentResolver.java | 8 +- .../SecurityContextChannelInterceptor.java | 18 +- .../AbstractMessageMatcherComposite.java | 18 +- .../util/matcher/AndMessageMatcher.java | 18 +- .../util/matcher/MessageMatcher.java | 18 +- .../util/matcher/OrMessageMatcher.java | 18 +- .../SimpDestinationMessageMatcher.java | 18 +- .../util/matcher/SimpMessageTypeMatcher.java | 18 +- ...ageSecurityMetadataSourceFactoryTests.java | 18 +- ...MessageExpressionConfigAttributeTests.java | 18 +- .../MessageExpressionVoterTests.java | 18 +- .../ChannelSecurityInterceptorTests.java | 18 +- ...ultMessageSecurityMetadataSourceTests.java | 18 +- ...ecurityContextChannelInterceptorTests.java | 15 ++ .../util/matcher/AndMessageMatcherTest.java | 18 +- .../util/matcher/OrMessageMatcherTest.java | 18 +- .../SimpDestinationMessageMatcherTests.java | 18 +- .../CsrfTokenHandshakeInterceptorTests.java | 18 +- .../AuthenticationCancelledException.java | 5 +- .../security/openid/AxFetchListFactory.java | 15 ++ .../openid/NullAxFetchListFactory.java | 15 ++ .../security/openid/OpenID4JavaConsumer.java | 5 +- .../security/openid/OpenIDAttribute.java | 15 ++ .../openid/OpenIDAuthenticationFilter.java | 5 +- .../openid/OpenIDAuthenticationProvider.java | 26 +- .../openid/OpenIDAuthenticationStatus.java | 5 +- .../openid/OpenIDAuthenticationToken.java | 5 +- .../security/openid/OpenIDConsumer.java | 5 +- .../openid/OpenIDConsumerException.java | 5 +- .../openid/RegexBasedAxFetchListFactory.java | 15 ++ .../security/openid/package-info.java | 15 ++ .../security/openid/MockOpenIDConsumer.java | 5 +- .../openid/OpenID4JavaConsumerTests.java | 15 ++ .../OpenIDAuthenticationFilterTests.java | 15 ++ .../OpenIDAuthenticationProviderTests.java | 5 +- .../dns/DnsEntryNotFoundException.java | 2 +- .../remoting/dns/DnsLookupException.java | 2 +- .../security/remoting/dns/DnsResolver.java | 2 +- .../remoting/dns/InitialContextFactory.java | 2 +- .../remoting/dns/JndiDnsResolver.java | 34 +-- .../security/remoting/dns/package-info.java | 15 ++ ...ationSimpleHttpInvokerRequestExecutor.java | 5 +- .../remoting/httpinvoker/package-info.java | 15 ++ .../security/remoting/package-info.java | 15 ++ .../ContextPropagatingRemoteInvocation.java | 5 +- ...extPropagatingRemoteInvocationFactory.java | 5 +- .../security/remoting/rmi/package-info.java | 15 ++ .../remoting/dns/JndiDnsResolverTests.java | 2 +- ...SimpleHttpInvokerRequestExecutorTests.java | 5 +- ...ntextPropagatingRemoteInvocationTests.java | 5 +- .../sample/aspectj/AspectjSecurityConfig.java | 18 +- .../java/sample/aspectj/SecuredService.java | 15 ++ .../src/main/java/sample/aspectj/Service.java | 15 ++ .../aspectj/AspectJInterceptorTests.java | 15 ++ .../java/sample/aspectj/SecuredService.java | 15 ++ .../src/main/java/sample/aspectj/Service.java | 15 ++ .../aspectj/AspectJInterceptorTests.java | 15 ++ .../cas/web/ProxyTicketSampleServlet.java | 2 +- .../config/ChatApplicationInitializer.java | 15 ++ .../java/sample/config/DataSourceConfig.java | 15 ++ .../sample/config/EmbeddedRedisConfig.java | 33 ++- .../main/java/sample/config/RedisConfig.java | 18 +- .../config/RedisConnectionProperties.java | 15 ++ .../sample/config/SessionAppInitializer.java | 18 +- .../java/sample/config/SpringDatatConfig.java | 18 +- .../sample/config/WebMvcConfiguration.java | 15 ++ .../java/sample/config/WebSocketConfig.java | 15 ++ .../config/WebSocketSecurityConfig.java | 18 +- .../java/sample/data/ActiveWebSocketUser.java | 15 ++ .../data/ActiveWebSocketUserRepository.java | 15 ++ .../main/java/sample/data/InstantMessage.java | 15 ++ .../main/java/sample/data/UserRepository.java | 18 +- .../main/java/sample/mvc/CsrfController.java | 18 +- .../main/java/sample/mvc/LoginController.java | 18 +- .../java/sample/mvc/MessageController.java | 18 +- .../UserRepositoryUserDetailsService.java | 9 +- .../websocket/WebSocketConnectHandler.java | 18 +- .../websocket/WebSocketDisconnectHandler.java | 18 +- .../samples/config/SecurityConfig.java | 15 ++ .../contact/AddDeleteContactController.java | 15 ++ .../java/sample/contact/AddPermission.java | 5 +- .../contact/AddPermissionValidator.java | 5 +- .../contact/AdminPermissionController.java | 15 ++ .../sample/contact/ClientApplication.java | 5 +- .../src/main/java/sample/contact/Contact.java | 5 +- .../main/java/sample/contact/ContactDao.java | 5 +- .../java/sample/contact/ContactDaoSpring.java | 5 +- .../java/sample/contact/ContactManager.java | 5 +- .../sample/contact/ContactManagerBackend.java | 5 +- .../sample/contact/DataSourcePopulator.java | 5 +- .../java/sample/contact/IndexController.java | 15 ++ .../main/java/sample/contact/WebContact.java | 5 +- .../sample/contact/WebContactValidator.java | 5 +- .../sample/contact/ContactManagerTests.java | 5 +- .../src/main/java/samples/DataConfig.java | 18 +- .../src/main/java/samples/data/Message.java | 18 +- .../java/samples/data/MessageRepository.java | 18 +- .../data/SecurityMessageRepository.java | 18 +- .../src/main/java/samples/data/User.java | 18 +- .../data/SecurityMessageRepositoryTests.java | 18 +- .../main/java/sample/dms/AbstractElement.java | 15 ++ .../java/sample/dms/DataSourcePopulator.java | 15 ++ .../src/main/java/sample/dms/Directory.java | 15 ++ .../src/main/java/sample/dms/DocumentDao.java | 15 ++ .../main/java/sample/dms/DocumentDaoImpl.java | 15 ++ .../src/main/java/sample/dms/File.java | 15 ++ .../secured/SecureDataSourcePopulator.java | 15 ++ .../sample/dms/secured/SecureDocumentDao.java | 15 ++ .../dms/secured/SecureDocumentDaoImpl.java | 15 ++ .../test/java/SecureDmsIntegrationTests.java | 40 --- .../{ => sample}/DmsIntegrationTests.java | 94 +++++-- .../sample/SecureDmsIntegrationTests.java | 68 +++++ .../samples/config/SecurityConfig.java | 15 ++ .../java/samples/gae/security/AppRole.java | 15 ++ .../gae/security/GaeAuthenticationFilter.java | 15 ++ .../gae/security/GaeUserAuthentication.java | 15 ++ ...oogleAccountsAuthenticationEntryPoint.java | 15 ++ .../GoogleAccountsAuthenticationProvider.java | 15 ++ .../gae/users/GaeDatastoreUserRegistry.java | 15 ++ .../main/java/samples/gae/users/GaeUser.java | 15 ++ .../gae/users/InMemoryUserRegistry.java | 15 ++ .../java/samples/gae/users/UserRegistry.java | 15 ++ .../java/samples/gae/validation/Forename.java | 15 ++ .../gae/validation/ForenameValidator.java | 15 ++ .../java/samples/gae/validation/Surname.java | 15 ++ .../gae/validation/SurnameValidator.java | 15 ++ .../samples/gae/web/GaeAppController.java | 15 ++ .../gae/web/RegistrationController.java | 15 ++ .../samples/gae/web/RegistrationForm.java | 15 ++ .../samples/gae/security/AppRoleTests.java | 15 ++ .../users/GaeDataStoreUserRegistryTests.java | 15 ++ .../samples/config/SecurityConfig.java | 15 ++ .../samples/mvc/MessageJsonController.java | 15 ++ .../samples/config/SecurityConfig.java | 15 ++ .../samples/config/SecurityConfig.java | 15 ++ .../samples/config/SecurityConfig.java | 15 ++ .../jaas/RoleUserAuthorityGranter.java | 4 +- .../UsernameEqualsPasswordLoginModule.java | 2 +- .../samples/config/SecurityConfig.java | 15 ++ .../samples/config/SecurityConfig.java | 15 ++ .../samples/config/DataConfiguration.java | 15 ++ .../MessageWebApplicationInitializer.java | 15 ++ .../samples/config/RootConfiguration.java | 15 ++ .../security/samples/data/Message.java | 15 ++ .../samples/data/MessageRepository.java | 15 ++ .../samples/mvc/DefaultController.java | 15 ++ .../samples/mvc/MessageController.java | 15 ++ .../mvc/config/WebMvcConfiguration.java | 15 ++ .../samples/config/SecurityConfig.java | 15 ++ .../security/samples/mvc/UserController.java | 15 ++ .../samples/openid/CustomUserDetails.java | 15 ++ .../openid/CustomUserDetailsService.java | 15 ++ .../samples/config/SecurityConfig.java | 15 ++ .../src/test/java/sample/PreAuthXmlTests.java | 18 +- .../samples/config/SecurityConfig.java | 15 ++ .../samples/servletapi/mvc/LoginForm.java | 17 +- .../servletapi/mvc/ServletApiController.java | 17 +- .../src/main/java/bigbank/Account.java | 15 ++ .../src/main/java/bigbank/BankDao.java | 15 ++ .../src/main/java/bigbank/BankDaoStub.java | 15 ++ .../src/main/java/bigbank/BankService.java | 15 ++ .../main/java/bigbank/BankServiceImpl.java | 15 ++ .../src/main/java/bigbank/SeedData.java | 15 ++ .../main/java/bigbank/web/ListAccounts.java | 15 ++ .../main/java/bigbank/web/PostAccounts.java | 15 ++ .../samples/config/SecurityConfig.java | 15 ++ .../src/main/java/bigbank/Account.java | 15 ++ .../src/main/java/bigbank/BankDao.java | 15 ++ .../src/main/java/bigbank/BankDaoStub.java | 15 ++ .../src/main/java/bigbank/BankService.java | 15 ++ .../main/java/bigbank/BankServiceImpl.java | 15 ++ .../src/main/java/bigbank/SeedData.java | 15 ++ .../main/java/bigbank/web/ListAccounts.java | 15 ++ .../main/java/bigbank/web/PostAccounts.java | 15 ++ ...avyDutyAuthenticationProcessingFilter.java | 15 ++ .../security/ui/HeavyDutyEntryPoint.java | 15 ++ .../web/TestMultiActionController.java | 15 ++ .../src/main/java/sample/TestVoter.java | 15 ++ .../src/main/java/sample/dao/GenericDAO.java | 15 ++ .../src/main/java/sample/dao/UserDAO.java | 16 +- .../java/sample/dao/impl/GenericDAOImpl.java | 15 ++ .../java/sample/dao/impl/UserDAOImpl.java | 15 ++ .../src/main/java/sample/domain/User.java | 16 +- .../main/java/sample/service/UserService.java | 15 ++ .../sample/service/impl/UserServiceImpl.java | 15 ++ .../taglibs/authz/AccessControlListTag.java | 5 +- .../taglibs/authz/AuthenticationTag.java | 5 +- .../taglibs/authz/JspAuthorizeTag.java | 15 ++ .../security/taglibs/authz/package-info.java | 15 ++ .../security/taglibs/package-info.java | 15 ++ .../authz/AbstractAuthorizeTagTests.java | 17 +- .../authz/AccessControlListTagTests.java | 17 +- .../taglibs/authz/AuthenticationTagTests.java | 5 +- .../taglibs/authz/AuthorizeTagTests.java | 5 +- .../taglibs/csrf/AbstractCsrfTagTests.java | 15 ++ .../taglibs/csrf/CsrfInputTagTests.java | 15 ++ .../taglibs/csrf/CsrfMetaTagsTagTests.java | 15 ++ .../setup/SecurityMockMvcConfigurer.java | 18 +- .../setup/SecurityMockMvcConfigurers.java | 18 +- .../context/showcase/CustomUserDetails.java | 18 +- ...hMockCustomUserSecurityContextFactory.java | 18 +- .../context/showcase/WithMockUserTests.java | 18 +- .../showcase/WithUserDetailsTests.java | 18 +- .../showcase/service/HelloMessageService.java | 18 +- .../showcase/service/MessageService.java | 15 ++ .../SecurityMockMvcResultMatchersTests.java | 15 ++ .../setup/SecurityMockMvcConfigurerTests.java | 18 +- .../web/AuthenticationEntryPoint.java | 5 +- .../security/web/DefaultRedirectStrategy.java | 15 ++ .../web/DefaultSecurityFilterChain.java | 15 ++ .../security/web/FilterChainProxy.java | 5 +- .../security/web/FilterInvocation.java | 41 +-- .../security/web/PortMapper.java | 5 +- .../security/web/PortMapperImpl.java | 32 +-- .../security/web/PortResolver.java | 5 +- .../security/web/PortResolverImpl.java | 5 +- .../security/web/RedirectStrategy.java | 15 ++ .../security/web/SecurityFilterChain.java | 15 ++ .../security/web/WebAttributes.java | 15 ++ .../web/access/AccessDeniedHandler.java | 5 +- .../web/access/AccessDeniedHandlerImpl.java | 5 +- ...efaultWebInvocationPrivilegeEvaluator.java | 5 +- .../access/ExceptionTranslationFilter.java | 5 +- .../WebInvocationPrivilegeEvaluator.java | 5 +- .../channel/AbstractRetryEntryPoint.java | 15 ++ .../channel/ChannelDecisionManager.java | 5 +- .../channel/ChannelDecisionManagerImpl.java | 5 +- .../web/access/channel/ChannelEntryPoint.java | 5 +- .../channel/ChannelProcessingFilter.java | 47 ++-- .../web/access/channel/ChannelProcessor.java | 5 +- .../channel/InsecureChannelProcessor.java | 5 +- .../channel/RetryWithHttpEntryPoint.java | 5 +- .../channel/RetryWithHttpsEntryPoint.java | 5 +- .../channel/SecureChannelProcessor.java | 5 +- .../web/access/channel/package-info.java | 15 ++ .../DefaultWebSecurityExpressionHandler.java | 15 ++ ...ilterInvocationSecurityMetadataSource.java | 15 ++ .../WebExpressionConfigAttribute.java | 15 ++ .../access/expression/WebExpressionVoter.java | 15 ++ .../expression/WebSecurityExpressionRoot.java | 15 ++ .../web/access/expression/package-info.java | 15 ++ ...ilterInvocationSecurityMetadataSource.java | 5 +- ...ilterInvocationSecurityMetadataSource.java | 5 +- .../intercept/FilterSecurityInterceptor.java | 5 +- .../web/access/intercept/RequestKey.java | 15 ++ .../web/access/intercept/package-info.java | 15 ++ .../security/web/access/package-info.java | 15 ++ ...bstractAuthenticationProcessingFilter.java | 5 +- ...AuthenticationTargetUrlRequestHandler.java | 15 ++ .../AnonymousAuthenticationFilter.java | 5 +- .../AuthenticationFailureHandler.java | 15 ++ .../AuthenticationSuccessHandler.java | 15 ++ .../DelegatingAuthenticationEntryPoint.java | 2 +- ...onMappingAuthenticationFailureHandler.java | 15 ++ .../Http403ForbiddenEntryPoint.java | 15 ++ .../authentication/HttpStatusEntryPoint.java | 18 +- .../LoginUrlAuthenticationEntryPoint.java | 5 +- .../NullRememberMeServices.java | 5 +- .../authentication/RememberMeServices.java | 5 +- ...uestAwareAuthenticationSuccessHandler.java | 15 ++ ...SimpleUrlAuthenticationFailureHandler.java | 15 ++ ...SimpleUrlAuthenticationSuccessHandler.java | 15 ++ .../UsernamePasswordAuthenticationFilter.java | 5 +- .../WebAuthenticationDetails.java | 5 +- .../WebAuthenticationDetailsSource.java | 5 +- .../logout/CookieClearingLogoutHandler.java | 15 ++ ...tpStatusReturningLogoutSuccessHandler.java | 32 +-- .../authentication/logout/LogoutFilter.java | 5 +- .../authentication/logout/LogoutHandler.java | 5 +- .../logout/LogoutSuccessHandler.java | 15 ++ .../logout/SecurityContextLogoutHandler.java | 5 +- .../logout/SimpleUrlLogoutSuccessHandler.java | 15 ++ .../authentication/logout/package-info.java | 15 ++ .../web/authentication/package-info.java | 15 ++ ...tractPreAuthenticatedProcessingFilter.java | 17 +- ...reAuthenticatedAuthenticationProvider.java | 15 ++ .../PreAuthenticatedAuthenticationToken.java | 15 ++ ...enticatedCredentialsNotFoundException.java | 15 ++ ...dGrantedAuthoritiesUserDetailsService.java | 15 ++ ...edAuthoritiesWebAuthenticationDetails.java | 15 ++ .../RequestHeaderAuthenticationFilter.java | 15 ++ ...ticatedWebAuthenticationDetailsSource.java | 15 ++ .../J2eePreAuthenticatedProcessingFilter.java | 15 ++ .../WebXmlMappableAttributesRetriever.java | 15 ++ .../preauth/j2ee/package-info.java | 15 ++ .../authentication/preauth/package-info.java | 15 ++ .../DefaultWASUsernameAndGroupsExtractor.java | 15 ++ .../WASUsernameAndGroupsExtractor.java | 15 ++ ...pherePreAuthenticatedProcessingFilter.java | 15 ++ ...ticatedWebAuthenticationDetailsSource.java | 15 ++ .../preauth/websphere/package-info.java | 15 ++ .../x509/SubjectDnX509PrincipalExtractor.java | 15 ++ .../x509/X509AuthenticationFilter.java | 15 ++ .../preauth/x509/X509PrincipalExtractor.java | 15 ++ .../preauth/x509/package-info.java | 15 ++ .../AbstractRememberMeServices.java | 15 ++ .../rememberme/CookieTheftException.java | 15 ++ .../InMemoryTokenRepositoryImpl.java | 15 ++ .../rememberme/InvalidCookieException.java | 15 ++ .../rememberme/PersistentRememberMeToken.java | 15 ++ ...ersistentTokenBasedRememberMeServices.java | 15 ++ .../rememberme/PersistentTokenRepository.java | 15 ++ .../RememberMeAuthenticationException.java | 15 ++ .../RememberMeAuthenticationFilter.java | 5 +- .../TokenBasedRememberMeServices.java | 5 +- .../rememberme/package-info.java | 15 ++ ...ChangeSessionIdAuthenticationStrategy.java | 12 +- ...ompositeSessionAuthenticationStrategy.java | 33 +-- ...tSessionControlAuthenticationStrategy.java | 15 ++ .../NullAuthenticatedSessionStrategy.java | 15 ++ ...RegisterSessionAuthenticationStrategy.java | 15 ++ .../SessionAuthenticationException.java | 15 ++ .../SessionAuthenticationStrategy.java | 15 ++ .../authentication/session/package-info.java | 15 ++ .../AuthenticationSwitchUserEvent.java | 5 +- .../SwitchUserAuthorityChanger.java | 15 ++ .../switchuser/SwitchUserFilter.java | 100 ++++---- .../SwitchUserGrantedAuthority.java | 5 +- .../switchuser/package-info.java | 15 ++ .../ui/DefaultLoginPageGeneratingFilter.java | 15 ++ .../web/authentication/ui/package-info.java | 15 ++ .../www/BasicAuthenticationEntryPoint.java | 5 +- .../www/BasicAuthenticationFilter.java | 62 ++--- .../authentication/www/DigestAuthUtils.java | 15 ++ .../www/DigestAuthenticationEntryPoint.java | 5 +- .../www/DigestAuthenticationFilter.java | 189 +++++++------- .../www/NonceExpiredException.java | 5 +- .../web/authentication/www/package-info.java | 15 ++ ...thenticationPrincipalArgumentResolver.java | 18 +- ...ractSecurityWebApplicationInitializer.java | 23 +- .../context/HttpRequestResponseHolder.java | 15 ++ .../HttpSessionSecurityContextRepository.java | 15 ++ .../NullSecurityContextRepository.java | 15 ++ .../context/OnCommittedResponseWrapper.java | 17 +- ...ContextOnUpdateOrErrorResponseWrapper.java | 17 +- .../SecurityContextPersistenceFilter.java | 15 ++ .../context/SecurityContextRepository.java | 15 ++ .../security/web/context/package-info.java | 15 ++ ...yContextCallableProcessingInterceptor.java | 17 +- .../WebAsyncManagerIntegrationFilter.java | 17 +- .../web/csrf/CsrfAuthenticationStrategy.java | 45 ++-- .../security/web/csrf/DefaultCsrfToken.java | 12 +- .../csrf/HttpSessionCsrfTokenRepository.java | 27 +- .../security/web/debug/DebugFilter.java | 15 ++ .../security/web/debug/Logger.java | 15 ++ .../web/firewall/DefaultHttpFirewall.java | 15 ++ .../web/firewall/FirewalledRequest.java | 15 ++ .../web/firewall/FirewalledResponse.java | 15 ++ .../security/web/firewall/HttpFirewall.java | 15 ++ .../firewall/RequestRejectedException.java | 15 ++ .../security/web/firewall/RequestWrapper.java | 15 ++ .../security/web/header/Header.java | 15 ++ .../DelegatingRequestMatcherHeaderWriter.java | 10 +- .../web/header/writers/HstsHeaderWriter.java | 18 +- .../header/writers/StaticHeadersWriter.java | 15 ++ ...ractRequestParameterAllowFromStrategy.java | 15 ++ .../frameoptions/AllowFromStrategy.java | 15 ++ .../frameoptions/RegExpAllowFromStrategy.java | 15 ++ .../frameoptions/StaticAllowFromStrategy.java | 15 ++ .../WhiteListedAllowFromStrategy.java | 15 ++ .../web/jaasapi/JaasApiIntegrationFilter.java | 2 +- .../security/web/jaasapi/package-info.java | 15 ++ ...thenticationPrincipalArgumentResolver.java | 18 +- .../security/web/package-info.java | 15 ++ .../web/savedrequest/DefaultSavedRequest.java | 5 +- .../security/web/savedrequest/Enumerator.java | 5 +- .../web/savedrequest/FastHttpDateFormat.java | 5 +- .../savedrequest/HttpSessionRequestCache.java | 15 ++ .../web/savedrequest/NullRequestCache.java | 15 ++ .../web/savedrequest/RequestCache.java | 15 ++ .../savedrequest/RequestCacheAwareFilter.java | 15 ++ .../web/savedrequest/SavedCookie.java | 15 ++ .../web/savedrequest/SavedRequest.java | 15 ++ .../SavedRequestAwareWrapper.java | 5 +- .../web/savedrequest/package-info.java | 15 ++ .../HttpServlet25RequestFactory.java | 17 +- .../HttpServlet3RequestFactory.java | 17 +- .../servletapi/HttpServletRequestFactory.java | 17 +- ...curityContextHolderAwareRequestFilter.java | 26 +- ...urityContextHolderAwareRequestWrapper.java | 5 +- .../security/web/servletapi/package-info.java | 15 ++ .../web/session/ConcurrentSessionFilter.java | 5 +- .../web/session/HttpSessionCreatedEvent.java | 5 +- .../session/HttpSessionDestroyedEvent.java | 5 +- .../session/HttpSessionEventPublisher.java | 5 +- .../web/session/InvalidSessionStrategy.java | 15 ++ .../web/session/SessionManagementFilter.java | 15 ++ .../SimpleRedirectInvalidSessionStrategy.java | 15 ++ .../security/web/session/package-info.java | 15 ++ .../security/web/util/RedirectUrlBuilder.java | 15 ++ .../security/web/util/TextEscapeUtils.java | 15 ++ .../security/web/util/ThrowableAnalyzer.java | 15 ++ .../web/util/ThrowableCauseExtractor.java | 15 ++ .../security/web/util/UrlUtils.java | 7 +- .../web/util/matcher/AndRequestMatcher.java | 18 +- .../util/matcher/AntPathRequestMatcher.java | 17 +- .../web/util/matcher/ELRequestMatcher.java | 2 +- .../util/matcher/ELRequestMatcherContext.java | 2 +- .../web/util/matcher/IpAddressMatcher.java | 15 ++ .../util/matcher/MediaTypeRequestMatcher.java | 53 ++-- .../util/matcher/NegatedRequestMatcher.java | 18 +- .../web/util/matcher/OrRequestMatcher.java | 18 +- .../web/util/matcher/RegexRequestMatcher.java | 17 +- .../web/util/matcher/RequestMatcher.java | 15 ++ .../util/matcher/RequestMatcherEditor.java | 2 +- .../security/web/util/package-info.java | 15 ++ .../security/MockFilterConfig.java | 5 +- .../security/MockPortResolver.java | 5 +- .../web/DefaultRedirectStrategyTests.java | 15 ++ .../security/web/FilterChainProxyTests.java | 15 ++ .../security/web/FilterInvocationTests.java | 5 +- .../security/web/PortMapperImplTests.java | 5 +- .../security/web/PortResolverImplTests.java | 5 +- ...tWebInvocationPrivilegeEvaluatorTests.java | 5 +- .../ExceptionTranslationFilterTests.java | 5 +- .../ChannelDecisionManagerImplTests.java | 53 ++-- .../channel/ChannelProcessingFilterTests.java | 5 +- .../InsecureChannelProcessorTests.java | 37 +-- .../channel/RetryWithHttpEntryPointTests.java | 41 +-- .../RetryWithHttpsEntryPointTests.java | 5 +- .../channel/SecureChannelProcessorTests.java | 5 +- ...aultWebSecurityExpressionHandlerTests.java | 18 +- ...InvocationSecurityMetadataSourceTests.java | 15 ++ .../expression/WebExpressionVoterTests.java | 16 +- .../WebSecurityExpressionRootTests.java | 15 ++ ...InvocationSecurityMetadataSourceTests.java | 5 +- .../FilterSecurityInterceptorTests.java | 5 +- .../web/access/intercept/RequestKeyTests.java | 15 ++ ...ctAuthenticationProcessingFilterTests.java | 5 +- .../AnonymousAuthenticationFilterTests.java | 5 +- ...DefaultLoginPageGeneratingFilterTests.java | 15 ++ ...gAuthenticationEntryPointContextTests.java | 15 ++ ...legatingAuthenticationEntryPointTests.java | 2 +- ...pingAuthenticationFailureHandlerTests.java | 15 ++ .../HttpStatusEntryPointTests.java | 18 +- ...LoginUrlAuthenticationEntryPointTests.java | 5 +- ...wareAuthenticationSuccessHandlerTests.java | 15 ++ ...eUrlAuthenticationFailureHandlerTests.java | 15 ++ ...eUrlAuthenticationSuccessHandlerTests.java | 15 ++ ...namePasswordAuthenticationFilterTests.java | 5 +- .../CookieClearingLogoutHandlerTests.java | 15 ++ ...tusReturningLogoutSuccessHandlerTests.java | 27 +- .../logout/LogoutHandlerTests.java | 15 ++ .../SecurityContextLogoutHandlerTests.java | 17 +- .../SimpleUrlLogoutSuccessHandlerTests.java | 15 ++ ...PreAuthenticatedProcessingFilterTests.java | 17 +- .../Http403ForbiddenEntryPointTests.java | 16 +- ...henticatedAuthenticationProviderTests.java | 16 +- ...AuthenticatedAuthenticationTokenTests.java | 16 +- ...tedAuthoritiesUserDetailsServiceTests.java | 15 ++ ...horitiesWebAuthenticationDetailsTests.java | 15 ++ ...equestHeaderAuthenticationFilterTests.java | 15 ++ ...edWebAuthenticationDetailsSourceTests.java | 16 +- ...PreAuthenticatedProcessingFilterTests.java | 16 +- .../WebXmlJ2eeDefinedRolesRetrieverTests.java | 15 ++ ...PreAuthenticatedProcessingFilterTests.java | 15 ++ .../SubjectDnX509PrincipalExtractorTests.java | 15 ++ .../preauth/x509/X509TestUtils.java | 10 +- ...stractRememberMeServicesServlet3Tests.java | 15 ++ .../AbstractRememberMeServicesTests.java | 16 +- .../NullRememberMeServicesTests.java | 5 +- ...tentTokenBasedRememberMeServicesTests.java | 15 ++ .../RememberMeAuthenticationFilterTests.java | 5 +- .../TokenBasedRememberMeServicesTests.java | 5 +- .../switchuser/SwitchUserFilterTests.java | 5 +- .../BasicAuthenticationEntryPointTests.java | 22 +- .../www/BasicAuthenticationFilterTests.java | 5 +- .../www/DigestAuthUtilsTests.java | 5 +- .../DigestAuthenticationEntryPointTests.java | 26 +- .../www/DigestAuthenticationFilterTests.java | 5 +- .../ConcurrentSessionFilterTests.java | 5 +- ...SessionSecurityContextRepositoryTests.java | 17 +- ...xtOnUpdateOrErrorResponseWrapperTests.java | 17 +- ...SecurityContextPersistenceFilterTests.java | 15 ++ ...extCallableProcessingInterceptorTests.java | 17 +- ...WebAsyncManagerIntegrationFilterTests.java | 17 +- .../security/web/debug/DebugFilterTest.java | 15 ++ .../firewall/DefaultHttpFirewallTests.java | 15 ++ .../web/firewall/FirewalledResponseTests.java | 15 ++ .../web/firewall/RequestWrapperTests.java | 15 ++ .../RegExpAllowFromStrategyTests.java | 16 +- .../StaticAllowFromStrategyTests.java | 15 ++ .../WhiteListedAllowFromStrategyTests.java | 15 ++ .../JaasApiIntegrationFilterTests.java | 2 +- .../DefaultSavedRequestTests.java | 15 ++ .../HttpSessionRequestCacheTests.java | 16 +- .../RequestCacheAwareFilterTests.java | 15 ++ .../web/savedrequest/SavedCookieTests.java | 15 ++ .../SavedRequestAwareWrapperTests.java | 15 ++ ...yContextHolderAwareRequestFilterTests.java | 234 +++++++++--------- ...ContextHolderAwareRequestWrapperTests.java | 34 +-- .../HttpSessionDestroyedEventTests.java | 16 +- .../HttpSessionEventPublisherTests.java | 5 +- .../web/session/MockApplicationListener.java | 5 +- .../session/SessionManagementFilterTests.java | 18 +- .../web/util/TextEscapeUtilsTests.java | 15 ++ .../web/util/ThrowableAnalyzerTests.java | 16 +- .../security/web/util/UrlUtilsTests.java | 15 ++ .../util/matcher/AndRequestMatcherTests.java | 18 +- .../matcher/AntPathRequestMatcherTests.java | 17 +- .../util/matcher/ELRequestMatcherTests.java | 2 +- .../util/matcher/IpAddressMatcherTests.java | 15 ++ .../matcher/NegatedRequestMatcherTests.java | 18 +- .../util/matcher/OrRequestMatcherTests.java | 18 +- .../matcher/RegexRequestMatcherTests.java | 17 +- 1245 files changed, 13196 insertions(+), 3392 deletions(-) delete mode 100644 samples/dms-xml/src/test/java/SecureDmsIntegrationTests.java rename samples/dms-xml/src/test/java/{ => sample}/DmsIntegrationTests.java (54%) create mode 100644 samples/dms-xml/src/test/java/sample/SecureDmsIntegrationTests.java diff --git a/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java b/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java index 6ff37fded9..8227d3a425 100644 --- a/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java +++ b/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java b/acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java index 857ea67669..424cc451b5 100644 --- a/acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java +++ b/acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls; import java.util.ArrayList; diff --git a/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java b/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java index 758c9d4b92..369a77fed2 100644 --- a/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java +++ b/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls; import java.io.Serializable; diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java index 86cb373157..32306bddfa 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java index 673c753910..3d0bcb9921 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java index 80f21f2618..a3a0978b21 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java index 45d782369d..c46ae8057b 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java index 58fcc9a400..661f2a6ee2 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/Filterer.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/Filterer.java index 610d7b6f45..e4a691efa3 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/Filterer.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/Filterer.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/package-info.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/package-info.java index 9d27664c26..abb6e0f6c6 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/package-info.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/package-info.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /** * After-invocation providers for collection and array filtering. Consider using a {@code PostFilter} annotation in * preference. diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java b/acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java index 575ad5361a..c6cf213ac3 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.domain; import org.springframework.security.acls.model.Permission; diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java index faa9189458..c5f02f7d68 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategy.java b/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategy.java index 0541c16252..fb9351092f 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategy.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategy.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java index 6514cd655e..d8a96ba2bc 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclFormattingUtils.java b/acl/src/main/java/org/springframework/security/acls/domain/AclFormattingUtils.java index 04c663e7e0..b486101666 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AclFormattingUtils.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AclFormattingUtils.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java index 9f6b94623d..7d47f429dc 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AuditLogger.java b/acl/src/main/java/org/springframework/security/acls/domain/AuditLogger.java index 4f767639ca..b906e76261 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AuditLogger.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AuditLogger.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/domain/BasePermission.java b/acl/src/main/java/org/springframework/security/acls/domain/BasePermission.java index 6953027f8e..4725416329 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/BasePermission.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/BasePermission.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/domain/ConsoleAuditLogger.java b/acl/src/main/java/org/springframework/security/acls/domain/ConsoleAuditLogger.java index 482f49f71e..8f36b3282a 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/ConsoleAuditLogger.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/ConsoleAuditLogger.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/domain/CumulativePermission.java b/acl/src/main/java/org/springframework/security/acls/domain/CumulativePermission.java index 158fd4150f..965f23fa46 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/CumulativePermission.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/CumulativePermission.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java b/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java index ec3150406f..43c4bb5848 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.domain; import java.lang.reflect.Field; diff --git a/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionGrantingStrategy.java b/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionGrantingStrategy.java index 1167f3b4ae..ff28223311 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionGrantingStrategy.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionGrantingStrategy.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.domain; import java.util.List; diff --git a/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java b/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java index d84459c74a..d6de027b81 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java b/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java index ecaaf68133..19afd2d6ff 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/domain/IdentityUnavailableException.java b/acl/src/main/java/org/springframework/security/acls/domain/IdentityUnavailableException.java index 9ede4f33aa..4092e4c782 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/IdentityUnavailableException.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/IdentityUnavailableException.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java index 2e485a670e..feb467b8e9 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImpl.java index e4345547c6..ea64511323 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImpl.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/domain/PermissionFactory.java b/acl/src/main/java/org/springframework/security/acls/domain/PermissionFactory.java index 2d98a85f34..2dd98d2bd9 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/PermissionFactory.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/PermissionFactory.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.domain; import java.util.List; diff --git a/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java b/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java index 2708162139..42ec8f304c 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java index b5621257e2..2b29068000 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/domain/package-info.java b/acl/src/main/java/org/springframework/security/acls/domain/package-info.java index 9201afa7f5..4fc062573c 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/package-info.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/package-info.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /** * Basic implementation of access control lists (ACLs) interfaces. */ diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java b/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java index 36db5ea663..0bd358e611 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java index 413332d2da..e9e8ed49c7 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java index f2197a68bc..8c990af9ac 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/LookupStrategy.java b/acl/src/main/java/org/springframework/security/acls/jdbc/LookupStrategy.java index 61f7d59a1d..3befd2e4ae 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/LookupStrategy.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/LookupStrategy.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/package-info.java b/acl/src/main/java/org/springframework/security/acls/jdbc/package-info.java index 382a7b111a..b0fe041521 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/package-info.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/package-info.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /** * JDBC-based persistence of ACL information */ diff --git a/acl/src/main/java/org/springframework/security/acls/model/AccessControlEntry.java b/acl/src/main/java/org/springframework/security/acls/model/AccessControlEntry.java index c8c3ee4796..262acb9a9c 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/AccessControlEntry.java +++ b/acl/src/main/java/org/springframework/security/acls/model/AccessControlEntry.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/model/Acl.java b/acl/src/main/java/org/springframework/security/acls/model/Acl.java index 98cbe300c8..becc8af1ab 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/Acl.java +++ b/acl/src/main/java/org/springframework/security/acls/model/Acl.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/model/AclCache.java b/acl/src/main/java/org/springframework/security/acls/model/AclCache.java index b3bdef81fd..6b5aa2d576 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/AclCache.java +++ b/acl/src/main/java/org/springframework/security/acls/model/AclCache.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/model/AclDataAccessException.java b/acl/src/main/java/org/springframework/security/acls/model/AclDataAccessException.java index 10b4bae1e2..b1f2fc4ceb 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/AclDataAccessException.java +++ b/acl/src/main/java/org/springframework/security/acls/model/AclDataAccessException.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.model; /** diff --git a/acl/src/main/java/org/springframework/security/acls/model/AclService.java b/acl/src/main/java/org/springframework/security/acls/model/AclService.java index c7f11ff84c..3cfb8cd26d 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/AclService.java +++ b/acl/src/main/java/org/springframework/security/acls/model/AclService.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/model/AlreadyExistsException.java b/acl/src/main/java/org/springframework/security/acls/model/AlreadyExistsException.java index 059d080983..23da005a5d 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/AlreadyExistsException.java +++ b/acl/src/main/java/org/springframework/security/acls/model/AlreadyExistsException.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/model/AuditableAccessControlEntry.java b/acl/src/main/java/org/springframework/security/acls/model/AuditableAccessControlEntry.java index 84d353eb9e..7eac79f7b9 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/AuditableAccessControlEntry.java +++ b/acl/src/main/java/org/springframework/security/acls/model/AuditableAccessControlEntry.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/model/AuditableAcl.java b/acl/src/main/java/org/springframework/security/acls/model/AuditableAcl.java index 5d573419c5..499eb0b48c 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/AuditableAcl.java +++ b/acl/src/main/java/org/springframework/security/acls/model/AuditableAcl.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/model/ChildrenExistException.java b/acl/src/main/java/org/springframework/security/acls/model/ChildrenExistException.java index 9f15c8b9e1..72d9d14707 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/ChildrenExistException.java +++ b/acl/src/main/java/org/springframework/security/acls/model/ChildrenExistException.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/model/MutableAcl.java b/acl/src/main/java/org/springframework/security/acls/model/MutableAcl.java index ad98cb19f6..77ed7088c4 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/MutableAcl.java +++ b/acl/src/main/java/org/springframework/security/acls/model/MutableAcl.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/model/MutableAclService.java b/acl/src/main/java/org/springframework/security/acls/model/MutableAclService.java index 949bcb53b2..517767ad6a 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/MutableAclService.java +++ b/acl/src/main/java/org/springframework/security/acls/model/MutableAclService.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/model/NotFoundException.java b/acl/src/main/java/org/springframework/security/acls/model/NotFoundException.java index d96c1e7c50..34cd18c913 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/NotFoundException.java +++ b/acl/src/main/java/org/springframework/security/acls/model/NotFoundException.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentity.java b/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentity.java index 855ae6883b..ae8de406f9 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentity.java +++ b/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentity.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityGenerator.java b/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityGenerator.java index cb9330d30f..ec103d19b5 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityGenerator.java +++ b/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityGenerator.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.model; import java.io.Serializable; diff --git a/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityRetrievalStrategy.java b/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityRetrievalStrategy.java index 395c7e3d6a..2ebd4d6b80 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityRetrievalStrategy.java +++ b/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityRetrievalStrategy.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/model/OwnershipAcl.java b/acl/src/main/java/org/springframework/security/acls/model/OwnershipAcl.java index ecd79a65bc..825ec5068d 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/OwnershipAcl.java +++ b/acl/src/main/java/org/springframework/security/acls/model/OwnershipAcl.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/model/Permission.java b/acl/src/main/java/org/springframework/security/acls/model/Permission.java index 625f5aeb6d..fe03630832 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/Permission.java +++ b/acl/src/main/java/org/springframework/security/acls/model/Permission.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/model/PermissionGrantingStrategy.java b/acl/src/main/java/org/springframework/security/acls/model/PermissionGrantingStrategy.java index 9ea73cccbf..642189f01f 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/PermissionGrantingStrategy.java +++ b/acl/src/main/java/org/springframework/security/acls/model/PermissionGrantingStrategy.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.model; import java.util.List; diff --git a/acl/src/main/java/org/springframework/security/acls/model/Sid.java b/acl/src/main/java/org/springframework/security/acls/model/Sid.java index be18753a9e..b65f6ea261 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/Sid.java +++ b/acl/src/main/java/org/springframework/security/acls/model/Sid.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/model/SidRetrievalStrategy.java b/acl/src/main/java/org/springframework/security/acls/model/SidRetrievalStrategy.java index fc48bfdb7d..b9588674f8 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/SidRetrievalStrategy.java +++ b/acl/src/main/java/org/springframework/security/acls/model/SidRetrievalStrategy.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/model/UnloadedSidException.java b/acl/src/main/java/org/springframework/security/acls/model/UnloadedSidException.java index e92f1e8710..b19ae6f30a 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/UnloadedSidException.java +++ b/acl/src/main/java/org/springframework/security/acls/model/UnloadedSidException.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/main/java/org/springframework/security/acls/model/package-info.java b/acl/src/main/java/org/springframework/security/acls/model/package-info.java index 476ab3424b..75fd4776e2 100644 --- a/acl/src/main/java/org/springframework/security/acls/model/package-info.java +++ b/acl/src/main/java/org/springframework/security/acls/model/package-info.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /** * Interfaces and shared classes to manage access control lists (ACLs) for domain object instances. */ diff --git a/acl/src/main/java/org/springframework/security/acls/package-info.java b/acl/src/main/java/org/springframework/security/acls/package-info.java index 2429048aae..4be9ef2ad9 100644 --- a/acl/src/main/java/org/springframework/security/acls/package-info.java +++ b/acl/src/main/java/org/springframework/security/acls/package-info.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /** * The Spring Security ACL package which implements instance-based security for domain objects. *

diff --git a/acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java b/acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java index 57828a390e..e12333625b 100644 --- a/acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java +++ b/acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java @@ -1,4 +1,18 @@ - +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls; import static org.assertj.core.api.Assertions.assertThat; diff --git a/acl/src/test/java/org/springframework/security/acls/AclPermissionCacheOptimizerTests.java b/acl/src/test/java/org/springframework/security/acls/AclPermissionCacheOptimizerTests.java index aad5162a6f..3a06537472 100644 --- a/acl/src/test/java/org/springframework/security/acls/AclPermissionCacheOptimizerTests.java +++ b/acl/src/test/java/org/springframework/security/acls/AclPermissionCacheOptimizerTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls; import static org.mockito.Mockito.*; diff --git a/acl/src/test/java/org/springframework/security/acls/AclPermissionEvaluatorTests.java b/acl/src/test/java/org/springframework/security/acls/AclPermissionEvaluatorTests.java index 2929411099..2be0b953e5 100644 --- a/acl/src/test/java/org/springframework/security/acls/AclPermissionEvaluatorTests.java +++ b/acl/src/test/java/org/springframework/security/acls/AclPermissionEvaluatorTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls; import static org.assertj.core.api.Assertions.*; diff --git a/acl/src/test/java/org/springframework/security/acls/TargetObject.java b/acl/src/test/java/org/springframework/security/acls/TargetObject.java index e9738e40f8..28cc484b8c 100644 --- a/acl/src/test/java/org/springframework/security/acls/TargetObject.java +++ b/acl/src/test/java/org/springframework/security/acls/TargetObject.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls; /** diff --git a/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java b/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java index 3beba8f3fd..3892065c32 100644 --- a/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java +++ b/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.afterinvocation; diff --git a/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java b/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java index b6f830628c..383b3b6806 100644 --- a/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java +++ b/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.afterinvocation; import static org.assertj.core.api.Assertions.*; diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AccessControlImplEntryTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AccessControlImplEntryTests.java index 5982f919eb..53fff360f5 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AccessControlImplEntryTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/AccessControlImplEntryTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.domain; import static org.assertj.core.api.Assertions.*; diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java index 6935222d0e..7bc3ba7406 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.domain; import static org.assertj.core.api.Assertions.*; diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java index fa122ec322..06121ec0b9 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.domain; import static org.assertj.core.api.Assertions.*; diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java index 59e4649108..a905a12d44 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.domain; import static org.assertj.core.api.Assertions.*; diff --git a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java index a4dcc204f6..18bb2fd38a 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.domain; import static org.assertj.core.api.Assertions.*; diff --git a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java index 35ef26150e..7422a0e744 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java @@ -1,4 +1,18 @@ - +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.domain; import static org.assertj.core.api.Assertions.assertThat; diff --git a/acl/src/test/java/org/springframework/security/acls/domain/PermissionTests.java b/acl/src/test/java/org/springframework/security/acls/domain/PermissionTests.java index 57f958e48d..45f3a48d67 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/PermissionTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/PermissionTests.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/test/java/org/springframework/security/acls/domain/SpecialPermission.java b/acl/src/test/java/org/springframework/security/acls/domain/SpecialPermission.java index 1c16fdab7f..ec80a7af1b 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/SpecialPermission.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/SpecialPermission.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java index 8c57e6a8c6..069f999b8d 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.jdbc; import static org.assertj.core.api.Assertions.*; diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/DatabaseSeeder.java b/acl/src/test/java/org/springframework/security/acls/jdbc/DatabaseSeeder.java index 41f9958b46..8f974ac408 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/DatabaseSeeder.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/DatabaseSeeder.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java index 2e9bc069bb..da14a623de 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.jdbc; import static org.mockito.Matchers.*; diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java index f7cd040a56..c0bb2af0d4 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.jdbc; import static org.mockito.Matchers.anyListOf; diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java index 5a4b9559e5..fcc6f8098b 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/SpringCacheBasedAclCacheTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/SpringCacheBasedAclCacheTests.java index 7681bd576f..d9675a1028 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/SpringCacheBasedAclCacheTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/SpringCacheBasedAclCacheTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.jdbc; import org.junit.After; diff --git a/acl/src/test/java/org/springframework/security/acls/sid/CustomSid.java b/acl/src/test/java/org/springframework/security/acls/sid/CustomSid.java index 905e161a2e..05e35cbd1a 100644 --- a/acl/src/test/java/org/springframework/security/acls/sid/CustomSid.java +++ b/acl/src/test/java/org/springframework/security/acls/sid/CustomSid.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.sid; import org.springframework.security.acls.model.Sid; diff --git a/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java b/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java index 0f6e637a17..ad81b6ff05 100644 --- a/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java +++ b/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.sid; import static org.assertj.core.api.Assertions.*; diff --git a/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java b/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java index 14a1e7670c..dabd0b5ae8 100644 --- a/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java +++ b/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java @@ -1,4 +1,18 @@ - +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.acls.sid; import static org.assertj.core.api.Assertions.assertThat; diff --git a/aspects/src/main/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspect.aj b/aspects/src/main/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspect.aj index f2194068fb..b81cc1c83e 100644 --- a/aspects/src/main/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspect.aj +++ b/aspects/src/main/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspect.aj @@ -1,10 +1,28 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.access.intercept.aspectj.aspect; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.access.annotation.Secured; -import org.springframework.security.access.prepost.*; import org.springframework.security.access.intercept.aspectj.AspectJCallback; import org.springframework.security.access.intercept.aspectj.AspectJMethodSecurityInterceptor; +import org.springframework.security.access.prepost.PostAuthorize; +import org.springframework.security.access.prepost.PostFilter; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.security.access.prepost.PreFilter; /** * Concrete AspectJ aspect using Spring Security @Secured annotation @@ -22,55 +40,55 @@ import org.springframework.security.access.intercept.aspectj.AspectJMethodSecuri */ public aspect AnnotationSecurityAspect implements InitializingBean { - /** - * Matches the execution of any public method in a type with the Secured - * annotation, or any subtype of a type with the Secured annotation. - */ - private pointcut executionOfAnyPublicMethodInAtSecuredType() : - execution(public * ((@Secured *)+).*(..)) && @this(Secured); + /** + * Matches the execution of any public method in a type with the Secured + * annotation, or any subtype of a type with the Secured annotation. + */ + private pointcut executionOfAnyPublicMethodInAtSecuredType() : + execution(public * ((@Secured *)+).*(..)) && @this(Secured); - /** - * Matches the execution of any method with the Secured annotation. - */ - private pointcut executionOfSecuredMethod() : - execution(* *(..)) && @annotation(Secured); + /** + * Matches the execution of any method with the Secured annotation. + */ + private pointcut executionOfSecuredMethod() : + execution(* *(..)) && @annotation(Secured); - /** - * Matches the execution of any method with Pre/Post annotations. - */ - private pointcut executionOfPrePostAnnotatedMethod() : - execution(* *(..)) && (@annotation(PreAuthorize) || @annotation(PreFilter) - || @annotation(PostAuthorize) || @annotation(PostFilter)); + /** + * Matches the execution of any method with Pre/Post annotations. + */ + private pointcut executionOfPrePostAnnotatedMethod() : + execution(* *(..)) && (@annotation(PreAuthorize) || @annotation(PreFilter) + || @annotation(PostAuthorize) || @annotation(PostFilter)); - private pointcut securedMethodExecution() : - executionOfAnyPublicMethodInAtSecuredType() || - executionOfSecuredMethod() || - executionOfPrePostAnnotatedMethod(); + private pointcut securedMethodExecution() : + executionOfAnyPublicMethodInAtSecuredType() || + executionOfSecuredMethod() || + executionOfPrePostAnnotatedMethod(); - private AspectJMethodSecurityInterceptor securityInterceptor; + private AspectJMethodSecurityInterceptor securityInterceptor; - Object around(): securedMethodExecution() { - if (this.securityInterceptor == null) { - return proceed(); - } + Object around(): securedMethodExecution() { + if (this.securityInterceptor == null) { + return proceed(); + } - AspectJCallback callback = new AspectJCallback() { - public Object proceedWithObject() { - return proceed(); - } - }; + AspectJCallback callback = new AspectJCallback() { + public Object proceedWithObject() { + return proceed(); + } + }; - return this.securityInterceptor.invoke(thisJoinPoint, callback); - } + return this.securityInterceptor.invoke(thisJoinPoint, callback); + } - public void setSecurityInterceptor(AspectJMethodSecurityInterceptor securityInterceptor) { - this.securityInterceptor = securityInterceptor; - } + public void setSecurityInterceptor(AspectJMethodSecurityInterceptor securityInterceptor) { + this.securityInterceptor = securityInterceptor; + } - public void afterPropertiesSet() throws Exception { - if (this.securityInterceptor == null) { - throw new IllegalArgumentException("securityInterceptor required"); - } - } + public void afterPropertiesSet() throws Exception { + if (this.securityInterceptor == null) { + throw new IllegalArgumentException("securityInterceptor required"); + } + } } diff --git a/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java b/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java index c5bd74869a..e11fa917e9 100644 --- a/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java +++ b/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.access.intercept.aspectj.aspect; import static org.assertj.core.api.Assertions.*; diff --git a/cas/src/main/java/org/springframework/security/cas/SamlServiceProperties.java b/cas/src/main/java/org/springframework/security/cas/SamlServiceProperties.java index e3e9599201..93f5ed048a 100644 --- a/cas/src/main/java/org/springframework/security/cas/SamlServiceProperties.java +++ b/cas/src/main/java/org/springframework/security/cas/SamlServiceProperties.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/main/java/org/springframework/security/cas/ServiceProperties.java b/cas/src/main/java/org/springframework/security/cas/ServiceProperties.java index bb0de24393..97f826698e 100644 --- a/cas/src/main/java/org/springframework/security/cas/ServiceProperties.java +++ b/cas/src/main/java/org/springframework/security/cas/ServiceProperties.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -60,7 +61,7 @@ public class ServiceProperties implements InitializingBean { *

* This service is the callback URL belonging to the local Spring Security System for * Spring secured application. For example, - * + * * 

 	 * https://www.mycompany.com/application/login/cas
 	 *
@@ -116,7 +117,7 @@ public class ServiceProperties implements InitializingBean { * @return the service parameter to use. Default is "service". */ public final String getServiceParameter() { - return serviceParameter; + return this.serviceParameter; } public final void setServiceParameter(final String serviceParameter) { @@ -124,7 +125,7 @@ public class ServiceProperties implements InitializingBean { } public final boolean isAuthenticateAllArtifacts() { - return authenticateAllArtifacts; + return this.authenticateAllArtifacts; } /** @@ -134,7 +135,8 @@ public class ServiceProperties implements InitializingBean { * * @param authenticateAllArtifacts */ - public final void setAuthenticateAllArtifacts(final boolean authenticateAllArtifacts) { + public final void setAuthenticateAllArtifacts( + final boolean authenticateAllArtifacts) { this.authenticateAllArtifacts = authenticateAllArtifacts; } } diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java index 57b9b41f43..19da86d366 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java index 9e498763b8..845244e5a9 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java index 2aa93587bb..856781ae5e 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java b/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java index 8097fd7904..620b13bbba 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/NullStatelessTicketCache.java b/cas/src/main/java/org/springframework/security/cas/authentication/NullStatelessTicketCache.java index a268fc3bfe..5f462bbcb3 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/NullStatelessTicketCache.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/NullStatelessTicketCache.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/StatelessTicketCache.java b/cas/src/main/java/org/springframework/security/cas/authentication/StatelessTicketCache.java index 02f2094b08..7c4b4b2fb9 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/StatelessTicketCache.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/StatelessTicketCache.java @@ -1,10 +1,11 @@ -/* Copyright 2004 Acegi Technology Pty Limited +/* + * Copyright 2004 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/package-info.java b/cas/src/main/java/org/springframework/security/cas/authentication/package-info.java index 6671180b87..1eb2cc9b01 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/package-info.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/package-info.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /** * An {@code AuthenticationProvider} that can process CAS service tickets and proxy tickets. */ diff --git a/cas/src/main/java/org/springframework/security/cas/package-info.java b/cas/src/main/java/org/springframework/security/cas/package-info.java index 6f1ef76ea7..f4932f42db 100644 --- a/cas/src/main/java/org/springframework/security/cas/package-info.java +++ b/cas/src/main/java/org/springframework/security/cas/package-info.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /** * Spring Security support for Jasig's Central Authentication Service (CAS). */ diff --git a/cas/src/main/java/org/springframework/security/cas/userdetails/AbstractCasAssertionUserDetailsService.java b/cas/src/main/java/org/springframework/security/cas/userdetails/AbstractCasAssertionUserDetailsService.java index 939f21d895..0493905d9e 100644 --- a/cas/src/main/java/org/springframework/security/cas/userdetails/AbstractCasAssertionUserDetailsService.java +++ b/cas/src/main/java/org/springframework/security/cas/userdetails/AbstractCasAssertionUserDetailsService.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/main/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsService.java b/cas/src/main/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsService.java index b44db23fea..6b19cb4400 100644 --- a/cas/src/main/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsService.java +++ b/cas/src/main/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsService.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationEntryPoint.java b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationEntryPoint.java index f4011f8240..9da3f71a04 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationEntryPoint.java +++ b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationEntryPoint.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java index f7f094907b..730814eb95 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java +++ b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java b/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java index bb141f0bea..5f08dc39b8 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java +++ b/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java @@ -1,5 +1,5 @@ /* - * Copyright 2011 the original author or authors. + * Copyright 2011-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetails.java b/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetails.java index 631a6776e4..024fc0b085 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetails.java +++ b/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetails.java @@ -1,12 +1,12 @@ /* - * Copyright 2011 the original author or authors. - * + * Copyright 2011-2016 the original author or authors. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java b/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java index b032e58105..ef26f97a01 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java +++ b/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2011 the original author or authors. + * Copyright 2011-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cas/src/main/java/org/springframework/security/cas/web/authentication/package-info.java b/cas/src/main/java/org/springframework/security/cas/web/authentication/package-info.java index 1b58e97681..3636c18c0d 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/authentication/package-info.java +++ b/cas/src/main/java/org/springframework/security/cas/web/authentication/package-info.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /** * Authentication processing mechanisms which respond to the submission of authentication * credentials using CAS. diff --git a/cas/src/main/java/org/springframework/security/cas/web/package-info.java b/cas/src/main/java/org/springframework/security/cas/web/package-info.java index b370ab5f0d..3e9f9add7f 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/package-info.java +++ b/cas/src/main/java/org/springframework/security/cas/web/package-info.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /** * Authenticates standard web browser users via CAS. */ diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/AbstractStatelessTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/AbstractStatelessTicketCacheTests.java index f0e8a741ab..8d7ab31594 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/AbstractStatelessTicketCacheTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/AbstractStatelessTicketCacheTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.cas.authentication; import java.util.ArrayList; diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java index f5dccd3c7c..b77b77815f 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java index b34c4ea5ff..ce1b1ece33 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java index 36d08b3f08..b1ff490bd6 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java index 5cffb897a6..f3b8b9495a 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCacheTests.java index 08f5240002..69e394e634 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCacheTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCacheTests.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/test/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests.java b/cas/src/test/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests.java index 009222405b..f2f2449648 100644 --- a/cas/src/test/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests.java +++ b/cas/src/test/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.cas.userdetails; import static org.assertj.core.api.Assertions.*; diff --git a/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationEntryPointTests.java b/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationEntryPointTests.java index 539ad62492..94c82714f5 100644 --- a/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationEntryPointTests.java +++ b/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationEntryPointTests.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java b/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java index 2811ad3fc1..dd1620774c 100644 --- a/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java +++ b/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/test/java/org/springframework/security/cas/web/ServicePropertiesTests.java b/cas/src/test/java/org/springframework/security/cas/web/ServicePropertiesTests.java index b47c302b0e..a6f5186ea3 100644 --- a/cas/src/test/java/org/springframework/security/cas/web/ServicePropertiesTests.java +++ b/cas/src/test/java/org/springframework/security/cas/web/ServicePropertiesTests.java @@ -1,10 +1,11 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/cas/src/test/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetailsTests.java b/cas/src/test/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetailsTests.java index 843f9c2879..6c28fc559a 100644 --- a/cas/src/test/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetailsTests.java +++ b/cas/src/test/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetailsTests.java @@ -1,12 +1,12 @@ /* - * Copyright 2011 the original author or authors. - * + * Copyright 2011-2016 the original author or authors. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,25 +15,19 @@ */ package org.springframework.security.cas.web.authentication; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.regex.Pattern; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; + import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.context.support.GenericApplicationContext; import org.springframework.context.support.GenericXmlApplicationContext; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.security.cas.ServiceProperties; import org.springframework.security.web.util.UrlUtils; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import static org.assertj.core.api.Assertions.assertThat; /** * @@ -49,93 +43,97 @@ public class DefaultServiceAuthenticationDetailsTests { @Before public void setUp() { - casServiceUrl = "https://localhost:8443/j_spring_security_cas"; - request = new MockHttpServletRequest(); - request.setScheme("https"); - request.setServerName("localhost"); - request.setServerPort(8443); - request.setRequestURI("/cas-sample/secure/"); - artifactPattern = DefaultServiceAuthenticationDetails + this.casServiceUrl = "https://localhost:8443/j_spring_security_cas"; + this.request = new MockHttpServletRequest(); + this.request.setScheme("https"); + this.request.setServerName("localhost"); + this.request.setServerPort(8443); + this.request.setRequestURI("/cas-sample/secure/"); + this.artifactPattern = DefaultServiceAuthenticationDetails .createArtifactPattern(ServiceProperties.DEFAULT_CAS_ARTIFACT_PARAMETER); } @After public void cleanup() { - if (context != null) { - context.close(); + if (this.context != null) { + this.context.close(); } } @Test public void getServiceUrlNullQuery() throws Exception { - details = new DefaultServiceAuthenticationDetails(casServiceUrl, request, - artifactPattern); - assertThat(details.getServiceUrl()).isEqualTo(UrlUtils.buildFullRequestUrl(request)); + this.details = new DefaultServiceAuthenticationDetails(this.casServiceUrl, + this.request, this.artifactPattern); + assertThat(this.details.getServiceUrl()) + .isEqualTo(UrlUtils.buildFullRequestUrl(this.request)); } @Test public void getServiceUrlTicketOnlyParam() throws Exception { - request.setQueryString("ticket=123"); - details = new DefaultServiceAuthenticationDetails(casServiceUrl, request, - artifactPattern); - String serviceUrl = details.getServiceUrl(); - request.setQueryString(null); - assertThat(serviceUrl).isEqualTo(UrlUtils.buildFullRequestUrl(request)); + this.request.setQueryString("ticket=123"); + this.details = new DefaultServiceAuthenticationDetails(this.casServiceUrl, + this.request, this.artifactPattern); + String serviceUrl = this.details.getServiceUrl(); + this.request.setQueryString(null); + assertThat(serviceUrl).isEqualTo(UrlUtils.buildFullRequestUrl(this.request)); } @Test public void getServiceUrlTicketFirstMultiParam() throws Exception { - request.setQueryString("ticket=123&other=value"); - details = new DefaultServiceAuthenticationDetails(casServiceUrl, request, - artifactPattern); - String serviceUrl = details.getServiceUrl(); - request.setQueryString("other=value"); - assertThat(serviceUrl).isEqualTo(UrlUtils.buildFullRequestUrl(request)); + this.request.setQueryString("ticket=123&other=value"); + this.details = new DefaultServiceAuthenticationDetails(this.casServiceUrl, + this.request, this.artifactPattern); + String serviceUrl = this.details.getServiceUrl(); + this.request.setQueryString("other=value"); + assertThat(serviceUrl).isEqualTo(UrlUtils.buildFullRequestUrl(this.request)); } @Test public void getServiceUrlTicketLastMultiParam() throws Exception { - request.setQueryString("other=value&ticket=123"); - details = new DefaultServiceAuthenticationDetails(casServiceUrl, request, - artifactPattern); - String serviceUrl = details.getServiceUrl(); - request.setQueryString("other=value"); - assertThat(serviceUrl).isEqualTo(UrlUtils.buildFullRequestUrl(request)); + this.request.setQueryString("other=value&ticket=123"); + this.details = new DefaultServiceAuthenticationDetails(this.casServiceUrl, + this.request, this.artifactPattern); + String serviceUrl = this.details.getServiceUrl(); + this.request.setQueryString("other=value"); + assertThat(serviceUrl).isEqualTo(UrlUtils.buildFullRequestUrl(this.request)); } @Test public void getServiceUrlTicketMiddleMultiParam() throws Exception { - request.setQueryString("other=value&ticket=123&last=this"); - details = new DefaultServiceAuthenticationDetails(casServiceUrl, request, - artifactPattern); - String serviceUrl = details.getServiceUrl(); - request.setQueryString("other=value&last=this"); - assertThat(serviceUrl).isEqualTo(UrlUtils.buildFullRequestUrl(request)); + this.request.setQueryString("other=value&ticket=123&last=this"); + this.details = new DefaultServiceAuthenticationDetails(this.casServiceUrl, + this.request, this.artifactPattern); + String serviceUrl = this.details.getServiceUrl(); + this.request.setQueryString("other=value&last=this"); + assertThat(serviceUrl).isEqualTo(UrlUtils.buildFullRequestUrl(this.request)); } @Test public void getServiceUrlDoesNotUseHostHeader() throws Exception { - casServiceUrl = "https://example.com/j_spring_security_cas"; - request.setServerName("evil.com"); - details = new DefaultServiceAuthenticationDetails(casServiceUrl, request, - artifactPattern); - assertThat(details.getServiceUrl()).isEqualTo("https://example.com/cas-sample/secure/"); + this.casServiceUrl = "https://example.com/j_spring_security_cas"; + this.request.setServerName("evil.com"); + this.details = new DefaultServiceAuthenticationDetails(this.casServiceUrl, + this.request, this.artifactPattern); + assertThat(this.details.getServiceUrl()) + .isEqualTo("https://example.com/cas-sample/secure/"); } @Test public void getServiceUrlDoesNotUseHostHeaderExplicit() { - casServiceUrl = "https://example.com/j_spring_security_cas"; - request.setServerName("evil.com"); - ServiceAuthenticationDetails details = loadServiceAuthenticationDetails("defaultserviceauthenticationdetails-explicit.xml"); - assertThat(details.getServiceUrl()).isEqualTo("https://example.com/cas-sample/secure/"); + this.casServiceUrl = "https://example.com/j_spring_security_cas"; + this.request.setServerName("evil.com"); + ServiceAuthenticationDetails details = loadServiceAuthenticationDetails( + "defaultserviceauthenticationdetails-explicit.xml"); + assertThat(details.getServiceUrl()) + .isEqualTo("https://example.com/cas-sample/secure/"); } private ServiceAuthenticationDetails loadServiceAuthenticationDetails( String resourceName) { - context = new GenericXmlApplicationContext(getClass(), resourceName); - ServiceAuthenticationDetailsSource source = context + this.context = new GenericXmlApplicationContext(getClass(), resourceName); + ServiceAuthenticationDetailsSource source = this.context .getBean(ServiceAuthenticationDetailsSource.class); - return source.buildDetails(request); + return source.buildDetails(this.request); } } diff --git a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java index a2002d9121..3410ed4932 100644 --- a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java +++ b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java @@ -1,14 +1,17 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2016 the original author or authors. * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.springframework.security.config.ldap; diff --git a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java index 662b55ccd2..18e7748429 100644 --- a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java +++ b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java @@ -1,14 +1,17 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2016 the original author or authors. * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.springframework.security.config.ldap; diff --git a/config/src/main/java/org/springframework/security/config/BeanIds.java b/config/src/main/java/org/springframework/security/config/BeanIds.java index c8d318e565..a235e79905 100644 --- a/config/src/main/java/org/springframework/security/config/BeanIds.java +++ b/config/src/main/java/org/springframework/security/config/BeanIds.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.config; /** diff --git a/config/src/main/java/org/springframework/security/config/DebugBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/DebugBeanDefinitionParser.java index 16cf1e5438..673c86e0c9 100644 --- a/config/src/main/java/org/springframework/security/config/DebugBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/DebugBeanDefinitionParser.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.config; import org.springframework.beans.factory.config.BeanDefinition; diff --git a/config/src/main/java/org/springframework/security/config/Elements.java b/config/src/main/java/org/springframework/security/config/Elements.java index 8b30c42d21..c45ac5160e 100644 --- a/config/src/main/java/org/springframework/security/config/Elements.java +++ b/config/src/main/java/org/springframework/security/config/Elements.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.config; /** diff --git a/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java index 892297e93d..3275b9a732 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java +++ b/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java @@ -33,13 +33,13 @@ public abstract class AbstractSecurityBuilder implements SecurityBuilder { /* * (non-Javadoc) - * + * * @see org.springframework.security.config.annotation.SecurityBuilder#build() */ public final O build() throws Exception { - if (building.compareAndSet(false, true)) { - object = doBuild(); - return object; + if (this.building.compareAndSet(false, true)) { + this.object = doBuild(); + return this.object; } throw new AlreadyBuiltException("This object has already been built"); } @@ -51,10 +51,10 @@ public abstract class AbstractSecurityBuilder implements SecurityBuilder { * @return the Object that was built */ public final O getObject() { - if (!building.get()) { + if (!this.building.get()) { throw new IllegalStateException("This object has not been built"); } - return object; + return this.object; } /** diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthentication.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthentication.java index 95a693b7b1..87d62f76f5 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthentication.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthentication.java @@ -35,7 +35,7 @@ import org.springframework.security.config.annotation.web.servlet.configuration. * @Configuration * @EnableGlobalAuthentication * public class MyGlobalAuthenticationConfiguration { - * + * * @Autowired * public void configureGlobal(AuthenticationManagerBuilder auth) { * auth.inMemoryAuthentication().withUser("user").password("password").roles("USER") @@ -52,13 +52,13 @@ import org.springframework.security.config.annotation.web.servlet.configuration. * @Configuration * @EnableWebSecurity * public class MyWebSecurityConfiguration extends WebSecurityConfigurerAdapter { - * + * * @Autowired * public void configureGlobal(AuthenticationManagerBuilder auth) { * auth.inMemoryAuthentication().withUser("user").password("password").roles("USER") * .and().withUser("admin").password("password").roles("USER", "ADMIN"); * } - * + * * // Possibly overridden methods ... * } * @@ -66,9 +66,9 @@ import org.springframework.security.config.annotation.web.servlet.configuration. * The following annotations are annotated with {@link EnableGlobalAuthentication} * *
    - *
  • {@link EnableWebSecurity}
    • - *
  • {@link EnableWebMvcSecurity}
    • - *
  • {@link EnableGlobalMethodSecurity}
    • + *
  • {@link EnableWebSecurity}
    • + *
  • {@link EnableWebMvcSecurity}
    • + *
  • {@link EnableGlobalMethodSecurity}
    • *
* * Configuring {@link AuthenticationManagerBuilder} in a class without the diff --git a/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java b/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java index 218d4d6853..73d65d894c 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java @@ -20,6 +20,7 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.beans.factory.Aware; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; @@ -35,8 +36,8 @@ import org.springframework.util.Assert; * @author Rob Winch * @since 3.2 */ -final class AutowireBeanFactoryObjectPostProcessor implements - ObjectPostProcessor, DisposableBean { +final class AutowireBeanFactoryObjectPostProcessor + implements ObjectPostProcessor, DisposableBean { private final Log logger = LogFactory.getLog(getClass()); private final AutowireCapableBeanFactory autowireBeanFactory; private final List disposableBeans = new ArrayList(); @@ -49,7 +50,7 @@ final class AutowireBeanFactoryObjectPostProcessor implements /* * (non-Javadoc) - * + * * @see * org.springframework.security.config.annotation.web.Initializer#initialize(java. * lang.Object) @@ -61,32 +62,33 @@ final class AutowireBeanFactoryObjectPostProcessor implements } T result = null; try { - result = (T) autowireBeanFactory.initializeBean(object, object.toString()); + result = (T) this.autowireBeanFactory.initializeBean(object, + object.toString()); } catch (RuntimeException e) { Class type = object.getClass(); - throw new RuntimeException("Could not postProcess " + object + " of type " - + type, e); + throw new RuntimeException( + "Could not postProcess " + object + " of type " + type, e); } - autowireBeanFactory.autowireBean(object); + this.autowireBeanFactory.autowireBean(object); if (result instanceof DisposableBean) { - disposableBeans.add((DisposableBean) result); + this.disposableBeans.add((DisposableBean) result); } return result; } /* * (non-Javadoc) - * + * * @see org.springframework.beans.factory.DisposableBean#destroy() */ public void destroy() throws Exception { - for (DisposableBean disposable : disposableBeans) { + for (DisposableBean disposable : this.disposableBeans) { try { disposable.destroy(); } catch (Exception error) { - logger.error(error); + this.logger.error(error); } } } diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/Jsr250MetadataSourceConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/Jsr250MetadataSourceConfiguration.java index 4f1f5980cd..44db492a04 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/Jsr250MetadataSourceConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/Jsr250MetadataSourceConfiguration.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.security.config.annotation.method.configuration; import org.springframework.context.annotation.Bean; diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurity.java index f55e5575cd..baa0e3c7c3 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurity.java @@ -34,14 +34,14 @@ import org.springframework.security.config.annotation.web.WebSecurityConfigurer; * @Configuration * @EnableWebSecurity * public class MyWebSecurityConfiguration extends WebSecurityConfigurerAdapter { - * + * * @Override * public void configure(WebSecurity web) throws Exception { * web.ignoring() * // Spring Security should completely ignore URLs starting with /resources/ * .antMatchers("/resources/**"); * } - * + * * @Override * protected void configure(HttpSecurity http) throws Exception { * http.authorizeRequests().antMatchers("/public/**").permitAll().anyRequest() @@ -51,7 +51,7 @@ import org.springframework.security.config.annotation.web.WebSecurityConfigurer; * // set permitAll for all URLs associated with Form Login * .permitAll(); * } - * + * * @Override * protected void configure(AuthenticationManagerBuilder auth) { * auth @@ -59,7 +59,7 @@ import org.springframework.security.config.annotation.web.WebSecurityConfigurer; * .inMemoryAuthentication().withUser("user").password("password").roles("USER") * .and().withUser("admin").password("password").roles("USER", "ADMIN"); * } - * + * * // Possibly more overridden methods ... * } * diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.java index 22960557b3..1f053ee46b 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.java @@ -31,16 +31,17 @@ class SpringWebMvcImportSelector implements ImportSelector { /* * (non-Javadoc) - * - * @see - * org.springframework.context.annotation.ImportSelector#selectImports(org.springframework - * .core.type.AnnotationMetadata) + * + * @see org.springframework.context.annotation.ImportSelector#selectImports(org. + * springframework .core.type.AnnotationMetadata) */ public String[] selectImports(AnnotationMetadata importingClassMetadata) { boolean webmvcPresent = ClassUtils.isPresent( - "org.springframework.web.servlet.DispatcherServlet", getClass() - .getClassLoader()); - return webmvcPresent ? new String[] { "org.springframework.security.config.annotation.web.configuration.WebMvcSecurityConfiguration" } + "org.springframework.web.servlet.DispatcherServlet", + getClass().getClassLoader()); + return webmvcPresent + ? new String[] { + "org.springframework.security.config.annotation.web.configuration.WebMvcSecurityConfiguration" } : new String[] {}; } } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java index 5a76f9901e..2d68ac11e7 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java @@ -38,8 +38,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher; * The following Filters are populated * *
    - *
  • - * {@link UsernamePasswordAuthenticationFilter}
    • + *
  • {@link UsernamePasswordAuthenticationFilter}
    • *
* *

Shared Objects Created

@@ -47,7 +46,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher; * The following shared objects are populated * *
    - *
  • {@link AuthenticationEntryPoint}
    • + *
  • {@link AuthenticationEntryPoint}
    • *
* *

Shared Objects Used

@@ -56,7 +55,8 @@ import org.springframework.security.web.util.matcher.RequestMatcher; * *