commit eafab7956b5992bc8c3dde2325329674d4a14bc7
author Sten Roger Sandvik <srs@apache.org> Thu Sep 24 21:12:15 2009 +0000
committer Sten Roger Sandvik <srs@apache.org> Thu Sep 24 21:12:15 2009 +0000
tree 8eb15c7af295b0e2078fed3818eec4082e9dea97
parent 3ec5809586bc79e0385e3471fe83f618777a2d18

Fixed whiteboard httpservice detection.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@818627 13f79535-47bb-0310-9956-ffa450edef68

http/whiteboard/pom.xml

diff --git a/http/whiteboard/pom.xml b/http/whiteboard/pom.xml
index 888a0cc..eb48e15 100644
--- a/http/whiteboard/pom.xml
+++ b/http/whiteboard/pom.xml
@@ -42,12 +42,14 @@
                             org.apache.felix.http.whiteboard.internal.WhiteboardActivator
                         </Bundle-Activator>
                         <Private-Package>
+                            org.apache.felix.http.api,
                             org.apache.felix.http.base.*,
                             org.apache.felix.http.whiteboard.*
                         </Private-Package>
                         <Import-Package>
                             javax.servlet.*,
                             org.osgi.service.http.*,
+                            org.apache.felix.http.api;resolution:=optional,
                             *;resolution:=optional
                         </Import-Package>
                     </instructions>

http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java

diff --git a/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java b/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java
index 063116b..2ebe6a2 100644
--- a/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java
+++ b/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java
@@ -143,7 +143,7 @@
         if (this.httpService instanceof ExtHttpService) {
             SystemLogger.info("Detected extended HttpService. Filters enabled.");
         } else {
-            SystemLogger.info("Standard HttpService. Filters disabled.");
+            SystemLogger.info("Detected standard HttpService. Filters disabled.");
         }
 
         registerAll();