Return-Path: 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 7869C18AA4 for ; Fri, 9 Oct 2015 15:38:27 +0000 (UTC) Received: (qmail 2059 invoked by uid 500); 9 Oct 2015 15:38:24 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 1940 invoked by uid 500); 9 Oct 2015 15:38:24 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 1863 invoked by uid 99); 9 Oct 2015 15:38:24 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Oct 2015 15:38:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 702E0DFD7A; Fri, 9 Oct 2015 15:38:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <5c89a1350d754926ac92469edb6a6359@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-6637] Making @GZIP/etc annotations @Inherited Date: Fri, 9 Oct 2015 15:38:23 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 56c896ffc -> 4f42074c5 [CXF-6637] Making @GZIP/etc annotations @Inherited Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4f42074c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4f42074c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4f42074c Branch: refs/heads/2.7.x-fixes Commit: 4f42074c5f4482c45670a7e727a3076c1dcae06d Parents: 56c896f Author: Sergey Beryozkin Authored: Fri Oct 9 16:34:47 2015 +0100 Committer: Sergey Beryozkin Committed: Fri Oct 9 16:38:02 2015 +0100 ---------------------------------------------------------------------- api/src/main/java/org/apache/cxf/annotations/DataBinding.java | 2 ++ .../main/java/org/apache/cxf/annotations/EndpointProperties.java | 2 ++ api/src/main/java/org/apache/cxf/annotations/EndpointProperty.java | 2 ++ api/src/main/java/org/apache/cxf/annotations/FastInfoset.java | 2 ++ api/src/main/java/org/apache/cxf/annotations/GZIP.java | 2 ++ api/src/main/java/org/apache/cxf/annotations/Policies.java | 2 ++ api/src/main/java/org/apache/cxf/annotations/Policy.java | 2 ++ api/src/main/java/org/apache/cxf/annotations/UseAsyncMethod.java | 2 ++ .../main/java/org/apache/cxf/annotations/WSDLDocumentation.java | 2 ++ .../org/apache/cxf/annotations/WSDLDocumentationCollection.java | 2 ++ api/src/main/java/org/apache/cxf/feature/Features.java | 2 ++ 11 files changed, 22 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/4f42074c/api/src/main/java/org/apache/cxf/annotations/DataBinding.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/cxf/annotations/DataBinding.java b/api/src/main/java/org/apache/cxf/annotations/DataBinding.java index bde8521..4fdf090 100644 --- a/api/src/main/java/org/apache/cxf/annotations/DataBinding.java +++ b/api/src/main/java/org/apache/cxf/annotations/DataBinding.java @@ -21,6 +21,7 @@ package org.apache.cxf.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -31,6 +32,7 @@ import java.lang.annotation.Target; @Documented @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) +@Inherited public @interface DataBinding { Class value(); http://git-wip-us.apache.org/repos/asf/cxf/blob/4f42074c/api/src/main/java/org/apache/cxf/annotations/EndpointProperties.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/cxf/annotations/EndpointProperties.java b/api/src/main/java/org/apache/cxf/annotations/EndpointProperties.java index 05f8612..c223741 100644 --- a/api/src/main/java/org/apache/cxf/annotations/EndpointProperties.java +++ b/api/src/main/java/org/apache/cxf/annotations/EndpointProperties.java @@ -21,6 +21,7 @@ package org.apache.cxf.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -31,6 +32,7 @@ import java.lang.annotation.Target; @Documented @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) +@Inherited public @interface EndpointProperties { /** http://git-wip-us.apache.org/repos/asf/cxf/blob/4f42074c/api/src/main/java/org/apache/cxf/annotations/EndpointProperty.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/cxf/annotations/EndpointProperty.java b/api/src/main/java/org/apache/cxf/annotations/EndpointProperty.java index b80069e..0893697 100644 --- a/api/src/main/java/org/apache/cxf/annotations/EndpointProperty.java +++ b/api/src/main/java/org/apache/cxf/annotations/EndpointProperty.java @@ -21,6 +21,7 @@ package org.apache.cxf.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -31,6 +32,7 @@ import java.lang.annotation.Target; @Documented @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) +@Inherited public @interface EndpointProperty { /** http://git-wip-us.apache.org/repos/asf/cxf/blob/4f42074c/api/src/main/java/org/apache/cxf/annotations/FastInfoset.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/cxf/annotations/FastInfoset.java b/api/src/main/java/org/apache/cxf/annotations/FastInfoset.java index 0b7b1fe..1082d8c 100644 --- a/api/src/main/java/org/apache/cxf/annotations/FastInfoset.java +++ b/api/src/main/java/org/apache/cxf/annotations/FastInfoset.java @@ -21,6 +21,7 @@ package org.apache.cxf.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -31,6 +32,7 @@ import java.lang.annotation.Target; @Documented @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) +@Inherited public @interface FastInfoset { /** * Set to true in order for FastInfoset to be always used without negotiation http://git-wip-us.apache.org/repos/asf/cxf/blob/4f42074c/api/src/main/java/org/apache/cxf/annotations/GZIP.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/cxf/annotations/GZIP.java b/api/src/main/java/org/apache/cxf/annotations/GZIP.java index 209feef..5a697a9 100644 --- a/api/src/main/java/org/apache/cxf/annotations/GZIP.java +++ b/api/src/main/java/org/apache/cxf/annotations/GZIP.java @@ -21,6 +21,7 @@ package org.apache.cxf.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -31,6 +32,7 @@ import java.lang.annotation.Target; @Documented @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) +@Inherited public @interface GZIP { int threshold() default -1; boolean force() default false; http://git-wip-us.apache.org/repos/asf/cxf/blob/4f42074c/api/src/main/java/org/apache/cxf/annotations/Policies.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/cxf/annotations/Policies.java b/api/src/main/java/org/apache/cxf/annotations/Policies.java index 5cb881d..1313b5d 100644 --- a/api/src/main/java/org/apache/cxf/annotations/Policies.java +++ b/api/src/main/java/org/apache/cxf/annotations/Policies.java @@ -22,6 +22,7 @@ package org.apache.cxf.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -35,6 +36,7 @@ import java.lang.annotation.Target; @Documented @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE, ElementType.METHOD }) +@Inherited public @interface Policies { Policy[] value(); } http://git-wip-us.apache.org/repos/asf/cxf/blob/4f42074c/api/src/main/java/org/apache/cxf/annotations/Policy.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/cxf/annotations/Policy.java b/api/src/main/java/org/apache/cxf/annotations/Policy.java index 0f83fac..2967f5c 100644 --- a/api/src/main/java/org/apache/cxf/annotations/Policy.java +++ b/api/src/main/java/org/apache/cxf/annotations/Policy.java @@ -21,6 +21,7 @@ package org.apache.cxf.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -31,6 +32,7 @@ import java.lang.annotation.Target; @Documented @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE, ElementType.METHOD }) +@Inherited public @interface Policy { String uri(); http://git-wip-us.apache.org/repos/asf/cxf/blob/4f42074c/api/src/main/java/org/apache/cxf/annotations/UseAsyncMethod.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/cxf/annotations/UseAsyncMethod.java b/api/src/main/java/org/apache/cxf/annotations/UseAsyncMethod.java index 926e94c..dd48501 100644 --- a/api/src/main/java/org/apache/cxf/annotations/UseAsyncMethod.java +++ b/api/src/main/java/org/apache/cxf/annotations/UseAsyncMethod.java @@ -21,6 +21,7 @@ package org.apache.cxf.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -57,6 +58,7 @@ import java.lang.annotation.Target; @Documented @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD }) +@Inherited public @interface UseAsyncMethod { /** http://git-wip-us.apache.org/repos/asf/cxf/blob/4f42074c/api/src/main/java/org/apache/cxf/annotations/WSDLDocumentation.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/cxf/annotations/WSDLDocumentation.java b/api/src/main/java/org/apache/cxf/annotations/WSDLDocumentation.java index 6e12418..6cb9a64 100644 --- a/api/src/main/java/org/apache/cxf/annotations/WSDLDocumentation.java +++ b/api/src/main/java/org/apache/cxf/annotations/WSDLDocumentation.java @@ -22,6 +22,7 @@ package org.apache.cxf.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -33,6 +34,7 @@ import java.lang.annotation.Target; @Documented @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE, ElementType.METHOD }) +@Inherited public @interface WSDLDocumentation { /** * The documentation to add http://git-wip-us.apache.org/repos/asf/cxf/blob/4f42074c/api/src/main/java/org/apache/cxf/annotations/WSDLDocumentationCollection.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/cxf/annotations/WSDLDocumentationCollection.java b/api/src/main/java/org/apache/cxf/annotations/WSDLDocumentationCollection.java index f4c99af..be9dd6c 100644 --- a/api/src/main/java/org/apache/cxf/annotations/WSDLDocumentationCollection.java +++ b/api/src/main/java/org/apache/cxf/annotations/WSDLDocumentationCollection.java @@ -22,6 +22,7 @@ package org.apache.cxf.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -35,6 +36,7 @@ import java.lang.annotation.Target; @Documented @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE, ElementType.METHOD }) +@Inherited public @interface WSDLDocumentationCollection { WSDLDocumentation[] value(); http://git-wip-us.apache.org/repos/asf/cxf/blob/4f42074c/api/src/main/java/org/apache/cxf/feature/Features.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/cxf/feature/Features.java b/api/src/main/java/org/apache/cxf/feature/Features.java index 6d3acae..7e82423 100644 --- a/api/src/main/java/org/apache/cxf/feature/Features.java +++ b/api/src/main/java/org/apache/cxf/feature/Features.java @@ -19,12 +19,14 @@ package org.apache.cxf.feature; import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) +@Inherited public @interface Features { String[] features() default { };