[2/2] git commit: CAMEL-7356: camel-smpp had wrong constant key for password. Thansk to Ray Slater for the patch.
CAMEL-7356: camel-smpp had wrong constant key for password. Thansk to Ray
Slater for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/35cb56a6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/35cb56a6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/35cb56a6
Branch: refs/heads/camel-2.13.x
Commit: 35cb56a68b38d1ca58e529c00f8f020b0cf1ad31
Parents: dea8545
Author: Claus Ibsen davscl...@apache.org
Authored: Thu Apr 10 09:07:12 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Thu Apr 10 09:07:37 2014 +0200
--
.../main/java/org/apache/camel/component/smpp/SmppConstants.java | 2 +-
.../component/smpp/SmppProducerLazySessionCreationTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/35cb56a6/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConstants.java
--
diff --git
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConstants.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConstants.java
index 7099c3a..d469359 100644
---
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConstants.java
+++
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConstants.java
@@ -55,7 +55,7 @@ public interface SmppConstants {
String SUBMITTED = CamelSmppSubmitted;
String SUBMIT_DATE = CamelSmppSubmitDate;
String SYSTEM_ID = CamelSmppSystemId;
-String PASSWORD = CamelSmppSystemId;
+String PASSWORD = CamelSmppPassword;
String VALIDITY_PERIOD = CamelSmppValidityPeriod;
String OPTIONAL_PARAMETERS = CamelSmppOptionalParameters;
String OPTIONAL_PARAMETER = CamelSmppOptionalParameter;
http://git-wip-us.apache.org/repos/asf/camel/blob/35cb56a6/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
--
diff --git
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
index e2057f7..effefd7 100644
---
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
+++
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
@@ -100,7 +100,7 @@ public class SmppProducerLazySessionCreationTest {
expect(binding.createSmppCommand(session,
exchange)).andReturn(command);
expect(exchange.getIn()).andReturn(in);
expect(in.getHeader(CamelSmppSystemId,
String.class)).andReturn(null);
-expect(in.getHeader(CamelSmppSystemId,
String.class)).andReturn(null);
+expect(in.getHeader(CamelSmppPassword,
String.class)).andReturn(null);
command.execute(exchange);
replay(session, endpoint, binding, exchange, in, command);
@@ -140,7 +140,7 @@ public class SmppProducerLazySessionCreationTest {
expect(binding.createSmppCommand(session,
exchange)).andReturn(command);
expect(exchange.getIn()).andReturn(in);
expect(in.getHeader(CamelSmppSystemId,
String.class)).andReturn(smppclient2);
-expect(in.getHeader(CamelSmppSystemId,
String.class)).andReturn(password2);
+expect(in.getHeader(CamelSmppPassword,
String.class)).andReturn(password2);
command.execute(exchange);
replay(session, endpoint, binding, exchange, in, command);
git commit: CAMEL-7356: camel-smpp had wrong constant key for password. Thansk to Ray Slater for the patch.
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x 201bffbe0 - fae4a9694
CAMEL-7356: camel-smpp had wrong constant key for password. Thansk to Ray
Slater for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fae4a969
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fae4a969
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fae4a969
Branch: refs/heads/camel-2.12.x
Commit: fae4a9694f5c346f126e2f14b788d689e63ad6a2
Parents: 201bffb
Author: Claus Ibsen davscl...@apache.org
Authored: Thu Apr 10 09:07:12 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Thu Apr 10 09:08:18 2014 +0200
--
.../main/java/org/apache/camel/component/smpp/SmppConstants.java | 2 +-
.../component/smpp/SmppProducerLazySessionCreationTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/fae4a969/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConstants.java
--
diff --git
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConstants.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConstants.java
index 7099c3a..d469359 100644
---
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConstants.java
+++
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConstants.java
@@ -55,7 +55,7 @@ public interface SmppConstants {
String SUBMITTED = CamelSmppSubmitted;
String SUBMIT_DATE = CamelSmppSubmitDate;
String SYSTEM_ID = CamelSmppSystemId;
-String PASSWORD = CamelSmppSystemId;
+String PASSWORD = CamelSmppPassword;
String VALIDITY_PERIOD = CamelSmppValidityPeriod;
String OPTIONAL_PARAMETERS = CamelSmppOptionalParameters;
String OPTIONAL_PARAMETER = CamelSmppOptionalParameter;
http://git-wip-us.apache.org/repos/asf/camel/blob/fae4a969/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
--
diff --git
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
index e2057f7..effefd7 100644
---
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
+++
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
@@ -100,7 +100,7 @@ public class SmppProducerLazySessionCreationTest {
expect(binding.createSmppCommand(session,
exchange)).andReturn(command);
expect(exchange.getIn()).andReturn(in);
expect(in.getHeader(CamelSmppSystemId,
String.class)).andReturn(null);
-expect(in.getHeader(CamelSmppSystemId,
String.class)).andReturn(null);
+expect(in.getHeader(CamelSmppPassword,
String.class)).andReturn(null);
command.execute(exchange);
replay(session, endpoint, binding, exchange, in, command);
@@ -140,7 +140,7 @@ public class SmppProducerLazySessionCreationTest {
expect(binding.createSmppCommand(session,
exchange)).andReturn(command);
expect(exchange.getIn()).andReturn(in);
expect(in.getHeader(CamelSmppSystemId,
String.class)).andReturn(smppclient2);
-expect(in.getHeader(CamelSmppSystemId,
String.class)).andReturn(password2);
+expect(in.getHeader(CamelSmppPassword,
String.class)).andReturn(password2);
command.execute(exchange);
replay(session, endpoint, binding, exchange, in, command);
[1/2] git commit: CAMEL-7356: camel-smpp had wrong constant key for password. Thansk to Ray Slater for the patch.
Repository: camel
Updated Branches:
refs/heads/camel-2.13.x dea8545d4 - 35cb56a68
refs/heads/master 0a77f5347 - 65648d156
CAMEL-7356: camel-smpp had wrong constant key for password. Thansk to Ray
Slater for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/65648d15
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/65648d15
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/65648d15
Branch: refs/heads/master
Commit: 65648d156f2c4826638bdb4e0abb490cd195190b
Parents: 0a77f53
Author: Claus Ibsen davscl...@apache.org
Authored: Thu Apr 10 09:07:12 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Thu Apr 10 09:07:12 2014 +0200
--
.../main/java/org/apache/camel/component/smpp/SmppConstants.java | 2 +-
.../component/smpp/SmppProducerLazySessionCreationTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/65648d15/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConstants.java
--
diff --git
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConstants.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConstants.java
index 7099c3a..d469359 100644
---
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConstants.java
+++
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConstants.java
@@ -55,7 +55,7 @@ public interface SmppConstants {
String SUBMITTED = CamelSmppSubmitted;
String SUBMIT_DATE = CamelSmppSubmitDate;
String SYSTEM_ID = CamelSmppSystemId;
-String PASSWORD = CamelSmppSystemId;
+String PASSWORD = CamelSmppPassword;
String VALIDITY_PERIOD = CamelSmppValidityPeriod;
String OPTIONAL_PARAMETERS = CamelSmppOptionalParameters;
String OPTIONAL_PARAMETER = CamelSmppOptionalParameter;
http://git-wip-us.apache.org/repos/asf/camel/blob/65648d15/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
--
diff --git
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
index e2057f7..effefd7 100644
---
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
+++
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
@@ -100,7 +100,7 @@ public class SmppProducerLazySessionCreationTest {
expect(binding.createSmppCommand(session,
exchange)).andReturn(command);
expect(exchange.getIn()).andReturn(in);
expect(in.getHeader(CamelSmppSystemId,
String.class)).andReturn(null);
-expect(in.getHeader(CamelSmppSystemId,
String.class)).andReturn(null);
+expect(in.getHeader(CamelSmppPassword,
String.class)).andReturn(null);
command.execute(exchange);
replay(session, endpoint, binding, exchange, in, command);
@@ -140,7 +140,7 @@ public class SmppProducerLazySessionCreationTest {
expect(binding.createSmppCommand(session,
exchange)).andReturn(command);
expect(exchange.getIn()).andReturn(in);
expect(in.getHeader(CamelSmppSystemId,
String.class)).andReturn(smppclient2);
-expect(in.getHeader(CamelSmppSystemId,
String.class)).andReturn(password2);
+expect(in.getHeader(CamelSmppPassword,
String.class)).andReturn(password2);
command.execute(exchange);
replay(session, endpoint, binding, exchange, in, command);
[2/3] git commit: CAMEL-7351: Fixed potential NPE when tracing and capturing from a context scoped onException.
CAMEL-7351: Fixed potential NPE when tracing and capturing from a context
scoped onException.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/68d3f233
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/68d3f233
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/68d3f233
Branch: refs/heads/camel-2.13.x
Commit: 68d3f233b0d11d17ffc17987db1b5c18da265cd3
Parents: 35cb56a
Author: Claus Ibsen davscl...@apache.org
Authored: Thu Apr 10 09:22:21 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Thu Apr 10 09:36:17 2014 +0200
--
.../java/org/apache/camel/processor/CamelInternalProcessor.java | 2 +-
.../processor/interceptor/DefaultBacklogTracerEventMessage.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/68d3f233/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 46b2b24..7ebd726 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -519,7 +519,7 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
backlogTracer.isBodyIncludeStreams(),
backlogTracer.isBodyIncludeFiles(), backlogTracer.getBodyMaxChars());
// if first we should add a pseudo trace message as well, so
we have a starting message (eg from the route)
-String routeId = routeDefinition.getId();
+String routeId = routeDefinition != null ?
routeDefinition.getId() : null;
if (first) {
Date created =
exchange.getProperty(Exchange.CREATED_TIMESTAMP, timestamp, Date.class);
DefaultBacklogTracerEventMessage pseudo = new
DefaultBacklogTracerEventMessage(backlogTracer.incrementTraceCounter(),
created, routeId, null, exchangeId, messageAsXml);
http://git-wip-us.apache.org/repos/asf/camel/blob/68d3f233/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
index 4cb5dff..0db7283 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
@@ -91,7 +91,8 @@ public final class DefaultBacklogTracerEventMessage
implements BacklogTracerEven
sb.append(prefix).append( uid).append(uid).append(/uid\n);
String ts = new SimpleDateFormat(TIMESTAMP_FORMAT).format(timestamp);
sb.append(prefix).append(
timestamp).append(ts).append(/timestamp\n);
-sb.append(prefix).append(
routeId).append(routeId).append(/routeId\n);
+// route id is optional and we then use an empty value for no route id
+sb.append(prefix).append( routeId).append(routeId != null ?
routeId : ).append(/routeId\n);
if (toNode != null) {
sb.append(prefix).append(
toNode).append(toNode).append(/toNode\n);
} else {
[1/3] git commit: CAMEL-7351: Fixed potential NPE when tracing and capturing from a context scoped onException.
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x fae4a9694 - eb9ccf421
refs/heads/camel-2.13.x 35cb56a68 - 68d3f233b
refs/heads/master 65648d156 - 3fe8ca766
CAMEL-7351: Fixed potential NPE when tracing and capturing from a context
scoped onException.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/eb9ccf42
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eb9ccf42
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eb9ccf42
Branch: refs/heads/camel-2.12.x
Commit: eb9ccf421441fc3f875a12719f002137dd14c6b3
Parents: fae4a96
Author: Claus Ibsen davscl...@apache.org
Authored: Thu Apr 10 09:22:21 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Thu Apr 10 09:35:50 2014 +0200
--
.../java/org/apache/camel/processor/CamelInternalProcessor.java | 2 +-
.../processor/interceptor/DefaultBacklogTracerEventMessage.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/eb9ccf42/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 46b2b24..7ebd726 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -519,7 +519,7 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
backlogTracer.isBodyIncludeStreams(),
backlogTracer.isBodyIncludeFiles(), backlogTracer.getBodyMaxChars());
// if first we should add a pseudo trace message as well, so
we have a starting message (eg from the route)
-String routeId = routeDefinition.getId();
+String routeId = routeDefinition != null ?
routeDefinition.getId() : null;
if (first) {
Date created =
exchange.getProperty(Exchange.CREATED_TIMESTAMP, timestamp, Date.class);
DefaultBacklogTracerEventMessage pseudo = new
DefaultBacklogTracerEventMessage(backlogTracer.incrementTraceCounter(),
created, routeId, null, exchangeId, messageAsXml);
http://git-wip-us.apache.org/repos/asf/camel/blob/eb9ccf42/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
index 4cb5dff..0db7283 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
@@ -91,7 +91,8 @@ public final class DefaultBacklogTracerEventMessage
implements BacklogTracerEven
sb.append(prefix).append( uid).append(uid).append(/uid\n);
String ts = new SimpleDateFormat(TIMESTAMP_FORMAT).format(timestamp);
sb.append(prefix).append(
timestamp).append(ts).append(/timestamp\n);
-sb.append(prefix).append(
routeId).append(routeId).append(/routeId\n);
+// route id is optional and we then use an empty value for no route id
+sb.append(prefix).append( routeId).append(routeId != null ?
routeId : ).append(/routeId\n);
if (toNode != null) {
sb.append(prefix).append(
toNode).append(toNode).append(/toNode\n);
} else {
[3/3] git commit: CAMEL-7351: Fixed potential NPE when tracing and capturing from a context scoped onException.
CAMEL-7351: Fixed potential NPE when tracing and capturing from a context
scoped onException.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3fe8ca76
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3fe8ca76
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3fe8ca76
Branch: refs/heads/master
Commit: 3fe8ca7666406b4e5a7c32d57c6bdf147e5ca870
Parents: 65648d1
Author: Claus Ibsen davscl...@apache.org
Authored: Thu Apr 10 09:22:21 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Thu Apr 10 09:36:35 2014 +0200
--
.../java/org/apache/camel/processor/CamelInternalProcessor.java | 2 +-
.../processor/interceptor/DefaultBacklogTracerEventMessage.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/3fe8ca76/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 46b2b24..7ebd726 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -519,7 +519,7 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
backlogTracer.isBodyIncludeStreams(),
backlogTracer.isBodyIncludeFiles(), backlogTracer.getBodyMaxChars());
// if first we should add a pseudo trace message as well, so
we have a starting message (eg from the route)
-String routeId = routeDefinition.getId();
+String routeId = routeDefinition != null ?
routeDefinition.getId() : null;
if (first) {
Date created =
exchange.getProperty(Exchange.CREATED_TIMESTAMP, timestamp, Date.class);
DefaultBacklogTracerEventMessage pseudo = new
DefaultBacklogTracerEventMessage(backlogTracer.incrementTraceCounter(),
created, routeId, null, exchangeId, messageAsXml);
http://git-wip-us.apache.org/repos/asf/camel/blob/3fe8ca76/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
index 4cb5dff..0db7283 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
@@ -91,7 +91,8 @@ public final class DefaultBacklogTracerEventMessage
implements BacklogTracerEven
sb.append(prefix).append( uid).append(uid).append(/uid\n);
String ts = new SimpleDateFormat(TIMESTAMP_FORMAT).format(timestamp);
sb.append(prefix).append(
timestamp).append(ts).append(/timestamp\n);
-sb.append(prefix).append(
routeId).append(routeId).append(/routeId\n);
+// route id is optional and we then use an empty value for no route id
+sb.append(prefix).append( routeId).append(routeId != null ?
routeId : ).append(/routeId\n);
if (toNode != null) {
sb.append(prefix).append(
toNode).append(toNode).append(/toNode\n);
} else {
git commit: CAMEL-7357 support jax-rs exception mappers in camel-cxf
Repository: camel
Updated Branches:
refs/heads/master 3fe8ca766 - 165fc8231
CAMEL-7357 support jax-rs exception mappers in camel-cxf
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/165fc823
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/165fc823
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/165fc823
Branch: refs/heads/master
Commit: 165fc82316294b2376b5e88c6dceaef0fcced6ef
Parents: 3fe8ca7
Author: Willem Jiang willem.ji...@gmail.com
Authored: Thu Apr 10 17:35:40 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Thu Apr 10 17:35:40 2014 +0800
--
.../camel/component/cxf/jaxrs/CxfRsInvoker.java | 9 +--
.../cxf/jaxrs/CustomExceptionMapper.java| 33 +
.../cxf/jaxrs/CxfRsSpringConsumerTest.java | 75
.../cxf/jaxrs/testbean/CustomException.java | 27 +++
.../component/cxf/jaxrs/CxfRsSpringConsumer.xml | 45
5 files changed, 182 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/165fc823/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
index 3e2c0fd..4f617a7 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.cxf.jaxrs;
import java.lang.reflect.Method;
import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
import org.apache.camel.AsyncCallback;
import org.apache.camel.ExchangePattern;
@@ -156,12 +155,8 @@ public class CxfRsInvoker extends JAXRSInvoker {
} else {
throw (WebApplicationException)exception;
}
-} else {
-// Send the exception message back
-WebApplicationException webApplicationException = new
WebApplicationException(exception,
Response.serverError().entity(exception.toString()).build());
-throw webApplicationException;
-}
-
+}
+//CAMEL-7357 throw out other exception to make sure the
ExceptionMapper work
}
return
endpoint.getBinding().populateCxfRsResponseFromExchange(camelExchange,
cxfExchange);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/165fc823/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
--
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
new file mode 100644
index 000..475b047
--- /dev/null
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.cxf.jaxrs;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
+import org.apache.camel.component.cxf.jaxrs.testbean.CustomException;
+
+public class CustomExceptionMapper implements ExceptionMapperCustomException
{
+
+@Override
+public Response toResponse(CustomException exception) {
+Response.Status status;
+status = Response.Status.INTERNAL_SERVER_ERROR;
+return Response.status(status).header(exception,
exception.getMessage()).build();
+}
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/165fc823/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringConsumerTest.java
[1/2] git commit: CAMEL-7357 support jax-rs exception mappers in camel-cxf
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x eb9ccf421 - 94c01b98d
refs/heads/camel-2.13.x 68d3f233b - 956b2d2b6
CAMEL-7357 support jax-rs exception mappers in camel-cxf
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/956b2d2b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/956b2d2b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/956b2d2b
Branch: refs/heads/camel-2.13.x
Commit: 956b2d2b6a01b63b60b90f268bb614de14ab930e
Parents: 68d3f23
Author: Willem Jiang willem.ji...@gmail.com
Authored: Thu Apr 10 17:35:40 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Thu Apr 10 17:41:01 2014 +0800
--
.../camel/component/cxf/jaxrs/CxfRsInvoker.java | 9 +--
.../cxf/jaxrs/CustomExceptionMapper.java| 33 +
.../cxf/jaxrs/CxfRsSpringConsumerTest.java | 75
.../cxf/jaxrs/testbean/CustomException.java | 27 +++
.../component/cxf/jaxrs/CxfRsSpringConsumer.xml | 45
5 files changed, 182 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/956b2d2b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
index 3e2c0fd..4f617a7 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.cxf.jaxrs;
import java.lang.reflect.Method;
import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
import org.apache.camel.AsyncCallback;
import org.apache.camel.ExchangePattern;
@@ -156,12 +155,8 @@ public class CxfRsInvoker extends JAXRSInvoker {
} else {
throw (WebApplicationException)exception;
}
-} else {
-// Send the exception message back
-WebApplicationException webApplicationException = new
WebApplicationException(exception,
Response.serverError().entity(exception.toString()).build());
-throw webApplicationException;
-}
-
+}
+//CAMEL-7357 throw out other exception to make sure the
ExceptionMapper work
}
return
endpoint.getBinding().populateCxfRsResponseFromExchange(camelExchange,
cxfExchange);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/956b2d2b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
--
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
new file mode 100644
index 000..475b047
--- /dev/null
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.cxf.jaxrs;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
+import org.apache.camel.component.cxf.jaxrs.testbean.CustomException;
+
+public class CustomExceptionMapper implements ExceptionMapperCustomException
{
+
+@Override
+public Response toResponse(CustomException exception) {
+Response.Status status;
+status = Response.Status.INTERNAL_SERVER_ERROR;
+return Response.status(status).header(exception,
exception.getMessage()).build();
+}
+
+}
[2/2] git commit: CAMEL-7357 support jax-rs exception mappers in camel-cxf
CAMEL-7357 support jax-rs exception mappers in camel-cxf
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/94c01b98
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/94c01b98
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/94c01b98
Branch: refs/heads/camel-2.12.x
Commit: 94c01b98dfd0b4140a7ff51c47222b1f728ce45e
Parents: eb9ccf4
Author: Willem Jiang willem.ji...@gmail.com
Authored: Thu Apr 10 17:35:40 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Thu Apr 10 17:41:21 2014 +0800
--
.../camel/component/cxf/jaxrs/CxfRsInvoker.java | 9 +--
.../cxf/jaxrs/CustomExceptionMapper.java| 33 +
.../cxf/jaxrs/CxfRsSpringConsumerTest.java | 75
.../cxf/jaxrs/testbean/CustomException.java | 27 +++
.../component/cxf/jaxrs/CxfRsSpringConsumer.xml | 45
5 files changed, 182 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/94c01b98/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
index 3e2c0fd..4f617a7 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.cxf.jaxrs;
import java.lang.reflect.Method;
import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
import org.apache.camel.AsyncCallback;
import org.apache.camel.ExchangePattern;
@@ -156,12 +155,8 @@ public class CxfRsInvoker extends JAXRSInvoker {
} else {
throw (WebApplicationException)exception;
}
-} else {
-// Send the exception message back
-WebApplicationException webApplicationException = new
WebApplicationException(exception,
Response.serverError().entity(exception.toString()).build());
-throw webApplicationException;
-}
-
+}
+//CAMEL-7357 throw out other exception to make sure the
ExceptionMapper work
}
return
endpoint.getBinding().populateCxfRsResponseFromExchange(camelExchange,
cxfExchange);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/94c01b98/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
--
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
new file mode 100644
index 000..475b047
--- /dev/null
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.cxf.jaxrs;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
+import org.apache.camel.component.cxf.jaxrs.testbean.CustomException;
+
+public class CustomExceptionMapper implements ExceptionMapperCustomException
{
+
+@Override
+public Response toResponse(CustomException exception) {
+Response.Status status;
+status = Response.Status.INTERNAL_SERVER_ERROR;
+return Response.status(status).header(exception,
exception.getMessage()).build();
+}
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/94c01b98/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringConsumerTest.java
--
diff --git
git commit: upgrade test dependency to Hibernate from 4.2.9.Final to 4.2.12.Final
Repository: camel Updated Branches: refs/heads/master 165fc8231 - b3aa9d2b7 upgrade test dependency to Hibernate from 4.2.9.Final to 4.2.12.Final Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b3aa9d2b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b3aa9d2b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b3aa9d2b Branch: refs/heads/master Commit: b3aa9d2b78fecf52e7d03c3c1918b58967c63a20 Parents: 165fc82 Author: cmueller cmuel...@apache.org Authored: Thu Apr 10 19:48:00 2014 +0200 Committer: cmueller cmuel...@apache.org Committed: Thu Apr 10 19:48:00 2014 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/b3aa9d2b/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 568603e..6f8880c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -178,7 +178,7 @@ hbase-version0.94.10/hbase-version hbase-bundle-version0.94.6_1/hbase-bundle-version hibernate-validator-version5.0.3.Final/hibernate-validator-version -hibernate-version4.2.9.Final/hibernate-version +hibernate-version4.2.12.Final/hibernate-version hsqldb-version2.3.2/hsqldb-version httpunit-version1.7/httpunit-version httpcore4-version4.3.2/httpcore4-version
git commit: adding back this missing maven-javadoc-plugin-version
Repository: camel
Updated Branches:
refs/heads/master b3aa9d2b7 - 679c81e9e
adding back this missing maven-javadoc-plugin-version
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/679c81e9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/679c81e9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/679c81e9
Branch: refs/heads/master
Commit: 679c81e9ee641f43a02577137ba9aa17c98a1396
Parents: b3aa9d2
Author: cmueller cmuel...@apache.org
Authored: Thu Apr 10 19:56:50 2014 +0200
Committer: cmueller cmuel...@apache.org
Committed: Thu Apr 10 19:56:50 2014 +0200
--
parent/pom.xml | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/679c81e9/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 6f8880c..a5b87bc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -280,6 +280,7 @@
!-- maven-checkstyle-plugin 2.10 has problems to validate the license
header in properties files--
maven-checkstyle-plugin-version2.9.1/maven-checkstyle-plugin-version
maven-eclipse-plugin-version2.9/maven-eclipse-plugin-version
+maven-javadoc-plugin-version2.9.1/maven-javadoc-plugin-version
maven-jboss-as-maven-plugin-version7.4.Final/maven-jboss-as-maven-plugin-version
maven-remote-resources-plugin-version1.4/maven-remote-resources-plugin-version
maven-reporting-api-version2.2.1/maven-reporting-api-version
@@ -2669,6 +2670,7 @@
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-javadoc-plugin/artifactId
+version${maven-javadoc-plugin-version}/version
configuration
links
linkhttp://download.oracle.com/javase/6/docs/api//link
git commit: upgrade bouncycastle from 1.49 to 1.50
Repository: camel Updated Branches: refs/heads/master 679c81e9e - 3b61d108c upgrade bouncycastle from 1.49 to 1.50 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3b61d108 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3b61d108 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3b61d108 Branch: refs/heads/master Commit: 3b61d108cf18b55df7064fba6c7e93a8759b506f Parents: 679c81e Author: cmueller cmuel...@apache.org Authored: Thu Apr 10 21:40:26 2014 +0200 Committer: cmueller cmuel...@apache.org Committed: Thu Apr 10 21:40:26 2014 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/3b61d108/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index a5b87bc..19ea3a0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -66,7 +66,7 @@ bcel-bundle-version5.2_4/bcel-bundle-version beanio-version2.0.7/beanio-version bsh-version2.0b5/bsh-version -bouncycastle-version1.49/bouncycastle-version +bouncycastle-version1.50/bouncycastle-version build-helper-maven-plugin-version1.8/build-helper-maven-plugin-version c3p0-version0.9.1.2/c3p0-version castor-bundle-version1.3.2_2/castor-bundle-version
[CONF] Apache Camel Camel 2.14.0 Release
Christian Mueller edited the page: Camel 2.14.0 Release ... The below list is a best effort, and we may miss some updates, its better to use the Camel Dependencies Version Differences web tool which uses the released projects for comparison. Bouncycastle 1.49 to 1.50 Scala 2.10.3 to 2.10.4 Internal changes ... View Online Like View Changes Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
git commit: upgrade Atomikos from 3.9.2 to 3.9.3
Repository: camel Updated Branches: refs/heads/master 3b61d108c - a2da4d36c upgrade Atomikos from 3.9.2 to 3.9.3 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a2da4d36 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a2da4d36 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a2da4d36 Branch: refs/heads/master Commit: a2da4d36c29e73f85584c87d315c4662e3c602f3 Parents: 3b61d10 Author: cmueller cmuel...@apache.org Authored: Thu Apr 10 22:09:31 2014 +0200 Committer: cmueller cmuel...@apache.org Committed: Thu Apr 10 22:09:31 2014 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a2da4d36/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 19ea3a0..084b842 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -54,7 +54,7 @@ asm-version3.3.1/asm-version aspectj-version1.6.2/aspectj-version atmosphere-version2.1.0/atmosphere-version -atomikos-transactions-version3.9.2/atomikos-transactions-version +atomikos-transactions-version3.9.3/atomikos-transactions-version avalon-bundle-version4.3.1_1/avalon-bundle-version avalon-version4.3.1/avalon-version avro-version1.7.6/avro-version
[CONF] Apache Camel Camel 2.14.0 Release
Christian Mueller edited the page: Camel 2.14.0 Release ... The below list is a best effort, and we may miss some updates, its better to use the Camel Dependencies Version Differences web tool which uses the released projects for comparison. Atomikos 3.9.2 to 3.9.3 Bouncycastle 1.49 to 1.50 Scala 2.10.3 to 2.10.4 ... View Online Like View Changes Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
svn commit: r905725 - in /websites/production/camel/content: cache/main.pageCache camel-2140-release.html
Author: buildbot Date: Thu Apr 10 20:19:14 2014 New Revision: 905725 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2140-release.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2140-release.html == --- websites/production/camel/content/camel-2140-release.html (original) +++ websites/production/camel/content/camel-2140-release.html Thu Apr 10 20:19:14 2014 @@ -87,7 +87,7 @@ tr td valign=top width=100% div class=wiki-content maincontenth1 id=Camel2.14.0Release-Camel2.14.0release(currentlyinprogress)Camel 2.14.0 release (currently in progress)/h1div style=padding-right:20px;float:left;margin-left:-20px; -pspan class=image-wrap style=img src=http://camel.apache.org/download.data/camel-box-v1.0-150x200.png; style=border: 0px solid black/span/p/divdiv style=min-height:200px/divh2 id=Camel2.14.0Release-NewandNoteworthyNew and Noteworthy/h2pWelcome to the 2.14.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...)/pulliSimple language defined in routes using resultType as boolean is now evaluated as predicate instead of as expression./liliIntroduced RuntimeEndpointRegistry to capture runtime usage of endpoints in use during routing, such as dynamic endpoints from dynamic a shape=rect href=eip.htmlEIP/as./liliAdded event notification for routes added and removed./li/ulh3 id=Camel2.14.0Release-FixedIssuesFixed Issues/h3ulliTimer consumer is now scheduled after CamelContext has started all routes, to ensure other routes is running when timer routes is triggered to run./lilia s hape=rect href=netty-http.htmlNetty HTTP/a now returns HTTP status 404 if resource not found instead of 503./li/ulh3 id=Camel2.14.0Release-NewNew a shape=rect href=enterprise-integration-patterns.htmlEnterprise Integration Patterns/a/h3h3 id=Camel2.14.0Release-New.1New a shape=rect href=components.htmlComponents/a/h3ullicamel-ahc-ws/lilicamel-atmosphere-websocket/li/ulh3 id=Camel2.14.0Release-New.2New a shape=rect href=camel-maven-archetypes.htmlCamel Maven Archetypes/a/h3h3 id=Camel2.14.0Release-NewDSLNew DSL/h3h3 id=Camel2.14.0Release-NewAnnotationsNew Annotations/h3h3 id=Camel2.14.0Release-NewDataFormatsNew a shape=rect href=data-format.htmlData Formats/a/h3h3 id=Camel2.14.0Release-New.3New a shape=rect href=languages.htmlLanguages/a/h3h3 id=Camel2.14.0Release-New.4New a shape=rect href=examples.htmlExamples/a/h3h3 id=Camel2.14.0Release-New.5New a shape=rec t href=tutorials.htmlTutorials/a/h3h3 id=Camel2.14.0Release-NewToolingNew Tooling/h3h2 id=Camel2.14.0Release-APIchangesAPI changes/h2ulliChanged .../li/ulh2 id=Camel2.14.0Release-KnownIssuesKnown Issues/h2ulliSpring 4.x is not yet official supported./li/ulh2 id=Camel2.14.0Release-DependencyUpgradesDependency Upgrades/h2pYou can see any dependency changes using a shape=rect class=external-link href=http://vdiff.notsoclever.cc/; rel=nofollowCamel Dependencies Version Differences web tool/a created by Tracy Snell from the Camel a shape=rect href=team.htmlTeam/a./ppThe below list is a best effort, and we may miss some updates, its better to use the a shape=rect class=external-link href=http://vdiff.notsoclever.cc/; rel=nofollowCamel Dependencies Version Differences web tool/a which uses the released projects for comparison./pulliScala 2.10.3 to 2.10.4/li/ulh2 id=Camel2.14.0Release-Internalcha ngesInternal changes/h2ulliChanged .../li/ulh2 id=Camel2.14.0Release-ChangesthatmayaffectendusersChanges that may affect end users/h2ulliBla bla/li/ulh2 id=Camel2.14.0Release-ImportantchangestoconsiderwhenupgradingImportant changes to consider when upgrading/h2ulliBla blabr clear=nonebr clear=none/li/ulh2 id=Camel2.14.0Release-GettingtheDistributionsGetting the Distributions/h2h3 id=Camel2.14.0Release-BinaryDistributionsBinary Distributions/h3div class=table-wraptable class=confluenceTabletbodytrth colspan=1 rowspan=1 class=confluenceThpDescription/p/thth colspan=1 rowspan=1 class=confluenceThpDownload Link/p/thth colspan=1 rowspan=1 class=confluenceThpPGP Signature file of download/p/th/trtrtd colspan=1 rowspan=1 class=confluenceTdpWindows Distribution/p/tdtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link href=h ttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.14.0/apache-camel-2.14.0.zipapache-camel-2.14.0.zip/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link href=http://www.apache.org/dist/camel/apache-camel/2.14.0/apache-camel-2.14.0.zip.asc;apache-camel-2.14.0.zip.asc/a/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpUnix/Linux/Cygwin
[CONF] Apache Camel Jetty
Gregor Zurowski edited the page:
Jetty
Comment: Fix formatting issues in options table
...
Wiki Markup
{div:class=confluenceTableSmall}
|| Name || Default Value || Description ||
| {{sessionSupport}} | {{false}} | Specifies whether to enable the session manager on the server side of Jetty. |
| {{httpClient.XXX}} | {{null}} | Configuration of Jetty's [HttpClient|http://wiki.eclipse.org/Jetty/Tutorial/HttpClient]. For example, setting {{httpClient.idleTimeout=3}} sets the idle timeout to 30 seconds. And {{httpClient.timeout=3}} sets the request timeout to 30 seconds, in case you want to timeout sooner if you have long running request/response calls. |
| {{httpClient}} | {{null}} | To use a shared {{org.eclipse.jetty.client.HttpClient}} for all producers created by this endpoint. This option should only be used in special circumstances. |
| {{httpClientMinThreads}} | {{null}} | *Camel 2.11:* *Producer only*: To set a value for minimum number of threads in {{HttpClient}} thread pool. This setting override any setting configured on component level. Notice that both a min and max size must be configured. If not set it default to min 8 threads used in Jettys thread pool. |
| {{httpClientMaxThreads}} | {{null}} | *Camel 2.11:* *Producer only*: To set a value for maximum number of threads in {{HttpClient}} thread pool. This setting override any setting configured on component level. Notice that both a min and max size must be configured. If not set it default to max 254 threads used in Jettys thread pool. |
| {{httpBindingRef}} | {{null}} | Reference to an {{org.apache.camel.component.http.HttpBinding}} in the [Registry]. {{HttpBinding}} can be used to customize how a response should be written for the consumer. |
| {{jettyHttpBindingRef}} | {{null}} | *Camel 2.6.0+:* Reference to an {{org.apache.camel.component.jetty.JettyHttpBinding}} in the [Registry]. {{JettyHttpBinding}} can be used to customize how a response should be written for the producer. |
| {{matchOnUriPrefix}} | {{false}} | Whether or not the {{CamelServlet}} should try to find a target consumer by matching the URI prefix if no exact match is found. See here [How do I let Jetty match wildcards]. |
| {{handlers}} | {{null}} | Specifies a comma-delimited set of {{org.mortbay.jetty.Handler}} instances in your [Registry] (such as your Spring {{ApplicationContext}}). These handlers are added to the Jetty servlet context (for example, to add security). *Important:* You can not use different handlers with different Jetty endpoints using the same port number. The handlers is associated to the port number. If you need different handlers, then use different port numbers. |
| {{chunked}} | {{true}} | *Camel 2.2:* If this option is false Jetty servlet will disable the HTTP streaming and set the content-length header on the response |
| {{enableJmx}} | {{false}} | *Camel 2.3:* If this option is true, Jetty JMX support will be enabled for this endpoint. See [Jetty JMX support|#Jetty JMX support] for more details. |
| {{disableStreamCache}} | {{false}} | *Camel 2.3:* Determines whether or not the raw input stream from Jetty is cached or not (Camel will read the stream into a in memory/overflow to file, [Stream caching]) cache. By default Camel will cache the Jetty input stream to support reading it multiple times
git commit: upgrade commons-codec from 1.8 to 1.9
Repository: camel Updated Branches: refs/heads/master a2da4d36c - 82c7edc1d upgrade commons-codec from 1.8 to 1.9 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/82c7edc1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/82c7edc1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/82c7edc1 Branch: refs/heads/master Commit: 82c7edc1d13a1b6c4dc5ac8c5e9e409db32c6a2e Parents: a2da4d3 Author: cmueller cmuel...@apache.org Authored: Thu Apr 10 22:56:30 2014 +0200 Committer: cmueller cmuel...@apache.org Committed: Thu Apr 10 22:56:30 2014 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/82c7edc1/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 084b842..a9ff924 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -79,7 +79,7 @@ cometd-java-server-bundle-version2.3.1_2/cometd-java-server-bundle-version cometd-java-server2.3.1/cometd-java-server commons-beanutils-bundle-version1.8.3_1/commons-beanutils-bundle-version -commons-codec-version1.8/commons-codec-version +commons-codec-version1.9/commons-codec-version commons-collections-version3.2.1/commons-collections-version commons-compress-version1.5/commons-compress-version commons-configuration-version1.9/commons-configuration-version
[CONF] Apache Camel Camel 2.14.0 Release
Christian Mueller edited the page: Camel 2.14.0 Release ... Atomikos 3.9.2 to 3.9.3 Bouncycastle 1.49 to 1.50 Commons-codec 1.8 to 1.9 Scala 2.10.3 to 2.10.4 Internal changes ... View Online Like View Changes Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
git commit: upgrade bouncycastle from 1.49 to 1.50
Repository: camel Updated Branches: refs/heads/camel-2.13.x 956b2d2b6 - 574688003 upgrade bouncycastle from 1.49 to 1.50 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/57468800 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/57468800 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/57468800 Branch: refs/heads/camel-2.13.x Commit: 574688003e448111b086c1bc80783e81e937 Parents: 956b2d2 Author: cmueller cmuel...@apache.org Authored: Thu Apr 10 21:40:26 2014 +0200 Committer: cmueller cmuel...@apache.org Committed: Thu Apr 10 22:59:29 2014 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/57468800/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 1620f1b..ceffe47 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -66,7 +66,7 @@ bcel-bundle-version5.2_4/bcel-bundle-version beanio-version2.0.7/beanio-version bsh-version2.0b5/bsh-version -bouncycastle-version1.49/bouncycastle-version +bouncycastle-version1.50/bouncycastle-version build-helper-maven-plugin-version1.8/build-helper-maven-plugin-version c3p0-version0.9.1.2/c3p0-version castor-bundle-version1.3.2_2/castor-bundle-version
git commit: upgrade Atomikos from 3.9.2 to 3.9.3
Repository: camel Updated Branches: refs/heads/camel-2.13.x 574688003 - 11dc3c675 upgrade Atomikos from 3.9.2 to 3.9.3 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/11dc3c67 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/11dc3c67 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/11dc3c67 Branch: refs/heads/camel-2.13.x Commit: 11dc3c6757d036991f5a2fb2b61892d1c3efb6ce Parents: 5746880 Author: cmueller cmuel...@apache.org Authored: Thu Apr 10 23:00:56 2014 +0200 Committer: cmueller cmuel...@apache.org Committed: Thu Apr 10 23:00:56 2014 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/11dc3c67/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index ceffe47..0a21246 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -54,7 +54,7 @@ asm-bundle-version3.3.1_1/asm-bundle-version asm-version3.3.1/asm-version aspectj-version1.6.2/aspectj-version -atomikos-transactions-version3.9.2/atomikos-transactions-version +atomikos-transactions-version3.9.3/atomikos-transactions-version avalon-bundle-version4.3.1_1/avalon-bundle-version avalon-version4.3.1/avalon-version avro-version1.7.6/avro-version
git commit: upgrade bouncycastle from 1.49 to 1.50
Repository: camel Updated Branches: refs/heads/camel-2.12.x 94c01b98d - 7eec1d39b upgrade bouncycastle from 1.49 to 1.50 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7eec1d39 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7eec1d39 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7eec1d39 Branch: refs/heads/camel-2.12.x Commit: 7eec1d39be6ed98d229073cb5924f1d7763f2334 Parents: 94c01b9 Author: cmueller cmuel...@apache.org Authored: Thu Apr 10 21:40:26 2014 +0200 Committer: cmueller cmuel...@apache.org Committed: Thu Apr 10 23:02:02 2014 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/7eec1d39/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 41c1b00..2a866d5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -67,7 +67,7 @@ bcel-bundle-version5.2_4/bcel-bundle-version beanio-version2.0.7/beanio-version bsh-version2.0b5/bsh-version -bouncycastle-version1.49/bouncycastle-version +bouncycastle-version1.50/bouncycastle-version build-helper-maven-plugin-version1.8/build-helper-maven-plugin-version c3p0-version0.9.1.2/c3p0-version castor-bundle-version1.3.2_2/castor-bundle-version
svn commit: r905737 - in /websites/production/camel/content: cache/main.pageCache camel-2140-release.html jetty.html
Author: buildbot Date: Thu Apr 10 21:19:13 2014 New Revision: 905737 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2140-release.html websites/production/camel/content/jetty.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2140-release.html == --- websites/production/camel/content/camel-2140-release.html (original) +++ websites/production/camel/content/camel-2140-release.html Thu Apr 10 21:19:13 2014 @@ -87,7 +87,7 @@ tr td valign=top width=100% div class=wiki-content maincontenth1 id=Camel2.14.0Release-Camel2.14.0release(currentlyinprogress)Camel 2.14.0 release (currently in progress)/h1div style=padding-right:20px;float:left;margin-left:-20px; -pspan class=image-wrap style=img src=http://camel.apache.org/download.data/camel-box-v1.0-150x200.png; style=border: 0px solid black/span/p/divdiv style=min-height:200px/divh2 id=Camel2.14.0Release-NewandNoteworthyNew and Noteworthy/h2pWelcome to the 2.14.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...)/pulliSimple language defined in routes using resultType as boolean is now evaluated as predicate instead of as expression./liliIntroduced RuntimeEndpointRegistry to capture runtime usage of endpoints in use during routing, such as dynamic endpoints from dynamic a shape=rect href=eip.htmlEIP/as./liliAdded event notification for routes added and removed./li/ulh3 id=Camel2.14.0Release-FixedIssuesFixed Issues/h3ulliTimer consumer is now scheduled after CamelContext has started all routes, to ensure other routes is running when timer routes is triggered to run./lilia s hape=rect href=netty-http.htmlNetty HTTP/a now returns HTTP status 404 if resource not found instead of 503./li/ulh3 id=Camel2.14.0Release-NewNew a shape=rect href=enterprise-integration-patterns.htmlEnterprise Integration Patterns/a/h3h3 id=Camel2.14.0Release-New.1New a shape=rect href=components.htmlComponents/a/h3ullicamel-ahc-ws/lilicamel-atmosphere-websocket/li/ulh3 id=Camel2.14.0Release-New.2New a shape=rect href=camel-maven-archetypes.htmlCamel Maven Archetypes/a/h3h3 id=Camel2.14.0Release-NewDSLNew DSL/h3h3 id=Camel2.14.0Release-NewAnnotationsNew Annotations/h3h3 id=Camel2.14.0Release-NewDataFormatsNew a shape=rect href=data-format.htmlData Formats/a/h3h3 id=Camel2.14.0Release-New.3New a shape=rect href=languages.htmlLanguages/a/h3h3 id=Camel2.14.0Release-New.4New a shape=rect href=examples.htmlExamples/a/h3h3 id=Camel2.14.0Release-New.5New a shape=rec t href=tutorials.htmlTutorials/a/h3h3 id=Camel2.14.0Release-NewToolingNew Tooling/h3h2 id=Camel2.14.0Release-APIchangesAPI changes/h2ulliChanged .../li/ulh2 id=Camel2.14.0Release-KnownIssuesKnown Issues/h2ulliSpring 4.x is not yet official supported./li/ulh2 id=Camel2.14.0Release-DependencyUpgradesDependency Upgrades/h2pYou can see any dependency changes using a shape=rect class=external-link href=http://vdiff.notsoclever.cc/; rel=nofollowCamel Dependencies Version Differences web tool/a created by Tracy Snell from the Camel a shape=rect href=team.htmlTeam/a./ppThe below list is a best effort, and we may miss some updates, its better to use the a shape=rect class=external-link href=http://vdiff.notsoclever.cc/; rel=nofollowCamel Dependencies Version Differences web tool/a which uses the released projects for comparison./pulliAtomikos 3.9.2 to 3.9.3/liliBouncycastle 1.49 to 1.50/liliScal a 2.10.3 to 2.10.4/li/ulh2 id=Camel2.14.0Release-InternalchangesInternal changes/h2ulliChanged .../li/ulh2 id=Camel2.14.0Release-ChangesthatmayaffectendusersChanges that may affect end users/h2ulliBla bla/li/ulh2 id=Camel2.14.0Release-ImportantchangestoconsiderwhenupgradingImportant changes to consider when upgrading/h2ulliBla blabr clear=nonebr clear=none/li/ulh2 id=Camel2.14.0Release-GettingtheDistributionsGetting the Distributions/h2h3 id=Camel2.14.0Release-BinaryDistributionsBinary Distributions/h3div class=table-wraptable class=confluenceTabletbodytrth colspan=1 rowspan=1 class=confluenceThpDescription/p/thth colspan=1 rowspan=1 class=confluenceThpDownload Link/p/thth colspan=1 rowspan=1 class=confluenceThpPGP Signature file of download/p/th/trtrtd colspan=1 rowspan=1 class=confluenceTdpWindows Distribution/p/tdtd colspan=1 rowspan=1 cla ss=confluenceTdpa shape=rect class=external-link href=http://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.14.0/apache-camel-2.14.0.zip;apache-camel-2.14.0.zip/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link
