This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tracer.git
commit 6d042ef2653ba5cd5e5078ea64c3fa22c937955f Author: Chetan Mehrotra <[email protected]> AuthorDate: Mon Oct 3 11:41:30 2016 +0000 SLING-6089 - Log Tracer does not work with system having new HTTP whiteboard implementation As mentioned by Robert using constant does not lead to adding package dependency on the constant class package git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1763155 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 7 ++++++- src/main/java/org/apache/sling/tracer/internal/LogTracer.java | 11 ++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 8c68597..8291063 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,12 @@ <version>3.0.0</version> <scope>provided</scope> </dependency> - + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.http.whiteboard</artifactId> + <version>1.0.0</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --git a/src/main/java/org/apache/sling/tracer/internal/LogTracer.java b/src/main/java/org/apache/sling/tracer/internal/LogTracer.java index c9ec0e6..714f02b 100644 --- a/src/main/java/org/apache/sling/tracer/internal/LogTracer.java +++ b/src/main/java/org/apache/sling/tracer/internal/LogTracer.java @@ -54,6 +54,7 @@ import org.apache.sling.commons.osgi.PropertiesUtil; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.osgi.framework.ServiceRegistration; +import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; import org.slf4j.LoggerFactory; import org.slf4j.Marker; @@ -272,14 +273,10 @@ public class LogTracer { Dictionary<String, Object> filterProps = new Hashtable<String, Object>(); filterProps.put("pattern", "/.*"); - //Do not use constant name to keep dependency as optional - //filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, "/"); - //filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT, - // "(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=*)"); + filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, "/"); + filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT, + "(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=*)"); - filterProps.put("osgi.http.whiteboard.filter.pattern", "/"); - filterProps.put("osgi.http.whiteboard.context.select", - "(osgi.http.whiteboard.context.name=*)"); filterProps.put(Constants.SERVICE_DESCRIPTION, "Servlet Filter required for Log Tracer"); filterRegistration = context.registerService(Filter.class.getName(), new TracerFilter(), filterProps); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
