Author: olli Date: Tue Jun 17 04:25:34 2014 New Revision: 1603053 URL: http://svn.apache.org/r1603053 Log: SLING-3518 remove default name, don't use properties for label and description
Modified: sling/trunk/contrib/extensions/urlrewriter/src/main/java/org/apache/sling/urlrewriter/SlingUrlRewriteFilter.java sling/trunk/contrib/extensions/urlrewriter/src/main/resources/OSGI-INF/metatype/metatype.properties Modified: sling/trunk/contrib/extensions/urlrewriter/src/main/java/org/apache/sling/urlrewriter/SlingUrlRewriteFilter.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/urlrewriter/src/main/java/org/apache/sling/urlrewriter/SlingUrlRewriteFilter.java?rev=1603053&r1=1603052&r2=1603053&view=diff ============================================================================== --- sling/trunk/contrib/extensions/urlrewriter/src/main/java/org/apache/sling/urlrewriter/SlingUrlRewriteFilter.java (original) +++ sling/trunk/contrib/extensions/urlrewriter/src/main/java/org/apache/sling/urlrewriter/SlingUrlRewriteFilter.java Tue Jun 17 04:25:34 2014 @@ -56,9 +56,8 @@ import org.w3c.dom.Document; import org.xml.sax.helpers.DefaultHandler; @Component( - name = "org.apache.sling.urlrewriter.SlingUrlRewriteFilter", - label = "%org.apache.sling.urlrewriter.label", - description = "%org.apache.sling.urlrewriter.description", + label = "Apache Sling URL Rewriter", + description = "multi-purpose service for altering HTTP requests/responses based on Tuckey's UrlRewriteFilter", immediate = true, metatype = true ) Modified: sling/trunk/contrib/extensions/urlrewriter/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/urlrewriter/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1603053&r1=1603052&r2=1603053&view=diff ============================================================================== --- sling/trunk/contrib/extensions/urlrewriter/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ sling/trunk/contrib/extensions/urlrewriter/src/main/resources/OSGI-INF/metatype/metatype.properties Tue Jun 17 04:25:34 2014 @@ -23,7 +23,5 @@ service.ranking.description = service pr sling.filter.scope.name = filter scopes sling.filter.scope.description = see http://sling.apache.org/documentation/the-sling-engine/filters.html -org.apache.sling.urlrewriter.label = Apache Sling URL Rewriter -org.apache.sling.urlrewriter.description = multi-purpose service for altering HTTP requests/responses based on Tuckey's UrlRewriteFilter org.apache.sling.urlrewriter.rewrite.rules.name = rewrite rules (urlrewrite.xml) org.apache.sling.urlrewriter.rewrite.rules.description = see http://urlrewritefilter.googlecode.com/svn/trunk/src/doc/manual/4.0/index.html#configuration