Modified: 
webservices/wss4j/site/xref/org/apache/ws/security/processor/SecurityContextTokenProcessor.html
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/processor/SecurityContextTokenProcessor.html?rev=1178426&r1=1178425&r2=1178426&view=diff
==============================================================================
--- 
webservices/wss4j/site/xref/org/apache/ws/security/processor/SecurityContextTokenProcessor.html
 (original)
+++ 
webservices/wss4j/site/xref/org/apache/ws/security/processor/SecurityContextTokenProcessor.html
 Mon Oct  3 15:15:52 2011
@@ -36,80 +36,98 @@
 <a name="26" href="#26">26</a>  <strong class="jxr_keyword">import</strong> 
org.apache.ws.security.WSSecurityException;
 <a name="27" href="#27">27</a>  <strong class="jxr_keyword">import</strong> 
org.apache.ws.security.handler.RequestData;
 <a name="28" href="#28">28</a>  <strong class="jxr_keyword">import</strong> 
org.apache.ws.security.message.token.SecurityContextToken;
-<a name="29" href="#29">29</a>  <strong class="jxr_keyword">import</strong> 
org.w3c.dom.Element;
-<a name="30" href="#30">30</a>  
-<a name="31" href="#31">31</a>  <strong class="jxr_keyword">import</strong> 
javax.security.auth.callback.Callback;
-<a name="32" href="#32">32</a>  <strong class="jxr_keyword">import</strong> 
javax.security.auth.callback.CallbackHandler;
-<a name="33" href="#33">33</a>  <strong class="jxr_keyword">import</strong> 
javax.security.auth.callback.UnsupportedCallbackException;
-<a name="34" href="#34">34</a>  
-<a name="35" href="#35">35</a>  <strong class="jxr_keyword">import</strong> 
java.util.List;
-<a name="36" href="#36">36</a>  <strong class="jxr_keyword">import</strong> 
java.io.IOException;
+<a name="29" href="#29">29</a>  <strong class="jxr_keyword">import</strong> 
org.apache.ws.security.validate.Credential;
+<a name="30" href="#30">30</a>  <strong class="jxr_keyword">import</strong> 
org.apache.ws.security.validate.Validator;
+<a name="31" href="#31">31</a>  <strong class="jxr_keyword">import</strong> 
org.w3c.dom.Element;
+<a name="32" href="#32">32</a>  
+<a name="33" href="#33">33</a>  <strong class="jxr_keyword">import</strong> 
javax.security.auth.callback.Callback;
+<a name="34" href="#34">34</a>  <strong class="jxr_keyword">import</strong> 
javax.security.auth.callback.CallbackHandler;
+<a name="35" href="#35">35</a>  <strong class="jxr_keyword">import</strong> 
javax.security.auth.callback.UnsupportedCallbackException;
+<a name="36" href="#36">36</a>  <strong class="jxr_keyword">import</strong> 
javax.xml.namespace.QName;
 <a name="37" href="#37">37</a>  
-<a name="38" href="#38">38</a>  <em class="jxr_javadoccomment">/**</em>
-<a name="39" href="#39">39</a>  <em class="jxr_javadoccomment"> * The 
processor to process &lt;code&gt;wsc:SecurityContextToken&lt;/code&gt;.</em>
-<a name="40" href="#40">40</a>  <em class="jxr_javadoccomment"> * </em>
-<a name="41" href="#41">41</a>  <em class="jxr_javadoccomment"> * @author 
Ruchith Fernando ([email protected])</em>
-<a name="42" href="#42">42</a>  <em class="jxr_javadoccomment"> */</em>
-<a name="43" href="#43">43</a>  <strong class="jxr_keyword">public</strong> 
<strong class="jxr_keyword">class</strong> <a 
href="../../../../../org/apache/ws/security/processor/SecurityContextTokenProcessor.html">SecurityContextTokenProcessor</a>
 implements <a 
href="../../../../../org/apache/ws/security/processor/Processor.html">Processor</a>
 {
-<a name="44" href="#44">44</a>      
-<a name="45" href="#45">45</a>      <strong 
class="jxr_keyword">public</strong> List&lt;WSSecurityEngineResult&gt; 
handleToken(
-<a name="46" href="#46">46</a>          Element elem, 
-<a name="47" href="#47">47</a>          <a 
href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a>
 data,
-<a name="48" href="#48">48</a>          <a 
href="../../../../../org/apache/ws/security/WSDocInfo.html">WSDocInfo</a> 
wsDocInfo 
-<a name="49" href="#49">49</a>      ) <strong 
class="jxr_keyword">throws</strong> <a 
href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>
 {
-<a name="50" href="#50">50</a>          <a 
href="../../../../../org/apache/ws/security/message/token/SecurityContextToken.html">SecurityContextToken</a>
 sct = <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/message/token/SecurityContextToken.html">SecurityContextToken</a>(elem);
-<a name="51" href="#51">51</a>          byte[] secret = 
getSecret(data.getCallbackHandler(), sct);
-<a name="52" href="#52">52</a>          
-<a name="53" href="#53">53</a>          <a 
href="../../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a>
 result =
-<a name="54" href="#54">54</a>              <strong 
class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a>(WSConstants.SCT,
 sct);
-<a name="55" href="#55">55</a>          wsDocInfo.addTokenElement(elem);
-<a name="56" href="#56">56</a>          
result.put(WSSecurityEngineResult.TAG_ID, sct.getID());
-<a name="57" href="#57">57</a>          
result.put(WSSecurityEngineResult.TAG_SECRET, secret);
-<a name="58" href="#58">58</a>          wsDocInfo.addResult(result);
-<a name="59" href="#59">59</a>          <strong 
class="jxr_keyword">return</strong> java.util.Collections.singletonList(result);
-<a name="60" href="#60">60</a>      }
-<a name="61" href="#61">61</a>  
-<a name="62" href="#62">62</a>      <em class="jxr_javadoccomment">/**</em>
-<a name="63" href="#63">63</a>  <em class="jxr_javadoccomment">     * Get the 
secret from the provided callback handler and return it.</em>
-<a name="64" href="#64">64</a>  <em class="jxr_javadoccomment">     * </em>
-<a name="65" href="#65">65</a>  <em class="jxr_javadoccomment">     * @param 
cb</em>
-<a name="66" href="#66">66</a>  <em class="jxr_javadoccomment">     * @param 
sct</em>
-<a name="67" href="#67">67</a>  <em class="jxr_javadoccomment">     * @return 
The key collected using the callback handler</em>
-<a name="68" href="#68">68</a>  <em class="jxr_javadoccomment">     */</em>
-<a name="69" href="#69">69</a>      <strong 
class="jxr_keyword">private</strong> byte[] getSecret(CallbackHandler cb, <a 
href="../../../../../org/apache/ws/security/message/token/SecurityContextToken.html">SecurityContextToken</a>
 sct)
-<a name="70" href="#70">70</a>          <strong 
class="jxr_keyword">throws</strong> <a 
href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>
 {
-<a name="71" href="#71">71</a>  
-<a name="72" href="#72">72</a>          <strong 
class="jxr_keyword">if</strong> (cb == <strong 
class="jxr_keyword">null</strong>) {
-<a name="73" href="#73">73</a>              <strong 
class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE,
 <span class="jxr_string">"noCallback"</span>);
-<a name="74" href="#74">74</a>          }
-<a name="75" href="#75">75</a>  
-<a name="76" href="#76">76</a>          <a 
href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a>
 callback = 
-<a name="77" href="#77">77</a>              <strong 
class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a>(
-<a name="78" href="#78">78</a>                  sct.getIdentifier(), 
WSPasswordCallback.SECURITY_CONTEXT_TOKEN
-<a name="79" href="#79">79</a>              );
-<a name="80" href="#80">80</a>          <strong 
class="jxr_keyword">try</strong> {
-<a name="81" href="#81">81</a>              Callback[] callbacks = <strong 
class="jxr_keyword">new</strong> Callback[]{callback};
-<a name="82" href="#82">82</a>              cb.handle(callbacks);
-<a name="83" href="#83">83</a>          } <strong 
class="jxr_keyword">catch</strong> (IOException e) {
-<a name="84" href="#84">84</a>              <strong 
class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
-<a name="85" href="#85">85</a>                  WSSecurityException.FAILURE, 
-<a name="86" href="#86">86</a>                  <span 
class="jxr_string">"noKey"</span>,
-<a name="87" href="#87">87</a>                  <strong 
class="jxr_keyword">new</strong> Object[] {sct.getIdentifier()}, 
-<a name="88" href="#88">88</a>                  e
-<a name="89" href="#89">89</a>              );
-<a name="90" href="#90">90</a>          } <strong 
class="jxr_keyword">catch</strong> (UnsupportedCallbackException e) {
-<a name="91" href="#91">91</a>              <strong 
class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
-<a name="92" href="#92">92</a>                  WSSecurityException.FAILURE, 
-<a name="93" href="#93">93</a>                  <span 
class="jxr_string">"noKey"</span>,
-<a name="94" href="#94">94</a>                  <strong 
class="jxr_keyword">new</strong> Object[] {sct.getIdentifier()}, 
-<a name="95" href="#95">95</a>                  e
-<a name="96" href="#96">96</a>              );
-<a name="97" href="#97">97</a>          }
-<a name="98" href="#98">98</a>  
-<a name="99" href="#99">99</a>          <strong 
class="jxr_keyword">return</strong> callback.getKey();
-<a name="100" href="#100">100</a>     }
-<a name="101" href="#101">101</a> 
-<a name="102" href="#102">102</a> }
+<a name="38" href="#38">38</a>  <strong class="jxr_keyword">import</strong> 
java.util.List;
+<a name="39" href="#39">39</a>  <strong class="jxr_keyword">import</strong> 
java.io.IOException;
+<a name="40" href="#40">40</a>  
+<a name="41" href="#41">41</a>  <em class="jxr_javadoccomment">/**</em>
+<a name="42" href="#42">42</a>  <em class="jxr_javadoccomment"> * The 
processor to process &lt;code&gt;wsc:SecurityContextToken&lt;/code&gt;.</em>
+<a name="43" href="#43">43</a>  <em class="jxr_javadoccomment"> * </em>
+<a name="44" href="#44">44</a>  <em class="jxr_javadoccomment"> * @author 
Ruchith Fernando ([email protected])</em>
+<a name="45" href="#45">45</a>  <em class="jxr_javadoccomment"> */</em>
+<a name="46" href="#46">46</a>  <strong class="jxr_keyword">public</strong> 
<strong class="jxr_keyword">class</strong> <a 
href="../../../../../org/apache/ws/security/processor/SecurityContextTokenProcessor.html">SecurityContextTokenProcessor</a>
 implements <a 
href="../../../../../org/apache/ws/security/processor/Processor.html">Processor</a>
 {
+<a name="47" href="#47">47</a>      
+<a name="48" href="#48">48</a>      <strong 
class="jxr_keyword">public</strong> List&lt;WSSecurityEngineResult&gt; 
handleToken(
+<a name="49" href="#49">49</a>          Element elem, 
+<a name="50" href="#50">50</a>          <a 
href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a>
 data,
+<a name="51" href="#51">51</a>          <a 
href="../../../../../org/apache/ws/security/WSDocInfo.html">WSDocInfo</a> 
wsDocInfo 
+<a name="52" href="#52">52</a>      ) <strong 
class="jxr_keyword">throws</strong> <a 
href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>
 {
+<a name="53" href="#53">53</a>          <a 
href="../../../../../org/apache/ws/security/message/token/SecurityContextToken.html">SecurityContextToken</a>
 sct = <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/message/token/SecurityContextToken.html">SecurityContextToken</a>(elem);
+<a name="54" href="#54">54</a>          
+<a name="55" href="#55">55</a>          <a 
href="../../../../../org/apache/ws/security/validate/Validator.html">Validator</a>
 validator = 
+<a name="56" href="#56">56</a>              data.getValidator(<strong 
class="jxr_keyword">new</strong> QName(elem.getNamespaceURI(), 
elem.getLocalName()));
+<a name="57" href="#57">57</a>  
+<a name="58" href="#58">58</a>          <a 
href="../../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a>
 result =
+<a name="59" href="#59">59</a>              <strong 
class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a>(WSConstants.SCT,
 sct);
+<a name="60" href="#60">60</a>          <strong 
class="jxr_keyword">if</strong> (validator != <strong 
class="jxr_keyword">null</strong>) {
+<a name="61" href="#61">61</a>              <em class="jxr_comment">// Hook to 
allow the user to validate the SecurityContextToken</em>
+<a name="62" href="#62">62</a>              <a 
href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a>
 credential = <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a>();
+<a name="63" href="#63">63</a>              
credential.setSecurityContextToken(sct);
+<a name="64" href="#64">64</a>              
+<a name="65" href="#65">65</a>              <a 
href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a>
 returnedCredential = validator.validate(credential, data);
+<a name="66" href="#66">66</a>              
result.put(WSSecurityEngineResult.TAG_VALIDATED_TOKEN, Boolean.TRUE);
+<a name="67" href="#67">67</a>              
result.put(WSSecurityEngineResult.TAG_ID, sct.getID());
+<a name="68" href="#68">68</a>              
result.put(WSSecurityEngineResult.TAG_SECRET, 
returnedCredential.getSecretKey());
+<a name="69" href="#69">69</a>          } <strong 
class="jxr_keyword">else</strong> {
+<a name="70" href="#70">70</a>              byte[] secret = 
getSecret(data.getCallbackHandler(), sct);
+<a name="71" href="#71">71</a>              
result.put(WSSecurityEngineResult.TAG_ID, sct.getID());
+<a name="72" href="#72">72</a>              
result.put(WSSecurityEngineResult.TAG_SECRET, secret);
+<a name="73" href="#73">73</a>          }
+<a name="74" href="#74">74</a>          
+<a name="75" href="#75">75</a>          wsDocInfo.addTokenElement(elem);
+<a name="76" href="#76">76</a>          wsDocInfo.addResult(result);
+<a name="77" href="#77">77</a>          <strong 
class="jxr_keyword">return</strong> java.util.Collections.singletonList(result);
+<a name="78" href="#78">78</a>      }
+<a name="79" href="#79">79</a>  
+<a name="80" href="#80">80</a>      <em class="jxr_javadoccomment">/**</em>
+<a name="81" href="#81">81</a>  <em class="jxr_javadoccomment">     * Get the 
secret from the provided callback handler and return it.</em>
+<a name="82" href="#82">82</a>  <em class="jxr_javadoccomment">     * </em>
+<a name="83" href="#83">83</a>  <em class="jxr_javadoccomment">     * @param 
cb</em>
+<a name="84" href="#84">84</a>  <em class="jxr_javadoccomment">     * @param 
sct</em>
+<a name="85" href="#85">85</a>  <em class="jxr_javadoccomment">     * @return 
The key collected using the callback handler</em>
+<a name="86" href="#86">86</a>  <em class="jxr_javadoccomment">     */</em>
+<a name="87" href="#87">87</a>      <strong 
class="jxr_keyword">private</strong> byte[] getSecret(CallbackHandler cb, <a 
href="../../../../../org/apache/ws/security/message/token/SecurityContextToken.html">SecurityContextToken</a>
 sct)
+<a name="88" href="#88">88</a>          <strong 
class="jxr_keyword">throws</strong> <a 
href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>
 {
+<a name="89" href="#89">89</a>  
+<a name="90" href="#90">90</a>          <strong 
class="jxr_keyword">if</strong> (cb == <strong 
class="jxr_keyword">null</strong>) {
+<a name="91" href="#91">91</a>              <strong 
class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE,
 <span class="jxr_string">"noCallback"</span>);
+<a name="92" href="#92">92</a>          }
+<a name="93" href="#93">93</a>  
+<a name="94" href="#94">94</a>          <a 
href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a>
 callback = 
+<a name="95" href="#95">95</a>              <strong 
class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a>(
+<a name="96" href="#96">96</a>                  sct.getIdentifier(), 
WSPasswordCallback.SECURITY_CONTEXT_TOKEN
+<a name="97" href="#97">97</a>              );
+<a name="98" href="#98">98</a>          <strong 
class="jxr_keyword">try</strong> {
+<a name="99" href="#99">99</a>              Callback[] callbacks = <strong 
class="jxr_keyword">new</strong> Callback[]{callback};
+<a name="100" href="#100">100</a>             cb.handle(callbacks);
+<a name="101" href="#101">101</a>         } <strong 
class="jxr_keyword">catch</strong> (IOException e) {
+<a name="102" href="#102">102</a>             <strong 
class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
+<a name="103" href="#103">103</a>                 WSSecurityException.FAILURE, 
+<a name="104" href="#104">104</a>                 <span 
class="jxr_string">"noKey"</span>,
+<a name="105" href="#105">105</a>                 <strong 
class="jxr_keyword">new</strong> Object[] {sct.getIdentifier()}, 
+<a name="106" href="#106">106</a>                 e
+<a name="107" href="#107">107</a>             );
+<a name="108" href="#108">108</a>         } <strong 
class="jxr_keyword">catch</strong> (UnsupportedCallbackException e) {
+<a name="109" href="#109">109</a>             <strong 
class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
+<a name="110" href="#110">110</a>                 WSSecurityException.FAILURE, 
+<a name="111" href="#111">111</a>                 <span 
class="jxr_string">"noKey"</span>,
+<a name="112" href="#112">112</a>                 <strong 
class="jxr_keyword">new</strong> Object[] {sct.getIdentifier()}, 
+<a name="113" href="#113">113</a>                 e
+<a name="114" href="#114">114</a>             );
+<a name="115" href="#115">115</a>         }
+<a name="116" href="#116">116</a> 
+<a name="117" href="#117">117</a>         <strong 
class="jxr_keyword">return</strong> callback.getKey();
+<a name="118" href="#118">118</a>     }
+<a name="119" href="#119">119</a> 
+<a name="120" href="#120">120</a> }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a 
href="http://maven.apache.org/";>Maven</a></div></body>
 </html>

Modified: 
webservices/wss4j/site/xref/org/apache/ws/security/processor/UsernameTokenProcessor.html
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/processor/UsernameTokenProcessor.html?rev=1178426&r1=1178425&r2=1178426&view=diff
==============================================================================
--- 
webservices/wss4j/site/xref/org/apache/ws/security/processor/UsernameTokenProcessor.html
 (original)
+++ 
webservices/wss4j/site/xref/org/apache/ws/security/processor/UsernameTokenProcessor.html
 Mon Oct  3 15:15:52 2011
@@ -57,80 +57,93 @@
 <a name="47" href="#47">47</a>          <strong 
class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
 <a name="48" href="#48">48</a>              log.debug(<span 
class="jxr_string">"Found UsernameToken list element"</span>);
 <a name="49" href="#49">49</a>          }
-<a name="50" href="#50">50</a>          
-<a name="51" href="#51">51</a>          <a 
href="../../../../../org/apache/ws/security/validate/Validator.html">Validator</a>
 validator = data.getValidator(WSSecurityEngine.USERNAME_TOKEN);
-<a name="52" href="#52">52</a>          <a 
href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a>
 credential = handleUsernameToken(elem, validator, data);
-<a name="53" href="#53">53</a>          <a 
href="../../../../../org/apache/ws/security/message/token/UsernameToken.html">UsernameToken</a>
 token = credential.getUsernametoken();
-<a name="54" href="#54">54</a>          
-<a name="55" href="#55">55</a>          <strong 
class="jxr_keyword">int</strong> action = WSConstants.UT;
-<a name="56" href="#56">56</a>          <strong 
class="jxr_keyword">if</strong> (token.getPassword() == <strong 
class="jxr_keyword">null</strong>) { 
-<a name="57" href="#57">57</a>              action = WSConstants.UT_NOPASSWORD;
-<a name="58" href="#58">58</a>          }
-<a name="59" href="#59">59</a>          <a 
href="../../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a>
 result = <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a>(action,
 token);
-<a name="60" href="#60">60</a>          
result.put(WSSecurityEngineResult.TAG_ID, token.getID());
-<a name="61" href="#61">61</a>          
-<a name="62" href="#62">62</a>          <strong 
class="jxr_keyword">if</strong> (validator != <strong 
class="jxr_keyword">null</strong>) {
-<a name="63" href="#63">63</a>              
result.put(WSSecurityEngineResult.TAG_VALIDATED_TOKEN, Boolean.TRUE);
-<a name="64" href="#64">64</a>              <strong 
class="jxr_keyword">if</strong> (credential.getTransformedToken() != <strong 
class="jxr_keyword">null</strong>) {
-<a name="65" href="#65">65</a>                  result.put(
-<a name="66" href="#66">66</a>                      
WSSecurityEngineResult.TAG_TRANSFORMED_TOKEN, credential.getTransformedToken()
-<a name="67" href="#67">67</a>                  );
-<a name="68" href="#68">68</a>                  <a 
href="../../../../../org/apache/ws/security/SAMLTokenPrincipal.html">SAMLTokenPrincipal</a>
 samlPrincipal = 
-<a name="69" href="#69">69</a>                      <strong 
class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/SAMLTokenPrincipal.html">SAMLTokenPrincipal</a>(credential.getTransformedToken());
-<a name="70" href="#70">70</a>                  
result.put(WSSecurityEngineResult.TAG_PRINCIPAL, samlPrincipal);
-<a name="71" href="#71">71</a>              } <strong 
class="jxr_keyword">else</strong> {
-<a name="72" href="#72">72</a>                  <a 
href="../../../../../org/apache/ws/security/WSUsernameTokenPrincipal.html">WSUsernameTokenPrincipal</a>
 principal = 
-<a name="73" href="#73">73</a>                      <strong 
class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/WSUsernameTokenPrincipal.html">WSUsernameTokenPrincipal</a>(token.getName(),
 token.isHashed());
-<a name="74" href="#74">74</a>                  
principal.setNonce(token.getNonce());
-<a name="75" href="#75">75</a>                  
principal.setPassword(token.getPassword());
-<a name="76" href="#76">76</a>                  
principal.setCreatedTime(token.getCreated());
-<a name="77" href="#77">77</a>                  
principal.setPasswordType(token.getPasswordType());
-<a name="78" href="#78">78</a>                  
result.put(WSSecurityEngineResult.TAG_PRINCIPAL, principal);
-<a name="79" href="#79">79</a>              }
-<a name="80" href="#80">80</a>          }
-<a name="81" href="#81">81</a>          
-<a name="82" href="#82">82</a>          wsDocInfo.addTokenElement(elem);
-<a name="83" href="#83">83</a>          wsDocInfo.addResult(result);
-<a name="84" href="#84">84</a>          <strong 
class="jxr_keyword">return</strong> java.util.Collections.singletonList(result);
-<a name="85" href="#85">85</a>      }
-<a name="86" href="#86">86</a>  
-<a name="87" href="#87">87</a>      <em class="jxr_javadoccomment">/**</em>
-<a name="88" href="#88">88</a>  <em class="jxr_javadoccomment">     * Check 
the UsernameToken element and validate it.</em>
-<a name="89" href="#89">89</a>  <em class="jxr_javadoccomment">     *</em>
-<a name="90" href="#90">90</a>  <em class="jxr_javadoccomment">     * @param 
token the DOM element that contains the UsernameToken</em>
-<a name="91" href="#91">91</a>  <em class="jxr_javadoccomment">     * @param 
data The RequestData object from which to obtain configuration</em>
-<a name="92" href="#92">92</a>  <em class="jxr_javadoccomment">     * @return 
a Credential object corresponding to the (validated) Username Token</em>
-<a name="93" href="#93">93</a>  <em class="jxr_javadoccomment">     * @throws 
WSSecurityException</em>
-<a name="94" href="#94">94</a>  <em class="jxr_javadoccomment">     */</em>
-<a name="95" href="#95">95</a>      <strong 
class="jxr_keyword">public</strong> <a 
href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a>
 
-<a name="96" href="#96">96</a>      handleUsernameToken(
-<a name="97" href="#97">97</a>          Element token, 
-<a name="98" href="#98">98</a>          <a 
href="../../../../../org/apache/ws/security/validate/Validator.html">Validator</a>
 validator,
-<a name="99" href="#99">99</a>          <a 
href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a>
 data
-<a name="100" href="#100">100</a>     ) <strong 
class="jxr_keyword">throws</strong> <a 
href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>
 {
-<a name="101" href="#101">101</a>         <strong 
class="jxr_keyword">boolean</strong> allowNamespaceQualifiedPasswordTypes = 
false;
-<a name="102" href="#102">102</a>         <strong 
class="jxr_keyword">boolean</strong> bspCompliant = <strong 
class="jxr_keyword">true</strong>;
-<a name="103" href="#103">103</a>         <a 
href="../../../../../org/apache/ws/security/WSSConfig.html">WSSConfig</a> 
wssConfig = data.getWssConfig();
-<a name="104" href="#104">104</a>         <strong 
class="jxr_keyword">if</strong> (wssConfig != <strong 
class="jxr_keyword">null</strong>) {
-<a name="105" href="#105">105</a>             
allowNamespaceQualifiedPasswordTypes = 
-<a name="106" href="#106">106</a>                 
wssConfig.getAllowNamespaceQualifiedPasswordTypes();
-<a name="107" href="#107">107</a>             bspCompliant = 
wssConfig.isWsiBSPCompliant();
-<a name="108" href="#108">108</a>         }
-<a name="109" href="#109">109</a>         
-<a name="110" href="#110">110</a>         <em class="jxr_comment">//</em>
-<a name="111" href="#111">111</a>         <em class="jxr_comment">// Parse and 
validate the UsernameToken element</em>
-<a name="112" href="#112">112</a>         <em class="jxr_comment">//</em>
-<a name="113" href="#113">113</a>         <a 
href="../../../../../org/apache/ws/security/message/token/UsernameToken.html">UsernameToken</a>
 ut = 
-<a name="114" href="#114">114</a>             <strong 
class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/message/token/UsernameToken.html">UsernameToken</a>(token,
 allowNamespaceQualifiedPasswordTypes, bspCompliant);
-<a name="115" href="#115">115</a>         <a 
href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a>
 credential = <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a>();
-<a name="116" href="#116">116</a>         credential.setUsernametoken(ut);
-<a name="117" href="#117">117</a>         <strong 
class="jxr_keyword">if</strong> (validator != <strong 
class="jxr_keyword">null</strong>) {
-<a name="118" href="#118">118</a>             <strong 
class="jxr_keyword">return</strong> validator.validate(credential, data);
-<a name="119" href="#119">119</a>         }
-<a name="120" href="#120">120</a>         <strong 
class="jxr_keyword">return</strong> credential;
-<a name="121" href="#121">121</a>     }
-<a name="122" href="#122">122</a> 
-<a name="123" href="#123">123</a> }
+<a name="50" href="#50">50</a>          <em class="jxr_comment">// See if the 
token has been previously processed</em>
+<a name="51" href="#51">51</a>          String id = 
elem.getAttributeNS(WSConstants.WSU_NS, <span class="jxr_string">"Id"</span>);
+<a name="52" href="#52">52</a>          <strong 
class="jxr_keyword">if</strong> (!<span 
class="jxr_string">""</span>.equals(id)) {
+<a name="53" href="#53">53</a>              Element foundElement = 
wsDocInfo.getTokenElement(id);
+<a name="54" href="#54">54</a>              <strong 
class="jxr_keyword">if</strong> (elem.equals(foundElement)) {
+<a name="55" href="#55">55</a>                  <a 
href="../../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a>
 result = wsDocInfo.getResult(id);
+<a name="56" href="#56">56</a>                  <strong 
class="jxr_keyword">return</strong> java.util.Collections.singletonList(result);
+<a name="57" href="#57">57</a>              } <strong 
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> 
(foundElement != <strong class="jxr_keyword">null</strong>) {
+<a name="58" href="#58">58</a>                  <strong 
class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
+<a name="59" href="#59">59</a>                      
WSSecurityException.INVALID_SECURITY_TOKEN, <span 
class="jxr_string">"duplicateError"</span>
+<a name="60" href="#60">60</a>                  );
+<a name="61" href="#61">61</a>              }
+<a name="62" href="#62">62</a>          }
+<a name="63" href="#63">63</a>          
+<a name="64" href="#64">64</a>          <a 
href="../../../../../org/apache/ws/security/validate/Validator.html">Validator</a>
 validator = data.getValidator(WSSecurityEngine.USERNAME_TOKEN);
+<a name="65" href="#65">65</a>          <a 
href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a>
 credential = handleUsernameToken(elem, validator, data);
+<a name="66" href="#66">66</a>          <a 
href="../../../../../org/apache/ws/security/message/token/UsernameToken.html">UsernameToken</a>
 token = credential.getUsernametoken();
+<a name="67" href="#67">67</a>          
+<a name="68" href="#68">68</a>          <strong 
class="jxr_keyword">int</strong> action = WSConstants.UT;
+<a name="69" href="#69">69</a>          <strong 
class="jxr_keyword">if</strong> (token.getPassword() == <strong 
class="jxr_keyword">null</strong>) { 
+<a name="70" href="#70">70</a>              action = WSConstants.UT_NOPASSWORD;
+<a name="71" href="#71">71</a>          }
+<a name="72" href="#72">72</a>          <a 
href="../../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a>
 result = <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a>(action,
 token);
+<a name="73" href="#73">73</a>          
result.put(WSSecurityEngineResult.TAG_ID, token.getID());
+<a name="74" href="#74">74</a>          
+<a name="75" href="#75">75</a>          <strong 
class="jxr_keyword">if</strong> (validator != <strong 
class="jxr_keyword">null</strong>) {
+<a name="76" href="#76">76</a>              
result.put(WSSecurityEngineResult.TAG_VALIDATED_TOKEN, Boolean.TRUE);
+<a name="77" href="#77">77</a>              <strong 
class="jxr_keyword">if</strong> (credential.getTransformedToken() != <strong 
class="jxr_keyword">null</strong>) {
+<a name="78" href="#78">78</a>                  result.put(
+<a name="79" href="#79">79</a>                      
WSSecurityEngineResult.TAG_TRANSFORMED_TOKEN, credential.getTransformedToken()
+<a name="80" href="#80">80</a>                  );
+<a name="81" href="#81">81</a>                  <a 
href="../../../../../org/apache/ws/security/SAMLTokenPrincipal.html">SAMLTokenPrincipal</a>
 samlPrincipal = 
+<a name="82" href="#82">82</a>                      <strong 
class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/SAMLTokenPrincipal.html">SAMLTokenPrincipal</a>(credential.getTransformedToken());
+<a name="83" href="#83">83</a>                  
result.put(WSSecurityEngineResult.TAG_PRINCIPAL, samlPrincipal);
+<a name="84" href="#84">84</a>              } <strong 
class="jxr_keyword">else</strong> {
+<a name="85" href="#85">85</a>                  <a 
href="../../../../../org/apache/ws/security/WSUsernameTokenPrincipal.html">WSUsernameTokenPrincipal</a>
 principal = 
+<a name="86" href="#86">86</a>                      <strong 
class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/WSUsernameTokenPrincipal.html">WSUsernameTokenPrincipal</a>(token.getName(),
 token.isHashed());
+<a name="87" href="#87">87</a>                  
principal.setNonce(token.getNonce());
+<a name="88" href="#88">88</a>                  
principal.setPassword(token.getPassword());
+<a name="89" href="#89">89</a>                  
principal.setCreatedTime(token.getCreated());
+<a name="90" href="#90">90</a>                  
principal.setPasswordType(token.getPasswordType());
+<a name="91" href="#91">91</a>                  
result.put(WSSecurityEngineResult.TAG_PRINCIPAL, principal);
+<a name="92" href="#92">92</a>              }
+<a name="93" href="#93">93</a>          }
+<a name="94" href="#94">94</a>          
+<a name="95" href="#95">95</a>          wsDocInfo.addTokenElement(elem);
+<a name="96" href="#96">96</a>          wsDocInfo.addResult(result);
+<a name="97" href="#97">97</a>          <strong 
class="jxr_keyword">return</strong> java.util.Collections.singletonList(result);
+<a name="98" href="#98">98</a>      }
+<a name="99" href="#99">99</a>  
+<a name="100" href="#100">100</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="101" href="#101">101</a> <em class="jxr_javadoccomment">     * Check 
the UsernameToken element and validate it.</em>
+<a name="102" href="#102">102</a> <em class="jxr_javadoccomment">     *</em>
+<a name="103" href="#103">103</a> <em class="jxr_javadoccomment">     * @param 
token the DOM element that contains the UsernameToken</em>
+<a name="104" href="#104">104</a> <em class="jxr_javadoccomment">     * @param 
data The RequestData object from which to obtain configuration</em>
+<a name="105" href="#105">105</a> <em class="jxr_javadoccomment">     * 
@return a Credential object corresponding to the (validated) Username Token</em>
+<a name="106" href="#106">106</a> <em class="jxr_javadoccomment">     * 
@throws WSSecurityException</em>
+<a name="107" href="#107">107</a> <em class="jxr_javadoccomment">     */</em>
+<a name="108" href="#108">108</a>     <strong 
class="jxr_keyword">public</strong> <a 
href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a>
 
+<a name="109" href="#109">109</a>     handleUsernameToken(
+<a name="110" href="#110">110</a>         Element token, 
+<a name="111" href="#111">111</a>         <a 
href="../../../../../org/apache/ws/security/validate/Validator.html">Validator</a>
 validator,
+<a name="112" href="#112">112</a>         <a 
href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a>
 data
+<a name="113" href="#113">113</a>     ) <strong 
class="jxr_keyword">throws</strong> <a 
href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>
 {
+<a name="114" href="#114">114</a>         <strong 
class="jxr_keyword">boolean</strong> allowNamespaceQualifiedPasswordTypes = 
false;
+<a name="115" href="#115">115</a>         <strong 
class="jxr_keyword">boolean</strong> bspCompliant = <strong 
class="jxr_keyword">true</strong>;
+<a name="116" href="#116">116</a>         <a 
href="../../../../../org/apache/ws/security/WSSConfig.html">WSSConfig</a> 
wssConfig = data.getWssConfig();
+<a name="117" href="#117">117</a>         <strong 
class="jxr_keyword">if</strong> (wssConfig != <strong 
class="jxr_keyword">null</strong>) {
+<a name="118" href="#118">118</a>             
allowNamespaceQualifiedPasswordTypes = 
+<a name="119" href="#119">119</a>                 
wssConfig.getAllowNamespaceQualifiedPasswordTypes();
+<a name="120" href="#120">120</a>             bspCompliant = 
wssConfig.isWsiBSPCompliant();
+<a name="121" href="#121">121</a>         }
+<a name="122" href="#122">122</a>         
+<a name="123" href="#123">123</a>         <em class="jxr_comment">//</em>
+<a name="124" href="#124">124</a>         <em class="jxr_comment">// Parse and 
validate the UsernameToken element</em>
+<a name="125" href="#125">125</a>         <em class="jxr_comment">//</em>
+<a name="126" href="#126">126</a>         <a 
href="../../../../../org/apache/ws/security/message/token/UsernameToken.html">UsernameToken</a>
 ut = 
+<a name="127" href="#127">127</a>             <strong 
class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/message/token/UsernameToken.html">UsernameToken</a>(token,
 allowNamespaceQualifiedPasswordTypes, bspCompliant);
+<a name="128" href="#128">128</a>         <a 
href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a>
 credential = <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a>();
+<a name="129" href="#129">129</a>         credential.setUsernametoken(ut);
+<a name="130" href="#130">130</a>         <strong 
class="jxr_keyword">if</strong> (validator != <strong 
class="jxr_keyword">null</strong>) {
+<a name="131" href="#131">131</a>             <strong 
class="jxr_keyword">return</strong> validator.validate(credential, data);
+<a name="132" href="#132">132</a>         }
+<a name="133" href="#133">133</a>         <strong 
class="jxr_keyword">return</strong> credential;
+<a name="134" href="#134">134</a>     }
+<a name="135" href="#135">135</a> 
+<a name="136" href="#136">136</a> }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a 
href="http://maven.apache.org/";>Maven</a></div></body>
 </html>

Modified: 
webservices/wss4j/site/xref/org/apache/ws/security/processor/package-frame.html
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/processor/package-frame.html?rev=1178426&r1=1178425&r2=1178426&view=diff
==============================================================================
--- 
webservices/wss4j/site/xref/org/apache/ws/security/processor/package-frame.html 
(original)
+++ 
webservices/wss4j/site/xref/org/apache/ws/security/processor/package-frame.html 
Mon Oct  3 15:15:52 2011
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
        <head>
                <meta http-equiv="content-type" content="text/html; 
charset=ISO-8859-1" />
-               <title>WSS4J 1.6.2 Reference Package 
org.apache.ws.security.processor</title>
+               <title>WSS4J 1.6.3 Reference Package 
org.apache.ws.security.processor</title>
                <link rel="stylesheet" type="text/css" 
href="../../../../../stylesheet.css" title="style" />
        </head>
        <body>

Modified: 
webservices/wss4j/site/xref/org/apache/ws/security/processor/package-summary.html
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/processor/package-summary.html?rev=1178426&r1=1178425&r2=1178426&view=diff
==============================================================================
--- 
webservices/wss4j/site/xref/org/apache/ws/security/processor/package-summary.html
 (original)
+++ 
webservices/wss4j/site/xref/org/apache/ws/security/processor/package-summary.html
 Mon Oct  3 15:15:52 2011
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
        <head>
                <meta http-equiv="content-type" content="text/html; 
charset=ISO-8859-1" />
-               <title>WSS4J 1.6.2 Reference Package 
org.apache.ws.security.processor</title>
+               <title>WSS4J 1.6.3 Reference Package 
org.apache.ws.security.processor</title>
                <link rel="stylesheet" type="text/css" 
href="../../../../../stylesheet.css" title="style" />
        </head>
        <body>


Reply via email to