date:20130802

git commit: CAMEL-6596: upgrade maven-antrun-plugin from 1.6 to 1.7

2013-08-02 Thread cmueller

Updated Branches:
  refs/heads/master e19acac50 - ff6e194e7


CAMEL-6596: upgrade maven-antrun-plugin from 1.6 to 1.7


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

Branch: refs/heads/master
Commit: ff6e194e725d3e6ef807b20db054a0c57661f456
Parents: e19acac
Author: cmueller cmuel...@apache.org
Authored: Fri Aug 2 08:01:33 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Fri Aug 2 08:01:46 2013 +0200

--
 parent/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ff6e194e/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 55a1821..c66ea9e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -251,11 +251,12 @@
 lightcouch-version0.0.6/lightcouch-version
 lightcouch-bundle-version0.0.5_1/lightcouch-bundle-version
 !-- needed from tooling/archetypes --
-maven-antrun-plugin-version1.6/maven-antrun-plugin-version
+maven-antrun-plugin-version1.7/maven-antrun-plugin-version
 maven-archetype-plugin-version2.0/maven-archetype-plugin-version
 maven-archetype-packaging-version2.0/maven-archetype-packaging-version
 maven-assembly-plugin-version2.4/maven-assembly-plugin-version
 maven-bundle-version${maven-bundle-plugin-version}/maven-bundle-version
+!-- problems by upgrading to maven-bundle-plugin 2.4.0 --
 maven-bundle-plugin-version2.3.7/maven-bundle-plugin-version
 maven-checkstyle-plugin-version2.9.1/maven-checkstyle-plugin-version
 maven-clean-plugin-version2.5/maven-clean-plugin-version

git commit: CAMEL-6596: Downgrade antrun plugin to 1.6 as 1.7 fails on some platforms.

2013-08-02 Thread davsclaus

Updated Branches:
  refs/heads/master ff6e194e7 - 809fbab39


CAMEL-6596: Downgrade antrun plugin to 1.6 as 1.7 fails on some platforms.


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

Branch: refs/heads/master
Commit: 809fbab39e6685e501bb09683d5709f7888bc121
Parents: ff6e194
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Aug 2 10:03:07 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Aug 2 10:03:07 2013 +0200

--
 parent/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/809fbab3/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index c66ea9e..e256b0f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -251,7 +251,8 @@
 lightcouch-version0.0.6/lightcouch-version
 lightcouch-bundle-version0.0.5_1/lightcouch-bundle-version
 !-- needed from tooling/archetypes --
-maven-antrun-plugin-version1.7/maven-antrun-plugin-version
+!-- use antrun 1.6 as 1.7 fails with finding tools.jar on java on some 
platforms --
+maven-antrun-plugin-version1.6/maven-antrun-plugin-version
 maven-archetype-plugin-version2.0/maven-archetype-plugin-version
 maven-archetype-packaging-version2.0/maven-archetype-packaging-version
 maven-assembly-plugin-version2.4/maven-assembly-plugin-version

git commit: CAMEL-6597 polish the code of CamelOutputStream

2013-08-02 Thread ningjiang

Updated Branches:
  refs/heads/master 809fbab39 - f1c877a6e


CAMEL-6597 polish the code of CamelOutputStream


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

Branch: refs/heads/master
Commit: f1c877a6e1e2eb59565f982d005cc422a839f4c3
Parents: 809fbab
Author: Willem Jiang ningji...@apache.org
Authored: Fri Aug 2 16:20:45 2013 +0800
Committer: Willem Jiang ningji...@apache.org
Committed: Fri Aug 2 18:48:39 2013 +0800

--
 .../component/cxf/transport/CamelOutputStream.java| 14 --
 1 file changed, 4 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f1c877a6/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
--
diff --git 
a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
 
b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
index 6cc1bb1..b00f472 100644
--- 
a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
+++ 
b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
@@ -145,19 +145,13 @@ class CamelOutputStream extends CachedOutputStream {
 try {
 Executor ex = outMessage.getExchange().get(Executor.class);
 if (ex != null) {
-final Executor ex2 = ex;
-final Runnable origRunnable = runnable;
-runnable = new Runnable() {
-public void run() {
-outMessage.getExchange().put(Executor.class.getName() 
- + .USING_SPECIFIED, 
Boolean.TRUE);
-ex2.execute(origRunnable);
-}
-};
+outMessage.getExchange().put(Executor.class.getName() 
+ + .USING_SPECIFIED, 
Boolean.TRUE);
+ex.execute(runnable);
 } else {
 WorkQueueManager mgr = outMessage.getExchange().get(Bus.class)
 .getExtension(WorkQueueManager.class);
-AutomaticWorkQueue qu = mgr.getNamedWorkQueue(nmr-conduit);
+AutomaticWorkQueue qu = 
mgr.getNamedWorkQueue(camel-cxf-conduit);
 if (qu == null) {
 qu = mgr.getAutomaticWorkQueue();
 }

git commit: CAMEL-6597 polish the code of CamelOutputStream

2013-08-02 Thread ningjiang

Updated Branches:
  refs/heads/master f1c877a6e - 93255d688


 CAMEL-6597 polish the code of CamelOutputStream


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

Branch: refs/heads/master
Commit: 93255d688919e3438c50bcb024429ddaed6bec2b
Parents: f1c877a
Author: Willem Jiang ningji...@apache.org
Authored: Fri Aug 2 19:05:29 2013 +0800
Committer: Willem Jiang ningji...@apache.org
Committed: Fri Aug 2 19:05:29 2013 +0800

--
 .../apache/camel/component/cxf/transport/CamelOutputStream.java| 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/93255d68/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
--
diff --git 
a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
 
b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
index b00f472..cd90530 100644
--- 
a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
+++ 
b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
@@ -21,8 +21,6 @@ import java.io.OutputStream;
 import java.util.concurrent.Executor;
 import java.util.concurrent.RejectedExecutionException;
 
-import org.apache.camel.AsyncCallback;
-import org.apache.camel.AsyncProcessor;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Producer;

git commit: CAMEL-6603: extend DateTimeConverter for Long - Date conversion

2013-08-02 Thread cmueller

Updated Branches:
  refs/heads/master 93255d688 - 7b139b90b


CAMEL-6603: extend DateTimeConverter for Long - Date conversion


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

Branch: refs/heads/master
Commit: 7b139b90b6d37ccfcc6ca5441b15b977b20c294e
Parents: 93255d6
Author: David J. M. Karlsen da...@davidkarlsen.com
Authored: Fri Aug 2 11:24:43 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Fri Aug 2 19:41:42 2013 +0200

--
 .../apache/camel/converter/DateTimeConverter.java| 11 +++
 .../camel/converter/DateTimeConverterTest.java   | 15 +++
 2 files changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7b139b90/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java 
b/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java
index d06cde7..9153318 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.converter;
 
+import java.util.Date;
 import java.util.TimeZone;
 
 import org.apache.camel.Converter;
@@ -36,4 +37,14 @@ public final class DateTimeConverter {
 public static TimeZone toTimeZone(String s) {
 return TimeZone.getTimeZone(s);
 }
+
+@Converter
+public static Date toDate(Long l) {
+return l != null ? new Date(l) : null;
+}
+
+@Converter
+public static Long toLong(Date date) {
+return date != null ? date.getTime() : null;
+}
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/7b139b90/camel-core/src/test/java/org/apache/camel/converter/DateTimeConverterTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/converter/DateTimeConverterTest.java
 
b/camel-core/src/test/java/org/apache/camel/converter/DateTimeConverterTest.java
index 62d043f..8652f8e 100644
--- 
a/camel-core/src/test/java/org/apache/camel/converter/DateTimeConverterTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/converter/DateTimeConverterTest.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.converter;
 
+
+import java.util.Date;
 import java.util.TimeZone;
 
 import org.apache.camel.ContextTestSupport;
@@ -32,4 +34,17 @@ public class DateTimeConverterTest extends 
ContextTestSupport {
 assertNotNull(zone);
 assertEquals(id, zone.getID());
 }
+
+public void testLongToDate() {
+long value = 0;
+Date date = context.getTypeConverter().convertTo(Date.class, value);
+Date expected = new Date(value);
+assertEquals(expected, date);
+}
+
+public void testDateToLong() {
+Date date = new Date(0);
+long l = context.getTypeConverter().convertTo(Long.class, date);
+assertEquals(date.getTime(), l);
+}
 }

git commit: CAMEL-6603: extend DateTimeConverter for Long - Date conversion

2013-08-02 Thread cmueller

Updated Branches:
  refs/heads/camel-2.11.x c90c9dc99 - 047001556


CAMEL-6603: extend DateTimeConverter for Long - Date conversion


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

Branch: refs/heads/camel-2.11.x
Commit: 0470015564143eb986b998380e0665cde7a0e386
Parents: c90c9dc
Author: David J. M. Karlsen da...@davidkarlsen.com
Authored: Fri Aug 2 11:24:43 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Fri Aug 2 19:43:09 2013 +0200

--
 .../apache/camel/converter/DateTimeConverter.java| 11 +++
 .../camel/converter/DateTimeConverterTest.java   | 15 +++
 2 files changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/04700155/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java 
b/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java
index d06cde7..9153318 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.converter;
 
+import java.util.Date;
 import java.util.TimeZone;
 
 import org.apache.camel.Converter;
@@ -36,4 +37,14 @@ public final class DateTimeConverter {
 public static TimeZone toTimeZone(String s) {
 return TimeZone.getTimeZone(s);
 }
+
+@Converter
+public static Date toDate(Long l) {
+return l != null ? new Date(l) : null;
+}
+
+@Converter
+public static Long toLong(Date date) {
+return date != null ? date.getTime() : null;
+}
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/04700155/camel-core/src/test/java/org/apache/camel/converter/DateTimeConverterTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/converter/DateTimeConverterTest.java
 
b/camel-core/src/test/java/org/apache/camel/converter/DateTimeConverterTest.java
index 62d043f..8652f8e 100644
--- 
a/camel-core/src/test/java/org/apache/camel/converter/DateTimeConverterTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/converter/DateTimeConverterTest.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.converter;
 
+
+import java.util.Date;
 import java.util.TimeZone;
 
 import org.apache.camel.ContextTestSupport;
@@ -32,4 +34,17 @@ public class DateTimeConverterTest extends 
ContextTestSupport {
 assertNotNull(zone);
 assertEquals(id, zone.getID());
 }
+
+public void testLongToDate() {
+long value = 0;
+Date date = context.getTypeConverter().convertTo(Date.class, value);
+Date expected = new Date(value);
+assertEquals(expected, date);
+}
+
+public void testDateToLong() {
+Date date = new Date(0);
+long l = context.getTypeConverter().convertTo(Long.class, date);
+assertEquals(date.getTime(), l);
+}
 }

git commit: CAMEL-6603: extend DateTimeConverter for Long - Date conversion

2013-08-02 Thread cmueller

Updated Branches:
  refs/heads/camel-2.10.x 8bd19b449 - 024ea5cc9


CAMEL-6603: extend DateTimeConverter for Long - Date conversion


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

Branch: refs/heads/camel-2.10.x
Commit: 024ea5cc96c999340c934c0504c7e1dd7a0b90da
Parents: 8bd19b4
Author: David J. M. Karlsen da...@davidkarlsen.com
Authored: Fri Aug 2 11:24:43 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Fri Aug 2 19:43:58 2013 +0200

--
 .../apache/camel/converter/DateTimeConverter.java| 11 +++
 .../camel/converter/DateTimeConverterTest.java   | 15 +++
 2 files changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/024ea5cc/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java 
b/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java
index d06cde7..9153318 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.converter;
 
+import java.util.Date;
 import java.util.TimeZone;
 
 import org.apache.camel.Converter;
@@ -36,4 +37,14 @@ public final class DateTimeConverter {
 public static TimeZone toTimeZone(String s) {
 return TimeZone.getTimeZone(s);
 }
+
+@Converter
+public static Date toDate(Long l) {
+return l != null ? new Date(l) : null;
+}
+
+@Converter
+public static Long toLong(Date date) {
+return date != null ? date.getTime() : null;
+}
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/024ea5cc/camel-core/src/test/java/org/apache/camel/converter/DateTimeConverterTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/converter/DateTimeConverterTest.java
 
b/camel-core/src/test/java/org/apache/camel/converter/DateTimeConverterTest.java
index 62d043f..8652f8e 100644
--- 
a/camel-core/src/test/java/org/apache/camel/converter/DateTimeConverterTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/converter/DateTimeConverterTest.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.converter;
 
+
+import java.util.Date;
 import java.util.TimeZone;
 
 import org.apache.camel.ContextTestSupport;
@@ -32,4 +34,17 @@ public class DateTimeConverterTest extends 
ContextTestSupport {
 assertNotNull(zone);
 assertEquals(id, zone.getID());
 }
+
+public void testLongToDate() {
+long value = 0;
+Date date = context.getTypeConverter().convertTo(Date.class, value);
+Date expected = new Date(value);
+assertEquals(expected, date);
+}
+
+public void testDateToLong() {
+Date date = new Date(0);
+long l = context.getTypeConverter().convertTo(Long.class, date);
+assertEquals(date.getTime(), l);
+}
 }

git commit: CAMEL-6596: upgraded maven-war-plugin from 2.3 to 2.4

2013-08-02 Thread cmueller

Updated Branches:
  refs/heads/master 7b139b90b - 4e1b35666


CAMEL-6596: upgraded maven-war-plugin from 2.3 to 2.4


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

Branch: refs/heads/master
Commit: 4e1b356665aed5b702aa0454a662daf54e1917fc
Parents: 7b139b9
Author: cmueller cmuel...@apache.org
Authored: Fri Aug 2 23:36:40 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Fri Aug 2 23:37:08 2013 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4e1b3566/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index e256b0f..e07278c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -277,7 +277,7 @@
 maven-source-plugin-version2.2.1/maven-source-plugin-version
 maven-surefire-plugin-version2.15/maven-surefire-plugin-version
 
maven-surefire-report-plugin-version2.13/maven-surefire-report-plugin-version
-maven-war-plugin-version2.3/maven-war-plugin-version
+maven-war-plugin-version2.4/maven-war-plugin-version
 maven-version2.0/maven-version
 mina-bundle-version1.1.7_6/mina-bundle-version
 mina-version1.1.7/mina-version

git commit: CAMEL-6596: upgrade maven-antrun-plugin from 1.6 to 1.7

git commit: CAMEL-6596: Downgrade antrun plugin to 1.6 as 1.7 fails on some platforms.

git commit: CAMEL-6597 polish the code of CamelOutputStream

git commit: CAMEL-6597 polish the code of CamelOutputStream

git commit: CAMEL-6603: extend DateTimeConverter for Long - Date conversion

git commit: CAMEL-6603: extend DateTimeConverter for Long - Date conversion

git commit: CAMEL-6603: extend DateTimeConverter for Long - Date conversion

git commit: CAMEL-6596: upgraded maven-war-plugin from 2.3 to 2.4

8 matches

Site Navigation

Mail list logo

Footer information