浏览代码

SEC-842: Minor doc fixes

Luke Taylor 17 年之前
父节点
当前提交
6ae81d553b

+ 4 - 3
src/docbkx/namespace-config.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="namespace-config" xmlns:xlink="http://www.w3.org/1999/xlink">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="ns-config" xmlns:xlink="http://www.w3.org/1999/xlink">
   <info>
   <info>
     <title>Security Namespace Configuration</title>
     <title>Security Namespace Configuration</title>
   </info>
   </info>
@@ -151,7 +151,7 @@
     </section>
     </section>
     
     
     <section xml:id="ns-minimal">
     <section xml:id="ns-minimal">
-      <title>A Minimal <literal>&lt;http&gt;</literal>Configuration</title>
+      <title>A Minimal <literal>&lt;http&gt;</literal> Configuration</title>
       <para>
       <para>
  All you need to enable web security to begin with is
  All you need to enable web security to begin with is
         <programlisting><![CDATA[
         <programlisting><![CDATA[
@@ -196,7 +196,8 @@
         The configuration above defines two users, their passwords and their roles within the application (which will
         The configuration above defines two users, their passwords and their roles within the application (which will
         be used for access control). It is also possible to load user information from
         be used for access control). It is also possible to load user information from
         a standard properties file using the <literal>properties</literal> attribute on 
         a standard properties file using the <literal>properties</literal> attribute on 
-        <literal>user-service</literal>. See <link xlink:href="#in-memory-service"/> for more details. 
+        <literal>user-service</literal>. See the section on 
+        <link xlink:href="#in-memory-service">in-memory authentication</link> for more details. 
         Using the <literal>&lt;authentication-provider&gt;</literal>
         Using the <literal>&lt;authentication-provider&gt;</literal>
         element means that the user information will be used by the authentication
         element means that the user information will be used by the authentication
         manager to process authentication requests.        
         manager to process authentication requests.        

+ 3 - 2
src/docbkx/remember-me-authentication.xml

@@ -141,10 +141,11 @@
 <bean id="rememberMeProcessingFilter"
 <bean id="rememberMeProcessingFilter"
     class="org.springframework.security.ui.rememberme.RememberMeProcessingFilter">
     class="org.springframework.security.ui.rememberme.RememberMeProcessingFilter">
   <property name="rememberMeServices" ref="rememberMeServices"/>
   <property name="rememberMeServices" ref="rememberMeServices"/>
+  <property name="authenticationManager" ref="theAuthenticationManager" />    
 </bean>
 </bean>
         
         
 <bean id="rememberMeServices" class="org.springframework.security.ui.rememberme.TokenBasedRememberMeServices">
 <bean id="rememberMeServices" class="org.springframework.security.ui.rememberme.TokenBasedRememberMeServices">
-  <property name="userDetailsService" ref="jdbcDaoImpl"/>
+  <property name="userDetailsService" ref="myUserDetailsService"/>
   <property name="key" value="springRocks"/>
   <property name="key" value="springRocks"/>
 </bean>
 </bean>
         
         
@@ -161,7 +162,7 @@
                 <literal>AuthenticationManager.setProviders()</literal> list, and add
                 <literal>AuthenticationManager.setProviders()</literal> list, and add
                 <literal>RememberMeProcessingFilter</literal> into your
                 <literal>RememberMeProcessingFilter</literal> into your
                 <literal>FilterChainProxy</literal> (typically immediately after your
                 <literal>FilterChainProxy</literal> (typically immediately after your
-                <literal>AuthenticationProcessingFilter</literal>)</para>            
+                <literal>AuthenticationProcessingFilter</literal>).</para>           
         </section>
         </section>
         <section>
         <section>
             <title>PersistentTokenBasedRememberMeServices</title>
             <title>PersistentTokenBasedRememberMeServices</title>

+ 1 - 1
src/docbkx/springsecurity.xml

@@ -145,7 +145,7 @@
       <para>
       <para>
         With some exceptions, we will be discussing the full details of Spring Security
         With some exceptions, we will be discussing the full details of Spring Security
         bean configuration rather than the shorthand
         bean configuration rather than the shorthand
-        <link xlink:href="#namespace-config">namespace syntax</link>. You should review
+        <link xlink:href="#ns-config">namespace syntax</link>. You should review
         the introduction to using namespace configuration and the options it provides
         the introduction to using namespace configuration and the options it provides
         to see if they will meet your needs. As you come to use the framework more,
         to see if they will meet your needs. As you come to use the framework more,
         and need to customize the internal behaviour, you will probably want to understand
         and need to customize the internal behaviour, you will probably want to understand

+ 3 - 3
src/docbkx/supporting-infrastructure.xml

@@ -26,11 +26,11 @@
     instead are hard-coded in English within Spring Security's
     instead are hard-coded in English within Spring Security's
     code.</para>
     code.</para>
 
 
-    <para>Shipping in the <literal>acegi-security-xx.jar</literal> you
+    <para>Shipping in the <literal>spring-security-core-xx.jar</literal> you
     will find an <literal>org.springframework.security</literal> package
     will find an <literal>org.springframework.security</literal> package
     that in turn contains a <literal>messages.properties</literal> file.
     that in turn contains a <literal>messages.properties</literal> file.
     This should be referred to by your
     This should be referred to by your
-    <literal>ApplicationContext</literal>, as Acegi Security classes
+    <literal>ApplicationContext</literal>, as Spring Security classes
     implement Spring's <literal>MessageSourceAware</literal> interface and
     implement Spring's <literal>MessageSourceAware</literal> interface and
     expect the message resolver to be dependency injected at application
     expect the message resolver to be dependency injected at application
     context startup time. Usually all you need to do is register a bean
     context startup time. Usually all you need to do is register a bean
@@ -39,7 +39,7 @@
 
 
     <para><programlisting><![CDATA[
     <para><programlisting><![CDATA[
 <bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource">
 <bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource">
-  <property name="basename" value="org/acegisecurity/messages"/>
+  <property name="basename" value="org/springframework/security/messages"/>
 </bean>
 </bean>
 ]]></programlisting></para>
 ]]></programlisting></para>