This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch feature/SLING-10001-scripting-engines in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-impl.git
commit 0a4b21735b3a082e7504aad426841fde1cd12866 Author: Stefan Seifert <[email protected]> AuthorDate: Fri Dec 17 08:52:13 2021 +0100 SLING-10001 make scripting engines for HTL Bindings Value Provider configurable (still default to sightly) --- .../caconfig/impl/ConfigurationBindingsValueProvider.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBindingsValueProvider.java b/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBindingsValueProvider.java index 7daca90..5e7373c 100644 --- a/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBindingsValueProvider.java +++ b/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBindingsValueProvider.java @@ -33,10 +33,10 @@ import org.apache.sling.caconfig.management.multiplexer.ConfigurationMetadataPro import org.apache.sling.caconfig.spi.ConfigurationMetadataProvider; import org.apache.sling.caconfig.spi.metadata.ConfigurationMetadata; import org.apache.sling.scripting.api.BindingsValuesProvider; -import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; +import org.osgi.service.component.propertytypes.ServiceRanking; import org.osgi.service.metatype.annotations.AttributeDefinition; import org.osgi.service.metatype.annotations.Designate; import org.osgi.service.metatype.annotations.ObjectClassDefinition; @@ -45,9 +45,8 @@ import org.osgi.service.metatype.annotations.ObjectClassDefinition; * Binds a script variable "caconfig" to the current configuration value map to be * used in HTL (Sightly). */ -@Component(immediate = true, service = BindingsValuesProvider.class, property = { - "javax.script.name=sightly", - Constants.SERVICE_RANKING + "=100" }) +@Component(immediate = true, service = BindingsValuesProvider.class) +@ServiceRanking(100) @Designate(ocd = ConfigurationBindingsValueProvider.Config.class) public class ConfigurationBindingsValueProvider implements BindingsValuesProvider { @@ -57,13 +56,16 @@ public class ConfigurationBindingsValueProvider implements BindingsValuesProvide */ public static final String BINDING_VARIABLE = "caconfig"; - @ObjectClassDefinition(name = "Apache Sling Context-Aware Configuration HTL Binding Values Provider", - description = "Binds a script variable '" + BINDING_VARIABLE + "' to the HTL/Sightly scripting context.") + @ObjectClassDefinition(name = "Apache Sling Context-Aware Configuration HTL Bindings Value Provider", + description = "Binds a script variable '" + BINDING_VARIABLE + "' to the scripting context.") static @interface Config { @AttributeDefinition(name = "Enabled", description = "Enable provider.") boolean enabled() default true; + @AttributeDefinition(name = "Scripting Engines", description = "Enable bindings value provider for the given scripting engines.") + String[] javax_script_name() default { "sightly" }; + } @Reference
