Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6CDCC4C9C for ; Sat, 4 Jun 2011 10:40:36 +0000 (UTC) Received: (qmail 75603 invoked by uid 500); 4 Jun 2011 10:40:36 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 75572 invoked by uid 500); 4 Jun 2011 10:40:36 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 75565 invoked by uid 99); 4 Jun 2011 10:40:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Jun 2011 10:40:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Jun 2011 10:40:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7A49A2388A1C; Sat, 4 Jun 2011 10:40:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1131372 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/util/ camel-core/src/test/java/org/apache/camel/util/ components/camel-ahc/src/main/java/org/apache/camel/component/ahc/ components/camel-ahc/src/main/java/org/apache/cam... Date: Sat, 04 Jun 2011 10:40:10 -0000 To: commits@camel.apache.org From: rickette@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110604104010.7A49A2388A1C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rickette Date: Sat Jun 4 10:40:09 2011 New Revision: 1131372 URL: http://svn.apache.org/viewvc?rev=1131372&view=rev Log: CAMEL-4051: Moved GZIPHelper to camel-core. Added: camel/trunk/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java (contents, props changed) - copied, changed from r1131357, camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/GZIPHelper.java camel/trunk/camel-core/src/test/java/org/apache/camel/util/GZIPHelperTest.java (contents, props changed) - copied, changed from r1131357, camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/helper/GZIPHelperTest.java Removed: camel/trunk/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/helper/GZIPHelper.java camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/GZIPHelper.java camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/helper/GZIPHelperTest.java camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/GZIPHelper.java camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/helper/GZIPHelperTest.java Modified: camel/trunk/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/RequestEntityConverter.java camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpConverter.java camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java (from r1131357, camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/GZIPHelper.java) URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java&p1=camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/GZIPHelper.java&r1=1131357&r2=1131372&rev=1131372&view=diff ============================================================================== --- camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/GZIPHelper.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java Sat Jun 4 10:40:09 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http4.helper; +package org.apache.camel.util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -25,7 +25,6 @@ import java.util.zip.GZIPOutputStream; import org.apache.camel.Exchange; import org.apache.camel.Message; -import org.apache.camel.util.IOHelper; /** * Helper class to help wrapping content into GZIP input and output streams. Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/util/GZIPHelper.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/util/GZIPHelperTest.java (from r1131357, camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/helper/GZIPHelperTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/GZIPHelperTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/util/GZIPHelperTest.java&p1=camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/helper/GZIPHelperTest.java&r1=1131357&r2=1131372&rev=1131372&view=diff ============================================================================== --- camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/helper/GZIPHelperTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/util/GZIPHelperTest.java Sat Jun 4 10:40:09 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.http4.helper; +package org.apache.camel.util; import java.io.ByteArrayInputStream; import java.io.IOException; Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/util/GZIPHelperTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/util/GZIPHelperTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: camel/trunk/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java?rev=1131372&r1=1131371&r2=1131372&view=diff ============================================================================== --- camel/trunk/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java (original) +++ camel/trunk/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java Sat Jun 4 10:40:09 2011 @@ -40,11 +40,11 @@ import org.apache.camel.CamelExchangeExc import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.ahc.helper.AhcHelper; -import org.apache.camel.component.ahc.helper.GZIPHelper; import org.apache.camel.component.file.GenericFile; import org.apache.camel.converter.IOConverter; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.util.ExchangeHelper; +import org.apache.camel.util.GZIPHelper; import org.apache.camel.util.IOHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java?rev=1131372&r1=1131371&r2=1131372&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java (original) +++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java Sat Jun 4 10:40:09 2011 @@ -36,9 +36,9 @@ import org.apache.camel.Message; import org.apache.camel.RuntimeCamelException; import org.apache.camel.StreamCache; import org.apache.camel.component.http.helper.CamelFileDataSource; -import org.apache.camel.component.http.helper.GZIPHelper; import org.apache.camel.component.http.helper.HttpHelper; import org.apache.camel.spi.HeaderFilterStrategy; +import org.apache.camel.util.GZIPHelper; import org.apache.camel.util.IOHelper; import org.apache.camel.util.MessageHelper; import org.apache.camel.util.ObjectHelper; Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java?rev=1131372&r1=1131371&r2=1131372&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java (original) +++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConverter.java Sat Jun 4 10:40:09 2011 @@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes import org.apache.camel.Converter; import org.apache.camel.Exchange; import org.apache.camel.Message; -import org.apache.camel.component.http.helper.GZIPHelper; +import org.apache.camel.util.GZIPHelper; /** * Some converter methods making it easy to convert the body of a message to servlet types or to switch between Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java?rev=1131372&r1=1131371&r2=1131372&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java (original) +++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java Sat Jun 4 10:40:09 2011 @@ -20,8 +20,6 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.HashMap; @@ -31,13 +29,13 @@ import org.apache.camel.CamelExchangeExc import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.file.GenericFile; -import org.apache.camel.component.http.helper.GZIPHelper; import org.apache.camel.component.http.helper.HttpHelper; import org.apache.camel.converter.IOConverter; import org.apache.camel.converter.stream.CachedOutputStream; import org.apache.camel.impl.DefaultProducer; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.util.ExchangeHelper; +import org.apache.camel.util.GZIPHelper; import org.apache.camel.util.IOHelper; import org.apache.commons.httpclient.Header; import org.apache.commons.httpclient.HttpClient; Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/RequestEntityConverter.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/RequestEntityConverter.java?rev=1131372&r1=1131371&r2=1131372&view=diff ============================================================================== --- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/RequestEntityConverter.java (original) +++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/RequestEntityConverter.java Sat Jun 4 10:40:09 2011 @@ -22,8 +22,8 @@ import java.io.InputStream; import org.apache.camel.Converter; import org.apache.camel.Exchange; -import org.apache.camel.component.http.helper.GZIPHelper; import org.apache.camel.util.ExchangeHelper; +import org.apache.camel.util.GZIPHelper; import org.apache.commons.httpclient.methods.InputStreamRequestEntity; import org.apache.commons.httpclient.methods.RequestEntity; Modified: camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java?rev=1131372&r1=1131371&r2=1131372&view=diff ============================================================================== --- camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java (original) +++ camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java Sat Jun 4 10:40:09 2011 @@ -37,9 +37,9 @@ import org.apache.camel.Message; import org.apache.camel.RuntimeCamelException; import org.apache.camel.StreamCache; import org.apache.camel.component.http4.helper.CamelFileDataSource; -import org.apache.camel.component.http4.helper.GZIPHelper; import org.apache.camel.component.http4.helper.HttpHelper; import org.apache.camel.spi.HeaderFilterStrategy; +import org.apache.camel.util.GZIPHelper; import org.apache.camel.util.IOHelper; import org.apache.camel.util.MessageHelper; import org.apache.camel.util.ObjectHelper; Modified: camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpConverter.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpConverter.java?rev=1131372&r1=1131371&r2=1131372&view=diff ============================================================================== --- camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpConverter.java (original) +++ camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpConverter.java Sat Jun 4 10:40:09 2011 @@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes import org.apache.camel.Converter; import org.apache.camel.Exchange; import org.apache.camel.Message; -import org.apache.camel.component.http4.helper.GZIPHelper; +import org.apache.camel.util.GZIPHelper; /** * Some converter methods making it easy to convert the body of a message to servlet types or to switch between Modified: camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java?rev=1131372&r1=1131371&r2=1131372&view=diff ============================================================================== --- camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java (original) +++ camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java Sat Jun 4 10:40:09 2011 @@ -22,8 +22,8 @@ import java.io.InputStream; import org.apache.camel.Converter; import org.apache.camel.Exchange; -import org.apache.camel.component.http4.helper.GZIPHelper; import org.apache.camel.util.ExchangeHelper; +import org.apache.camel.util.GZIPHelper; import org.apache.http.HttpEntity; import org.apache.http.entity.InputStreamEntity; @@ -77,7 +77,7 @@ public class HttpEntityConverter { InputStreamEntity entity = null; if (exchange != null && !exchange.getProperty(Exchange.SKIP_GZIP_ENCODING, Boolean.FALSE, Boolean.class)) { - entity = new InputStreamEntity(GZIPHelper.compressGzip(contentEncoding, data), -1); + entity = new InputStreamEntity(GZIPHelper.compressGzip(contentEncoding, data), -1); } else { entity = new InputStreamEntity(new ByteArrayInputStream(data), -1); } Modified: camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java?rev=1131372&r1=1131371&r2=1131372&view=diff ============================================================================== --- camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java (original) +++ camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java Sat Jun 4 10:40:09 2011 @@ -31,13 +31,13 @@ import org.apache.camel.CamelExchangeExc import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.file.GenericFile; -import org.apache.camel.component.http4.helper.GZIPHelper; import org.apache.camel.component.http4.helper.HttpHelper; import org.apache.camel.converter.IOConverter; import org.apache.camel.converter.stream.CachedOutputStream; import org.apache.camel.impl.DefaultProducer; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.util.ExchangeHelper; +import org.apache.camel.util.GZIPHelper; import org.apache.camel.util.IOHelper; import org.apache.http.Header; import org.apache.http.HttpEntity;