camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [4/4] camel git commit: Component docs
Date Wed, 06 Jan 2016 17:28:48 GMT
Component docs


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

Branch: refs/heads/camel-2.16.x
Commit: 8c49ea9c830a22b2d6bdfd17a257ced8f92308ba
Parents: 74b78a1
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed Jan 6 18:27:00 2016 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed Jan 6 18:28:35 2016 +0100

----------------------------------------------------------------------
 .../processor/XmlSignatureConfiguration.java           |  4 ++--
 .../xmlsecurity/processor/XmlSignerConfiguration.java  |  1 +
 .../processor/XmlVerifierConfiguration.java            | 13 ++++++++++++-
 .../component/xmlsecurity/SpringXmlSignatureTests.xml  |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/8c49ea9c/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureConfiguration.java
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureConfiguration.java
index 5d72aa1..3c0648e 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureConfiguration.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureConfiguration.java
@@ -32,8 +32,6 @@ import org.apache.camel.spi.UriParams;
 public abstract class XmlSignatureConfiguration implements Cloneable, CamelContextAware {
 
     private CamelContext context;
-    private URIDereferencer uriDereferencer;
-
     @UriParam(label = "common")
     private String baseUri;
     @UriParam(label = "common")
@@ -48,6 +46,8 @@ public abstract class XmlSignatureConfiguration implements Cloneable, CamelConte
     private String schemaResourceUri;
     @UriParam(label = "common")
     private String outputXmlEncoding;
+    @UriParam(label = "advanced")
+    private URIDereferencer uriDereferencer;
 
     public XmlSignatureConfiguration() {
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/8c49ea9c/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerConfiguration.java
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerConfiguration.java
index ee22768..112c345 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerConfiguration.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerConfiguration.java
@@ -40,6 +40,7 @@ public class XmlSignerConfiguration extends XmlSignatureConfiguration {
 
     @UriParam(label = "sign")
     private XPathFilterParameterSpec parentXpath;
+    @UriParam(label = "sign")
     private List<XPathFilterParameterSpec> xpathsToIdAttributes = Collections.emptyList();
     @UriParam(label = "sign")
     private List<AlgorithmMethod> transformMethods = Collections.singletonList(XmlSignatureHelper

http://git-wip-us.apache.org/repos/asf/camel/blob/8c49ea9c/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java
index dba59c6..b89159a 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java
@@ -43,7 +43,7 @@ public class XmlVerifierConfiguration extends XmlSignatureConfiguration
{
     @UriParam(label = "verify")
     private ValidationFailedHandler validationFailedHandler = new DefaultValidationFailedHandler();
     private String validationFailedHandlerName;
-    @UriParam(label = "verify")
+    @UriParam(label = "verify", javaType = "java.lang.String")
     private Object outputNodeSearch;
     @UriParam(label = "verify", defaultValue = DefaultXmlSignature2Message.OUTPUT_NODE_SEARCH_TYPE_DEFAULT)
     private String outputNodeSearchType = DefaultXmlSignature2Message.OUTPUT_NODE_SEARCH_TYPE_DEFAULT;
@@ -255,4 +255,15 @@ public class XmlVerifierConfiguration extends XmlSignatureConfiguration
{
         this.secureValidation = secureValidation;
     }
 
+    public String getValidationFailedHandlerName() {
+        return validationFailedHandlerName;
+    }
+
+    /**
+     * Name of handler to
+     * @param validationFailedHandlerName
+     */
+    public void setValidationFailedHandlerName(String validationFailedHandlerName) {
+        this.validationFailedHandlerName = validationFailedHandlerName;
+    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/8c49ea9c/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 0bb9179..635eebc 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
@@ -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 -->


Mime
View raw message