You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/02/13 13:57:38 UTC
[camel] branch master updated: CAMEL-14546: camel-xmlsecurity -
Split up into verify and sign endpoints
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 9c3815b CAMEL-14546: camel-xmlsecurity - Split up into verify and sign endpoints
9c3815b is described below
commit 9c3815bb8dee758f6be71fb2755a6e6595679515
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Feb 13 14:57:18 2020 +0100
CAMEL-14546: camel-xmlsecurity - Split up into verify and sign endpoints
---
.../ROOT/pages/xmlsecurity-sign-component.adoc | 28 +++++++++++----------
.../ROOT/pages/xmlsecurity-verify-component.adoc | 29 +++++++++++-----------
docs/user-manual/modules/ROOT/pages/index.adoc | 1 -
docs/user-manual/modules/ROOT/pages/security.adoc | 2 --
4 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/xmlsecurity-sign-component.adoc b/docs/components/modules/ROOT/pages/xmlsecurity-sign-component.adoc
index ff222ea..5ece051 100644
--- a/docs/components/modules/ROOT/pages/xmlsecurity-sign-component.adoc
+++ b/docs/components/modules/ROOT/pages/xmlsecurity-sign-component.adoc
@@ -2,6 +2,8 @@
= XML Security Sign Component
:page-source: components/camel-xmlsecurity/src/main/docs/xmlsecurity-sign-component.adoc
*Since Camel 2.12*
+*Since Camel 2.12*
+
*Since Camel 2.12*
@@ -158,8 +160,8 @@ URI format:
[source]
----
-xmlsecurity:sign:name[?options]
-xmlsecurity:verify:name[?options]
+xmlsecurity-sign:name[?options]
+xmlsecurity-verify:name[?options]
----
* With the signer endpoint, you can generate a XML signature for the
@@ -180,8 +182,8 @@ The following example shows the basic usage of the component.
[source,java]
----
-from("direct:enveloping").to("xmlsecurity:sign://enveloping?keyAccessor=#accessor",
- "xmlsecurity:verify://enveloping?keySelector=#selector",
+from("direct:enveloping").to("xmlsecurity-sign://enveloping?keyAccessor=#accessor",
+ "xmlsecurity-verify://enveloping?keySelector=#selector",
"mock:result")
----
@@ -190,8 +192,8 @@ In Spring XML:
[source,xml]
----
<from uri="direct:enveloping" />
- <to uri="xmlsecurity:sign://enveloping?keyAccessor=#accessor" />
- <to uri="xmlsecurity:verify://enveloping?keySelector=#selector" />
+ <to uri="xmlsecurity-sign://enveloping?keyAccessor=#accessor" />
+ <to uri="xmlsecurity-verify://enveloping?keySelector=#selector" />
<to uri="mock:result" />
----
@@ -446,8 +448,8 @@ element `A`.
[source,java]
----
from("direct:detached")
- .to("xmlsecurity:sign://detached?keyAccessor=#keyAccessorBeant&xpathsToIdAttributes=#xpathsToIdAttributesBean&schemaResourceUri=Test.xsd")
- .to("xmlsecurity:verify://detached?keySelector=#keySelectorBean&schemaResourceUri=org/apache/camel/component/xmlsecurity/Test.xsd")
+ .to("xmlsecurity-sign://detached?keyAccessor=#keyAccessorBeant&xpathsToIdAttributes=#xpathsToIdAttributesBean&schemaResourceUri=Test.xsd")
+ .to("xmlsecurity-verify://detached?keySelector=#keySelectorBean&schemaResourceUri=org/apache/camel/component/xmlsecurity/Test.xsd")
.to("mock:result");
----
@@ -476,9 +478,9 @@ from("direct:detached")
...
<from uri="direct:detached" />
<to
- uri="xmlsecurity:sign://detached?keyAccessor=#keyAccessorBean&xpathsToIdAttributes=#xpathsToIdAttributesBean&schemaResourceUri=Test.xsd" />
+ uri="xmlsecurity-sign://detached?keyAccessor=#keyAccessorBean&xpathsToIdAttributes=#xpathsToIdAttributesBean&schemaResourceUri=Test.xsd" />
<to
- uri="xmlsecurity:verify://detached?keySelector=#keySelectorBean&schemaResourceUri=Test.xsd" />
+ uri="xmlsecurity-verify://detached?keySelector=#keySelectorBean&schemaResourceUri=Test.xsd" />
<to uri="mock:result" />
----
@@ -619,7 +621,7 @@ beanRegistry.bind("xmlSignatureProperties",props);
beanRegistry.bind("keyAccessorDefault",keyAccessor);
// you must reference the properties bean in the "xmlsecurity" URI
-from("direct:xades").to("xmlsecurity:sign://xades?keyAccessor=#keyAccessorDefault&properties=#xmlSignatureProperties")
+from("direct:xades").to("xmlsecurity-sign://xades?keyAccessor=#keyAccessorDefault&properties=#xmlSignatureProperties")
.to("mock:result");
----
@@ -630,7 +632,7 @@ from("direct:xades").to("xmlsecurity:sign://xades?keyAccessor=#keyAccessorDefaul
...
<from uri="direct:xades" />
<to
- uri="xmlsecurity:sign://xades?keyAccessor=#accessorRsa&properties=#xadesProperties" />
+ uri="xmlsecurity-sign://xades?keyAccessor=#accessorRsa&properties=#xadesProperties" />
<to uri="mock:result" />
...
<bean id="xadesProperties"
@@ -708,4 +710,4 @@ the XML signer endpoint).
* The `IndividualDataObjectsTimeStamp` element is not supported
-include::camel-spring-boot::page$xmlsecurity-starter.adoc[]
+include::camel-spring-boot::page$xmlsecurity-starter.adoc[]
\ No newline at end of file
diff --git a/docs/components/modules/ROOT/pages/xmlsecurity-verify-component.adoc b/docs/components/modules/ROOT/pages/xmlsecurity-verify-component.adoc
index 7c1ffa3..bb0edd1 100644
--- a/docs/components/modules/ROOT/pages/xmlsecurity-verify-component.adoc
+++ b/docs/components/modules/ROOT/pages/xmlsecurity-verify-component.adoc
@@ -1,8 +1,9 @@
[[xmlsecurity-verify-component]]
= XML Security Verify Component
:page-source: components/camel-xmlsecurity/src/main/docs/xmlsecurity-verify-component.adoc
-= XML Security Component
*Since Camel 2.12*
+*Since Camel 2.12*
+
*Since Camel 2.12*
@@ -159,8 +160,8 @@ URI format:
[source]
----
-xmlsecurity:sign:name[?options]
-xmlsecurity:verify:name[?options]
+xmlsecurity-sign:name[?options]
+xmlsecurity-verify:name[?options]
----
* With the signer endpoint, you can generate a XML signature for the
@@ -181,8 +182,8 @@ The following example shows the basic usage of the component.
[source,java]
----
-from("direct:enveloping").to("xmlsecurity:sign://enveloping?keyAccessor=#accessor",
- "xmlsecurity:verify://enveloping?keySelector=#selector",
+from("direct:enveloping").to("xmlsecurity-sign://enveloping?keyAccessor=#accessor",
+ "xmlsecurity-verify://enveloping?keySelector=#selector",
"mock:result")
----
@@ -191,8 +192,8 @@ In Spring XML:
[source,xml]
----
<from uri="direct:enveloping" />
- <to uri="xmlsecurity:sign://enveloping?keyAccessor=#accessor" />
- <to uri="xmlsecurity:verify://enveloping?keySelector=#selector" />
+ <to uri="xmlsecurity-sign://enveloping?keyAccessor=#accessor" />
+ <to uri="xmlsecurity-verify://enveloping?keySelector=#selector" />
<to uri="mock:result" />
----
@@ -437,8 +438,8 @@ element `A`.
[source,java]
----
from("direct:detached")
- .to("xmlsecurity:sign://detached?keyAccessor=#keyAccessorBeant&xpathsToIdAttributes=#xpathsToIdAttributesBean&schemaResourceUri=Test.xsd")
- .to("xmlsecurity:verify://detached?keySelector=#keySelectorBean&schemaResourceUri=org/apache/camel/component/xmlsecurity/Test.xsd")
+ .to("xmlsecurity-sign://detached?keyAccessor=#keyAccessorBeant&xpathsToIdAttributes=#xpathsToIdAttributesBean&schemaResourceUri=Test.xsd")
+ .to("xmlsecurity-verify://detached?keySelector=#keySelectorBean&schemaResourceUri=org/apache/camel/component/xmlsecurity/Test.xsd")
.to("mock:result");
----
@@ -467,9 +468,9 @@ from("direct:detached")
...
<from uri="direct:detached" />
<to
- uri="xmlsecurity:sign://detached?keyAccessor=#keyAccessorBean&xpathsToIdAttributes=#xpathsToIdAttributesBean&schemaResourceUri=Test.xsd" />
+ uri="xmlsecurity-sign://detached?keyAccessor=#keyAccessorBean&xpathsToIdAttributes=#xpathsToIdAttributesBean&schemaResourceUri=Test.xsd" />
<to
- uri="xmlsecurity:verify://detached?keySelector=#keySelectorBean&schemaResourceUri=Test.xsd" />
+ uri="xmlsecurity-verify://detached?keySelector=#keySelectorBean&schemaResourceUri=Test.xsd" />
<to uri="mock:result" />
----
@@ -610,7 +611,7 @@ beanRegistry.bind("xmlSignatureProperties",props);
beanRegistry.bind("keyAccessorDefault",keyAccessor);
// you must reference the properties bean in the "xmlsecurity" URI
-from("direct:xades").to("xmlsecurity:sign://xades?keyAccessor=#keyAccessorDefault&properties=#xmlSignatureProperties")
+from("direct:xades").to("xmlsecurity-sign://xades?keyAccessor=#keyAccessorDefault&properties=#xmlSignatureProperties")
.to("mock:result");
----
@@ -621,7 +622,7 @@ from("direct:xades").to("xmlsecurity:sign://xades?keyAccessor=#keyAccessorDefaul
...
<from uri="direct:xades" />
<to
- uri="xmlsecurity:sign://xades?keyAccessor=#accessorRsa&properties=#xadesProperties" />
+ uri="xmlsecurity-sign://xades?keyAccessor=#accessorRsa&properties=#xadesProperties" />
<to uri="mock:result" />
...
<bean id="xadesProperties"
@@ -699,4 +700,4 @@ the XML signer endpoint).
* The `IndividualDataObjectsTimeStamp` element is not supported
-include::camel-spring-boot::page$xmlsecurity-starter.adoc[]
+include::camel-spring-boot::page$xmlsecurity-starter.adoc[]
\ No newline at end of file
diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc b/docs/user-manual/modules/ROOT/pages/index.adoc
index da683fa..37d8392 100644
--- a/docs/user-manual/modules/ROOT/pages/index.adoc
+++ b/docs/user-manual/modules/ROOT/pages/index.adoc
@@ -396,7 +396,6 @@ camel routes without them knowing
** xref:components::web3j-component.adoc[Web3j Ethereum Blockchain]
** xref:components::wordpress-component.adoc[Wordpress]
** xref:components::xchange-component.adoc[XChange]
-** xref:components::xmlsecurity-component.adoc[XML Security]
** xref:components::xmpp-component.adoc[XMPP]
** xref:components::xj-component.adoc[XJ]
** xref:components::xquery-component.adoc[XQuery]
diff --git a/docs/user-manual/modules/ROOT/pages/security.adoc b/docs/user-manual/modules/ROOT/pages/security.adoc
index 40b84dd..8b84a1b 100644
--- a/docs/user-manual/modules/ROOT/pages/security.adoc
+++ b/docs/user-manual/modules/ROOT/pages/security.adoc
@@ -42,8 +42,6 @@ These capabilites are offered by the following components
* xref:components::secureXML-dataformat.adoc[XMLSecurity DataFormat] (XML
Encryption support)
-* xref:components::xmlsecurity-component.adoc[XML Security component] (XML
-Signature support)
* xref:components::crypto-dataformat.adoc[Crypto DataFormat] (Encryption + PGP support)
* xref:components::crypto-component.adoc[Crypto component] (Signature
support)