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 2018/09/07 20:16:32 UTC
[sling-org-apache-sling-scripting-freemarker] branch master updated
(551b18c -> c226e0b)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-freemarker.git.
from 551b18c SLING-7893 Update Pax Exam to 4.12.0
new 7bebe7c adjust README
new c226e0b style
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 4 ++--
.../scripting/freemarker/internal/FreemarkerScriptEngineFactory.java | 2 +-
.../internal/FreemarkerScriptEngineFactoryConfiguration.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
[sling-org-apache-sling-scripting-freemarker] 02/02: style
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-freemarker.git
commit c226e0b2e1a83bfb265d1ced87a5222fcd5391dd
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Sep 7 22:16:11 2018 +0200
style
---
.../scripting/freemarker/internal/FreemarkerScriptEngineFactory.java | 2 +-
.../internal/FreemarkerScriptEngineFactoryConfiguration.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngineFactory.java b/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngineFactory.java
index c9fab1c..939755e 100644
--- a/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngineFactory.java
+++ b/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngineFactory.java
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
service = ScriptEngineFactory.class,
immediate = true,
property = {
- Constants.SERVICE_DESCRIPTION + "=Scripting engine for FreeMarker templates",
+ Constants.SERVICE_DESCRIPTION + "=Apache Sling Scripting FreeMarker ScriptEngineFactory",
Constants.SERVICE_VENDOR + "=The Apache Software Foundation"
}
)
diff --git a/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngineFactoryConfiguration.java b/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngineFactoryConfiguration.java
index 70c69ad..f523c46 100644
--- a/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngineFactoryConfiguration.java
+++ b/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngineFactoryConfiguration.java
@@ -22,8 +22,8 @@ import org.osgi.service.metatype.annotations.AttributeDefinition;
import org.osgi.service.metatype.annotations.ObjectClassDefinition;
@ObjectClassDefinition(
- name = "Apache Sling Scripting FreeMarker “ScriptEngine Factory”",
- description = "scripting engine for FreeMarker templates"
+ name = "Apache Sling Scripting FreeMarker ScriptEngineFactory",
+ description = "Scripting engine for FreeMarker templates"
)
@interface FreemarkerScriptEngineFactoryConfiguration {
[sling-org-apache-sling-scripting-freemarker] 01/02: adjust README
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-freemarker.git
commit 7bebe7c8be19db2d8a680b250605cf90af8785b1
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Sep 7 22:13:53 2018 +0200
adjust README
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 1c821e9..17272a9 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
[<img src="http://sling.apache.org/res/logos/sling.png"/>](http://sling.apache.org)
- [](https://builds.apache.org/view/S-Z/view/Sling/job/sling-org-apache-sling-scripting-freemarker-1.8) [](https://builds.apache.org/view/S-Z/view/Sling/job/sling-org-apache-sling-scripting-freemarker-1.8/test_results_analyzer/) [![Li [...]
+ [](https://builds.apache.org/view/S-Z/view/Sling/job/sling-org-apache-sling-scripting-freemarker-1.8) [](https://builds.apache.org/view/S-Z/view/Sling/job/sling-org-apache-sling-scripting-freemarker-1.8/test_results_analyzer/) [![Ma [...]
# Apache Sling Scripting FreeMarker
This module is part of the [Apache Sling](https://sling.apache.org) project.
-Support for Freemarker scripting.
+Support for FreeMarker scripting.