You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wss4j-dev@ws.apache.org by co...@apache.org on 2009/07/28 15:24:03 UTC

svn commit: r798514 [41/44] - in /webservices/wss4j/site: ./ apidocs/ apidocs/org/apache/ws/axis/security/ apidocs/org/apache/ws/axis/security/class-use/ apidocs/org/apache/ws/axis/security/handler/ apidocs/org/apache/ws/axis/security/handler/class-use...

Modified: webservices/wss4j/site/xref/org/apache/ws/security/processor/SignatureProcessor.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/processor/SignatureProcessor.html?rev=798514&r1=798513&r2=798514&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/processor/SignatureProcessor.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/processor/SignatureProcessor.html Tue Jul 28 13:23:48 2009
@@ -480,130 +480,132 @@
 <a name="470" href="#470">470</a>                         <a href="../../../../../org/apache/ws/security/WSDataRef.html">WSDataRef</a> ref = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSDataRef.html">WSDataRef</a>(uri);
 <a name="471" href="#471">471</a>                         ref.setWsuId(uri);
 <a name="472" href="#472">472</a>                         ref.setName(<strong class="jxr_keyword">new</strong> QName(se.getNamespaceURI(), se.getLocalName()));
-<a name="473" href="#473">473</a>                         protectedElements.add(ref);
-<a name="474" href="#474">474</a>                         returnElements.add(WSSecurityUtil.getIDFromReference(uri));
-<a name="475" href="#475">475</a>                     } <strong class="jxr_keyword">else</strong> {
-<a name="476" href="#476">476</a>                        <em class="jxr_comment">// This is the case where the signed element is identified </em>
-<a name="477" href="#477">477</a>                        <em class="jxr_comment">// by a transform such as XPath filtering</em>
-<a name="478" href="#478">478</a>                        <em class="jxr_comment">// We add the complete reference element to the return </em>
-<a name="479" href="#479">479</a>                        <em class="jxr_comment">// elements</em>
-<a name="480" href="#480">480</a>                        returnElements.add(siRef); 
-<a name="481" href="#481">481</a>                     }
-<a name="482" href="#482">482</a>                 }
-<a name="483" href="#483">483</a>                 
-<a name="484" href="#484">484</a>                 <strong class="jxr_keyword">if</strong> (certs != <strong class="jxr_keyword">null</strong>) {
-<a name="485" href="#485">485</a>                     returnCert[0] = certs[0];
-<a name="486" href="#486">486</a>                     <strong class="jxr_keyword">return</strong> certs[0].getSubjectDN();
-<a name="487" href="#487">487</a>                 } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (publicKey != <strong class="jxr_keyword">null</strong>) {
-<a name="488" href="#488">488</a>                     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/PublicKeyPrincipal.html">PublicKeyPrincipal</a>(publicKey);
-<a name="489" href="#489">489</a>                 } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (ut != <strong class="jxr_keyword">null</strong>) {
-<a name="490" href="#490">490</a>                     <a href="../../../../../org/apache/ws/security/WSUsernameTokenPrincipal.html">WSUsernameTokenPrincipal</a> principal = 
-<a name="491" href="#491">491</a>                         <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSUsernameTokenPrincipal.html">WSUsernameTokenPrincipal</a>(ut.getName(), ut.isHashed());
-<a name="492" href="#492">492</a>                     principal.setNonce(ut.getNonce());
-<a name="493" href="#493">493</a>                     principal.setPassword(ut.getPassword());
-<a name="494" href="#494">494</a>                     principal.setCreatedTime(ut.getCreated());
-<a name="495" href="#495">495</a>                     <strong class="jxr_keyword">return</strong> principal;
-<a name="496" href="#496">496</a>                 } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (dkt != <strong class="jxr_keyword">null</strong>) {
-<a name="497" href="#497">497</a>                     <a href="../../../../../org/apache/ws/security/WSDerivedKeyTokenPrincipal.html">WSDerivedKeyTokenPrincipal</a> principal = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSDerivedKeyTokenPrincipal.html">WSDerivedKeyTokenPrincipal</a>(dkt.getID());
-<a name="498" href="#498">498</a>                     principal.setNonce(dkt.getNonce());
-<a name="499" href="#499">499</a>                     principal.setLabel(dkt.getLabel());
-<a name="500" href="#500">500</a>                     principal.setLength(dkt.getLength());
-<a name="501" href="#501">501</a>                     principal.setOffset(dkt.getOffset());
-<a name="502" href="#502">502</a>                     String basetokenId = <strong class="jxr_keyword">null</strong>;
-<a name="503" href="#503">503</a>                     <a href="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html">SecurityTokenReference</a> securityTokenReference = dkt.getSecurityTokenReference();
-<a name="504" href="#504">504</a>                     <strong class="jxr_keyword">if</strong> (securityTokenReference.containsReference()) {
-<a name="505" href="#505">505</a>                         basetokenId = securityTokenReference.getReference().getURI();
-<a name="506" href="#506">506</a>                         <strong class="jxr_keyword">if</strong> (basetokenId.charAt(0) == '#') {
-<a name="507" href="#507">507</a>                             basetokenId = basetokenId.substring(1);
-<a name="508" href="#508">508</a>                         }
-<a name="509" href="#509">509</a>                     } <strong class="jxr_keyword">else</strong> {
-<a name="510" href="#510">510</a>                         <em class="jxr_comment">// KeyIdentifier</em>
-<a name="511" href="#511">511</a>                         basetokenId = securityTokenReference.getKeyIdentifierValue();
-<a name="512" href="#512">512</a>                     }
-<a name="513" href="#513">513</a>                     principal.setBasetokenId(basetokenId);
-<a name="514" href="#514">514</a>                     <strong class="jxr_keyword">return</strong> principal;
-<a name="515" href="#515">515</a>                 } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (samlKi != <strong class="jxr_keyword">null</strong>) {
-<a name="516" href="#516">516</a>                     <strong class="jxr_keyword">final</strong> SAMLAssertion assertion = samlKi.getAssertion();
-<a name="517" href="#517">517</a>                     <a href="../../../../../org/apache/ws/security/CustomTokenPrincipal.html">CustomTokenPrincipal</a> principal = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/CustomTokenPrincipal.html">CustomTokenPrincipal</a>(assertion.getId());
-<a name="518" href="#518">518</a>                     principal.setTokenObject(assertion);
-<a name="519" href="#519">519</a>                     <strong class="jxr_keyword">return</strong> principal;
-<a name="520" href="#520">520</a>                 } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (secretKey != <strong class="jxr_keyword">null</strong>) {
-<a name="521" href="#521">521</a>                     <em class="jxr_comment">// This is the custom key scenario</em>
-<a name="522" href="#522">522</a>                     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/CustomTokenPrincipal.html">CustomTokenPrincipal</a>(customTokenId);
-<a name="523" href="#523">523</a>                 } <strong class="jxr_keyword">else</strong> {
-<a name="524" href="#524">524</a>                     <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(<span class="jxr_string">"Cannot determine principal"</span>);
-<a name="525" href="#525">525</a>                 }
-<a name="526" href="#526">526</a>             } <strong class="jxr_keyword">else</strong> {
-<a name="527" href="#527">527</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILED_CHECK);
-<a name="528" href="#528">528</a>             }
-<a name="529" href="#529">529</a>         } <strong class="jxr_keyword">catch</strong> (XMLSignatureException e1) {
-<a name="530" href="#530">530</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="531" href="#531">531</a>                 WSSecurityException.FAILED_CHECK, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, e1
-<a name="532" href="#532">532</a>             );
-<a name="533" href="#533">533</a>         }
-<a name="534" href="#534">534</a>     }
-<a name="535" href="#535">535</a> 
-<a name="536" href="#536">536</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="537" href="#537">537</a> <em class="jxr_javadoccomment">     * Extracts the certificate(s) from the Binary Security token reference.</em>
-<a name="538" href="#538">538</a> <em class="jxr_javadoccomment">     *</em>
-<a name="539" href="#539">539</a> <em class="jxr_javadoccomment">     * @param elem The element containing the binary security token. This is</em>
-<a name="540" href="#540">540</a> <em class="jxr_javadoccomment">     *             either X509 certificate(s) or a PKIPath.</em>
-<a name="541" href="#541">541</a> <em class="jxr_javadoccomment">     * @return an array of X509 certificates</em>
-<a name="542" href="#542">542</a> <em class="jxr_javadoccomment">     * @throws WSSecurityException</em>
-<a name="543" href="#543">543</a> <em class="jxr_javadoccomment">     */</em>
-<a name="544" href="#544">544</a>     <strong class="jxr_keyword">public</strong> X509Certificate[] getCertificatesTokenReference(Element elem, <a href="../../../../../org/apache/ws/security/components/crypto/Crypto.html">Crypto</a> crypto)
-<a name="545" href="#545">545</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
-<a name="546" href="#546">546</a>         <strong class="jxr_keyword">if</strong> (crypto == <strong class="jxr_keyword">null</strong>) {
-<a name="547" href="#547">547</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">"noSigCryptoFile"</span>);
-<a name="548" href="#548">548</a>         }
-<a name="549" href="#549">549</a>         <a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a> token = createSecurityToken(elem);
-<a name="550" href="#550">550</a>         <strong class="jxr_keyword">if</strong> (token instanceof PKIPathSecurity) {
-<a name="551" href="#551">551</a>             <strong class="jxr_keyword">return</strong> ((PKIPathSecurity) token).getX509Certificates(false, crypto);
-<a name="552" href="#552">552</a>         } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (token instanceof X509Security) {
-<a name="553" href="#553">553</a>             X509Certificate cert = ((X509Security) token).getX509Certificate(crypto);
-<a name="554" href="#554">554</a>             X509Certificate[] certs = <strong class="jxr_keyword">new</strong> X509Certificate[1];
-<a name="555" href="#555">555</a>             certs[0] = cert;
-<a name="556" href="#556">556</a>             <strong class="jxr_keyword">return</strong> certs;
-<a name="557" href="#557">557</a>         }
-<a name="558" href="#558">558</a>         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a name="559" href="#559">559</a>     }
-<a name="560" href="#560">560</a> 
-<a name="561" href="#561">561</a> 
-<a name="562" href="#562">562</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="563" href="#563">563</a> <em class="jxr_javadoccomment">     * Checks the &lt;code&gt;element&lt;/code&gt; and creates appropriate binary security object.</em>
-<a name="564" href="#564">564</a> <em class="jxr_javadoccomment">     *</em>
-<a name="565" href="#565">565</a> <em class="jxr_javadoccomment">     * @param element The XML element that contains either a &lt;code&gt;BinarySecurityToken</em>
-<a name="566" href="#566">566</a> <em class="jxr_javadoccomment">     *                &lt;/code&gt; or a &lt;code&gt;PKIPath&lt;/code&gt; element. Other element types a not</em>
-<a name="567" href="#567">567</a> <em class="jxr_javadoccomment">     *                supported</em>
-<a name="568" href="#568">568</a> <em class="jxr_javadoccomment">     * @return the BinarySecurity object, either a &lt;code&gt;X509Security&lt;/code&gt; or a</em>
-<a name="569" href="#569">569</a> <em class="jxr_javadoccomment">     *         &lt;code&gt;PKIPathSecurity&lt;/code&gt; object.</em>
-<a name="570" href="#570">570</a> <em class="jxr_javadoccomment">     * @throws WSSecurityException</em>
-<a name="571" href="#571">571</a> <em class="jxr_javadoccomment">     */</em>
-<a name="572" href="#572">572</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a> createSecurityToken(Element element) <strong class="jxr_keyword">throws</strong> WSSecurityException {
-<a name="573" href="#573">573</a>         <a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a> token = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a>(element);
-<a name="574" href="#574">574</a>         String type = token.getValueType();
-<a name="575" href="#575">575</a>         X509Security x509 = <strong class="jxr_keyword">null</strong>;
-<a name="576" href="#576">576</a>         <a href="../../../../../org/apache/ws/security/message/token/PKIPathSecurity.html">PKIPathSecurity</a> pkiPath = <strong class="jxr_keyword">null</strong>;
-<a name="577" href="#577">577</a> 
-<a name="578" href="#578">578</a>         <strong class="jxr_keyword">if</strong> (X509Security.X509_V3_TYPE.equals(type)) {
-<a name="579" href="#579">579</a>             x509 = <strong class="jxr_keyword">new</strong> X509Security(element);
-<a name="580" href="#580">580</a>             <strong class="jxr_keyword">return</strong> (BinarySecurity) x509;
-<a name="581" href="#581">581</a>         } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (PKIPathSecurity.getType().equals(type)) {
-<a name="582" href="#582">582</a>             pkiPath = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/message/token/PKIPathSecurity.html">PKIPathSecurity</a>(element);
-<a name="583" href="#583">583</a>             <strong class="jxr_keyword">return</strong> (BinarySecurity) pkiPath;
-<a name="584" href="#584">584</a>         }
-<a name="585" href="#585">585</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="586" href="#586">586</a>             WSSecurityException.UNSUPPORTED_SECURITY_TOKEN,
-<a name="587" href="#587">587</a>             <span class="jxr_string">"unsupportedBinaryTokenType"</span>, 
-<a name="588" href="#588">588</a>             <strong class="jxr_keyword">new</strong> Object[]{type}
-<a name="589" href="#589">589</a>         );
-<a name="590" href="#590">590</a>     }
-<a name="591" href="#591">591</a> 
-<a name="592" href="#592">592</a>     <strong class="jxr_keyword">public</strong> String getId() {
-<a name="593" href="#593">593</a>         <strong class="jxr_keyword">return</strong> signatureId;
-<a name="594" href="#594">594</a>     }
-<a name="595" href="#595">595</a> 
-<a name="596" href="#596">596</a> }
+<a name="473" href="#473">473</a>                         ref.setProtectedElement(se);
+<a name="474" href="#474">474</a>                         ref.setXpath(ReferenceListProcessor.getXPath(se));
+<a name="475" href="#475">475</a>                         protectedElements.add(ref);
+<a name="476" href="#476">476</a>                         returnElements.add(WSSecurityUtil.getIDFromReference(uri));
+<a name="477" href="#477">477</a>                     } <strong class="jxr_keyword">else</strong> {
+<a name="478" href="#478">478</a>                        <em class="jxr_comment">// This is the case where the signed element is identified </em>
+<a name="479" href="#479">479</a>                        <em class="jxr_comment">// by a transform such as XPath filtering</em>
+<a name="480" href="#480">480</a>                        <em class="jxr_comment">// We add the complete reference element to the return </em>
+<a name="481" href="#481">481</a>                        <em class="jxr_comment">// elements</em>
+<a name="482" href="#482">482</a>                        returnElements.add(siRef); 
+<a name="483" href="#483">483</a>                     }
+<a name="484" href="#484">484</a>                 }
+<a name="485" href="#485">485</a>                 
+<a name="486" href="#486">486</a>                 <strong class="jxr_keyword">if</strong> (certs != <strong class="jxr_keyword">null</strong>) {
+<a name="487" href="#487">487</a>                     returnCert[0] = certs[0];
+<a name="488" href="#488">488</a>                     <strong class="jxr_keyword">return</strong> certs[0].getSubjectDN();
+<a name="489" href="#489">489</a>                 } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (publicKey != <strong class="jxr_keyword">null</strong>) {
+<a name="490" href="#490">490</a>                     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/PublicKeyPrincipal.html">PublicKeyPrincipal</a>(publicKey);
+<a name="491" href="#491">491</a>                 } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (ut != <strong class="jxr_keyword">null</strong>) {
+<a name="492" href="#492">492</a>                     <a href="../../../../../org/apache/ws/security/WSUsernameTokenPrincipal.html">WSUsernameTokenPrincipal</a> principal = 
+<a name="493" href="#493">493</a>                         <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSUsernameTokenPrincipal.html">WSUsernameTokenPrincipal</a>(ut.getName(), ut.isHashed());
+<a name="494" href="#494">494</a>                     principal.setNonce(ut.getNonce());
+<a name="495" href="#495">495</a>                     principal.setPassword(ut.getPassword());
+<a name="496" href="#496">496</a>                     principal.setCreatedTime(ut.getCreated());
+<a name="497" href="#497">497</a>                     <strong class="jxr_keyword">return</strong> principal;
+<a name="498" href="#498">498</a>                 } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (dkt != <strong class="jxr_keyword">null</strong>) {
+<a name="499" href="#499">499</a>                     <a href="../../../../../org/apache/ws/security/WSDerivedKeyTokenPrincipal.html">WSDerivedKeyTokenPrincipal</a> principal = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSDerivedKeyTokenPrincipal.html">WSDerivedKeyTokenPrincipal</a>(dkt.getID());
+<a name="500" href="#500">500</a>                     principal.setNonce(dkt.getNonce());
+<a name="501" href="#501">501</a>                     principal.setLabel(dkt.getLabel());
+<a name="502" href="#502">502</a>                     principal.setLength(dkt.getLength());
+<a name="503" href="#503">503</a>                     principal.setOffset(dkt.getOffset());
+<a name="504" href="#504">504</a>                     String basetokenId = <strong class="jxr_keyword">null</strong>;
+<a name="505" href="#505">505</a>                     <a href="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html">SecurityTokenReference</a> securityTokenReference = dkt.getSecurityTokenReference();
+<a name="506" href="#506">506</a>                     <strong class="jxr_keyword">if</strong> (securityTokenReference.containsReference()) {
+<a name="507" href="#507">507</a>                         basetokenId = securityTokenReference.getReference().getURI();
+<a name="508" href="#508">508</a>                         <strong class="jxr_keyword">if</strong> (basetokenId.charAt(0) == '#') {
+<a name="509" href="#509">509</a>                             basetokenId = basetokenId.substring(1);
+<a name="510" href="#510">510</a>                         }
+<a name="511" href="#511">511</a>                     } <strong class="jxr_keyword">else</strong> {
+<a name="512" href="#512">512</a>                         <em class="jxr_comment">// KeyIdentifier</em>
+<a name="513" href="#513">513</a>                         basetokenId = securityTokenReference.getKeyIdentifierValue();
+<a name="514" href="#514">514</a>                     }
+<a name="515" href="#515">515</a>                     principal.setBasetokenId(basetokenId);
+<a name="516" href="#516">516</a>                     <strong class="jxr_keyword">return</strong> principal;
+<a name="517" href="#517">517</a>                 } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (samlKi != <strong class="jxr_keyword">null</strong>) {
+<a name="518" href="#518">518</a>                     <strong class="jxr_keyword">final</strong> SAMLAssertion assertion = samlKi.getAssertion();
+<a name="519" href="#519">519</a>                     <a href="../../../../../org/apache/ws/security/CustomTokenPrincipal.html">CustomTokenPrincipal</a> principal = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/CustomTokenPrincipal.html">CustomTokenPrincipal</a>(assertion.getId());
+<a name="520" href="#520">520</a>                     principal.setTokenObject(assertion);
+<a name="521" href="#521">521</a>                     <strong class="jxr_keyword">return</strong> principal;
+<a name="522" href="#522">522</a>                 } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (secretKey != <strong class="jxr_keyword">null</strong>) {
+<a name="523" href="#523">523</a>                     <em class="jxr_comment">// This is the custom key scenario</em>
+<a name="524" href="#524">524</a>                     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/CustomTokenPrincipal.html">CustomTokenPrincipal</a>(customTokenId);
+<a name="525" href="#525">525</a>                 } <strong class="jxr_keyword">else</strong> {
+<a name="526" href="#526">526</a>                     <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(<span class="jxr_string">"Cannot determine principal"</span>);
+<a name="527" href="#527">527</a>                 }
+<a name="528" href="#528">528</a>             } <strong class="jxr_keyword">else</strong> {
+<a name="529" href="#529">529</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILED_CHECK);
+<a name="530" href="#530">530</a>             }
+<a name="531" href="#531">531</a>         } <strong class="jxr_keyword">catch</strong> (XMLSignatureException e1) {
+<a name="532" href="#532">532</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="533" href="#533">533</a>                 WSSecurityException.FAILED_CHECK, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, e1
+<a name="534" href="#534">534</a>             );
+<a name="535" href="#535">535</a>         }
+<a name="536" href="#536">536</a>     }
+<a name="537" href="#537">537</a> 
+<a name="538" href="#538">538</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="539" href="#539">539</a> <em class="jxr_javadoccomment">     * Extracts the certificate(s) from the Binary Security token reference.</em>
+<a name="540" href="#540">540</a> <em class="jxr_javadoccomment">     *</em>
+<a name="541" href="#541">541</a> <em class="jxr_javadoccomment">     * @param elem The element containing the binary security token. This is</em>
+<a name="542" href="#542">542</a> <em class="jxr_javadoccomment">     *             either X509 certificate(s) or a PKIPath.</em>
+<a name="543" href="#543">543</a> <em class="jxr_javadoccomment">     * @return an array of X509 certificates</em>
+<a name="544" href="#544">544</a> <em class="jxr_javadoccomment">     * @throws WSSecurityException</em>
+<a name="545" href="#545">545</a> <em class="jxr_javadoccomment">     */</em>
+<a name="546" href="#546">546</a>     <strong class="jxr_keyword">public</strong> X509Certificate[] getCertificatesTokenReference(Element elem, <a href="../../../../../org/apache/ws/security/components/crypto/Crypto.html">Crypto</a> crypto)
+<a name="547" href="#547">547</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
+<a name="548" href="#548">548</a>         <strong class="jxr_keyword">if</strong> (crypto == <strong class="jxr_keyword">null</strong>) {
+<a name="549" href="#549">549</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">"noSigCryptoFile"</span>);
+<a name="550" href="#550">550</a>         }
+<a name="551" href="#551">551</a>         <a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a> token = createSecurityToken(elem);
+<a name="552" href="#552">552</a>         <strong class="jxr_keyword">if</strong> (token instanceof PKIPathSecurity) {
+<a name="553" href="#553">553</a>             <strong class="jxr_keyword">return</strong> ((PKIPathSecurity) token).getX509Certificates(false, crypto);
+<a name="554" href="#554">554</a>         } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (token instanceof X509Security) {
+<a name="555" href="#555">555</a>             X509Certificate cert = ((X509Security) token).getX509Certificate(crypto);
+<a name="556" href="#556">556</a>             X509Certificate[] certs = <strong class="jxr_keyword">new</strong> X509Certificate[1];
+<a name="557" href="#557">557</a>             certs[0] = cert;
+<a name="558" href="#558">558</a>             <strong class="jxr_keyword">return</strong> certs;
+<a name="559" href="#559">559</a>         }
+<a name="560" href="#560">560</a>         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a name="561" href="#561">561</a>     }
+<a name="562" href="#562">562</a> 
+<a name="563" href="#563">563</a> 
+<a name="564" href="#564">564</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="565" href="#565">565</a> <em class="jxr_javadoccomment">     * Checks the &lt;code&gt;element&lt;/code&gt; and creates appropriate binary security object.</em>
+<a name="566" href="#566">566</a> <em class="jxr_javadoccomment">     *</em>
+<a name="567" href="#567">567</a> <em class="jxr_javadoccomment">     * @param element The XML element that contains either a &lt;code&gt;BinarySecurityToken</em>
+<a name="568" href="#568">568</a> <em class="jxr_javadoccomment">     *                &lt;/code&gt; or a &lt;code&gt;PKIPath&lt;/code&gt; element. Other element types a not</em>
+<a name="569" href="#569">569</a> <em class="jxr_javadoccomment">     *                supported</em>
+<a name="570" href="#570">570</a> <em class="jxr_javadoccomment">     * @return the BinarySecurity object, either a &lt;code&gt;X509Security&lt;/code&gt; or a</em>
+<a name="571" href="#571">571</a> <em class="jxr_javadoccomment">     *         &lt;code&gt;PKIPathSecurity&lt;/code&gt; object.</em>
+<a name="572" href="#572">572</a> <em class="jxr_javadoccomment">     * @throws WSSecurityException</em>
+<a name="573" href="#573">573</a> <em class="jxr_javadoccomment">     */</em>
+<a name="574" href="#574">574</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a> createSecurityToken(Element element) <strong class="jxr_keyword">throws</strong> WSSecurityException {
+<a name="575" href="#575">575</a>         <a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a> token = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a>(element);
+<a name="576" href="#576">576</a>         String type = token.getValueType();
+<a name="577" href="#577">577</a>         X509Security x509 = <strong class="jxr_keyword">null</strong>;
+<a name="578" href="#578">578</a>         <a href="../../../../../org/apache/ws/security/message/token/PKIPathSecurity.html">PKIPathSecurity</a> pkiPath = <strong class="jxr_keyword">null</strong>;
+<a name="579" href="#579">579</a> 
+<a name="580" href="#580">580</a>         <strong class="jxr_keyword">if</strong> (X509Security.X509_V3_TYPE.equals(type)) {
+<a name="581" href="#581">581</a>             x509 = <strong class="jxr_keyword">new</strong> X509Security(element);
+<a name="582" href="#582">582</a>             <strong class="jxr_keyword">return</strong> (BinarySecurity) x509;
+<a name="583" href="#583">583</a>         } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (PKIPathSecurity.getType().equals(type)) {
+<a name="584" href="#584">584</a>             pkiPath = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/message/token/PKIPathSecurity.html">PKIPathSecurity</a>(element);
+<a name="585" href="#585">585</a>             <strong class="jxr_keyword">return</strong> (BinarySecurity) pkiPath;
+<a name="586" href="#586">586</a>         }
+<a name="587" href="#587">587</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="588" href="#588">588</a>             WSSecurityException.UNSUPPORTED_SECURITY_TOKEN,
+<a name="589" href="#589">589</a>             <span class="jxr_string">"unsupportedBinaryTokenType"</span>, 
+<a name="590" href="#590">590</a>             <strong class="jxr_keyword">new</strong> Object[]{type}
+<a name="591" href="#591">591</a>         );
+<a name="592" href="#592">592</a>     }
+<a name="593" href="#593">593</a> 
+<a name="594" href="#594">594</a>     <strong class="jxr_keyword">public</strong> String getId() {
+<a name="595" href="#595">595</a>         <strong class="jxr_keyword">return</strong> signatureId;
+<a name="596" href="#596">596</a>     }
+<a name="597" href="#597">597</a> 
+<a name="598" href="#598">598</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=798514&r1=798513&r2=798514&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 Tue Jul 28 13:23:48 2009
@@ -53,172 +53,174 @@
 <a name="43" href="#43">43</a>      <strong class="jxr_keyword">private</strong> String utId;
 <a name="44" href="#44">44</a>      <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/ws/security/message/token/UsernameToken.html">UsernameToken</a> ut;
 <a name="45" href="#45">45</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> handleCustomPasswordTypes;
-<a name="46" href="#46">46</a>      
-<a name="47" href="#47">47</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> handleToken(Element elem, <a href="../../../../../org/apache/ws/security/components/crypto/Crypto.html">Crypto</a> crypto, <a href="../../../../../org/apache/ws/security/components/crypto/Crypto.html">Crypto</a> decCrypto, CallbackHandler cb, 
-<a name="48" href="#48">48</a>          <a href="../../../../../org/apache/ws/security/WSDocInfo.html">WSDocInfo</a> wsDocInfo, Vector returnResults, <a href="../../../../../org/apache/ws/security/WSSConfig.html">WSSConfig</a> wsc) <strong class="jxr_keyword">throws</strong> WSSecurityException {
-<a name="49" href="#49">49</a>          <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
-<a name="50" href="#50">50</a>              log.debug(<span class="jxr_string">"Found UsernameToken list element"</span>);
-<a name="51" href="#51">51</a>          }
-<a name="52" href="#52">52</a>          handleCustomPasswordTypes = wsc.getHandleCustomPasswordTypes();
-<a name="53" href="#53">53</a>          
-<a name="54" href="#54">54</a>          Principal lastPrincipalFound = handleUsernameToken((Element) elem, cb);
-<a name="55" href="#55">55</a>          returnResults.add(
-<a name="56" href="#56">56</a>              0, 
-<a name="57" href="#57">57</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a>(WSConstants.UT, lastPrincipalFound, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>)
-<a name="58" href="#58">58</a>          );
-<a name="59" href="#59">59</a>          utId = ut.getID();
-<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">     * Check the UsernameToken element. Depending on the password type</em>
-<a name="64" href="#64">64</a>  <em class="jxr_javadoccomment">     * contained in the element the processing differs. If the password type</em>
-<a name="65" href="#65">65</a>  <em class="jxr_javadoccomment">     * is digested, then retrieve a password from the callback handler and</em>
-<a name="66" href="#66">66</a>  <em class="jxr_javadoccomment">     * authenticate the UsernameToken here.</em>
-<a name="67" href="#67">67</a>  <em class="jxr_javadoccomment">     * &lt;p/&gt;</em>
-<a name="68" href="#68">68</a>  <em class="jxr_javadoccomment">     * If the password is in plaintext or any other yet unknown password type</em>
-<a name="69" href="#69">69</a>  <em class="jxr_javadoccomment">     * then delegate the password validation to the callback class. Note that for unknown</em>
-<a name="70" href="#70">70</a>  <em class="jxr_javadoccomment">     * password types an exception is thrown if WSSConfig.getHandleCustomPasswordTypes()</em>
-<a name="71" href="#71">71</a>  <em class="jxr_javadoccomment">     * is set to false (as it is by default). The security engine hands over all necessary</em>
-<a name="72" href="#72">72</a>  <em class="jxr_javadoccomment">     * data to the callback class via the WSPasswordCallback object. The usage parameter of</em>
-<a name="73" href="#73">73</a>  <em class="jxr_javadoccomment">     * WSPasswordCallback is set to &lt;code&gt;USERNAME_TOKEN_UNKNOWN&lt;/code&gt;.</em>
-<a name="74" href="#74">74</a>  <em class="jxr_javadoccomment">     *</em>
-<a name="75" href="#75">75</a>  <em class="jxr_javadoccomment">     * @param token the DOM element that contains the UsernameToken</em>
-<a name="76" href="#76">76</a>  <em class="jxr_javadoccomment">     * @param cb    the reference to the callback object</em>
-<a name="77" href="#77">77</a>  <em class="jxr_javadoccomment">     * @return WSUsernameTokenPrincipal that contain data that an application</em>
-<a name="78" href="#78">78</a>  <em class="jxr_javadoccomment">     *         may use to further validate the password/user combination.</em>
-<a name="79" href="#79">79</a>  <em class="jxr_javadoccomment">     * @throws WSSecurityException</em>
-<a name="80" href="#80">80</a>  <em class="jxr_javadoccomment">     */</em>
-<a name="81" href="#81">81</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/ws/security/WSUsernameTokenPrincipal.html">WSUsernameTokenPrincipal</a> handleUsernameToken(Element token, CallbackHandler cb) 
-<a name="82" href="#82">82</a>          <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
-<a name="83" href="#83">83</a>          <strong class="jxr_keyword">if</strong> (cb == <strong class="jxr_keyword">null</strong>) {
-<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>(WSSecurityException.FAILURE, <span class="jxr_string">"noCallback"</span>);
-<a name="85" href="#85">85</a>          }
-<a name="86" href="#86">86</a>          <em class="jxr_comment">//</em>
-<a name="87" href="#87">87</a>          <em class="jxr_comment">// Parse the UsernameToken element</em>
+<a name="46" href="#46">46</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> allowNamespaceQualifiedPasswordTypes;
+<a name="47" href="#47">47</a>      
+<a name="48" href="#48">48</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> handleToken(Element elem, <a href="../../../../../org/apache/ws/security/components/crypto/Crypto.html">Crypto</a> crypto, <a href="../../../../../org/apache/ws/security/components/crypto/Crypto.html">Crypto</a> decCrypto, CallbackHandler cb, 
+<a name="49" href="#49">49</a>          <a href="../../../../../org/apache/ws/security/WSDocInfo.html">WSDocInfo</a> wsDocInfo, Vector returnResults, <a href="../../../../../org/apache/ws/security/WSSConfig.html">WSSConfig</a> wsc) <strong class="jxr_keyword">throws</strong> WSSecurityException {
+<a name="50" href="#50">50</a>          <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
+<a name="51" href="#51">51</a>              log.debug(<span class="jxr_string">"Found UsernameToken list element"</span>);
+<a name="52" href="#52">52</a>          }
+<a name="53" href="#53">53</a>          handleCustomPasswordTypes = wsc.getHandleCustomPasswordTypes();
+<a name="54" href="#54">54</a>          allowNamespaceQualifiedPasswordTypes = wsc.getAllowNamespaceQualifiedPasswordTypes();
+<a name="55" href="#55">55</a>          
+<a name="56" href="#56">56</a>          Principal lastPrincipalFound = handleUsernameToken((Element) elem, cb);
+<a name="57" href="#57">57</a>          returnResults.add(
+<a name="58" href="#58">58</a>              0, 
+<a name="59" href="#59">59</a>              <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a>(WSConstants.UT, lastPrincipalFound, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>)
+<a name="60" href="#60">60</a>          );
+<a name="61" href="#61">61</a>          utId = ut.getID();
+<a name="62" href="#62">62</a>      }
+<a name="63" href="#63">63</a>  
+<a name="64" href="#64">64</a>      <em class="jxr_javadoccomment">/**</em>
+<a name="65" href="#65">65</a>  <em class="jxr_javadoccomment">     * Check the UsernameToken element. Depending on the password type</em>
+<a name="66" href="#66">66</a>  <em class="jxr_javadoccomment">     * contained in the element the processing differs. If the password type</em>
+<a name="67" href="#67">67</a>  <em class="jxr_javadoccomment">     * is digested, then retrieve a password from the callback handler and</em>
+<a name="68" href="#68">68</a>  <em class="jxr_javadoccomment">     * authenticate the UsernameToken here.</em>
+<a name="69" href="#69">69</a>  <em class="jxr_javadoccomment">     * &lt;p/&gt;</em>
+<a name="70" href="#70">70</a>  <em class="jxr_javadoccomment">     * If the password is in plaintext or any other yet unknown password type</em>
+<a name="71" href="#71">71</a>  <em class="jxr_javadoccomment">     * then delegate the password validation to the callback class. Note that for unknown</em>
+<a name="72" href="#72">72</a>  <em class="jxr_javadoccomment">     * password types an exception is thrown if WSSConfig.getHandleCustomPasswordTypes()</em>
+<a name="73" href="#73">73</a>  <em class="jxr_javadoccomment">     * is set to false (as it is by default). The security engine hands over all necessary</em>
+<a name="74" href="#74">74</a>  <em class="jxr_javadoccomment">     * data to the callback class via the WSPasswordCallback object. The usage parameter of</em>
+<a name="75" href="#75">75</a>  <em class="jxr_javadoccomment">     * WSPasswordCallback is set to &lt;code&gt;USERNAME_TOKEN_UNKNOWN&lt;/code&gt;.</em>
+<a name="76" href="#76">76</a>  <em class="jxr_javadoccomment">     *</em>
+<a name="77" href="#77">77</a>  <em class="jxr_javadoccomment">     * @param token the DOM element that contains the UsernameToken</em>
+<a name="78" href="#78">78</a>  <em class="jxr_javadoccomment">     * @param cb    the reference to the callback object</em>
+<a name="79" href="#79">79</a>  <em class="jxr_javadoccomment">     * @return WSUsernameTokenPrincipal that contain data that an application</em>
+<a name="80" href="#80">80</a>  <em class="jxr_javadoccomment">     *         may use to further validate the password/user combination.</em>
+<a name="81" href="#81">81</a>  <em class="jxr_javadoccomment">     * @throws WSSecurityException</em>
+<a name="82" href="#82">82</a>  <em class="jxr_javadoccomment">     */</em>
+<a name="83" href="#83">83</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/ws/security/WSUsernameTokenPrincipal.html">WSUsernameTokenPrincipal</a> handleUsernameToken(Element token, CallbackHandler cb) 
+<a name="84" href="#84">84</a>          <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
+<a name="85" href="#85">85</a>          <strong class="jxr_keyword">if</strong> (cb == <strong class="jxr_keyword">null</strong>) {
+<a name="86" href="#86">86</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="87" href="#87">87</a>          }
 <a name="88" href="#88">88</a>          <em class="jxr_comment">//</em>
-<a name="89" href="#89">89</a>          ut = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/message/token/UsernameToken.html">UsernameToken</a>(token);
-<a name="90" href="#90">90</a>          String user = ut.getName();
-<a name="91" href="#91">91</a>          String password = ut.getPassword();
-<a name="92" href="#92">92</a>          String nonce = ut.getNonce();
-<a name="93" href="#93">93</a>          String createdTime = ut.getCreated();
-<a name="94" href="#94">94</a>          String pwType = ut.getPasswordType();
-<a name="95" href="#95">95</a>          <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
-<a name="96" href="#96">96</a>              log.debug(<span class="jxr_string">"UsernameToken user "</span> + user);
-<a name="97" href="#97">97</a>              log.debug(<span class="jxr_string">"UsernameToken password "</span> + password);
-<a name="98" href="#98">98</a>          }
-<a name="99" href="#99">99</a>  
-<a name="100" href="#100">100</a>         Callback[] callbacks = <strong class="jxr_keyword">new</strong> Callback[1];
-<a name="101" href="#101">101</a>         String origPassword = <strong class="jxr_keyword">null</strong>;
-<a name="102" href="#102">102</a>         
-<a name="103" href="#103">103</a>         <em class="jxr_comment">//</em>
-<a name="104" href="#104">104</a>         <em class="jxr_comment">// If the UsernameToken is hashed, then retrieve the password from the callback handler </em>
-<a name="105" href="#105">105</a>         <em class="jxr_comment">// and compare directly. If the UsernameToken is in plaintext or of some unknown type,</em>
-<a name="106" href="#106">106</a>         <em class="jxr_comment">// then delegate authentication to the callback handler</em>
-<a name="107" href="#107">107</a>         <em class="jxr_comment">//</em>
-<a name="108" href="#108">108</a>         <strong class="jxr_keyword">if</strong> (ut.isHashed()) {
-<a name="109" href="#109">109</a>             <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a> pwCb = 
-<a name="110" href="#110">110</a>                 <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a>(user, WSPasswordCallback.USERNAME_TOKEN);
-<a name="111" href="#111">111</a>             callbacks[0] = pwCb;
-<a name="112" href="#112">112</a>             <strong class="jxr_keyword">try</strong> {
-<a name="113" href="#113">113</a>                 cb.handle(callbacks);
-<a name="114" href="#114">114</a>             } <strong class="jxr_keyword">catch</strong> (IOException e) {
-<a name="115" href="#115">115</a>                 <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
-<a name="116" href="#116">116</a>                     log.debug(e);
-<a name="117" href="#117">117</a>                 }
-<a name="118" href="#118">118</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="119" href="#119">119</a>                     WSSecurityException.FAILED_AUTHENTICATION, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, e
-<a name="120" href="#120">120</a>                 );
-<a name="121" href="#121">121</a>             } <strong class="jxr_keyword">catch</strong> (UnsupportedCallbackException e) {
-<a name="122" href="#122">122</a>                 <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
-<a name="123" href="#123">123</a>                     log.debug(e);
-<a name="124" href="#124">124</a>                 }
-<a name="125" href="#125">125</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="126" href="#126">126</a>                     WSSecurityException.FAILED_AUTHENTICATION, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, e
-<a name="127" href="#127">127</a>                 );
-<a name="128" href="#128">128</a>             }
-<a name="129" href="#129">129</a>             origPassword = pwCb.getPassword();
-<a name="130" href="#130">130</a>             <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
-<a name="131" href="#131">131</a>                 log.debug(<span class="jxr_string">"UsernameToken callback password "</span> + origPassword);
-<a name="132" href="#132">132</a>             }
-<a name="133" href="#133">133</a>             <strong class="jxr_keyword">if</strong> (origPassword == <strong class="jxr_keyword">null</strong>) {
-<a name="134" href="#134">134</a>                 <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
-<a name="135" href="#135">135</a>                     log.debug(<span class="jxr_string">"Callback supplied no password for: "</span> + user);
-<a name="136" href="#136">136</a>                 }
-<a name="137" href="#137">137</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILED_AUTHENTICATION);
-<a name="138" href="#138">138</a>             }
-<a name="139" href="#139">139</a>             String passDigest = UsernameToken.doPasswordDigest(nonce, createdTime, origPassword);
-<a name="140" href="#140">140</a>             <strong class="jxr_keyword">if</strong> (!passDigest.equals(password)) {
-<a name="141" href="#141">141</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILED_AUTHENTICATION);
-<a name="142" href="#142">142</a>             }
-<a name="143" href="#143">143</a>             ut.setRawPassword(origPassword);
-<a name="144" href="#144">144</a>         } <strong class="jxr_keyword">else</strong> {
-<a name="145" href="#145">145</a>             <strong class="jxr_keyword">if</strong> (!WSConstants.PASSWORD_TEXT.equals(pwType) 
-<a name="146" href="#146">146</a>                 &amp;&amp; pwType != <strong class="jxr_keyword">null</strong>
-<a name="147" href="#147">147</a>                 &amp;&amp; !handleCustomPasswordTypes
-<a name="148" href="#148">148</a>             ) {
-<a name="149" href="#149">149</a>                 <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
-<a name="150" href="#150">150</a>                     log.debug(<span class="jxr_string">"Authentication failed as handleCustomUsernameTokenTypes is false"</span>);
-<a name="151" href="#151">151</a>                 }
-<a name="152" href="#152">152</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILED_AUTHENTICATION);
-<a name="153" href="#153">153</a>             }
-<a name="154" href="#154">154</a>             <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a> pwCb = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a>(user, password,
-<a name="155" href="#155">155</a>                     pwType, WSPasswordCallback.USERNAME_TOKEN_UNKNOWN);
-<a name="156" href="#156">156</a>             callbacks[0] = pwCb;
-<a name="157" href="#157">157</a>             <strong class="jxr_keyword">try</strong> {
-<a name="158" href="#158">158</a>                 cb.handle(callbacks);
-<a name="159" href="#159">159</a>             } <strong class="jxr_keyword">catch</strong> (IOException e) {
-<a name="160" href="#160">160</a>                 <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
-<a name="161" href="#161">161</a>                     log.debug(e);
-<a name="162" href="#162">162</a>                 }
-<a name="163" href="#163">163</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="164" href="#164">164</a>                     WSSecurityException.FAILED_AUTHENTICATION, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, e
-<a name="165" href="#165">165</a>                 );
-<a name="166" href="#166">166</a>             } <strong class="jxr_keyword">catch</strong> (UnsupportedCallbackException e) {
-<a name="167" href="#167">167</a>                 <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
-<a name="168" href="#168">168</a>                     log.debug(e);
-<a name="169" href="#169">169</a>                 }
-<a name="170" href="#170">170</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="171" href="#171">171</a>                     WSSecurityException.FAILED_AUTHENTICATION, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, e
-<a name="172" href="#172">172</a>                 );
-<a name="173" href="#173">173</a>             }
-<a name="174" href="#174">174</a>             origPassword = pwCb.getPassword();
-<a name="175" href="#175">175</a>             ut.setRawPassword(origPassword);
-<a name="176" href="#176">176</a>         }
-<a name="177" href="#177">177</a>         <a href="../../../../../org/apache/ws/security/WSUsernameTokenPrincipal.html">WSUsernameTokenPrincipal</a> principal = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSUsernameTokenPrincipal.html">WSUsernameTokenPrincipal</a>(user, ut.isHashed());
-<a name="178" href="#178">178</a>         principal.setNonce(nonce);
-<a name="179" href="#179">179</a>         principal.setPassword(password);
-<a name="180" href="#180">180</a>         principal.setCreatedTime(createdTime);
-<a name="181" href="#181">181</a>         principal.setPasswordType(pwType);
-<a name="182" href="#182">182</a> 
-<a name="183" href="#183">183</a>         <strong class="jxr_keyword">return</strong> principal;
-<a name="184" href="#184">184</a>     }
-<a name="185" href="#185">185</a> 
-<a name="186" href="#186">186</a>     <em class="jxr_comment">/*<em class="jxr_comment"> (non-Javadoc)</em></em>
-<a name="187" href="#187">187</a> <em class="jxr_comment">     * @see org.apache.ws.security.processor.Processor#getId()</em>
-<a name="188" href="#188">188</a> <em class="jxr_comment">     */</em>
-<a name="189" href="#189">189</a>     <strong class="jxr_keyword">public</strong> String getId() {
-<a name="190" href="#190">190</a>         <strong class="jxr_keyword">return</strong> utId;
-<a name="191" href="#191">191</a>     }
-<a name="192" href="#192">192</a> 
-<a name="193" href="#193">193</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="194" href="#194">194</a> <em class="jxr_javadoccomment">     * Get the processed UsernameToken.</em>
-<a name="195" href="#195">195</a> <em class="jxr_javadoccomment">     * </em>
-<a name="196" href="#196">196</a> <em class="jxr_javadoccomment">     * @return the ut</em>
-<a name="197" href="#197">197</a> <em class="jxr_javadoccomment">     */</em>
-<a name="198" href="#198">198</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/ws/security/message/token/UsernameToken.html">UsernameToken</a> getUt() {
-<a name="199" href="#199">199</a>         <strong class="jxr_keyword">return</strong> ut;
-<a name="200" href="#200">200</a>     }    
-<a name="201" href="#201">201</a>     
-<a name="202" href="#202">202</a>     <strong class="jxr_keyword">public</strong> byte[] getDerivedKey(CallbackHandler cb) <strong class="jxr_keyword">throws</strong> WSSecurityException {
-<a name="203" href="#203">203</a>         String password = ut.getRawPassword();
-<a name="204" href="#204">204</a>         <strong class="jxr_keyword">if</strong> (password == <strong class="jxr_keyword">null</strong>) {
-<a name="205" href="#205">205</a>             password = <span class="jxr_string">""</span>;
-<a name="206" href="#206">206</a>         }
-<a name="207" href="#207">207</a>         byte[] saltValue = ut.getSalt();
-<a name="208" href="#208">208</a>         <strong class="jxr_keyword">int</strong> iteration = ut.getIteration();
-<a name="209" href="#209">209</a>         <strong class="jxr_keyword">return</strong> UsernameToken.generateDerivedKey(password, saltValue, iteration);
-<a name="210" href="#210">210</a>     }
-<a name="211" href="#211">211</a> }
+<a name="89" href="#89">89</a>          <em class="jxr_comment">// Parse the UsernameToken element</em>
+<a name="90" href="#90">90</a>          <em class="jxr_comment">//</em>
+<a name="91" href="#91">91</a>          ut = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/message/token/UsernameToken.html">UsernameToken</a>(token, allowNamespaceQualifiedPasswordTypes);
+<a name="92" href="#92">92</a>          String user = ut.getName();
+<a name="93" href="#93">93</a>          String password = ut.getPassword();
+<a name="94" href="#94">94</a>          String nonce = ut.getNonce();
+<a name="95" href="#95">95</a>          String createdTime = ut.getCreated();
+<a name="96" href="#96">96</a>          String pwType = ut.getPasswordType();
+<a name="97" href="#97">97</a>          <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
+<a name="98" href="#98">98</a>              log.debug(<span class="jxr_string">"UsernameToken user "</span> + user);
+<a name="99" href="#99">99</a>              log.debug(<span class="jxr_string">"UsernameToken password "</span> + password);
+<a name="100" href="#100">100</a>         }
+<a name="101" href="#101">101</a> 
+<a name="102" href="#102">102</a>         Callback[] callbacks = <strong class="jxr_keyword">new</strong> Callback[1];
+<a name="103" href="#103">103</a>         String origPassword = <strong class="jxr_keyword">null</strong>;
+<a name="104" href="#104">104</a>         
+<a name="105" href="#105">105</a>         <em class="jxr_comment">//</em>
+<a name="106" href="#106">106</a>         <em class="jxr_comment">// If the UsernameToken is hashed, then retrieve the password from the callback handler </em>
+<a name="107" href="#107">107</a>         <em class="jxr_comment">// and compare directly. If the UsernameToken is in plaintext or of some unknown type,</em>
+<a name="108" href="#108">108</a>         <em class="jxr_comment">// then delegate authentication to the callback handler</em>
+<a name="109" href="#109">109</a>         <em class="jxr_comment">//</em>
+<a name="110" href="#110">110</a>         <strong class="jxr_keyword">if</strong> (ut.isHashed()) {
+<a name="111" href="#111">111</a>             <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a> pwCb = 
+<a name="112" href="#112">112</a>                 <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a>(user, <strong class="jxr_keyword">null</strong>, pwType, WSPasswordCallback.USERNAME_TOKEN);
+<a name="113" href="#113">113</a>             callbacks[0] = pwCb;
+<a name="114" href="#114">114</a>             <strong class="jxr_keyword">try</strong> {
+<a name="115" href="#115">115</a>                 cb.handle(callbacks);
+<a name="116" href="#116">116</a>             } <strong class="jxr_keyword">catch</strong> (IOException e) {
+<a name="117" href="#117">117</a>                 <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
+<a name="118" href="#118">118</a>                     log.debug(e);
+<a name="119" href="#119">119</a>                 }
+<a name="120" href="#120">120</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="121" href="#121">121</a>                     WSSecurityException.FAILED_AUTHENTICATION, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, e
+<a name="122" href="#122">122</a>                 );
+<a name="123" href="#123">123</a>             } <strong class="jxr_keyword">catch</strong> (UnsupportedCallbackException e) {
+<a name="124" href="#124">124</a>                 <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
+<a name="125" href="#125">125</a>                     log.debug(e);
+<a name="126" href="#126">126</a>                 }
+<a name="127" href="#127">127</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="128" href="#128">128</a>                     WSSecurityException.FAILED_AUTHENTICATION, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, e
+<a name="129" href="#129">129</a>                 );
+<a name="130" href="#130">130</a>             }
+<a name="131" href="#131">131</a>             origPassword = pwCb.getPassword();
+<a name="132" href="#132">132</a>             <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
+<a name="133" href="#133">133</a>                 log.debug(<span class="jxr_string">"UsernameToken callback password "</span> + origPassword);
+<a name="134" href="#134">134</a>             }
+<a name="135" href="#135">135</a>             <strong class="jxr_keyword">if</strong> (origPassword == <strong class="jxr_keyword">null</strong>) {
+<a name="136" href="#136">136</a>                 <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
+<a name="137" href="#137">137</a>                     log.debug(<span class="jxr_string">"Callback supplied no password for: "</span> + user);
+<a name="138" href="#138">138</a>                 }
+<a name="139" href="#139">139</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILED_AUTHENTICATION);
+<a name="140" href="#140">140</a>             }
+<a name="141" href="#141">141</a>             String passDigest = UsernameToken.doPasswordDigest(nonce, createdTime, origPassword);
+<a name="142" href="#142">142</a>             <strong class="jxr_keyword">if</strong> (!passDigest.equals(password)) {
+<a name="143" href="#143">143</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILED_AUTHENTICATION);
+<a name="144" href="#144">144</a>             }
+<a name="145" href="#145">145</a>             ut.setRawPassword(origPassword);
+<a name="146" href="#146">146</a>         } <strong class="jxr_keyword">else</strong> {
+<a name="147" href="#147">147</a>             <strong class="jxr_keyword">if</strong> (!WSConstants.PASSWORD_TEXT.equals(pwType) 
+<a name="148" href="#148">148</a>                 &amp;&amp; pwType != <strong class="jxr_keyword">null</strong>
+<a name="149" href="#149">149</a>                 &amp;&amp; !handleCustomPasswordTypes
+<a name="150" href="#150">150</a>             ) {
+<a name="151" href="#151">151</a>                 <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
+<a name="152" href="#152">152</a>                     log.debug(<span class="jxr_string">"Authentication failed as handleCustomUsernameTokenTypes is false"</span>);
+<a name="153" href="#153">153</a>                 }
+<a name="154" href="#154">154</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILED_AUTHENTICATION);
+<a name="155" href="#155">155</a>             }
+<a name="156" href="#156">156</a>             <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a> pwCb = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a>(user, password,
+<a name="157" href="#157">157</a>                     pwType, WSPasswordCallback.USERNAME_TOKEN_UNKNOWN);
+<a name="158" href="#158">158</a>             callbacks[0] = pwCb;
+<a name="159" href="#159">159</a>             <strong class="jxr_keyword">try</strong> {
+<a name="160" href="#160">160</a>                 cb.handle(callbacks);
+<a name="161" href="#161">161</a>             } <strong class="jxr_keyword">catch</strong> (IOException e) {
+<a name="162" href="#162">162</a>                 <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
+<a name="163" href="#163">163</a>                     log.debug(e);
+<a name="164" href="#164">164</a>                 }
+<a name="165" href="#165">165</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="166" href="#166">166</a>                     WSSecurityException.FAILED_AUTHENTICATION, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, e
+<a name="167" href="#167">167</a>                 );
+<a name="168" href="#168">168</a>             } <strong class="jxr_keyword">catch</strong> (UnsupportedCallbackException e) {
+<a name="169" href="#169">169</a>                 <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) {
+<a name="170" href="#170">170</a>                     log.debug(e);
+<a name="171" href="#171">171</a>                 }
+<a name="172" href="#172">172</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="173" href="#173">173</a>                     WSSecurityException.FAILED_AUTHENTICATION, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, e
+<a name="174" href="#174">174</a>                 );
+<a name="175" href="#175">175</a>             }
+<a name="176" href="#176">176</a>             origPassword = pwCb.getPassword();
+<a name="177" href="#177">177</a>             ut.setRawPassword(origPassword);
+<a name="178" href="#178">178</a>         }
+<a name="179" href="#179">179</a>         <a href="../../../../../org/apache/ws/security/WSUsernameTokenPrincipal.html">WSUsernameTokenPrincipal</a> principal = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSUsernameTokenPrincipal.html">WSUsernameTokenPrincipal</a>(user, ut.isHashed());
+<a name="180" href="#180">180</a>         principal.setNonce(nonce);
+<a name="181" href="#181">181</a>         principal.setPassword(password);
+<a name="182" href="#182">182</a>         principal.setCreatedTime(createdTime);
+<a name="183" href="#183">183</a>         principal.setPasswordType(pwType);
+<a name="184" href="#184">184</a> 
+<a name="185" href="#185">185</a>         <strong class="jxr_keyword">return</strong> principal;
+<a name="186" href="#186">186</a>     }
+<a name="187" href="#187">187</a> 
+<a name="188" href="#188">188</a>     <em class="jxr_comment">/*<em class="jxr_comment"> (non-Javadoc)</em></em>
+<a name="189" href="#189">189</a> <em class="jxr_comment">     * @see org.apache.ws.security.processor.Processor#getId()</em>
+<a name="190" href="#190">190</a> <em class="jxr_comment">     */</em>
+<a name="191" href="#191">191</a>     <strong class="jxr_keyword">public</strong> String getId() {
+<a name="192" href="#192">192</a>         <strong class="jxr_keyword">return</strong> utId;
+<a name="193" href="#193">193</a>     }
+<a name="194" href="#194">194</a> 
+<a name="195" href="#195">195</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="196" href="#196">196</a> <em class="jxr_javadoccomment">     * Get the processed UsernameToken.</em>
+<a name="197" href="#197">197</a> <em class="jxr_javadoccomment">     * </em>
+<a name="198" href="#198">198</a> <em class="jxr_javadoccomment">     * @return the ut</em>
+<a name="199" href="#199">199</a> <em class="jxr_javadoccomment">     */</em>
+<a name="200" href="#200">200</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/ws/security/message/token/UsernameToken.html">UsernameToken</a> getUt() {
+<a name="201" href="#201">201</a>         <strong class="jxr_keyword">return</strong> ut;
+<a name="202" href="#202">202</a>     }    
+<a name="203" href="#203">203</a>     
+<a name="204" href="#204">204</a>     <strong class="jxr_keyword">public</strong> byte[] getDerivedKey(CallbackHandler cb) <strong class="jxr_keyword">throws</strong> WSSecurityException {
+<a name="205" href="#205">205</a>         String password = ut.getRawPassword();
+<a name="206" href="#206">206</a>         <strong class="jxr_keyword">if</strong> (password == <strong class="jxr_keyword">null</strong>) {
+<a name="207" href="#207">207</a>             password = <span class="jxr_string">""</span>;
+<a name="208" href="#208">208</a>         }
+<a name="209" href="#209">209</a>         byte[] saltValue = ut.getSalt();
+<a name="210" href="#210">210</a>         <strong class="jxr_keyword">int</strong> iteration = ut.getIteration();
+<a name="211" href="#211">211</a>         <strong class="jxr_keyword">return</strong> UsernameToken.generateDerivedKey(password, saltValue, iteration);
+<a name="212" href="#212">212</a>     }
+<a name="213" href="#213">213</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=798514&r1=798513&r2=798514&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 Tue Jul 28 13:23:48 2009
@@ -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.5.7 Reference Package org.apache.ws.security.processor</title>
+		<title>WSS4J 1.5.8 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=798514&r1=798513&r2=798514&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 Tue Jul 28 13:23:48 2009
@@ -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.5.7 Reference Package org.apache.ws.security.processor</title>
+		<title>WSS4J 1.5.8 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/saml/package-frame.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/saml/package-frame.html?rev=798514&r1=798513&r2=798514&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/saml/package-frame.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/saml/package-frame.html Tue Jul 28 13:23:48 2009
@@ -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.5.7 Reference Package org.apache.ws.security.saml</title>
+		<title>WSS4J 1.5.8 Reference Package org.apache.ws.security.saml</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/wss4j/site/xref/org/apache/ws/security/saml/package-summary.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/saml/package-summary.html?rev=798514&r1=798513&r2=798514&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/saml/package-summary.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/saml/package-summary.html Tue Jul 28 13:23:48 2009
@@ -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.5.7 Reference Package org.apache.ws.security.saml</title>
+		<title>WSS4J 1.5.8 Reference Package org.apache.ws.security.saml</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>



---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: wss4j-dev-help@ws.apache.org