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:10:48 UTC
[1/2] git commit: Upgraded to Netty 3.6.6
Updated Branches:
refs/heads/camel-2.11.x 54918c88e -> 361759920
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/77d7243d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/77d7243d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/77d7243d
Branch: refs/heads/camel-2.11.x
Commit: 77d7243d4210a8314672d310ec713f61e04fd216
Parents: 54918c8
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 16:10:33 2013 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/77d7243d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1eca447..73e5a14 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>
[2/2] 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/36175992
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/36175992
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/36175992
Branch: refs/heads/camel-2.11.x
Commit: 3617599201c3b134cdfd3af63697f45fb3b2c88e
Parents: 77d7243
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:10:39 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/36175992/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/36175992/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) {