From d7ed005cacd7d84ad0d95b82fb9a6237485bf470 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Tue, 6 Nov 2012 11:38:21 +0000
Subject: [PATCH] SWS-805

---
 ...rityPasswordValidationCallbackHandler.java |  2 +-
 src/docbkx/security.xml                       | 38 ++-----------------
 2 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringSecurityPasswordValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringSecurityPasswordValidationCallbackHandler.java
index c81f0608..2d39c64b 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringSecurityPasswordValidationCallbackHandler.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringSecurityPasswordValidationCallbackHandler.java
@@ -42,7 +42,7 @@ import org.apache.ws.security.WSUsernameTokenPrincipal;
  * password contained in this details object is then compared with the digest in the message.
  *
  * @author Arjen Poutsma
- * @since 1.5.0
+ * @since 2.1
  */
 public class SpringSecurityPasswordValidationCallbackHandler extends AbstractWsPasswordCallbackHandler
         implements InitializingBean {
diff --git a/src/docbkx/security.xml b/src/docbkx/security.xml
index 68bb7c29..69989471 100644
--- a/src/docbkx/security.xml
+++ b/src/docbkx/security.xml
@@ -1352,43 +1352,13 @@
 </bean>]]></programlisting>
                 </section>
                 <section>
-                    <title>SpringPlainTextPasswordValidationCallbackHandler</title>
+                    <title>SpringSecurityPasswordValidationCallbackHandler</title>
                     <para>
-                        The <classname>SpringPlainTextPasswordValidationCallbackHandler</classname> requires an Spring
-                        Security <interfacename>AuthenticationManager</interfacename> to operate. It uses this manager
-                        to authenticate against a
-                        <classname>UsernamePasswordAuthenticationToken</classname>
-                        that it creates. If authentication is successful, the token is stored in the
-                        <classname>SecurityContextHolder</classname>. You can set the
-                        authentication manager using the <property>authenticationManager</property>
-                        property:
-                    </para>
-                    <programlisting><![CDATA[<beans>
-  <bean id="springSecurityHandler"
-      class="org.springframework.ws.soap.security.wss4j.callback.SpringPlainTextPasswordValidationCallbackHandler">
-    <property name="authenticationManager" ref="authenticationManager"/>
-  </bean>
-
-  <bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
-      <property name="providers">
-          <bean class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
-              <property name="userDetailsService" ref="userDetailsService"/>
-          </bean>
-      </property>
-  </bean>
-
-  <bean id="userDetailsService" class="com.mycompany.app.dao.UserDetailService" />
-  ...
-</beans>]]></programlisting>
-                </section>
-                <section>
-                    <title>SpringDigestPasswordValidationCallbackHandler</title>
-                    <para>
-                        The <classname>SpringDigestPasswordValidationCallbackHandler</classname>
-                        requires an Spring Security
+                        The <classname>SpringSecurityPasswordValidationCallbackHandler</classname> validates plain text
+                        and digest passwords using a Spring Security
                         <classname>UserDetailService</classname>
                         to operate. It uses this service to retrieve the
-                        password of the user specified in the token. The digest of the password contained in this
+                        (digest of ) the password of the user specified in the token. The (digest of) the password contained in this
                         details object is then compared with the digest in the message. If they are equal, the user has
                         successfully authenticated, and a
                         <classname>UsernamePasswordAuthenticationToken</classname>