You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bu...@apache.org on 2012/08/29 15:19:14 UTC
svn commit: r830454 - in /websites/production/camel/content:
book-dataformat-appendix.html book-in-one-page.html cache/main.pageCache
xmlsecurity-dataformat.html
Author: buildbot
Date: Wed Aug 29 13:19:13 2012
New Revision: 830454
Log:
Production update by buildbot for camel
Modified:
websites/production/camel/content/book-dataformat-appendix.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/xmlsecurity-dataformat.html
Modified: websites/production/camel/content/book-dataformat-appendix.html
==============================================================================
--- websites/production/camel/content/book-dataformat-appendix.html (original)
+++ websites/production/camel/content/book-dataformat-appendix.html Wed Aug 29 13:19:13 2012
@@ -2443,7 +2443,7 @@ The XMLSecurity DataFormat supports asym
<div class="table-wrap">
<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Option </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> recipientKeyAlias </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> The key alias to be used when retrieving the recipient's public or private key from a KeyStore when performing asymmetric key encryption or decryption </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> keyCipherAlgorithm </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> The cipher algorithm to be used for encryption/decription of the asymmetric key. The available choices are:
<ul><li><tt>XMLCipher.RSA_v1dot5</tt></li><li><tt>XMLCipher.RSA_OAEP</tt></li></ul>
-</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> keyOrTrustStoreParameters </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> Configuration options for creating and loading a KeyStore instance that represents the sender's trustStore or recipient's keyStore. </td></tr></tbody></table>
+</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> keyOrTrustStoreParameters </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> Configuration options for creating and loading a KeyStore instance that represents the sender's trustStore or recipient's keyStore. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> keyPassword </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>2.10.2, 2.11</b> The password to be used for retrieving the private key from the KeyStore. This key is used for asymmetric decryption. </td></tr></tbody></table>
</div>
@@ -2603,7 +2603,8 @@ context.addRoutes(<span class="code-keyw
xmlCipherAlgorithm=<span class="code-quote">"http:<span class="code-comment">//www.w3.org/2001/04/xmlenc#aes128-cbc"</span>
</span> keyCipherAlgorithm=<span class="code-quote">"http:<span class="code-comment">//www.w3.org/2001/04/xmlenc#rsa-1_5"</span>
</span> recipientKeyAlias=<span class="code-quote">"recipient"</span>
- keyOrTrustStoreParametersId=<span class="code-quote">"keyStoreParams"</span> />
+ keyOrTrustStoreParametersId=<span class="code-quote">"keyStoreParams"</span>
+ keyPassword=<span class="code-quote">"privateKeyPassword"</span> />
</unmarshal>
...
</pre>
Modified: websites/production/camel/content/book-in-one-page.html
==============================================================================
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Wed Aug 29 13:19:13 2012
@@ -13400,7 +13400,7 @@ The XMLSecurity DataFormat supports asym
<div class="table-wrap">
<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Option </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> recipientKeyAlias </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> The key alias to be used when retrieving the recipient's public or private key from a KeyStore when performing asymmetric key encryption or decryption </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> keyCipherAlgorithm </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> The cipher algorithm to be used for encryption/decription of the asymmetric key. The available choices are:
<ul><li><tt>XMLCipher.RSA_v1dot5</tt></li><li><tt>XMLCipher.RSA_OAEP</tt></li></ul>
-</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> keyOrTrustStoreParameters </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> Configuration options for creating and loading a KeyStore instance that represents the sender's trustStore or recipient's keyStore. </td></tr></tbody></table>
+</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> keyOrTrustStoreParameters </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> Configuration options for creating and loading a KeyStore instance that represents the sender's trustStore or recipient's keyStore. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> keyPassword </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>2.10.2, 2.11</b> The password to be used for retrieving the private key from the KeyStore. This key is used for asymmetric decryption. </td></tr></tbody></table>
</div>
@@ -13560,7 +13560,8 @@ context.addRoutes(<span class="code-keyw
xmlCipherAlgorithm=<span class="code-quote">"http:<span class="code-comment">//www.w3.org/2001/04/xmlenc#aes128-cbc"</span>
</span> keyCipherAlgorithm=<span class="code-quote">"http:<span class="code-comment">//www.w3.org/2001/04/xmlenc#rsa-1_5"</span>
</span> recipientKeyAlias=<span class="code-quote">"recipient"</span>
- keyOrTrustStoreParametersId=<span class="code-quote">"keyStoreParams"</span> />
+ keyOrTrustStoreParametersId=<span class="code-quote">"keyStoreParams"</span>
+ keyPassword=<span class="code-quote">"privateKeyPassword"</span> />
</unmarshal>
...
</pre>
Modified: websites/production/camel/content/cache/main.pageCache
==============================================================================
Binary files - no diff available.
Modified: websites/production/camel/content/xmlsecurity-dataformat.html
==============================================================================
--- websites/production/camel/content/xmlsecurity-dataformat.html (original)
+++ websites/production/camel/content/xmlsecurity-dataformat.html Wed Aug 29 13:19:13 2012
@@ -108,7 +108,7 @@ The XMLSecurity DataFormat supports asym
<div class="table-wrap">
<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Option </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> recipientKeyAlias </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> The key alias to be used when retrieving the recipient's public or private key from a KeyStore when performing asymmetric key encryption or decryption </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> keyCipherAlgorithm </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> The cipher algorithm to be used for encryption/decription of the asymmetric key. The available choices are:
<ul><li><tt>XMLCipher.RSA_v1dot5</tt></li><li><tt>XMLCipher.RSA_OAEP</tt></li></ul>
-</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> keyOrTrustStoreParameters </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> Configuration options for creating and loading a KeyStore instance that represents the sender's trustStore or recipient's keyStore. </td></tr></tbody></table>
+</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> keyOrTrustStoreParameters </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> Configuration options for creating and loading a KeyStore instance that represents the sender's trustStore or recipient's keyStore. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> keyPassword </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>2.10.2, 2.11</b> The password to be used for retrieving the private key from the KeyStore. This key is used for asymmetric decryption. </td></tr></tbody></table>
</div>
@@ -268,7 +268,8 @@ context.addRoutes(<span class="code-keyw
xmlCipherAlgorithm=<span class="code-quote">"http:<span class="code-comment">//www.w3.org/2001/04/xmlenc#aes128-cbc"</span>
</span> keyCipherAlgorithm=<span class="code-quote">"http:<span class="code-comment">//www.w3.org/2001/04/xmlenc#rsa-1_5"</span>
</span> recipientKeyAlias=<span class="code-quote">"recipient"</span>
- keyOrTrustStoreParametersId=<span class="code-quote">"keyStoreParams"</span> />
+ keyOrTrustStoreParametersId=<span class="code-quote">"keyStoreParams"</span>
+ keyPassword=<span class="code-quote">"privateKeyPassword"</span> />
</unmarshal>
...
</pre>