Repository: cxf Updated Branches: refs/heads/master-jaxrs-2.1 d634c7e7c -> e24fb5bcf (forced update)
Making some of CXF features auto-discoverable Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/131449dc Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/131449dc Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/131449dc Branch: refs/heads/master-jaxrs-2.1 Commit: 131449dc8bb210547ed01c4962e0f45a7bc86a6d Parents: e2efd03 Author: Sergey Beryozkin <sberyoz...@gmail.com> Authored: Mon Jul 18 10:11:06 2016 +0300 Committer: Sergey Beryozkin <sberyoz...@gmail.com> Committed: Mon Jul 18 10:11:06 2016 +0300 ---------------------------------------------------------------------- core/src/main/java/org/apache/cxf/feature/LoggingFeature.java | 3 +++ .../src/main/java/org/apache/cxf/clustering/FailoverFeature.java | 4 ++++ .../main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/131449dc/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java b/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java index 4a0c028..ebda1bf 100644 --- a/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java +++ b/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java @@ -20,6 +20,8 @@ package org.apache.cxf.feature; import org.apache.cxf.Bus; import org.apache.cxf.annotations.Logging; +import org.apache.cxf.annotations.Provider; +import org.apache.cxf.annotations.Provider.Type; import org.apache.cxf.common.injection.NoJSR250Annotations; import org.apache.cxf.interceptor.AbstractLoggingInterceptor; import org.apache.cxf.interceptor.InterceptorProvider; @@ -42,6 +44,7 @@ import org.apache.cxf.interceptor.LoggingOutInterceptor; </pre> */ @NoJSR250Annotations +@Provider(value = Type.Feature) public class LoggingFeature extends AbstractFeature { private static final int DEFAULT_LIMIT = AbstractLoggingInterceptor.DEFAULT_LIMIT; private static final LoggingInInterceptor IN = new LoggingInInterceptor(DEFAULT_LIMIT); http://git-wip-us.apache.org/repos/asf/cxf/blob/131449dc/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java ---------------------------------------------------------------------- diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java index c9278f4..a911445 100644 --- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java +++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java @@ -20,6 +20,9 @@ package org.apache.cxf.clustering; import org.apache.cxf.Bus; import org.apache.cxf.annotations.EvaluateAllEndpoints; +import org.apache.cxf.annotations.Provider; +import org.apache.cxf.annotations.Provider.Scope; +import org.apache.cxf.annotations.Provider.Type; import org.apache.cxf.common.injection.NoJSR250Annotations; import org.apache.cxf.endpoint.Client; import org.apache.cxf.endpoint.ConduitSelector; @@ -35,6 +38,7 @@ import org.apache.cxf.interceptor.InterceptorProvider; */ @NoJSR250Annotations @EvaluateAllEndpoints +@Provider(value = Type.Feature, scope = Scope.Client) public class FailoverFeature extends AbstractFeature { private FailoverStrategy failoverStrategy; http://git-wip-us.apache.org/repos/asf/cxf/blob/131449dc/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java ---------------------------------------------------------------------- diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java index bc9102f..2722c08 100644 --- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java +++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java @@ -37,6 +37,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.apache.cxf.annotations.Provider; +import org.apache.cxf.annotations.Provider.Scope; import org.apache.cxf.annotations.Provider.Type; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.endpoint.Server; @@ -54,7 +55,7 @@ import io.swagger.jaxrs.config.DefaultReaderConfig; import io.swagger.jaxrs.config.ReaderConfig; import io.swagger.jaxrs.listing.ApiListingResource; -@Provider(Type.Feature) +@Provider(value = Type.Feature, scope = Scope.Server) public class Swagger2Feature extends AbstractSwaggerFeature { protected boolean dynamicBasePath;
