You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:13:42 UTC
[sling-org-apache-sling-scripting-thymeleaf] 31/50: rename
NonCachingTemplateResolver to SlingResourceTemplateResolver (still
non-caching, but the default one)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.thymeleaf-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-thymeleaf.git
commit 6b468dfea6a1110cc04e448ceead6f4b05c9dc3b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon May 16 08:50:35 2016 +0000
rename NonCachingTemplateResolver to SlingResourceTemplateResolver (still non-caching, but the default one)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf@1743996 13f79535-47bb-0310-9956-ffa450edef68
---
README.md | 2 +-
...eResolver.java => SlingResourceTemplateResolver.java} | 16 ++++++++--------
...a => SlingResourceTemplateResolverConfiguration.java} | 6 +++---
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
index e993c62..3c7f095 100644
--- a/README.md
+++ b/README.md
@@ -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`
diff --git a/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java b/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java
similarity index 86%
rename from src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java
rename to src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java
index 4a369e9..70b79be 100644
--- a/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java
+++ b/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java
@@ -47,14 +47,14 @@ import org.thymeleaf.templateresource.ITemplateResource;
@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 implements ITemplateResolver {
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 implements ITemplateResolver {
}
@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 implements ITemplateResolver {
logger.debug("deactivate");
}
- private void configure(final NonCachingTemplateResolverConfiguration configuration) {
+ private void configure(final SlingResourceTemplateResolverConfiguration configuration) {
order = configuration.order();
}
diff --git a/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolverConfiguration.java b/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolverConfiguration.java
similarity index 84%
rename from src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolverConfiguration.java
rename to src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolverConfiguration.java
index 54edd53..27d7685 100644
--- a/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolverConfiguration.java
+++ b/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolverConfiguration.java
@@ -22,10 +22,10 @@ import org.osgi.service.metatype.annotations.AttributeDefinition;
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",
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.