You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2016/08/26 09:18:48 UTC
svn commit: r1757801 - in /sling/trunk/testing/tools: pom.xml
src/main/java/org/apache/sling/testing/tools/junit/TestNameLoggingFilter.java
src/main/java/org/apache/sling/testing/tools/junit/package-info.java
Author: cziegeler
Date: Fri Aug 26 09:18:48 2016
New Revision: 1757801
URL: http://svn.apache.org/viewvc?rev=1757801&view=rev
Log:
SLING-6012 : Register filter through http whiteboard
Modified:
sling/trunk/testing/tools/pom.xml
sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/junit/TestNameLoggingFilter.java
sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/junit/package-info.java
Modified: sling/trunk/testing/tools/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/tools/pom.xml?rev=1757801&r1=1757800&r2=1757801&view=diff
==============================================================================
--- sling/trunk/testing/tools/pom.xml (original)
+++ sling/trunk/testing/tools/pom.xml Fri Aug 26 09:18:48 2016
@@ -74,6 +74,12 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http.whiteboard</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
Modified: sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/junit/TestNameLoggingFilter.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/junit/TestNameLoggingFilter.java?rev=1757801&r1=1757800&r2=1757801&view=diff
==============================================================================
--- sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/junit/TestNameLoggingFilter.java (original)
+++ sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/junit/TestNameLoggingFilter.java Fri Aug 26 09:18:48 2016
@@ -30,8 +30,10 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
@@ -42,25 +44,31 @@ import org.slf4j.MDC;
*/
@Component
@Service
-@Property(name = "pattern",value="/.*")
+@Properties({
+ @Property(name = HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, value="/"),
+ @Property(name = HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,
+ value = "(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=*)")
+})
public class TestNameLoggingFilter implements Filter{
private Logger log = LoggerFactory.getLogger(getClass());
+ @Override
public void init(FilterConfig filterConfig) throws ServletException {
// nothing to init
}
+ @Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
throws IOException, ServletException {
final HttpServletRequest httpRequest = (HttpServletRequest) servletRequest;
final String className = httpRequest.getHeader(TEST_CLASS);
-
+
if(className == null) {
filterChain.doFilter(servletRequest,servletResponse);
return;
}
-
+
final String testName = httpRequest.getHeader(TEST_NAME);
try {
MDC.put(TEST_NAME,testName);
@@ -78,6 +86,7 @@ public class TestNameLoggingFilter imple
}
}
+ @Override
public void destroy() {
// nothing to destroy
}
Modified: sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/junit/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/junit/package-info.java?rev=1757801&r1=1757800&r2=1757801&view=diff
==============================================================================
--- sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/junit/package-info.java (original)
+++ sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/junit/package-info.java Fri Aug 26 09:18:48 2016
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("2.0.0")
+@Version("2.0.2")
package org.apache.sling.testing.tools.junit;
import aQute.bnd.annotation.Version;