[sling-org-apache-sling-scripting-groovy] branch master updated: SLING-8730 Remove all GSP names and references

[olli]

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-groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new 826d961  SLING-8730 Remove all GSP names and references
826d961 is described below

commit 826d961a61c1687b4316e2d8e0ff8601d62ec80f
Author: Oliver Lietz <o...@apache.org>
AuthorDate: Sun Sep 22 22:00:51 2019 +0200

    SLING-8730 Remove all GSP names and references
    
    Make language name configurable (allows using custom/legacy name)
---
 .../sling/scripting/groovy/internal/GStringScriptEngineFactory.java | 2 +-
 .../groovy/internal/GStringScriptEngineFactoryConfiguration.java    | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/sling/scripting/groovy/internal/GStringScriptEngineFactory.java
 
b/src/main/java/org/apache/sling/scripting/groovy/internal/GStringScriptEngineFactory.java
index fdacffc..8e9fb95 100644
--- 
a/src/main/java/org/apache/sling/scripting/groovy/internal/GStringScriptEngineFactory.java
+++ 
b/src/main/java/org/apache/sling/scripting/groovy/internal/GStringScriptEngineFactory.java
@@ -105,7 +105,7 @@ public class GStringScriptEngineFactory extends 
AbstractScriptEngineFactory {
 
     @Override
     public String getLanguageName() {
-        return "Groovy GString";
+        return configuration.language_name();
     }
 
     @Override
diff --git 
a/src/main/java/org/apache/sling/scripting/groovy/internal/GStringScriptEngineFactoryConfiguration.java
 
b/src/main/java/org/apache/sling/scripting/groovy/internal/GStringScriptEngineFactoryConfiguration.java
index 4098d1d..8688e76 100644
--- 
a/src/main/java/org/apache/sling/scripting/groovy/internal/GStringScriptEngineFactoryConfiguration.java
+++ 
b/src/main/java/org/apache/sling/scripting/groovy/internal/GStringScriptEngineFactoryConfiguration.java
@@ -54,4 +54,10 @@ import 
org.osgi.service.metatype.annotations.ObjectClassDefinition;
         "gstring"
     };
 
+    @AttributeDefinition(
+        name = "language name",
+        description = "The name of the script engine language."
+    )
+    String language_name() default "Groovy GString";
+
 }