FELIX-4796 : Log deprecation warning if Felix whiteboard is used
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1679549 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/whiteboard/pom.xml b/http/whiteboard/pom.xml
index d0ca3a3..9a2b49c 100644
--- a/http/whiteboard/pom.xml
+++ b/http/whiteboard/pom.xml
@@ -28,7 +28,7 @@
<name>Apache Felix Http Whiteboard</name>
<artifactId>org.apache.felix.http.whiteboard</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.3.3-SNAPSHOT</version>
<packaging>jar</packaging>
<scm>
diff --git a/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/tracker/FilterTracker.java b/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/tracker/FilterTracker.java
index 9ff5c64..b7c3cb6 100644
--- a/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/tracker/FilterTracker.java
+++ b/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/tracker/FilterTracker.java
@@ -18,6 +18,7 @@
import javax.servlet.Filter;
+import org.apache.felix.http.base.internal.logger.SystemLogger;
import org.apache.felix.http.whiteboard.HttpWhiteboardConstants;
import org.apache.felix.http.whiteboard.internal.manager.ExtenderManager;
import org.osgi.framework.BundleContext;
@@ -53,6 +54,10 @@
@Override
protected void added(Filter service, ServiceReference ref)
{
+ SystemLogger.warning("Deprecation warning: " +
+ "Filter registered through Apache Felix whiteboard service: " + ref +
+ ". Please change your code to the OSGi Whiteboard Service.", null);
+
this.manager.add(service, ref);
}
diff --git a/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/tracker/HttpContextTracker.java b/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/tracker/HttpContextTracker.java
index 9238d36..b89ae07 100644
--- a/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/tracker/HttpContextTracker.java
+++ b/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/tracker/HttpContextTracker.java
@@ -16,10 +16,11 @@
*/
package org.apache.felix.http.whiteboard.internal.tracker;
+import org.apache.felix.http.base.internal.logger.SystemLogger;
+import org.apache.felix.http.whiteboard.internal.manager.ExtenderManager;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.http.HttpContext;
-import org.apache.felix.http.whiteboard.internal.manager.ExtenderManager;
public final class HttpContextTracker
extends AbstractTracker<HttpContext>
@@ -32,17 +33,24 @@
this.manager = manager;
}
+ @Override
protected void added(HttpContext service, ServiceReference ref)
{
+ SystemLogger.warning("Deprecation warning: " +
+ "HttpContext registered through Apache Felix whiteboard service: " + ref +
+ ". Please change your code to the OSGi Whiteboard Service.", null);
+
this.manager.add(service, ref);
}
+ @Override
protected void modified(HttpContext service, ServiceReference ref)
{
removed(service, ref);
added(service, ref);
}
+ @Override
protected void removed(HttpContext service, ServiceReference ref)
{
this.manager.remove(service);
diff --git a/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/tracker/ServletTracker.java b/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/tracker/ServletTracker.java
index 39a25e0..0f2d8aa 100644
--- a/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/tracker/ServletTracker.java
+++ b/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/tracker/ServletTracker.java
@@ -18,6 +18,7 @@
import javax.servlet.Servlet;
+import org.apache.felix.http.base.internal.logger.SystemLogger;
import org.apache.felix.http.whiteboard.HttpWhiteboardConstants;
import org.apache.felix.http.whiteboard.internal.manager.ExtenderManager;
import org.osgi.framework.BundleContext;
@@ -53,6 +54,9 @@
@Override
protected void added(Servlet service, ServiceReference ref)
{
+ SystemLogger.warning("Deprecation warning: " +
+ "Servlet registered through Apache Felix whiteboard service: " + ref +
+ ". Please change your code to the OSGi Whiteboard Service.", null);
this.manager.add(service, ref);
}