瀏覽代碼

Fix typos (#228)

Johnny Lim 9 年之前
父節點
當前提交
fe94d654ed

+ 5 - 5
config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java

@@ -51,7 +51,7 @@ public class AuthenticationConfiguration {
 
 
 	private boolean authenticationManagerInitialized;
 	private boolean authenticationManagerInitialized;
 
 
-	private List<GlobalAuthenticationConfigurerAdapter> globalAuthConfigures = Collections
+	private List<GlobalAuthenticationConfigurerAdapter> globalAuthConfigurers = Collections
 			.emptyList();
 			.emptyList();
 
 
 	private ObjectPostProcessor<Object> objectPostProcessor;
 	private ObjectPostProcessor<Object> objectPostProcessor;
@@ -84,14 +84,14 @@ public class AuthenticationConfiguration {
 		}
 		}
 
 
 		AuthenticationManagerBuilder authBuilder = authenticationManagerBuilder(objectPostProcessor);
 		AuthenticationManagerBuilder authBuilder = authenticationManagerBuilder(objectPostProcessor);
-		for (GlobalAuthenticationConfigurerAdapter config : globalAuthConfigures) {
+		for (GlobalAuthenticationConfigurerAdapter config : globalAuthConfigurers) {
 			authBuilder.apply(config);
 			authBuilder.apply(config);
 		}
 		}
 
 
 		authenticationManager = authBuilder.build();
 		authenticationManager = authBuilder.build();
 
 
 		if (authenticationManager == null) {
 		if (authenticationManager == null) {
-			authenticationManager = getAuthenticationMangerBean();
+			authenticationManager = getAuthenticationManagerBean();
 		}
 		}
 
 
 		this.authenticationManagerInitialized = true;
 		this.authenticationManagerInitialized = true;
@@ -102,7 +102,7 @@ public class AuthenticationConfiguration {
 	public void setGlobalAuthenticationConfigurers(
 	public void setGlobalAuthenticationConfigurers(
 			List<GlobalAuthenticationConfigurerAdapter> configurers) throws Exception {
 			List<GlobalAuthenticationConfigurerAdapter> configurers) throws Exception {
 		Collections.sort(configurers, AnnotationAwareOrderComparator.INSTANCE);
 		Collections.sort(configurers, AnnotationAwareOrderComparator.INSTANCE);
-		this.globalAuthConfigures = configurers;
+		this.globalAuthConfigurers = configurers;
 	}
 	}
 
 
 	@Autowired
 	@Autowired
@@ -134,7 +134,7 @@ public class AuthenticationConfiguration {
 		return (T) proxyFactory.getObject();
 		return (T) proxyFactory.getObject();
 	}
 	}
 
 
-	private AuthenticationManager getAuthenticationMangerBean() {
+	private AuthenticationManager getAuthenticationManagerBean() {
 		return lazyBean(AuthenticationManager.class);
 		return lazyBean(AuthenticationManager.class);
 	}
 	}
 
 

+ 1 - 1
config/src/main/java/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.java

@@ -20,7 +20,7 @@ import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ClassUtils;
 
 
 /**
 /**
- * Used by {@link EnableWebSecurity} to conditionaly import
+ * Used by {@link EnableWebSecurity} to conditionally import
  * {@link WebMvcSecurityConfiguration} when the DispatcherServlet is present on the
  * {@link WebMvcSecurityConfiguration} when the DispatcherServlet is present on the
  * classpath.
  * classpath.
  *
  *

+ 1 - 1
config/src/main/resources/org/springframework/security/config/spring-security-3.0.3.xsd

@@ -1203,7 +1203,7 @@
     </xs:attribute>
     </xs:attribute>
     <xs:attribute name="erase-credentials" type="security:boolean">
     <xs:attribute name="erase-credentials" type="security:boolean">
       <xs:annotation>
       <xs:annotation>
-        <xs:documentation>If set to true, the AuthenticationManger will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated. Defaults to false.</xs:documentation>
+        <xs:documentation>If set to true, the AuthenticationManager will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated. Defaults to false.</xs:documentation>
       </xs:annotation>
       </xs:annotation>
     </xs:attribute>
     </xs:attribute>
   </xs:attributeGroup>
   </xs:attributeGroup>

+ 1 - 1
config/src/main/resources/org/springframework/security/config/spring-security-3.1.rnc

@@ -657,7 +657,7 @@ authman.attlist &=
     ## An alias you wish to use for the AuthenticationManager bean (not required it you are using a specific id)
     ## An alias you wish to use for the AuthenticationManager bean (not required it you are using a specific id)
     attribute alias {xsd:token}?
     attribute alias {xsd:token}?
 authman.attlist &=
 authman.attlist &=
-    ## If set to true, the AuthenticationManger will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated.
+    ## If set to true, the AuthenticationManager will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated.
     attribute erase-credentials {xsd:boolean}?
     attribute erase-credentials {xsd:boolean}?
 
 
 authentication-provider =
 authentication-provider =

+ 1 - 1
config/src/main/resources/org/springframework/security/config/spring-security-3.1.xsd

@@ -2067,7 +2067,7 @@
       </xs:attribute>
       </xs:attribute>
       <xs:attribute name="erase-credentials" type="xs:boolean">
       <xs:attribute name="erase-credentials" type="xs:boolean">
          <xs:annotation>
          <xs:annotation>
-            <xs:documentation>If set to true, the AuthenticationManger will attempt to clear any credentials data in the
+            <xs:documentation>If set to true, the AuthenticationManager will attempt to clear any credentials data in the
                 returned Authentication object, once the user has been authenticated.
                 returned Authentication object, once the user has been authenticated.
                 </xs:documentation>
                 </xs:documentation>
          </xs:annotation>
          </xs:annotation>

+ 1 - 1
config/src/main/resources/org/springframework/security/config/spring-security-3.2.rnc

@@ -659,7 +659,7 @@ authman.attlist &=
     ## An alias you wish to use for the AuthenticationManager bean (not required it you are using a specific id)
     ## An alias you wish to use for the AuthenticationManager bean (not required it you are using a specific id)
     attribute alias {xsd:token}?
     attribute alias {xsd:token}?
 authman.attlist &=
 authman.attlist &=
-    ## If set to true, the AuthenticationManger will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated.
+    ## If set to true, the AuthenticationManager will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated.
     attribute erase-credentials {xsd:boolean}?
     attribute erase-credentials {xsd:boolean}?
 
 
 authentication-provider =
 authentication-provider =

+ 1 - 1
config/src/main/resources/org/springframework/security/config/spring-security-3.2.xsd

@@ -2083,7 +2083,7 @@
       </xs:attribute>
       </xs:attribute>
       <xs:attribute name="erase-credentials" type="xs:boolean">
       <xs:attribute name="erase-credentials" type="xs:boolean">
          <xs:annotation>
          <xs:annotation>
-            <xs:documentation>If set to true, the AuthenticationManger will attempt to clear any credentials data in the
+            <xs:documentation>If set to true, the AuthenticationManager will attempt to clear any credentials data in the
                 returned Authentication object, once the user has been authenticated.
                 returned Authentication object, once the user has been authenticated.
                 </xs:documentation>
                 </xs:documentation>
          </xs:annotation>
          </xs:annotation>

+ 1 - 1
config/src/main/resources/org/springframework/security/config/spring-security-4.0.rnc

@@ -668,7 +668,7 @@ authman.attlist &=
 	## An alias you wish to use for the AuthenticationManager bean (not required it you are using a specific id)
 	## An alias you wish to use for the AuthenticationManager bean (not required it you are using a specific id)
 	attribute alias {xsd:token}?
 	attribute alias {xsd:token}?
 authman.attlist &=
 authman.attlist &=
-	## If set to true, the AuthenticationManger will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated.
+	## If set to true, the AuthenticationManager will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated.
 	attribute erase-credentials {xsd:boolean}?
 	attribute erase-credentials {xsd:boolean}?
 
 
 authentication-provider =
 authentication-provider =

+ 1 - 1
config/src/main/resources/org/springframework/security/config/spring-security-4.0.xsd

@@ -2114,7 +2114,7 @@
       </xs:attribute>
       </xs:attribute>
       <xs:attribute name="erase-credentials" type="xs:boolean">
       <xs:attribute name="erase-credentials" type="xs:boolean">
          <xs:annotation>
          <xs:annotation>
-            <xs:documentation>If set to true, the AuthenticationManger will attempt to clear any credentials data in the
+            <xs:documentation>If set to true, the AuthenticationManager will attempt to clear any credentials data in the
                 returned Authentication object, once the user has been authenticated.
                 returned Authentication object, once the user has been authenticated.
                 </xs:documentation>
                 </xs:documentation>
          </xs:annotation>
          </xs:annotation>

+ 1 - 1
docs/manual/src/docs/asciidoc/index.adoc

@@ -8514,7 +8514,7 @@ This attribute allows you to define an alias name for the internal instance for
 
 
 [[nsa-authentication-manager-erase-credentials]]
 [[nsa-authentication-manager-erase-credentials]]
 * **erase-credentials**
 * **erase-credentials**
-If set to true, the AuthenticationManger will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated. Literally it maps to the `eraseCredentialsAfterAuthentication` property of the `ProviderManager`. This is discussed in the <<core-services-erasing-credentials,Core Services>> chapter.
+If set to true, the AuthenticationManager will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated. Literally it maps to the `eraseCredentialsAfterAuthentication` property of the `ProviderManager`. This is discussed in the <<core-services-erasing-credentials,Core Services>> chapter.
 
 
 
 
 [[nsa-authentication-manager-id]]
 [[nsa-authentication-manager-id]]

+ 2 - 2
web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java

@@ -91,7 +91,7 @@ public class DefaultWebInvocationPrivilegeEvaluatorTests {
 	}
 	}
 
 
 	@Test
 	@Test
-	public void allowsAccessIfAccessDecisionMangerDoes() throws Exception {
+	public void allowsAccessIfAccessDecisionManagerDoes() throws Exception {
 		Authentication token = new TestingAuthenticationToken("test", "Password",
 		Authentication token = new TestingAuthenticationToken("test", "Password",
 				"MOCK_INDEX");
 				"MOCK_INDEX");
 		DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(
 		DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(
@@ -101,7 +101,7 @@ public class DefaultWebInvocationPrivilegeEvaluatorTests {
 
 
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	@Test
 	@Test
-	public void deniesAccessIfAccessDecisionMangerDoes() throws Exception {
+	public void deniesAccessIfAccessDecisionManagerDoes() throws Exception {
 		Authentication token = new TestingAuthenticationToken("test", "Password",
 		Authentication token = new TestingAuthenticationToken("test", "Password",
 				"MOCK_INDEX");
 				"MOCK_INDEX");
 		DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(
 		DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(