You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2013/09/27 15:21:00 UTC

svn commit: r1526893 - /sling/trunk/contrib/extensions/startup-filter/src/main/java/org/apache/sling/startupfilter/impl/StartupFilterImpl.java

Author: bdelacretaz
Date: Fri Sep 27 13:21:00 2013
New Revision: 1526893

URL: http://svn.apache.org/r1526893
Log:
SLING-3119 - log filter pattern when activated

Modified:
    sling/trunk/contrib/extensions/startup-filter/src/main/java/org/apache/sling/startupfilter/impl/StartupFilterImpl.java

Modified: sling/trunk/contrib/extensions/startup-filter/src/main/java/org/apache/sling/startupfilter/impl/StartupFilterImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/startup-filter/src/main/java/org/apache/sling/startupfilter/impl/StartupFilterImpl.java?rev=1526893&r1=1526892&r2=1526893&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/startup-filter/src/main/java/org/apache/sling/startupfilter/impl/StartupFilterImpl.java (original)
+++ sling/trunk/contrib/extensions/startup-filter/src/main/java/org/apache/sling/startupfilter/impl/StartupFilterImpl.java Fri Sep 27 13:21:00 2013
@@ -79,7 +79,7 @@ public class StartupFilterImpl implement
     @Reference(cardinality=ReferenceCardinality.OPTIONAL_UNARY, policy=ReferencePolicy.DYNAMIC)
     private StartupFilterDisabler startupFilterDisabler;
 
-    private final String FRAMEWORK_PROP_MANAGER_ROOT = "felix.webconsole.manager.root";
+    private static final String FRAMEWORK_PROP_MANAGER_ROOT = "felix.webconsole.manager.root";
     static final String DEFAULT_MANAGER_ROOT = "/system/console";
     private String managerRoot;
     
@@ -179,12 +179,13 @@ public class StartupFilterImpl implement
     
     public synchronized void enable() {
         if(filterServiceRegistration == null) {
+            final String pattern = "^(?!"+ managerRoot +")(.+)";
             final Hashtable<String, Object> params = new Hashtable<String, Object>();
             params.put(Constants.SERVICE_RANKING, 0x9000); // run before RequestLoggerFilter (0x8000)
             params.put("filter.scope", "REQUEST");
-            params.put("pattern", "^(?!"+ managerRoot +")(.+)");
+            params.put("pattern", pattern);
             filterServiceRegistration = bundleContext.registerService(Filter.class.getName(), this, params);
-            log.info("Registered {} as a Filter service", this);
+            log.info("Registered {} as a Filter service with pattern {}", this, pattern);
         }
     }