You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:24:13 UTC

[sling-org-apache-sling-urlrewriter] 05/10: SLING-3518 add a multipurpose filter based on Tuckey's UrlRewriteFilter

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.urlrewriter-0.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-urlrewriter.git

commit c9a65a2bfe11f18fe2a6bf6f80530d33b488ccc0
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Feb 14 16:39:53 2015 +0000

    SLING-3518 add a multipurpose filter based on Tuckey's UrlRewriteFilter
    
    * remove duplicate bundle settings
    * require configuration for component
    * make filter final
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/urlrewriter@1659805 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                                           | 2 --
 .../apache/sling/urlrewriter/internal/SlingUrlRewriteFilter.java  | 8 +++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4f5f441..328c0cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,8 +124,6 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-Category>sling</Bundle-Category>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Export-Package/>
             <Embed-Dependency>
               org.apache.sling.commons.osgi;inline="org/apache/sling/commons/osgi/PropertiesUtil.*"
diff --git a/src/main/java/org/apache/sling/urlrewriter/internal/SlingUrlRewriteFilter.java b/src/main/java/org/apache/sling/urlrewriter/internal/SlingUrlRewriteFilter.java
index fbc5d7f..6427889 100644
--- a/src/main/java/org/apache/sling/urlrewriter/internal/SlingUrlRewriteFilter.java
+++ b/src/main/java/org/apache/sling/urlrewriter/internal/SlingUrlRewriteFilter.java
@@ -37,6 +37,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import org.apache.commons.io.IOUtils;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Modified;
 import org.apache.felix.scr.annotations.Properties;
@@ -59,7 +60,8 @@ import org.xml.sax.helpers.DefaultHandler;
     label = "Apache Sling URL Rewriter",
     description = "multi-purpose service for altering HTTP requests/responses based on Tuckey's UrlRewriteFilter",
     immediate = true,
-    metatype = true
+    metatype = true,
+    policy = ConfigurationPolicy.REQUIRE
 )
 @Service
 @Properties({
@@ -68,7 +70,7 @@ import org.xml.sax.helpers.DefaultHandler;
     @Property(name = Constants.SERVICE_RANKING, intValue = 0, propertyPrivate = false),
     @Property(name = EngineConstants.SLING_FILTER_SCOPE, value = {EngineConstants.FILTER_SCOPE_REQUEST, EngineConstants.FILTER_SCOPE_FORWARD})
 })
-public class SlingUrlRewriteFilter implements Filter {
+public final class SlingUrlRewriteFilter implements Filter {
 
     private UrlRewriter rewriter;
 
@@ -101,7 +103,7 @@ public class SlingUrlRewriteFilter implements Filter {
         clearRewriter();
     }
 
-    private synchronized void configure(final ComponentContext context) {
+    private void configure(final ComponentContext context) {
         logger.info("configuring URL rewriter");
         final Dictionary properties = context.getProperties();
         final String rules = PropertiesUtil.toString(properties.get(REWRITE_RULES_PARAMETER), DEFAULT_REWRITE_RULES);

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.