You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2011/12/06 11:24:32 UTC
svn commit: r1210847 [29/42] - in /webservices/wss4j/site: ./ apidocs/
apidocs/org/apache/ws/security/ apidocs/org/apache/ws/security/action/
apidocs/org/apache/ws/security/action/class-use/
apidocs/org/apache/ws/security/class-use/ apidocs/org/apache/...
Modified: webservices/wss4j/site/xref/org/apache/ws/security/handler/package-frame.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/handler/package-frame.html?rev=1210847&r1=1210846&r2=1210847&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/handler/package-frame.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/handler/package-frame.html Tue Dec 6 10:23:54 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.3 Reference Package org.apache.ws.security.handler</title>
+ <title>WSS4J 1.6.4 Reference Package org.apache.ws.security.handler</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: webservices/wss4j/site/xref/org/apache/ws/security/handler/package-summary.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/handler/package-summary.html?rev=1210847&r1=1210846&r2=1210847&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/handler/package-summary.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/handler/package-summary.html Tue Dec 6 10:23:54 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.3 Reference Package org.apache.ws.security.handler</title>
+ <title>WSS4J 1.6.4 Reference Package org.apache.ws.security.handler</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: webservices/wss4j/site/xref/org/apache/ws/security/message/WSSecDKSign.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/message/WSSecDKSign.html?rev=1210847&r1=1210846&r2=1210847&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/message/WSSecDKSign.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/message/WSSecDKSign.html Tue Dec 6 10:23:54 2011
@@ -43,348 +43,366 @@
<a name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.w3c.dom.Document;
<a name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.w3c.dom.Element;
<a name="35" href="#35">35</a>
-<a name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> java.util.ArrayList;
-<a name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> java.util.List;
-<a name="38" href="#38">38</a>
-<a name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.XMLStructure;
-<a name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dom.DOMStructure;
-<a name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.CanonicalizationMethod;
-<a name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.SignatureMethod;
-<a name="43" href="#43">43</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.SignedInfo;
-<a name="44" href="#44">44</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.XMLSignature;
-<a name="45" href="#45">45</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.XMLSignatureFactory;
-<a name="46" href="#46">46</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.XMLSignContext;
-<a name="47" href="#47">47</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.dom.DOMSignContext;
-<a name="48" href="#48">48</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.keyinfo.KeyInfo;
-<a name="49" href="#49">49</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.keyinfo.KeyInfoFactory;
-<a name="50" href="#50">50</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
-<a name="51" href="#51">51</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.spec.ExcC14NParameterSpec;
-<a name="52" href="#52">52</a>
-<a name="53" href="#53">53</a> <em class="jxr_javadoccomment">/**</em>
-<a name="54" href="#54">54</a> <em class="jxr_javadoccomment"> * Builder to sign with derived keys</em>
-<a name="55" href="#55">55</a> <em class="jxr_javadoccomment"> * </em>
-<a name="56" href="#56">56</a> <em class="jxr_javadoccomment"> * @author Ruchith Fernando (ruchith.fernando@gmail.com)</em>
-<a name="57" href="#57">57</a> <em class="jxr_javadoccomment"> * @author Davanum Srinivas (dims@yahoo.com)</em>
-<a name="58" href="#58">58</a> <em class="jxr_javadoccomment"> * @author Werner Dittmann (werner@apache.org)</em>
-<a name="59" href="#59">59</a> <em class="jxr_javadoccomment"> */</em>
-<a name="60" href="#60">60</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/ws/security/message/WSSecDKSign.html">WSSecDKSign</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../org/apache/ws/security/message/WSSecDerivedKeyBase.html">WSSecDerivedKeyBase</a> {
-<a name="61" href="#61">61</a>
-<a name="62" href="#62">62</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> org.apache.commons.logging.Log log =
-<a name="63" href="#63">63</a> org.apache.commons.logging.LogFactory.getLog(WSSecDKSign.<strong class="jxr_keyword">class</strong>);
-<a name="64" href="#64">64</a>
-<a name="65" href="#65">65</a> <strong class="jxr_keyword">private</strong> String sigAlgo = WSConstants.HMAC_SHA1;
-<a name="66" href="#66">66</a> <strong class="jxr_keyword">private</strong> String digestAlgo = WSConstants.SHA1;
-<a name="67" href="#67">67</a> <strong class="jxr_keyword">private</strong> String canonAlgo = WSConstants.C14N_EXCL_OMIT_COMMENTS;
-<a name="68" href="#68">68</a> <strong class="jxr_keyword">private</strong> byte[] signatureValue = <strong class="jxr_keyword">null</strong>;
-<a name="69" href="#69">69</a>
-<a name="70" href="#70">70</a> <strong class="jxr_keyword">private</strong> String keyInfoUri = <strong class="jxr_keyword">null</strong>;
-<a name="71" href="#71">71</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html">SecurityTokenReference</a> secRef = <strong class="jxr_keyword">null</strong>;
-<a name="72" href="#72">72</a> <strong class="jxr_keyword">private</strong> String strUri = <strong class="jxr_keyword">null</strong>;
-<a name="73" href="#73">73</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/ws/security/WSDocInfo.html">WSDocInfo</a> wsDocInfo;
-<a name="74" href="#74">74</a>
-<a name="75" href="#75">75</a> <strong class="jxr_keyword">private</strong> KeyInfoFactory keyInfoFactory = KeyInfoFactory.getInstance(<span class="jxr_string">"DOM"</span>);
-<a name="76" href="#76">76</a> <strong class="jxr_keyword">private</strong> XMLSignatureFactory signatureFactory = XMLSignatureFactory.getInstance(<span class="jxr_string">"DOM"</span>);
-<a name="77" href="#77">77</a> <strong class="jxr_keyword">private</strong> XMLSignature sig;
-<a name="78" href="#78">78</a> <strong class="jxr_keyword">private</strong> KeyInfo keyInfo;
-<a name="79" href="#79">79</a> <strong class="jxr_keyword">private</strong> CanonicalizationMethod c14nMethod;
-<a name="80" href="#80">80</a> <strong class="jxr_keyword">private</strong> Element securityHeader = <strong class="jxr_keyword">null</strong>;
-<a name="81" href="#81">81</a>
+<a name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> java.security.NoSuchProviderException;
+<a name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> java.util.ArrayList;
+<a name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> java.util.List;
+<a name="39" href="#39">39</a>
+<a name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.XMLStructure;
+<a name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dom.DOMStructure;
+<a name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.CanonicalizationMethod;
+<a name="43" href="#43">43</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.SignatureMethod;
+<a name="44" href="#44">44</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.SignedInfo;
+<a name="45" href="#45">45</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.XMLSignature;
+<a name="46" href="#46">46</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.XMLSignatureFactory;
+<a name="47" href="#47">47</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.XMLSignContext;
+<a name="48" href="#48">48</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.dom.DOMSignContext;
+<a name="49" href="#49">49</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.keyinfo.KeyInfo;
+<a name="50" href="#50">50</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.keyinfo.KeyInfoFactory;
+<a name="51" href="#51">51</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
+<a name="52" href="#52">52</a> <strong class="jxr_keyword">import</strong> javax.xml.crypto.dsig.spec.ExcC14NParameterSpec;
+<a name="53" href="#53">53</a>
+<a name="54" href="#54">54</a> <em class="jxr_javadoccomment">/**</em>
+<a name="55" href="#55">55</a> <em class="jxr_javadoccomment"> * Builder to sign with derived keys</em>
+<a name="56" href="#56">56</a> <em class="jxr_javadoccomment"> * </em>
+<a name="57" href="#57">57</a> <em class="jxr_javadoccomment"> * @author Ruchith Fernando (ruchith.fernando@gmail.com)</em>
+<a name="58" href="#58">58</a> <em class="jxr_javadoccomment"> * @author Davanum Srinivas (dims@yahoo.com)</em>
+<a name="59" href="#59">59</a> <em class="jxr_javadoccomment"> * @author Werner Dittmann (werner@apache.org)</em>
+<a name="60" href="#60">60</a> <em class="jxr_javadoccomment"> */</em>
+<a name="61" href="#61">61</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/ws/security/message/WSSecDKSign.html">WSSecDKSign</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../org/apache/ws/security/message/WSSecDerivedKeyBase.html">WSSecDerivedKeyBase</a> {
+<a name="62" href="#62">62</a>
+<a name="63" href="#63">63</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> org.apache.commons.logging.Log log =
+<a name="64" href="#64">64</a> org.apache.commons.logging.LogFactory.getLog(WSSecDKSign.<strong class="jxr_keyword">class</strong>);
+<a name="65" href="#65">65</a>
+<a name="66" href="#66">66</a> <strong class="jxr_keyword">private</strong> String sigAlgo = WSConstants.HMAC_SHA1;
+<a name="67" href="#67">67</a> <strong class="jxr_keyword">private</strong> String digestAlgo = WSConstants.SHA1;
+<a name="68" href="#68">68</a> <strong class="jxr_keyword">private</strong> String canonAlgo = WSConstants.C14N_EXCL_OMIT_COMMENTS;
+<a name="69" href="#69">69</a> <strong class="jxr_keyword">private</strong> byte[] signatureValue = <strong class="jxr_keyword">null</strong>;
+<a name="70" href="#70">70</a>
+<a name="71" href="#71">71</a> <strong class="jxr_keyword">private</strong> String keyInfoUri = <strong class="jxr_keyword">null</strong>;
+<a name="72" href="#72">72</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html">SecurityTokenReference</a> secRef = <strong class="jxr_keyword">null</strong>;
+<a name="73" href="#73">73</a> <strong class="jxr_keyword">private</strong> String strUri = <strong class="jxr_keyword">null</strong>;
+<a name="74" href="#74">74</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/ws/security/WSDocInfo.html">WSDocInfo</a> wsDocInfo;
+<a name="75" href="#75">75</a>
+<a name="76" href="#76">76</a> <strong class="jxr_keyword">private</strong> KeyInfoFactory keyInfoFactory;
+<a name="77" href="#77">77</a> <strong class="jxr_keyword">private</strong> XMLSignatureFactory signatureFactory;
+<a name="78" href="#78">78</a> <strong class="jxr_keyword">private</strong> XMLSignature sig;
+<a name="79" href="#79">79</a> <strong class="jxr_keyword">private</strong> KeyInfo keyInfo;
+<a name="80" href="#80">80</a> <strong class="jxr_keyword">private</strong> CanonicalizationMethod c14nMethod;
+<a name="81" href="#81">81</a> <strong class="jxr_keyword">private</strong> Element securityHeader = <strong class="jxr_keyword">null</strong>;
<a name="82" href="#82">82</a>
<a name="83" href="#83">83</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/ws/security/message/WSSecDKSign.html">WSSecDKSign</a>() {
<a name="84" href="#84">84</a> <strong class="jxr_keyword">super</strong>();
-<a name="85" href="#85">85</a> }
-<a name="86" href="#86">86</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/ws/security/message/WSSecDKSign.html">WSSecDKSign</a>(<a href="../../../../../org/apache/ws/security/WSSConfig.html">WSSConfig</a> config) {
-<a name="87" href="#87">87</a> <strong class="jxr_keyword">super</strong>(config);
-<a name="88" href="#88">88</a> }
-<a name="89" href="#89">89</a>
-<a name="90" href="#90">90</a> <strong class="jxr_keyword">public</strong> Document build(Document doc, <a href="../../../../../org/apache/ws/security/message/WSSecHeader.html">WSSecHeader</a> secHeader)
-<a name="91" href="#91">91</a> <strong class="jxr_keyword">throws</strong> WSSecurityException, <a href="../../../../../org/apache/ws/security/conversation/ConversationException.html">ConversationException</a> {
-<a name="92" href="#92">92</a>
-<a name="93" href="#93">93</a> prepare(doc, secHeader);
-<a name="94" href="#94">94</a> String soapNamespace = WSSecurityUtil.getSOAPNamespace(doc.getDocumentElement());
-<a name="95" href="#95">95</a> <strong class="jxr_keyword">if</strong> (parts == <strong class="jxr_keyword">null</strong>) {
-<a name="96" href="#96">96</a> parts = <strong class="jxr_keyword">new</strong> ArrayList<WSEncryptionPart>(1);
-<a name="97" href="#97">97</a> <a href="../../../../../org/apache/ws/security/WSEncryptionPart.html">WSEncryptionPart</a> encP =
-<a name="98" href="#98">98</a> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSEncryptionPart.html">WSEncryptionPart</a>(
-<a name="99" href="#99">99</a> WSConstants.ELEM_BODY,
-<a name="100" href="#100">100</a> soapNamespace,
-<a name="101" href="#101">101</a> <span class="jxr_string">"Content"</span>
-<a name="102" href="#102">102</a> );
-<a name="103" href="#103">103</a> parts.add(encP);
-<a name="104" href="#104">104</a> } <strong class="jxr_keyword">else</strong> {
-<a name="105" href="#105">105</a> <strong class="jxr_keyword">for</strong> (WSEncryptionPart part : parts) {
-<a name="106" href="#106">106</a> <strong class="jxr_keyword">if</strong> (<span class="jxr_string">"STRTransform"</span>.equals(part.getName()) && part.getId() == <strong class="jxr_keyword">null</strong>) {
-<a name="107" href="#107">107</a> part.setId(strUri);
-<a name="108" href="#108">108</a> }
-<a name="109" href="#109">109</a> }
-<a name="110" href="#110">110</a> }
-<a name="111" href="#111">111</a>
-<a name="112" href="#112">112</a> List<javax.xml.crypto.dsig.Reference> referenceList =
-<a name="113" href="#113">113</a> addReferencesToSign(parts, secHeader);
-<a name="114" href="#114">114</a> computeSignature(referenceList);
-<a name="115" href="#115">115</a>
-<a name="116" href="#116">116</a> <em class="jxr_comment">//</em>
-<a name="117" href="#117">117</a> <em class="jxr_comment">// prepend elements in the right order to the security header</em>
-<a name="118" href="#118">118</a> <em class="jxr_comment">//</em>
-<a name="119" href="#119">119</a> prependDKElementToHeader(secHeader);
-<a name="120" href="#120">120</a>
-<a name="121" href="#121">121</a> <strong class="jxr_keyword">return</strong> doc;
-<a name="122" href="#122">122</a> }
-<a name="123" href="#123">123</a>
-<a name="124" href="#124">124</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> prepare(Document doc, <a href="../../../../../org/apache/ws/security/message/WSSecHeader.html">WSSecHeader</a> secHeader)
-<a name="125" href="#125">125</a> <strong class="jxr_keyword">throws</strong> WSSecurityException, <a href="../../../../../org/apache/ws/security/conversation/ConversationException.html">ConversationException</a> {
-<a name="126" href="#126">126</a> <strong class="jxr_keyword">super</strong>.prepare(doc);
-<a name="127" href="#127">127</a> wsDocInfo = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSDocInfo.html">WSDocInfo</a>(doc);
-<a name="128" href="#128">128</a> securityHeader = secHeader.getSecurityHeader();
-<a name="129" href="#129">129</a> sig = <strong class="jxr_keyword">null</strong>;
-<a name="130" href="#130">130</a>
-<a name="131" href="#131">131</a> <strong class="jxr_keyword">try</strong> {
-<a name="132" href="#132">132</a> C14NMethodParameterSpec c14nSpec = <strong class="jxr_keyword">null</strong>;
-<a name="133" href="#133">133</a> <strong class="jxr_keyword">if</strong> (getWsConfig().isWsiBSPCompliant() && canonAlgo.equals(WSConstants.C14N_EXCL_OMIT_COMMENTS)) {
-<a name="134" href="#134">134</a> List<String> prefixes =
-<a name="135" href="#135">135</a> getInclusivePrefixes(secHeader.getSecurityHeader(), false);
-<a name="136" href="#136">136</a> c14nSpec = <strong class="jxr_keyword">new</strong> ExcC14NParameterSpec(prefixes);
-<a name="137" href="#137">137</a> }
-<a name="138" href="#138">138</a>
-<a name="139" href="#139">139</a> c14nMethod = signatureFactory.newCanonicalizationMethod(canonAlgo, c14nSpec);
-<a name="140" href="#140">140</a> } <strong class="jxr_keyword">catch</strong> (Exception ex) {
-<a name="141" href="#141">141</a> log.error(<span class="jxr_string">""</span>, ex);
-<a name="142" href="#142">142</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="143" href="#143">143</a> WSSecurityException.FAILED_SIGNATURE, <span class="jxr_string">"noXMLSig"</span>, <strong class="jxr_keyword">null</strong>, ex
-<a name="144" href="#144">144</a> );
-<a name="145" href="#145">145</a> }
-<a name="146" href="#146">146</a>
-<a name="147" href="#147">147</a> keyInfoUri = getWsConfig().getIdAllocator().createSecureId(<span class="jxr_string">"KI-"</span>, keyInfo);
+<a name="85" href="#85">85</a> init();
+<a name="86" href="#86">86</a> }
+<a name="87" href="#87">87</a>
+<a name="88" href="#88">88</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/ws/security/message/WSSecDKSign.html">WSSecDKSign</a>(<a href="../../../../../org/apache/ws/security/WSSConfig.html">WSSConfig</a> config) {
+<a name="89" href="#89">89</a> <strong class="jxr_keyword">super</strong>(config);
+<a name="90" href="#90">90</a> init();
+<a name="91" href="#91">91</a> }
+<a name="92" href="#92">92</a>
+<a name="93" href="#93">93</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> init() {
+<a name="94" href="#94">94</a> <em class="jxr_comment">// Try to install the Santuario Provider - fall back to the JDK provider if this does</em>
+<a name="95" href="#95">95</a> <em class="jxr_comment">// not work</em>
+<a name="96" href="#96">96</a> <strong class="jxr_keyword">try</strong> {
+<a name="97" href="#97">97</a> signatureFactory = XMLSignatureFactory.getInstance(<span class="jxr_string">"DOM"</span>, <span class="jxr_string">"ApacheXMLDSig"</span>);
+<a name="98" href="#98">98</a> } <strong class="jxr_keyword">catch</strong> (NoSuchProviderException ex) {
+<a name="99" href="#99">99</a> signatureFactory = XMLSignatureFactory.getInstance(<span class="jxr_string">"DOM"</span>);
+<a name="100" href="#100">100</a> }
+<a name="101" href="#101">101</a> <strong class="jxr_keyword">try</strong> {
+<a name="102" href="#102">102</a> keyInfoFactory = KeyInfoFactory.getInstance(<span class="jxr_string">"DOM"</span>, <span class="jxr_string">"ApacheXMLDSig"</span>);
+<a name="103" href="#103">103</a> } <strong class="jxr_keyword">catch</strong> (NoSuchProviderException ex) {
+<a name="104" href="#104">104</a> keyInfoFactory = KeyInfoFactory.getInstance(<span class="jxr_string">"DOM"</span>);
+<a name="105" href="#105">105</a> }
+<a name="106" href="#106">106</a> }
+<a name="107" href="#107">107</a>
+<a name="108" href="#108">108</a> <strong class="jxr_keyword">public</strong> Document build(Document doc, <a href="../../../../../org/apache/ws/security/message/WSSecHeader.html">WSSecHeader</a> secHeader)
+<a name="109" href="#109">109</a> <strong class="jxr_keyword">throws</strong> WSSecurityException, <a href="../../../../../org/apache/ws/security/conversation/ConversationException.html">ConversationException</a> {
+<a name="110" href="#110">110</a>
+<a name="111" href="#111">111</a> prepare(doc, secHeader);
+<a name="112" href="#112">112</a> String soapNamespace = WSSecurityUtil.getSOAPNamespace(doc.getDocumentElement());
+<a name="113" href="#113">113</a> <strong class="jxr_keyword">if</strong> (parts == <strong class="jxr_keyword">null</strong>) {
+<a name="114" href="#114">114</a> parts = <strong class="jxr_keyword">new</strong> ArrayList<WSEncryptionPart>(1);
+<a name="115" href="#115">115</a> <a href="../../../../../org/apache/ws/security/WSEncryptionPart.html">WSEncryptionPart</a> encP =
+<a name="116" href="#116">116</a> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSEncryptionPart.html">WSEncryptionPart</a>(
+<a name="117" href="#117">117</a> WSConstants.ELEM_BODY,
+<a name="118" href="#118">118</a> soapNamespace,
+<a name="119" href="#119">119</a> <span class="jxr_string">"Content"</span>
+<a name="120" href="#120">120</a> );
+<a name="121" href="#121">121</a> parts.add(encP);
+<a name="122" href="#122">122</a> } <strong class="jxr_keyword">else</strong> {
+<a name="123" href="#123">123</a> <strong class="jxr_keyword">for</strong> (WSEncryptionPart part : parts) {
+<a name="124" href="#124">124</a> <strong class="jxr_keyword">if</strong> (<span class="jxr_string">"STRTransform"</span>.equals(part.getName()) && part.getId() == <strong class="jxr_keyword">null</strong>) {
+<a name="125" href="#125">125</a> part.setId(strUri);
+<a name="126" href="#126">126</a> }
+<a name="127" href="#127">127</a> }
+<a name="128" href="#128">128</a> }
+<a name="129" href="#129">129</a>
+<a name="130" href="#130">130</a> List<javax.xml.crypto.dsig.Reference> referenceList =
+<a name="131" href="#131">131</a> addReferencesToSign(parts, secHeader);
+<a name="132" href="#132">132</a> computeSignature(referenceList);
+<a name="133" href="#133">133</a>
+<a name="134" href="#134">134</a> <em class="jxr_comment">//</em>
+<a name="135" href="#135">135</a> <em class="jxr_comment">// prepend elements in the right order to the security header</em>
+<a name="136" href="#136">136</a> <em class="jxr_comment">//</em>
+<a name="137" href="#137">137</a> prependDKElementToHeader(secHeader);
+<a name="138" href="#138">138</a>
+<a name="139" href="#139">139</a> <strong class="jxr_keyword">return</strong> doc;
+<a name="140" href="#140">140</a> }
+<a name="141" href="#141">141</a>
+<a name="142" href="#142">142</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> prepare(Document doc, <a href="../../../../../org/apache/ws/security/message/WSSecHeader.html">WSSecHeader</a> secHeader)
+<a name="143" href="#143">143</a> <strong class="jxr_keyword">throws</strong> WSSecurityException, <a href="../../../../../org/apache/ws/security/conversation/ConversationException.html">ConversationException</a> {
+<a name="144" href="#144">144</a> <strong class="jxr_keyword">super</strong>.prepare(doc);
+<a name="145" href="#145">145</a> wsDocInfo = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSDocInfo.html">WSDocInfo</a>(doc);
+<a name="146" href="#146">146</a> securityHeader = secHeader.getSecurityHeader();
+<a name="147" href="#147">147</a> sig = <strong class="jxr_keyword">null</strong>;
<a name="148" href="#148">148</a>
-<a name="149" href="#149">149</a> secRef = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html">SecurityTokenReference</a>(doc);
-<a name="150" href="#150">150</a> strUri = getWsConfig().getIdAllocator().createSecureId(<span class="jxr_string">"STR-"</span>, secRef);
-<a name="151" href="#151">151</a> secRef.setID(strUri);
-<a name="152" href="#152">152</a>
-<a name="153" href="#153">153</a> <a href="../../../../../org/apache/ws/security/message/token/Reference.html">Reference</a> refUt = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/message/token/Reference.html">Reference</a>(document);
-<a name="154" href="#154">154</a> refUt.setURI(<span class="jxr_string">"#"</span> + dktId);
-<a name="155" href="#155">155</a> secRef.setReference(refUt);
-<a name="156" href="#156">156</a>
-<a name="157" href="#157">157</a> XMLStructure structure = <strong class="jxr_keyword">new</strong> DOMStructure(secRef.getElement());
-<a name="158" href="#158">158</a> wsDocInfo.addTokenElement(secRef.getElement(), false);
-<a name="159" href="#159">159</a> keyInfo =
-<a name="160" href="#160">160</a> keyInfoFactory.newKeyInfo(
-<a name="161" href="#161">161</a> java.util.Collections.singletonList(structure), keyInfoUri
+<a name="149" href="#149">149</a> <strong class="jxr_keyword">try</strong> {
+<a name="150" href="#150">150</a> C14NMethodParameterSpec c14nSpec = <strong class="jxr_keyword">null</strong>;
+<a name="151" href="#151">151</a> <strong class="jxr_keyword">if</strong> (getWsConfig().isWsiBSPCompliant() && canonAlgo.equals(WSConstants.C14N_EXCL_OMIT_COMMENTS)) {
+<a name="152" href="#152">152</a> List<String> prefixes =
+<a name="153" href="#153">153</a> getInclusivePrefixes(secHeader.getSecurityHeader(), false);
+<a name="154" href="#154">154</a> c14nSpec = <strong class="jxr_keyword">new</strong> ExcC14NParameterSpec(prefixes);
+<a name="155" href="#155">155</a> }
+<a name="156" href="#156">156</a>
+<a name="157" href="#157">157</a> c14nMethod = signatureFactory.newCanonicalizationMethod(canonAlgo, c14nSpec);
+<a name="158" href="#158">158</a> } <strong class="jxr_keyword">catch</strong> (Exception ex) {
+<a name="159" href="#159">159</a> log.error(<span class="jxr_string">""</span>, ex);
+<a name="160" href="#160">160</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="161" href="#161">161</a> WSSecurityException.FAILED_SIGNATURE, <span class="jxr_string">"noXMLSig"</span>, <strong class="jxr_keyword">null</strong>, ex
<a name="162" href="#162">162</a> );
-<a name="163" href="#163">163</a>
-<a name="164" href="#164">164</a> }
-<a name="165" href="#165">165</a>
-<a name="166" href="#166">166</a> <em class="jxr_javadoccomment">/**</em>
-<a name="167" href="#167">167</a> <em class="jxr_javadoccomment"> * Returns the SignatureElement.</em>
-<a name="168" href="#168">168</a> <em class="jxr_javadoccomment"> * The method can be called any time after <code>prepare()</code>.</em>
-<a name="169" href="#169">169</a> <em class="jxr_javadoccomment"> * @return The DOM Element of the signature.</em>
-<a name="170" href="#170">170</a> <em class="jxr_javadoccomment"> */</em>
-<a name="171" href="#171">171</a> <strong class="jxr_keyword">public</strong> Element getSignatureElement() {
-<a name="172" href="#172">172</a> <strong class="jxr_keyword">return</strong>
-<a name="173" href="#173">173</a> WSSecurityUtil.getDirectChildElement(
-<a name="174" href="#174">174</a> securityHeader,
-<a name="175" href="#175">175</a> WSConstants.SIG_LN,
-<a name="176" href="#176">176</a> WSConstants.SIG_NS
-<a name="177" href="#177">177</a> );
-<a name="178" href="#178">178</a> }
-<a name="179" href="#179">179</a>
-<a name="180" href="#180">180</a> <em class="jxr_javadoccomment">/**</em>
-<a name="181" href="#181">181</a> <em class="jxr_javadoccomment"> * This method adds references to the Signature.</em>
-<a name="182" href="#182">182</a> <em class="jxr_javadoccomment"> * </em>
-<a name="183" href="#183">183</a> <em class="jxr_javadoccomment"> * @param references The list of references to sign</em>
-<a name="184" href="#184">184</a> <em class="jxr_javadoccomment"> * @param secHeader The Security Header</em>
-<a name="185" href="#185">185</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException</em>
-<a name="186" href="#186">186</a> <em class="jxr_javadoccomment"> */</em>
-<a name="187" href="#187">187</a> <strong class="jxr_keyword">public</strong> List<javax.xml.crypto.dsig.Reference> addReferencesToSign(
-<a name="188" href="#188">188</a> List<WSEncryptionPart> references,
-<a name="189" href="#189">189</a> <a href="../../../../../org/apache/ws/security/message/WSSecHeader.html">WSSecHeader</a> secHeader
-<a name="190" href="#190">190</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
-<a name="191" href="#191">191</a> <strong class="jxr_keyword">return</strong>
-<a name="192" href="#192">192</a> addReferencesToSign(
-<a name="193" href="#193">193</a> document,
-<a name="194" href="#194">194</a> references,
-<a name="195" href="#195">195</a> wsDocInfo,
-<a name="196" href="#196">196</a> signatureFactory,
-<a name="197" href="#197">197</a> secHeader,
-<a name="198" href="#198">198</a> getWsConfig(),
-<a name="199" href="#199">199</a> digestAlgo
-<a name="200" href="#200">200</a> );
-<a name="201" href="#201">201</a> }
-<a name="202" href="#202">202</a>
-<a name="203" href="#203">203</a> <em class="jxr_javadoccomment">/**</em>
-<a name="204" href="#204">204</a> <em class="jxr_javadoccomment"> * Compute the Signature over the references.</em>
-<a name="205" href="#205">205</a> <em class="jxr_javadoccomment"> * </em>
-<a name="206" href="#206">206</a> <em class="jxr_javadoccomment"> * After references are set this method computes the Signature for them.</em>
-<a name="207" href="#207">207</a> <em class="jxr_javadoccomment"> * This method can be called any time after the references were set. See</em>
-<a name="208" href="#208">208</a> <em class="jxr_javadoccomment"> * <code>addReferencesToSign()</code>.</em>
-<a name="209" href="#209">209</a> <em class="jxr_javadoccomment"> * </em>
-<a name="210" href="#210">210</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException</em>
-<a name="211" href="#211">211</a> <em class="jxr_javadoccomment"> */</em>
-<a name="212" href="#212">212</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> computeSignature(
-<a name="213" href="#213">213</a> List<javax.xml.crypto.dsig.Reference> referenceList
-<a name="214" href="#214">214</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
-<a name="215" href="#215">215</a> computeSignature(referenceList, <strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">null</strong>);
-<a name="216" href="#216">216</a> }
-<a name="217" href="#217">217</a>
-<a name="218" href="#218">218</a> <em class="jxr_javadoccomment">/**</em>
-<a name="219" href="#219">219</a> <em class="jxr_javadoccomment"> * Compute the Signature over the references.</em>
-<a name="220" href="#220">220</a> <em class="jxr_javadoccomment"> * </em>
-<a name="221" href="#221">221</a> <em class="jxr_javadoccomment"> * After references are set this method computes the Signature for them.</em>
-<a name="222" href="#222">222</a> <em class="jxr_javadoccomment"> * This method can be called any time after the references were set. See</em>
-<a name="223" href="#223">223</a> <em class="jxr_javadoccomment"> * <code>addReferencesToSign()</code>.</em>
-<a name="224" href="#224">224</a> <em class="jxr_javadoccomment"> * </em>
-<a name="225" href="#225">225</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException</em>
-<a name="226" href="#226">226</a> <em class="jxr_javadoccomment"> */</em>
-<a name="227" href="#227">227</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> computeSignature(
-<a name="228" href="#228">228</a> List<javax.xml.crypto.dsig.Reference> referenceList,
-<a name="229" href="#229">229</a> <strong class="jxr_keyword">boolean</strong> prepend,
-<a name="230" href="#230">230</a> Element siblingElement
-<a name="231" href="#231">231</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
-<a name="232" href="#232">232</a> <strong class="jxr_keyword">try</strong> {
-<a name="233" href="#233">233</a> java.security.Key key =
-<a name="234" href="#234">234</a> WSSecurityUtil.prepareSecretKey(sigAlgo, derivedKeyBytes);
-<a name="235" href="#235">235</a> SignatureMethod signatureMethod =
-<a name="236" href="#236">236</a> signatureFactory.newSignatureMethod(sigAlgo, <strong class="jxr_keyword">null</strong>);
-<a name="237" href="#237">237</a> SignedInfo signedInfo =
-<a name="238" href="#238">238</a> signatureFactory.newSignedInfo(c14nMethod, signatureMethod, referenceList);
-<a name="239" href="#239">239</a>
-<a name="240" href="#240">240</a> sig = signatureFactory.newXMLSignature(
-<a name="241" href="#241">241</a> signedInfo,
-<a name="242" href="#242">242</a> keyInfo,
-<a name="243" href="#243">243</a> <strong class="jxr_keyword">null</strong>,
-<a name="244" href="#244">244</a> getWsConfig().getIdAllocator().createId(<span class="jxr_string">"SIG-"</span>, <strong class="jxr_keyword">null</strong>),
-<a name="245" href="#245">245</a> <strong class="jxr_keyword">null</strong>);
-<a name="246" href="#246">246</a>
-<a name="247" href="#247">247</a> <em class="jxr_comment">//</em>
-<a name="248" href="#248">248</a> <em class="jxr_comment">// Figure out where to insert the signature element</em>
-<a name="249" href="#249">249</a> <em class="jxr_comment">//</em>
-<a name="250" href="#250">250</a> XMLSignContext signContext = <strong class="jxr_keyword">null</strong>;
-<a name="251" href="#251">251</a> <strong class="jxr_keyword">if</strong> (prepend) {
-<a name="252" href="#252">252</a> <strong class="jxr_keyword">if</strong> (siblingElement == <strong class="jxr_keyword">null</strong>) {
-<a name="253" href="#253">253</a> siblingElement = (Element)securityHeader.getFirstChild();
-<a name="254" href="#254">254</a> }
-<a name="255" href="#255">255</a> <strong class="jxr_keyword">if</strong> (siblingElement == <strong class="jxr_keyword">null</strong>) {
-<a name="256" href="#256">256</a> signContext = <strong class="jxr_keyword">new</strong> DOMSignContext(key, securityHeader);
-<a name="257" href="#257">257</a> } <strong class="jxr_keyword">else</strong> {
-<a name="258" href="#258">258</a> signContext = <strong class="jxr_keyword">new</strong> DOMSignContext(key, securityHeader, siblingElement);
-<a name="259" href="#259">259</a> }
-<a name="260" href="#260">260</a> } <strong class="jxr_keyword">else</strong> {
-<a name="261" href="#261">261</a> signContext = <strong class="jxr_keyword">new</strong> DOMSignContext(key, securityHeader);
-<a name="262" href="#262">262</a> }
-<a name="263" href="#263">263</a>
-<a name="264" href="#264">264</a> signContext.putNamespacePrefix(WSConstants.SIG_NS, WSConstants.SIG_PREFIX);
-<a name="265" href="#265">265</a> <strong class="jxr_keyword">if</strong> (WSConstants.C14N_EXCL_OMIT_COMMENTS.equals(canonAlgo)) {
-<a name="266" href="#266">266</a> signContext.putNamespacePrefix(
-<a name="267" href="#267">267</a> WSConstants.C14N_EXCL_OMIT_COMMENTS,
-<a name="268" href="#268">268</a> WSConstants.C14N_EXCL_OMIT_COMMENTS_PREFIX
-<a name="269" href="#269">269</a> );
-<a name="270" href="#270">270</a> }
-<a name="271" href="#271">271</a> signContext.setProperty(STRTransform.TRANSFORM_WS_DOC_INFO, wsDocInfo);
-<a name="272" href="#272">272</a> wsDocInfo.setCallbackLookup(callbackLookup);
-<a name="273" href="#273">273</a>
-<a name="274" href="#274">274</a> <em class="jxr_comment">// Add the elements to sign to the Signature Context</em>
-<a name="275" href="#275">275</a> wsDocInfo.setTokensOnContext((DOMSignContext)signContext);
-<a name="276" href="#276">276</a> <strong class="jxr_keyword">if</strong> (secRef != <strong class="jxr_keyword">null</strong> && secRef.getElement() != <strong class="jxr_keyword">null</strong>) {
-<a name="277" href="#277">277</a> WSSecurityUtil.storeElementInContext((DOMSignContext)signContext, secRef.getElement());
-<a name="278" href="#278">278</a> }
-<a name="279" href="#279">279</a>
-<a name="280" href="#280">280</a> sig.sign(signContext);
+<a name="163" href="#163">163</a> }
+<a name="164" href="#164">164</a>
+<a name="165" href="#165">165</a> keyInfoUri = getWsConfig().getIdAllocator().createSecureId(<span class="jxr_string">"KI-"</span>, keyInfo);
+<a name="166" href="#166">166</a>
+<a name="167" href="#167">167</a> secRef = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html">SecurityTokenReference</a>(doc);
+<a name="168" href="#168">168</a> strUri = getWsConfig().getIdAllocator().createSecureId(<span class="jxr_string">"STR-"</span>, secRef);
+<a name="169" href="#169">169</a> secRef.setID(strUri);
+<a name="170" href="#170">170</a>
+<a name="171" href="#171">171</a> <a href="../../../../../org/apache/ws/security/message/token/Reference.html">Reference</a> refUt = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/message/token/Reference.html">Reference</a>(document);
+<a name="172" href="#172">172</a> refUt.setURI(<span class="jxr_string">"#"</span> + dktId);
+<a name="173" href="#173">173</a> secRef.setReference(refUt);
+<a name="174" href="#174">174</a>
+<a name="175" href="#175">175</a> XMLStructure structure = <strong class="jxr_keyword">new</strong> DOMStructure(secRef.getElement());
+<a name="176" href="#176">176</a> wsDocInfo.addTokenElement(secRef.getElement(), false);
+<a name="177" href="#177">177</a> keyInfo =
+<a name="178" href="#178">178</a> keyInfoFactory.newKeyInfo(
+<a name="179" href="#179">179</a> java.util.Collections.singletonList(structure), keyInfoUri
+<a name="180" href="#180">180</a> );
+<a name="181" href="#181">181</a>
+<a name="182" href="#182">182</a> }
+<a name="183" href="#183">183</a>
+<a name="184" href="#184">184</a> <em class="jxr_javadoccomment">/**</em>
+<a name="185" href="#185">185</a> <em class="jxr_javadoccomment"> * Returns the SignatureElement.</em>
+<a name="186" href="#186">186</a> <em class="jxr_javadoccomment"> * The method can be called any time after <code>prepare()</code>.</em>
+<a name="187" href="#187">187</a> <em class="jxr_javadoccomment"> * @return The DOM Element of the signature.</em>
+<a name="188" href="#188">188</a> <em class="jxr_javadoccomment"> */</em>
+<a name="189" href="#189">189</a> <strong class="jxr_keyword">public</strong> Element getSignatureElement() {
+<a name="190" href="#190">190</a> <strong class="jxr_keyword">return</strong>
+<a name="191" href="#191">191</a> WSSecurityUtil.getDirectChildElement(
+<a name="192" href="#192">192</a> securityHeader,
+<a name="193" href="#193">193</a> WSConstants.SIG_LN,
+<a name="194" href="#194">194</a> WSConstants.SIG_NS
+<a name="195" href="#195">195</a> );
+<a name="196" href="#196">196</a> }
+<a name="197" href="#197">197</a>
+<a name="198" href="#198">198</a> <em class="jxr_javadoccomment">/**</em>
+<a name="199" href="#199">199</a> <em class="jxr_javadoccomment"> * This method adds references to the Signature.</em>
+<a name="200" href="#200">200</a> <em class="jxr_javadoccomment"> * </em>
+<a name="201" href="#201">201</a> <em class="jxr_javadoccomment"> * @param references The list of references to sign</em>
+<a name="202" href="#202">202</a> <em class="jxr_javadoccomment"> * @param secHeader The Security Header</em>
+<a name="203" href="#203">203</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException</em>
+<a name="204" href="#204">204</a> <em class="jxr_javadoccomment"> */</em>
+<a name="205" href="#205">205</a> <strong class="jxr_keyword">public</strong> List<javax.xml.crypto.dsig.Reference> addReferencesToSign(
+<a name="206" href="#206">206</a> List<WSEncryptionPart> references,
+<a name="207" href="#207">207</a> <a href="../../../../../org/apache/ws/security/message/WSSecHeader.html">WSSecHeader</a> secHeader
+<a name="208" href="#208">208</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
+<a name="209" href="#209">209</a> <strong class="jxr_keyword">return</strong>
+<a name="210" href="#210">210</a> addReferencesToSign(
+<a name="211" href="#211">211</a> document,
+<a name="212" href="#212">212</a> references,
+<a name="213" href="#213">213</a> wsDocInfo,
+<a name="214" href="#214">214</a> signatureFactory,
+<a name="215" href="#215">215</a> secHeader,
+<a name="216" href="#216">216</a> getWsConfig(),
+<a name="217" href="#217">217</a> digestAlgo
+<a name="218" href="#218">218</a> );
+<a name="219" href="#219">219</a> }
+<a name="220" href="#220">220</a>
+<a name="221" href="#221">221</a> <em class="jxr_javadoccomment">/**</em>
+<a name="222" href="#222">222</a> <em class="jxr_javadoccomment"> * Compute the Signature over the references.</em>
+<a name="223" href="#223">223</a> <em class="jxr_javadoccomment"> * </em>
+<a name="224" href="#224">224</a> <em class="jxr_javadoccomment"> * After references are set this method computes the Signature for them.</em>
+<a name="225" href="#225">225</a> <em class="jxr_javadoccomment"> * This method can be called any time after the references were set. See</em>
+<a name="226" href="#226">226</a> <em class="jxr_javadoccomment"> * <code>addReferencesToSign()</code>.</em>
+<a name="227" href="#227">227</a> <em class="jxr_javadoccomment"> * </em>
+<a name="228" href="#228">228</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException</em>
+<a name="229" href="#229">229</a> <em class="jxr_javadoccomment"> */</em>
+<a name="230" href="#230">230</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> computeSignature(
+<a name="231" href="#231">231</a> List<javax.xml.crypto.dsig.Reference> referenceList
+<a name="232" href="#232">232</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
+<a name="233" href="#233">233</a> computeSignature(referenceList, <strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">null</strong>);
+<a name="234" href="#234">234</a> }
+<a name="235" href="#235">235</a>
+<a name="236" href="#236">236</a> <em class="jxr_javadoccomment">/**</em>
+<a name="237" href="#237">237</a> <em class="jxr_javadoccomment"> * Compute the Signature over the references.</em>
+<a name="238" href="#238">238</a> <em class="jxr_javadoccomment"> * </em>
+<a name="239" href="#239">239</a> <em class="jxr_javadoccomment"> * After references are set this method computes the Signature for them.</em>
+<a name="240" href="#240">240</a> <em class="jxr_javadoccomment"> * This method can be called any time after the references were set. See</em>
+<a name="241" href="#241">241</a> <em class="jxr_javadoccomment"> * <code>addReferencesToSign()</code>.</em>
+<a name="242" href="#242">242</a> <em class="jxr_javadoccomment"> * </em>
+<a name="243" href="#243">243</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException</em>
+<a name="244" href="#244">244</a> <em class="jxr_javadoccomment"> */</em>
+<a name="245" href="#245">245</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> computeSignature(
+<a name="246" href="#246">246</a> List<javax.xml.crypto.dsig.Reference> referenceList,
+<a name="247" href="#247">247</a> <strong class="jxr_keyword">boolean</strong> prepend,
+<a name="248" href="#248">248</a> Element siblingElement
+<a name="249" href="#249">249</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
+<a name="250" href="#250">250</a> <strong class="jxr_keyword">try</strong> {
+<a name="251" href="#251">251</a> java.security.Key key =
+<a name="252" href="#252">252</a> WSSecurityUtil.prepareSecretKey(sigAlgo, derivedKeyBytes);
+<a name="253" href="#253">253</a> SignatureMethod signatureMethod =
+<a name="254" href="#254">254</a> signatureFactory.newSignatureMethod(sigAlgo, <strong class="jxr_keyword">null</strong>);
+<a name="255" href="#255">255</a> SignedInfo signedInfo =
+<a name="256" href="#256">256</a> signatureFactory.newSignedInfo(c14nMethod, signatureMethod, referenceList);
+<a name="257" href="#257">257</a>
+<a name="258" href="#258">258</a> sig = signatureFactory.newXMLSignature(
+<a name="259" href="#259">259</a> signedInfo,
+<a name="260" href="#260">260</a> keyInfo,
+<a name="261" href="#261">261</a> <strong class="jxr_keyword">null</strong>,
+<a name="262" href="#262">262</a> getWsConfig().getIdAllocator().createId(<span class="jxr_string">"SIG-"</span>, <strong class="jxr_keyword">null</strong>),
+<a name="263" href="#263">263</a> <strong class="jxr_keyword">null</strong>);
+<a name="264" href="#264">264</a>
+<a name="265" href="#265">265</a> <em class="jxr_comment">//</em>
+<a name="266" href="#266">266</a> <em class="jxr_comment">// Figure out where to insert the signature element</em>
+<a name="267" href="#267">267</a> <em class="jxr_comment">//</em>
+<a name="268" href="#268">268</a> XMLSignContext signContext = <strong class="jxr_keyword">null</strong>;
+<a name="269" href="#269">269</a> <strong class="jxr_keyword">if</strong> (prepend) {
+<a name="270" href="#270">270</a> <strong class="jxr_keyword">if</strong> (siblingElement == <strong class="jxr_keyword">null</strong>) {
+<a name="271" href="#271">271</a> siblingElement = (Element)securityHeader.getFirstChild();
+<a name="272" href="#272">272</a> }
+<a name="273" href="#273">273</a> <strong class="jxr_keyword">if</strong> (siblingElement == <strong class="jxr_keyword">null</strong>) {
+<a name="274" href="#274">274</a> signContext = <strong class="jxr_keyword">new</strong> DOMSignContext(key, securityHeader);
+<a name="275" href="#275">275</a> } <strong class="jxr_keyword">else</strong> {
+<a name="276" href="#276">276</a> signContext = <strong class="jxr_keyword">new</strong> DOMSignContext(key, securityHeader, siblingElement);
+<a name="277" href="#277">277</a> }
+<a name="278" href="#278">278</a> } <strong class="jxr_keyword">else</strong> {
+<a name="279" href="#279">279</a> signContext = <strong class="jxr_keyword">new</strong> DOMSignContext(key, securityHeader);
+<a name="280" href="#280">280</a> }
<a name="281" href="#281">281</a>
-<a name="282" href="#282">282</a> signatureValue = sig.getSignatureValue().getValue();
-<a name="283" href="#283">283</a> } <strong class="jxr_keyword">catch</strong> (Exception ex) {
-<a name="284" href="#284">284</a> log.error(ex);
-<a name="285" href="#285">285</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="286" href="#286">286</a> WSSecurityException.FAILED_SIGNATURE, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, ex
-<a name="287" href="#287">287</a> );
-<a name="288" href="#288">288</a> }
-<a name="289" href="#289">289</a> }
-<a name="290" href="#290">290</a>
-<a name="291" href="#291">291</a> <em class="jxr_javadoccomment">/**</em>
-<a name="292" href="#292">292</a> <em class="jxr_javadoccomment"> * @see org.apache.ws.security.message.WSSecDerivedKeyBase#getDerivedKeyLength()</em>
-<a name="293" href="#293">293</a> <em class="jxr_javadoccomment"> */</em>
-<a name="294" href="#294">294</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">int</strong> getDerivedKeyLength() <strong class="jxr_keyword">throws</strong> WSSecurityException {
-<a name="295" href="#295">295</a> <strong class="jxr_keyword">return</strong> (derivedKeyLength > 0) ? derivedKeyLength :
-<a name="296" href="#296">296</a> WSSecurityUtil.getKeyLength(sigAlgo);
-<a name="297" href="#297">297</a> }
-<a name="298" href="#298">298</a>
-<a name="299" href="#299">299</a> <em class="jxr_javadoccomment">/**</em>
-<a name="300" href="#300">300</a> <em class="jxr_javadoccomment"> * Set the signature algorithm to use. The default is WSConstants.SHA1.</em>
-<a name="301" href="#301">301</a> <em class="jxr_javadoccomment"> * @param algorithm the signature algorithm to use.</em>
-<a name="302" href="#302">302</a> <em class="jxr_javadoccomment"> */</em>
-<a name="303" href="#303">303</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setSignatureAlgorithm(String algorithm) {
-<a name="304" href="#304">304</a> sigAlgo = algorithm;
-<a name="305" href="#305">305</a> }
-<a name="306" href="#306">306</a>
-<a name="307" href="#307">307</a> <em class="jxr_javadoccomment">/**</em>
-<a name="308" href="#308">308</a> <em class="jxr_javadoccomment"> * @return the signature algorithm to use</em>
-<a name="309" href="#309">309</a> <em class="jxr_javadoccomment"> */</em>
-<a name="310" href="#310">310</a> <strong class="jxr_keyword">public</strong> String getSignatureAlgorithm() {
-<a name="311" href="#311">311</a> <strong class="jxr_keyword">return</strong> sigAlgo;
-<a name="312" href="#312">312</a> }
-<a name="313" href="#313">313</a>
-<a name="314" href="#314">314</a> <em class="jxr_javadoccomment">/**</em>
-<a name="315" href="#315">315</a> <em class="jxr_javadoccomment"> * Returns the the value of wsu:Id attribute of the Signature element.</em>
-<a name="316" href="#316">316</a> <em class="jxr_javadoccomment"> * </em>
-<a name="317" href="#317">317</a> <em class="jxr_javadoccomment"> * @return Return the wsu:Id of this token or null if the signature has not been generated.</em>
-<a name="318" href="#318">318</a> <em class="jxr_javadoccomment"> */</em>
-<a name="319" href="#319">319</a> <strong class="jxr_keyword">public</strong> String getSignatureId() {
-<a name="320" href="#320">320</a> <strong class="jxr_keyword">if</strong> (sig == <strong class="jxr_keyword">null</strong>) {
-<a name="321" href="#321">321</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a name="322" href="#322">322</a> }
-<a name="323" href="#323">323</a> <strong class="jxr_keyword">return</strong> sig.getId();
-<a name="324" href="#324">324</a> }
-<a name="325" href="#325">325</a>
-<a name="326" href="#326">326</a> <em class="jxr_javadoccomment">/**</em>
-<a name="327" href="#327">327</a> <em class="jxr_javadoccomment"> * Set the digest algorithm to use. The default is Constants.ALGO_ID_DIGEST_SHA1.</em>
-<a name="328" href="#328">328</a> <em class="jxr_javadoccomment"> * @param algorithm the digest algorithm to use.</em>
-<a name="329" href="#329">329</a> <em class="jxr_javadoccomment"> */</em>
-<a name="330" href="#330">330</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setDigestAlgorithm(String algorithm) {
-<a name="331" href="#331">331</a> digestAlgo = algorithm;
-<a name="332" href="#332">332</a> }
-<a name="333" href="#333">333</a>
-<a name="334" href="#334">334</a> <em class="jxr_javadoccomment">/**</em>
-<a name="335" href="#335">335</a> <em class="jxr_javadoccomment"> * @return the digest algorithm to use</em>
+<a name="282" href="#282">282</a> signContext.putNamespacePrefix(WSConstants.SIG_NS, WSConstants.SIG_PREFIX);
+<a name="283" href="#283">283</a> <strong class="jxr_keyword">if</strong> (WSConstants.C14N_EXCL_OMIT_COMMENTS.equals(canonAlgo)) {
+<a name="284" href="#284">284</a> signContext.putNamespacePrefix(
+<a name="285" href="#285">285</a> WSConstants.C14N_EXCL_OMIT_COMMENTS,
+<a name="286" href="#286">286</a> WSConstants.C14N_EXCL_OMIT_COMMENTS_PREFIX
+<a name="287" href="#287">287</a> );
+<a name="288" href="#288">288</a> }
+<a name="289" href="#289">289</a> signContext.setProperty(STRTransform.TRANSFORM_WS_DOC_INFO, wsDocInfo);
+<a name="290" href="#290">290</a> wsDocInfo.setCallbackLookup(callbackLookup);
+<a name="291" href="#291">291</a>
+<a name="292" href="#292">292</a> <em class="jxr_comment">// Add the elements to sign to the Signature Context</em>
+<a name="293" href="#293">293</a> wsDocInfo.setTokensOnContext((DOMSignContext)signContext);
+<a name="294" href="#294">294</a> <strong class="jxr_keyword">if</strong> (secRef != <strong class="jxr_keyword">null</strong> && secRef.getElement() != <strong class="jxr_keyword">null</strong>) {
+<a name="295" href="#295">295</a> WSSecurityUtil.storeElementInContext((DOMSignContext)signContext, secRef.getElement());
+<a name="296" href="#296">296</a> }
+<a name="297" href="#297">297</a>
+<a name="298" href="#298">298</a> sig.sign(signContext);
+<a name="299" href="#299">299</a>
+<a name="300" href="#300">300</a> signatureValue = sig.getSignatureValue().getValue();
+<a name="301" href="#301">301</a> } <strong class="jxr_keyword">catch</strong> (Exception ex) {
+<a name="302" href="#302">302</a> log.error(ex);
+<a name="303" href="#303">303</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="304" href="#304">304</a> WSSecurityException.FAILED_SIGNATURE, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, ex
+<a name="305" href="#305">305</a> );
+<a name="306" href="#306">306</a> }
+<a name="307" href="#307">307</a> }
+<a name="308" href="#308">308</a>
+<a name="309" href="#309">309</a> <em class="jxr_javadoccomment">/**</em>
+<a name="310" href="#310">310</a> <em class="jxr_javadoccomment"> * @see org.apache.ws.security.message.WSSecDerivedKeyBase#getDerivedKeyLength()</em>
+<a name="311" href="#311">311</a> <em class="jxr_javadoccomment"> */</em>
+<a name="312" href="#312">312</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">int</strong> getDerivedKeyLength() <strong class="jxr_keyword">throws</strong> WSSecurityException {
+<a name="313" href="#313">313</a> <strong class="jxr_keyword">return</strong> (derivedKeyLength > 0) ? derivedKeyLength :
+<a name="314" href="#314">314</a> WSSecurityUtil.getKeyLength(sigAlgo);
+<a name="315" href="#315">315</a> }
+<a name="316" href="#316">316</a>
+<a name="317" href="#317">317</a> <em class="jxr_javadoccomment">/**</em>
+<a name="318" href="#318">318</a> <em class="jxr_javadoccomment"> * Set the signature algorithm to use. The default is WSConstants.SHA1.</em>
+<a name="319" href="#319">319</a> <em class="jxr_javadoccomment"> * @param algorithm the signature algorithm to use.</em>
+<a name="320" href="#320">320</a> <em class="jxr_javadoccomment"> */</em>
+<a name="321" href="#321">321</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setSignatureAlgorithm(String algorithm) {
+<a name="322" href="#322">322</a> sigAlgo = algorithm;
+<a name="323" href="#323">323</a> }
+<a name="324" href="#324">324</a>
+<a name="325" href="#325">325</a> <em class="jxr_javadoccomment">/**</em>
+<a name="326" href="#326">326</a> <em class="jxr_javadoccomment"> * @return the signature algorithm to use</em>
+<a name="327" href="#327">327</a> <em class="jxr_javadoccomment"> */</em>
+<a name="328" href="#328">328</a> <strong class="jxr_keyword">public</strong> String getSignatureAlgorithm() {
+<a name="329" href="#329">329</a> <strong class="jxr_keyword">return</strong> sigAlgo;
+<a name="330" href="#330">330</a> }
+<a name="331" href="#331">331</a>
+<a name="332" href="#332">332</a> <em class="jxr_javadoccomment">/**</em>
+<a name="333" href="#333">333</a> <em class="jxr_javadoccomment"> * Returns the the value of wsu:Id attribute of the Signature element.</em>
+<a name="334" href="#334">334</a> <em class="jxr_javadoccomment"> * </em>
+<a name="335" href="#335">335</a> <em class="jxr_javadoccomment"> * @return Return the wsu:Id of this token or null if the signature has not been generated.</em>
<a name="336" href="#336">336</a> <em class="jxr_javadoccomment"> */</em>
-<a name="337" href="#337">337</a> <strong class="jxr_keyword">public</strong> String getDigestAlgorithm() {
-<a name="338" href="#338">338</a> <strong class="jxr_keyword">return</strong> digestAlgo;
-<a name="339" href="#339">339</a> }
-<a name="340" href="#340">340</a>
-<a name="341" href="#341">341</a> <em class="jxr_javadoccomment">/**</em>
-<a name="342" href="#342">342</a> <em class="jxr_javadoccomment"> * @return Returns the signatureValue.</em>
-<a name="343" href="#343">343</a> <em class="jxr_javadoccomment"> */</em>
-<a name="344" href="#344">344</a> <strong class="jxr_keyword">public</strong> byte[] getSignatureValue() {
-<a name="345" href="#345">345</a> <strong class="jxr_keyword">return</strong> signatureValue;
-<a name="346" href="#346">346</a> }
-<a name="347" href="#347">347</a>
-<a name="348" href="#348">348</a> <em class="jxr_javadoccomment">/**</em>
-<a name="349" href="#349">349</a> <em class="jxr_javadoccomment"> * Set the canonicalization method to use.</em>
-<a name="350" href="#350">350</a> <em class="jxr_javadoccomment"> * </em>
-<a name="351" href="#351">351</a> <em class="jxr_javadoccomment"> * If the canonicalization method is not set then the recommended Exclusive</em>
-<a name="352" href="#352">352</a> <em class="jxr_javadoccomment"> * XML Canonicalization is used by default Refer to WSConstants which</em>
-<a name="353" href="#353">353</a> <em class="jxr_javadoccomment"> * algorithms are supported.</em>
-<a name="354" href="#354">354</a> <em class="jxr_javadoccomment"> * </em>
-<a name="355" href="#355">355</a> <em class="jxr_javadoccomment"> * @param algo Is the name of the signature algorithm</em>
-<a name="356" href="#356">356</a> <em class="jxr_javadoccomment"> * @see WSConstants#C14N_OMIT_COMMENTS</em>
-<a name="357" href="#357">357</a> <em class="jxr_javadoccomment"> * @see WSConstants#C14N_WITH_COMMENTS</em>
-<a name="358" href="#358">358</a> <em class="jxr_javadoccomment"> * @see WSConstants#C14N_EXCL_OMIT_COMMENTS</em>
-<a name="359" href="#359">359</a> <em class="jxr_javadoccomment"> * @see WSConstants#C14N_EXCL_WITH_COMMENTS</em>
-<a name="360" href="#360">360</a> <em class="jxr_javadoccomment"> */</em>
-<a name="361" href="#361">361</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setSigCanonicalization(String algo) {
-<a name="362" href="#362">362</a> canonAlgo = algo;
-<a name="363" href="#363">363</a> }
-<a name="364" href="#364">364</a>
-<a name="365" href="#365">365</a> <em class="jxr_javadoccomment">/**</em>
-<a name="366" href="#366">366</a> <em class="jxr_javadoccomment"> * Get the canonicalization method.</em>
-<a name="367" href="#367">367</a> <em class="jxr_javadoccomment"> * </em>
-<a name="368" href="#368">368</a> <em class="jxr_javadoccomment"> * If the canonicalization method was not set then Exclusive XML</em>
-<a name="369" href="#369">369</a> <em class="jxr_javadoccomment"> * Canonicalization is used by default.</em>
-<a name="370" href="#370">370</a> <em class="jxr_javadoccomment"> * </em>
-<a name="371" href="#371">371</a> <em class="jxr_javadoccomment"> * @return The string describing the canonicalization algorithm.</em>
-<a name="372" href="#372">372</a> <em class="jxr_javadoccomment"> */</em>
-<a name="373" href="#373">373</a> <strong class="jxr_keyword">public</strong> String getSigCanonicalization() {
-<a name="374" href="#374">374</a> <strong class="jxr_keyword">return</strong> canonAlgo;
-<a name="375" href="#375">375</a> }
-<a name="376" href="#376">376</a>
-<a name="377" href="#377">377</a> }
+<a name="337" href="#337">337</a> <strong class="jxr_keyword">public</strong> String getSignatureId() {
+<a name="338" href="#338">338</a> <strong class="jxr_keyword">if</strong> (sig == <strong class="jxr_keyword">null</strong>) {
+<a name="339" href="#339">339</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a name="340" href="#340">340</a> }
+<a name="341" href="#341">341</a> <strong class="jxr_keyword">return</strong> sig.getId();
+<a name="342" href="#342">342</a> }
+<a name="343" href="#343">343</a>
+<a name="344" href="#344">344</a> <em class="jxr_javadoccomment">/**</em>
+<a name="345" href="#345">345</a> <em class="jxr_javadoccomment"> * Set the digest algorithm to use. The default is Constants.ALGO_ID_DIGEST_SHA1.</em>
+<a name="346" href="#346">346</a> <em class="jxr_javadoccomment"> * @param algorithm the digest algorithm to use.</em>
+<a name="347" href="#347">347</a> <em class="jxr_javadoccomment"> */</em>
+<a name="348" href="#348">348</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setDigestAlgorithm(String algorithm) {
+<a name="349" href="#349">349</a> digestAlgo = algorithm;
+<a name="350" href="#350">350</a> }
+<a name="351" href="#351">351</a>
+<a name="352" href="#352">352</a> <em class="jxr_javadoccomment">/**</em>
+<a name="353" href="#353">353</a> <em class="jxr_javadoccomment"> * @return the digest algorithm to use</em>
+<a name="354" href="#354">354</a> <em class="jxr_javadoccomment"> */</em>
+<a name="355" href="#355">355</a> <strong class="jxr_keyword">public</strong> String getDigestAlgorithm() {
+<a name="356" href="#356">356</a> <strong class="jxr_keyword">return</strong> digestAlgo;
+<a name="357" href="#357">357</a> }
+<a name="358" href="#358">358</a>
+<a name="359" href="#359">359</a> <em class="jxr_javadoccomment">/**</em>
+<a name="360" href="#360">360</a> <em class="jxr_javadoccomment"> * @return Returns the signatureValue.</em>
+<a name="361" href="#361">361</a> <em class="jxr_javadoccomment"> */</em>
+<a name="362" href="#362">362</a> <strong class="jxr_keyword">public</strong> byte[] getSignatureValue() {
+<a name="363" href="#363">363</a> <strong class="jxr_keyword">return</strong> signatureValue;
+<a name="364" href="#364">364</a> }
+<a name="365" href="#365">365</a>
+<a name="366" href="#366">366</a> <em class="jxr_javadoccomment">/**</em>
+<a name="367" href="#367">367</a> <em class="jxr_javadoccomment"> * Set the canonicalization method to use.</em>
+<a name="368" href="#368">368</a> <em class="jxr_javadoccomment"> * </em>
+<a name="369" href="#369">369</a> <em class="jxr_javadoccomment"> * If the canonicalization method is not set then the recommended Exclusive</em>
+<a name="370" href="#370">370</a> <em class="jxr_javadoccomment"> * XML Canonicalization is used by default Refer to WSConstants which</em>
+<a name="371" href="#371">371</a> <em class="jxr_javadoccomment"> * algorithms are supported.</em>
+<a name="372" href="#372">372</a> <em class="jxr_javadoccomment"> * </em>
+<a name="373" href="#373">373</a> <em class="jxr_javadoccomment"> * @param algo Is the name of the signature algorithm</em>
+<a name="374" href="#374">374</a> <em class="jxr_javadoccomment"> * @see WSConstants#C14N_OMIT_COMMENTS</em>
+<a name="375" href="#375">375</a> <em class="jxr_javadoccomment"> * @see WSConstants#C14N_WITH_COMMENTS</em>
+<a name="376" href="#376">376</a> <em class="jxr_javadoccomment"> * @see WSConstants#C14N_EXCL_OMIT_COMMENTS</em>
+<a name="377" href="#377">377</a> <em class="jxr_javadoccomment"> * @see WSConstants#C14N_EXCL_WITH_COMMENTS</em>
+<a name="378" href="#378">378</a> <em class="jxr_javadoccomment"> */</em>
+<a name="379" href="#379">379</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setSigCanonicalization(String algo) {
+<a name="380" href="#380">380</a> canonAlgo = algo;
+<a name="381" href="#381">381</a> }
+<a name="382" href="#382">382</a>
+<a name="383" href="#383">383</a> <em class="jxr_javadoccomment">/**</em>
+<a name="384" href="#384">384</a> <em class="jxr_javadoccomment"> * Get the canonicalization method.</em>
+<a name="385" href="#385">385</a> <em class="jxr_javadoccomment"> * </em>
+<a name="386" href="#386">386</a> <em class="jxr_javadoccomment"> * If the canonicalization method was not set then Exclusive XML</em>
+<a name="387" href="#387">387</a> <em class="jxr_javadoccomment"> * Canonicalization is used by default.</em>
+<a name="388" href="#388">388</a> <em class="jxr_javadoccomment"> * </em>
+<a name="389" href="#389">389</a> <em class="jxr_javadoccomment"> * @return The string describing the canonicalization algorithm.</em>
+<a name="390" href="#390">390</a> <em class="jxr_javadoccomment"> */</em>
+<a name="391" href="#391">391</a> <strong class="jxr_keyword">public</strong> String getSigCanonicalization() {
+<a name="392" href="#392">392</a> <strong class="jxr_keyword">return</strong> canonAlgo;
+<a name="393" href="#393">393</a> }
+<a name="394" href="#394">394</a>
+<a name="395" href="#395">395</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/message/WSSecDerivedKeyBase.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/message/WSSecDerivedKeyBase.html?rev=1210847&r1=1210846&r2=1210847&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/message/WSSecDerivedKeyBase.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/message/WSSecDerivedKeyBase.html Tue Dec 6 10:23:54 2011
@@ -270,66 +270,67 @@
<a name="260" href="#260">260</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (KerberosSecurity.isKerberosToken(customValueType)) {
<a name="261" href="#261">261</a> secRef.addTokenType(customValueType);
<a name="262" href="#262">262</a> ref.setValueType(customValueType);
-<a name="263" href="#263">263</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.WSC_SCT.equals(customValueType)) {
-<a name="264" href="#264">264</a> ref.setValueType(customValueType);
-<a name="265" href="#265">265</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (!WSConstants.WSS_USERNAME_TOKEN_VALUE_TYPE.equals(customValueType)) {
-<a name="266" href="#266">266</a> secRef.addTokenType(WSConstants.WSS_ENC_KEY_VALUE_TYPE);
-<a name="267" href="#267">267</a> }
-<a name="268" href="#268">268</a>
-<a name="269" href="#269">269</a> secRef.setReference(ref);
-<a name="270" href="#270">270</a> }
-<a name="271" href="#271">271</a>
-<a name="272" href="#272">272</a> dkt.setSecurityTokenReference(secRef);
-<a name="273" href="#273">273</a> } <strong class="jxr_keyword">else</strong> {
-<a name="274" href="#274">274</a> dkt.setSecurityTokenReference(strElem);
-<a name="275" href="#275">275</a> }
-<a name="276" href="#276">276</a> }
-<a name="277" href="#277">277</a>
+<a name="263" href="#263">263</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.WSC_SCT.equals(customValueType)
+<a name="264" href="#264">264</a> || WSConstants.WSC_SCT_05_12.equals(customValueType)) {
+<a name="265" href="#265">265</a> ref.setValueType(customValueType);
+<a name="266" href="#266">266</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (!WSConstants.WSS_USERNAME_TOKEN_VALUE_TYPE.equals(customValueType)) {
+<a name="267" href="#267">267</a> secRef.addTokenType(WSConstants.WSS_ENC_KEY_VALUE_TYPE);
+<a name="268" href="#268">268</a> }
+<a name="269" href="#269">269</a>
+<a name="270" href="#270">270</a> secRef.setReference(ref);
+<a name="271" href="#271">271</a> }
+<a name="272" href="#272">272</a>
+<a name="273" href="#273">273</a> dkt.setSecurityTokenReference(secRef);
+<a name="274" href="#274">274</a> } <strong class="jxr_keyword">else</strong> {
+<a name="275" href="#275">275</a> dkt.setSecurityTokenReference(strElem);
+<a name="276" href="#276">276</a> }
+<a name="277" href="#277">277</a> }
<a name="278" href="#278">278</a>
-<a name="279" href="#279">279</a> <em class="jxr_javadoccomment">/**</em>
-<a name="280" href="#280">280</a> <em class="jxr_javadoccomment"> * Prepend the DerivedKey element to the elements already in the Security</em>
-<a name="281" href="#281">281</a> <em class="jxr_javadoccomment"> * header.</em>
-<a name="282" href="#282">282</a> <em class="jxr_javadoccomment"> * </em>
-<a name="283" href="#283">283</a> <em class="jxr_javadoccomment"> * The method can be called any time after <code>prepare()</code>. This</em>
-<a name="284" href="#284">284</a> <em class="jxr_javadoccomment"> * allows to insert the DerivedKey element at any position in the Security</em>
-<a name="285" href="#285">285</a> <em class="jxr_javadoccomment"> * header.</em>
-<a name="286" href="#286">286</a> <em class="jxr_javadoccomment"> * </em>
-<a name="287" href="#287">287</a> <em class="jxr_javadoccomment"> * @param secHeader The security header that holds the Signature element.</em>
-<a name="288" href="#288">288</a> <em class="jxr_javadoccomment"> */</em>
-<a name="289" href="#289">289</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> prependDKElementToHeader(<a href="../../../../../org/apache/ws/security/message/WSSecHeader.html">WSSecHeader</a> secHeader) {
-<a name="290" href="#290">290</a> WSSecurityUtil.prependChildElement(
-<a name="291" href="#291">291</a> secHeader.getSecurityHeader(), dkt.getElement()
-<a name="292" href="#292">292</a> );
-<a name="293" href="#293">293</a> }
-<a name="294" href="#294">294</a>
-<a name="295" href="#295">295</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> appendDKElementToHeader(<a href="../../../../../org/apache/ws/security/message/WSSecHeader.html">WSSecHeader</a> secHeader) {
-<a name="296" href="#296">296</a> Element secHeaderElement = secHeader.getSecurityHeader();
-<a name="297" href="#297">297</a> secHeaderElement.appendChild(dkt.getElement());
-<a name="298" href="#298">298</a> }
-<a name="299" href="#299">299</a>
-<a name="300" href="#300">300</a> <em class="jxr_javadoccomment">/**</em>
-<a name="301" href="#301">301</a> <em class="jxr_javadoccomment"> * @param wscVersion The wscVersion to set.</em>
-<a name="302" href="#302">302</a> <em class="jxr_javadoccomment"> */</em>
-<a name="303" href="#303">303</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setWscVersion(<strong class="jxr_keyword">int</strong> wscVersion) {
-<a name="304" href="#304">304</a> <strong class="jxr_keyword">this</strong>.wscVersion = wscVersion;
-<a name="305" href="#305">305</a> }
-<a name="306" href="#306">306</a>
-<a name="307" href="#307">307</a> <strong class="jxr_keyword">public</strong> Element getdktElement() {
-<a name="308" href="#308">308</a> <strong class="jxr_keyword">return</strong> dkt.getElement();
-<a name="309" href="#309">309</a> }
-<a name="310" href="#310">310</a>
-<a name="311" href="#311">311</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setDerivedKeyLength(<strong class="jxr_keyword">int</strong> keyLength) {
-<a name="312" href="#312">312</a> derivedKeyLength = keyLength;
-<a name="313" href="#313">313</a> }
-<a name="314" href="#314">314</a>
-<a name="315" href="#315">315</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setCustomValueType(String customValueType) {
-<a name="316" href="#316">316</a> <strong class="jxr_keyword">this</strong>.customValueType = customValueType;
-<a name="317" href="#317">317</a> }
-<a name="318" href="#318">318</a>
-<a name="319" href="#319">319</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setTokenIdDirectId(<strong class="jxr_keyword">boolean</strong> b) {
-<a name="320" href="#320">320</a> tokenIdDirectId = b;
-<a name="321" href="#321">321</a> }
-<a name="322" href="#322">322</a> }
+<a name="279" href="#279">279</a>
+<a name="280" href="#280">280</a> <em class="jxr_javadoccomment">/**</em>
+<a name="281" href="#281">281</a> <em class="jxr_javadoccomment"> * Prepend the DerivedKey element to the elements already in the Security</em>
+<a name="282" href="#282">282</a> <em class="jxr_javadoccomment"> * header.</em>
+<a name="283" href="#283">283</a> <em class="jxr_javadoccomment"> * </em>
+<a name="284" href="#284">284</a> <em class="jxr_javadoccomment"> * The method can be called any time after <code>prepare()</code>. This</em>
+<a name="285" href="#285">285</a> <em class="jxr_javadoccomment"> * allows to insert the DerivedKey element at any position in the Security</em>
+<a name="286" href="#286">286</a> <em class="jxr_javadoccomment"> * header.</em>
+<a name="287" href="#287">287</a> <em class="jxr_javadoccomment"> * </em>
+<a name="288" href="#288">288</a> <em class="jxr_javadoccomment"> * @param secHeader The security header that holds the Signature element.</em>
+<a name="289" href="#289">289</a> <em class="jxr_javadoccomment"> */</em>
+<a name="290" href="#290">290</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> prependDKElementToHeader(<a href="../../../../../org/apache/ws/security/message/WSSecHeader.html">WSSecHeader</a> secHeader) {
+<a name="291" href="#291">291</a> WSSecurityUtil.prependChildElement(
+<a name="292" href="#292">292</a> secHeader.getSecurityHeader(), dkt.getElement()
+<a name="293" href="#293">293</a> );
+<a name="294" href="#294">294</a> }
+<a name="295" href="#295">295</a>
+<a name="296" href="#296">296</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> appendDKElementToHeader(<a href="../../../../../org/apache/ws/security/message/WSSecHeader.html">WSSecHeader</a> secHeader) {
+<a name="297" href="#297">297</a> Element secHeaderElement = secHeader.getSecurityHeader();
+<a name="298" href="#298">298</a> secHeaderElement.appendChild(dkt.getElement());
+<a name="299" href="#299">299</a> }
+<a name="300" href="#300">300</a>
+<a name="301" href="#301">301</a> <em class="jxr_javadoccomment">/**</em>
+<a name="302" href="#302">302</a> <em class="jxr_javadoccomment"> * @param wscVersion The wscVersion to set.</em>
+<a name="303" href="#303">303</a> <em class="jxr_javadoccomment"> */</em>
+<a name="304" href="#304">304</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setWscVersion(<strong class="jxr_keyword">int</strong> wscVersion) {
+<a name="305" href="#305">305</a> <strong class="jxr_keyword">this</strong>.wscVersion = wscVersion;
+<a name="306" href="#306">306</a> }
+<a name="307" href="#307">307</a>
+<a name="308" href="#308">308</a> <strong class="jxr_keyword">public</strong> Element getdktElement() {
+<a name="309" href="#309">309</a> <strong class="jxr_keyword">return</strong> dkt.getElement();
+<a name="310" href="#310">310</a> }
+<a name="311" href="#311">311</a>
+<a name="312" href="#312">312</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setDerivedKeyLength(<strong class="jxr_keyword">int</strong> keyLength) {
+<a name="313" href="#313">313</a> derivedKeyLength = keyLength;
+<a name="314" href="#314">314</a> }
+<a name="315" href="#315">315</a>
+<a name="316" href="#316">316</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setCustomValueType(String customValueType) {
+<a name="317" href="#317">317</a> <strong class="jxr_keyword">this</strong>.customValueType = customValueType;
+<a name="318" href="#318">318</a> }
+<a name="319" href="#319">319</a>
+<a name="320" href="#320">320</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setTokenIdDirectId(<strong class="jxr_keyword">boolean</strong> b) {
+<a name="321" href="#321">321</a> tokenIdDirectId = b;
+<a name="322" href="#322">322</a> }
+<a name="323" href="#323">323</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/message/WSSecEncrypt.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/message/WSSecEncrypt.html?rev=1210847&r1=1210846&r2=1210847&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/message/WSSecEncrypt.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/message/WSSecEncrypt.html Tue Dec 6 10:23:54 2011
@@ -454,7 +454,7 @@
<a name="444" href="#444">444</a> config.getIdAllocator().createId(<span class="jxr_string">"ED-"</span>, elementToEncrypt);
<a name="445" href="#445">445</a> <strong class="jxr_keyword">try</strong> {
<a name="446" href="#446">446</a> String headerId = <span class="jxr_string">""</span>;
-<a name="447" href="#447">447</a> <strong class="jxr_keyword">if</strong> (modifier.equals(<span class="jxr_string">"Header"</span>)) {
+<a name="447" href="#447">447</a> <strong class="jxr_keyword">if</strong> (<span class="jxr_string">"Header"</span>.equals(modifier)) {
<a name="448" href="#448">448</a> Element elem =
<a name="449" href="#449">449</a> doc.createElementNS(
<a name="450" href="#450">450</a> WSConstants.WSSE11_NS, <span class="jxr_string">"wsse11:"</span> + WSConstants.ENCRYPTED_HEADER