You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/09/28 10:32:20 UTC
[1/5] git commit: CAMEL-7866 Fixed the CS errors
Repository: camel
Updated Branches:
refs/heads/master 4f7bda395 -> c49c7c600
CAMEL-7866 Fixed the CS errors
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/74786826
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/74786826
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/74786826
Branch: refs/heads/master
Commit: 74786826eb41d15aa7b41742da988caf37dc4922
Parents: 9ba2dc6
Author: Willem Jiang <wi...@gmail.com>
Authored: Sun Sep 28 16:23:10 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sun Sep 28 16:31:52 2014 +0800
----------------------------------------------------------------------
.../camel/dataformat/barcode/BarcodeTestBase.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/74786826/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java
----------------------------------------------------------------------
diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java
index 251dc9d..f875e8a 100644
--- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java
+++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java
@@ -16,6 +16,14 @@
*/
package org.apache.camel.dataformat.barcode;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
+
import com.google.zxing.BarcodeFormat;
import com.google.zxing.BinaryBitmap;
import com.google.zxing.MultiFormatReader;
@@ -24,13 +32,6 @@ import com.google.zxing.ReaderException;
import com.google.zxing.Result;
import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
import com.google.zxing.common.HybridBinarizer;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReader;
-import javax.imageio.stream.ImageInputStream;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
@@ -74,8 +75,7 @@ public class BarcodeTestBase extends CamelTestSupport {
private void checkFormat(File file, BarcodeFormat format) throws IOException {
Reader reader = new MultiFormatReader();
- BinaryBitmap bitmap = new BinaryBitmap((new HybridBinarizer(
- new BufferedImageLuminanceSource(ImageIO.read(file)))));
+ BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(new BufferedImageLuminanceSource(ImageIO.read(file))));
Result result;
try {
result = reader.decode(bitmap);
[4/5] git commit: CAMEL-7835 Fixed the test error of camel-quartz
Posted by ni...@apache.org.
CAMEL-7835 Fixed the test error of camel-quartz
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d0388df8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d0388df8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d0388df8
Branch: refs/heads/master
Commit: d0388df8e1f72ed18ae1d74ab5790bf3560be014
Parents: 96bc757
Author: Willem Jiang <wi...@gmail.com>
Authored: Sun Sep 28 16:21:25 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sun Sep 28 16:31:52 2014 +0800
----------------------------------------------------------------------
components/camel-quartz/pom.xml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d0388df8/components/camel-quartz/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz/pom.xml b/components/camel-quartz/pom.xml
index 396c611..3ef7968 100644
--- a/components/camel-quartz/pom.xml
+++ b/components/camel-quartz/pom.xml
@@ -42,6 +42,9 @@
*
</camel.osgi.import.pkg>
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=quartz</camel.osgi.export.service>
+ <!-- Spring 4.1.x only Compatible with Quartz 2.1.4 and higher -->
+ <!-- Here we just override the spring-version to spring 4.0.x -->
+ <spring-version>${spring40-version}</spring-version>
</properties>
<dependencies>
@@ -68,7 +71,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring40</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -76,6 +79,9 @@
<artifactId>commons-dbcp</artifactId>
<scope>test</scope>
</dependency>
+
+ <!-- Need to override the default dependency verson of Spring -->
+
<!-- for persistent test -->
<dependency>
[2/5] git commit: CAMEL-7835 Clean up the pom.xml setting of
camel-test-spring40 and camel-test-spring3
Posted by ni...@apache.org.
CAMEL-7835 Clean up the pom.xml setting of camel-test-spring40 and camel-test-spring3
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9ba2dc63
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9ba2dc63
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9ba2dc63
Branch: refs/heads/master
Commit: 9ba2dc63d0614195dfefe88a037cdbdc4ac94090
Parents: d0388df
Author: Willem Jiang <wi...@gmail.com>
Authored: Sun Sep 28 16:22:20 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sun Sep 28 16:31:52 2014 +0800
----------------------------------------------------------------------
components/camel-test-spring3/pom.xml | 34 ++---------------------------
components/camel-test-spring40/pom.xml | 34 +----------------------------
2 files changed, 3 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9ba2dc63/components/camel-test-spring3/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-spring3/pom.xml b/components/camel-test-spring3/pom.xml
index 581c7b3..9d55492 100644
--- a/components/camel-test-spring3/pom.xml
+++ b/components/camel-test-spring3/pom.xml
@@ -32,6 +32,7 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.test.spring.*</camel.osgi.export.pkg>
+ <spring-version>${spring32-version}</spring-version>
</properties>
<dependencies>
@@ -47,38 +48,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring32-version}</version>
- </dependency>
- <!-- we need to override the other spring version -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring32-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring32-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>${spring32-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring32-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>${spring32-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring32-version}</version>
+ <version>${spring-version}</version>
</dependency>
<!-- test dependencies -->
http://git-wip-us.apache.org/repos/asf/camel/blob/9ba2dc63/components/camel-test-spring40/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-spring40/pom.xml b/components/camel-test-spring40/pom.xml
index f13e99d..281878e 100644
--- a/components/camel-test-spring40/pom.xml
+++ b/components/camel-test-spring40/pom.xml
@@ -51,39 +51,7 @@
<artifactId>spring-test</artifactId>
<version>${spring40-version}</version>
</dependency>
- <!-- we need to override the other spring version -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring40-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring40-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>${spring40-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring40-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>${spring40-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring40-version}</version>
- </dependency>
-
-
+
<!-- test dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
[3/5] git commit: CAMEL-7835 Fixed camel-spring-javaconfig test error
Posted by ni...@apache.org.
CAMEL-7835 Fixed camel-spring-javaconfig test error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/96bc7570
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/96bc7570
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/96bc7570
Branch: refs/heads/master
Commit: 96bc75700ac4cae85e6d313215eef554cabfc8ea
Parents: 4f7bda3
Author: Willem Jiang <wi...@gmail.com>
Authored: Sun Sep 28 15:53:36 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sun Sep 28 16:31:52 2014 +0800
----------------------------------------------------------------------
.../javaconfig/test/JavaConfigContextLoader.java | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/96bc7570/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java b/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java
index 0e150f0..87006b2 100644
--- a/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java
+++ b/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java
@@ -126,20 +126,8 @@ public class JavaConfigContextLoader implements ContextLoader {
}
context.refresh();
-
- // Have to create a child context that implements BeanDefinitionRegistry
- // to pass to registerAnnotationConfigProcessors, since
- // JavaConfigApplicationContext does not
- final GenericApplicationContext gac = new GenericApplicationContext(context);
- AnnotationConfigUtils.registerAnnotationConfigProcessors(gac);
- // copy BeanPostProcessors to the child context
- for (String bppName : context.getBeanFactory().getBeanNamesForType(BeanPostProcessor.class)) {
- gac.registerBeanDefinition(bppName, context.getBeanFactory().getBeanDefinition(bppName));
- }
- gac.refresh();
- gac.registerShutdownHook();
-
- return gac;
+
+ return context;
}
}
[5/5] git commit: CAMEL-7858 Fixed the test error of
ModelSanityCheckerTest
Posted by ni...@apache.org.
CAMEL-7858 Fixed the test error of ModelSanityCheckerTest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c49c7c60
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c49c7c60
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c49c7c60
Branch: refs/heads/master
Commit: c49c7c600527493931cd59faf11f3bbe83cae74f
Parents: 7478682
Author: Willem Jiang <wi...@gmail.com>
Authored: Sun Sep 28 16:27:43 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sun Sep 28 16:31:53 2014 +0800
----------------------------------------------------------------------
.../org/apache/camel/model/dataformat/JsonDataFormat.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c49c7c60/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
index 4a29415..9ac6f90 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
@@ -138,6 +138,14 @@ public class JsonDataFormat extends DataFormatDefinition {
this.useList = useList;
}
+ public Boolean getEnableJaxbAnnotationModule() {
+ return enableJaxbAnnotationModule;
+ }
+
+ public void setEnableJaxbAnnotationModule(Boolean enableJaxbAnnotationModule) {
+ this.enableJaxbAnnotationModule = enableJaxbAnnotationModule;
+ }
+
@Override
protected DataFormat createDataFormat(RouteContext routeContext) {
if (library == JsonLibrary.XStream) {