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 D40B317B69 for ; Wed, 14 Jan 2015 09:59:28 +0000 (UTC) Received: (qmail 76170 invoked by uid 500); 14 Jan 2015 09:59:30 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 76115 invoked by uid 500); 14 Jan 2015 09:59:30 -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 76105 invoked by uid 99); 14 Jan 2015 09:59:30 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Jan 2015 09:59:30 +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 CD4ECAC010F; Wed, 14 Jan 2015 09:59:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1651612 - /felix/sandbox/http-rfc189/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManager.java Date: Wed, 14 Jan 2015 09:59:24 -0000 To: commits@felix.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150114095929.CD4ECAC010F@hades.apache.org> Author: cziegeler Date: Wed Jan 14 09:59:24 2015 New Revision: 1651612 URL: http://svn.apache.org/r1651612 Log: Set filter and servlet name if not configured Modified: felix/sandbox/http-rfc189/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManager.java Modified: felix/sandbox/http-rfc189/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManager.java URL: http://svn.apache.org/viewvc/felix/sandbox/http-rfc189/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManager.java?rev=1651612&r1=1651611&r2=1651612&view=diff ============================================================================== --- felix/sandbox/http-rfc189/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManager.java (original) +++ felix/sandbox/http-rfc189/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManager.java Wed Jan 14 09:59:24 2015 @@ -289,10 +289,14 @@ public final class ExtenderManager this.contextManager.ungetHttpContext(bundle, contextId, mapping); } - public void add(Filter service, ServiceReference ref) + public void add(final Filter service, final ServiceReference ref) { FilterInfo filterInfo = new FilterInfo(); filterInfo.name = getStringProperty(ref, HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME); + if ( filterInfo.name == null || filterInfo.name.isEmpty() ) + { + filterInfo.name = service.getClass().getName(); + } filterInfo.asyncSupported = getBooleanProperty(ref, HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_ASYNC_SUPPORTED); filterInfo.servletNames = getStringArrayProperty(ref, HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_SERVLET); filterInfo.patterns = getStringArrayProperty(ref, HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN); @@ -334,6 +338,10 @@ public final class ExtenderManager { ServletInfo servletInfo = new ServletInfo(); servletInfo.name = getStringProperty(ref, HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME); + if ( servletInfo.name == null || servletInfo.name.isEmpty() ) + { + servletInfo.name = service.getClass().getName(); + } servletInfo.errorPage = getStringArrayProperty(ref, HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_ERROR_PAGE); servletInfo.patterns = getStringArrayProperty(ref, HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN); servletInfo.asyncSupported = getBooleanProperty(ref, HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_ASYNC_SUPPORTED); @@ -365,7 +373,7 @@ public final class ExtenderManager } } - ServletMapping mapping = new ServletMapping(ref.getBundle(), service, servletInfo); + final ServletMapping mapping = new ServletMapping(ref.getBundle(), service, servletInfo); servletInfo.context = getHttpContext(mapping, ref); // XXX addInitParams(ref, mapping); addMapping(TYPE_SERVLET, ref, mapping);