Return-Path: 
 <commits-return-19106-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-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 4A52191A4
	for <apmail-cxf-commits-archive@www.apache.org>;
 Fri,  6 Apr 2012 18:00:29 +0000 (UTC)
Received: (qmail 90575 invoked by uid 500); 6 Apr 2012 18:00:29 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 90519 invoked by uid 500); 6 Apr 2012 18:00:29 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 90510 invoked by uid 99); 6 Apr 2012 18:00:29 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Apr 2012 18:00:29 +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; Fri, 06 Apr 2012 18:00:26 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 66D9523889BB;
	Fri,  6 Apr 2012 18:00:05 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1310517 - in /cxf/branches/2.3.x-fixes: ./
 rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
Date: Fri, 06 Apr 2012 18:00:05 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120406180005.66D9523889BB@eris.apache.org>

Author: dkulp
Date: Fri Apr  6 18:00:04 2012
New Revision: 1310517

URL: http://svn.apache.org/viewvc?rev=1310517&view=rev
Log:
Merged revisions 1310471 via  svn merge from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

........
  r1310471 | dkulp | 2012-04-06 12:45:45 -0400 (Fri, 06 Apr 2012) | 10 lines
  
  Merged revisions 1310441 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1310441 | dkulp | 2012-04-06 12:18:23 -0400 (Fri, 06 Apr 2012) | 2 lines
    
    [CXF-4230] Updating Javadoc of GZIPFeature, patch from Simon Olofsson
    applied with thanks
  ........
  
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java?rev=1310517&r1=1310516&r2=1310517&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java Fri Apr  6 18:00:04 2012
@@ -37,23 +37,15 @@ import org.apache.cxf.message.Message;
  * <![CDATA[
  * <jaxws:endpoint ...>
  *   <jaxws:features>
- *     <bean class="org.apache.cxf.transport.http.gzip.GZIPFeature"/>
+ *     <bean class="org.apache.cxf.transport.common.gzip.GZIPFeature"/>
  *   </jaxws:features>
  * </jaxws:endpoint>
  * ]]>
  * </pre>
- * Attaching this feature to a client will cause outgoing request messages to
- * be compressed and incoming compressed responses to be uncompressed.  If you
- * want the service to know that your client can accept compressed responses,
- * you will also need to set the "AcceptEncoding" value in the relevant HTTP
- * conduit client configuration.
- * <pre>
- * <![CDATA[
- * <http-conf:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
- *   <http-conf:client AcceptEncoding="gzip" />
- * </http-conf:conduit>
- * ]]>
- * </pre>
+ * Attaching this feature to a client will cause outgoing request messages 
+ * to be compressed and incoming compressed responses to be uncompressed. 
+ * Accept-Encoding header is sent to let the service know 
+ * that your client can accept compressed responses. 
  */
 @NoJSR250Annotations
 public class GZIPFeature extends AbstractFeature {