Author: davsclaus
Date: Sat Jan 28 11:50:03 2012
New Revision: 1237049
URL: http://svn.apache.org/viewvc?rev=1237049&view=rev
Log:
CAMEL-4944: New camel-gson data format. Thanks to Denis Bardadym for
contributioon
Added:
camel/trunk/components/camel-gson/ (with props)
camel/trunk/components/camel-gson/pom.xml (with props)
camel/trunk/components/camel-gson/src/
camel/trunk/components/camel-gson/src/main/
camel/trunk/components/camel-gson/src/main/java/
camel/trunk/components/camel-gson/src/main/java/org/
camel/trunk/components/camel-gson/src/main/java/org/apache/
camel/trunk/components/camel-gson/src/main/java/org/apache/camel/
camel/trunk/components/camel-gson/src/main/java/org/apache/camel/component/
camel/trunk/components/camel-gson/src/main/java/org/apache/camel/component/gson/
camel/trunk/components/camel-gson/src/main/java/org/apache/camel/component/gson/GsonDataFormat.java
(with props)
camel/trunk/components/camel-gson/src/main/resources/
camel/trunk/components/camel-gson/src/main/resources/META-INF/
camel/trunk/components/camel-gson/src/main/resources/META-INF/LICENSE.txt
(with props)
camel/trunk/components/camel-gson/src/main/resources/META-INF/NOTICE.txt
(with props)
camel/trunk/components/camel-gson/src/main/resources/META-INF/services/
camel/trunk/components/camel-gson/src/main/resources/META-INF/services/org/
camel/trunk/components/camel-gson/src/main/resources/META-INF/services/org/apache/
camel/trunk/components/camel-gson/src/main/resources/META-INF/services/org/apache/camel/
camel/trunk/components/camel-gson/src/main/resources/META-INF/services/org/apache/camel/dataformat/
camel/trunk/components/camel-gson/src/main/resources/META-INF/services/org/apache/camel/dataformat/json-gson
camel/trunk/components/camel-gson/src/test/
camel/trunk/components/camel-gson/src/test/java/
camel/trunk/components/camel-gson/src/test/java/org/
camel/trunk/components/camel-gson/src/test/java/org/apache/
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonConcurrentTest.java
(with props)
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonJsonDataFormatTest.java
(with props)
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java
(with props)
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java
(with props)
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/TestPojo.java
(with props)
camel/trunk/components/camel-gson/src/test/resources/
camel/trunk/components/camel-gson/src/test/resources/log4j.properties
(with props)
camel/trunk/components/camel-gson/src/test/resources/org/
camel/trunk/components/camel-gson/src/test/resources/org/apache/
camel/trunk/components/camel-gson/src/test/resources/org/apache/camel/
camel/trunk/components/camel-gson/src/test/resources/org/apache/camel/component/
camel/trunk/components/camel-gson/src/test/resources/org/apache/camel/component/gson/
camel/trunk/components/camel-gson/src/test/resources/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.xml
(with props)
Modified:
camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
camel/trunk/components/pom.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=1237049&r1=1237048&r2=1237049&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Sat Jan 28
11:50:03 2012
@@ -64,6 +64,7 @@
<include>org.apache.camel:camel-gae</include>
<include>org.apache.camel:camel-groovy</include>
<include>org.apache.camel:camel-guice</include>
+ <include>org.apache.camel:camel-gson</include>
<include>org.apache.camel:camel-hl7</include>
<include>org.apache.camel:camel-hawtdb</include>
<include>org.apache.camel:camel-hazelcast</include>
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java?rev=1237049&r1=1237048&r2=1237049&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
Sat Jan 28 11:50:03 2012
@@ -87,8 +87,10 @@ public class JsonDataFormat extends Data
protected DataFormat createDataFormat(RouteContext routeContext) {
if (library == JsonLibrary.XStream) {
setProperty(this, "dataFormatName", "json-xstream");
- } else {
+ } else if(library == JsonLibrary.Jackson){
setProperty(this, "dataFormatName", "json-jackson");
+ } else {
+ setProperty(this, "dataFormatName", "json-gson");
}
if (unmarshalType == null && unmarshalTypeName != null) {
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java?rev=1237049&r1=1237048&r2=1237049&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
Sat Jan 28 11:50:03 2012
@@ -28,6 +28,6 @@ import javax.xml.bind.annotation.XmlType
@XmlEnum(String.class)
public enum JsonLibrary {
- XStream, Jackson
+ XStream, Jackson, Gson
}
Propchange: camel/trunk/components/camel-gson/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jan 28 11:50:03 2012
@@ -0,0 +1,17 @@
+.pmd
+.checkstyle
+.ruleset
+target
+.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
+*.idea
Added: camel/trunk/components/camel-gson/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gson/pom.xml?rev=1237049&view=auto
==============================================================================
--- camel/trunk/components/camel-gson/pom.xml (added)
+++ camel/trunk/components/camel-gson/pom.xml Sat Jan 28 11:50:03 2012
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>2.10-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <artifactId>camel-gson</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Gson</name>
+ <description>Camel Gson support</description>
+
+ <properties>
+
<camel.osgi.export.pkg>org.apache.camel.component.gson.*</camel.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson-version}</version>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: camel/trunk/components/camel-gson/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-gson/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-gson/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
camel/trunk/components/camel-gson/src/main/java/org/apache/camel/component/gson/GsonDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gson/src/main/java/org/apache/camel/component/gson/GsonDataFormat.java?rev=1237049&view=auto
==============================================================================
---
camel/trunk/components/camel-gson/src/main/java/org/apache/camel/component/gson/GsonDataFormat.java
(added)
+++
camel/trunk/components/camel-gson/src/main/java/org/apache/camel/component/gson/GsonDataFormat.java
Sat Jan 28 11:50:03 2012
@@ -0,0 +1,96 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.gson;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.Map;
+
+import com.google.gson.Gson;
+import org.apache.camel.Exchange;
+import org.apache.camel.spi.DataFormat;
+
+/**
+ * A <a href="http://camel.apache.org/data-format.html";>data format</a>
({@link DataFormat})
+ * using <a href="http://code.google.com/p/google-gson/";>Gson</a> to marshal
to and from JSON.
+ */
+public class GsonDataFormat implements DataFormat {
+
+ private final Gson gson;
+ private Class<?> unmarshalType;
+
+ public GsonDataFormat() {
+ this(Map.class);
+ }
+
+ /**
+ * Use the default Gson {@link Gson} and with a custom
+ * unmarshal type
+ *
+ * @param unmarshalType the custom unmarshal type
+ */
+ public GsonDataFormat(Class<?> unmarshalType) {
+ this(new Gson(), unmarshalType);
+ }
+
+ /**
+ * Use a custom Gson mapper and and unmarshal type
+ *
+ * @param gson the custom mapper
+ * @param unmarshalType the custom unmarshal type
+ */
+ public GsonDataFormat(Gson gson, Class<?> unmarshalType) {
+ this.gson = gson;
+ this.unmarshalType = unmarshalType;
+ }
+
+ @Override
+ public void marshal(Exchange exchange, Object graph, OutputStream stream)
throws Exception {
+ Writer writer = new BufferedWriter(new OutputStreamWriter(stream));
+ gson.toJson(graph, writer);
+ writer.close();
+ }
+
+ @Override
+ public Object unmarshal(Exchange exchange, InputStream stream) throws
Exception {
+ BufferedReader reader = new BufferedReader(new
InputStreamReader(stream));
+ Object result = gson.fromJson(reader, this.unmarshalType);
+ reader.close();
+ return result;
+ }
+
+ // Properties
+ //
-------------------------------------------------------------------------
+
+ public Class<?> getUnmarshalType() {
+ return this.unmarshalType;
+ }
+
+ public void setUnmarshalType(Class<?> unmarshalType) {
+ this.unmarshalType = unmarshalType;
+ }
+
+ public Gson getGson() {
+ return this.gson;
+ }
+
+}
Propchange:
camel/trunk/components/camel-gson/src/main/java/org/apache/camel/component/gson/GsonDataFormat.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-gson/src/main/java/org/apache/camel/component/gson/GsonDataFormat.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/components/camel-gson/src/main/resources/META-INF/LICENSE.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gson/src/main/resources/META-INF/LICENSE.txt?rev=1237049&view=auto
==============================================================================
--- camel/trunk/components/camel-gson/src/main/resources/META-INF/LICENSE.txt
(added)
+++ camel/trunk/components/camel-gson/src/main/resources/META-INF/LICENSE.txt
Sat Jan 28 11:50:03 2012
@@ -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 Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
Propchange:
camel/trunk/components/camel-gson/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-gson/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: camel/trunk/components/camel-gson/src/main/resources/META-INF/NOTICE.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gson/src/main/resources/META-INF/NOTICE.txt?rev=1237049&view=auto
==============================================================================
--- camel/trunk/components/camel-gson/src/main/resources/META-INF/NOTICE.txt
(added)
+++ camel/trunk/components/camel-gson/src/main/resources/META-INF/NOTICE.txt
Sat Jan 28 11:50:03 2012
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
Propchange:
camel/trunk/components/camel-gson/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-gson/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
camel/trunk/components/camel-gson/src/main/resources/META-INF/services/org/apache/camel/dataformat/json-gson
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gson/src/main/resources/META-INF/services/org/apache/camel/dataformat/json-gson?rev=1237049&view=auto
==============================================================================
---
camel/trunk/components/camel-gson/src/main/resources/META-INF/services/org/apache/camel/dataformat/json-gson
(added)
+++
camel/trunk/components/camel-gson/src/main/resources/META-INF/services/org/apache/camel/dataformat/json-gson
Sat Jan 28 11:50:03 2012
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class=org.apache.camel.component.gson.GsonDataFormat
Added:
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonConcurrentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonConcurrentTest.java?rev=1237049&view=auto
==============================================================================
---
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonConcurrentTest.java
(added)
+++
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonConcurrentTest.java
Sat Jan 28 11:50:03 2012
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.gson;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.dataformat.JsonLibrary;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+/**
+ * @version
+ */
+public class GsonConcurrentTest extends CamelTestSupport {
+
+ @Test
+ public void testNoConcurrentProducers() throws Exception {
+ doSendMessages(1, 1);
+ }
+
+ @Test
+ public void testConcurrentProducers() throws Exception {
+ doSendMessages(10, 5);
+ }
+
+ private void doSendMessages(int files, int poolSize) throws Exception {
+ getMockEndpoint("mock:result").expectedMessageCount(files);
+ getMockEndpoint("mock:result").assertNoDuplicates(body());
+
+ ExecutorService executor = Executors.newFixedThreadPool(poolSize);
+ for (int i = 0; i < files; i++) {
+ final int index = i;
+ executor.submit(new Callable<Object>() {
+ public Object call() throws Exception {
+ TestPojo pojo = new TestPojo();
+ pojo.setName("Hi " + index);
+
+ template.sendBody("direct:start", pojo);
+ return null;
+ }
+ });
+ }
+
+ assertMockEndpointsSatisfied();
+ executor.shutdownNow();
+ }
+
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ public void configure() {
+ from("direct:start").
+ marshal().json(JsonLibrary.Gson).
+ to("log:marshalled").
+ to("direct:marshalled");
+
+ from("direct:marshalled").
+ unmarshal().json(JsonLibrary.Gson, TestPojo.class).
+ to("mock:result");
+ }
+ };
+ }
+
+}
Propchange:
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonConcurrentTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonConcurrentTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonJsonDataFormatTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonJsonDataFormatTest.java?rev=1237049&view=auto
==============================================================================
---
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonJsonDataFormatTest.java
(added)
+++
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonJsonDataFormatTest.java
Sat Jan 28 11:50:03 2012
@@ -0,0 +1,38 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.gson;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.dataformat.JsonLibrary;
+
+public class GsonJsonDataFormatTest extends GsonMarshalTest {
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:in").marshal().json(JsonLibrary.Gson);
+
from("direct:back").unmarshal().json(JsonLibrary.Gson).to("mock:reverse");
+
+ from("direct:inPojo").marshal().json(JsonLibrary.Gson);
+ from("direct:backPojo").unmarshal().json(JsonLibrary.Gson,
TestPojo.class).to("mock:reversePojo");
+ }
+ };
+ }
+
+}
\ No newline at end of file
Propchange:
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonJsonDataFormatTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonJsonDataFormatTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java?rev=1237049&view=auto
==============================================================================
---
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java
(added)
+++
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java
Sat Jan 28 11:50:03 2012
@@ -0,0 +1,85 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.gson;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class GsonMarshalTest extends CamelTestSupport {
+
+ @Test
+ public void testMarshalAndUnmarshalMap() throws Exception {
+ Map<String, String> in = new HashMap<String, String>();
+ in.put("name", "Camel");
+
+ MockEndpoint mock = getMockEndpoint("mock:reverse");
+ mock.expectedMessageCount(1);
+ mock.message(0).body().isInstanceOf(Map.class);
+ mock.message(0).body().equals(in);
+
+ Object marshalled = template.requestBody("direct:in", in);
+ String marshalledAsString =
context.getTypeConverter().convertTo(String.class, marshalled);
+ assertEquals("{\"name\":\"Camel\"}", marshalledAsString);
+
+ template.sendBody("direct:back", marshalled);
+
+ mock.assertIsSatisfied();
+ }
+
+ @Test
+ public void testMarshalAndUnmarshalPojo() throws Exception {
+ TestPojo in = new TestPojo();
+ in.setName("Camel");
+
+ MockEndpoint mock = getMockEndpoint("mock:reversePojo");
+ mock.expectedMessageCount(1);
+ mock.message(0).body().isInstanceOf(TestPojo.class);
+ mock.message(0).body().equals(in);
+
+ Object marshalled = template.requestBody("direct:inPojo", in);
+ String marshalledAsString =
context.getTypeConverter().convertTo(String.class, marshalled);
+ assertEquals("{\"name\":\"Camel\"}", marshalledAsString);
+
+ template.sendBody("direct:backPojo", marshalled);
+
+ mock.assertIsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ GsonDataFormat format = new GsonDataFormat();
+
+ from("direct:in").marshal(format);
+ from("direct:back").unmarshal(format).to("mock:reverse");
+
+ GsonDataFormat formatPojo = new GsonDataFormat(TestPojo.class);
+
+ from("direct:inPojo").marshal(formatPojo);
+
from("direct:backPojo").unmarshal(formatPojo).to("mock:reversePojo");
+ }
+ };
+ }
+
+}
Propchange:
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java?rev=1237049&view=auto
==============================================================================
---
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java
(added)
+++
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java
Sat Jan 28 11:50:03 2012
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.gson;
+
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * @version
+ */
+public class SpringGsonJsonDataFormatTest extends CamelSpringTestSupport {
+
+ @Test
+ public void testMarshalAndUnmarshalPojo() throws Exception {
+ TestPojo in = new TestPojo();
+ in.setName("Camel");
+
+ MockEndpoint mock = getMockEndpoint("mock:reversePojo");
+ mock.expectedMessageCount(1);
+ mock.message(0).body().isInstanceOf(TestPojo.class);
+ mock.message(0).body().equals(in);
+
+ Object marshalled = template.requestBody("direct:inPojo", in);
+ String marshalledAsString =
context.getTypeConverter().convertTo(String.class, marshalled);
+ assertEquals("{\"name\":\"Camel\"}", marshalledAsString);
+
+ template.sendBody("direct:backPojo", marshalled);
+
+ mock.assertIsSatisfied();
+ }
+
+ @Override
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return new
ClassPathXmlApplicationContext("org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.xml");
+ }
+
+}
Propchange:
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/TestPojo.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/TestPojo.java?rev=1237049&view=auto
==============================================================================
---
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/TestPojo.java
(added)
+++
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/TestPojo.java
Sat Jan 28 11:50:03 2012
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.gson;
+
+public class TestPojo {
+
+ private String name;
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return this.name.equals(((TestPojo) obj).getName());
+ }
+
+ @Override
+ public int hashCode() {
+ return name != null ? name.hashCode() : 0;
+ }
+
+ @Override
+ public String toString() {
+ return "TestPojo[" + name + "]";
+ }
+}
\ No newline at end of file
Propchange:
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/TestPojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/TestPojo.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/components/camel-gson/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gson/src/test/resources/log4j.properties?rev=1237049&view=auto
==============================================================================
--- camel/trunk/components/camel-gson/src/test/resources/log4j.properties
(added)
+++ camel/trunk/components/camel-gson/src/test/resources/log4j.properties Sat
Jan 28 11:50:03 2012
@@ -0,0 +1,36 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+#
+# The logging properties used during tests..
+#
+log4j.rootLogger=INFO, file
+
+# uncomment this to turn on debug of camel
+#log4j.logger.org.apache.camel=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
+
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
+log4j.appender.file.file=target/camel-gson-test.log
+log4j.appender.file.append=true
Propchange:
camel/trunk/components/camel-gson/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-gson/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/trunk/components/camel-gson/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
camel/trunk/components/camel-gson/src/test/resources/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gson/src/test/resources/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.xml?rev=1237049&view=auto
==============================================================================
---
camel/trunk/components/camel-gson/src/test/resources/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.xml
(added)
+++
camel/trunk/components/camel-gson/src/test/resources/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.xml
Sat Jan 28 11:50:03 2012
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
+
+ <!-- START SNIPPET: e1 -->
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
+
+ <!-- we define the json jackson data formats to be used -->
+ <dataFormats>
+ <!-- this one uses our own TestPojo class as unmarshal type -->
+ <json id="gson" library="Gson"
unmarshalTypeName="org.apache.camel.component.gson.TestPojo"/>
+ </dataFormats>
+
+ <route>
+ <from uri="direct:inPojo"/>
+ <marshal ref="gson"/>
+ </route>
+
+ <route>
+ <from uri="direct:backPojo"/>
+ <unmarshal ref="gson"/>
+ <to uri="mock:reversePojo"/>
+ </route>
+
+ </camelContext>
+ <!-- END SNIPPET: e1 -->
+
+</beans>
Propchange:
camel/trunk/components/camel-gson/src/test/resources/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-gson/src/test/resources/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/trunk/components/camel-gson/src/test/resources/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: camel/trunk/components/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1237049&r1=1237048&r2=1237049&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Sat Jan 28 11:50:03 2012
@@ -76,6 +76,7 @@
<module>camel-freemarker</module>
<module>camel-ftp</module>
<module>camel-gae</module>
+ <module>camel-gson</module>
<module>camel-guice</module>
<module>camel-hawtdb</module>
<module>camel-hazelcast</module>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1237049&r1=1237048&r2=1237049&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sat Jan 28 11:50:03 2012
@@ -77,6 +77,7 @@
<geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
<geronimo-servlet-spec-version>1.1.2</geronimo-servlet-spec-version>
<groovy-version>1.8.5</groovy-version>
+ <gson-version>2.1</gson-version>
<guiceyfruit-version>2.0</guiceyfruit-version>
<h2-version>1.3.161</h2-version>
<hadoop-version>1.0.0</hadoop-version>
@@ -390,6 +391,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-gson</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-hawtdb</artifactId>
<version>${project.version}</version>
</dependency>
