You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/01/26 18:39:46 UTC
camel git commit: CAMEL-5583 - Add ning-compress as data format
Repository: camel
Updated Branches:
refs/heads/master 9fbde5d01 -> 09e0b4663
CAMEL-5583 - Add ning-compress as data format
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/09e0b466
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/09e0b466
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/09e0b466
Branch: refs/heads/master
Commit: 09e0b4663bb3838971c3a6fd4db7bd3ce115d8ed
Parents: 9fbde5d
Author: lburgazzoli <lb...@gmail.com>
Authored: Tue Jan 26 16:18:37 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 26 18:26:20 2016 +0100
----------------------------------------------------------------------
apache-camel/pom.xml | 4 +
.../src/main/descriptors/common-bin.xml | 1 +
.../apache/camel/builder/DataFormatClause.java | 9 +
.../camel/model/dataformat/LZFDataFormat.java | 60 ++++++
components/camel-lzf/pom.xml | 76 +++++++
.../camel/dataformat/lzf/LZFDataFormat.java | 89 ++++++++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../services/org/apache/camel/dataformat/lzf | 18 ++
.../camel/dataformat/lzf/LZFDataFormatTest.java | 91 +++++++++
.../src/test/resources/log4j.properties | 38 ++++
components/pom.xml | 1 +
parent/pom.xml | 6 +
.../features/src/main/resources/features.xml | 5 +
.../apache/camel/itest/karaf/CamelLzfTest.java | 40 ++++
15 files changed, 652 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/09e0b466/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 3646dcd..4ba0d8c 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -516,6 +516,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-lzf</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-mail</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/09e0b466/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 9d03471..19ad7c7 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -140,6 +140,7 @@
<include>org.apache.camel:camel-linkedin-api</include>
<include>org.apache.camel:camel-linkedin</include>
<include>org.apache.camel:camel-lucene</include>
+ <include>org.apache.camel:camel-lzf</include>
<include>org.apache.camel:camel-metrics</include>
<include>org.apache.camel:camel-mail</include>
<include>org.apache.camel:camel-mina</include>
http://git-wip-us.apache.org/repos/asf/camel/blob/09e0b466/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
index c80f45d..d9fd05b 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
@@ -41,6 +41,7 @@ import org.apache.camel.model.dataformat.JaxbDataFormat;
import org.apache.camel.model.dataformat.JibxDataFormat;
import org.apache.camel.model.dataformat.JsonDataFormat;
import org.apache.camel.model.dataformat.JsonLibrary;
+import org.apache.camel.model.dataformat.LZFDataFormat;
import org.apache.camel.model.dataformat.MimeMultipartDataFormat;
import org.apache.camel.model.dataformat.PGPDataFormat;
import org.apache.camel.model.dataformat.ProtobufDataFormat;
@@ -273,6 +274,14 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
}
/**
+ * Uses the LZF deflater data format
+ */
+ public T lzf() {
+ LZFDataFormat lzfdf = new LZFDataFormat();
+ return dataFormat(lzfdf);
+ }
+
+ /**
* Uses the MIME Multipart data format
*/
public T mimeMultipart() {
http://git-wip-us.apache.org/repos/asf/camel/blob/09e0b466/camel-core/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
new file mode 100644
index 0000000..30f7852
--- /dev/null
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
@@ -0,0 +1,60 @@
+/**
+ * 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.model.dataformat;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.model.DataFormatDefinition;
+import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.Metadata;
+
+/**
+ * lzf data format
+ */
+@Metadata(label = "dataformat,transformation", title = "LZF Deflate Compression")
+@XmlRootElement(name = "lzf")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class LZFDataFormat extends DataFormatDefinition {
+ @XmlAttribute
+ private Boolean usingParallelCompression;
+
+ public LZFDataFormat() {
+ super("lzf");
+ }
+
+ @Override
+ protected void configureDataFormat(DataFormat dataFormat, CamelContext camelContext) {
+ if (usingParallelCompression != null) {
+ setProperty(camelContext, dataFormat, "usingParallelCompression", usingParallelCompression);
+ }
+ }
+
+ public Boolean getUsingParallelCompression() {
+ return usingParallelCompression;
+ }
+
+ /**
+ * Enable encoding (compress) using multiple processing cores.
+ */
+ public void setUsingParallelCompression(Boolean usingParallelCompression) {
+ this.usingParallelCompression = usingParallelCompression;
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/09e0b466/components/camel-lzf/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-lzf/pom.xml b/components/camel-lzf/pom.xml
new file mode 100644
index 0000000..19d67b6
--- /dev/null
+++ b/components/camel-lzf/pom.xml
@@ -0,0 +1,76 @@
+<?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>components</artifactId>
+ <version>2.17-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-lzf</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: LZF</name>
+ <description>Camel LZF support</description>
+
+ <properties>
+ <camel.osgi.import>
+ !org.apache.camel.dataformat.lzf,
+ *
+ </camel.osgi.import>
+ <camel.osgi.export>
+ org.apache.camel.dataformat.lzf;${camel.osgi.version},
+ </camel.osgi.export>
+ <camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=lzf</camel.osgi.export.service>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.ning</groupId>
+ <artifactId>compress-lzf</artifactId>
+ <version>${compress-lzf-version}</version>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <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>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/09e0b466/components/camel-lzf/src/main/java/org/apache/camel/dataformat/lzf/LZFDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-lzf/src/main/java/org/apache/camel/dataformat/lzf/LZFDataFormat.java b/components/camel-lzf/src/main/java/org/apache/camel/dataformat/lzf/LZFDataFormat.java
new file mode 100644
index 0000000..d57d845
--- /dev/null
+++ b/components/camel-lzf/src/main/java/org/apache/camel/dataformat/lzf/LZFDataFormat.java
@@ -0,0 +1,89 @@
+/**
+ * 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.dataformat.lzf;
+
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import com.ning.compress.lzf.LZFInputStream;
+import com.ning.compress.lzf.LZFOutputStream;
+import com.ning.compress.lzf.parallel.PLZFOutputStream;
+import org.apache.camel.Exchange;
+import org.apache.camel.converter.stream.OutputStreamBuilder;
+import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.DataFormatName;
+import org.apache.camel.support.ServiceSupport;
+import org.apache.camel.util.IOHelper;
+
+/**
+ * LZF data format.
+ * See {@link org.apache.camel.model.dataformat.LZFDataFormat} for "deflate" compression.
+ */
+public class LZFDataFormat extends ServiceSupport implements DataFormat, DataFormatName {
+ private boolean parallelCompression;
+
+ @Override
+ public String getDataFormatName() {
+ return "lzf";
+ }
+
+ @Override
+ public void marshal(final Exchange exchange, final Object graph, final OutputStream stream) throws Exception {
+ InputStream is = exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, exchange, graph);
+ OutputStream compressedOutput = parallelCompression ? new PLZFOutputStream(stream) : new LZFOutputStream(stream);
+ try {
+ IOHelper.copy(is, compressedOutput);
+ } finally {
+ // must close all input streams
+ IOHelper.close(is, compressedOutput);
+ }
+ }
+
+ @Override
+ public Object unmarshal(final Exchange exchange, final InputStream inputStream) throws Exception {
+ InputStream compressedInput = null;
+
+ OutputStreamBuilder osb = OutputStreamBuilder.withExchange(exchange);
+ try {
+ compressedInput = new LZFInputStream(inputStream);
+ IOHelper.copy(compressedInput, osb);
+ return osb.build();
+ } finally {
+ // must close all input streams
+ IOHelper.close(osb, compressedInput, inputStream);
+ }
+ }
+
+ public boolean isUsingParallelCompression() {
+ return parallelCompression;
+ }
+
+ public void setUsingParallelCompression(boolean parallelCompression) {
+ this.parallelCompression = parallelCompression;
+ }
+
+ @Override
+ protected void doStart() throws Exception {
+ // noop
+ }
+
+ @Override
+ protected void doStop() throws Exception {
+ // noop
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/09e0b466/components/camel-lzf/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/components/camel-lzf/src/main/resources/META-INF/LICENSE.txt b/components/camel-lzf/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/components/camel-lzf/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 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.
+
http://git-wip-us.apache.org/repos/asf/camel/blob/09e0b466/components/camel-lzf/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/components/camel-lzf/src/main/resources/META-INF/NOTICE.txt b/components/camel-lzf/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/components/camel-lzf/src/main/resources/META-INF/NOTICE.txt
@@ -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.
http://git-wip-us.apache.org/repos/asf/camel/blob/09e0b466/components/camel-lzf/src/main/resources/META-INF/services/org/apache/camel/dataformat/lzf
----------------------------------------------------------------------
diff --git a/components/camel-lzf/src/main/resources/META-INF/services/org/apache/camel/dataformat/lzf b/components/camel-lzf/src/main/resources/META-INF/services/org/apache/camel/dataformat/lzf
new file mode 100644
index 0000000..c38dbd8
--- /dev/null
+++ b/components/camel-lzf/src/main/resources/META-INF/services/org/apache/camel/dataformat/lzf
@@ -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.dataformat.lzf.LZFDataFormat
http://git-wip-us.apache.org/repos/asf/camel/blob/09e0b466/components/camel-lzf/src/test/java/org/apache/camel/dataformat/lzf/LZFDataFormatTest.java
----------------------------------------------------------------------
diff --git a/components/camel-lzf/src/test/java/org/apache/camel/dataformat/lzf/LZFDataFormatTest.java b/components/camel-lzf/src/test/java/org/apache/camel/dataformat/lzf/LZFDataFormatTest.java
new file mode 100644
index 0000000..a69077ba
--- /dev/null
+++ b/components/camel-lzf/src/test/java/org/apache/camel/dataformat/lzf/LZFDataFormatTest.java
@@ -0,0 +1,91 @@
+/**
+ * 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.dataformat.lzf;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
+import com.ning.compress.lzf.LZFInputStream;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.converter.IOConverter;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class LZFDataFormatTest extends CamelTestSupport {
+ private static final String TEXT = "Hamlet by William Shakespeare\n"
+ + "To be, or not to be: that is the question:\n"
+ + "Whether 'tis nobler in the mind to suffer\n"
+ + "The slings and arrows of outrageous fortune,\n"
+ + "Or to take arms against a sea of troubles,\n"
+ + "And by opposing end them? To die: to sleep;";
+
+ @Test
+ public void testMarshalTextToLzf() throws Exception {
+ byte[] output = sendText("direct:textToLzf");
+
+ InputStream stream = new LZFInputStream(new ByteArrayInputStream(output));
+ String result = IOConverter.toString(stream, null);
+ assertEquals("Uncompressed something different than compressed", TEXT, result);
+ }
+
+ @Test
+ public void testUnMarshalTextToLzf() throws Exception {
+ MockEndpoint result = context.getEndpoint("mock:unMarshalTextToLzf", MockEndpoint.class);
+ result.expectedBodiesReceived(TEXT.getBytes("UTF-8"));
+
+ sendText("direct:unMarshalTextToLzf");
+
+ result.assertIsSatisfied();
+ }
+
+ @Test
+ public void testParallelUnMarshalTextToLzf() throws Exception {
+ MockEndpoint result = context.getEndpoint("mock:parallelUnMarshalTextToLzf", MockEndpoint.class);
+ result.expectedBodiesReceived(TEXT.getBytes("UTF-8"));
+
+ sendText("direct:parallelUnMarshalTextToLzf");
+
+ result.assertIsSatisfied();
+ }
+
+ protected RoutesBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() {
+ LZFDataFormat dataFormat = new LZFDataFormat();
+ dataFormat.setUsingParallelCompression(true);
+
+ from("direct:textToLzf")
+ .marshal().lzf();
+ from("direct:unMarshalTextToLzf")
+ .marshal().lzf()
+ .unmarshal().lzf()
+ .to("mock:unMarshalTextToLzf");
+ from("direct:parallelUnMarshalTextToLzf")
+ .marshal(dataFormat)
+ .unmarshal(dataFormat)
+ .to("mock:parallelUnMarshalTextToLzf");
+ }
+ };
+ }
+
+ private byte[] sendText(String destination) throws Exception {
+ return (byte[]) template.requestBody(destination, TEXT.getBytes("UTF-8"));
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/09e0b466/components/camel-lzf/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-lzf/src/test/resources/log4j.properties b/components/camel-lzf/src/test/resources/log4j.properties
new file mode 100644
index 0000000..6ce9410
--- /dev/null
+++ b/components/camel-lzf/src/test/resources/log4j.properties
@@ -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.
+#
+
+#
+# The logging properties used for testing.
+#
+log4j.rootLogger=INFO, file
+
+#
+# uncomment the following line to enable debugging 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=[%30.30t] %-30.30c{1} %-5p %m%n
+#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-lzf-test.log
+log4j.appender.file.append=true
http://git-wip-us.apache.org/repos/asf/camel/blob/09e0b466/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index 53f7dc6..bfe6959 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -160,6 +160,7 @@
<module>camel-leveldb</module>
<module>camel-linkedin</module>
<module>camel-lucene</module>
+ <module>camel-lzf</module>
<module>camel-mail</module>
<module>camel-metrics</module>
<module>camel-mina</module>
http://git-wip-us.apache.org/repos/asf/camel/blob/09e0b466/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 46db9d4..64654a4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -127,6 +127,7 @@
<commons-pool-version>1.6</commons-pool-version>
<commons-pool2-version>2.4.2</commons-pool2-version>
<commons-vfs2-version>2.0</commons-vfs2-version>
+ <compress-lzf-version>1.0.3</compress-lzf-version>
<concurrentlinkedhashmap.version>1.4.2</concurrentlinkedhashmap.version>
<cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
<cxf-version>3.1.4</cxf-version>
@@ -1235,6 +1236,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-lzf</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-mail</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/09e0b466/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 dc80c1d..10ddd6e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1018,6 +1018,11 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jakarta-regexp/${regexp-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-lucene/${project.version}</bundle>
</feature>
+ <feature name='camel-lzf' version='${project.version}' resolver='(obr)' start-level='50'>
+ <bundle dependency='true'>mvn:com.ning/compress-lzf/${compress-lzf-version}</bundle>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-lzf/${project.version}</bundle>
+ </feature>
<feature name='camel-mail' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
http://git-wip-us.apache.org/repos/asf/camel/blob/09e0b466/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLzfTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLzfTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLzfTest.java
new file mode 100644
index 0000000..3bf0b49
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLzfTest.java
@@ -0,0 +1,40 @@
+/*
+ * 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.itest.karaf;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class CamelLzfTest extends AbstractFeatureTest {
+
+ public static final String COMPONENT = extractName(CamelLzfTest.class);
+
+ @Test
+ public void test() throws Exception {
+ testComponent(COMPONENT);
+ }
+
+ @Configuration
+ public static Option[] configure() {
+ return configure(COMPONENT);
+ }
+
+}
\ No newline at end of file