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 2013/05/17 16:09:51 UTC

[1/3] git commit: CAMEL-6318: File/ftp consumer should only check idempotent repo for files, and not directories.

Updated Branches:
  refs/heads/master 63080ac78 -> b3fb66fac


CAMEL-6318: File/ftp consumer should only check idempotent repo for files, and not directories.


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

Branch: refs/heads/master
Commit: 4d4b983d70afc25d0af792c35abfbdf745ae9b75
Parents: 63080ac
Author: Claus Ibsen <da...@apache.org>
Authored: Fri May 17 15:57:58 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri May 17 15:57:58 2013 +0200

----------------------------------------------------------------------
 .../camel/component/file/GenericFileConsumer.java  |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/4d4b983d/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 6cb3262..301262f 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
@@ -431,7 +431,8 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
             return false;
         }
 
-        if (endpoint.isIdempotent()) {
+        // if its a file then check we have the file in the idempotent registry already
+        if (!isDirectory && 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) {


[3/3] git commit: CAMEL-6290: osgi example is not verbose by default.

Posted by da...@apache.org.
CAMEL-6290: osgi example is not verbose by default.


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

Branch: refs/heads/master
Commit: b3fb66facc1b9ab9a0b2dd9d38837d5ff9fbc10c
Parents: 6cb6ad4
Author: Claus Ibsen <da...@apache.org>
Authored: Fri May 17 16:05:58 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri May 17 16:05:58 2013 +0200

----------------------------------------------------------------------
 examples/camel-example-osgi/README.txt             |    9 +++++++++
 .../org/apache/camel/example/osgi/MyTransform.java |    2 +-
 2 files changed, 10 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b3fb66fa/examples/camel-example-osgi/README.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-osgi/README.txt b/examples/camel-example-osgi/README.txt
index f77e0c1..18d9cb3 100644
--- a/examples/camel-example-osgi/README.txt
+++ b/examples/camel-example-osgi/README.txt
@@ -14,6 +14,15 @@ To run the example using Maven type
 
 To stop the example hit ctrl + c
 
+The example outputs to the log, which you can see using
+
+  log:display
+
+... or you can tail the log with
+
+  log:tail
+
+And use ctrl+c to break the tail.
 
 
 Running inside OSGi container

http://git-wip-us.apache.org/repos/asf/camel/blob/b3fb66fa/examples/camel-example-osgi/src/main/java/org/apache/camel/example/osgi/MyTransform.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-osgi/src/main/java/org/apache/camel/example/osgi/MyTransform.java b/examples/camel-example-osgi/src/main/java/org/apache/camel/example/osgi/MyTransform.java
index b797101..be27dec 100644
--- a/examples/camel-example-osgi/src/main/java/org/apache/camel/example/osgi/MyTransform.java
+++ b/examples/camel-example-osgi/src/main/java/org/apache/camel/example/osgi/MyTransform.java
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
  */
 public class MyTransform  {
     private static final transient Logger LOG = LoggerFactory.getLogger(MyTransform.class);
-    private boolean verbose = true;
+    private boolean verbose;
     private String prefix = "MyTransform";
 
     public Object transform(Object body) {


[2/3] git commit: Upgraded to Netty 3.6.6

Posted by da...@apache.org.
Upgraded to Netty 3.6.6


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

Branch: refs/heads/master
Commit: 6cb6ad46ee6196975be6f099eb1b98c6c6b39208
Parents: 4d4b983
Author: Claus Ibsen <da...@apache.org>
Authored: Fri May 17 15:59:34 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri May 17 15:59:34 2013 +0200

----------------------------------------------------------------------
 parent/pom.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/6cb6ad46/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 23aa0a0..abcc936 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -282,7 +282,7 @@
     <mvel-version>2.1.3.Final</mvel-version>
     <mybatis-version>3.2.2</mybatis-version>
     <neethi-bundle-version>3.0.1</neethi-bundle-version>
-    <netty-version>3.6.5.Final</netty-version>
+    <netty-version>3.6.6.Final</netty-version>
     <ode-version>1.3.4</ode-version>
     <!-- should be in-sync with deltaspike -->
     <openwebbeans-version>1.1.5</openwebbeans-version>