You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2008/12/01 10:09:06 UTC
svn commit: r722006 - in /activemq/camel/branches/camel-1.x: ./
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/main/java/org/apache/camel/model/dataformat/
camel-core/src/main/resource...
Author: ningjiang
Date: Mon Dec 1 01:09:06 2008
New Revision: 722006
URL: http://svn.apache.org/viewvc?rev=722006&view=rev
Log:
Merged revisions 721985 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r721985 | ningjiang | 2008-12-01 14:46:09 +0800 (Mon, 01 Dec 2008) | 1 line
CAMEL-1133 Applied patch with thanks to Ashwin
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java
activemq/camel/branches/camel-1.x/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 1 01:09:06 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java?rev=722006&r1=722005&r2=722006&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java Mon Dec 1 01:09:06 2008
@@ -16,6 +16,9 @@
*/
package org.apache.camel.builder;
+import java.util.zip.Deflater;
+
+import org.apache.camel.Processor;
import org.apache.camel.model.ProcessorType;
import org.apache.camel.model.dataformat.ArtixDSContentType;
import org.apache.camel.model.dataformat.ArtixDSDataFormat;
@@ -28,6 +31,7 @@
import org.apache.camel.model.dataformat.StringDataFormat;
import org.apache.camel.model.dataformat.XMLBeansDataFormat;
import org.apache.camel.model.dataformat.XStreamDataFormat;
+import org.apache.camel.model.dataformat.ZipDataFormat;
import org.apache.camel.spi.DataFormat;
/**
@@ -175,4 +179,13 @@
}
}
+ public T zip() {
+ ZipDataFormat zdf = new ZipDataFormat(Deflater.DEFAULT_COMPRESSION);
+ return dataFormat(zdf);
+ }
+
+ public T zip(int compressionLevel) {
+ ZipDataFormat zdf = new ZipDataFormat(compressionLevel);
+ return dataFormat(zdf);
+ }
}
Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/MarshalType.java?rev=722006&r1=722005&r2=722006&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/MarshalType.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/MarshalType.java Mon Dec 1 01:09:06 2008
@@ -34,6 +34,7 @@
import org.apache.camel.model.dataformat.StringDataFormat;
import org.apache.camel.model.dataformat.XMLBeansDataFormat;
import org.apache.camel.model.dataformat.XStreamDataFormat;
+import org.apache.camel.model.dataformat.ZipDataFormat;
import org.apache.camel.processor.MarshalProcessor;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.RouteContext;
@@ -59,7 +60,8 @@
@XmlElement(required = false, name = "serialization", type = SerializationDataFormat.class),
@XmlElement(required = false, name = "string", type = StringDataFormat.class),
@XmlElement(required = false, name = "xmlBeans", type = XMLBeansDataFormat.class),
- @XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class)}
+ @XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
+ @XmlElement(required = false, name = "zip", type = ZipDataFormat.class)}
)
private DataFormatType dataFormatType;
Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java?rev=722006&r1=722005&r2=722006&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java Mon Dec 1 01:09:06 2008
@@ -34,6 +34,7 @@
import org.apache.camel.model.dataformat.StringDataFormat;
import org.apache.camel.model.dataformat.XMLBeansDataFormat;
import org.apache.camel.model.dataformat.XStreamDataFormat;
+import org.apache.camel.model.dataformat.ZipDataFormat;
import org.apache.camel.processor.UnmarshalProcessor;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.RouteContext;
@@ -59,7 +60,8 @@
@XmlElement(required = false, name = "serialization", type = SerializationDataFormat.class),
@XmlElement(required = false, name = "string", type = StringDataFormat.class),
@XmlElement(required = false, name = "xmlBeans", type = XMLBeansDataFormat.class),
- @XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class)}
+ @XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
+ @XmlElement(required = false, name = "zip", type = ZipDataFormat.class)}
)
private DataFormatType dataFormatType;
Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java?rev=722006&r1=722005&r2=722006&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java Mon Dec 1 01:09:06 2008
@@ -48,7 +48,8 @@
@XmlElement(required = false, name = "serialization", type = SerializationDataFormat.class),
@XmlElement(required = false, name = "string", type = StringDataFormat.class),
@XmlElement(required = false, name = "xmlBeans", type = XMLBeansDataFormat.class),
- @XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class)}
+ @XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
+ @XmlElement(required = false, name = "zip", type = ZipDataFormat.class)}
)
private List<DataFormatType> dataFormats;
Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index?rev=722006&r1=722005&r2=722006&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index Mon Dec 1 01:09:06 2008
@@ -26,3 +26,4 @@
StringDataFormat
XMLBeansDataFormat
XStreamDataFormat
+ZipDataFormat
\ No newline at end of file