camel git commit: Related to Camel-8559. Upgrade jsonpath version from 1.2.0 to 2.0.0
Repository: camel Updated Branches: refs/heads/master d0a071dc6 - 9072fcb93 Related to Camel-8559. Upgrade jsonpath version from 1.2.0 to 2.0.0 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9072fcb9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9072fcb9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9072fcb9 Branch: refs/heads/master Commit: 9072fcb93ea00ee0644f9a9697c5cda7816622f3 Parents: d0a071d Author: ancosen anco...@gmail.com Authored: Sun Mar 29 10:55:28 2015 +0200 Committer: Willem Jiang willem.ji...@gmail.com Committed: Mon Mar 30 09:00:36 2015 +0800 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/9072fcb9/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 3be974b..99815d8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -284,7 +284,7 @@ jsonlib-version2.4/jsonlib-version json4s-bundle-version3.2.8_1/json4s-bundle-version json-asm-version1.0.2/json-asm-version -json-path-version1.2.0/json-path-version +json-path-version2.0.0/json-path-version json-smart-version2.1.1/json-smart-version jsp-api-2.1-version1.0.1/jsp-api-2.1-version jsr311-api-version1.1.1/jsr311-api-version
[2/2] camel git commit: CAMEL-8565 Polish the unit test code
CAMEL-8565 Polish the unit test code
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/88fe5dd1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/88fe5dd1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/88fe5dd1
Branch: refs/heads/master
Commit: 88fe5dd1e68bd1bdfa1527cb46a0af97304301fc
Parents: e4d64b8
Author: Willem Jiang willem.ji...@gmail.com
Authored: Mon Mar 30 09:31:40 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Mon Mar 30 09:31:40 2015 +0800
--
.../org/apache/camel/component/gson/GsonMarshalListTest.java| 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/88fe5dd1/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalListTest.java
--
diff --git
a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalListTest.java
b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalListTest.java
index 57af054..aa17ca9 100644
---
a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalListTest.java
+++
b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalListTest.java
@@ -50,9 +50,8 @@ public class GsonMarshalListTest extends CamelTestSupport {
mock.message(0).body().isInstanceOf(List.class);
mock.message(0).body().equals(inList);
-Object marshalled = template.requestBody(direct:inPojo, inList);
-String marshalledAsString =
context.getTypeConverter().convertTo(String.class, marshalled);
-assertEquals([{\name\:\Camel1\},{\name\:\Camel2\}],
marshalledAsString);
+String marshalled = template.requestBody(direct:inPojo, inList,
String.class);
+assertEquals([{\name\:\Camel1\},{\name\:\Camel2\}],
marshalled);
template.sendBody(direct:backPojo, marshalled);
[1/2] camel git commit: CAMEL-8565 Created ability to unmarshal generic types
Repository: camel
Updated Branches:
refs/heads/master 9072fcb93 - 88fe5dd1e
CAMEL-8565 Created ability to unmarshal generic types
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e4d64b8c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e4d64b8c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e4d64b8c
Branch: refs/heads/master
Commit: e4d64b8c73841940804491d9985fd5b9e128f64b
Parents: 9072fcb
Author: Andrew Block andy.bl...@gmail.com
Authored: Sat Mar 28 19:20:21 2015 -0500
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Mon Mar 30 09:20:42 2015 +0800
--
.../camel/component/gson/GsonDataFormat.java| 40 +-
.../component/gson/GsonMarshalListTest.java | 78
2 files changed, 117 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/e4d64b8c/components/camel-gson/src/main/java/org/apache/camel/component/gson/GsonDataFormat.java
--
diff --git
a/components/camel-gson/src/main/java/org/apache/camel/component/gson/GsonDataFormat.java
b/components/camel-gson/src/main/java/org/apache/camel/component/gson/GsonDataFormat.java
index fc1a0d7..f12ff71 100644
---
a/components/camel-gson/src/main/java/org/apache/camel/component/gson/GsonDataFormat.java
+++
b/components/camel-gson/src/main/java/org/apache/camel/component/gson/GsonDataFormat.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
+import java.lang.reflect.Type;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -45,6 +46,7 @@ public class GsonDataFormat extends ServiceSupport implements
DataFormat {
private Gson gson;
private Class? unmarshalType;
+private Type unmarshalGenericType;
private ListExclusionStrategy exclusionStrategies;
private LongSerializationPolicy longSerializationPolicy;
private FieldNamingPolicy fieldNamingPolicy;
@@ -92,6 +94,27 @@ public class GsonDataFormat extends ServiceSupport
implements DataFormat {
this.unmarshalType = unmarshalType;
}
+/**
+ * Use the default Gson {@link Gson} and with a custom
+ * unmarshal generic type
+ *
+ * @param unmarshalGenericType the custom unmarshal generic type
+ */
+public GsonDataFormat(Type unmarshalGenericType) {
+this(null, unmarshalGenericType);
+}
+
+/**
+ * Use a custom Gson mapper and and unmarshal token type
+ *
+ * @param gson the custom mapper
+ * @param unmarshalGenericType the custom unmarshal generic type
+ */
+public GsonDataFormat(Gson gson, Type unmarshalGenericType) {
+this.gson = gson;
+this.unmarshalGenericType = unmarshalGenericType;
+}
+
@Override
public void marshal(Exchange exchange, Object graph, OutputStream stream)
throws Exception {
BufferedWriter writer = IOHelper.buffered(new
OutputStreamWriter(stream, IOHelper.getCharsetName(exchange)));
@@ -102,7 +125,14 @@ public class GsonDataFormat extends ServiceSupport
implements DataFormat {
@Override
public Object unmarshal(Exchange exchange, InputStream stream) throws
Exception {
BufferedReader reader = IOHelper.buffered(new
InputStreamReader(stream, IOHelper.getCharsetName(exchange)));
-Object result = gson.fromJson(reader, this.unmarshalType);
+Object result = null;
+
+if (this.unmarshalGenericType != null) {
+result = gson.fromJson(reader, this.unmarshalGenericType);
+} else {
+result = gson.fromJson(reader, this.unmarshalType);
+}
+
reader.close();
return result;
}
@@ -153,6 +183,14 @@ public class GsonDataFormat extends ServiceSupport
implements DataFormat {
this.unmarshalType = unmarshalType;
}
+public Type getUnmarshalGenericType() {
+return this.unmarshalType;
+}
+
+public void setUnmarshalGenericType(Type unmarshalGenericType) {
+this.unmarshalGenericType = unmarshalGenericType;
+}
+
public ListExclusionStrategy getExclusionStrategies() {
return exclusionStrategies;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/e4d64b8c/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalListTest.java
--
diff --git
a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalListTest.java
b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalListTest.java
new file mode 100644
index 000..57af054
--- /dev/null
+++
[1/2] camel git commit: CAMEL-8566: Feature camel-cxf doesn't install all required dependencies
Repository: camel
Updated Branches:
refs/heads/master b1d482888 - 2c5d084c4
CAMEL-8566: Feature camel-cxf doesn't install all required dependencies
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fd47e97c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fd47e97c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fd47e97c
Branch: refs/heads/master
Commit: fd47e97ca9d3bafd1cd5e71c088e29307c6a9d0a
Parents: b1d4828
Author: Christian Mueller cmuel...@apache.org
Authored: Sun Mar 29 22:20:16 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Mar 29 22:20:16 2015 +0200
--
platforms/karaf/features/src/main/resources/features.xml | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/fd47e97c/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 6288517..0309ea5 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -300,6 +300,7 @@
feature version='${cxf-version-range}'cxf-http-jetty/feature
feature version='${cxf-version-range}'cxf-databinding-jaxb/feature
feature version='${cxf-version-range}'cxf-bindings-soap/feature
+feature version='${project.version}'camel-spring/feature
bundlemvn:org.apache.camel/camel-cxf-transport/${project.version}/bundle
bundlemvn:org.apache.camel/camel-cxf/${project.version}/bundle
/feature
[2/2] camel git commit: update the copyright year to 2015
update the copyright year to 2015 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2c5d084c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2c5d084c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2c5d084c Branch: refs/heads/master Commit: 2c5d084c4984cc713716665b8b30df0297212c05 Parents: fd47e97 Author: Christian Mueller cmuel...@apache.org Authored: Sun Mar 29 22:20:58 2015 +0200 Committer: Christian Mueller cmuel...@apache.org Committed: Sun Mar 29 22:20:58 2015 +0200 -- tooling/camel-manual/src/styles/docbook-fo.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/2c5d084c/tooling/camel-manual/src/styles/docbook-fo.xsl -- diff --git a/tooling/camel-manual/src/styles/docbook-fo.xsl b/tooling/camel-manual/src/styles/docbook-fo.xsl index 4458809..c40bd8c 100644 --- a/tooling/camel-manual/src/styles/docbook-fo.xsl +++ b/tooling/camel-manual/src/styles/docbook-fo.xsl @@ -70,7 +70,7 @@ fo:table-cell text-align=center fo:block font-family=Helvetica font-size=12pt padding=10mm - xsl:textCopyright copyright; 2004-2007, + xsl:textCopyright copyright; 2004-2015, Apache Software Foundation/xsl:text /fo:block !--fo:block--
camel git commit: CAMEL-8566: Feature camel-cxf doesn't install all required dependencies
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x c5363b16f - df8584354
CAMEL-8566: Feature camel-cxf doesn't install all required dependencies
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/df858435
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/df858435
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/df858435
Branch: refs/heads/camel-2.15.x
Commit: df85843544e7b1546745f6ea278cc853ec5b7e52
Parents: c5363b1
Author: Christian Mueller cmuel...@apache.org
Authored: Sun Mar 29 22:20:16 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Mar 29 22:22:29 2015 +0200
--
platforms/karaf/features/src/main/resources/features.xml | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/df858435/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index ad099ad..4d56c9e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -295,6 +295,7 @@
feature version='${cxf-version-range}'cxf-http-jetty/feature
feature version='${cxf-version-range}'cxf-databinding-jaxb/feature
feature version='${cxf-version-range}'cxf-bindings-soap/feature
+feature version='${project.version}'camel-spring/feature
bundlemvn:org.apache.camel/camel-cxf-transport/${project.version}/bundle
bundlemvn:org.apache.camel/camel-cxf/${project.version}/bundle
/feature
svn commit: r1669957 - /camel/website/template/template.camel
Author: cmueller Date: Sun Mar 29 19:45:45 2015 New Revision: 1669957 URL: http://svn.apache.org/r1669957 Log: update the year in copyright to 2015 Modified: camel/website/template/template.camel Modified: camel/website/template/template.camel URL: http://svn.apache.org/viewvc/camel/website/template/template.camel?rev=1669957r1=1669956r2=1669957view=diff == --- camel/website/template/template.camel (original) +++ camel/website/template/template.camel Sun Mar 29 19:45:45 2015 @@ -123,7 +123,7 @@ $content /div /div div class=design_attribution -copy; 2004-2014 The Apache Software Foundation. +copy; 2004-2015 The Apache Software Foundation. br Apache Camel, Camel, Apache, the Apache feather logo, and the Apache Camel project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. br
camel git commit: CAMEL-8568: Feature camel-swagger doesn't install all required dependencies
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x df8584354 - f92078e14
CAMEL-8568: Feature camel-swagger doesn't install all required dependencies
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f92078e1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f92078e1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f92078e1
Branch: refs/heads/camel-2.15.x
Commit: f92078e148d5a8f347f2a5e314b1859632f72ee2
Parents: df85843
Author: Christian Mueller cmuel...@apache.org
Authored: Sun Mar 29 23:39:29 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Mar 29 23:40:38 2015 +0200
--
platforms/karaf/features/src/main/resources/features.xml | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f92078e1/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 4d56c9e..c02f5c1 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1425,6 +1425,7 @@
feature version='${project.version}'camel-core/feature
!-- must use Scala 2.10 --
bundle
dependency='true'mvn:org.scala-lang/scala-library/${scala-2.10-version}/bundle
+bundle
dependency='true'mvn:org.scala-lang/scala-reflect/${scala-2.10-version}/bundle
bundlemvn:javax.ws.rs/jsr311-api/${jsr311-api-version}/bundle
bundle
dependency='true'mvn:com.google.guava/guava/${swagger-guava-version}/bundle
bundle
dependency='true'mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}/bundle
camel git commit: added the missing license and notice file
Repository: camel Updated Branches: refs/heads/master 2c5d084c4 - e3926e71e added the missing license and notice file Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e3926e71 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e3926e71 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e3926e71 Branch: refs/heads/master Commit: e3926e71e7b273ba1cf7954fb05649c27665606d Parents: 2c5d084 Author: Christian Mueller cmuel...@apache.org Authored: Sun Mar 29 23:17:50 2015 +0200 Committer: Christian Mueller cmuel...@apache.org Committed: Sun Mar 29 23:17:50 2015 +0200 -- .../src/main/resources/META-INF/LICENSE.txt | 203 +++ .../src/main/resources/META-INF/NOTICE.txt | 11 + 2 files changed, 214 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e3926e71/components/camel-paho/src/main/resources/META-INF/LICENSE.txt -- diff --git a/components/camel-paho/src/main/resources/META-INF/LICENSE.txt b/components/camel-paho/src/main/resources/META-INF/LICENSE.txt new file mode 100755 index 000..6b0b127 --- /dev/null +++ b/components/camel-paho/src/main/resources/META-INF/LICENSE.txt @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + License shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + Licensor shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + Legal Entity shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + control means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + You (or Your) shall mean an individual or Legal Entity + exercising permissions granted by this License. + + Source form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + Object form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + Work shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + Derivative Works shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + Contribution shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, submitted + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as Not a Contribution. + + Contributor shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of
camel git commit: CAMEL-8568: Feature camel-swagger doesn't install all required dependencies
Repository: camel
Updated Branches:
refs/heads/master e3926e71e - d0a071dc6
CAMEL-8568: Feature camel-swagger doesn't install all required dependencies
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d0a071dc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d0a071dc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d0a071dc
Branch: refs/heads/master
Commit: d0a071dc639448ba76bd22dcfc17c8385787a775
Parents: e3926e7
Author: Christian Mueller cmuel...@apache.org
Authored: Sun Mar 29 23:39:29 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Mar 29 23:39:29 2015 +0200
--
platforms/karaf/features/src/main/resources/features.xml | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d0a071dc/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 0309ea5..28531c2 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1435,6 +1435,7 @@
feature version='${project.version}'camel-core/feature
!-- must use Scala 2.10 --
bundle
dependency='true'mvn:org.scala-lang/scala-library/${scala-2.10-version}/bundle
+bundle
dependency='true'mvn:org.scala-lang/scala-reflect/${scala-2.10-version}/bundle
bundlemvn:javax.ws.rs/jsr311-api/${jsr311-api-version}/bundle
bundle
dependency='true'mvn:com.google.guava/guava/${swagger-guava-version}/bundle
bundle
dependency='true'mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}/bundle
