svn commit: r1843662 - in /felix/trunk/http/sslfilter: pom.xml src/main/java/org/apache/felix/http/sslfilter/internal/SslFilter.java src/main/java/org/apache/felix/http/sslfilter/internal/SslFilterActivator.java

[pauls]

Author: pauls
Date: Fri Oct 12 13:07:41 2018
New Revision: 1843662

URL: http://svn.apache.org/viewvc?rev=1843662&view=rev
Log:
FELIX-5964: Make tls work with anonymous pages by registering the filter as 
Preprocessor with the whiteboard (patch provided by Antonio Sanso - thanks)

Modified:
    felix/trunk/http/sslfilter/pom.xml
    
felix/trunk/http/sslfilter/src/main/java/org/apache/felix/http/sslfilter/internal/SslFilter.java
    
felix/trunk/http/sslfilter/src/main/java/org/apache/felix/http/sslfilter/internal/SslFilterActivator.java

Modified: felix/trunk/http/sslfilter/pom.xml
URL: 
http://svn.apache.org/viewvc/felix/trunk/http/sslfilter/pom.xml?rev=1843662&r1=1843661&r2=1843662&view=diff
==============================================================================
--- felix/trunk/http/sslfilter/pom.xml (original)
+++ felix/trunk/http/sslfilter/pom.xml Fri Oct 12 13:07:41 2018
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.http.whiteboard</artifactId>
-            <version>1.0.0</version>
+            <version>1.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: 
felix/trunk/http/sslfilter/src/main/java/org/apache/felix/http/sslfilter/internal/SslFilter.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/http/sslfilter/src/main/java/org/apache/felix/http/sslfilter/internal/SslFilter.java?rev=1843662&r1=1843661&r2=1843662&view=diff
==============================================================================
--- 
felix/trunk/http/sslfilter/src/main/java/org/apache/felix/http/sslfilter/internal/SslFilter.java
 (original)
+++ 
felix/trunk/http/sslfilter/src/main/java/org/apache/felix/http/sslfilter/internal/SslFilter.java
 Fri Oct 12 13:07:41 2018
@@ -35,10 +35,11 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 
 import org.osgi.service.cm.ConfigurationException;
+import org.osgi.service.http.whiteboard.Preprocessor;
 import org.osgi.service.log.LogService;
 
 @SuppressWarnings("rawtypes")
-public class SslFilter implements Filter
+public class SslFilter implements  Preprocessor
 {
     public static final String PID = 
"org.apache.felix.http.sslfilter.SslFilter";
 

Modified: 
felix/trunk/http/sslfilter/src/main/java/org/apache/felix/http/sslfilter/internal/SslFilterActivator.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/http/sslfilter/src/main/java/org/apache/felix/http/sslfilter/internal/SslFilterActivator.java?rev=1843662&r1=1843661&r2=1843662&view=diff
==============================================================================
--- 
felix/trunk/http/sslfilter/src/main/java/org/apache/felix/http/sslfilter/internal/SslFilterActivator.java
 (original)
+++ 
felix/trunk/http/sslfilter/src/main/java/org/apache/felix/http/sslfilter/internal/SslFilterActivator.java
 Fri Oct 12 13:07:41 2018
@@ -21,8 +21,6 @@ package org.apache.felix.http.sslfilter.
 import java.util.Dictionary;
 import java.util.Hashtable;
 
-import javax.servlet.Filter;
-
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
@@ -32,6 +30,7 @@ import org.osgi.framework.ServiceRegistr
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.cm.ManagedService;
 import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
+import org.osgi.service.http.whiteboard.Preprocessor;
 import org.osgi.service.log.LogService;
 
 public class SslFilterActivator implements BundleActivator
@@ -84,7 +83,7 @@ public class SslFilterActivator implemen
         properties.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT, 
"(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=*)");
         properties.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, 
"/");
 
-        this.filterReg = context.registerService(Filter.class.getName(), 
filter, properties);
+        this.filterReg = context.registerService(Preprocessor.class.getName(), 
filter, properties);
 
         SystemLogger.log(LogService.LOG_DEBUG, "SSL filter registered...");
     }