Author: olli
Date: Fri Jul 1 14:57:45 2016
New Revision: 1750950
URL: http://svn.apache.org/viewvc?rev=1750950&view=rev
Log:
SLING-5075 Upgrade Thymeleaf to 3.0
tweak names and descriptions
Modified:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/PatternTemplateModeProvider.java
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/PatternTemplateModeProviderConfiguration.java
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolverConfiguration.java
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactoryConfiguration.java
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/dialect/SlingDialect.java
Modified:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/PatternTemplateModeProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/PatternTemplateModeProvider.java?rev=1750950&r1=1750949&r2=1750950&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/PatternTemplateModeProvider.java
(original)
+++
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/PatternTemplateModeProvider.java
Fri Jul 1 14:57:45 2016
@@ -38,7 +38,7 @@ import org.thymeleaf.util.PatternSpec;
@Component(
immediate = true,
property = {
- Constants.SERVICE_DESCRIPTION + "=Pattern TemplateMode Provider for
Sling Scripting Thymeleaf",
+ Constants.SERVICE_DESCRIPTION + "=Pattern TemplateModeProvider for
Sling Scripting Thymeleaf",
Constants.SERVICE_VENDOR + "=The Apache Software Foundation"
}
)
Modified:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/PatternTemplateModeProviderConfiguration.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/PatternTemplateModeProviderConfiguration.java?rev=1750950&r1=1750949&r2=1750950&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/PatternTemplateModeProviderConfiguration.java
(original)
+++
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/PatternTemplateModeProviderConfiguration.java
Fri Jul 1 14:57:45 2016
@@ -22,8 +22,8 @@ import org.osgi.service.metatype.annotat
import org.osgi.service.metatype.annotations.ObjectClassDefinition;
@ObjectClassDefinition(
- name = "Apache Sling Scripting Thymeleaf âPattern TemplateMode
Providerâ",
- description = "pattern template mode provider for Sling Scripting
Thymeleaf"
+ name = "Apache Sling Scripting Thymeleaf âPattern
TemplateModeProviderâ",
+ description = "Provides template modes by matching template paths against
configured patterns."
)
@interface PatternTemplateModeProviderConfiguration {
Modified:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java?rev=1750950&r1=1750949&r2=1750950&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java
(original)
+++
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java
Fri Jul 1 14:57:45 2016
@@ -48,7 +48,7 @@ import org.thymeleaf.templateresource.IT
@Component(
immediate = true,
property = {
- Constants.SERVICE_DESCRIPTION + "=Sling resource template resolver for
Sling Scripting Thymeleaf",
+ Constants.SERVICE_DESCRIPTION + "=Sling Resource TemplateResolver for
Sling Scripting Thymeleaf",
Constants.SERVICE_VENDOR + "=The Apache Software Foundation"
}
)
Modified:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolverConfiguration.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolverConfiguration.java?rev=1750950&r1=1750949&r2=1750950&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolverConfiguration.java
(original)
+++
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolverConfiguration.java
Fri Jul 1 14:57:45 2016
@@ -23,7 +23,7 @@ import org.osgi.service.metatype.annotat
@ObjectClassDefinition(
name = "Apache Sling Scripting Thymeleaf âSling Resource
TemplateResolverâ",
- description = "Sling resource template resolver for Sling Scripting
Thymeleaf"
+ description = "Resolves template resources by using Sling's resource
resolver from script bindings."
)
@interface SlingResourceTemplateResolverConfiguration {
Modified:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java?rev=1750950&r1=1750949&r2=1750950&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java
(original)
+++
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java
Fri Jul 1 14:57:45 2016
@@ -60,7 +60,7 @@ import org.thymeleaf.templateresolver.IT
service = ScriptEngineFactory.class,
immediate = true,
property = {
- Constants.SERVICE_DESCRIPTION + "=Scripting engine for Thymeleaf
templates",
+ Constants.SERVICE_DESCRIPTION + "=ScriptEngineFactory for Sling
Scripting Thymeleaf",
Constants.SERVICE_VENDOR + "=The Apache Software Foundation"
}
)
Modified:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactoryConfiguration.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactoryConfiguration.java?rev=1750950&r1=1750949&r2=1750950&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactoryConfiguration.java
(original)
+++
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactoryConfiguration.java
Fri Jul 1 14:57:45 2016
@@ -22,8 +22,8 @@ import org.osgi.service.metatype.annotat
import org.osgi.service.metatype.annotations.ObjectClassDefinition;
@ObjectClassDefinition(
- name = "Apache Sling Scripting Thymeleaf âScriptEngine Factoryâ",
- description = "scripting engine for Thymeleaf templates"
+ name = "Apache Sling Scripting Thymeleaf âScriptEngineFactoryâ",
+ description = "Script engine factory for Thymeleaf's template engine."
)
@interface ThymeleafScriptEngineFactoryConfiguration {
Modified:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/dialect/SlingDialect.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/dialect/SlingDialect.java?rev=1750950&r1=1750949&r2=1750950&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/dialect/SlingDialect.java
(original)
+++
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/dialect/SlingDialect.java
Fri Jul 1 14:57:45 2016
@@ -32,7 +32,7 @@ import org.thymeleaf.processor.IProcesso
service = IDialect.class,
immediate = true,
property = {
- Constants.SERVICE_DESCRIPTION + "=Sling dialect for Sling Scripting
Thymeleaf",
+ Constants.SERVICE_DESCRIPTION + "=Sling Dialect for Sling Scripting
Thymeleaf",
Constants.SERVICE_VENDOR + "=The Apache Software Foundation"
}
)
