git commit: CAMEL-6355: File consumer Check in progress eager as well to avoid any very slight chance for duplicate pickup
Updated Branches:
refs/heads/master 73b614da5 - bce6ea8e1
CAMEL-6355: File consumer Check in progress eager as well to avoid any very
slight chance for duplicate pickup
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bce6ea8e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bce6ea8e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bce6ea8e
Branch: refs/heads/master
Commit: bce6ea8e190df0f3fa93270d701a9c960288918c
Parents: 73b614d
Author: Claus Ibsen davscl...@apache.org
Authored: Mon May 13 09:23:16 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon May 13 09:23:16 2013 +0200
--
.../apache/camel/component/file/FileConsumer.java | 16 --
.../camel/component/file/GenericFileConsumer.java | 12 ++-
.../camel/component/file/remote/FtpConsumer.java | 12 +++---
.../camel/component/file/remote/SftpConsumer.java | 14 +++-
4 files changed, 24 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/bce6ea8e/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
b/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
index 0b312f5..3d55e70 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
@@ -83,7 +83,7 @@ public class FileConsumer extends GenericFileConsumerFile {
GenericFileFile gf = asGenericFile(endpointPath, file,
getEndpoint().getCharset());
if (file.isDirectory()) {
-if (endpoint.isRecursive() isValidFile(gf, true, files)
depth endpoint.getMaxDepth()) {
+if (endpoint.isRecursive() depth endpoint.getMaxDepth()
isValidFile(gf, true, files)) {
// recursive scan and add the sub files and folders
String subDirectory = fileName + File.separator +
file.getName();
boolean canPollMore = pollDirectory(subDirectory,
fileList, depth);
@@ -93,16 +93,10 @@ public class FileConsumer extends GenericFileConsumerFile
{
}
} else {
// Windows can report false to a file on a share so regard it
always as a file (if its not a directory)
-if (isValidFile(gf, false, files) depth =
endpoint.minDepth) {
-if (isInProgress(gf)) {
-if (log.isTraceEnabled()) {
-log.trace(Skipping as file is already in
progress: {}, gf.getFileName());
-}
-} else {
-log.trace(Adding valid file: {}, file);
-// matched file so add
-fileList.add(gf);
-}
+if (depth = endpoint.minDepth isValidFile(gf, false,
files)) {
+log.trace(Adding valid file: {}, file);
+// matched file so add
+fileList.add(gf);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/bce6ea8e/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
index 4e60e29..6cb3262 100644
---
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
+++
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
@@ -421,7 +421,17 @@ public abstract class GenericFileConsumerT extends
ScheduledBatchPollingConsum
if (!isMatched(file, isDirectory, files)) {
log.trace(File did not match. Will skip this file: {}, file);
return false;
-} else if (endpoint.isIdempotent()) {
+}
+
+// if its a file then check if its already in progress
+if (!isDirectory isInProgress(file)) {
+if (log.isTraceEnabled()) {
+log.trace(Skipping as file is already in progress: {},
file.getFileName());
+}
+return false;
+}
+
+if (endpoint.isIdempotent()) {
// use absolute file path as default key, but evaluate if an
expression key was configured
String key = file.getAbsoluteFilePath();
if (endpoint.getIdempotentKey() != null) {
svn commit: r861820 - in /websites/production/camel/content: cache/main.pageCache user-guide.html
Author: buildbot Date: Mon May 13 08:19:53 2013 New Revision: 861820 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/user-guide.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/user-guide.html == --- websites/production/camel/content/user-guide.html (original) +++ websites/production/camel/content/user-guide.html Mon May 13 08:19:53 2013 @@ -83,7 +83,7 @@ h3a shape=rect name=UserGuide-Wikipages/aWiki pages/h3 -ullia shape=rect href=getting-started.html title=Getting StartedGetting Started/a/lilia shape=rect href=book-getting-started.html title=Book Getting StartedLonger Getting Started Guide/a/lilia shape=rect href=camel-jar-dependencies.html title=Camel jar dependenciesCamel jar dependencies/a/lilia shape=rect href=spring.html title=SpringWorking with Camel and Spring/a/lilia shape=rect href=guice.html title=GuiceWorking with Camel and Guice/a/lilia shape=rect href=karaf.html title=KarafWorking with Camel and Karaf/a/lilia shape=rect href=how-do-i-configure-endpoints.html title=How do I configure endpointsHow do I configure endpoints/a/lilia shape=rect href=bean-integration.html title=Bean IntegrationBean Integration/a/lilia shape=rect href=configuring-camel.html title=Configuring CamelConfiguring Camel/a/lilia shape=rect href=configuring-route-sta rtup-ordering-and-autostartup.html title=Configuring route startup ordering and autostartupConfiguring route startup ordering and autostartup/a/lilia shape=rect href=graceful-shutdown.html title=Graceful ShutdownGraceful Shutdown/a/lilia shape=rect href=error-handling-in-camel.html title=Error handling in CamelError handling in Camel/a/lilia shape=rect href=using-propertyplaceholder.html title=Using PropertyPlaceholderHow to use Camel property placeholders/a/lilia shape=rect href=tutorials.html title=TutorialsTutorials/a/lilia shape=rect href=examples.html title=ExamplesExamples/a/lilia shape=rect href=testing.html title=TestingTesting/a/lilia shape=rect href=xml-configuration.html title=Xml ConfigurationXml Configuration/a/lilia shape=rect href=using-camelproxy.html title=Using CamelProxyUsing CamelProxy/a for how to use proxies for clients to easily invoke camel routes without them knowing/lilia shape=rect href=camel-maven-plugin.html title=Camel Maven PluginCamel Maven Plugin/a for working with a shape=rect href=spring.html title=SpringSpring/a/lilia shape=rect href=guice-maven-plugin.html title=Guice Maven PluginGuice Maven Plugin/a for working with a shape=rect href=guice.html title=GuiceGuice/a/lilia shape=rect href=camel-maven-archetypes.html title=Camel Maven ArchetypesCamel Maven Archetypes/a/lilia shape=rect href=creating-a-new-spring-based-camel-route.html title=Creating a new Spring based Camel RouteCreating a new Spring based Camel Route/a/lilia shape=rect href=camel-jmx.html title=Camel JMXCamel JMX/a/lilia shape=rect href=how-to-run-camel-in-a-osgi-container.html title=How to run Camel in a osgi containerHow to run Camel in a osgi container/a/lilia shape=rect href=using-osgi-blueprint-with-camel.html ti tle=Using OSGi blueprint with CamelUsing OSGi blueprint with Camel/a/lilia shape=rect href=visualisation.html title=VisualisationVisualisation/a for generating nice EIP diagrams based on your routes./lilia shape=rect href=web-console.html title=Web ConsoleWeb Console/a for browsing endpoints and sending messages to endpoints/lilia shape=rect href=karaf.html title=KarafKaraf/a for working with a shape=rect class=external-link href=http://karaf.apache.org/;Apache Karaf/a/li/ul +ullia shape=rect href=getting-started.html title=Getting StartedGetting Started/a/lilia shape=rect href=book-getting-started.html title=Book Getting StartedLonger Getting Started Guide/a/lilia shape=rect href=camel-jar-dependencies.html title=Camel jar dependenciesCamel jar dependencies/a/lilia shape=rect href=spring.html title=SpringWorking with Camel and Spring/a/lilia shape=rect href=guice.html title=GuiceWorking with Camel and Guice/a/lilia shape=rect href=karaf.html title=KarafWorking with Camel and Karaf/a/lilia shape=rect href=how-do-i-configure-endpoints.html title=How do I configure endpointsHow do I configure endpoints/a/lilia shape=rect href=bean-integration.html title=Bean IntegrationBean Integration/a/lilia shape=rect href=configuring-camel.html title=Configuring CamelConfiguring Camel/a/lilia shape=rect href=configuring-route-sta rtup-ordering-and-autostartup.html title=Configuring route startup ordering and autostartupConfiguring route startup ordering and autostartup/a/lilia shape=rect href=graceful-shutdown.html title=Graceful
git commit: CAMEL-6357: Routing engine avoid clearning headers if end user copied headers the wrong way. Improved SetBody EIP to check if OUT message exists when setting message.
Updated Branches:
refs/heads/master bce6ea8e1 - 4c9943510
CAMEL-6357: Routing engine avoid clearning headers if end user copied headers
the wrong way. Improved SetBody EIP to check if OUT message exists when setting
message.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4c994351
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4c994351
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4c994351
Branch: refs/heads/master
Commit: 4c9943510a46b3a8a372155680eefe6929fc3e67
Parents: bce6ea8
Author: Claus Ibsen davscl...@apache.org
Authored: Mon May 13 18:49:16 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon May 13 18:49:16 2013 +0200
--
.../src/main/java/org/apache/camel/Message.java|3 +
.../java/org/apache/camel/impl/MessageSupport.java | 18 +++-
.../apache/camel/processor/SetBodyProcessor.java | 12 ++-
.../org/apache/camel/impl/MessageSupportTest.java | 20
.../camel/issues/SetBodyTryCatchIssueTest.java | 73 +++
5 files changed, 119 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4c994351/camel-core/src/main/java/org/apache/camel/Message.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/Message.java
b/camel-core/src/main/java/org/apache/camel/Message.java
index 4018ea1..179871f 100644
--- a/camel-core/src/main/java/org/apache/camel/Message.java
+++ b/camel-core/src/main/java/org/apache/camel/Message.java
@@ -160,6 +160,9 @@ public interface Message {
/**
* Set all the headers associated with this message
+ * p/
+ * bImportant:/b If you want to copy headers from another {@link
Message} to this {@link Message}, then
+ * use ttgetHeaders().putAll(other)/tt to copy the headers, where
ttother/tt is the other headers.
*
* @param headers headers to set
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/4c994351/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
b/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
index 3dd2420..c199a15 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
@@ -135,11 +135,21 @@ public abstract class MessageSupport implements Message {
setBody(that.getBody());
setFault(that.isFault());
-if (hasHeaders()) {
-getHeaders().clear();
+// the headers may be the same instance if the end user has made some
mistake
+// and set the OUT message with the same header instance of the IN
message etc
+boolean sameHeadersInstance = false;
+if (hasHeaders() that.hasHeaders() getHeaders() ==
that.getHeaders()) {
+sameHeadersInstance = true;
}
-if (that.hasHeaders()) {
-getHeaders().putAll(that.getHeaders());
+
+if (!sameHeadersInstance) {
+if (hasHeaders()) {
+// okay its safe to clear the headers
+getHeaders().clear();
+}
+if (that.hasHeaders()) {
+getHeaders().putAll(that.getHeaders());
+}
}
if (hasAttachments()) {
http://git-wip-us.apache.org/repos/asf/camel/blob/4c994351/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
b/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
index 42ee0f5..23b3995 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
@@ -25,7 +25,7 @@ import org.apache.camel.impl.DefaultMessage;
import org.apache.camel.support.ServiceSupport;
/**
- * A processor which sets the body on the IN message with an {@link Expression}
+ * A processor which sets the body on the IN or OUT message with an {@link
Expression}
*/
public class SetBodyProcessor extends ServiceSupport implements Processor,
Traceable {
private final Expression expression;
@@ -37,13 +37,19 @@ public class SetBodyProcessor extends ServiceSupport
implements Processor, Trace
public void process(Exchange exchange) throws Exception {
Object newBody = expression.evaluate(exchange, Object.class);
-Message old = exchange.getIn();
+boolean out = exchange.hasOut();
+Message old = out
git commit: CAMEL-6357: Routing engine avoid clearning headers if end user copied headers the wrong way. Improved SetBody EIP to check if OUT message exists when setting message.
Updated Branches:
refs/heads/camel-2.11.x 5807b8a0e - 4afac18c1
CAMEL-6357: Routing engine avoid clearning headers if end user copied headers
the wrong way. Improved SetBody EIP to check if OUT message exists when setting
message.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4afac18c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4afac18c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4afac18c
Branch: refs/heads/camel-2.11.x
Commit: 4afac18c1c5a90ac6098d86680a1d6084fe0c55f
Parents: 5807b8a
Author: Claus Ibsen davscl...@apache.org
Authored: Mon May 13 18:49:16 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon May 13 18:49:49 2013 +0200
--
.../src/main/java/org/apache/camel/Message.java|3 +
.../java/org/apache/camel/impl/MessageSupport.java | 18 +++-
.../apache/camel/processor/SetBodyProcessor.java | 12 ++-
.../org/apache/camel/impl/MessageSupportTest.java | 20
.../camel/issues/SetBodyTryCatchIssueTest.java | 73 +++
5 files changed, 119 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4afac18c/camel-core/src/main/java/org/apache/camel/Message.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/Message.java
b/camel-core/src/main/java/org/apache/camel/Message.java
index 4018ea1..179871f 100644
--- a/camel-core/src/main/java/org/apache/camel/Message.java
+++ b/camel-core/src/main/java/org/apache/camel/Message.java
@@ -160,6 +160,9 @@ public interface Message {
/**
* Set all the headers associated with this message
+ * p/
+ * bImportant:/b If you want to copy headers from another {@link
Message} to this {@link Message}, then
+ * use ttgetHeaders().putAll(other)/tt to copy the headers, where
ttother/tt is the other headers.
*
* @param headers headers to set
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/4afac18c/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
b/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
index 3dd2420..c199a15 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
@@ -135,11 +135,21 @@ public abstract class MessageSupport implements Message {
setBody(that.getBody());
setFault(that.isFault());
-if (hasHeaders()) {
-getHeaders().clear();
+// the headers may be the same instance if the end user has made some
mistake
+// and set the OUT message with the same header instance of the IN
message etc
+boolean sameHeadersInstance = false;
+if (hasHeaders() that.hasHeaders() getHeaders() ==
that.getHeaders()) {
+sameHeadersInstance = true;
}
-if (that.hasHeaders()) {
-getHeaders().putAll(that.getHeaders());
+
+if (!sameHeadersInstance) {
+if (hasHeaders()) {
+// okay its safe to clear the headers
+getHeaders().clear();
+}
+if (that.hasHeaders()) {
+getHeaders().putAll(that.getHeaders());
+}
}
if (hasAttachments()) {
http://git-wip-us.apache.org/repos/asf/camel/blob/4afac18c/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
b/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
index 42ee0f5..23b3995 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
@@ -25,7 +25,7 @@ import org.apache.camel.impl.DefaultMessage;
import org.apache.camel.support.ServiceSupport;
/**
- * A processor which sets the body on the IN message with an {@link Expression}
+ * A processor which sets the body on the IN or OUT message with an {@link
Expression}
*/
public class SetBodyProcessor extends ServiceSupport implements Processor,
Traceable {
private final Expression expression;
@@ -37,13 +37,19 @@ public class SetBodyProcessor extends ServiceSupport
implements Processor, Trace
public void process(Exchange exchange) throws Exception {
Object newBody = expression.evaluate(exchange, Object.class);
-Message old = exchange.getIn();
+boolean out = exchange.hasOut();
+
git commit: upgrade Spring 3.1.4.RELEASE to 3.2.2.RELEASE
Updated Branches:
refs/heads/master 4c9943510 - 1658cce84
upgrade Spring 3.1.4.RELEASE to 3.2.2.RELEASE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1658cce8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1658cce8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1658cce8
Branch: refs/heads/master
Commit: 1658cce849532be7bed3a3c56d51f425c882cdc1
Parents: 4c99435
Author: cmueller cmuel...@apache.org
Authored: Mon May 13 19:49:34 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Mon May 13 19:49:34 2013 +0200
--
parent/pom.xml |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/1658cce8/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 322118a..37a6a6e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -348,7 +348,7 @@
spring-retry-version1.0.2.RELEASE/spring-retry-version
!-- CAMEL-5768 using spring3.1.x by default --
spring-version-range[3.1,3.3)/spring-version-range
-spring-version${spring31-version}/spring-version
+spring-version${spring32-version}/spring-version
!-- spring 3.0 support is @deprecated --
spring30-version3.0.7.RELEASE/spring30-version
spring31-version3.1.4.RELEASE/spring31-version
[CONF] Apache Camel Camel 2.12.0 Release
Camel 2.12.0 Release Page edited by Christian Mueller Changes (1) ... * Commons Httpcore 4.2.3 to 4.2.4 * Hibernate Validator 4.1.0 to 4.3.1 * Spring 3.1.4.RELEASE to 3.2.2.RELEASE * Spring Web Services 2.1.2 to 2.1.3 * TestNG 6.8 to 6.8.1 ... Full Content Camel 2.12.0 release (currently in progress) New and Noteworthy Welcome to the 2.12.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...) Endpoint Annotations along with automatically created HTML documentation for the endpoint parameters; this makes it easier for component developers to add a few refactoring-safe annotations to their Endpoint or Consumer implementations and, (along with javadoc comments on the field or setter method), get nice user documentation on how to use the endpoint for free. ComponentConfiguration API provides a handy API for tools developers to introspect on a Component to find all the possible parameters, their types and any extra annotations (like Bean Validation Annotations) to be able to create/edit endpoints or URI strings so that tools can generate nicer UIs for configuring endpoints than just letting folks edit Strings. Spring Web Services now supports setting/receiving SOAP headers more easily using a header on the Camel Message. Evaluating Groovy expressions is faster as we cache the compiled scripts. Added base64 option to Shiro Security to allow transferring security token over JMS and other transports as base64 encoded representation. Made it easier to use Shiro Security as the credentials can be provided in headers, when sending a message to a secured route. Fixed Issues Fixed setting .id in Java DSL on some EIPs such as the Validate Fixed Dead Letter Channel always handled exception, which wasn't the case if an Exception Clause was in use, which didn't had handled=true. Fixed Using PropertyPlaceholder in attributes defined on camelContext. All Camel Components will configure their consumers when being created to ensure you can configure from URIs with consumer. as prefix. Fixed QuickfixJEndpoint to adhere a given InOut MEP correctly. Fixed using property placeholders in a Simple predicate used inside a when in a Content Based Router when using Java DSL New Enterprise Integration Patterns New Components camel-netty-http - HTTP component using Netty as transport New DSL New Annotations New Data Formats New Languages New Examples New Tutorials API breaking Known Issues Dependency Upgrades Commons Httpclient 4.2.3 to 4.2.5 Commons Httpcore 4.2.3 to 4.2.4 Hibernate Validator 4.1.0 to 4.3.1 Spring 3.1.4.RELEASE to 3.2.2.RELEASE Spring Web Services 2.1.2 to 2.1.3 TestNG 6.8 to 6.8.1 Important changes to consider when upgrading The usage of the deprecated built-in CommonsHttpMessageSender has been replaced with HttpUrlConnectionMessageSender by Spring Web Services. Consider this in case either the timeout or sslContextParameters option is used through the Producer of this component. camel-scala-29 module has been removed. Getting the Distributions Binary Distributions Description Download Link PGP Signature file of download Windows Distribution apache-camel-2.12.0.zip apache-camel-2.12.0.zip.asc Unix/Linux/Cygwin Distribution apache-camel-2.12.0.tar.gz apache-camel-2.12.0.tar.gz.asc The above URLs use redirectionThe above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers). If the download doesn't seem to work for you from the above URL then try using FireFox Source Distributions Description Download Link PGP Signature file of download Source for Windows apache-camel-2.12.0-src.zip apache-camel-2.12.0-src.zip.asc Source for Unix/Linux/Cygwin apache-camel-2.12.0-src.tar.gz apache-camel-2.12.0-src.tar.gz.asc Getting the Binaries using Maven 2 To use this release in your maven project, the proper dependency configuration that you should use in your Maven POM is: dependency groupIdorg.apache.camel/groupId artifactIdcamel-core/artifactId version2.12.0/version /dependency SVN Tag Checkout svn co http://svn.apache.org/repos/asf/camel/tags/camel-2.12.0 Changelog For a more detailed view of new features and bug fixes, see the: release notes for 2.12.0 Change Notification Preferences View Online | View Changes | Add Comment
git commit: removed the deprecated Spring 3.0 support
Updated Branches:
refs/heads/master 1658cce84 - 2ff57af36
removed the deprecated Spring 3.0 support
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ff57af3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ff57af3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ff57af3
Branch: refs/heads/master
Commit: 2ff57af3649d0129a9cd45464b0afc177b0ba164
Parents: 1658cce
Author: cmueller cmuel...@apache.org
Authored: Mon May 13 20:18:20 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Mon May 13 20:18:20 2013 +0200
--
parent/pom.xml |8
1 files changed, 0 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/2ff57af3/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 37a6a6e..8d0e4b6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -349,8 +349,6 @@
!-- CAMEL-5768 using spring3.1.x by default --
spring-version-range[3.1,3.3)/spring-version-range
spring-version${spring32-version}/spring-version
-!-- spring 3.0 support is @deprecated --
-spring30-version3.0.7.RELEASE/spring30-version
spring31-version3.1.4.RELEASE/spring31-version
spring32-version3.2.2.RELEASE/spring32-version
spring-osgi-version1.2.1/spring-osgi-version
@@ -2578,12 +2576,6 @@
!-- profiles for choosing default spring version --
profile
- idspring3.0/id
- properties
-spring-version${spring30-version}/spring-version
- /properties
-/profile
-profile
idspring3.1/id
properties
spring-version${spring31-version}/spring-version
svn commit: r861874 - in /websites/production/camel/content: building.html cache/main.pageCache camel-2120-release.html
Author: buildbot Date: Mon May 13 18:18:54 2013 New Revision: 861874 Log: Production update by buildbot for camel Modified: websites/production/camel/content/building.html websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2120-release.html Modified: websites/production/camel/content/building.html == --- websites/production/camel/content/building.html (original) +++ websites/production/camel/content/building.html Mon May 13 18:18:54 2013 @@ -239,6 +239,8 @@ mvn clean install -Pspring3.1 /pre /div/div +pFrom Camel 2.11.0 onwards, Spring 3.1 is the default./p + pbNote:/b the ttcamel-test-spring/tt component requires to be built with Spring 3.1./p h3a shape=rect name=Building-BuildingwithSpring3.2/aBuilding with Spring 3.2/h3 @@ -249,6 +251,8 @@ mvn clean install -Pspring3.2 /pre /div/div +pFrom Camel 2.12.0 onwards, Spring 3.2 is the default./p + h3a shape=rect name=Building-Workingwithfeatures/aWorking with features/h3 pIf you change anything in the features.xml from ttplatform/karaf/tt you can run a validation step to ensure the generated features.xml file is correct. You can do this running the following maven goal from the ttplatform/tt directory./p div class=code panel style=border-width: 1px;div class=codeContent panelContent Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2120-release.html == --- websites/production/camel/content/camel-2120-release.html (original) +++ websites/production/camel/content/camel-2120-release.html Mon May 13 18:18:54 2013 @@ -116,7 +116,7 @@ h2a shape=rect name=Camel2.12.0Release-KnownIssues/aKnown Issues/h2 h2a shape=rect name=Camel2.12.0Release-DependencyUpgrades/aDependency Upgrades/h2 -ulliCommons Httpclient 4.2.3 to 4.2.5/liliCommons Httpcore 4.2.3 to 4.2.4/liliHibernate Validator 4.1.0 to 4.3.1/liliSpring Web Services 2.1.2 to 2.1.3/liliTestNG 6.8 to 6.8.1/li/ul +ulliCommons Httpclient 4.2.3 to 4.2.5/liliCommons Httpcore 4.2.3 to 4.2.4/liliHibernate Validator 4.1.0 to 4.3.1/liliSpring 3.1.4.RELEASE to 3.2.2.RELEASE/liliSpring Web Services 2.1.2 to 2.1.3/liliTestNG 6.8 to 6.8.1/li/ul h2a shape=rect name=Camel2.12.0Release-Importantchangestoconsiderwhenupgrading/aImportant changes to consider when upgrading/h2
git commit: upgrade JRuby 1.7.2 to 1.7.3
Updated Branches: refs/heads/master 2ff57af36 - 0f3c51e04 upgrade JRuby 1.7.2 to 1.7.3 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0f3c51e0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0f3c51e0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0f3c51e0 Branch: refs/heads/master Commit: 0f3c51e04a0c0d89891ecb9e195ca17cc6f22676 Parents: 2ff57af Author: cmueller cmuel...@apache.org Authored: Mon May 13 21:13:33 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Mon May 13 21:13:33 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/0f3c51e0/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 8d0e4b6..598c88f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -218,7 +218,7 @@ jodatime2-bundle-version2.1/jodatime2-bundle-version josql-bundle-version1.5_5/josql-bundle-version josql-version1.5/josql-version -jruby-version1.7.2/jruby-version +jruby-version1.7.3/jruby-version jsendnsca-version1.3.1/jsendnsca-version jsmpp-version2.1.0_4/jsmpp-version jsch-bundle-version0.1.49_1/jsch-bundle-version
git commit: upgrade OpenJPA 2.2.1 to 2.2.2
Updated Branches: refs/heads/master 0f3c51e04 - d929748f0 upgrade OpenJPA 2.2.1 to 2.2.2 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d929748f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d929748f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d929748f Branch: refs/heads/master Commit: d929748f0a314d992182e9cf1308d82138c312c4 Parents: 0f3c51e Author: cmueller cmuel...@apache.org Authored: Mon May 13 21:20:44 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Mon May 13 21:20:44 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/d929748f/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 598c88f..eee6ec9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -289,7 +289,7 @@ openwebbeans-version1.1.5/openwebbeans-version ognl-version3.0.6_1/ognl-version openejb-version4.5.1/openejb-version -openjpa-version2.2.1/openjpa-version +openjpa-version2.2.2/openjpa-version opensaml-version2.5.1_2/opensaml-version oro-bundle-version2.0.8_6/oro-bundle-version oscache-bundle-version2.4_5/oscache-bundle-version
git commit: upgrade OpenJPA 2.2.1 to 2.2.2
Updated Branches: refs/heads/camel-2.11.x 4afac18c1 - 43f42f6b6 upgrade OpenJPA 2.2.1 to 2.2.2 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/43f42f6b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/43f42f6b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/43f42f6b Branch: refs/heads/camel-2.11.x Commit: 43f42f6b65df909db1d08fea069d9ace0b9a6137 Parents: 4afac18 Author: cmueller cmuel...@apache.org Authored: Mon May 13 21:20:44 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Mon May 13 21:25:40 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/43f42f6b/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 4bc3acb..ca24390 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -288,7 +288,7 @@ openwebbeans-version1.1.5/openwebbeans-version ognl-version3.0.6_1/ognl-version openejb-version4.5.1/openejb-version -openjpa-version2.2.1/openjpa-version +openjpa-version2.2.2/openjpa-version opensaml-version2.5.1_2/opensaml-version oro-bundle-version2.0.8_6/oro-bundle-version oscache-bundle-version2.4_5/oscache-bundle-version
git commit: upgrade JRuby 1.7.2 to 1.7.3
Updated Branches: refs/heads/camel-2.11.x 43f42f6b6 - 75b901eb1 upgrade JRuby 1.7.2 to 1.7.3 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/75b901eb Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/75b901eb Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/75b901eb Branch: refs/heads/camel-2.11.x Commit: 75b901eb1c66f522245161facec00e2407a480d2 Parents: 43f42f6 Author: cmueller cmuel...@apache.org Authored: Mon May 13 21:13:33 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Mon May 13 21:30:46 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/75b901eb/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index ca24390..bb7765b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -217,7 +217,7 @@ jodatime2-bundle-version2.1/jodatime2-bundle-version josql-bundle-version1.5_5/josql-bundle-version josql-version1.5/josql-version -jruby-version1.7.2/jruby-version +jruby-version1.7.3/jruby-version jsendnsca-version1.3.1/jsendnsca-version jsmpp-version2.1.0_4/jsmpp-version jsch-bundle-version0.1.49_1/jsch-bundle-version
git commit: upgrade JRuby 1.7.2 to 1.7.3
Updated Branches: refs/heads/camel-2.10.x 4fe2323d1 - 2ca4c02fb upgrade JRuby 1.7.2 to 1.7.3 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ca4c02f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ca4c02f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ca4c02f Branch: refs/heads/camel-2.10.x Commit: 2ca4c02fbf3785f506e730af49a34ff703d3da47 Parents: 4fe2323 Author: cmueller cmuel...@apache.org Authored: Mon May 13 21:13:33 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Mon May 13 21:34:28 2013 +0200 -- parent/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/2ca4c02f/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index cf5f362..eec5199 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -130,7 +130,7 @@ jettison-version1.3.3/jettison-version jexcelapi-version2.4.2/jexcelapi-version jibx-version1.2.4.5/jibx-version -jruby-version1.7.2/jruby-version +jruby-version1.7.3/jruby-version jsmpp-version2.1.0_4/jsmpp-version jsch-version0.1.48/jsch-version jsonlib-version2.4/jsonlib-version
git commit: upgrade OpenJPA 2.2.0 to 2.2.2
Updated Branches: refs/heads/camel-2.10.x 2ca4c02fb - a85b70861 upgrade OpenJPA 2.2.0 to 2.2.2 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a85b7086 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a85b7086 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a85b7086 Branch: refs/heads/camel-2.10.x Commit: a85b70861acbd437f2c222e0374614fb2336f80b Parents: 2ca4c02 Author: cmueller cmuel...@apache.org Authored: Mon May 13 21:40:46 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Mon May 13 21:40:46 2013 +0200 -- pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a85b7086/pom.xml -- diff --git a/pom.xml b/pom.xml index 15a2eb1..f4369a0 100755 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ jaxb-version2.1.13/jaxb-version maven-bundle-version2.3.7/maven-bundle-version -openjpa-version2.2.0/openjpa-version +openjpa-version2.2.2/openjpa-version /properties mailingLists
svn commit: r861890 - in /websites/production/camel/content: cache/main.pageCache camel-2120-release.html
Author: buildbot Date: Mon May 13 20:18:47 2013 New Revision: 861890 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2120-release.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2120-release.html == --- websites/production/camel/content/camel-2120-release.html (original) +++ websites/production/camel/content/camel-2120-release.html Mon May 13 20:18:47 2013 @@ -116,7 +116,7 @@ h2a shape=rect name=Camel2.12.0Release-KnownIssues/aKnown Issues/h2 h2a shape=rect name=Camel2.12.0Release-DependencyUpgrades/aDependency Upgrades/h2 -ulliCommons Httpclient 4.2.3 to 4.2.5/liliCommons Httpcore 4.2.3 to 4.2.4/liliHibernate Validator 4.1.0 to 4.3.1/liliSpring 3.1.4.RELEASE to 3.2.2.RELEASE/liliSpring Web Services 2.1.2 to 2.1.3/liliTestNG 6.8 to 6.8.1/li/ul +ulliCommons Httpclient 4.2.3 to 4.2.5/liliCommons Httpcore 4.2.3 to 4.2.4/liliHibernate Validator 4.1.0 to 4.3.1/liliJRuby 1.7.2 to 1.7.3/liliOpenJPA 2.2.1 to 2.2.2/liliSpring 3.1.4.RELEASE to 3.2.2.RELEASE/liliSpring Web Services 2.1.2 to 2.1.3/liliTestNG 6.8 to 6.8.1/li/ul h2a shape=rect name=Camel2.12.0Release-Importantchangestoconsiderwhenupgrading/aImportant changes to consider when upgrading/h2
git commit: fixed the Netty type converter encoding issue which results in NettyHttpEndpointUriEncodingIssueTest.testEndpointUriWithDanishCharEncodingIssue to fail
Updated Branches:
refs/heads/master d929748f0 - dbd0ce546
fixed the Netty type converter encoding issue which results in
NettyHttpEndpointUriEncodingIssueTest.testEndpointUriWithDanishCharEncodingIssue
to fail
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dbd0ce54
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dbd0ce54
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dbd0ce54
Branch: refs/heads/master
Commit: dbd0ce546972e17efde3e451ec3ca62eade73708
Parents: d929748
Author: cmueller cmuel...@apache.org
Authored: Mon May 13 23:35:40 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Mon May 13 23:35:40 2013 +0200
--
.../camel/component/netty/NettyConverter.java |5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/dbd0ce54/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConverter.java
--
diff --git
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConverter.java
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConverter.java
index 73a2e12..0638138 100644
---
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConverter.java
+++
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConverter.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
+import java.io.UnsupportedEncodingException;
import org.apache.camel.Converter;
import org.apache.camel.Exchange;
@@ -45,13 +46,13 @@ public final class NettyConverter {
}
@Converter
-public static String toString(ChannelBuffer buffer, Exchange exchange) {
+public static String toString(ChannelBuffer buffer, Exchange exchange)
throws UnsupportedEncodingException {
byte[] bytes = toByteArray(buffer);
// use type converter as it can handle encoding set on the Exchange
if (exchange != null) {
return
exchange.getContext().getTypeConverter().convertTo(String.class, exchange,
bytes);
}
-return new String(bytes);
+return new String(bytes, UTF-8);
}
@Converter
