svn commit: r1754766 - /sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java

[cziegeler]

Author: cziegeler
Date: Mon Aug  1 15:04:26 2016
New Revision: 1754766

URL: http://svn.apache.org/viewvc?rev=1754766&view=rev
Log:
SLING-5936 : Log warning if old "filter.scope" or "filter.order" property is 
used to register a Sling filter

Modified:
    
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java

Modified: 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java?rev=1754766&r1=1754765&r2=1754766&view=diff
==============================================================================
--- 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java
 (original)
+++ 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java
 Mon Aug  1 15:04:26 2016
@@ -90,12 +90,6 @@ public class ServletFilterManager extend
         }
     }
 
-    /**
-     * The service property used by Felix's HttpService whiteboard
-     * implementation.
-     */
-    private static String FELIX_WHITEBOARD_PATTERN_PROPERTY = "pattern";
-
     /** default log */
     private final Logger log = LoggerFactory.getLogger(getClass());
 
@@ -209,6 +203,8 @@ public class ServletFilterManager extend
                 // addition we allow different types than Integer
                 orderObj = reference.getProperty(EngineConstants.FILTER_ORDER);
                 if (orderObj != null) {
+                    log.warn("Filter service {} is using deprecated property 
{}. Use {} instead.",
+                            new Object[] {reference, 
EngineConstants.FILTER_ORDER, Constants.SERVICE_RANKING});
                     // we can use 0 as the default as this will be applied
                     // in the next step anyway if this props contains an
                     // invalid value
@@ -231,6 +227,8 @@ public class ServletFilterManager extend
             if ( scopes == null ) {
                 scopes = OsgiUtil.toStringArray(
                     reference.getProperty(EngineConstants.FILTER_SCOPE), null);
+                log.warn("Filter service {} is using deprecated property {}. 
Use {} instead.",
+                        new Object[] {reference, EngineConstants.FILTER_SCOPE, 
EngineConstants.SLING_FILTER_SCOPE});
             }
             if (scopes != null && scopes.length > 0) {
                 for (String scope : scopes) {