You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2015/02/08 16:54:06 UTC

svn commit: r1658198 - /sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/

Author: olli
Date: Sun Feb  8 15:54:05 2015
New Revision: 1658198

URL: http://svn.apache.org/r1658198
Log:
SLING-4396 make template mode handlers configuration driven

* add configuration policy “require”
* remove default patterns value

Modified:
    sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/AbstractTemplateModeHandler.java
    sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/Html5TemplateModeHandler.java
    sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/LegacyHtml5TemplateModeHandler.java
    sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/ValidatingXhtmlTemplateModeHandler.java
    sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/ValidatingXmlTemplateModeHandler.java
    sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/XhtmlTemplateModeHandler.java
    sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/XmlTemplateModeHandler.java

Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/AbstractTemplateModeHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/AbstractTemplateModeHandler.java?rev=1658198&r1=1658197&r2=1658198&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/AbstractTemplateModeHandler.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/AbstractTemplateModeHandler.java Sun Feb  8 15:54:05 2015
@@ -73,7 +73,7 @@ public abstract class AbstractTemplateMo
 
     protected abstract void configure(final ComponentContext componentContext);
 
-    protected synchronized void configurePatternSpec(final String[] strings) {
+    protected void configurePatternSpec(final String[] strings) {
         final Set<String> set = new HashSet<String>();
         Collections.addAll(set, strings);
         final PatternSpec patternSpec = new PatternSpec(); // isInitialized() is private, so create a new PatternSpec

Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/Html5TemplateModeHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/Html5TemplateModeHandler.java?rev=1658198&r1=1658197&r2=1658198&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/Html5TemplateModeHandler.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/Html5TemplateModeHandler.java Sun Feb  8 15:54:05 2015
@@ -21,6 +21,7 @@ package org.apache.sling.scripting.thyme
 import java.util.Dictionary;
 
 import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
 import org.apache.felix.scr.annotations.Properties;
 import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.PropertyUnbounded;
@@ -35,7 +36,8 @@ import org.thymeleaf.templatewriter.Xhtm
     label = "Apache Sling Scripting Thymeleaf “HTML5 Template Mode Handler”",
     description = "HTML5 template mode handler for Sling Scripting Thymeleaf",
     immediate = true,
-    metatype = true
+    metatype = true,
+    policy = ConfigurationPolicy.REQUIRE
 )
 @Service
 @Properties({
@@ -46,18 +48,16 @@ public class Html5TemplateModeHandler ex
 
     public static final String TEMPLATE_MODE_NAME = "HTML5";
 
-    public static final String DEFAULT_PATTERN = "*.html";
-
-    @Property(value = {DEFAULT_PATTERN}, unbounded = PropertyUnbounded.ARRAY)
+    @Property(unbounded = PropertyUnbounded.ARRAY)
     public static final String PATTERNS_PARAMETER = "org.apache.sling.scripting.thymeleaf.internal.templatemodehandler.Html5TemplateModeHandler.patterns";
 
     public Html5TemplateModeHandler() {
         super(TEMPLATE_MODE_NAME, new XhtmlAndHtml5NonValidatingSAXTemplateParser(poolSize()), new XhtmlHtml5TemplateWriter());
     }
 
-    protected synchronized void configure(final ComponentContext componentContext) {
+    protected void configure(final ComponentContext componentContext) {
         final Dictionary properties = componentContext.getProperties();
-        final String[] strings = PropertiesUtil.toStringArray(properties.get(PATTERNS_PARAMETER), new String[]{DEFAULT_PATTERN});
+        final String[] strings = PropertiesUtil.toStringArray(properties.get(PATTERNS_PARAMETER), new String[]{});
         configurePatternSpec(strings);
     }
 

Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/LegacyHtml5TemplateModeHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/LegacyHtml5TemplateModeHandler.java?rev=1658198&r1=1658197&r2=1658198&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/LegacyHtml5TemplateModeHandler.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/LegacyHtml5TemplateModeHandler.java Sun Feb  8 15:54:05 2015
@@ -21,6 +21,7 @@ package org.apache.sling.scripting.thyme
 import java.util.Dictionary;
 
 import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
 import org.apache.felix.scr.annotations.Properties;
 import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.PropertyUnbounded;
@@ -35,7 +36,8 @@ import org.thymeleaf.templatewriter.XmlT
     label = "Apache Sling Scripting Thymeleaf “Legacy HTML5 Template Mode Handler”",
     description = "legacy HTML5 template mode handler for Sling Scripting Thymeleaf",
     immediate = true,
-    metatype = true
+    metatype = true,
+    policy = ConfigurationPolicy.REQUIRE
 )
 @Service
 @Properties({
@@ -46,18 +48,16 @@ public class LegacyHtml5TemplateModeHand
 
     public static final String TEMPLATE_MODE_NAME = "LEGACYHTML5";
 
-    public static final String DEFAULT_PATTERN = "*.html";
-
-    @Property(value = {DEFAULT_PATTERN}, unbounded = PropertyUnbounded.ARRAY)
+    @Property(unbounded = PropertyUnbounded.ARRAY)
     public static final String PATTERNS_PARAMETER = "org.apache.sling.scripting.thymeleaf.internal.templatemodehandler.LegacyHtml5TemplateModeHandler.patterns";
 
     public LegacyHtml5TemplateModeHandler() {
         super(TEMPLATE_MODE_NAME, new LegacyHtml5TemplateParser(TEMPLATE_MODE_NAME, poolSize()), new XmlTemplateWriter());
     }
 
-    protected synchronized void configure(final ComponentContext componentContext) {
+    protected void configure(final ComponentContext componentContext) {
         final Dictionary properties = componentContext.getProperties();
-        final String[] strings = PropertiesUtil.toStringArray(properties.get(PATTERNS_PARAMETER), new String[]{DEFAULT_PATTERN});
+        final String[] strings = PropertiesUtil.toStringArray(properties.get(PATTERNS_PARAMETER), new String[]{});
         configurePatternSpec(strings);
     }
 

Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/ValidatingXhtmlTemplateModeHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/ValidatingXhtmlTemplateModeHandler.java?rev=1658198&r1=1658197&r2=1658198&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/ValidatingXhtmlTemplateModeHandler.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/ValidatingXhtmlTemplateModeHandler.java Sun Feb  8 15:54:05 2015
@@ -21,6 +21,7 @@ package org.apache.sling.scripting.thyme
 import java.util.Dictionary;
 
 import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
 import org.apache.felix.scr.annotations.Properties;
 import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.PropertyUnbounded;
@@ -35,7 +36,8 @@ import org.thymeleaf.templatewriter.Xhtm
     label = "Apache Sling Scripting Thymeleaf “Validating XHTML Template Mode Handler”",
     description = "validating XHTML template mode handler for Sling Scripting Thymeleaf",
     immediate = true,
-    metatype = true
+    metatype = true,
+    policy = ConfigurationPolicy.REQUIRE
 )
 @Service
 @Properties({
@@ -46,18 +48,16 @@ public class ValidatingXhtmlTemplateMode
 
     public static final String TEMPLATE_MODE_NAME = "VALIDXHTML";
 
-    public static final String DEFAULT_PATTERN = "*.xhtml";
-
-    @Property(value = {DEFAULT_PATTERN}, unbounded = PropertyUnbounded.ARRAY)
+    @Property(unbounded = PropertyUnbounded.ARRAY)
     public static final String PATTERNS_PARAMETER = "org.apache.sling.scripting.thymeleaf.internal.templatemodehandler.ValidatingXhtmlTemplateModeHandler.patterns";
 
     public ValidatingXhtmlTemplateModeHandler() {
         super(TEMPLATE_MODE_NAME, new XhtmlAndHtml5NonValidatingSAXTemplateParser(poolSize()), new XhtmlHtml5TemplateWriter());
     }
 
-    protected synchronized void configure(final ComponentContext componentContext) {
+    protected void configure(final ComponentContext componentContext) {
         final Dictionary properties = componentContext.getProperties();
-        final String[] strings = PropertiesUtil.toStringArray(properties.get(PATTERNS_PARAMETER), new String[]{DEFAULT_PATTERN});
+        final String[] strings = PropertiesUtil.toStringArray(properties.get(PATTERNS_PARAMETER), new String[]{});
         configurePatternSpec(strings);
     }
 

Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/ValidatingXmlTemplateModeHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/ValidatingXmlTemplateModeHandler.java?rev=1658198&r1=1658197&r2=1658198&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/ValidatingXmlTemplateModeHandler.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/ValidatingXmlTemplateModeHandler.java Sun Feb  8 15:54:05 2015
@@ -21,6 +21,7 @@ package org.apache.sling.scripting.thyme
 import java.util.Dictionary;
 
 import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
 import org.apache.felix.scr.annotations.Properties;
 import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.PropertyUnbounded;
@@ -35,7 +36,8 @@ import org.thymeleaf.templatewriter.XmlT
     label = "Apache Sling Scripting Thymeleaf “Validating XML Template Mode Handler”",
     description = "validating XML template mode handler for Sling Scripting Thymeleaf",
     immediate = true,
-    metatype = true
+    metatype = true,
+    policy = ConfigurationPolicy.REQUIRE
 )
 @Service
 @Properties({
@@ -46,18 +48,16 @@ public class ValidatingXmlTemplateModeHa
 
     public static final String TEMPLATE_MODE_NAME = "VALIDXML";
 
-    public static final String DEFAULT_PATTERN = "*.xml";
-
-    @Property(value = {DEFAULT_PATTERN}, unbounded = PropertyUnbounded.ARRAY)
+    @Property(unbounded = PropertyUnbounded.ARRAY)
     public static final String PATTERNS_PARAMETER = "org.apache.sling.scripting.thymeleaf.internal.templatemodehandler.ValidatingXmlTemplateModeHandler.patterns";
 
     public ValidatingXmlTemplateModeHandler() {
         super(TEMPLATE_MODE_NAME, new XmlValidatingSAXTemplateParser(poolSize()), new XmlTemplateWriter());
     }
 
-    protected synchronized void configure(final ComponentContext componentContext) {
+    protected void configure(final ComponentContext componentContext) {
         final Dictionary properties = componentContext.getProperties();
-        final String[] strings = PropertiesUtil.toStringArray(properties.get(PATTERNS_PARAMETER), new String[]{DEFAULT_PATTERN});
+        final String[] strings = PropertiesUtil.toStringArray(properties.get(PATTERNS_PARAMETER), new String[]{});
         configurePatternSpec(strings);
     }
 

Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/XhtmlTemplateModeHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/XhtmlTemplateModeHandler.java?rev=1658198&r1=1658197&r2=1658198&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/XhtmlTemplateModeHandler.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/XhtmlTemplateModeHandler.java Sun Feb  8 15:54:05 2015
@@ -21,6 +21,7 @@ package org.apache.sling.scripting.thyme
 import java.util.Dictionary;
 
 import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
 import org.apache.felix.scr.annotations.Properties;
 import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.PropertyUnbounded;
@@ -35,7 +36,8 @@ import org.thymeleaf.templatewriter.Xhtm
     label = "Apache Sling Scripting Thymeleaf “XHTML Template Mode Handler”",
     description = "XHTML template mode handler for Sling Scripting Thymeleaf",
     immediate = true,
-    metatype = true
+    metatype = true,
+    policy = ConfigurationPolicy.REQUIRE
 )
 @Service
 @Properties({
@@ -46,18 +48,16 @@ public class XhtmlTemplateModeHandler ex
 
     public static final String TEMPLATE_MODE_NAME = "XHTML";
 
-    public static final String DEFAULT_PATTERN = "*.xhtml";
-
-    @Property(value = {DEFAULT_PATTERN}, unbounded = PropertyUnbounded.ARRAY)
+    @Property(unbounded = PropertyUnbounded.ARRAY)
     public static final String PATTERNS_PARAMETER = "org.apache.sling.scripting.thymeleaf.internal.templatemodehandler.XhtmlTemplateModeHandler.patterns";
 
     public XhtmlTemplateModeHandler() {
         super(TEMPLATE_MODE_NAME, new XhtmlAndHtml5NonValidatingSAXTemplateParser(poolSize()), new XhtmlHtml5TemplateWriter());
     }
 
-    protected synchronized void configure(final ComponentContext componentContext) {
+    protected void configure(final ComponentContext componentContext) {
         final Dictionary properties = componentContext.getProperties();
-        final String[] strings = PropertiesUtil.toStringArray(properties.get(PATTERNS_PARAMETER), new String[]{DEFAULT_PATTERN});
+        final String[] strings = PropertiesUtil.toStringArray(properties.get(PATTERNS_PARAMETER), new String[]{});
         configurePatternSpec(strings);
     }
 

Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/XmlTemplateModeHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/XmlTemplateModeHandler.java?rev=1658198&r1=1658197&r2=1658198&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/XmlTemplateModeHandler.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/templatemodehandler/XmlTemplateModeHandler.java Sun Feb  8 15:54:05 2015
@@ -21,6 +21,7 @@ package org.apache.sling.scripting.thyme
 import java.util.Dictionary;
 
 import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
 import org.apache.felix.scr.annotations.Properties;
 import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.PropertyUnbounded;
@@ -35,7 +36,8 @@ import org.thymeleaf.templatewriter.XmlT
     label = "Apache Sling Scripting Thymeleaf “XML Template Mode Handler”",
     description = "XML template mode handler for Sling Scripting Thymeleaf",
     immediate = true,
-    metatype = true
+    metatype = true,
+    policy = ConfigurationPolicy.REQUIRE
 )
 @Service
 @Properties({
@@ -46,18 +48,16 @@ public class XmlTemplateModeHandler exte
 
     public static final String TEMPLATE_MODE_NAME = "XML";
 
-    public static final String DEFAULT_PATTERN = "*.xml";
-
-    @Property(value = {DEFAULT_PATTERN}, unbounded = PropertyUnbounded.ARRAY)
+    @Property(unbounded = PropertyUnbounded.ARRAY)
     public static final String PATTERNS_PARAMETER = "org.apache.sling.scripting.thymeleaf.internal.templatemodehandler.XmlTemplateModeHandler.patterns";
 
     public XmlTemplateModeHandler() {
         super(TEMPLATE_MODE_NAME, new XmlNonValidatingSAXTemplateParser(poolSize()), new XmlTemplateWriter());
     }
 
-    protected synchronized void configure(final ComponentContext componentContext) {
+    protected void configure(final ComponentContext componentContext) {
         final Dictionary properties = componentContext.getProperties();
-        final String[] strings = PropertiesUtil.toStringArray(properties.get(PATTERNS_PARAMETER), new String[]{DEFAULT_PATTERN});
+        final String[] strings = PropertiesUtil.toStringArray(properties.get(PATTERNS_PARAMETER), new String[]{});
         configurePatternSpec(strings);
     }