Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-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 A638618B01 for ; Thu, 25 Jun 2015 21:13:08 +0000 (UTC) Received: (qmail 31728 invoked by uid 500); 25 Jun 2015 21:13:08 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 31691 invoked by uid 500); 25 Jun 2015 21:13:08 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 31682 invoked by uid 99); 25 Jun 2015 21:13:08 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jun 2015 21:13:08 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 7051CAC08F4 for ; Thu, 25 Jun 2015 21:13:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1687648 - /felix/trunk/http/bridge/src/main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java Date: Thu, 25 Jun 2015 21:13:08 -0000 To: commits@felix.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150625211308.7051CAC08F4@hades.apache.org> Author: cziegeler Date: Thu Jun 25 21:13:08 2015 New Revision: 1687648 URL: http://svn.apache.org/r1687648 Log: Update description Modified: felix/trunk/http/bridge/src/main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java Modified: felix/trunk/http/bridge/src/main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java URL: http://svn.apache.org/viewvc/felix/trunk/http/bridge/src/main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java?rev=1687648&r1=1687647&r2=1687648&view=diff ============================================================================== --- felix/trunk/http/bridge/src/main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java (original) +++ felix/trunk/http/bridge/src/main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java Thu Jun 25 21:13:08 2015 @@ -36,24 +36,27 @@ public final class BridgeActivator exten private static final String VENDOR = "The Apache Software Foundation"; + private static final String MARKER_PROP = "http.felix.dispatcher"; + @Override protected void doStart() throws Exception { super.doStart(); // dispatcher servlet + final Object servlet = getDispatcherServlet(); Hashtable props = new Hashtable(); - props.put("http.felix.dispatcher", getDispatcherServlet().getClass().getName()); - props.put(Constants.SERVICE_DESCRIPTION, "Dispatcher for bridged request handling"); + props.put(MARKER_PROP, servlet.getClass().getName()); + props.put(Constants.SERVICE_DESCRIPTION, "Apache Felix Http Dispatcher for bridged request handling"); props.put(Constants.SERVICE_VENDOR, VENDOR); - getBundleContext().registerService(HttpServlet.class.getName(), getDispatcherServlet(), props); + getBundleContext().registerService(HttpServlet.class.getName(), servlet, props); // Http Session event dispatcher final EventDispatcher dispatcher = getEventDispatcher(); dispatcher.setActive(true); props = new Hashtable(); - props.put("http.felix.dispatcher", dispatcher.getClass().getName()); - props.put(Constants.SERVICE_DESCRIPTION, "Dispatcher for bridged HttpSession events"); + props.put(MARKER_PROP, dispatcher.getClass().getName()); + props.put(Constants.SERVICE_DESCRIPTION, "Apache Felix Http Dispatcher for bridged event handling"); props.put(Constants.SERVICE_VENDOR, VENDOR); getBundleContext().registerService(EventListener.class.getName(), dispatcher, props); @@ -66,6 +69,6 @@ public final class BridgeActivator exten this.getHttpServiceController().setProperties(serviceRegProps); } - SystemLogger.info("Started bridged http service"); + SystemLogger.info("Started bridged http services"); } }