[2/2] camel git commit: Component docs
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/42afd879
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/42afd879
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/42afd879
Branch: refs/heads/master
Commit: 42afd87936c6b1d2931ef8d8a042297cd76a1101
Parents: 0207b66
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Jun 17 15:04:52 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Jun 17 15:13:57 2015 +0200
--
.../xmlsecurity/XmlSignatureEndpoint.java | 6 +
.../processor/XmlSignatureConfiguration.java| 36 +---
.../processor/XmlSignerConfiguration.java | 177 ---
.../processor/XmlVerifierConfiguration.java | 76
4 files changed, 130 insertions(+), 165 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/42afd879/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 30f6884..dd93b56 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
@@ -52,6 +52,9 @@ public abstract class XmlSignatureEndpoint extends
DefaultEndpoint {
return command;
}
+/**
+ * Whether to sign or verify.
+ */
public void setCommand(XmlCommand command) {
this.command = command;
}
@@ -60,6 +63,9 @@ public abstract class XmlSignatureEndpoint extends
DefaultEndpoint {
return name;
}
+/**
+ * The name part in the URI can be chosen by the user to distinguish
between different signer/verifier endpoints within the camel context.
+ */
public void setName(String name) {
this.name = name;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/42afd879/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 beded30..3c4d3c3 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,28 +32,21 @@ import org.apache.camel.spi.UriParams;
public abstract class XmlSignatureConfiguration implements Cloneable,
CamelContextAware {
private CamelContext context;
-
private URIDereferencer uriDereferencer;
-@UriParam
+@UriParam(label = verify,sign)
private String baseUri;
-
-@UriParam
+@UriParam(label = verify,sign)
private MapString, ? cryptoContextProperties;
-
-@UriParam(defaultValue = true)
+@UriParam(label = verify,sign, defaultValue = true)
private Boolean disallowDoctypeDecl = Boolean.TRUE;
-
-@UriParam(defaultValue = false)
+@UriParam(label = verify,sign, defaultValue = false)
private Boolean omitXmlDeclaration = Boolean.FALSE;
-
-@UriParam(defaultValue = true)
+@UriParam(label = verify,sign, defaultValue = true)
private Boolean clearHeaders = Boolean.TRUE;
-
-@UriParam
+@UriParam(label = verify,sign)
private String schemaResourceUri;
-
-@UriParam
+@UriParam(label = verify,sign)
private String outputXmlEncoding;
public XmlSignatureConfiguration() {
@@ -79,7 +72,6 @@ public abstract class XmlSignatureConfiguration implements
Cloneable, CamelConte
* p
* Attention: The implementation is provider dependent!
*
- * @param uriDereferencer
* @see XMLCryptoContext#setURIDereferencer(URIDereferencer)
*/
public void setUriDereferencer(URIDereferencer uriDereferencer) {
@@ -93,10 +85,7 @@ public abstract class XmlSignatureConfiguration implements
Cloneable, CamelConte
/**
* You can set a base URI which is used in the URI dereferencing. Relative
* URIs are then concatenated with the base URI.
- *
- * @param baseUri
- *base URI
- *
+ *
* @see XMLCryptoContext#setBaseURI(String)
*/
[1/2] camel git commit: Component docs
Repository: camel
Updated Branches:
refs/heads/master d052bd084 - 42afd8793
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0207b661
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0207b661
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0207b661
Branch: refs/heads/master
Commit: 0207b661af67acb5dd859eca5f9079c6608d02c7
Parents: d052bd0
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Jun 17 14:38:44 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Jun 17 14:38:44 2015 +0200
--
.../camel/component/xmlsecurity/XmlSignatureComponent.java| 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/0207b661/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 eb27b38..169a39b 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
@@ -30,7 +30,6 @@ import org.apache.camel.util.ObjectHelper;
public class XmlSignatureComponent extends UriEndpointComponent {
private XmlSignerConfiguration signerConfiguration;
-
private XmlVerifierConfiguration verifierConfiguration;
public XmlSignatureComponent() {
@@ -91,6 +90,9 @@ public class XmlSignatureComponent extends
UriEndpointComponent {
return signerConfiguration;
}
+/**
+ * To use a shared XmlSignerConfiguration configuration to use as base for
configuring endpoints.
+ */
public void setSignerConfiguration(XmlSignerConfiguration
signerConfiguration) {
this.signerConfiguration = signerConfiguration;
}
@@ -102,6 +104,9 @@ public class XmlSignatureComponent extends
UriEndpointComponent {
return verifierConfiguration;
}
+/**
+ * To use a shared XmlVerifierConfiguration configuration to use as base
for configuring endpoints.
+ */
public void setVerifierConfiguration(XmlVerifierConfiguration
verifierConfiguration) {
this.verifierConfiguration = verifierConfiguration;
}
[2/2] camel git commit: CAMEL-8876 Added an option for HttpProducer to ignore response body avoiding stream caching
CAMEL-8876 Added an option for HttpProducer to ignore response body avoiding
stream caching
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/601681cf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/601681cf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/601681cf
Branch: refs/heads/master
Commit: 601681cf3f11bb66f9b0d416d1671117677a44c8
Parents: 42afd87
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Jun 17 16:12:59 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Jun 17 23:35:40 2015 +0800
--
.../camel/component/http4/HttpEndpoint.java | 14
.../camel/component/http4/HttpProducer.java | 13 +---
.../http4/HttpProducerContentTypeTest.java | 18 +++
.../http4/HttpThrowExceptionOnFailureTest.java | 34
4 files changed, 74 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/601681cf/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
--
diff --git
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
index c22f9ac..14db1ca 100644
---
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
+++
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
@@ -87,6 +87,8 @@ public class HttpEndpoint extends DefaultEndpoint implements
HeaderFilterStrateg
private String httpMethodRestrict;
@UriParam(label = producer, defaultValue = true)
private boolean clearExpiredCookies = true;
+@UriParam(label = producer, defaultValue = false)
+private boolean ignoreResponseBody;
public HttpEndpoint() {
}
@@ -475,4 +477,16 @@ public class HttpEndpoint extends DefaultEndpoint
implements HeaderFilterStrateg
public void setAuthenticationPreemptive(boolean authenticationPreemptive) {
this.authenticationPreemptive = authenticationPreemptive;
}
+
+
+public boolean isIgnoreResponseBody() {
+return ignoreResponseBody;
+}
+
+/**
+ * If this option is true, The http producer won't read response body and
cached the input stream.
+ */
+public void setIgnoreResponseBody(boolean ignoreResponseBody) {
+this.ignoreResponseBody = ignoreResponseBody;
+}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/601681cf/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
--
diff --git
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
index 612c6ce..c2790cc 100644
---
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
+++
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
@@ -185,7 +185,7 @@ public class HttpProducer extends DefaultProducer {
protected void populateResponse(Exchange exchange, HttpRequestBase
httpRequest, HttpResponse httpResponse,
Message in, HeaderFilterStrategy strategy,
int responseCode) throws IOException, ClassNotFoundException {
// We just make the out message is not create when extractResponseBody
throws exception
-Object response = extractResponseBody(httpRequest, httpResponse,
exchange);
+Object response = extractResponseBody(httpRequest, httpResponse,
exchange, getEndpoint().isIgnoreResponseBody());
Message answer = exchange.getOut();
answer.setHeader(Exchange.HTTP_RESPONSE_CODE, responseCode);
@@ -220,7 +220,7 @@ public class HttpProducer extends DefaultProducer {
String statusText = httpResponse.getStatusLine() != null ?
httpResponse.getStatusLine().getReasonPhrase() : null;
MapString, String headers =
extractResponseHeaders(httpResponse.getAllHeaders());
-Object responseBody = extractResponseBody(httpRequest, httpResponse,
exchange);
+Object responseBody = extractResponseBody(httpRequest, httpResponse,
exchange, getEndpoint().isIgnoreResponseBody());
if (transferException responseBody != null responseBody
instanceof Exception) {
// if the response was a serialized exception then use that
return (Exception) responseBody;
@@ -287,7 +287,7 @@ public class HttpProducer extends DefaultProducer {
* @return the response either as a stream, or as a deserialized java
object
* @throws IOException can
[1/2] camel git commit: CAMEL-8876 Added the option to camel-http
Repository: camel
Updated Branches:
refs/heads/master 42afd8793 - ac13da377
CAMEL-8876 Added the option to camel-http
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ac13da37
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ac13da37
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ac13da37
Branch: refs/heads/master
Commit: ac13da3774522926e5b1992f4ee7b95aa4c78847
Parents: 601681c
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Jun 17 23:13:45 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Jun 17 23:35:40 2015 +0800
--
.../apache/camel/component/http/HttpEndpoint.java| 14 ++
.../apache/camel/component/http/HttpProducer.java| 15 ++-
.../apache/camel/component/jetty/HttpRouteTest.java | 6 ++
3 files changed, 30 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ac13da37/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
--
diff --git
a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
index a78142c..5ad32b6 100644
---
a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
+++
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
@@ -106,6 +106,8 @@ public class HttpEndpoint extends DefaultEndpoint
implements HeaderFilterStrateg
@UriParam(label = consumer,
description = To use a custom buffer size on the
javax.servlet.ServletResponse.)
private Integer responseBufferSize;
+@UriParam(label = producer, defaultValue = false)
+private boolean ignoreResponseBody;
public HttpEndpoint() {
}
@@ -475,4 +477,16 @@ public class HttpEndpoint extends DefaultEndpoint
implements HeaderFilterStrateg
public void setResponseBufferSize(Integer responseBufferSize) {
this.responseBufferSize = responseBufferSize;
}
+
+public boolean isIgnoreResponseBody() {
+return ignoreResponseBody;
+}
+
+/**
+ * If this option is true, The http producer won't read response body and
cache the input stream.
+ *
+ */
+public void setIgnoreResponseBody(boolean ignoreResponseBody) {
+this.ignoreResponseBody = ignoreResponseBody;
+}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ac13da37/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
--
diff --git
a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
index 32b7c05..1519362 100644
---
a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
+++
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
@@ -169,7 +169,7 @@ public class HttpProducer extends DefaultProducer {
protected void populateResponse(Exchange exchange, HttpMethod method,
Message in, HeaderFilterStrategy strategy, int responseCode) throws
IOException, ClassNotFoundException {
//We just make the out message is not create when extractResponseBody
throws exception,
-Object response = extractResponseBody(method, exchange);
+Object response = extractResponseBody(method, exchange,
getEndpoint().isIgnoreResponseBody());
Message answer = exchange.getOut();
answer.setHeader(Exchange.HTTP_RESPONSE_CODE, responseCode);
@@ -205,7 +205,7 @@ public class HttpProducer extends DefaultProducer {
String statusText = method.getStatusLine() != null ?
method.getStatusLine().getReasonPhrase() : null;
MapString, String headers =
extractResponseHeaders(method.getResponseHeaders());
-Object responseBody = extractResponseBody(method, exchange);
+Object responseBody = extractResponseBody(method, exchange,
getEndpoint().isIgnoreResponseBody());
if (transferException responseBody != null responseBody
instanceof Exception) {
// if the response was a serialized exception then use that
return (Exception) responseBody;
@@ -269,10 +269,11 @@ public class HttpProducer extends DefaultProducer {
* Extracts the response from the method as a InputStream.
*
* @param method the method that was executed
+ * @param ignoreResponseBody if it is true, camel don't read the response
and cached the input stream
* @return the response either as a stream, or as a deserialized java
object
camel git commit: Upgrade Deltaspike to version 1.4.1
Repository: camel Updated Branches: refs/heads/master ac13da377 - 944c4c40d Upgrade Deltaspike to version 1.4.1 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/944c4c40 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/944c4c40 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/944c4c40 Branch: refs/heads/master Commit: 944c4c40dc6826e549928a2b64894736f93d0e2d Parents: ac13da3 Author: Andrea Cosentino anco...@gmail.com Authored: Wed Jun 17 09:32:06 2015 +0200 Committer: Andrea Cosentino anco...@gmail.com Committed: Wed Jun 17 18:54:42 2015 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/944c4c40/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index f3a2bec..6ea5ea2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -125,7 +125,7 @@ cxf-version3.0.4/cxf-version cxf-version-range[2.7,4.0)/cxf-version-range cxf-xjc-utils-version3.0.2/cxf-xjc-utils-version -deltaspike-version1.4.0/deltaspike-version +deltaspike-version1.4.1/deltaspike-version derby-version10.11.1.1/derby-version disruptor-version3.3.2/disruptor-version dnsjava-version2.1.7/dnsjava-version
camel git commit: Upgrade OpenEjb to version 4.7.2
Repository: camel Updated Branches: refs/heads/master 944c4c40d - 1e83aef00 Upgrade OpenEjb to version 4.7.2 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1e83aef0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1e83aef0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1e83aef0 Branch: refs/heads/master Commit: 1e83aef00d760761e3c5687d3dd8777550bd9413 Parents: 944c4c4 Author: Andrea Cosentino anco...@gmail.com Authored: Wed Jun 17 14:50:15 2015 +0200 Committer: Andrea Cosentino anco...@gmail.com Committed: Wed Jun 17 19:02:25 2015 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/1e83aef0/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 6ea5ea2..24d1bad 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -377,7 +377,7 @@ ognl-version3.0.11/ognl-version ognl-bundle-version3.0.11_1/ognl-bundle-version oncrpc-version1.1.2/oncrpc-version -openejb-version4.7.1/openejb-version +openejb-version4.7.2/openejb-version openjpa-version2.4.0/openjpa-version openshift-java-client-version2.7.0.Final/openshift-java-client-version optaplanner-version6.2.0.Final/optaplanner-version
