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 4556B117E3 for ; Thu, 24 Apr 2014 13:10:56 +0000 (UTC) Received: (qmail 75112 invoked by uid 500); 24 Apr 2014 13:10:54 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 75065 invoked by uid 500); 24 Apr 2014 13:10:54 -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 75058 invoked by uid 99); 24 Apr 2014 13:10:54 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Apr 2014 13:10:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DF219990F41; Thu, 24 Apr 2014 13:10:53 +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: X-Mailer: ASF-Git Admin Mailer Subject: git commit: [CXF-5410] Making sure does not affect the conduit configurers Date: Thu, 24 Apr 2014 13:10:53 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 7215e8683 -> 37a9b1f83 [CXF-5410] Making sure does not affect the conduit configurers Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/37a9b1f8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/37a9b1f8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/37a9b1f8 Branch: refs/heads/master Commit: 37a9b1f838670705504221aa0d7bac15957f0529 Parents: 7215e86 Author: Sergey Beryozkin Authored: Thu Apr 24 14:10:39 2014 +0100 Committer: Sergey Beryozkin Committed: Thu Apr 24 14:10:39 2014 +0100 ---------------------------------------------------------------------- .../http/osgi/HTTPTransportActivator.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/37a9b1f8/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java ---------------------------------------------------------------------- diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java index b0dff63..375046d 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java @@ -43,28 +43,32 @@ import org.osgi.service.cm.ManagedServiceFactory; public class HTTPTransportActivator implements BundleActivator { - - private static final String DISABLE_DEFAULT_HTTP_TRANSPORT = "org.apache.cxf.osgi.http.transport.disable"; + private static final String CXF_CONFIG_SCOPE = "org.apache.cxf.osgi"; + private static final String DISABLE_DEFAULT_HTTP_TRANSPORT = CXF_CONFIG_SCOPE + ".http.transport.disable"; public void start(BundleContext context) throws Exception { + ConfigAdminHttpConduitConfigurer conduitConfigurer = new ConfigAdminHttpConduitConfigurer(); + + registerService(context, ManagedServiceFactory.class, conduitConfigurer, + ConfigAdminHttpConduitConfigurer.FACTORY_PID); + registerService(context, HTTPConduitConfigurer.class, conduitConfigurer, + "org.apache.cxf.http.conduit-configurer"); + if (PropertyUtils.isTrue(context.getProperty(DISABLE_DEFAULT_HTTP_TRANSPORT))) { + //TODO: Review if it also makes sense to support "http.transport.disable" + // directly in the CXF_CONFIG_SCOPE properties file return; } - ConfigAdminHttpConduitConfigurer conduitConfigurer = new ConfigAdminHttpConduitConfigurer(); DestinationRegistry destinationRegistry = new DestinationRegistryImpl(); HTTPTransportFactory transportFactory = new HTTPTransportFactory(destinationRegistry); Servlet servlet = new CXFNonSpringServlet(destinationRegistry , false); ServletConfigurer servletConfig = new ServletConfigurer(context, servlet); - registerService(context, ManagedServiceFactory.class, conduitConfigurer, - ConfigAdminHttpConduitConfigurer.FACTORY_PID); - registerService(context, HTTPConduitConfigurer.class, conduitConfigurer, - "org.apache.cxf.http.conduit-configurer"); context.registerService(DestinationRegistry.class.getName(), destinationRegistry, null); context.registerService(HTTPTransportFactory.class.getName(), transportFactory, null); - registerService(context, ManagedService.class, servletConfig, "org.apache.cxf.osgi"); + registerService(context, ManagedService.class, servletConfig, CXF_CONFIG_SCOPE); BlueprintNameSpaceHandlerFactory factory = new BlueprintNameSpaceHandlerFactory() {