date:20130916

[CONF] Apache Camel Crypto

2013-09-16 Thread Jakub Korab (Confluence)

Crypto
Page edited by Jakub Korab

Comment:
Added link to list of algorithms available in Java 7

Changes (1)

Full Content

Crypto
Available as of Camel 2.3
PGP Available as of Camel 2.9

The Crypto Data Format integrates the Java Cryptographic Extension into Camel, allowing simple and flexible encryption and decryption of messages using Camel's familiar marshall and unmarshal formatting mechanism. It assumes marshalling to mean encryption to cyphertext and unmarshalling to mean decryption back to the original plaintext.

Options

Name
Type
Default
Description

algorithm
String
DES/CBC/PKCS5Padding
The JCE algorithm name indicating the cryptographic algorithm that will be used.

algorithmParamterSpec
AlgorithmParameterSpec
null
A JCE AlgorithmParameterSpec used to initialize the Cipher.

bufferSize
Integer
2048
the size of the buffer used in the signature process.

cryptoProvider
String
null
The name of the JCE Security Provider that should be used.

initializationVector
byte[]
null
A byte array containing the Initialization Vector that will be used to initialize the Cipher.

inline
boolean
false
Flag indicating that the configured IV should be inlined into the encrypted data stream.

macAlgorithm
String
null
The JCE algorithm name indicating the Message Authentication algorithm.

shouldAppendHMAC
boolean
null
Flag indicating that a Message Authentication Code should be calculated and appended to the encrypted data.

Basic Usage
At its most basic all that is required to encrypt/decrypt an exchange is a shared secret key. If one or more instances of the Crypto data format are configured with this key the format can be used to encrypt the payload in one route (or part of one) and decrypted in another. For example, using the Java DSL as follows:

In Spring the dataformat is configured first and then used in routes

camelContext id="camel" xmlns="http://camel.apache.org/schema/spring"
dataFormats
crypto id="basic" algorithm="DES" keyRef="desKey" /
/dataFormats
...
route
from uri="direct:basic-encryption" /
marshal ref="basic" /
to uri="mock:encrypted" /
unmarshal ref="basic" /
to uri="mock:unencrypted" /
/route
/camelContext

Specifying the Encryption Algorithm

Changing the algorithm is a matter of supplying the JCE algorithm name. If you change the algorithm you will need to use a compatible key.

A list of the available alrorithms in Java 7 is available via IBM's Security Information for Java 7 guide.

Specifying an Initialization Vector

Some crypto algorithms, particularly block algorithms, require configuration with an initial block of data known as an Initialization Vector. In the JCE this is passed as an AlgorithmParameterSpec when the Cipher is initialized. To use such a vector with the CryptoDataFormat you can configure it with a byte[] containing the required data e.g.

or with spring, suppling a reference to a byte[]

The same vector is required in both the encryption and decryption phases. As it is not necessary to keep the IV a secret, the DataFormat allows for it to be inlined into the encrypted data and subsequently read out in the decryption phase to initialize the Cipher. To inline the IV set the /oinline flag.

or with spring.

For more information of the use of Initialization Vectors, consult

http://en.wikipedia.org/wiki/Initialization_vector
http://www.herongyang.com/Cryptography/
http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation

Hashed Message Authentication Codes (HMAC)

To avoid attacks against the encrypted data while it is in transit the CryptoDataFormat can also calculate a Message Authentication Code for the encrypted exchange contents based on a configurable MAC algorithm. The calculated HMAC is appended to the stream after encryption. It is separated from the stream in the decryption phase. The MAC is recalculated and verified against the transmitted version to insure nothing was tampered with in transit.For more information on Message Authentication Codes see http://en.wikipedia.org/wiki/HMAC

or with spring.

By default the HMAC is calculated using the HmacSHA1 mac algorithm though this can be easily changed by supplying a different algorithm name. See here

git commit: CAMEL-6751 Upgaded to Jetty 8.1.x and Sevelt API 3.0

2013-09-16 Thread ningjiang

Updated Branches:
  refs/heads/master 961413cca - d9dd9ecc5


CAMEL-6751 Upgaded to Jetty 8.1.x and Sevelt API 3.0


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

Branch: refs/heads/master
Commit: d9dd9ecc5c28ebcf5ed53ef06ec073896a81bf34
Parents: 961413c
Author: Willem Jiang ningji...@apache.org
Authored: Mon Sep 16 15:53:51 2013 +0800
Committer: Willem Jiang ningji...@apache.org
Committed: Mon Sep 16 15:53:51 2013 +0800

--
 components/camel-http/pom.xml|  2 +-
 components/camel-http4/pom.xml   |  2 +-
 components/camel-jetty/pom.xml   | 23 ++-
 components/camel-servlet/pom.xml |  8 +---
 parent/pom.xml   | 12 +---
 5 files changed, 26 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d9dd9ecc/components/camel-http/pom.xml
--
diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml
index 6071b90..2e9641f 100644
--- a/components/camel-http/pom.xml
+++ b/components/camel-http/pom.xml
@@ -45,7 +45,7 @@
 /dependency
 dependency
   groupIdorg.apache.geronimo.specs/groupId
-  artifactIdgeronimo-servlet_2.5_spec/artifactId
+  artifactIdgeronimo-servlet_3.0_spec/artifactId
 /dependency
 
 dependency

http://git-wip-us.apache.org/repos/asf/camel/blob/d9dd9ecc/components/camel-http4/pom.xml
--
diff --git a/components/camel-http4/pom.xml b/components/camel-http4/pom.xml
index adeaa19..93bb090 100644
--- a/components/camel-http4/pom.xml
+++ b/components/camel-http4/pom.xml
@@ -49,7 +49,7 @@
 /dependency
 dependency
 groupIdorg.apache.geronimo.specs/groupId
-artifactIdgeronimo-servlet_2.5_spec/artifactId
+artifactIdgeronimo-servlet_3.0_spec/artifactId
 /dependency
 dependency
 groupIdorg.apache.httpcomponents/groupId

http://git-wip-us.apache.org/repos/asf/camel/blob/d9dd9ecc/components/camel-jetty/pom.xml
--
diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index 6450631..1777224 100644
--- a/components/camel-jetty/pom.xml
+++ b/components/camel-jetty/pom.xml
@@ -46,25 +46,30 @@
 /dependency
 dependency
 groupIdorg.apache.geronimo.specs/groupId
-artifactIdgeronimo-servlet_2.5_spec/artifactId
+artifactIdgeronimo-servlet_3.0_spec/artifactId
 /dependency
 dependency
 groupIdorg.eclipse.jetty/groupId
 artifactIdjetty-server/artifactId
+exclusions
+   exclusion
+   groupIdjavax.servlet/groupId
+   artifactIdservlet-api/artifactId
+   /exclusion
+   exclusion
+   groupIdorg.eclipse.jetty.orbit/groupId
+   artifactIdjavax.servlet/artifactId
+   /exclusion
+/exclusions
 /dependency
 dependency
 groupIdorg.eclipse.jetty/groupId
-artifactIdjetty-security/artifactId
+artifactIdjetty-servlet/artifactId
+version${jetty-version}/version
 /dependency
 dependency
 groupIdorg.eclipse.jetty/groupId
-artifactIdjetty-servlet/artifactId
-exclusions
-   exclusion
-  groupIdjavax.servlet/groupId
-artifactIdservlet-api/artifactId
-   /exclusion
-/exclusions
+artifactIdjetty-security/artifactId
 /dependency
 dependency
 groupIdorg.eclipse.jetty/groupId

http://git-wip-us.apache.org/repos/asf/camel/blob/d9dd9ecc/components/camel-servlet/pom.xml
--
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index 98885ae..aaceb82 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -44,12 +44,6 @@
 dependency
   groupIdorg.apache.camel/groupId
   artifactIdcamel-http/artifactId
-  exclusions
-exclusion
-  groupIdorg.apache.geronimo.specs/groupId
-  artifactIdgeronimo-servlet_2.5_spec/artifactId
-/exclusion
-  /exclusions
 /dependency
 dependency
   groupIdorg.osgi/groupId
@@ -59,7 +53,7 @@
 /dependency
 dependency
   groupIdorg.apache.geronimo.specs/groupId
-  artifactIdgeronimo-servlet_2.5_spec/artifactId
+

svn commit: r878589 - in /websites/production/camel/content: book-dataformat-appendix.html book-in-one-page.html cache/main.pageCache crypto.html

2013-09-16 Thread buildbot

Author: buildbot
Date: Mon Sep 16 08:20:25 2013
New Revision: 878589

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/book-dataformat-appendix.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/crypto.html

Modified: websites/production/camel/content/book-dataformat-appendix.html
==
--- websites/production/camel/content/book-dataformat-appendix.html (original)
+++ websites/production/camel/content/book-dataformat-appendix.html Mon Sep 16 
08:20:25 2013
@@ -3623,6 +3623,8 @@ from(direct:hmac-algorithm)
 ]]/script
 /div/div
 
+pA list of the available alrorithms in Java 7 is available via a 
shape=rect class=external-link 
href=http://pic.dhe.ibm.com/infocenter/java7sdk/v7r0/index.jsp?topic=%2Fcom.ibm.java.security.component.doc%2Fsecurity-component%2FJceDocs%2Fapi_standardnames.html;
 rel=nofollowIBM's Security Information for Java 7/a guide./p
+
 h3a shape=rect 
name=BookDataFormatAppendix-SpecifyinganInitializationVector/aSpecifying 
an Initialization Vector/h3
 
 pSome crypto algorithms, particularly block algorithms, require 
configuration with an initial block of data known as an Initialization Vector. 
In the JCE this is passed as an AlgorithmParameterSpec when the Cipher is 
initialized. To use such a vector with the CryptoDataFormat you can configure 
it with a byte[] containing the required data e.g./p

Modified: websites/production/camel/content/book-in-one-page.html
==
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Mon Sep 16 08:20:25 
2013
@@ -14722,6 +14722,8 @@ from(direct:hmac-algorithm)
 ]]/script
 /div/div
 
+pA list of the available alrorithms in Java 7 is available via a 
shape=rect class=external-link 
href=http://pic.dhe.ibm.com/infocenter/java7sdk/v7r0/index.jsp?topic=%2Fcom.ibm.java.security.component.doc%2Fsecurity-component%2FJceDocs%2Fapi_standardnames.html;
 rel=nofollowIBM's Security Information for Java 7/a guide./p
+
 h3a shape=rect 
name=BookInOnePage-SpecifyinganInitializationVector/aSpecifying an 
Initialization Vector/h3
 
 pSome crypto algorithms, particularly block algorithms, require 
configuration with an initial block of data known as an Initialization Vector. 
In the JCE this is passed as an AlgorithmParameterSpec when the Cipher is 
initialized. To use such a vector with the CryptoDataFormat you can configure 
it with a byte[] containing the required data e.g./p

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/crypto.html
==
--- websites/production/camel/content/crypto.html (original)
+++ websites/production/camel/content/crypto.html Mon Sep 16 08:20:25 2013
@@ -154,6 +154,8 @@ from(direct:hmac-algorithm)
 ]]/script
 /div/div
 
+pA list of the available alrorithms in Java 7 is available via a 
shape=rect class=external-link 
href=http://pic.dhe.ibm.com/infocenter/java7sdk/v7r0/index.jsp?topic=%2Fcom.ibm.java.security.component.doc%2Fsecurity-component%2FJceDocs%2Fapi_standardnames.html;
 rel=nofollowIBM's Security Information for Java 7/a guide./p
+
 h3a shape=rect 
name=Crypto-SpecifyinganInitializationVector/aSpecifying an Initialization 
Vector/h3
 
 pSome crypto algorithms, particularly block algorithms, require 
configuration with an initial block of data known as an Initialization Vector. 
In the JCE this is passed as an AlgorithmParameterSpec when the Cipher is 
initialized. To use such a vector with the CryptoDataFormat you can configure 
it with a byte[] containing the required data e.g./p

[09/10] git commit: Skip test on some platforms

2013-09-16 Thread davsclaus

Skip test on some platforms


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

Branch: refs/heads/camel-2.12.x
Commit: 06cf696df5776107ef7a5cba88bca5ecbdf10b20
Parents: 10dd32e
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Sep 16 11:25:29 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Sep 16 11:29:18 2013 +0200

--
 .../apache/camel/component/xmpp/XmppRobustConnectionTest.java   | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/06cf696d/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
--
diff --git 
a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
 
b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
index dc51088..25d4e07 100644
--- 
a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
+++ 
b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
@@ -29,6 +29,11 @@ public class XmppRobustConnectionTest extends 
CamelTestSupport {
 
 @Test
 public void testXmppChatWithRobustConnection() throws Exception {
+// does not work well on aix or solaris
+if (isPlatform(aix) || isPlatform(sunos)) {
+return;
+}
+
 MockEndpoint consumerEndpoint = context.getEndpoint(mock:out, 
MockEndpoint.class);
 MockEndpoint errorEndpoint = context.getEndpoint(mock:error, 
MockEndpoint.class);

[02/10] git commit: Skip test on some platforms

2013-09-16 Thread davsclaus

Skip test on some platforms


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

Branch: refs/heads/master
Commit: dc7ae0d8305c1ba6fbc9e2e6f2697b77e9b16aeb
Parents: 7ee691a
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Sep 16 11:25:29 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Sep 16 11:29:07 2013 +0200

--
 .../apache/camel/component/xmpp/XmppRobustConnectionTest.java   | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/dc7ae0d8/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
--
diff --git 
a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
 
b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
index dc51088..25d4e07 100644
--- 
a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
+++ 
b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
@@ -29,6 +29,11 @@ public class XmppRobustConnectionTest extends 
CamelTestSupport {
 
 @Test
 public void testXmppChatWithRobustConnection() throws Exception {
+// does not work well on aix or solaris
+if (isPlatform(aix) || isPlatform(sunos)) {
+return;
+}
+
 MockEndpoint consumerEndpoint = context.getEndpoint(mock:out, 
MockEndpoint.class);
 MockEndpoint errorEndpoint = context.getEndpoint(mock:error, 
MockEndpoint.class);

[05/10] git commit: Skip test which fails on CI servers.

2013-09-16 Thread davsclaus

Skip test which fails on CI servers.


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

Branch: refs/heads/master
Commit: bdb3faff23b8e4af9a56ca40736b5f4b805450ab
Parents: dc7ae0d
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Sep 16 11:28:09 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Sep 16 11:29:07 2013 +0200

--
 .../apache/camel/impl/StopRouteAbortAfterTimeoutTest.java| 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bdb3faff/camel-core/src/test/java/org/apache/camel/impl/StopRouteAbortAfterTimeoutTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/impl/StopRouteAbortAfterTimeoutTest.java
 
b/camel-core/src/test/java/org/apache/camel/impl/StopRouteAbortAfterTimeoutTest.java
index 03483c1..211e229 100644
--- 
a/camel-core/src/test/java/org/apache/camel/impl/StopRouteAbortAfterTimeoutTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/impl/StopRouteAbortAfterTimeoutTest.java
@@ -25,6 +25,10 @@ import org.apache.camel.component.mock.MockEndpoint;
 public class StopRouteAbortAfterTimeoutTest extends ContextTestSupport {
 
 public void testStopRouteWithAbortAfterTimeoutTrue() throws Exception {
+// doesnt test to well on all Windows
+if (isPlatform(windows)) {
+return;
+}
 
 MockEndpoint mockEP = getMockEndpoint(mock:result);
 mockEP.setExpectedMessageCount(10);
@@ -50,6 +54,10 @@ public class StopRouteAbortAfterTimeoutTest extends 
ContextTestSupport {
 }
 
 public void testStopRouteWithAbortAfterTimeoutFalse() throws Exception {
+// doesnt test to well on all Windows
+if (isPlatform(windows)) {
+return;
+}
 
 MockEndpoint mockEP = getMockEndpoint(mock:result);

[06/10] git commit: Fixed tests

2013-09-16 Thread davsclaus

Fixed tests


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

Branch: refs/heads/camel-2.12.x
Commit: b3b4582539331211677a12f1b9f834ec4f86d9c4
Parents: f6f28b5
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Sep 16 11:09:58 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Sep 16 11:29:17 2013 +0200

--
 .../apache/camel/component/jsch/ScpSimpleProduceTest.java | 10 +-
 .../netty/http/NettyHttpProducerKeepAliveTest.java|  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b3b45825/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java
--
diff --git 
a/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java
 
b/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java
index 6677080..88e9f4d 100644
--- 
a/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java
+++ 
b/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java
@@ -35,7 +35,7 @@ public class ScpSimpleProduceTest extends 
ScpServerTestSupport {
 
 String uri = getScpUri() + 
?username=adminpassword=adminknownHostsFile= + getKnownHostsFile();
 template.sendBodyAndHeader(uri, Hello World, Exchange.FILE_NAME, 
hello.txt);
-Thread.sleep(800);
+Thread.sleep(1000);
 
 File file = new File(getScpPath() + /hello.txt);
 assertFileExists(file.getAbsolutePath());
@@ -48,7 +48,7 @@ public class ScpSimpleProduceTest extends 
ScpServerTestSupport {
 
 String uri = getScpUri() + 
?username=adminpassword=adminknownHostsFile= + getKnownHostsFile();
 template.sendBodyAndHeader(uri, Bye World, Exchange.FILE_NAME, 
mysub/bye.txt);
-Thread.sleep(800);
+Thread.sleep(1000);
 
 File file = new File(getScpPath() + /mysub/bye.txt);
 assertFileExists(file.getAbsolutePath());
@@ -61,7 +61,7 @@ public class ScpSimpleProduceTest extends 
ScpServerTestSupport {
 
 String uri = getScpUri() + 
?username=adminpassword=adminknownHostsFile= + getKnownHostsFile();
 template.sendBodyAndHeader(uri, Farewell World, Exchange.FILE_NAME, 
mysub/mysubsub/farewell.txt);
-Thread.sleep(800);
+Thread.sleep(1000);
 
 File file = new File(getScpPath() + /mysub/mysubsub/farewell.txt);
 assertFileExists(file.getAbsolutePath());
@@ -74,7 +74,7 @@ public class ScpSimpleProduceTest extends 
ScpServerTestSupport {
 
 String uri = getScpUri() + 
?username=adminpassword=adminchmod=640knownHostsFile= + 
getKnownHostsFile();
 template.sendBodyAndHeader(uri, Bonjour Monde, Exchange.FILE_NAME, 
monde.txt);
-Thread.sleep(800);
+Thread.sleep(1000);
 
 File file = new File(getScpPath() + /monde.txt);
 assertFileExists(file.getAbsolutePath());
@@ -89,7 +89,7 @@ public class ScpSimpleProduceTest extends 
ScpServerTestSupport {
 
 String uri = getScpUri() + 
?username=adminprivateKeyFile=src/test/resources/camel-key.privprivateKeyFilePassphrase=passwordknownHostsFile=
 + getKnownHostsFile();
 template.sendBodyAndHeader(uri, Hallo Welt, Exchange.FILE_NAME, 
welt.txt);
-Thread.sleep(800);
+Thread.sleep(1000);
 
 File file = new File(getScpPath() + /welt.txt);
 assertFileExists(file.getAbsolutePath());

http://git-wip-us.apache.org/repos/asf/camel/blob/b3b45825/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerKeepAliveTest.java
--
diff --git 
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerKeepAliveTest.java
 
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerKeepAliveTest.java
index ad018f0..9d1dd95 100644
--- 
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerKeepAliveTest.java
+++ 
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerKeepAliveTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.netty.http;
 
 import org.apache.camel.builder.RouteBuilder;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class NettyHttpProducerKeepAliveTest extends BaseNettyTest {
@@ -35,6 +36,7 @@ public class NettyHttpProducerKeepAliveTest extends 
BaseNettyTest {
 }

[01/10] git commit: Fixed tests

2013-09-16 Thread davsclaus

Updated Branches:
  refs/heads/camel-2.12.x f6f28b502 - 07549
  refs/heads/master d9dd9ecc5 - bdb3faff2


Fixed tests


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

Branch: refs/heads/master
Commit: 6aee9d52457d29751ff5193f5fa6bff2bba6a226
Parents: d9dd9ec
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Sep 16 11:09:58 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Sep 16 11:29:06 2013 +0200

--
 .../apache/camel/component/jsch/ScpSimpleProduceTest.java | 10 +-
 .../netty/http/NettyHttpProducerKeepAliveTest.java|  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6aee9d52/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java
--
diff --git 
a/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java
 
b/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java
index 6677080..88e9f4d 100644
--- 
a/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java
+++ 
b/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java
@@ -35,7 +35,7 @@ public class ScpSimpleProduceTest extends 
ScpServerTestSupport {
 
 String uri = getScpUri() + 
?username=adminpassword=adminknownHostsFile= + getKnownHostsFile();
 template.sendBodyAndHeader(uri, Hello World, Exchange.FILE_NAME, 
hello.txt);
-Thread.sleep(800);
+Thread.sleep(1000);
 
 File file = new File(getScpPath() + /hello.txt);
 assertFileExists(file.getAbsolutePath());
@@ -48,7 +48,7 @@ public class ScpSimpleProduceTest extends 
ScpServerTestSupport {
 
 String uri = getScpUri() + 
?username=adminpassword=adminknownHostsFile= + getKnownHostsFile();
 template.sendBodyAndHeader(uri, Bye World, Exchange.FILE_NAME, 
mysub/bye.txt);
-Thread.sleep(800);
+Thread.sleep(1000);
 
 File file = new File(getScpPath() + /mysub/bye.txt);
 assertFileExists(file.getAbsolutePath());
@@ -61,7 +61,7 @@ public class ScpSimpleProduceTest extends 
ScpServerTestSupport {
 
 String uri = getScpUri() + 
?username=adminpassword=adminknownHostsFile= + getKnownHostsFile();
 template.sendBodyAndHeader(uri, Farewell World, Exchange.FILE_NAME, 
mysub/mysubsub/farewell.txt);
-Thread.sleep(800);
+Thread.sleep(1000);
 
 File file = new File(getScpPath() + /mysub/mysubsub/farewell.txt);
 assertFileExists(file.getAbsolutePath());
@@ -74,7 +74,7 @@ public class ScpSimpleProduceTest extends 
ScpServerTestSupport {
 
 String uri = getScpUri() + 
?username=adminpassword=adminchmod=640knownHostsFile= + 
getKnownHostsFile();
 template.sendBodyAndHeader(uri, Bonjour Monde, Exchange.FILE_NAME, 
monde.txt);
-Thread.sleep(800);
+Thread.sleep(1000);
 
 File file = new File(getScpPath() + /monde.txt);
 assertFileExists(file.getAbsolutePath());
@@ -89,7 +89,7 @@ public class ScpSimpleProduceTest extends 
ScpServerTestSupport {
 
 String uri = getScpUri() + 
?username=adminprivateKeyFile=src/test/resources/camel-key.privprivateKeyFilePassphrase=passwordknownHostsFile=
 + getKnownHostsFile();
 template.sendBodyAndHeader(uri, Hallo Welt, Exchange.FILE_NAME, 
welt.txt);
-Thread.sleep(800);
+Thread.sleep(1000);
 
 File file = new File(getScpPath() + /welt.txt);
 assertFileExists(file.getAbsolutePath());

http://git-wip-us.apache.org/repos/asf/camel/blob/6aee9d52/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerKeepAliveTest.java
--
diff --git 
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerKeepAliveTest.java
 
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerKeepAliveTest.java
index ad018f0..9d1dd95 100644
--- 
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerKeepAliveTest.java
+++ 
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerKeepAliveTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.netty.http;
 
 import org.apache.camel.builder.RouteBuilder;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class NettyHttpProducerKeepAliveTest extends

[10/10] git commit: Skip test which fails on CI servers.

2013-09-16 Thread davsclaus

Skip test which fails on CI servers.


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

Branch: refs/heads/camel-2.12.x
Commit: 0754974286336f19144060811cc7b9ee7454
Parents: 06cf696
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Sep 16 11:28:09 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Sep 16 11:29:18 2013 +0200

--
 .../apache/camel/impl/StopRouteAbortAfterTimeoutTest.java| 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0754/camel-core/src/test/java/org/apache/camel/impl/StopRouteAbortAfterTimeoutTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/impl/StopRouteAbortAfterTimeoutTest.java
 
b/camel-core/src/test/java/org/apache/camel/impl/StopRouteAbortAfterTimeoutTest.java
index 03483c1..211e229 100644
--- 
a/camel-core/src/test/java/org/apache/camel/impl/StopRouteAbortAfterTimeoutTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/impl/StopRouteAbortAfterTimeoutTest.java
@@ -25,6 +25,10 @@ import org.apache.camel.component.mock.MockEndpoint;
 public class StopRouteAbortAfterTimeoutTest extends ContextTestSupport {
 
 public void testStopRouteWithAbortAfterTimeoutTrue() throws Exception {
+// doesnt test to well on all Windows
+if (isPlatform(windows)) {
+return;
+}
 
 MockEndpoint mockEP = getMockEndpoint(mock:result);
 mockEP.setExpectedMessageCount(10);
@@ -50,6 +54,10 @@ public class StopRouteAbortAfterTimeoutTest extends 
ContextTestSupport {
 }
 
 public void testStopRouteWithAbortAfterTimeoutFalse() throws Exception {
+// doesnt test to well on all Windows
+if (isPlatform(windows)) {
+return;
+}
 
 MockEndpoint mockEP = getMockEndpoint(mock:result);

[2/2] git commit: Skip test if cannot run on platform due security provider not supporting ECDSA.

2013-09-16 Thread davsclaus

Skip test if cannot run on platform due security provider not supporting ECDSA.


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

Branch: refs/heads/camel-2.12.x
Commit: 4db3d9e12dd74c4ecef68ddcbfc5b29dc713bc3b
Parents: 0754222
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Sep 16 11:39:41 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Sep 16 11:39:57 2013 +0200

--
 .../component/crypto/ECDSASignatureTest.java| 40 ++--
 1 file changed, 28 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4db3d9e1/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
--
diff --git 
a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
 
b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
index 4f8760f..b24988c 100644
--- 
a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
+++ 
b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
@@ -40,12 +40,15 @@ public class ECDSASignatureTest extends CamelTestSupport {
 
 private String payload = Dear Alice, Rest assured it's me, signed Bob;
 private boolean ibmJDK;
+private PrivateKey privateKey;
+private X509Certificate x509;
+private boolean canRun = true;
 
 public ECDSASignatureTest() throws Exception {
 // BouncyCastle is required for ECDSA support for JDK 1.6
 if (isJava16()
  Security.getProvider(BC) == null) {
-Constructor? cons = null;
+Constructor? cons;
 Class? c = 
Class.forName(org.bouncycastle.jce.provider.BouncyCastleProvider);
 cons = c.getConstructor(new Class[] {});
 
@@ -57,28 +60,40 @@ public class ECDSASignatureTest extends CamelTestSupport {
 if (isJavaVendor(IBM)) {
 ibmJDK = true;
 }
+
+// see if we can load the keystore et all
+try {
+KeyStore keyStore = 
KeyStore.getInstance(KeyStore.getDefaultType());
+InputStream in = 
ECDSASignatureTest.class.getResourceAsStream(/org/apache/camel/component/crypto/ecdsa.jks);
+keyStore.load(in, security.toCharArray());
+privateKey = (PrivateKey) keyStore.getKey(ECDSA, 
security.toCharArray());
+x509 = (X509Certificate)keyStore.getCertificate(ECDSA);
+} catch (Throwable e) {
+log.warn(Cannot setup keystore for running this test due  + 
e.getMessage() + . This test is skipped., e);
+canRun = false;
+}
 }
 
 @Override
 protected RouteBuilder[] createRouteBuilders() throws Exception {
-if (ibmJDK) {
+if (ibmJDK || !canRun) {
 return new RouteBuilder[] {};
 }
 
 return new RouteBuilder[]{new RouteBuilder() {
 public void configure() throws Exception {
 // START SNIPPET: ecdsa-sha1
-KeyStore keyStore = 
KeyStore.getInstance(KeyStore.getDefaultType());
-InputStream in = 
ECDSASignatureTest.class.getResourceAsStream(/org/apache/camel/component/crypto/ecdsa.jks);
-keyStore.load(in, security.toCharArray());
-PrivateKey privateKey = 
-(PrivateKey)keyStore.getKey(ECDSA, 
security.toCharArray());
-X509Certificate x509 = 
(X509Certificate)keyStore.getCertificate(ECDSA);
 
 // we can set the keys explicitly on the endpoint instances.
-
context.getEndpoint(crypto:sign://ecdsa-sha1?algorithm=SHA1withECDSA, 
DigitalSignatureEndpoint.class).setPrivateKey(privateKey);
-
context.getEndpoint(crypto:verify://ecdsa-sha1?algorithm=SHA1withECDSA, 
DigitalSignatureEndpoint.class).setPublicKey(x509.getPublicKey());
-
from(direct:ecdsa-sha1).to(crypto:sign://ecdsa-sha1?algorithm=SHA1withECDSA,
 crypto:verify://ecdsa-sha1?algorithm=SHA1withECDSA, mock:result);
+
context.getEndpoint(crypto:sign://ecdsa-sha1?algorithm=SHA1withECDSA, 
DigitalSignatureEndpoint.class)
+.setPrivateKey(privateKey);
+
context.getEndpoint(crypto:verify://ecdsa-sha1?algorithm=SHA1withECDSA, 
DigitalSignatureEndpoint.class)
+.setPublicKey(x509.getPublicKey());
+
+from(direct:ecdsa-sha1)
+.to(crypto:sign://ecdsa-sha1?algorithm=SHA1withECDSA)
+

[1/2] git commit: Skip test if cannot run on platform due security provider not supporting ECDSA.

2013-09-16 Thread davsclaus

Updated Branches:
  refs/heads/camel-2.12.x 07549 - 4db3d9e12
  refs/heads/master bdb3faff2 - 89c61cacc


Skip test if cannot run on platform due security provider not supporting ECDSA.


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

Branch: refs/heads/master
Commit: 89c61caccc6f2138c1b20e4ff3d92daa8acee613
Parents: bdb3faf
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Sep 16 11:39:41 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Sep 16 11:39:41 2013 +0200

--
 .../component/crypto/ECDSASignatureTest.java| 40 ++--
 1 file changed, 28 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/89c61cac/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
--
diff --git 
a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
 
b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
index 4f8760f..b24988c 100644
--- 
a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
+++ 
b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
@@ -40,12 +40,15 @@ public class ECDSASignatureTest extends CamelTestSupport {
 
 private String payload = Dear Alice, Rest assured it's me, signed Bob;
 private boolean ibmJDK;
+private PrivateKey privateKey;
+private X509Certificate x509;
+private boolean canRun = true;
 
 public ECDSASignatureTest() throws Exception {
 // BouncyCastle is required for ECDSA support for JDK 1.6
 if (isJava16()
  Security.getProvider(BC) == null) {
-Constructor? cons = null;
+Constructor? cons;
 Class? c = 
Class.forName(org.bouncycastle.jce.provider.BouncyCastleProvider);
 cons = c.getConstructor(new Class[] {});
 
@@ -57,28 +60,40 @@ public class ECDSASignatureTest extends CamelTestSupport {
 if (isJavaVendor(IBM)) {
 ibmJDK = true;
 }
+
+// see if we can load the keystore et all
+try {
+KeyStore keyStore = 
KeyStore.getInstance(KeyStore.getDefaultType());
+InputStream in = 
ECDSASignatureTest.class.getResourceAsStream(/org/apache/camel/component/crypto/ecdsa.jks);
+keyStore.load(in, security.toCharArray());
+privateKey = (PrivateKey) keyStore.getKey(ECDSA, 
security.toCharArray());
+x509 = (X509Certificate)keyStore.getCertificate(ECDSA);
+} catch (Throwable e) {
+log.warn(Cannot setup keystore for running this test due  + 
e.getMessage() + . This test is skipped., e);
+canRun = false;
+}
 }
 
 @Override
 protected RouteBuilder[] createRouteBuilders() throws Exception {
-if (ibmJDK) {
+if (ibmJDK || !canRun) {
 return new RouteBuilder[] {};
 }
 
 return new RouteBuilder[]{new RouteBuilder() {
 public void configure() throws Exception {
 // START SNIPPET: ecdsa-sha1
-KeyStore keyStore = 
KeyStore.getInstance(KeyStore.getDefaultType());
-InputStream in = 
ECDSASignatureTest.class.getResourceAsStream(/org/apache/camel/component/crypto/ecdsa.jks);
-keyStore.load(in, security.toCharArray());
-PrivateKey privateKey = 
-(PrivateKey)keyStore.getKey(ECDSA, 
security.toCharArray());
-X509Certificate x509 = 
(X509Certificate)keyStore.getCertificate(ECDSA);
 
 // we can set the keys explicitly on the endpoint instances.
-
context.getEndpoint(crypto:sign://ecdsa-sha1?algorithm=SHA1withECDSA, 
DigitalSignatureEndpoint.class).setPrivateKey(privateKey);
-
context.getEndpoint(crypto:verify://ecdsa-sha1?algorithm=SHA1withECDSA, 
DigitalSignatureEndpoint.class).setPublicKey(x509.getPublicKey());
-
from(direct:ecdsa-sha1).to(crypto:sign://ecdsa-sha1?algorithm=SHA1withECDSA,
 crypto:verify://ecdsa-sha1?algorithm=SHA1withECDSA, mock:result);
+
context.getEndpoint(crypto:sign://ecdsa-sha1?algorithm=SHA1withECDSA, 
DigitalSignatureEndpoint.class)
+.setPrivateKey(privateKey);
+
context.getEndpoint(crypto:verify://ecdsa-sha1?algorithm=SHA1withECDSA, 
DigitalSignatureEndpoint.class)
+.setPublicKey(x509.getPublicKey());
+
+

[5/5] git commit: Fixed CS

2013-09-16 Thread davsclaus

Fixed CS


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

Branch: refs/heads/camel-2.11.x
Commit: 0acff1b0a2ab0ed2bad66b1e13c58885e8252b14
Parents: aebe527
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Sep 16 12:41:44 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Sep 16 12:42:21 2013 +0200

--
 .../src/main/java/org/apache/camel/component/bean/BeanInfo.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0acff1b0/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java 
b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index f288ace..583d6ad 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -613,7 +613,7 @@ public class BeanInfo {
 private MethodInfo getSingleCovariantMethod(CollectionMethodInfo 
candidates) {
 // if all the candidates are actually covariant, it doesn't matter 
which one we call
 MethodInfo firstCandidate = candidates.iterator().next();
-for (MethodInfo candidate: candidates) {
+for (MethodInfo candidate : candidates) {
 if (!firstCandidate.isCovariantWith(candidate)) {
 return null;
 }

[2/5] git commit: Fixed CS

2013-09-16 Thread davsclaus

Fixed CS


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

Branch: refs/heads/master
Commit: 302133ed3b488ff07b03644d1c010032581d75f3
Parents: 0dbb9ea
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Sep 16 12:41:44 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Sep 16 12:41:44 2013 +0200

--
 .../src/main/java/org/apache/camel/component/bean/BeanInfo.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/302133ed/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java 
b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 98d0c8b..19d7ad3 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -627,7 +627,7 @@ public class BeanInfo {
 private MethodInfo getSingleCovariantMethod(CollectionMethodInfo 
candidates) {
 // if all the candidates are actually covariant, it doesn't matter 
which one we call
 MethodInfo firstCandidate = candidates.iterator().next();
-for (MethodInfo candidate: candidates) {
+for (MethodInfo candidate : candidates) {
 if (!firstCandidate.isCovariantWith(candidate)) {
 return null;
 }

[3/5] git commit: CAMEL-6729: camel-jt400 filter unsupported scheduled poll consumer options when creating a PollingConsumer as it does not support these options, due special in jt400 component.

2013-09-16 Thread davsclaus

CAMEL-6729: camel-jt400 filter unsupported scheduled poll consumer options when 
creating a PollingConsumer as it does not support these options, due special in 
jt400 component.


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

Branch: refs/heads/camel-2.12.x
Commit: 8ad3d365652597deefd50cf7e5862de40aa0ecbc
Parents: 4db3d9e
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Sep 16 12:40:53 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Sep 16 12:42:00 2013 +0200

--
 .../camel/impl/ScheduledPollEndpoint.java   |  2 +-
 .../component/jt400/Jt400DataQueueEndpoint.java | 24 ++-
 .../jt400/Jt400CustomPollStrategyTest.java  | 71 
 3 files changed, 95 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8ad3d365/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java 
b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
index 9106ef3..cc63ddc 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
@@ -55,7 +55,7 @@ public abstract class ScheduledPollEndpoint extends 
DefaultEndpoint {
 configureScheduledPollConsumerProperties(options, 
getConsumerProperties());
 }
 
-private void configureScheduledPollConsumerProperties(MapString, Object 
options, MapString, Object consumerProperties) {
+protected void configureScheduledPollConsumerProperties(MapString, 
Object options, MapString, Object consumerProperties) {
 // special for scheduled poll consumers as we want to allow end users 
to configure its options
 // from the URI parameters without the consumer. prefix
 MapString, Object schedulerProperties = 
IntrospectionSupport.extractProperties(options, scheduler.);

http://git-wip-us.apache.org/repos/asf/camel/blob/8ad3d365/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
--
diff --git 
a/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
 
b/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
index 3692864..b9b5797 100644
--- 
a/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
+++ 
b/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.jt400;
 
 import java.beans.PropertyVetoException;
 import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
 
 import com.ibm.as400.access.AS400;
 import com.ibm.as400.access.AS400ConnectionPool;
@@ -27,7 +29,9 @@ import com.ibm.as400.access.KeyedDataQueue;
 import org.apache.camel.CamelException;
 import org.apache.camel.PollingConsumer;
 import org.apache.camel.Producer;
+import org.apache.camel.ResolveEndpointFailedException;
 import org.apache.camel.impl.DefaultPollingEndpoint;
+import org.apache.camel.util.EndpointHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
 
@@ -143,7 +147,25 @@ public class Jt400DataQueueEndpoint extends 
DefaultPollingEndpoint {
 @Override
 public PollingConsumer createPollingConsumer() throws Exception {
 Jt400DataQueueConsumer answer = new Jt400DataQueueConsumer(this);
-configureConsumer(answer);
+
+MapString, Object copy = new HashMapString, 
Object(getConsumerProperties());
+MapString, Object throwaway = new HashMapString, Object();
+
+// filter out unwanted options which is intended for the scheduled 
poll consumer
+// as these options are not supported on Jt400DataQueueConsumer
+configureScheduledPollConsumerProperties(copy, throwaway);
+
+// set reference properties first as they use # syntax that fools the 
regular properties setter
+EndpointHelper.setReferenceProperties(getCamelContext(), this, copy);
+EndpointHelper.setProperties(getCamelContext(), this, copy);
+
+if (!isLenientProperties()  copy.size()  0) {
+throw new ResolveEndpointFailedException(this.getEndpointUri(), 
There are  + copy.size()
++  parameters that couldn't be set on the endpoint 
consumer.
++  Check the uri if the parameters

[1/5] git commit: CAMEL-6729: camel-jt400 filter unsupported scheduled poll consumer options when creating a PollingConsumer as it does not support these options, due special in jt400 component.

2013-09-16 Thread davsclaus

Updated Branches:
  refs/heads/camel-2.11.x aebe52774 - 0acff1b0a
  refs/heads/camel-2.12.x 4db3d9e12 - a971b79da
  refs/heads/master 89c61cacc - 302133ed3


CAMEL-6729: camel-jt400 filter unsupported scheduled poll consumer options when 
creating a PollingConsumer as it does not support these options, due special in 
jt400 component.


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

Branch: refs/heads/master
Commit: 0dbb9ea266f640c3859703f90fe5b5b98e27e579
Parents: 89c61ca
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Sep 16 12:40:53 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Sep 16 12:40:53 2013 +0200

--
 .../camel/impl/ScheduledPollEndpoint.java   |  2 +-
 .../component/jt400/Jt400DataQueueEndpoint.java | 24 ++-
 .../jt400/Jt400CustomPollStrategyTest.java  | 71 
 3 files changed, 95 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0dbb9ea2/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java 
b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
index 9106ef3..cc63ddc 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
@@ -55,7 +55,7 @@ public abstract class ScheduledPollEndpoint extends 
DefaultEndpoint {
 configureScheduledPollConsumerProperties(options, 
getConsumerProperties());
 }
 
-private void configureScheduledPollConsumerProperties(MapString, Object 
options, MapString, Object consumerProperties) {
+protected void configureScheduledPollConsumerProperties(MapString, 
Object options, MapString, Object consumerProperties) {
 // special for scheduled poll consumers as we want to allow end users 
to configure its options
 // from the URI parameters without the consumer. prefix
 MapString, Object schedulerProperties = 
IntrospectionSupport.extractProperties(options, scheduler.);

http://git-wip-us.apache.org/repos/asf/camel/blob/0dbb9ea2/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
--
diff --git 
a/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
 
b/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
index 3692864..b9b5797 100644
--- 
a/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
+++ 
b/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.jt400;
 
 import java.beans.PropertyVetoException;
 import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
 
 import com.ibm.as400.access.AS400;
 import com.ibm.as400.access.AS400ConnectionPool;
@@ -27,7 +29,9 @@ import com.ibm.as400.access.KeyedDataQueue;
 import org.apache.camel.CamelException;
 import org.apache.camel.PollingConsumer;
 import org.apache.camel.Producer;
+import org.apache.camel.ResolveEndpointFailedException;
 import org.apache.camel.impl.DefaultPollingEndpoint;
+import org.apache.camel.util.EndpointHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
 
@@ -143,7 +147,25 @@ public class Jt400DataQueueEndpoint extends 
DefaultPollingEndpoint {
 @Override
 public PollingConsumer createPollingConsumer() throws Exception {
 Jt400DataQueueConsumer answer = new Jt400DataQueueConsumer(this);
-configureConsumer(answer);
+
+MapString, Object copy = new HashMapString, 
Object(getConsumerProperties());
+MapString, Object throwaway = new HashMapString, Object();
+
+// filter out unwanted options which is intended for the scheduled 
poll consumer
+// as these options are not supported on Jt400DataQueueConsumer
+configureScheduledPollConsumerProperties(copy, throwaway);
+
+// set reference properties first as they use # syntax that fools the 
regular properties setter
+EndpointHelper.setReferenceProperties(getCamelContext(), this, copy);
+EndpointHelper.setProperties(getCamelContext(), this, copy);
+
+if (!isLenientProperties()  copy.size()  0) {
+throw new ResolveEndpointFailedException(this.getEndpointUri(), 
There are  +

[4/5] git commit: Fixed CS

2013-09-16 Thread davsclaus

Fixed CS


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

Branch: refs/heads/camel-2.12.x
Commit: a971b79dac4f0f0e9d091d6dc8758c4eb784a884
Parents: 8ad3d36
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Sep 16 12:41:44 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Sep 16 12:42:06 2013 +0200

--
 .../src/main/java/org/apache/camel/component/bean/BeanInfo.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a971b79d/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java 
b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 98d0c8b..19d7ad3 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -627,7 +627,7 @@ public class BeanInfo {
 private MethodInfo getSingleCovariantMethod(CollectionMethodInfo 
candidates) {
 // if all the candidates are actually covariant, it doesn't matter 
which one we call
 MethodInfo firstCandidate = candidates.iterator().next();
-for (MethodInfo candidate: candidates) {
+for (MethodInfo candidate : candidates) {
 if (!firstCandidate.isCovariantWith(candidate)) {
 return null;
 }

svn commit: r878624 - in /websites/production/camel/content: cache/main.pageCache component-list-grouped.html

2013-09-16 Thread buildbot

Author: buildbot
Date: Mon Sep 16 14:19:41 2013
New Revision: 878624

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/component-list-grouped.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/component-list-grouped.html
==
--- websites/production/camel/content/component-list-grouped.html (original)
+++ websites/production/camel/content/component-list-grouped.html Mon Sep 16 
14:19:41 2013
@@ -77,11 +77,14 @@
 td valign=top width=100%
 div class=wiki-content maincontenth2a shape=rect 
name=ComponentListGrouped-AninformalgroupingofCamelcomponents./aAn 
informal grouping of Camel components./h2
 
+h3a shape=rect name=ComponentListGrouped-AutomatingTasks/aAutomating 
Tasks/h3
+pa shape=rect href=timer.html title=Timertimer/a, quartz, 
quartz2/p
+
 h3a shape=rect name=ComponentListGrouped-Amazon/aAmazon/h3
 paws-cw, aws-ddb, aws-sdb, aws-ses, aws-sns, aws-sqs, aws-s3/p
 
 h3a shape=rect name=ComponentListGrouped-Basics/aBasics   /h3
-pbean, class, a shape=rect href=dataformat-component.html 
title=DataFormat Componentdataformat/a, direct, direct-vm, language, 
properties, ref, vm/p
+pbean, class, a shape=rect href=dataformat-component.html 
title=DataFormat Componentdataformat/a, language, properties, ref, /p
 
 h3a shape=rect name=ComponentListGrouped-Chat/aChat/h3
 pirc, xmpp/p
@@ -90,7 +93,7 @@
 pjgroups, zookeeper /p
 
 h3a shape=rect name=ComponentListGrouped-Commands/aCommands /h3
-pdns, exec, a shape=rect href=file2.html title=File2file/a, 
flatpack, hdfs, scp, log, lpr, a shape=rect href=stream.html 
title=Streamstream/a, ssh/p
+pdns, exec, flatpack, hdfs, scp, log, lpr, a shape=rect 
href=stream.html title=Streamstream/a, ssh/p
 
 h3a shape=rect 
name=ComponentListGrouped-ContentRepositories/aContent Repositories/h3
 pcmis, jcr/p
@@ -104,8 +107,8 @@
 h3a shape=rect name=ComponentListGrouped-Feeds/aFeeds/h3
 pAtom, RSS/p
 
-h3a shape=rect name=ComponentListGrouped-FTP/aFTP/h3
-pftp, ftps, sftp /p
+h3a shape=rect name=ComponentListGrouped-FileI%2FO/aFile I/O/h3
+pa shape=rect href=file2.html title=File2file/a, ftp, ftps, sftp 
/p
 
 h3a shape=rect name=ComponentListGrouped-Google/aGoogle/h3
 pguath, ghttps, glogin, gmail, gtask, guava-eventbus/p
@@ -113,6 +116,9 @@
 h3a shape=rect name=ComponentListGrouped-http/ahttp/h3
 pahc, cometd, http, http4, jetty, servlet/p
 
+h3a shape=rect 
name=ComponentListGrouped-InMemoryManagement/aIn-Memory Management/h3
+pdirect, direct-vm, disruptor, disruptor-vm, seda, vm/p
+
 h3a shape=rect name=ComponentListGrouped-JMS/aJMS/h3
 pactivemq, activemq.journal, jms, rabbitmq, sjms, stomp, zeromq/p
 
@@ -128,7 +134,7 @@
 h3a shape=rect name=ComponentListGrouped-Messaging/aMessaging/h3
 pamqp, javaspace, jt400, kestrel, mqtt, sip, sips, smpp, smpps, snmp, 
quickfix/p
 
-h3a shape=rect name=ComponentListGrouped-MINA/aMINA/h3
+h3a shape=rect name=ComponentListGrouped-Networking/aNetworking/h3
 pmina, mina2/p
 
 h3a shape=rect name=ComponentListGrouped-Netty/aNetty /h3
@@ -146,9 +152,6 @@
 h3a shape=rect name=ComponentListGrouped-SearchEngines/aSearch 
Engines /h3
 pElasticSearch, Lucene, Solr/p
 
-h3a shape=rect name=ComponentListGrouped-SEDA/aSEDA/h3
-pseda, disruptor, disruptor-vm/p
-
 h3a shape=rect name=ComponentListGrouped-SocialMedia/aSocial Media 
/h3
 pfacebook, twitter, yammer/p
 
@@ -158,12 +161,9 @@
 h3a shape=rect name=ComponentListGrouped-Templates/aTemplates/h3
 pfreemarker, mustache, mvel, scalate, string-template, velocity/p
 
-h3a shape=rect name=ComponentListGrouped-Testing/aTesting/h3
+h3a shape=rect name=ComponentListGrouped-Testing/aTesting /h3
 pdataset, a shape=rect href=mock.html title=Mockmock/a, stub, 
test/p
 
-h3a shape=rect name=ComponentListGrouped-Timers/aTimers/h3
-pa shape=rect href=timer.html title=Timertimer/a, quartz, 
quartz2/p
-
 h3a shape=rect name=ComponentListGrouped-XML/aXML/h3
 pbean-validator, fop, msv, rnc, rng, stax, squery, xslt, validation/p

svn commit: r878640 - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache cxf-bean-component.html

2013-09-16 Thread buildbot

Author: buildbot
Date: Mon Sep 16 15:20:48 2013
New Revision: 878640

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/book-component-appendix.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/cxf-bean-component.html

Modified: websites/production/camel/content/book-component-appendix.html
==
--- websites/production/camel/content/book-component-appendix.html (original)
+++ websites/production/camel/content/book-component-appendix.html Mon Sep 16 
15:20:48 2013
@@ -2754,7 +2754,7 @@ cxfbean:serviceBeanRef
 
 h3a shape=rect name=BookComponentAppendix-Options/aOptions/h3
 div class=confluenceTableSmalldiv class=table-wrap
-table class=confluenceTabletbodytrth colspan=1 rowspan=1 
class=confluenceTh Name /thth colspan=1 rowspan=1 
class=confluenceTh Description /thth colspan=1 rowspan=1 
class=confluenceTh Example /thth colspan=1 rowspan=1 
class=confluenceTh Required? /thth colspan=1 rowspan=1 
class=confluenceTh Default Value /th/trtrtd colspan=1 rowspan=1 
class=confluenceTd ttcxfBeanBinding/tt /tdtd colspan=1 rowspan=1 
class=confluenceTd CXF bean binding specified by the tt#/tt notation.  
The referenced object must be an instance of 
ttorg.apache.camel.component.cxf.cxfbean.CxfBeanBinding/tt. /tdtd 
colspan=1 rowspan=1 class=confluenceTd ttcxfBinding=#bindingName/tt 
/tdtd colspan=1 rowspan=1 class=confluenceTd No /tdtd colspan=1 
rowspan=1 class=confluenceTd ttDefaultCxfBeanBinding/tt 
/td/trtrtd colspan=1 rowspan=1 class=confluenceTd ttbus/tt 
/tdtd colspan=1
  rowspan=1 class=confluenceTd CXF bus reference specified by the 
tt#/tt notation. The referenced object must be an instance of 
ttorg.apache.cxf.Bus/tt. /tdtd colspan=1 rowspan=1 
class=confluenceTd ttbus=#busName/tt /tdtd colspan=1 rowspan=1 
class=confluenceTd No /tdtd colspan=1 rowspan=1 class=confluenceTd 
Default bus created by CXF Bus Factory /td/trtrtd colspan=1 
rowspan=1 class=confluenceTd ttheaderFilterStrategy/tt /tdtd 
colspan=1 rowspan=1 class=confluenceTd Header filter strategy specified 
by the tt#/tt notation.  The referenced object must be an instance of 
ttorg.apache.camel.spi.HeaderFilterStrategy/tt. /tdtd colspan=1 
rowspan=1 class=confluenceTd ttheaderFilterStrategy=#strategyName/tt 
/tdtd colspan=1 rowspan=1 class=confluenceTd No /tdtd colspan=1 
rowspan=1 class=confluenceTd ttCxfHeaderFilterStrategy/tt 
/td/trtrtd colspan=1 rowspan=1 class=
 confluenceTd ttsetDefaultBus/tt /tdtd colspan=1 rowspan=1 
class=confluenceTd Will set the default bus when CXF endpoint create a bus 
by itself. /tdtd colspan=1 rowspan=1 class=confluenceTd 
tttrue/tt, ttfalse/tt /tdtd colspan=1 rowspan=1 
class=confluenceTd No /tdtd colspan=1 rowspan=1 class=confluenceTd 
ttfalse/tt /td/trtrtd colspan=1 rowspan=1 class=confluenceTd 
ttpopulateFromClass/ttbr clear=none class=atl-forced-newline /tdtd 
colspan=1 rowspan=1 class=confluenceTd Since 2.3, the wsdlLocation 
annotated in the POJO is ignored (by default) unless this option is set 
to#160; ttfalse./tt Prior to 2.3, the wsdlLocation annotated in the POJO 
is always honored and it is not possible to ignore.br clear=none 
class=atl-forced-newline /tdtd colspan=1 rowspan=1 
class=confluenceTd tttrue/tt, ttfalse/tt /tdtd colspan=1 
rowspan=1 class=confluenceTd No /tdtd colspan=
 1 rowspan=1 class=confluenceTd tttrue/tt /td/trtrtd 
colspan=1 rowspan=1 class=confluenceTd ttproviders/tt /tdtd 
colspan=1 rowspan=1 class=confluenceTd Since 2.5, setting the providers 
for the CXFRS endpoint. /tdtd colspan=1 rowspan=1 
class=confluenceTdttproviders=#providerRef1,#providerRef2/tt/tdtd 
colspan=1 rowspan=1 class=confluenceTd No /tdtd colspan=1 
rowspan=1 class=confluenceTd ttnull/tt/td/tr/tbody/table
+table class=confluenceTabletbodytrth colspan=1 rowspan=1 
class=confluenceTh Name /thth colspan=1 rowspan=1 
class=confluenceTh Description /thth colspan=1 rowspan=1 
class=confluenceTh Example /thth colspan=1 rowspan=1 
class=confluenceTh Required? /thth colspan=1 rowspan=1 
class=confluenceTh Default Value /th/trtrtd colspan=1 rowspan=1 
class=confluenceTd ttbus/tt /tdtd colspan=1 rowspan=1 
class=confluenceTd CXF bus reference specified by the tt#/tt notation. 
The referenced object must be an instance of ttorg.apache.cxf.Bus/tt. 
/tdtd colspan=1 rowspan=1 class=confluenceTd ttbus=#busName/tt 
/tdtd colspan=1 rowspan=1 class=confluenceTd No /tdtd colspan=1 
rowspan=1 class=confluenceTd Default bus created by CXF Bus Factory 
/td/trtrtd colspan=1 rowspan=1 class=confluenceTd 
ttcxfBeanBinding/tt /tdtd colspan=1 rowspan=1 class=confluenceTd 
CX
 F bean binding specified by the tt#/tt notation.  The referenced object 
must be an instance of 
ttorg.apache.camel.component.cxf.cxfbean.CxfBeanBinding/tt. /tdtd 
colspan=1 rowspan=1 class=confluenceTd ttcxfBinding=#bindingName/tt 
/tdtd

[CONF] Apache Camel Crypto

2013-09-16 Thread Jakub Korab (Confluence)

Crypto
Page edited by Jakub Korab

Comment:
Replaced link with algorithms to point to the Cryptography API spec.

Changes (2)

...
{snippet:id=algorithm|lang=java|url=""
A list of the available alrorithms in Java 7 is available via [IBMs Security Information for Java 7|http://pic.dhe.ibm.com/infocenter/java7sdk/v7r0/index.jsp?topic=%2Fcom.ibm.java.security.component.doc%2Fsecurity-component%2FJceDocs%2Fapi_standardnames.html] guide.
A list of the available algorithms in Java 7 is available via the [Java Cryptography Architecture Standard Algorithm Name Documentation|http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html].
h3. Specifying an Initialization Vector
...