This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-compiler-java.git
commit 30a698f2b830bc3a5b90ec33c55c27cf8b5b1157 Author: Radu Cotescu <[email protected]> AuthorDate: Fri Sep 2 14:51:07 2016 +0000 SLING-6028 - Replace Sightly references with HTL in both code and documentation git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1758968 13f79535-47bb-0310-9956-ffa450edef68 --- README.md | 6 +++--- pom.xml | 14 ++++---------- .../java/org/apache/sling/scripting/sightly/Record.java | 2 +- .../scripting/sightly/extension/RuntimeExtension.java | 2 +- .../sling/scripting/sightly/java/compiler/RenderUnit.java | 6 +++--- .../sightly/java/compiler/impl/VariableScope.java | 2 +- .../java/org/apache/sling/scripting/sightly/pojo/Use.java | 4 ++-- .../sling/scripting/sightly/render/RenderContext.java | 4 ++-- .../sling/scripting/sightly/render/RuntimeObjectModel.java | 2 +- 9 files changed, 18 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 5445259..1b811f4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Apache Sling Scripting Sightly Java Compiler -==== -The Apache Sling Scripting Sightly Java Compiler provides support for transpiling the Abstract Syntax Tree produced by the +Apache Sling Scripting HTL Java Compiler +======================================== +The Apache Sling Scripting HTL Java Compiler provides support for transpiling the Abstract Syntax Tree produced by the [`org.apache.sling.scripting.sightly.compiler`](../compiler) module into Java source code. diff --git a/pom.xml b/pom.xml index 005effe..3d58d8c 100644 --- a/pom.xml +++ b/pom.xml @@ -34,10 +34,10 @@ <version>0.0.1-SNAPSHOT</version> <packaging>bundle</packaging> - <name>Apache Sling Scripting Sightly Java Compiler</name> + <name>Apache Sling Scripting HTL Java Compiler</name> <description> - The Apache Sling Scripting Sightly Java Compiler provides support for transpiling the Abstract Syntax Tree produced by the + The Apache Sling Scripting HTL Java Compiler provides support for transpiling the Abstract Syntax Tree produced by the org.apache.sling.scripting.sightly.compiler module into Java source code. </description> @@ -119,14 +119,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <groups> - <group> - <title>Apache Sling Scriptin Sightly Java Compiler</title> - <packages>org.apache.sling.scripting.sightly.compiler.java</packages> - </group> - </groups> - <doctitle>${project.name} Documentation (Version: ${project.version})</doctitle> - <windowtitle>${project.name} Documentation (Version: ${project.version})</windowtitle> + <stylesheet>maven</stylesheet> + <excludePackageNames>*.impl:*.internal:${site.javadoc.exclude}</excludePackageNames> </configuration> </plugin> </plugins> diff --git a/src/main/java/org/apache/sling/scripting/sightly/Record.java b/src/main/java/org/apache/sling/scripting/sightly/Record.java index 0b27f0c..ead00db 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/Record.java +++ b/src/main/java/org/apache/sling/scripting/sightly/Record.java @@ -24,7 +24,7 @@ import java.util.Set; import aQute.bnd.annotation.ConsumerType; /** - * A {@code Record} is a key-value immutable object understood by the Sightly runtime, used for abstracting complex objects like Sightly + * A {@code Record} is a key-value immutable object understood by the HTL runtime, used for abstracting complex objects like Sightly * templates (declared with the {@code data-sly-template} block element) or objects that need to be translated from Java to JavaScript * and back. * diff --git a/src/main/java/org/apache/sling/scripting/sightly/extension/RuntimeExtension.java b/src/main/java/org/apache/sling/scripting/sightly/extension/RuntimeExtension.java index c14b95e..186495b 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/extension/RuntimeExtension.java +++ b/src/main/java/org/apache/sling/scripting/sightly/extension/RuntimeExtension.java @@ -23,7 +23,7 @@ import org.apache.sling.scripting.sightly.render.RenderContext; import aQute.bnd.annotation.ConsumerType; /** - * A {@code RuntimeExtension} represents a Sightly runtime construct that provides some processing capabilities for the various + * A {@code RuntimeExtension} represents a HTL runtime construct that provides some processing capabilities for the various * {@code data-sly-*} block elements. */ @ConsumerType diff --git a/src/main/java/org/apache/sling/scripting/sightly/java/compiler/RenderUnit.java b/src/main/java/org/apache/sling/scripting/sightly/java/compiler/RenderUnit.java index 0b68af3..d9f831c 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/java/compiler/RenderUnit.java +++ b/src/main/java/org/apache/sling/scripting/sightly/java/compiler/RenderUnit.java @@ -70,13 +70,13 @@ public abstract class RenderUnit implements Record<RenderUnit> { } if (renderContext.getObjectModel().isPrimitive(templateObj)) { throw new SightlyJavaCompilerException( - "data-sly-call: primitive \"" + templateObj.toString() + "\" does not represent a Sightly template."); + "data-sly-call: primitive \"" + templateObj.toString() + "\" does not represent a HTL template."); } else if (templateObj instanceof String) { throw new SightlyJavaCompilerException( - "data-sly-call: String '" + templateObj.toString() + "' does not represent a Sightly template."); + "data-sly-call: String '" + templateObj.toString() + "' does not represent a HTL template."); } throw new SightlyJavaCompilerException( - "data-sly-call: " + templateObj.getClass().getName() + " does not represent a Sightly template."); + "data-sly-call: " + templateObj.getClass().getName() + " does not represent a HTL template."); } RenderUnit unit = (RenderUnit) templateObj; Map<String, Object> argumentsMap = renderContext.getObjectModel().toMap(argsObj); diff --git a/src/main/java/org/apache/sling/scripting/sightly/java/compiler/impl/VariableScope.java b/src/main/java/org/apache/sling/scripting/sightly/java/compiler/impl/VariableScope.java index 9b34322..7e2fb75 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/java/compiler/impl/VariableScope.java +++ b/src/main/java/org/apache/sling/scripting/sightly/java/compiler/impl/VariableScope.java @@ -18,7 +18,7 @@ package org.apache.sling.scripting.sightly.java.compiler.impl; /** - * The scope of a variable in a Sightly script + * The scope of a variable in a HTL script */ public enum VariableScope { DYNAMIC, SCOPED, GLOBAL diff --git a/src/main/java/org/apache/sling/scripting/sightly/pojo/Use.java b/src/main/java/org/apache/sling/scripting/sightly/pojo/Use.java index 48943f3..d4ec318 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/pojo/Use.java +++ b/src/main/java/org/apache/sling/scripting/sightly/pojo/Use.java @@ -26,7 +26,7 @@ import aQute.bnd.annotation.ConsumerType; * The <code>Use</code> interface can be implemented by Java objects which are instantiated as part of processing {@code data-sly-use} * attributes. * - * @see <a href="https://github.com/Adobe-Marketing-Cloud/sightly-spec/blob/master/SPECIFICATION.md#221-use";>Sightly Block Statements - Use</a> + * @see <a href="https://github.com/Adobe-Marketing-Cloud/htl-spec/blob/master/SPECIFICATION.md#221-use";>HTL Block Statements - Use</a> */ @ConsumerType public interface Use { @@ -36,7 +36,7 @@ public interface Use { * Called to initialize the Java object with the current Java Scripting API bindings. * </p> * <p/> - * This method is called only if the object has been instantiated by Sightly as part of processing the {@code data-sly-use} + * This method is called only if the object has been instantiated by HTL as part of processing the {@code data-sly-use} * attribute. The Java Scripting API bindings provide all the global variables known to a script being executed. * <p/> * diff --git a/src/main/java/org/apache/sling/scripting/sightly/render/RenderContext.java b/src/main/java/org/apache/sling/scripting/sightly/render/RenderContext.java index bb06812..d0a4390 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/render/RenderContext.java +++ b/src/main/java/org/apache/sling/scripting/sightly/render/RenderContext.java @@ -23,7 +23,7 @@ import org.apache.sling.scripting.sightly.extension.RuntimeExtension; import aQute.bnd.annotation.ProviderType; /** - * The {@code RenderContext} defines the context for executing Sightly scripts. + * The {@code RenderContext} defines the context for executing HTL scripts. */ @ProviderType public interface RenderContext { @@ -36,7 +36,7 @@ public interface RenderContext { RuntimeObjectModel getObjectModel(); /** - * Returns the map of script bindings available to Sightly scripts. + * Returns the map of script bindings available to HTL scripts. * * @return the global bindings for a script */ diff --git a/src/main/java/org/apache/sling/scripting/sightly/render/RuntimeObjectModel.java b/src/main/java/org/apache/sling/scripting/sightly/render/RuntimeObjectModel.java index f45a8e9..2945402 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/render/RuntimeObjectModel.java +++ b/src/main/java/org/apache/sling/scripting/sightly/render/RuntimeObjectModel.java @@ -23,7 +23,7 @@ import aQute.bnd.annotation.ProviderType; /** * The {@code RuntimeObjectModel} provides various utility object inspection & conversion methods that can be applied to runtime - * objects when executing Sightly scripts. + * objects when executing HTL scripts. */ @ProviderType public interface RuntimeObjectModel { -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
