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 2016/01/06 18:28:47 UTC

[3/4] camel git commit: Component docs - Fixed invalid uris

Component docs - Fixed invalid uris


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/74b78a1d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/74b78a1d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/74b78a1d

Branch: refs/heads/camel-2.16.x
Commit: 74b78a1d455abc8ba8ddaecec7f25db43164582e
Parents: 2801a71
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jan 6 18:08:31 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 6 18:28:14 2016 +0100

----------------------------------------------------------------------
 .../xmlsecurity/XmlSignatureComponent.java      |  2 +-
 .../xmlsecurity/XmlSignatureEndpoint.java       |  6 +-
 .../xmlsecurity/ECDSASignatureTest.java         | 24 ++---
 .../xmlsecurity/SignatureAlgorithmTest.java     | 68 +++++++-------
 .../xmlsecurity/SignatureDigestMethodTest.java  | 44 ++++-----
 .../xmlsecurity/SpringXmlSignatureTest.java     | 12 +--
 .../XAdESSignaturePropertiesTest.java           | 10 +--
 .../component/xmlsecurity/XmlSignatureTest.java | 94 ++++++++++----------
 .../xmlsecurity/SpringXmlSignatureTests.xml     | 80 ++++++++---------
 9 files changed, 171 insertions(+), 169 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/74b78a1d/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java
index 169a39b..9b2928b 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java
@@ -55,7 +55,7 @@ public class XmlSignatureComponent extends UriEndpointComponent {
             throw new MalformedURLException(
                 String.format(
                     "An invalid xmlsecurity uri was provided '%s'."
-                    + " Check the uri matches the format xmlsecurity:sign://<name> or xmlsecurity:verify://<name>",
+                    + " Check the uri matches the format xmlsecurity:sign://<name> or xmlsecurity:verify:<name>",
                     uri
                 )
             );

http://git-wip-us.apache.org/repos/asf/camel/blob/74b78a1d/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureEndpoint.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureEndpoint.java
index dd93b56..d782501 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureEndpoint.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureEndpoint.java
@@ -31,7 +31,10 @@ import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
 
-@UriEndpoint(scheme = "xmlsecurity", title = "XML Security", syntax = "xmlsecurity:command/name", producerOnly = true, label = "security,transformation")
+/**
+ * Used to sign and verify exchanges using the XML signature specification.
+ */
+@UriEndpoint(scheme = "xmlsecurity", title = "XML Security", syntax = "xmlsecurity:command:name", producerOnly = true, label = "security,transformation")
 public abstract class XmlSignatureEndpoint extends DefaultEndpoint {
 
     @UriPath @Metadata(required = "true")
@@ -139,7 +142,6 @@ public abstract class XmlSignatureEndpoint extends DefaultEndpoint {
 
     public void setSchemaResourceUri(String schemaResourceUri) {
         getConfiguration().setSchemaResourceUri(schemaResourceUri);
-        
     }
     
     public String getOutputXmlEncoding() {

http://git-wip-us.apache.org/repos/asf/camel/blob/74b78a1d/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java
index 71d603e..df5f8ce 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java
@@ -106,10 +106,10 @@ public class ECDSASignatureTest extends CamelTestSupport {
             public void configure() throws Exception {
                 // START SNIPPET: ecdsa signature algorithm
                 from("direct:ecdsa_sha1")
-                    .to("xmlsecurity:sign://ecdsa_sha1?keyAccessor=#accessor"
+                    .to("xmlsecurity:sign:ecdsa_sha1?keyAccessor=#accessor"
                         + "&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1")
                         // .log("Body: + ${body}")
-                        .to("xmlsecurity:verify://ecdsa?keySelector=#selector")
+                        .to("xmlsecurity:verify:ecdsa?keySelector=#selector")
                     .to("mock:result");
                 // END SNIPPET: ecdsa signature algorithm
             }
@@ -117,9 +117,9 @@ public class ECDSASignatureTest extends CamelTestSupport {
             public void configure() throws Exception {
                 // START SNIPPET: ecdsa signature algorithm
                 from("direct:ecdsa_sha224")
-                    .to("xmlsecurity:sign://ecdsa_sha224?keyAccessor=#accessor"
+                    .to("xmlsecurity:sign:ecdsa_sha224?keyAccessor=#accessor"
                         + "&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224")
-                        .to("xmlsecurity:verify://ecdsa?keySelector=#selector")
+                        .to("xmlsecurity:verify:ecdsa?keySelector=#selector")
                     .to("mock:result");
                 // END SNIPPET: ecdsa signature algorithm
             }
@@ -127,9 +127,9 @@ public class ECDSASignatureTest extends CamelTestSupport {
             public void configure() throws Exception {
                 // START SNIPPET: ecdsa signature algorithm
                 from("direct:ecdsa_sha256")
-                    .to("xmlsecurity:sign://ecdsa_sha256?keyAccessor=#accessor"
+                    .to("xmlsecurity:sign:ecdsa_sha256?keyAccessor=#accessor"
                         + "&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256")
-                        .to("xmlsecurity:verify://ecdsa?keySelector=#selector")
+                        .to("xmlsecurity:verify:ecdsa?keySelector=#selector")
                     .to("mock:result");
                 // END SNIPPET: ecdsa signature algorithm
             }
@@ -137,9 +137,9 @@ public class ECDSASignatureTest extends CamelTestSupport {
             public void configure() throws Exception {
                 // START SNIPPET: ecdsa signature algorithm
                 from("direct:ecdsa_sha384")
-                    .to("xmlsecurity:sign://ecdsa_sha384?keyAccessor=#accessor"
+                    .to("xmlsecurity:sign:ecdsa_sha384?keyAccessor=#accessor"
                         + "&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384")
-                        .to("xmlsecurity:verify://ecdsa?keySelector=#selector")
+                        .to("xmlsecurity:verify:ecdsa?keySelector=#selector")
                     .to("mock:result");
                 // END SNIPPET: ecdsa signature algorithm
             }
@@ -147,9 +147,9 @@ public class ECDSASignatureTest extends CamelTestSupport {
             public void configure() throws Exception {
                 // START SNIPPET: ecdsa signature algorithm
                 from("direct:ecdsa_sha512")
-                    .to("xmlsecurity:sign://ecdsa_sha512?keyAccessor=#accessor"
+                    .to("xmlsecurity:sign:ecdsa_sha512?keyAccessor=#accessor"
                         + "&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512")
-                        .to("xmlsecurity:verify://ecdsa?keySelector=#selector")
+                        .to("xmlsecurity:verify:ecdsa?keySelector=#selector")
                     .to("mock:result");
                 // END SNIPPET: ecdsa signature algorithm
             }
@@ -157,9 +157,9 @@ public class ECDSASignatureTest extends CamelTestSupport {
             public void configure() throws Exception {
                 // START SNIPPET: ecdsa signature algorithm
                 from("direct:ecdsa_ripemd160")
-                    .to("xmlsecurity:sign://ecdsa_ripemd160?keyAccessor=#accessor"
+                    .to("xmlsecurity:sign:ecdsa_ripemd160?keyAccessor=#accessor"
                         + "&signatureAlgorithm=http://www.w3.org/2007/05/xmldsig-more#ecdsa-ripemd160")
-                        .to("xmlsecurity:verify://ecdsa?keySelector=#selector")
+                        .to("xmlsecurity:verify:ecdsa?keySelector=#selector")
                     .to("mock:result");
                 // END SNIPPET: ecdsa signature algorithm
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/74b78a1d/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
index 8de7b9c..413621e 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
@@ -147,154 +147,154 @@ public class SignatureAlgorithmTest extends CamelTestSupport {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:hmacsha1")
-                        .to("xmlsecurity:sign://hmacsha1?keyAccessor=#secretKeyAccessor"
+                        .to("xmlsecurity:sign:hmacsha1?keyAccessor=#secretKeyAccessor"
                             + "&signatureAlgorithm=http://www.w3.org/2000/09/xmldsig#hmac-sha1")
                         // .log("Body: + ${body}")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#secretKeySelector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#secretKeySelector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:hmacsha224")
-                        .to("xmlsecurity:sign://hmacsha224?keyAccessor=#secretKeyAccessor"
+                        .to("xmlsecurity:sign:hmacsha224?keyAccessor=#secretKeyAccessor"
                             + "&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#hmac-sha224")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#secretKeySelector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#secretKeySelector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:hmacsha256")
-                        .to("xmlsecurity:sign://hmacsha256?keyAccessor=#secretKeyAccessor"
+                        .to("xmlsecurity:sign:hmacsha256?keyAccessor=#secretKeyAccessor"
                             + "&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#hmac-sha256")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#secretKeySelector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#secretKeySelector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:hmacsha384")
-                        .to("xmlsecurity:sign://hmacsha384?keyAccessor=#secretKeyAccessor"
+                        .to("xmlsecurity:sign:hmacsha384?keyAccessor=#secretKeyAccessor"
                             + "&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#hmac-sha384")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#secretKeySelector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#secretKeySelector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:hmacsha512")
-                        .to("xmlsecurity:sign://hmacsha512?keyAccessor=#secretKeyAccessor"
+                        .to("xmlsecurity:sign:hmacsha512?keyAccessor=#secretKeyAccessor"
                             + "&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#hmac-sha512")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#secretKeySelector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#secretKeySelector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:hmacripemd160")
-                        .to("xmlsecurity:sign://hmacripemd160?keyAccessor=#secretKeyAccessor"
+                        .to("xmlsecurity:sign:hmacripemd160?keyAccessor=#secretKeyAccessor"
                             + "&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#secretKeySelector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#secretKeySelector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:rsasha1")
-                        .to("xmlsecurity:sign://rsasha1?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:rsasha1?keyAccessor=#accessor"
                             + "&signatureAlgorithm=http://www.w3.org/2000/09/xmldsig#rsa-sha1")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:rsasha224")
-                        .to("xmlsecurity:sign://rsasha224?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:rsasha224?keyAccessor=#accessor"
                             + "&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#rsa-sha224")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:rsasha256")
-                        .to("xmlsecurity:sign://rsasha256?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:rsasha256?keyAccessor=#accessor"
                             + "&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#rsa-sha256")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:rsasha384")
-                        .to("xmlsecurity:sign://rsasha384?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:rsasha384?keyAccessor=#accessor"
                             + "&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#rsa-sha384")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:rsasha512")
-                        .to("xmlsecurity:sign://rsasha512?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:rsasha512?keyAccessor=#accessor"
                             + "&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#rsa-sha512")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:rsaripemd160")
-                        .to("xmlsecurity:sign://rsaripemd160?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:rsaripemd160?keyAccessor=#accessor"
                             + "&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:rsasha1_mgf1")
-                        .to("xmlsecurity:sign://rsasha1_mgf1?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:rsasha1_mgf1?keyAccessor=#accessor"
                             + "&signatureAlgorithm=http://www.w3.org/2007/05/xmldsig-more#sha1-rsa-MGF1")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:rsasha224_mgf1")
-                        .to("xmlsecurity:sign://rsasha224_mgf1?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:rsasha224_mgf1?keyAccessor=#accessor"
                             + "&signatureAlgorithm=http://www.w3.org/2007/05/xmldsig-more#sha224-rsa-MGF1")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:rsasha256_mgf1")
-                        .to("xmlsecurity:sign://rsasha256_mgf1?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:rsasha256_mgf1?keyAccessor=#accessor"
                             + "&signatureAlgorithm=http://www.w3.org/2007/05/xmldsig-more#sha256-rsa-MGF1")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:rsasha384_mgf1")
-                        .to("xmlsecurity:sign://rsasha384_mgf1?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:rsasha384_mgf1?keyAccessor=#accessor"
                             + "&signatureAlgorithm=http://www.w3.org/2007/05/xmldsig-more#sha384-rsa-MGF1")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:rsasha512_mgf1")
-                        .to("xmlsecurity:sign://rsasha512_mgf1?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:rsasha512_mgf1?keyAccessor=#accessor"
                             + "&signatureAlgorithm=http://www.w3.org/2007/05/xmldsig-more#sha512-rsa-MGF1")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }};

http://git-wip-us.apache.org/repos/asf/camel/blob/74b78a1d/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
index cf69163..4a4c8c0 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
@@ -141,99 +141,99 @@ public class SignatureDigestMethodTest extends CamelTestSupport {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:sha1")
-                        .to("xmlsecurity:sign://sha1?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:sha1?keyAccessor=#accessor"
                             + "&digestAlgorithm=http://www.w3.org/2000/09/xmldsig#sha1")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:sha224")
-                        .to("xmlsecurity:sign://sha224?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:sha224?keyAccessor=#accessor"
                             + "&digestAlgorithm=http://www.w3.org/2001/04/xmldsig-more#sha224")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:sha256")
-                        .to("xmlsecurity:sign://sha256?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:sha256?keyAccessor=#accessor"
                             + "&digestAlgorithm=http://www.w3.org/2001/04/xmlenc#sha256")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:sha384")
-                        .to("xmlsecurity:sign://sha384?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:sha384?keyAccessor=#accessor"
                             + "&digestAlgorithm=http://www.w3.org/2001/04/xmldsig-more#sha384")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:sha512")
-                        .to("xmlsecurity:sign://sha512?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:sha512?keyAccessor=#accessor"
                             + "&digestAlgorithm=http://www.w3.org/2001/04/xmlenc#sha512")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:ripemd160")
-                        .to("xmlsecurity:sign://ripemd160?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:ripemd160?keyAccessor=#accessor"
                             + "&digestAlgorithm=http://www.w3.org/2001/04/xmlenc#ripemd160")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:whirlpool")
-                        .to("xmlsecurity:sign://whirlpool?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:whirlpool?keyAccessor=#accessor"
                             + "&digestAlgorithm=http://www.w3.org/2007/05/xmldsig-more#whirlpool")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:sha3_224")
-                        .to("xmlsecurity:sign://sha3_224?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:sha3_224?keyAccessor=#accessor"
                             + "&digestAlgorithm=http://www.w3.org/2007/05/xmldsig-more#sha3-224")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:sha3_256")
-                        .to("xmlsecurity:sign://sha3_256?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:sha3_256?keyAccessor=#accessor"
                             + "&digestAlgorithm=http://www.w3.org/2007/05/xmldsig-more#sha3-256")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:sha3_384")
-                        .to("xmlsecurity:sign://sha3_384?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:sha3_384?keyAccessor=#accessor"
                             + "&digestAlgorithm=http://www.w3.org/2007/05/xmldsig-more#sha3-384")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:sha3_512")
-                        .to("xmlsecurity:sign://sha3_512?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:sha3_512?keyAccessor=#accessor"
                             + "&digestAlgorithm=http://www.w3.org/2007/05/xmldsig-more#sha3-512")
-                        .to("xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                        .to("xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }};

http://git-wip-us.apache.org/repos/asf/camel/blob/74b78a1d/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SpringXmlSignatureTest.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SpringXmlSignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SpringXmlSignatureTest.java
index fe0324a..4ab53ca 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SpringXmlSignatureTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SpringXmlSignatureTest.java
@@ -74,7 +74,7 @@ public class SpringXmlSignatureTest extends XmlSignatureTest {
     XmlSignerEndpoint getDetachedSignerEndpoint() {
         XmlSignerEndpoint endpoint = (XmlSignerEndpoint) context()
                 .getEndpoint(
-                        "xmlsecurity:sign://detached?keyAccessor=#accessorRsa&xpathsToIdAttributes=#xpathsToIdAttributes&"//
+                        "xmlsecurity:sign:detached?keyAccessor=#accessorRsa&xpathsToIdAttributes=#xpathsToIdAttributes&"//
                         + "schemaResourceUri=org/apache/camel/component/xmlsecurity/Test.xsd&signatureId=&clearHeaders=false");
         return endpoint;
     }
@@ -82,28 +82,28 @@ public class SpringXmlSignatureTest extends XmlSignatureTest {
     @Override
     XmlSignerEndpoint getSignatureEncpointForSignException() {
         XmlSignerEndpoint endpoint = (XmlSignerEndpoint)context().getEndpoint(//
-            "xmlsecurity:sign://signexceptioninvalidkey?keyAccessor=#accessorRsa");
+            "xmlsecurity:sign:signexceptioninvalidkey?keyAccessor=#accessorRsa");
         return endpoint;
     }
     
     @Override
     String getVerifierEndpointURIEnveloped() {
-        return "xmlsecurity:verify://enveloped?keySelector=#selectorRsa";
+        return "xmlsecurity:verify:enveloped?keySelector=#selectorRsa";
     }
 
     @Override
     String getSignerEndpointURIEnveloped() {
-        return "xmlsecurity:sign://enveloped?keyAccessor=#accessorRsa&parentLocalName=root&parentNamespace=http://test/test";
+        return "xmlsecurity:sign:enveloped?keyAccessor=#accessorRsa&parentLocalName=root&parentNamespace=http://test/test";
     }
     
     @Override
     String getVerifierEndpointURIEnveloping() {
-        return "xmlsecurity:verify://enveloping?keySelector=#selectorRsa";
+        return "xmlsecurity:verify:enveloping?keySelector=#selectorRsa";
     }
 
     @Override
     String getSignerEndpointURIEnveloping() {
-        return "xmlsecurity:sign://enveloping?keyAccessor=#accessorRsa";
+        return "xmlsecurity:sign:enveloping?keyAccessor=#accessorRsa";
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/camel/blob/74b78a1d/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
index 79a9ccc..7c0a61a 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
@@ -113,27 +113,27 @@ public class XAdESSignaturePropertiesTest extends CamelTestSupport {
             public void configure() throws Exception {
                 onException(XmlSignatureException.class).handled(true).to("mock:exception");
                 from("direct:enveloped")
-                        .to("xmlsecurity:sign://xades?keyAccessor=#keyAccessorDefault&properties=#xmlSignatureProperties&parentLocalName=root&parentNamespace=http://test/test")
+                        .to("xmlsecurity:sign:xades?keyAccessor=#keyAccessorDefault&properties=#xmlSignatureProperties&parentLocalName=root&parentNamespace=http://test/test")
                         .to("mock:result");
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 onException(XmlSignatureException.class).handled(true).to("mock:exception");
-                from("direct:enveloping").to("xmlsecurity:sign://xades?keyAccessor=#keyAccessorDefault&properties=#xmlSignatureProperties")
+                from("direct:enveloping").to("xmlsecurity:sign:xades?keyAccessor=#keyAccessorDefault&properties=#xmlSignatureProperties")
                         .to("mock:result");
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 onException(XmlSignatureException.class).handled(true).to("mock:exception");
                 from("direct:emptySignatureId").to(
-                        "xmlsecurity:sign://xades?keyAccessor=#keyAccessorDefault&properties=#xmlSignatureProperties&signatureId=").to(
+                        "xmlsecurity:sign:xades?keyAccessor=#keyAccessorDefault&properties=#xmlSignatureProperties&signatureId=").to(
                         "mock:result");
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 onException(Exception.class).handled(false).to("mock:exception");
                 from("direct:detached").to(
-                        "xmlsecurity:sign://detached?keyAccessor=#keyAccessorDefault&xpathsToIdAttributes=#xpathsToIdAttributes&"//
+                        "xmlsecurity:sign:detached?keyAccessor=#keyAccessorDefault&xpathsToIdAttributes=#xpathsToIdAttributes&"//
                                 + "schemaResourceUri=org/apache/camel/component/xmlsecurity/Test.xsd&properties=#xmlSignatureProperties")
                         .to("mock:result");
             }
@@ -723,7 +723,7 @@ public class XAdESSignaturePropertiesTest extends CamelTestSupport {
 
     private XmlSignerEndpoint getSignerEndpoint() {
         return (XmlSignerEndpoint) context().getEndpoint(
-                "xmlsecurity:sign://xades?keyAccessor=#keyAccessorDefault&properties=#xmlSignatureProperties");
+                "xmlsecurity:sign:xades?keyAccessor=#keyAccessorDefault&properties=#xmlSignatureProperties");
     }
 
     private String getPathToSignatureProperties() {

http://git-wip-us.apache.org/repos/asf/camel/blob/74b78a1d/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
index fa62b2e..0183603 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
@@ -162,8 +162,8 @@ public class XmlSignatureTest extends CamelTestSupport {
                 // START SNIPPET: enveloping XML signature with plain text
                 // message body
                 onException(XmlSignatureException.class).handled(true).to("mock:exception");
-                from("direct:plaintext").to("xmlsecurity:sign://plaintext?keyAccessor=#accessor&plainText=true&plainTextEncoding=UTF-8")
-                        .to("xmlsecurity:verify://plaintext?keySelector=#selector").to("mock:result");
+                from("direct:plaintext").to("xmlsecurity:sign:plaintext?keyAccessor=#accessor&plainText=true&plainTextEncoding=UTF-8")
+                        .to("xmlsecurity:verify:plaintext?keySelector=#selector").to("mock:result");
                 // END SNIPPET: enveloping XML signature with plain text message
                 // body
             }
@@ -180,31 +180,31 @@ public class XmlSignatureTest extends CamelTestSupport {
                 // START SNIPPET: canonicalization
                 // we can set the configuration properties explicitly on the
                 // endpoint instances.
-                context.getEndpoint("xmlsecurity:sign://canonicalization?canonicalizationMethod=#canonicalizationMethod1",
+                context.getEndpoint("xmlsecurity:sign:canonicalization?canonicalizationMethod=#canonicalizationMethod1",
                         XmlSignerEndpoint.class).setKeyAccessor(getKeyAccessor(keyPair.getPrivate()));
-                context.getEndpoint("xmlsecurity:sign://canonicalization?canonicalizationMethod=#canonicalizationMethod1",
+                context.getEndpoint("xmlsecurity:sign:canonicalization?canonicalizationMethod=#canonicalizationMethod1",
                         XmlSignerEndpoint.class).setSignatureAlgorithm("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256");
-                context.getEndpoint("xmlsecurity:verify://canonicalization", XmlVerifierEndpoint.class).setKeySelector(
+                context.getEndpoint("xmlsecurity:verify:canonicalization", XmlVerifierEndpoint.class).setKeySelector(
                         KeySelector.singletonKeySelector(keyPair.getPublic()));
-                from("direct:canonicalization").to("xmlsecurity:sign://canonicalization?canonicalizationMethod=#canonicalizationMethod1",
-                        "xmlsecurity:verify://canonicalization", "mock:result");
+                from("direct:canonicalization").to("xmlsecurity:sign:canonicalization?canonicalizationMethod=#canonicalizationMethod1",
+                        "xmlsecurity:verify:canonicalization", "mock:result");
                 // END SNIPPET: canonicalization
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: signature and digest algorithm
                 from("direct:signaturedigestalgorithm")
-                        .to("xmlsecurity:sign://signaturedigestalgorithm?keyAccessor=#accessor"
+                        .to("xmlsecurity:sign:signaturedigestalgorithm?keyAccessor=#accessor"
                                 + "&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#rsa-sha512&digestAlgorithm=http://www.w3.org/2001/04/xmlenc#sha512",
-                                "xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selector").to("mock:result");
+                                "xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selector").to("mock:result");
                 // END SNIPPET: signature and digest algorithm
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: transforms XPath2
                 from("direct:transformsXPath2").to(
-                        "xmlsecurity:sign://transformsXPath2?keyAccessor=#accessor&transformMethods=#transformsXPath2",
-                        "xmlsecurity:verify://transformsXPath2?keySelector=#selector").to("mock:result");
+                        "xmlsecurity:sign:transformsXPath2?keyAccessor=#accessor&transformMethods=#transformsXPath2",
+                        "xmlsecurity:verify:transformsXPath2?keySelector=#selector").to("mock:result");
                 // END SNIPPET: transform XPath
             }
         }, new RouteBuilder() {
@@ -212,8 +212,8 @@ public class XmlSignatureTest extends CamelTestSupport {
                 // START SNIPPET: transforms XSLT,XPath
                 onException(XmlSignatureException.class).handled(false).to("mock:exception");
                 from("direct:transformsXsltXPath").to(
-                        "xmlsecurity:sign://transformsXsltXPath?keyAccessor=#accessor&transformMethods=#transformsXsltXPath",
-                        "xmlsecurity:verify://transformsXsltXPath?keySelector=#selector").to("mock:result");
+                        "xmlsecurity:sign:transformsXsltXPath?keyAccessor=#accessor&transformMethods=#transformsXsltXPath",
+                        "xmlsecurity:verify:transformsXsltXPath?keySelector=#selector").to("mock:result");
                 // END SNIPPET: transforms XSLT,XPath
             }
         }, new RouteBuilder() {
@@ -221,8 +221,8 @@ public class XmlSignatureTest extends CamelTestSupport {
                 // START SNIPPET: transforms XSLT,XPath - secure Validation
                 // disabled
                 from("direct:transformsXsltXPathSecureValDisabled")
-                        .to("xmlsecurity:sign://transformsXsltXPathSecureValDisabled?keyAccessor=#accessor&transformMethods=#transformsXsltXPath",
-                                "xmlsecurity:verify://transformsXsltXPathSecureValDisabled?keySelector=#selector&secureValidation=false")
+                        .to("xmlsecurity:sign:transformsXsltXPathSecureValDisabled?keyAccessor=#accessor&transformMethods=#transformsXsltXPath",
+                                "xmlsecurity:verify:transformsXsltXPathSecureValDisabled?keySelector=#selector&secureValidation=false")
                         .to("mock:result");
                 // END SNIPPET: transforms XSLT,XPath - secure Validation
                 // disabled
@@ -232,7 +232,7 @@ public class XmlSignatureTest extends CamelTestSupport {
                 // START SNIPPET: cryptocontextprops
                 onException(XmlSignatureException.class).handled(false).to("mock:exception");
                 from("direct:cryptocontextprops")
-                        .to("xmlsecurity:verify://cryptocontextprops?keySelector=#selectorKeyValue&cryptoContextProperties=#cryptoContextProperties")
+                        .to("xmlsecurity:verify:cryptocontextprops?keySelector=#selectorKeyValue&cryptoContextProperties=#cryptoContextProperties")
                         .to("mock:result");
                 // END SNIPPET: cryptocontextprops
             }
@@ -240,8 +240,8 @@ public class XmlSignatureTest extends CamelTestSupport {
             public void configure() throws Exception {
                 // START SNIPPET: URI dereferencer
                 from("direct:uridereferencer")
-                        .to("xmlsecurity:sign://uriderferencer?keyAccessor=#accessor&uriDereferencer=#uriDereferencer")
-                        .to("xmlsecurity:verify://uridereferencer?keySelector=#selector&uriDereferencer=#uriDereferencer")
+                        .to("xmlsecurity:sign:uriderferencer?keyAccessor=#accessor&uriDereferencer=#uriDereferencer")
+                        .to("xmlsecurity:verify:uridereferencer?keySelector=#selector&uriDereferencer=#uriDereferencer")
                         .to("mock:result");
                 // END SNIPPET: URI dereferencer
             }
@@ -249,8 +249,8 @@ public class XmlSignatureTest extends CamelTestSupport {
             public void configure() throws Exception {
                 // START SNIPPET: keyAccessorKeySelectorDefault
                 from("direct:keyAccessorKeySelectorDefault")
-                        .to("xmlsecurity:sign://keyAccessorKeySelectorDefault?keyAccessor=#keyAccessorDefault&addKeyInfoReference=true")
-                        .to("xmlsecurity:verify://keyAccessorKeySelectorDefault?keySelector=#keySelectorDefault").to("mock:result");
+                        .to("xmlsecurity:sign:keyAccessorKeySelectorDefault?keyAccessor=#keyAccessorDefault&addKeyInfoReference=true")
+                        .to("xmlsecurity:verify:keyAccessorKeySelectorDefault?keySelector=#keySelectorDefault").to("mock:result");
                 // END SNIPPET: keyAccessorKeySelectorDefault
             }
         }, new RouteBuilder() {
@@ -258,7 +258,7 @@ public class XmlSignatureTest extends CamelTestSupport {
                 // START SNIPPET: xmlSignatureChecker
                 onException(XmlSignatureInvalidException.class).handled(false).to("mock:exception");
                 from("direct:xmlSignatureChecker")
-                        .to("xmlsecurity:verify://xmlSignatureChecker?keySelector=#selectorKeyValue&xmlSignatureChecker=#envelopingSignatureChecker")
+                        .to("xmlsecurity:verify:xmlSignatureChecker?keySelector=#selectorKeyValue&xmlSignatureChecker=#envelopingSignatureChecker")
                         .to("mock:result");
                 // END SNIPPET: xmlSignatureChecker
             }
@@ -266,8 +266,8 @@ public class XmlSignatureTest extends CamelTestSupport {
             public void configure() throws Exception { //
                 // START SNIPPET: properties
                 from("direct:props")
-                        .to("xmlsecurity:sign://properties?keyAccessor=#accessor&properties=#signatureProperties")
-                        .to("xmlsecurity:verify://properties?keySelector=#selector&xmlSignature2Message=#xmlSignature2MessageWithTimestampProperty")
+                        .to("xmlsecurity:sign:properties?keyAccessor=#accessor&properties=#signatureProperties")
+                        .to("xmlsecurity:verify:properties?keySelector=#selector&xmlSignature2Message=#xmlSignature2MessageWithTimestampProperty")
                         .to("mock:result");
                 // END SNIPPET: properties
             }
@@ -276,7 +276,7 @@ public class XmlSignatureTest extends CamelTestSupport {
                 // START SNIPPET: verify output node search element name
                 onException(XmlSignatureException.class).handled(true).to("mock:exception");
                 from("direct:outputnodesearchelementname").to(
-                        "xmlsecurity:verify://outputnodesearchelementname?keySelector=#selectorKeyValue"
+                        "xmlsecurity:verify:outputnodesearchelementname?keySelector=#selectorKeyValue"
                                 + "&outputNodeSearchType=ElementName&outputNodeSearch={http://test/test}root&removeSignatureElements=true")
                         .to("mock:result");
                 // END SNIPPET: verify output node search element name
@@ -286,7 +286,7 @@ public class XmlSignatureTest extends CamelTestSupport {
                 // START SNIPPET: verify output node search xpath
                 onException(XmlSignatureException.class).handled(true).to("mock:exception");
                 from("direct:outputnodesearchxpath")
-                        .to("xmlsecurity:verify://outputnodesearchxpath?keySelector=#selectorKeyValue&outputNodeSearchType=XPath&outputNodeSearch=#nodesearchxpath&removeSignatureElements=true")
+                        .to("xmlsecurity:verify:outputnodesearchxpath?keySelector=#selectorKeyValue&outputNodeSearchType=XPath&outputNodeSearch=#nodesearchxpath&removeSignatureElements=true")
                         .to("mock:result");
                 // END SNIPPET: verify output node search xpath
             }
@@ -294,7 +294,7 @@ public class XmlSignatureTest extends CamelTestSupport {
             public void configure() throws Exception {
                 // START SNIPPET: validationFailedHandler
                 from("direct:validationFailedHandler")
-                        .to("xmlsecurity:verify://validationFailedHandler?keySelector=#selectorKeyValue&validationFailedHandler=validationFailedHandlerIgnoreManifestFailures")
+                        .to("xmlsecurity:verify:validationFailedHandler?keySelector=#selectorKeyValue&validationFailedHandler=validationFailedHandlerIgnoreManifestFailures")
                         .to("mock:result");
                 // END SNIPPET: validationFailedHandler
             }
@@ -302,8 +302,8 @@ public class XmlSignatureTest extends CamelTestSupport {
             public void configure() throws Exception {
                 // START SNIPPET: further parameters
                 from("direct:furtherparams")
-                        .to("xmlsecurity:sign://furtherparams?keyAccessor=#accessor&prefixForXmlSignatureNamespace=digsig&disallowDoctypeDecl=false")
-                        .to("xmlsecurity:verify://bfurtherparams?keySelector=#selector&disallowDoctypeDecl=false").to("mock:result");
+                        .to("xmlsecurity:sign:furtherparams?keyAccessor=#accessor&prefixForXmlSignatureNamespace=digsig&disallowDoctypeDecl=false")
+                        .to("xmlsecurity:verify:bfurtherparams?keySelector=#selector&disallowDoctypeDecl=false").to("mock:result");
                 // END SNIPPET: further parameters
             }
         }, new RouteBuilder() {
@@ -311,7 +311,7 @@ public class XmlSignatureTest extends CamelTestSupport {
                 // START SNIPPET: signer invalid keyexception
                 onException(XmlSignatureInvalidKeyException.class).handled(true).to("mock:exception");
                 from("direct:signexceptioninvalidkey").to(
-                        "xmlsecurity:sign://signexceptioninvalidkey?signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#rsa-sha512")
+                        "xmlsecurity:sign:signexceptioninvalidkey?signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#rsa-sha512")
                         .to("mock:result");
                 // END SNIPPET: signer invalid keyexception
             }
@@ -320,7 +320,7 @@ public class XmlSignatureTest extends CamelTestSupport {
                 // START SNIPPET: signer exceptions
                 onException(XmlSignatureException.class).handled(true).to("mock:exception");
                 from("direct:signexceptions")
-                        .to("xmlsecurity:sign://signexceptions?keyAccessor=#accessor&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#rsa-sha512")
+                        .to("xmlsecurity:sign:signexceptions?keyAccessor=#accessor&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#rsa-sha512")
                         .to("mock:result");
                 // END SNIPPET: signer exceptions
             }
@@ -328,25 +328,25 @@ public class XmlSignatureTest extends CamelTestSupport {
             public void configure() throws Exception {
                 onException(XmlSignatureException.class).handled(true).to("mock:exception");
                 from("direct:noSuchAlgorithmException")
-                        .to("xmlsecurity:sign://noSuchAlgorithmException?keyAccessor=#accessor&signatureAlgorithm=wrongalgorithm&digestAlgorithm=http://www.w3.org/2001/04/xmlenc#sha512")
+                        .to("xmlsecurity:sign:noSuchAlgorithmException?keyAccessor=#accessor&signatureAlgorithm=wrongalgorithm&digestAlgorithm=http://www.w3.org/2001/04/xmlenc#sha512")
                         .to("mock:result");
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 onException(XmlSignatureException.class).handled(false).to("mock:exception");
-                from("direct:verifyexceptions").to("xmlsecurity:verify://verifyexceptions?keySelector=#selector").to("mock:result");
+                from("direct:verifyexceptions").to("xmlsecurity:verify:verifyexceptions?keySelector=#selector").to("mock:result");
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 onException(XmlSignatureException.class).handled(false).to("mock:exception");
-                from("direct:verifyInvalidKeyException").to("xmlsecurity:verify://verifyInvalidKeyException?keySelector=#selector").to(
+                from("direct:verifyInvalidKeyException").to("xmlsecurity:verify:verifyInvalidKeyException?keySelector=#selector").to(
                         "mock:result");
             }
         }, new RouteBuilder() {
             public void configure() throws Exception {
                 onException(XmlSignatureException.class).handled(false).to("mock:exception");
                 from("direct:invalidhash").to(
-                        "xmlsecurity:verify://invalidhash?keySelector=#selectorKeyValue&baseUri=#baseUri&secureValidation=false").to(
+                        "xmlsecurity:verify:invalidhash?keySelector=#selectorKeyValue&baseUri=#baseUri&secureValidation=false").to(
                         "mock:result");
             }
         }, createDetachedRoute(), createRouteForEnvelopedWithParentXpath() };
@@ -358,10 +358,10 @@ public class XmlSignatureTest extends CamelTestSupport {
                 // START SNIPPET: detached XML signature
                 onException(Exception.class).handled(false).to("mock:exception");
                 from("direct:detached")
-                        .to("xmlsecurity:sign://detached?keyAccessor=#keyAccessorDefault&xpathsToIdAttributes=#xpathsToIdAttributes&"//
+                        .to("xmlsecurity:sign:detached?keyAccessor=#keyAccessorDefault&xpathsToIdAttributes=#xpathsToIdAttributes&"//
                                 + "schemaResourceUri=org/apache/camel/component/xmlsecurity/Test.xsd&signatureId=&clearHeaders=false")
                         .to("mock:result")
-                        .to("xmlsecurity:verify://detached?keySelector=#keySelectorDefault&schemaResourceUri=org/apache/camel/component/xmlsecurity/Test.xsd")
+                        .to("xmlsecurity:verify:detached?keySelector=#keySelectorDefault&schemaResourceUri=org/apache/camel/component/xmlsecurity/Test.xsd")
                         .to("mock:verified");
                 // END SNIPPET: detached XML signature
             }
@@ -373,7 +373,7 @@ public class XmlSignatureTest extends CamelTestSupport {
             public void configure() throws Exception {
                 // START SNIPPET: enveloped XML signature with parent XPath
                 onException(XmlSignatureException.class).handled(false).to("mock:exception");
-                from("direct:envelopedParentXpath").to("xmlsecurity:sign://enveloped?keyAccessor=#accessor&parentXpath=#parentXpathBean")
+                from("direct:envelopedParentXpath").to("xmlsecurity:sign:enveloped?keyAccessor=#accessor&parentXpath=#parentXpathBean")
                         .to("mock:signed").to(getVerifierEndpointURIEnveloped()).to("mock:result");
                 // END SNIPPET: enveloped XML signature with parent XPath
             }
@@ -556,7 +556,7 @@ public class XmlSignatureTest extends CamelTestSupport {
 
     @Test
     public void testVerifyExceptionOutputNodeSearchElementNameInvalidFormat1() throws Exception {
-        XmlVerifierEndpoint endpoint = context.getEndpoint("xmlsecurity:verify://outputnodesearchelementname?keySelector=#selectorKeyValue"
+        XmlVerifierEndpoint endpoint = context.getEndpoint("xmlsecurity:verify:outputnodesearchelementname?keySelector=#selectorKeyValue"
                 + "&outputNodeSearchType=ElementName&outputNodeSearch={http://test/test}root&removeSignatureElements=true",
                 XmlVerifierEndpoint.class);
         endpoint.setOutputNodeSearch("{wrongformat"); // closing '}' missing
@@ -572,7 +572,7 @@ public class XmlSignatureTest extends CamelTestSupport {
     @Test
     public void testVerifyExceptionOutputNodeSearchElementNameInvalidFormat2() throws Exception {
         context.getEndpoint(
-                "xmlsecurity:verify://outputnodesearchelementname?keySelector=#selectorKeyValue"
+                "xmlsecurity:verify:outputnodesearchelementname?keySelector=#selectorKeyValue"
                         + "&outputNodeSearchType=ElementName&outputNodeSearch={http://test/test}root&removeSignatureElements=true",
                 XmlVerifierEndpoint.class).setOutputNodeSearch("{wrongformat}");
         // local name missing
@@ -645,7 +645,7 @@ public class XmlSignatureTest extends CamelTestSupport {
         // wrong key type
         setUpKeys("DSA", 512);
         context.getEndpoint(
-                "xmlsecurity:sign://signexceptioninvalidkey?signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#rsa-sha512",
+                "xmlsecurity:sign:signexceptioninvalidkey?signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#rsa-sha512",
                 XmlSignerEndpoint.class).setKeyAccessor(getKeyAccessor(keyPair.getPrivate()));
         sendBody("direct:signexceptioninvalidkey", payload);
         assertMockEndpointsSatisfied();
@@ -723,7 +723,7 @@ public class XmlSignatureTest extends CamelTestSupport {
     public void testVerifySignatureInvalidValueException() throws Exception {
         MockEndpoint mock = setupExceptionMock();
         setUpKeys("DSA", 512);
-        context.getEndpoint("xmlsecurity:verify://verifyexceptions?keySelector=#selector", XmlVerifierEndpoint.class).setKeySelector(
+        context.getEndpoint("xmlsecurity:verify:verifyexceptions?keySelector=#selector", XmlVerifierEndpoint.class).setKeySelector(
                 KeySelector.singletonKeySelector(keyPair.getPublic()));
         // payload needs DSA key
         InputStream payload = XmlSignatureTest.class
@@ -1051,11 +1051,11 @@ public class XmlSignatureTest extends CamelTestSupport {
     }
 
     String getVerifierEndpointURIEnveloping() {
-        return "xmlsecurity:verify://enveloping?keySelector=#selector";
+        return "xmlsecurity:verify:enveloping?keySelector=#selector";
     }
 
     String getSignerEndpointURIEnveloping() {
-        return "xmlsecurity:sign://enveloping?keyAccessor=#accessor&schemaResourceUri=";
+        return "xmlsecurity:sign:enveloping?keyAccessor=#accessor&schemaResourceUri=";
     }
 
     @Test
@@ -1074,11 +1074,11 @@ public class XmlSignatureTest extends CamelTestSupport {
     }
 
     String getVerifierEndpointURIEnveloped() {
-        return "xmlsecurity:verify://enveloped?keySelector=#selector";
+        return "xmlsecurity:verify:enveloped?keySelector=#selector";
     }
 
     String getSignerEndpointURIEnveloped() {
-        return "xmlsecurity:sign://enveloped?keyAccessor=#accessor&parentLocalName=root&parentNamespace=http://test/test";
+        return "xmlsecurity:sign:enveloped?keyAccessor=#accessor&parentLocalName=root&parentNamespace=http://test/test";
     }
 
     private byte[] getPayloadForEncoding(String encoding) {
@@ -1162,7 +1162,7 @@ public class XmlSignatureTest extends CamelTestSupport {
     }
 
     XmlSignerEndpoint getSignatureEncpointForSignException() {
-        XmlSignerEndpoint endpoint = (XmlSignerEndpoint) context().getEndpoint("xmlsecurity:sign://signexceptions?keyAccessor=#accessor" + //
+        XmlSignerEndpoint endpoint = (XmlSignerEndpoint) context().getEndpoint("xmlsecurity:sign:signexceptions?keyAccessor=#accessor" + //
                 "&signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#rsa-sha512");
         return endpoint;
     }
@@ -1198,7 +1198,7 @@ public class XmlSignatureTest extends CamelTestSupport {
 
     XmlSignerEndpoint getDetachedSignerEndpoint() {
         XmlSignerEndpoint endpoint = (XmlSignerEndpoint) context().getEndpoint(
-                "xmlsecurity:sign://detached?keyAccessor=#keyAccessorDefault&xpathsToIdAttributes=#xpathsToIdAttributes&"//
+                "xmlsecurity:sign:detached?keyAccessor=#keyAccessorDefault&xpathsToIdAttributes=#xpathsToIdAttributes&"//
                         + "schemaResourceUri=org/apache/camel/component/xmlsecurity/Test.xsd&signatureId=&clearHeaders=false");
         return endpoint;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/74b78a1d/components/camel-xmlsecurity/src/test/resources/org/apache/camel/component/xmlsecurity/SpringXmlSignatureTests.xml
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/test/resources/org/apache/camel/component/xmlsecurity/SpringXmlSignatureTests.xml b/components/camel-xmlsecurity/src/test/resources/org/apache/camel/component/xmlsecurity/SpringXmlSignatureTests.xml
index 6ba4920..0bb9179 100644
--- a/components/camel-xmlsecurity/src/test/resources/org/apache/camel/component/xmlsecurity/SpringXmlSignatureTests.xml
+++ b/components/camel-xmlsecurity/src/test/resources/org/apache/camel/component/xmlsecurity/SpringXmlSignatureTests.xml
@@ -29,10 +29,10 @@
         <!-- START SNIPPET: enveloping XML signature -->
         <route>
             <from uri="direct:enveloping" />
-            <to uri="xmlsecurity:sign://enveloping?keyAccessor=#accessorRsa" />
+            <to uri="xmlsecurity:sign:enveloping?keyAccessor=#accessorRsa" />
             <to uri="mock:signed" />
             <to
-                uri="xmlsecurity:verify://enveloping?keySelector=#selectorRsa" />
+                uri="xmlsecurity:verify:enveloping?keySelector=#selectorRsa" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: enveloping XML signature -->
@@ -41,9 +41,9 @@
         <route>
             <from uri="direct:plaintext" />
             <to
-                uri="xmlsecurity:sign://plaintext?keyAccessor=#accessorRsa&amp;plainText=true&amp;plainTextEncoding=UTF-8" />
+                uri="xmlsecurity:sign:plaintext?keyAccessor=#accessorRsa&amp;plainText=true&amp;plainTextEncoding=UTF-8" />
             <to
-                uri="xmlsecurity:verify://plaintext?keySelector=#selectorRsa" />
+                uri="xmlsecurity:verify:plaintext?keySelector=#selectorRsa" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: enveloping XML signature with plain text -->
@@ -52,10 +52,10 @@
         <route>
             <from uri="direct:enveloped" />
             <to
-                uri="xmlsecurity:sign://enveloped?keyAccessor=#accessorRsa&amp;parentLocalName=root&amp;parentNamespace=http://test/test" />
+                uri="xmlsecurity:sign:enveloped?keyAccessor=#accessorRsa&amp;parentLocalName=root&amp;parentNamespace=http://test/test" />
             <to uri="mock:signed" />
             <to
-                uri="xmlsecurity:verify://enveloped?keySelector=#selectorRsa" />
+                uri="xmlsecurity:verify:enveloped?keySelector=#selectorRsa" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: enveloped XML signature -->
@@ -64,9 +64,9 @@
         <route>
             <from uri="direct:canonicalization" />
             <to
-                uri="xmlsecurity:sign://canonicalization?keyAccessor=#accessorRsa&amp;canonicalizationMethod=#canonicalizationMethod1" />
+                uri="xmlsecurity:sign:canonicalization?keyAccessor=#accessorRsa&amp;canonicalizationMethod=#canonicalizationMethod1" />
             <to
-                uri="xmlsecurity:verify://canonicalization?keySelector=#selectorRsa" />
+                uri="xmlsecurity:verify:canonicalization?keySelector=#selectorRsa" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: canonicalization -->
@@ -75,9 +75,9 @@
         <route>
             <from uri="direct:signaturedigestalgorithm" />
             <to
-                uri="xmlsecurity:sign://signaturedigestalgorithm?keyAccessor=#accessorRsa&amp;signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#rsa-sha384&amp;digestAlgorithm=http://www.w3.org/2001/04/xmlenc#sha256" />
+                uri="xmlsecurity:sign:signaturedigestalgorithm?keyAccessor=#accessorRsa&amp;signatureAlgorithm=http://www.w3.org/2001/04/xmldsig-more#rsa-sha384&amp;digestAlgorithm=http://www.w3.org/2001/04/xmlenc#sha256" />
             <to
-                uri="xmlsecurity:verify://signaturedigestalgorithm?keySelector=#selectorRsa" />
+                uri="xmlsecurity:verify:signaturedigestalgorithm?keySelector=#selectorRsa" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: digest and signature algorithm -->
@@ -86,9 +86,9 @@
         <route>
             <from uri="direct:transformsXPath2" />
             <to
-                uri="xmlsecurity:sign://transformsXPath2?keyAccessor=#accessorRsa&amp;transformMethods=#transformsXPath2" />
+                uri="xmlsecurity:sign:transformsXPath2?keyAccessor=#accessorRsa&amp;transformMethods=#transformsXPath2" />
             <to
-                uri="xmlsecurity:verify://transformsXPath2?keySelector=#selectorRsa" />
+                uri="xmlsecurity:verify:transformsXPath2?keySelector=#selectorRsa" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: transforms XPath2 -->
@@ -97,9 +97,9 @@
         <route>
             <from uri="direct:transformsXsltXPath" />
             <to
-                uri="xmlsecurity:sign://transformsXsltXPath?keyAccessor=#accessorRsa&amp;transformMethods=#transformsXsltXPath" />
+                uri="xmlsecurity:sign:transformsXsltXPath?keyAccessor=#accessorRsa&amp;transformMethods=#transformsXsltXPath" />
             <to
-                uri="xmlsecurity:verify://transformsXsltXPath?keySelector=#selectorRsa" />
+                uri="xmlsecurity:verify:transformsXsltXPath?keySelector=#selectorRsa" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: transforms XSLT, XPath -->
@@ -108,9 +108,9 @@
         <route>
             <from uri="direct:transformsXsltXPathSecureValDisabled" />
             <to
-                uri="xmlsecurity:sign://transformsXsltXPathSecureValDisabled?keyAccessor=#accessorRsa&amp;transformMethods=#transformsXsltXPath" />
+                uri="xmlsecurity:sign:transformsXsltXPathSecureValDisabled?keyAccessor=#accessorRsa&amp;transformMethods=#transformsXsltXPath" />
             <to
-                uri="xmlsecurity:verify://transformsXsltXPathSecureValDisabled?keySelector=#selectorRsa&amp;secureValidation=false" />
+                uri="xmlsecurity:verify:transformsXsltXPathSecureValDisabled?keySelector=#selectorRsa&amp;secureValidation=false" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: transforms XSLT, XPath - secure Validation disabled -->
@@ -120,7 +120,7 @@
         <route>
             <from uri="direct:signexceptioninvalidkey" />
             <to
-                uri="xmlsecurity:sign://signexceptioninvalidkey?keyAccessor=#accessorDsa" />
+                uri="xmlsecurity:sign:signexceptioninvalidkey?keyAccessor=#accessorDsa" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: invalid key exception -->
@@ -129,7 +129,7 @@
         <route>
             <from uri="direct:signexceptions" />
             <to
-                uri="xmlsecurity:sign://signexceptioninvalidkey?keyAccessor=#accessorRsa" />
+                uri="xmlsecurity:sign:signexceptioninvalidkey?keyAccessor=#accessorRsa" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: sign exceptions -->
@@ -138,7 +138,7 @@
         <route>
             <from uri="direct:noSuchAlgorithmException" />
             <to
-                uri="xmlsecurity:sign://noSuchAlgorithmException?keyAccessor=#accessorRsa&amp;signatureAlgorithm=wrongalgorithm&amp;digestAlgorithm=http://www.w3.org/2001/04/xmlenc#sha512" />
+                uri="xmlsecurity:sign:noSuchAlgorithmException?keyAccessor=#accessorRsa&amp;signatureAlgorithm=wrongalgorithm&amp;digestAlgorithm=http://www.w3.org/2001/04/xmlenc#sha512" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: noSuchAlgorithmException -->
@@ -147,7 +147,7 @@
         <route>
             <from uri="direct:verifyexceptions" />
             <to
-                uri="xmlsecurity:verify://verifyexceptions?keySelector=#selectorDsa" />
+                uri="xmlsecurity:verify:verifyexceptions?keySelector=#selectorDsa" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: verify exceptions -->
@@ -156,7 +156,7 @@
         <route>
             <from uri="direct:invalidhash" />
             <to
-                uri="xmlsecurity:verify://invalidhash?keySelector=#selectorKeyValue&amp;baseUri=#baseUri&amp;secureValidation=false" />
+                uri="xmlsecurity:verify:invalidhash?keySelector=#selectorKeyValue&amp;baseUri=#baseUri&amp;secureValidation=false" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: verifier InvalidHashException -->
@@ -165,7 +165,7 @@
         <route>
             <from uri="direct:cryptocontextprops" />
             <to
-                uri="xmlsecurity:verify://cryptocontextprops?keySelector=#selectorKeyValue&amp;cryptoContextProperties=#cryptoContextProperties" />
+                uri="xmlsecurity:verify:cryptocontextprops?keySelector=#selectorKeyValue&amp;cryptoContextProperties=#cryptoContextProperties" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: cryptoContextProperties -->
@@ -174,7 +174,7 @@
         <route>
             <from uri="direct:verifyInvalidKeyException" />
             <to
-                uri="xmlsecurity:verify://verifyInvalidKeyException?keySelector=#selectorRsa" />
+                uri="xmlsecurity:verify:verifyInvalidKeyException?keySelector=#selectorRsa" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: verify InvalidKeyException -->
@@ -184,9 +184,9 @@
         <route>
             <from uri="direct:uridereferencer" />
             <to
-                uri="xmlsecurity:sign://uridereferencer?keyAccessor=#accessorRsa&amp;uriDereferencer=#uriDereferencer" />
+                uri="xmlsecurity:sign:uridereferencer?keyAccessor=#accessorRsa&amp;uriDereferencer=#uriDereferencer" />
             <to
-                uri="xmlsecurity:verify://uridereferencer?keySelector=#selectorRsa&amp;uriDereferencer=#uriDereferencer" />
+                uri="xmlsecurity:verify:uridereferencer?keySelector=#selectorRsa&amp;uriDereferencer=#uriDereferencer" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: uridereferencer -->
@@ -195,9 +195,9 @@
         <route>
             <from uri="direct:keyAccessorKeySelectorDefault" />
             <to
-                uri="xmlsecurity:sign://keyAccessorKeySelectorDefault?keyAccessor=#keyAccessorDefault" />
+                uri="xmlsecurity:sign:keyAccessorKeySelectorDefault?keyAccessor=#keyAccessorDefault" />
             <to
-                uri="xmlsecurity:verify://keyAccessorKeySelectorDefault?keySelector=#keySelectorDefault" />
+                uri="xmlsecurity:verify:keyAccessorKeySelectorDefault?keySelector=#keySelectorDefault" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: keyAccessorKeySelectorDefault -->
@@ -206,7 +206,7 @@
         <route>
             <from uri="direct:xmlSignatureChecker" />
             <to
-                uri="xmlsecurity:verify://keyAccessorKeySelectorDefault?keySelector=#selectorKeyValue&amp;xmlSignatureChecker=#envelopingSignatureChecker" />
+                uri="xmlsecurity:verify:keyAccessorKeySelectorDefault?keySelector=#selectorKeyValue&amp;xmlSignatureChecker=#envelopingSignatureChecker" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: xmlSignatureChecker -->
@@ -215,9 +215,9 @@
         <route>
             <from uri="direct:props" />
             <to
-                uri="xmlsecurity:sign://properties?keyAccessor=#accessorRsa&amp;properties=#signatureProperties" />
+                uri="xmlsecurity:sign:properties?keyAccessor=#accessorRsa&amp;properties=#signatureProperties" />
             <to
-                uri="xmlsecurity:verify://properties?keySelector=#selectorRsa&amp;xmlSignature2Message=#xmlSignature2MessageWithTimestampPropertyy" />
+                uri="xmlsecurity:verify:properties?keySelector=#selectorRsa&amp;xmlSignature2Message=#xmlSignature2MessageWithTimestampPropertyy" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: properties -->
@@ -226,7 +226,7 @@
         <route>
             <from uri="direct:outputnodesearchelementname" />
             <to
-                uri="xmlsecurity:verify://outputnodesearchelementname?keySelector=#selectorKeyValue&amp;outputNodeSearchType=ElementName&amp;outputNodeSearch={http://test/test}root&amp;removeSignatureElements=true" />
+                uri="xmlsecurity:verify:outputnodesearchelementname?keySelector=#selectorKeyValue&amp;outputNodeSearchType=ElementName&amp;outputNodeSearch={http://test/test}root&amp;removeSignatureElements=true" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: verify output node search element name -->
@@ -235,7 +235,7 @@
         <route>
             <from uri="direct:outputnodesearchxpath" />
             <to
-                uri="xmlsecurity:verify://outputnodesearchxpath?keySelector=#selectorKeyValue&amp;outputNodeSearchType=XPath&amp;outputNodeSearch=#nodesearchxpath&amp;removeSignatureElements=true" />
+                uri="xmlsecurity:verify:outputnodesearchxpath?keySelector=#selectorKeyValue&amp;outputNodeSearchType=XPath&amp;outputNodeSearch=#nodesearchxpath&amp;removeSignatureElements=true" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: verify output node search xpath -->
@@ -244,7 +244,7 @@
         <route>
             <from uri="direct:validationFailedHandler" />
             <to
-                uri="xmlsecurity:verify://validationFailedHandler?keySelector=#selectorKeyValue&amp;validationFailedHandler=validationFailedHandlerIgnoreManifestFailures" />
+                uri="xmlsecurity:verify:validationFailedHandler?keySelector=#selectorKeyValue&amp;validationFailedHandler=validationFailedHandlerIgnoreManifestFailures" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: validationFailedHandler -->
@@ -253,9 +253,9 @@
         <route>
             <from uri="direct:furtherparams" />
             <to
-                uri="xmlsecurity:sign://furtherparams?keyAccessor=#accessorRsa&amp;prefixForXmlSignatureNamespace=digsig&amp;disallowDoctypeDecl=false" />
+                uri="xmlsecurity:sign:furtherparams?keyAccessor=#accessorRsa&amp;prefixForXmlSignatureNamespace=digsig&amp;disallowDoctypeDecl=false" />
             <to
-                uri="xmlsecurity:verify://furtherparams?keySelector=#selectorRsa&amp;disallowDoctypeDecl=false" />
+                uri="xmlsecurity:verify:furtherparams?keySelector=#selectorRsa&amp;disallowDoctypeDecl=false" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: further parameters -->
@@ -264,10 +264,10 @@
         <route>
             <from uri="direct:detached" />
             <to
-                uri="xmlsecurity:sign://detached?keyAccessor=#accessorRsa&amp;xpathsToIdAttributes=#xpathsToIdAttributes&amp;schemaResourceUri=org/apache/camel/component/xmlsecurity/Test.xsd&amp;signatureId=&amp;clearHeaders=false" />
+                uri="xmlsecurity:sign:detached?keyAccessor=#accessorRsa&amp;xpathsToIdAttributes=#xpathsToIdAttributes&amp;schemaResourceUri=org/apache/camel/component/xmlsecurity/Test.xsd&amp;signatureId=&amp;clearHeaders=false" />
             <to uri="mock:result" />
             <to
-                uri="xmlsecurity:verify://detached?keySelector=#selectorRsa&amp;schemaResourceUri=org/apache/camel/component/xmlsecurity/Test.xsd" />
+                uri="xmlsecurity:verify:detached?keySelector=#selectorRsa&amp;schemaResourceUri=org/apache/camel/component/xmlsecurity/Test.xsd" />
             <to uri="mock:verified" />
         </route>
         <!-- END SNIPPET: detached -->
@@ -276,9 +276,9 @@
         <route>
             <from uri="direct:envelopedParentXpath" />
             <to
-                uri="xmlsecurity:sign://enveloped?keyAccessor=#accessorRsa&amp;parentXpath=#parentXpathBean" />
+                uri="xmlsecurity:sign:enveloped?keyAccessor=#accessorRsa&amp;parentXpath=#parentXpathBean" />
             <to
-                uri="xmlsecurity:verify://enveloped?keySelector=#selectorRsa" />
+                uri="xmlsecurity:verify:enveloped?keySelector=#selectorRsa" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: enveloped XML signature with parent XPath -->
@@ -287,7 +287,7 @@
         <route>
             <from uri="direct:xades" />
             <to
-                uri="xmlsecurity:sign://xades?keyAccessor=#accessorRsa&amp;properties=#xadesProperties" />
+                uri="xmlsecurity:sign:xades?keyAccessor=#accessorRsa&amp;properties=#xadesProperties" />
             <to uri="mock:result" />
         </route>
         <!-- END SNIPPET: xades -->