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 2013/02/16 11:07:21 UTC
svn commit: r1446867 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/main/java/org/apache/camel/model/dataformat/ came...
Author: davsclaus
Date: Sat Feb 16 10:07:20 2013
New Revision: 1446867
URL: http://svn.apache.org/r1446867
Log:
CAMEL-6061: Added new camel-zipfile data format. Thanks to Daniel Gredler for the contribution.
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java (with props)
camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithZipFileDataFormat.xml (with props)
camel/trunk/components/camel-zipfile/ (with props)
camel/trunk/components/camel-zipfile/pom.xml (with props)
camel/trunk/components/camel-zipfile/src/
camel/trunk/components/camel-zipfile/src/main/
camel/trunk/components/camel-zipfile/src/main/java/
camel/trunk/components/camel-zipfile/src/main/java/org/
camel/trunk/components/camel-zipfile/src/main/java/org/apache/
camel/trunk/components/camel-zipfile/src/main/java/org/apache/camel/
camel/trunk/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/
camel/trunk/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/
camel/trunk/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java (with props)
camel/trunk/components/camel-zipfile/src/main/resources/
camel/trunk/components/camel-zipfile/src/main/resources/META-INF/
camel/trunk/components/camel-zipfile/src/main/resources/META-INF/LICENSE.txt (with props)
camel/trunk/components/camel-zipfile/src/main/resources/META-INF/NOTICE.txt (with props)
camel/trunk/components/camel-zipfile/src/main/resources/META-INF/services/
camel/trunk/components/camel-zipfile/src/main/resources/META-INF/services/org/
camel/trunk/components/camel-zipfile/src/main/resources/META-INF/services/org/apache/
camel/trunk/components/camel-zipfile/src/main/resources/META-INF/services/org/apache/camel/
camel/trunk/components/camel-zipfile/src/main/resources/META-INF/services/org/apache/camel/dataformat/
camel/trunk/components/camel-zipfile/src/main/resources/META-INF/services/org/apache/camel/dataformat/zipfile
camel/trunk/components/camel-zipfile/src/test/
camel/trunk/components/camel-zipfile/src/test/java/
camel/trunk/components/camel-zipfile/src/test/java/org/
camel/trunk/components/camel-zipfile/src/test/java/org/apache/
camel/trunk/components/camel-zipfile/src/test/java/org/apache/camel/
camel/trunk/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/
camel/trunk/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/
camel/trunk/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java (with props)
camel/trunk/components/camel-zipfile/src/test/resources/
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
camel/trunk/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
camel/trunk/components/pom.xml
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java?rev=1446867&r1=1446866&r2=1446867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java Sat Feb 16 10:07:20 2013
@@ -50,6 +50,7 @@ import org.apache.camel.model.dataformat
import org.apache.camel.model.dataformat.XStreamDataFormat;
import org.apache.camel.model.dataformat.XmlJsonDataFormat;
import org.apache.camel.model.dataformat.ZipDataFormat;
+import org.apache.camel.model.dataformat.ZipFileDataFormat;
import org.apache.camel.util.jsse.KeyStoreParameters;
/**
@@ -682,6 +683,14 @@ public class DataFormatClause<T extends
return dataFormat(zdf);
}
+ /**
+ * Uses the ZIP file data format
+ */
+ public T zipFile() {
+ ZipFileDataFormat zfdf = new ZipFileDataFormat();
+ return dataFormat(zfdf);
+ }
+
@SuppressWarnings("unchecked")
private T dataFormat(DataFormatDefinition dataFormatType) {
switch (operation) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java?rev=1446867&r1=1446866&r2=1446867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java Sat Feb 16 10:07:20 2013
@@ -27,6 +27,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.util.IOHelper;
+/**
+ * "Deflate" compression data format.
+ * See {@link org.apache.camel.model.dataformat.ZipFileDataFormat} for Zip file compression.
+ */
public class ZipDataFormat implements DataFormat {
private final int compressionLevel;
@@ -61,7 +65,8 @@ public class ZipDataFormat implements Da
IOHelper.copy(unzipInput, bos);
return bos.toByteArray();
} finally {
- IOHelper.close(unzipInput);
+ // must close input streams
+ IOHelper.close(is, unzipInput);
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java?rev=1446867&r1=1446866&r2=1446867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java Sat Feb 16 10:07:20 2013
@@ -52,6 +52,7 @@ import org.apache.camel.model.dataformat
import org.apache.camel.model.dataformat.XmlJsonDataFormat;
import org.apache.camel.model.dataformat.XmlRpcDataFormat;
import org.apache.camel.model.dataformat.ZipDataFormat;
+import org.apache.camel.model.dataformat.ZipFileDataFormat;
import org.apache.camel.processor.MarshalProcessor;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.RouteContext;
@@ -99,7 +100,8 @@ public class MarshalDefinition extends N
@XmlElement(required = false, name = "xmlrpc", type = XmlRpcDataFormat.class),
@XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
@XmlElement(required = false, name = "pgp", type = PGPDataFormat.class),
- @XmlElement(required = false, name = "zip", type = ZipDataFormat.class)}
+ @XmlElement(required = false, name = "zip", type = ZipDataFormat.class),
+ @XmlElement(required = false, name = "zipFile", type = ZipFileDataFormat.class)}
)
private DataFormatDefinition dataFormatType;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java?rev=1446867&r1=1446866&r2=1446867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java Sat Feb 16 10:07:20 2013
@@ -52,6 +52,7 @@ import org.apache.camel.model.dataformat
import org.apache.camel.model.dataformat.XmlJsonDataFormat;
import org.apache.camel.model.dataformat.XmlRpcDataFormat;
import org.apache.camel.model.dataformat.ZipDataFormat;
+import org.apache.camel.model.dataformat.ZipFileDataFormat;
import org.apache.camel.processor.UnmarshalProcessor;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.RouteContext;
@@ -99,7 +100,8 @@ public class UnmarshalDefinition extends
@XmlElement(required = false, name = "xmlrpc", type = XmlRpcDataFormat.class),
@XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
@XmlElement(required = false, name = "pgp", type = PGPDataFormat.class),
- @XmlElement(required = false, name = "zip", type = ZipDataFormat.class)}
+ @XmlElement(required = false, name = "zip", type = ZipDataFormat.class),
+ @XmlElement(required = false, name = "zipFile", type = ZipFileDataFormat.class)}
)
private DataFormatDefinition dataFormatType;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java?rev=1446867&r1=1446866&r2=1446867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java Sat Feb 16 10:07:20 2013
@@ -64,7 +64,8 @@ public class DataFormatsDefinition {
@XmlElement(required = false, name = "xmlrpc", type = XmlRpcDataFormat.class),
@XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
@XmlElement(required = false, name = "pgp", type = PGPDataFormat.class),
- @XmlElement(required = false, name = "zip", type = ZipDataFormat.class)}
+ @XmlElement(required = false, name = "zip", type = ZipDataFormat.class),
+ @XmlElement(required = false, name = "zipFile", type = ZipFileDataFormat.class)}
)
private List<DataFormatDefinition> dataFormats;
Added: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java?rev=1446867&view=auto
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java (added)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java Sat Feb 16 10:07:20 2013
@@ -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.
+ */
+package org.apache.camel.model.dataformat;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.camel.model.DataFormatDefinition;
+
+/**
+ * Represents the ZIP file XML {@link org.apache.camel.spi.DataFormat}.
+ */
+@XmlRootElement(name = "zipFile")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class ZipFileDataFormat extends DataFormatDefinition {
+
+ public ZipFileDataFormat() {
+ super("zipfile");
+ }
+
+}
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index?rev=1446867&r1=1446866&r2=1446867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index (original)
+++ camel/trunk/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index Sat Feb 16 10:07:20 2013
@@ -42,3 +42,4 @@ XMLBeansDataFormat
XMLSecurityDataFormat
XStreamDataFormat
ZipDataFormat
+ZipFileDataFormat
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java?rev=1446867&r1=1446866&r2=1446867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java Sat Feb 16 10:07:20 2013
@@ -292,6 +292,11 @@ public class XmlParseTest extends XmlTes
assertFrom(route, "seda:a");
}
+ public void testParseZipFileDataFormat() throws Exception {
+ RouteDefinition route = assertOneRoute("routeWithZipFileDataFormat.xml");
+ assertFrom(route, "seda:a");
+ }
+
public void testParseBindyDataFormat() throws Exception {
RouteDefinition route = assertOneRoute("routeWithBindyDataFormat.xml");
assertFrom(route, "seda:a");
Added: camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithZipFileDataFormat.xml
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithZipFileDataFormat.xml?rev=1446867&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithZipFileDataFormat.xml (added)
+++ camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithZipFileDataFormat.xml Sat Feb 16 10:07:20 2013
@@ -0,0 +1,28 @@
+<?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.
+-->
+<routes id="camel" xmlns="http://camel.apache.org/schema/spring">
+ <route>
+ <from uri="seda:a"/>
+ <pipeline>
+ <marshal>
+ <zipFile/>
+ </marshal>
+ <to uri="seda:b"/>
+ </pipeline>
+ </route>
+</routes>
Propchange: camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithZipFileDataFormat.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithZipFileDataFormat.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithZipFileDataFormat.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: camel/trunk/components/camel-zipfile/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Feb 16 10:07:20 2013
@@ -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-zipfile/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zipfile/pom.xml?rev=1446867&view=auto
==============================================================================
--- camel/trunk/components/camel-zipfile/pom.xml (added)
+++ camel/trunk/components/camel-zipfile/pom.xml Sat Feb 16 10:07:20 2013
@@ -0,0 +1,56 @@
+<?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.11-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-zipfile</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Zip File</name>
+ <description>Camel Zip file support</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.dataformat.zipfile.*</camel.osgi.export.pkg>
+ <camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=zipfile</camel.osgi.export.service>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: camel/trunk/components/camel-zipfile/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-zipfile/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-zipfile/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: camel/trunk/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java?rev=1446867&view=auto
==============================================================================
--- camel/trunk/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java (added)
+++ camel/trunk/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java Sat Feb 16 10:07:20 2013
@@ -0,0 +1,90 @@
+/**
+ * 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.zipfile;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.spi.DataFormat;
+import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.StringHelper;
+
+import static org.apache.camel.Exchange.FILE_NAME;
+
+/**
+ * Zip file data format.
+ * See {@link org.apache.camel.model.dataformat.ZipDataFormat} for "deflate" compression.
+ */
+public class ZipFileDataFormat implements DataFormat {
+
+ @Override
+ public void marshal(Exchange exchange, Object graph, OutputStream stream) throws Exception {
+ String filename = exchange.getIn().getHeader(FILE_NAME, String.class);
+ if (filename != null) {
+ filename = new File(filename).getName(); // remove any path elements
+ } else {
+ // generate the file name as the camel file component would do
+ filename = StringHelper.sanitize(exchange.getIn().getMessageId());
+ }
+
+ ZipOutputStream zos = new ZipOutputStream(stream);
+ zos.putNextEntry(new ZipEntry(filename));
+
+ InputStream is = exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, graph);
+
+ try {
+ IOHelper.copy(is, zos);
+ } finally {
+ IOHelper.close(is, zos);
+ }
+
+ String newFilename = filename + ".zip";
+ exchange.getOut().setHeader(FILE_NAME, newFilename);
+ }
+
+ @Override
+ public Object unmarshal(Exchange exchange, InputStream stream) throws Exception {
+ InputStream is = exchange.getIn().getMandatoryBody(InputStream.class);
+ ZipInputStream zis = new ZipInputStream(is);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ try {
+ ZipEntry entry = zis.getNextEntry();
+ if (entry != null) {
+ exchange.getOut().setHeader(FILE_NAME, entry.getName());
+ IOHelper.copy(zis, baos);
+ }
+
+ entry = zis.getNextEntry();
+ if (entry != null) {
+ throw new IllegalStateException("Zip file has more than 1 entry.");
+ }
+
+ return baos.toByteArray();
+
+ } finally {
+ IOHelper.close(zis, baos);
+ }
+ }
+
+}
Propchange: camel/trunk/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/components/camel-zipfile/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zipfile/src/main/resources/META-INF/LICENSE.txt?rev=1446867&view=auto
==============================================================================
--- camel/trunk/components/camel-zipfile/src/main/resources/META-INF/LICENSE.txt (added)
+++ camel/trunk/components/camel-zipfile/src/main/resources/META-INF/LICENSE.txt Sat Feb 16 10:07:20 2013
@@ -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-zipfile/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-zipfile/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: camel/trunk/components/camel-zipfile/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zipfile/src/main/resources/META-INF/NOTICE.txt?rev=1446867&view=auto
==============================================================================
--- camel/trunk/components/camel-zipfile/src/main/resources/META-INF/NOTICE.txt (added)
+++ camel/trunk/components/camel-zipfile/src/main/resources/META-INF/NOTICE.txt Sat Feb 16 10:07:20 2013
@@ -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-zipfile/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-zipfile/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: camel/trunk/components/camel-zipfile/src/main/resources/META-INF/services/org/apache/camel/dataformat/zipfile
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zipfile/src/main/resources/META-INF/services/org/apache/camel/dataformat/zipfile?rev=1446867&view=auto
==============================================================================
--- camel/trunk/components/camel-zipfile/src/main/resources/META-INF/services/org/apache/camel/dataformat/zipfile (added)
+++ camel/trunk/components/camel-zipfile/src/main/resources/META-INF/services/org/apache/camel/dataformat/zipfile Sat Feb 16 10:07:20 2013
@@ -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.zipfile.ZipFileDataFormat
Added: camel/trunk/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java?rev=1446867&view=auto
==============================================================================
--- camel/trunk/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java (added)
+++ camel/trunk/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java Sat Feb 16 10:07:20 2013
@@ -0,0 +1,200 @@
+/**
+ * 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.zipfile;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ObjectHelper;
+import org.junit.Test;
+
+import static org.apache.camel.Exchange.FILE_NAME;
+
+/**
+ * Unit tests for {@link ZipFileDataFormat}.
+ */
+public class ZipFileDataFormatTest extends CamelTestSupport {
+
+ private static final String TEXT = "The Masque of Queen Bersabe (excerpt) \n"
+ + "by: Algernon Charles Swinburne \n\n"
+ + "My lips kissed dumb the word of Ah \n"
+ + "Sighed on strange lips grown sick thereby. \n"
+ + "God wrought to me my royal bed; \n"
+ + "The inner work thereof was red, \n"
+ + "The outer work was ivory. \n"
+ + "My mouth's heat was the heat of flame \n"
+ + "For lust towards the kings that came \n"
+ + "With horsemen riding royally.";
+
+ private static final File TEST_DIR = new File("target/zip");
+
+ @Test
+ public void testZipWithoutFileName() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:zip");
+ mock.expectedMessageCount(1);
+
+ template.sendBody("direct:zip", TEXT);
+
+ assertMockEndpointsSatisfied();
+
+ Exchange exchange = mock.getReceivedExchanges().get(0);
+ assertEquals(exchange.getIn().getMessageId() + ".zip", exchange.getIn().getHeader(FILE_NAME));
+ assertTrue(ObjectHelper.equalByteArray(getZippedText(exchange.getIn().getMessageId()), (byte[])exchange.getIn().getBody()));
+ }
+
+ @Test
+ public void testZipWithFileName() throws Exception {
+ getMockEndpoint("mock:zip").expectedBodiesReceived(getZippedText("poem.txt"));
+ getMockEndpoint("mock:zip").expectedHeaderReceived(FILE_NAME, "poem.txt.zip");
+
+ template.sendBodyAndHeader("direct:zip", TEXT, FILE_NAME, "poem.txt");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testUnzip() throws Exception {
+ getMockEndpoint("mock:unzip").expectedBodiesReceived(TEXT);
+ getMockEndpoint("mock:unzip").expectedHeaderReceived(FILE_NAME, "file");
+
+ template.sendBody("direct:unzip", getZippedText("file"));
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testZipAndUnzip() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:zipAndUnzip");
+ mock.expectedMessageCount(1);
+
+ template.sendBody("direct:zipAndUnzip", TEXT);
+
+ assertMockEndpointsSatisfied();
+
+ Exchange exchange = mock.getReceivedExchanges().get(0);
+ assertEquals(exchange.getIn().getMessageId(), exchange.getIn().getHeader(FILE_NAME));
+ assertEquals(TEXT, new String((byte[])exchange.getIn().getBody(), "UTF-8"));
+ }
+
+ @Test
+ public void testZipToFileWithoutFileName() throws Exception {
+ String[] files = TEST_DIR.list();
+ assertTrue(files == null || files.length == 0);
+
+ MockEndpoint mock = getMockEndpoint("mock:intercepted");
+ mock.expectedMessageCount(1);
+
+ template.sendBody("direct:zipToFile", TEXT);
+
+ assertMockEndpointsSatisfied();
+
+ Exchange exchange = mock.getReceivedExchanges().get(0);
+ File file = new File(TEST_DIR, exchange.getIn().getMessageId() + ".zip");
+ assertTrue(file.exists());
+ assertTrue(ObjectHelper.equalByteArray(getZippedText(exchange.getIn().getMessageId()), getBytes(file)));
+ }
+
+ @Test
+ public void testZipToFileWithFileName() throws Exception {
+ File file = new File(TEST_DIR, "poem.txt.zip");
+ assertFalse(file.exists());
+
+ template.sendBodyAndHeader("direct:zipToFile", TEXT, FILE_NAME, "poem.txt");
+
+ assertTrue(file.exists());
+ assertTrue(ObjectHelper.equalByteArray(getZippedText("poem.txt"), getBytes(file)));
+ }
+
+ @Test
+ public void testDslZip() throws Exception {
+ getMockEndpoint("mock:dslZip").expectedBodiesReceived(getZippedText("poem.txt"));
+ getMockEndpoint("mock:dslZip").expectedHeaderReceived(FILE_NAME, "poem.txt.zip");
+
+ template.sendBodyAndHeader("direct:dslZip", TEXT, FILE_NAME, "poem.txt");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testDslUnzip() throws Exception {
+ getMockEndpoint("mock:dslUnzip").expectedBodiesReceived(TEXT);
+ getMockEndpoint("mock:dslUnzip").expectedHeaderReceived(FILE_NAME, "test.txt");
+
+ template.sendBody("direct:dslUnzip", getZippedText("test.txt"));
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ public void setUp() throws Exception {
+ deleteDirectory(TEST_DIR);
+ super.setUp();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ interceptSendToEndpoint("file:*").to("mock:intercepted");
+
+ ZipFileDataFormat zip = new ZipFileDataFormat();
+
+ from("direct:zip").marshal(zip).to("mock:zip");
+ from("direct:unzip").unmarshal(zip).to("mock:unzip");
+ from("direct:zipAndUnzip").marshal(zip).unmarshal(zip).to("mock:zipAndUnzip");
+ from("direct:zipToFile").marshal(zip).to("file:" + TEST_DIR.getPath());
+ from("direct:dslZip").marshal().zipFile().to("mock:dslZip");
+ from("direct:dslUnzip").unmarshal().zipFile().to("mock:dslUnzip");
+ }
+ };
+ }
+
+ private static byte[] getZippedText(String entryName) throws IOException {
+ ByteArrayInputStream bais = new ByteArrayInputStream(TEXT.getBytes("UTF-8"));
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ZipOutputStream zos = new ZipOutputStream(baos);
+ try {
+ zos.putNextEntry(new ZipEntry(entryName));
+ IOHelper.copy(bais, zos);
+ } finally {
+ IOHelper.close(bais, zos);
+ }
+ return baos.toByteArray();
+ }
+
+ private static byte[] getBytes(File file) throws IOException {
+ FileInputStream fis = new FileInputStream(file);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ try {
+ IOHelper.copy(fis, baos);
+ } finally {
+ IOHelper.close(fis, baos);
+ }
+ return baos.toByteArray();
+ }
+}
Propchange: camel/trunk/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1446867&r1=1446866&r2=1446867&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Sat Feb 16 10:07:20 2013
@@ -173,6 +173,7 @@
<module>camel-xmlsecurity</module>
<module>camel-xmpp</module>
<module>camel-xstream</module>
+ <module>camel-zipfile</module>
<module>camel-zookeeper</module>
</modules>