You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/04/06 20:00:05 UTC
svn commit: r1310517 - in /cxf/branches/2.3.x-fixes: ./
rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
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 {