Author: fmeschbe
Date: Mon Dec 8 14:12:45 2014
New Revision: 1643823
URL: http://svn.apache.org/r1643823
Log:
SLING-4227 Rename RuntimeExtension.SCR_PROP_NAME to NAME
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/extension/RuntimeExtension.java
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/ExtensionRegistryService.java
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/I18nRuntimeExtension.java
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/IncludeRuntimeExtension.java
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/ResourceRuntimeExtension.java
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/XSSRuntimeExtension.java
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/UseRuntimeExtension.java
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FormatFilter.java
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/JoinFilter.java
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/extension/RuntimeExtension.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/extension/RuntimeExtension.java?rev=1643823&r1=1643822&r2=1643823&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/extension/RuntimeExtension.java
(original)
+++
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/extension/RuntimeExtension.java
Mon Dec 8 14:12:45 2014
@@ -28,7 +28,13 @@ import aQute.bnd.annotation.ConsumerType
@ConsumerType
public interface RuntimeExtension {
- String SCR_PROP_NAME = "org.apache.sling.scripting.sightly.extension.name";
+ /**
+ * The name of the service registration property indicating the
+ * {@code RuntimeExtension} name. This service registration property is
+ * mandatory to register runtime extensions to the Sightly Engine and is of
+ * type String.
+ */
+ String NAME = "org.apache.sling.scripting.sightly.extension.name";
/**
* Provide an instance of this extension
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/ExtensionRegistryService.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/ExtensionRegistryService.java?rev=1643823&r1=1643822&r2=1643823&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/ExtensionRegistryService.java
(original)
+++
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/ExtensionRegistryService.java
Mon Dec 8 14:12:45 2014
@@ -54,7 +54,7 @@ public class ExtensionRegistryService {
@SuppressWarnings("UnusedDeclaration")
protected synchronized void bindExtensionService(RuntimeExtension
extension, Map<String, Object> properties) {
Integer newPriority =
PropertiesUtil.toInteger(properties.get(Constants.SERVICE_RANKING), 0);
- String extensionName =
PropertiesUtil.toString(properties.get(RuntimeExtension.SCR_PROP_NAME), "");
+ String extensionName =
PropertiesUtil.toString(properties.get(RuntimeExtension.NAME), "");
Integer priority =
PropertiesUtil.toInteger(mappingPriorities.get(extensionName), 0);
if (newPriority > priority) {
mapping = Collections.unmodifiableMap(add(mapping, extension,
extensionName));
@@ -70,7 +70,7 @@ public class ExtensionRegistryService {
@SuppressWarnings("UnusedDeclaration")
protected synchronized void unbindExtensionService(RuntimeExtension
extension, Map<String, Object> properties) {
- String extensionName =
PropertiesUtil.toString(properties.get(RuntimeExtension.SCR_PROP_NAME), "");
+ String extensionName =
PropertiesUtil.toString(properties.get(RuntimeExtension.NAME), "");
mappingPriorities.remove(extensionName);
mapping = Collections.unmodifiableMap(remove(mapping, extensionName));
}
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/I18nRuntimeExtension.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/I18nRuntimeExtension.java?rev=1643823&r1=1643822&r2=1643823&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/I18nRuntimeExtension.java
(original)
+++
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/I18nRuntimeExtension.java
Mon Dec 8 14:12:45 2014
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
@Component
@Service(RuntimeExtension.class)
@Properties({
- @Property(name = RuntimeExtension.SCR_PROP_NAME, value =
I18nFilter.FUNCTION)
+ @Property(name = RuntimeExtension.NAME, value = I18nFilter.FUNCTION)
})
public class I18nRuntimeExtension implements RuntimeExtension {
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/IncludeRuntimeExtension.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/IncludeRuntimeExtension.java?rev=1643823&r1=1643822&r2=1643823&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/IncludeRuntimeExtension.java
(original)
+++
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/IncludeRuntimeExtension.java
Mon Dec 8 14:12:45 2014
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
@Component
@Service(RuntimeExtension.class)
@Properties({
- @Property(name = RuntimeExtension.SCR_PROP_NAME, value =
IncludePlugin.FUNCTION)
+ @Property(name = RuntimeExtension.NAME, value = IncludePlugin.FUNCTION)
})
@SuppressWarnings("unused")
/**
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/ResourceRuntimeExtension.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/ResourceRuntimeExtension.java?rev=1643823&r1=1643822&r2=1643823&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/ResourceRuntimeExtension.java
(original)
+++
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/ResourceRuntimeExtension.java
Mon Dec 8 14:12:45 2014
@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
@Component
@Service(RuntimeExtension.class)
@Properties(
- @Property(name = RuntimeExtension.SCR_PROP_NAME, value =
ResourcePlugin.FUNCTION)
+ @Property(name = RuntimeExtension.NAME, value =
ResourcePlugin.FUNCTION)
)
@SuppressWarnings("unused")
public class ResourceRuntimeExtension implements RuntimeExtension {
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/XSSRuntimeExtension.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/XSSRuntimeExtension.java?rev=1643823&r1=1643822&r2=1643823&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/XSSRuntimeExtension.java
(original)
+++
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/XSSRuntimeExtension.java
Mon Dec 8 14:12:45 2014
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
@Component
@Service(RuntimeExtension.class)
@Properties(
- @Property(name = RuntimeExtension.SCR_PROP_NAME, value =
XSSFilter.FUNCTION_NAME)
+ @Property(name = RuntimeExtension.NAME, value =
XSSFilter.FUNCTION_NAME)
)
public class XSSRuntimeExtension implements RuntimeExtension {
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/UseRuntimeExtension.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/UseRuntimeExtension.java?rev=1643823&r1=1643822&r2=1643823&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/UseRuntimeExtension.java
(original)
+++
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/UseRuntimeExtension.java
Mon Dec 8 14:12:45 2014
@@ -52,7 +52,7 @@ import org.osgi.framework.ServiceReferen
@Component
@Service(RuntimeExtension.class)
@Properties(
- @Property(name = RuntimeExtension.SCR_PROP_NAME, value =
UsePlugin.FUNCTION_NAME)
+ @Property(name = RuntimeExtension.NAME, value =
UsePlugin.FUNCTION_NAME)
)
@Reference(
policy = ReferencePolicy.DYNAMIC,
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FormatFilter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FormatFilter.java?rev=1643823&r1=1643822&r2=1643823&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FormatFilter.java
(original)
+++
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FormatFilter.java
Mon Dec 8 14:12:45 2014
@@ -40,7 +40,7 @@ import org.apache.sling.scripting.sightl
@Component
@Service({Filter.class, RuntimeExtension.class})
@Properties({
- @Property(name = RuntimeExtension.SCR_PROP_NAME, value =
FormatFilter.FORMAT_FUNCTION)
+ @Property(name = RuntimeExtension.NAME, value =
FormatFilter.FORMAT_FUNCTION)
})
public class FormatFilter extends FilterComponent implements RuntimeExtension {
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/JoinFilter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/JoinFilter.java?rev=1643823&r1=1643822&r2=1643823&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/JoinFilter.java
(original)
+++
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/JoinFilter.java
Mon Dec 8 14:12:45 2014
@@ -40,7 +40,7 @@ import org.apache.sling.scripting.sightl
@Component
@Service({Filter.class, RuntimeExtension.class})
@Properties({
- @Property(name = RuntimeExtension.SCR_PROP_NAME, value =
JoinFilter.JOIN_FUNCTION)
+ @Property(name = RuntimeExtension.NAME, value =
JoinFilter.JOIN_FUNCTION)
})
public class JoinFilter extends FilterComponent implements RuntimeExtension {
