Permalink
Browse files

HttpConfiguration->HttpSecurity

  • Loading branch information...
rwinch committed Jun 27, 2013
1 parent aac67d0 commit 91a670a47dcc5e6f8ff68862d0f7cc667de082e8
Showing with 405 additions and 405 deletions.
  1. +3 −3 samples-web.md
  2. +2 −2 samples/concurrency/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
  3. +2 −2 samples/inmemory/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
  4. +2 −2 samples/jdbc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
  5. +2 −2 samples/ldap/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
  6. +2 −2 .../src/main/java/org/springframework/security/oauth/examples/sparklr/config/OAuth2ServerConfig.java
  7. +2 −2 ...c/main/java/org/springframework/security/oauth/examples/sparklr/config/SecurityConfiguration.java
  8. +2 −2 .../oauth2-tonr/src/main/java/org/springframework/security/oauth/examples/config/SecurityConfig.java
  9. +2 −2 samples/openid/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
  10. +2 −2 samples/preauth/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
  11. +2 −2 samples/rememberme/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
  12. +2 −2 samples/social/src/main/java/org/springframework/social/showcase/config/SecurityConfig.java
  13. +2 −2 samples/x509/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
  14. +6 −6 ...rity-javaconfig/src/main/java/org/springframework/security/config/annotation/web/HttpBuilder.java
  15. +82 −82 ...ingframework/security/config/annotation/web/builders/{HttpConfiguration.java → HttpSecurity.java}
  16. +1 −1 ...main/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurity.java
  17. +13 −13 ...rg/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java
  18. +2 −2 ...n/java/org/springframework/security/config/annotation/web/configurers/AbstractHttpConfigurer.java
  19. +1 −1 ...rg/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java
  20. +4 −4 ...main/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurer.java
  21. +2 −2 ...ava/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java
  22. +6 −6 ...a/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurer.java
  23. +4 −4 ...ingframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java
  24. +3 −3 ...main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java
  25. +3 −3 ...main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java
  26. +6 −6 ...g/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java
  27. +3 −3 ...rc/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java
  28. +1 −1 ...rc/main/java/org/springframework/security/config/annotation/web/configurers/PermitAllSupport.java
  29. +2 −2 ...ain/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurer.java
  30. +11 −11 ...ain/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurer.java
  31. +2 −2 ...n/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurer.java
  32. +3 −3 ...ava/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurer.java
  33. +2 −2 ...ain/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurer.java
  34. +2 −2 ...a/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java
  35. +1 −1 ...va/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java
  36. +3 −3 .../src/main/java/org/springframework/security/config/annotation/web/configurers/X509Configurer.java
  37. +7 −7 .../org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java
  38. +2 −2 ...g/springframework/security/config/annotation/authentication/PasswordEncoderConfigurerConfigs.java
  39. +1 −1 ...g/springframework/security/config/annotation/authentication/PasswordEncoderConfigurerTests.groovy
  40. +2 −2 ...config/src/test/groovy/org/springframework/security/config/annotation/issue50/SecurityConfig.java
  41. +4 −4 ...org/springframework/security/config/annotation/web/SampleWebSecurityConfigurerAdapterTests.groovy
  42. +2 −2 .../org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterTestsConfigs.java
  43. +5 −5 .../groovy/org/springframework/security/config/annotation/web/builders/HttpConfigurationTests.groovy
  44. +24 −24 ...test/groovy/org/springframework/security/config/annotation/web/builders/NamespaceHttpTests.groovy
  45. +3 −3 ...vy/org/springframework/security/config/annotation/web/configuration/EnableWebSecurityTests.groovy
  46. +7 −7 ...springframework/security/config/annotation/web/configuration/WebSecurityConfigurationTests.groovy
  47. +2 −2 ...rk/security/config/annotation/web/configurers/AbstractRequestMatcherMappingConfigurerTests.groovy
  48. +2 −2 .../springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurerTests.groovy
  49. +4 −4 .../groovy/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.groovy
  50. +9 −9 ...springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurerTests.groovy
  51. +2 −2 ...pringframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurerTests.groovy
  52. +14 −14 ...pringframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationsTests.groovy
  53. +6 −6 ...vy/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurerTests.groovy
  54. +2 −2 ...vy/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurerTests.groovy
  55. +4 −4 ...rc/test/groovy/org/springframework/security/config/annotation/web/configurers/Issue55Tests.groovy
  56. +2 −2 ...t/groovy/org/springframework/security/config/annotation/web/configurers/JeeConfigurerTests.groovy
  57. +2 −2 ...roovy/org/springframework/security/config/annotation/web/configurers/LogoutConfigurerTests.groovy
  58. +3 −3 ...framework/security/config/annotation/web/configurers/NamespaceHttpAccessDeniedHandlerTests.groovy
  59. +6 −6 ...org/springframework/security/config/annotation/web/configurers/NamespaceHttpAnonymousTests.groovy
  60. +5 −5 ...ovy/org/springframework/security/config/annotation/web/configurers/NamespaceHttpBasicTests.groovy
  61. +6 −6 .../springframework/security/config/annotation/web/configurers/NamespaceHttpCustomFilterTests.groovy
  62. +2 −2 ...ngframework/security/config/annotation/web/configurers/NamespaceHttpExpressionHandlerTests.groovy
  63. +3 −3 .../org/springframework/security/config/annotation/web/configurers/NamespaceHttpFirewallTests.groovy
  64. +4 −4 ...org/springframework/security/config/annotation/web/configurers/NamespaceHttpFormLoginTests.groovy
  65. +2 −2 .../springframework/security/config/annotation/web/configurers/NamespaceHttpInterceptUrlTests.groovy
  66. +3 −3 ...roovy/org/springframework/security/config/annotation/web/configurers/NamespaceHttpJeeTests.groovy
  67. +4 −4 ...vy/org/springframework/security/config/annotation/web/configurers/NamespaceHttpLogoutTests.groovy
  68. +5 −5 ...g/springframework/security/config/annotation/web/configurers/NamespaceHttpOpenIDLoginTests.groovy
  69. +2 −2 .../springframework/security/config/annotation/web/configurers/NamespaceHttpPortMappingsTests.groovy
  70. +3 −3 .../springframework/security/config/annotation/web/configurers/NamespaceHttpRequestCacheTests.groovy
  71. +6 −6 ...oovy/org/springframework/security/config/annotation/web/configurers/NamespaceHttpX509Tests.groovy
  72. +12 −12 ...vy/org/springframework/security/config/annotation/web/configurers/NamespaceRememberMeTests.groovy
  73. +7 −7 ...springframework/security/config/annotation/web/configurers/NamespaceSessionManagementTests.groovy
  74. +3 −3 ...roovy/org/springframework/security/config/annotation/web/configurers/PermitAllSupportTests.groovy
  75. +3 −3 ...y/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.groovy
  76. +2 −2 ...org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurerTests.groovy
  77. +2 −2 .../springframework/security/config/annotation/web/configurers/SecurityContextConfigurerTests.groovy
  78. +2 −2 ...y/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurerTests.groovy
  79. +4 −4 ...pringframework/security/config/annotation/web/configurers/SessionManagementConfigurerTests.groovy
  80. +3 −3 ...oovy/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationsTests.groovy
  81. +2 −2 .../groovy/org/springframework/security/config/annotation/web/configurers/X509ConfigurerTests.groovy
  82. +2 −2 ...ringframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurerTests.groovy
  83. +11 −11 ...org/springframework/security/oauth2/config/annotation/web/configurers/OAuth2ServerConfigurer.java
  84. +2 −2 ...ecurity/oauth2/config/annotation/web/configuration/OAuth2ServerConfigurerAdapterTestsConfigs.java
View
@@ -23,7 +23,7 @@ The following configuration
}
@Override
- protected void configure(HttpConfiguration http) throws Exception {
+ protected void configure(HttpSecurity http) throws Exception {
http
.authorizeUrls()
.antMatchers("/signup","/about").permitAll()
@@ -104,7 +104,7 @@ The following configuration
@Configuration
@Order(1)
public static class ApiWebSecurityConfigurationAdapter extends WebSecurityConfigurerAdapter {
- protected void configure(HttpConfiguration http) throws Exception {
+ protected void configure(HttpSecurity http) throws Exception {
http
.antMatcher("/api/**")
.authorizeUrls()
@@ -125,7 +125,7 @@ The following configuration
}
@Override
- protected void configure(HttpConfiguration http) throws Exception {
+ protected void configure(HttpSecurity http) throws Exception {
http
.authorizeUrls()
.antMatchers("/signup","/about").permitAll()
@@ -5,7 +5,7 @@
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpConfiguration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.WebSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -39,7 +39,7 @@ public AuthenticationManager authenticationManagerBean()
@Override
protected void configure(
- HttpConfiguration http) throws Exception {
+ HttpSecurity http) throws Exception {
http
.authorizeUrls()
.antMatchers("/users**","/sessions/**").hasRole("ADMIN")
@@ -5,7 +5,7 @@
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpConfiguration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.WebSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -39,7 +39,7 @@ public AuthenticationManager authenticationManagerBean()
}
@Override
- protected void configure(HttpConfiguration http) throws Exception {
+ protected void configure(HttpSecurity http) throws Exception {
http
.authorizeUrls()
.antMatchers("/users**","/sessions/**").hasRole("ADMIN")
@@ -6,7 +6,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpConfiguration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.WebSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -35,7 +35,7 @@ protected void registerAuthentication(AuthenticationManagerBuilder auth) throws
}
@Override
- protected void configure(HttpConfiguration http) throws Exception {
+ protected void configure(HttpSecurity http) throws Exception {
http
.authorizeUrls()
.antMatchers("/users**","/sessions/**").hasRole("ADMIN")
@@ -2,7 +2,7 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpConfiguration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.WebSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -28,7 +28,7 @@ protected void registerAuthentication(
}
@Override
- protected void configure(HttpConfiguration http) throws Exception {
+ protected void configure(HttpSecurity http) throws Exception {
http
.authorizeUrls()
.antMatchers("/users**","/sessions/**").hasRole("ADMIN")
@@ -21,7 +21,7 @@
import org.springframework.core.annotation.Order;
import org.springframework.http.HttpMethod;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpConfiguration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.WebSecurity;
import org.springframework.security.oauth.examples.sparklr.oauth.SparklrUserApprovalHandler;
import org.springframework.security.oauth2.config.annotation.authentication.configurers.InMemoryClientDetailsServiceConfigurer;
@@ -66,7 +66,7 @@ public void configure(WebSecurity web) throws Exception {
}
@Override
- protected void configure(HttpConfiguration http) throws Exception {
+ protected void configure(HttpSecurity http) throws Exception {
http
.authorizeUrls()
.antMatchers("/oauth/token").fullyAuthenticated()
@@ -5,7 +5,7 @@
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.BeanIds;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpConfiguration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -28,7 +28,7 @@ protected AuthenticationManager authenticationManager() throws Exception {
}
@Override
- protected void configure(HttpConfiguration http) throws Exception {
+ protected void configure(HttpSecurity http) throws Exception {
http
.authorizeUrls()
.antMatchers("/oauth/**").hasRole("USER")
@@ -3,7 +3,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpConfiguration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.WebSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -33,7 +33,7 @@ public void configure(WebSecurity web) throws Exception {
}
@Override
- protected void configure(HttpConfiguration http) throws Exception {
+ protected void configure(HttpSecurity http) throws Exception {
http
.authorizeUrls()
.antMatchers("/sparklr/**","/facebook/**").hasRole("USER")
@@ -1,7 +1,7 @@
package org.springframework.security.samples.config;
import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpConfiguration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.WebSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -19,7 +19,7 @@ public void configure(WebSecurity web) throws Exception {
}
@Override
- protected void configure(HttpConfiguration http) throws Exception {
+ protected void configure(HttpSecurity http) throws Exception {
http
.authorizeUrls()
.antMatchers("/users**","/sessions/**").hasRole("ADMIN")
@@ -1,7 +1,7 @@
package org.springframework.security.samples.config;
import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpConfiguration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.WebSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -18,7 +18,7 @@ public void configure(WebSecurity web) throws Exception {
}
@Override
- protected void configure(HttpConfiguration http) throws Exception {
+ protected void configure(HttpSecurity http) throws Exception {
http
.authorizeUrls()
.antMatchers("/login").permitAll()
@@ -5,7 +5,7 @@
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpConfiguration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.WebSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -38,7 +38,7 @@ public AuthenticationManager authenticationManagerBean()
}
@Override
- protected void configure(HttpConfiguration http) throws Exception {
+ protected void configure(HttpSecurity http) throws Exception {
http
.authorizeUrls()
.antMatchers("/users**","/sessions/**").hasRole("ADMIN")
@@ -23,7 +23,7 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpConfiguration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.WebSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -87,7 +87,7 @@ public UserDetailsService userDetailsServiceBean() throws Exception {
}
@Override
- protected void configure(HttpConfiguration http) throws Exception {
+ protected void configure(HttpSecurity http) throws Exception {
http
.authorizeUrls()
.antMatchers("/favicon.ico","/resources/**","/auth/**","/signup/**","/disconnect/facebook").permitAll()
@@ -2,7 +2,7 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpConfiguration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.WebSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -29,7 +29,7 @@ protected void registerAuthentication(AuthenticationManagerBuilder auth)
}
@Override
- protected void configure(HttpConfiguration http) throws Exception {
+ protected void configure(HttpSecurity http) throws Exception {
http
.authorizeUrls()
.antMatchers("/login").permitAll()
@@ -21,7 +21,7 @@
import org.springframework.security.authentication.AuthenticationProvider;
import org.springframework.security.config.annotation.SecurityBuilder;
import org.springframework.security.config.annotation.SecurityConfigurer;
-import org.springframework.security.config.annotation.web.builders.HttpConfiguration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.openid.OpenIDAuthenticationFilter;
import org.springframework.security.web.DefaultSecurityFilterChain;
@@ -92,7 +92,7 @@
* Allows adding an additional {@link AuthenticationProvider} to be used
*
* @param authenticationProvider the {@link AuthenticationProvider} to be added
- * @return the {@link HttpConfiguration} for further customizations
+ * @return the {@link HttpSecurity} for further customizations
*/
H authenticationProvider(
AuthenticationProvider authenticationProvider);
@@ -101,7 +101,7 @@ H authenticationProvider(
* Allows adding an additional {@link UserDetailsService} to be used
*
* @param userDetailsService the {@link UserDetailsService} to be added
- * @return the {@link HttpConfiguration} for further customizations
+ * @return the {@link HttpSecurity} for further customizations
*/
H userDetailsService(
UserDetailsService userDetailsService) throws Exception;
@@ -115,7 +115,7 @@ H userDetailsService(
*
* @param filter the {@link Filter} to register before the type {@code afterFilter}
* @param afterFilter the Class of the known {@link Filter}.
- * @return the {@link HttpConfiguration} for further customizations
+ * @return the {@link HttpSecurity} for further customizations
*/
H addFilterAfter(Filter filter,
Class<? extends Filter> afterFilter);
@@ -129,7 +129,7 @@ H addFilterAfter(Filter filter,
*
* @param filter the {@link Filter} to register before the type {@code beforeFilter}
* @param beforeFilter the Class of the known {@link Filter}.
- * @return the {@link HttpConfiguration} for further customizations
+ * @return the {@link HttpSecurity} for further customizations
*/
H addFilterBefore(Filter filter,
Class<? extends Filter> beforeFilter);
@@ -168,7 +168,7 @@ H addFilterBefore(Filter filter,
* </ul>
*
* @param filter the {@link Filter} to add
- * @return the {@link HttpConfiguration} for further customizations
+ * @return the {@link HttpSecurity} for further customizations
*/
H addFilter(Filter filter);
Oops, something went wrong.

0 comments on commit 91a670a

Please sign in to comment.