You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/08/10 09:39:02 UTC
[1/5] camel git commit: Commented line deleted
Repository: camel
Updated Branches:
refs/heads/master b46405508 -> 7d8a68be4
Commented line deleted
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c8519906
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c8519906
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c8519906
Branch: refs/heads/master
Commit: c8519906383accef888e442497470c505f6ca40d
Parents: 128d96b
Author: oalles <oa...@gmail.com>
Authored: Sun Aug 9 14:10:08 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Aug 10 09:41:18 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/mongodb/MongoDbEndpoint.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c8519906/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
index fd00379..1151866 100644
--- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
+++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
@@ -282,7 +282,6 @@ public class MongoDbEndpoint extends DefaultEndpoint {
}
public Exchange createMongoDbExchange(DBObject dbObj) {
-// Exchange exchange = new DefaultExchange(this.getCamelContext(), getExchangePattern());
Exchange exchange = super.createExchange();
Message message = new DefaultMessage();
message.setHeader(MongoDbConstants.DATABASE, database);
[3/5] camel git commit: Upgrade hibernate
Posted by da...@apache.org.
Upgrade hibernate
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cc7909c8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cc7909c8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cc7909c8
Branch: refs/heads/master
Commit: cc7909c89e1468fcd5e0798acc5ca7db2f13ae31
Parents: c851990
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Aug 10 09:22:43 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Aug 10 09:41:19 2015 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cc7909c8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 37f68ca..48e438b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -213,7 +213,7 @@
<hbase-bundle-version>0.98.5-hadoop2_2</hbase-bundle-version>
<hibernate-validator-version>5.2.1.Final</hibernate-validator-version>
<!-- Spring 3.2.x and 4.0.x still stick to JPA 2.0. Hibernate 4.3.x upgraded to JPA 2.1. -->
- <hibernate-version>4.2.16.Final</hibernate-version>
+ <hibernate-version>4.2.20.Final</hibernate-version>
<hk2-version>2.3.0</hk2-version>
<hk2-osgi-resource-version>1.0.1</hk2-osgi-resource-version>
<hsqldb-version>2.3.3</hsqldb-version>
[5/5] camel git commit: Fixes #591. Polished
Posted by da...@apache.org.
Fixes #591. Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7d8a68be
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7d8a68be
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7d8a68be
Branch: refs/heads/master
Commit: 7d8a68be454f255b004007542dea0d869c4b6da1
Parents: 86fc16b
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Aug 10 09:42:31 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Aug 10 09:42:54 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/mongodb/MongoDbEndpoint.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7d8a68be/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
index 1151866..b3980d7 100644
--- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
+++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
@@ -283,12 +283,11 @@ public class MongoDbEndpoint extends DefaultEndpoint {
public Exchange createMongoDbExchange(DBObject dbObj) {
Exchange exchange = super.createExchange();
- Message message = new DefaultMessage();
+ Message message = exchange.getIn();
message.setHeader(MongoDbConstants.DATABASE, database);
message.setHeader(MongoDbConstants.COLLECTION, collection);
message.setHeader(MongoDbConstants.FROM_TAILABLE, true);
message.setBody(dbObj);
- exchange.setIn(message);
return exchange;
}
[2/5] camel git commit: createMongoDbExchange should call its parent
createExchange, so the proper exchange constructors are called.
Posted by da...@apache.org.
createMongoDbExchange should call its parent createExchange, so the
proper exchange constructors are called.
https://issues.apache.org/jira/browse/CAMEL-9065
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/128d96ba
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/128d96ba
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/128d96ba
Branch: refs/heads/master
Commit: 128d96ba3de08a1d5c35ee9140aa2f23a8151657
Parents: b464055
Author: oalles <oa...@gmail.com>
Authored: Sun Aug 9 14:02:36 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Aug 10 09:41:18 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/mongodb/MongoDbEndpoint.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/128d96ba/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
index dc6ccb8..fd00379 100644
--- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
+++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
@@ -282,7 +282,8 @@ public class MongoDbEndpoint extends DefaultEndpoint {
}
public Exchange createMongoDbExchange(DBObject dbObj) {
- Exchange exchange = new DefaultExchange(this.getCamelContext(), getExchangePattern());
+// Exchange exchange = new DefaultExchange(this.getCamelContext(), getExchangePattern());
+ Exchange exchange = super.createExchange();
Message message = new DefaultMessage();
message.setHeader(MongoDbConstants.DATABASE, database);
message.setHeader(MongoDbConstants.COLLECTION, collection);
[4/5] camel git commit: Polished
Posted by da...@apache.org.
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/86fc16b9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/86fc16b9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/86fc16b9
Branch: refs/heads/master
Commit: 86fc16b9904227a0cdc56551e7ac9185e548ba68
Parents: cc7909c
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Aug 10 09:40:48 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Aug 10 09:41:19 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/file/GenericFileEndpoint.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/86fc16b9/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
index 57cce2c..18919ac 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
@@ -417,6 +417,10 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
/**
* Is used to include files, if filename matches the regex pattern.
+ * <p/>
+ * Notice if you use symbols such as plus sign and others you would need to configure
+ * this using the RAW() syntax if configuring this as an endpoint uri.
+ * See more details at <a href="http://camel.apache.org/how-do-i-configure-endpoints.html">configuring endpoint uris</a>
*/
public void setInclude(String include) {
this.include = include;
@@ -428,6 +432,10 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
/**
* Is used to exclude files, if filename matches the regex pattern.
+ * <p/>
+ * Notice if you use symbols such as plus sign and others you would need to configure
+ * this using the RAW() syntax if configuring this as an endpoint uri.
+ * See more details at <a href="http://camel.apache.org/how-do-i-configure-endpoints.html">configuring endpoint uris</a>
*/
public void setExclude(String exclude) {
this.exclude = exclude;