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 2016/05/16 08:50:35 UTC
svn commit: r1743996 - in
/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf: ./
src/main/java/org/apache/sling/scripting/thymeleaf/internal/
Author: olli
Date: Mon May 16 08:50:35 2016
New Revision: 1743996
URL: http://svn.apache.org/viewvc?rev=1743996&view=rev
Log:
rename NonCachingTemplateResolver to SlingResourceTemplateResolver (still non-caching, but the default one)
Added:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java
- copied, changed from r1743923, sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolverConfiguration.java
- copied, changed from r1743923, sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolverConfiguration.java
Removed:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolverConfiguration.java
Modified:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/README.md
Modified: sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/README.md
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/README.md?rev=1743996&r1=1743995&r2=1743996&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/README.md (original)
+++ sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/README.md Mon May 16 08:50:35 2016
@@ -7,7 +7,7 @@ Features
--------
* Supporting all of Thymeleaf's extension points: _TemplateResolver_s, _MessageResolver_s, _Dialect_s, _LinkBuilder_s, _DecoupledTemplateLogicResolver_, _CacheManager_ and _EngineContextFactory_
-* `NonCachingTemplateResolver` customizable through `TemplateModeProvider`
+* `SlingResourceTemplateResolver` customizable through `TemplateModeProvider`
* `MessageResolver` backed by `ResourceBundleProvider` from `org.apache.sling.i18n` customizable through optional `AbsentMessageRepresentationProvider`
* `PatternSpecTemplateModeProvider` supporting `PatternSpec` configurations for all template modes (`HTML`, `XML`, `TEXT`, `JAVASCRIPT`, `CSS` and `RAW`)
* `SlingDialect`
Copied: sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java (from r1743923, sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.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?p2=sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java&p1=sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java&r1=1743923&r2=1743996&rev=1743996&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java (original)
+++ sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java Mon May 16 08:50:35 2016
@@ -47,14 +47,14 @@ import org.thymeleaf.templateresource.IT
@Component(
immediate = true,
property = {
- Constants.SERVICE_DESCRIPTION + "=Non-caching template resolver for Sling Scripting Thymeleaf",
+ Constants.SERVICE_DESCRIPTION + "=Sling resource template resolver for Sling Scripting Thymeleaf",
Constants.SERVICE_VENDOR + "=The Apache Software Foundation"
}
)
@Designate(
- ocd = NonCachingTemplateResolverConfiguration.class
+ ocd = SlingResourceTemplateResolverConfiguration.class
)
-public class NonCachingTemplateResolver implements ITemplateResolver {
+public class SlingResourceTemplateResolver implements ITemplateResolver {
@Reference(
cardinality = ReferenceCardinality.OPTIONAL,
@@ -67,9 +67,9 @@ public class NonCachingTemplateResolver
private Integer order;
- private final Logger logger = LoggerFactory.getLogger(NonCachingTemplateResolver.class);
+ private final Logger logger = LoggerFactory.getLogger(SlingResourceTemplateResolver.class);
- public NonCachingTemplateResolver() {
+ public SlingResourceTemplateResolver() {
}
public void setTemplateModeProvider(final TemplateModeProvider templateModeProvider) {
@@ -81,13 +81,13 @@ public class NonCachingTemplateResolver
}
@Activate
- private void activate(final NonCachingTemplateResolverConfiguration configuration) {
+ private void activate(final SlingResourceTemplateResolverConfiguration configuration) {
logger.debug("activate");
configure(configuration);
}
@Modified
- private void modified(final NonCachingTemplateResolverConfiguration configuration) {
+ private void modified(final SlingResourceTemplateResolverConfiguration configuration) {
logger.debug("modified");
configure(configuration);
}
@@ -97,7 +97,7 @@ public class NonCachingTemplateResolver
logger.debug("deactivate");
}
- private void configure(final NonCachingTemplateResolverConfiguration configuration) {
+ private void configure(final SlingResourceTemplateResolverConfiguration configuration) {
order = configuration.order();
}
Copied: sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolverConfiguration.java (from r1743923, sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolverConfiguration.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?p2=sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolverConfiguration.java&p1=sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolverConfiguration.java&r1=1743923&r2=1743996&rev=1743996&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolverConfiguration.java (original)
+++ sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolverConfiguration.java Mon May 16 08:50:35 2016
@@ -22,10 +22,10 @@ import org.osgi.service.metatype.annotat
import org.osgi.service.metatype.annotations.ObjectClassDefinition;
@ObjectClassDefinition(
- name = "Apache Sling Scripting Thymeleaf “Non-Caching Template Resolver”",
- description = "non-caching template resolver for Sling Scripting Thymeleaf"
+ name = "Apache Sling Scripting Thymeleaf “Sling resource Template Resolver”",
+ description = "Sling resource template resolver for Sling Scripting Thymeleaf"
)
-@interface NonCachingTemplateResolverConfiguration {
+@interface SlingResourceTemplateResolverConfiguration {
@AttributeDefinition(
name = "order",