This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 155a8c7 Regen
155a8c7 is described below
commit 155a8c78f52d7718619819a708c0ba9fff838220
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Feb 6 16:14:29 2019 +0100
Regen
---
.../camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc | 2 +-
docs/components/modules/ROOT/pages/secureXML-dataformat.adoc | 6 +++---
docs/components/modules/ROOT/pages/xmlsecurity-component.adoc | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc
b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc
index d396677..cd91896 100644
--- a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc
+++ b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc
@@ -375,7 +375,7 @@ The component supports 63 options, which are listed below.
| *camel.dataformat.securexml.digest-algorithm* | The digest algorithm to use
with the RSA OAEP algorithm. The available choices are: XMLCipher.SHA1
XMLCipher.SHA256 XMLCipher.SHA512 The default value is XMLCipher.SHA1 | SHA1 |
String
| *camel.dataformat.securexml.enabled* | Enable securexml dataformat | true |
Boolean
| *camel.dataformat.securexml.key-cipher-algorithm* | The cipher algorithm to
be used for encryption/decryption of the asymmetric key. The available choices
are: XMLCipher.RSA_v1dot5 XMLCipher.RSA_OAEP XMLCipher.RSA_OAEP_11 The default
value is XMLCipher.RSA_OAEP | RSA_OAEP | String
-| *camel.dataformat.securexml.key-or-trust-store-parameters-id* | Refers to a
KeyStore instance to lookup in the registry, which is used for configuration
options for creating and loading a KeyStore instance that represents the
sender's trustStore or recipient's keyStore. | | String
+| *camel.dataformat.securexml.key-or-trust-store-parameters-ref* | Refers to a
KeyStore instance to lookup in the registry, which is used for configuration
options for creating and loading a KeyStore instance that represents the
sender's trustStore or recipient's keyStore. | | String
| *camel.dataformat.securexml.key-password* | The password to be used for
retrieving the private key from the KeyStore. This key is used for asymmetric
decryption. | | String
| *camel.dataformat.securexml.mgf-algorithm* | The MGF Algorithm to use with
the RSA OAEP algorithm. The available choices are:
EncryptionConstants.MGF1_SHA1 EncryptionConstants.MGF1_SHA256
EncryptionConstants.MGF1_SHA512 The default value is
EncryptionConstants.MGF1_SHA1 | MGF1_SHA1 | String
| *camel.dataformat.securexml.pass-phrase* | A String used as passPhrase to
encrypt/decrypt content. The passPhrase has to be provided. If no passPhrase is
specified, a default passPhrase is used. The passPhrase needs to be put
together in conjunction with the appropriate encryption algorithm. For example
using TRIPLEDES the passPhase can be a Only another 24 Byte key | | String
diff --git a/docs/components/modules/ROOT/pages/secureXML-dataformat.adoc
b/docs/components/modules/ROOT/pages/secureXML-dataformat.adoc
index ac7885b..a1f6c7a 100644
--- a/docs/components/modules/ROOT/pages/secureXML-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/secureXML-dataformat.adoc
@@ -53,7 +53,7 @@ The XML Security dataformat supports 13 options, which are
listed below.
| secureTagContents | false | Boolean | A boolean value to specify whether the
XML Element is to be encrypted or the contents of the XML Element false =
Element Level true = Element Content Level
| keyCipherAlgorithm | RSA_OAEP | String | The cipher algorithm to be used for
encryption/decryption of the asymmetric key. The available choices are:
XMLCipher.RSA_v1dot5 XMLCipher.RSA_OAEP XMLCipher.RSA_OAEP_11 The default value
is XMLCipher.RSA_OAEP
| recipientKeyAlias | | String | 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.
-| keyOrTrustStoreParametersId | | String | Refers to a KeyStore instance to
lookup in the registry, which is used for configuration options for creating
and loading a KeyStore instance that represents the sender's trustStore or
recipient's keyStore.
+| keyOrTrustStoreParametersRef | | String | Refers to a KeyStore instance to
lookup in the registry, which is used for configuration options for creating
and loading a KeyStore instance that represents the sender's trustStore or
recipient's keyStore.
| keyPassword | | String | The password to be used for retrieving the private
key from the KeyStore. This key is used for asymmetric decryption.
| digestAlgorithm | SHA1 | String | The digest algorithm to use with the RSA
OAEP algorithm. The available choices are: XMLCipher.SHA1 XMLCipher.SHA256
XMLCipher.SHA512 The default value is XMLCipher.SHA1
| mgfAlgorithm | MGF1_SHA1 | String | The MGF Algorithm to use with the RSA
OAEP algorithm. The available choices are: EncryptionConstants.MGF1_SHA1
EncryptionConstants.MGF1_SHA256 EncryptionConstants.MGF1_SHA512 The default
value is EncryptionConstants.MGF1_SHA1
@@ -218,7 +218,7 @@ Spring XML Sender
xmlCipherAlgorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc";
keyCipherAlgorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5";
recipientKeyAlias="recipient"
- keyOrTrustStoreParametersId="trustStoreParams"/>
+ keyOrTrustStoreParametersRef="trustStoreParams"/>
</marshal>
...
--------------------------------------------------------------------------------------------------
@@ -243,7 +243,7 @@ Spring XML Recipient
xmlCipherAlgorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc";
keyCipherAlgorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5";
recipientKeyAlias="recipient"
- keyOrTrustStoreParametersId="keyStoreParams"
+ keyOrTrustStoreParametersRef="keyStoreParams"
keyPassword="privateKeyPassword" />
</unmarshal>
...
diff --git a/docs/components/modules/ROOT/pages/xmlsecurity-component.adoc
b/docs/components/modules/ROOT/pages/xmlsecurity-component.adoc
index d396677..cd91896 100644
--- a/docs/components/modules/ROOT/pages/xmlsecurity-component.adoc
+++ b/docs/components/modules/ROOT/pages/xmlsecurity-component.adoc
@@ -375,7 +375,7 @@ The component supports 63 options, which are listed below.
| *camel.dataformat.securexml.digest-algorithm* | The digest algorithm to use
with the RSA OAEP algorithm. The available choices are: XMLCipher.SHA1
XMLCipher.SHA256 XMLCipher.SHA512 The default value is XMLCipher.SHA1 | SHA1 |
String
| *camel.dataformat.securexml.enabled* | Enable securexml dataformat | true |
Boolean
| *camel.dataformat.securexml.key-cipher-algorithm* | The cipher algorithm to
be used for encryption/decryption of the asymmetric key. The available choices
are: XMLCipher.RSA_v1dot5 XMLCipher.RSA_OAEP XMLCipher.RSA_OAEP_11 The default
value is XMLCipher.RSA_OAEP | RSA_OAEP | String
-| *camel.dataformat.securexml.key-or-trust-store-parameters-id* | Refers to a
KeyStore instance to lookup in the registry, which is used for configuration
options for creating and loading a KeyStore instance that represents the
sender's trustStore or recipient's keyStore. | | String
+| *camel.dataformat.securexml.key-or-trust-store-parameters-ref* | Refers to a
KeyStore instance to lookup in the registry, which is used for configuration
options for creating and loading a KeyStore instance that represents the
sender's trustStore or recipient's keyStore. | | String
| *camel.dataformat.securexml.key-password* | The password to be used for
retrieving the private key from the KeyStore. This key is used for asymmetric
decryption. | | String
| *camel.dataformat.securexml.mgf-algorithm* | The MGF Algorithm to use with
the RSA OAEP algorithm. The available choices are:
EncryptionConstants.MGF1_SHA1 EncryptionConstants.MGF1_SHA256
EncryptionConstants.MGF1_SHA512 The default value is
EncryptionConstants.MGF1_SHA1 | MGF1_SHA1 | String
| *camel.dataformat.securexml.pass-phrase* | A String used as passPhrase to
encrypt/decrypt content. The passPhrase has to be provided. If no passPhrase is
specified, a default passPhrase is used. The passPhrase needs to be put
together in conjunction with the appropriate encryption algorithm. For example
using TRIPLEDES the passPhase can be a Only another 24 Byte key | | String
