cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1492332 - in /cxf/branches/2.6.x-fixes: api/src/main/java/org/apache/cxf/annotations/GZIP.java rt/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java
Date Wed, 12 Jun 2013 18:31:34 GMT
Author: dkulp
Date: Wed Jun 12 18:31:32 2013
New Revision: 1492332

URL: http://svn.apache.org/r1492332
Log:
Merged revisions 1492324 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1492324 | dkulp | 2013-06-12 14:24:13 -0400 (Wed, 12 Jun 2013) | 10 lines

  Merged revisions 1492290 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1492290 | dkulp | 2013-06-12 13:11:04 -0400 (Wed, 12 Jun 2013) | 2 lines

    Add force setting to @GZIP annotation

  ........

........

Modified:
    cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/annotations/GZIP.java
    cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java

Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/annotations/GZIP.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/annotations/GZIP.java?rev=1492332&r1=1492331&r2=1492332&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/annotations/GZIP.java (original)
+++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/annotations/GZIP.java Wed Jun
12 18:31:32 2013
@@ -33,5 +33,6 @@ import java.lang.annotation.Target;
 @Target({ ElementType.TYPE })
 public @interface GZIP {
     int threshold() default -1;
+    boolean force() default false;
 }
 

Modified: cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java?rev=1492332&r1=1492331&r2=1492332&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java
Wed Jun 12 18:31:32 2013
@@ -249,6 +249,7 @@ public class AnnotationsFactoryBeanListe
             try {
                 GZIPFeature feature = new GZIPFeature();
                 feature.setThreshold(annotation.threshold());
+                feature.setForce(annotation.force());
                 feature.initialize(ep, bus);
             } catch (Exception e) {
                 //ignore - just assume it's an unsupported/unknown annotation



Mime
View raw message