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 2015/02/12 14:41:42 UTC
svn commit: r1659251 - in
/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal:
dialect/ dom/ processor/attr/
Author: olli
Date: Thu Feb 12 13:41:41 2015
New Revision: 1659251
URL: http://svn.apache.org/r1659251
Log:
SLING-4297 add a dialect and processors to provide out-of-the-box support for a Sling Include
* make classes final
Modified:
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/dialect/SlingDialect.java
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/dom/NodeUtil.java
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingAddSelectorsAttrProcessor.java
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingIncludeAttrProcessor.java
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingPathAttrProcessor.java
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingReplaceSelectorsAttrProcessor.java
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingReplaceSuffixAttrProcessor.java
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingResourceAttrProcessor.java
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingResourceTypeAttrProcessor.java
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingUnwrapAttrProcessor.java
Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/dialect/SlingDialect.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/dialect/SlingDialect.java?rev=1659251&r1=1659250&r2=1659251&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/dialect/SlingDialect.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/dialect/SlingDialect.java Thu Feb 12 13:41:41 2015
@@ -48,7 +48,7 @@ import org.thymeleaf.processor.IProcesso
@Property(name = Constants.SERVICE_VENDOR, value = "The Apache Software Foundation"),
@Property(name = Constants.SERVICE_DESCRIPTION, value = "Sling dialect for Sling Scripting Thymeleaf")
})
-public class SlingDialect extends AbstractDialect {
+public final class SlingDialect extends AbstractDialect {
public static final String PREFIX = "sling";
Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/dom/NodeUtil.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/dom/NodeUtil.java?rev=1659251&r1=1659250&r2=1659251&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/dom/NodeUtil.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/dom/NodeUtil.java Thu Feb 12 13:41:41 2015
@@ -20,7 +20,7 @@ package org.apache.sling.scripting.thyme
import org.thymeleaf.dom.Node;
-public class NodeUtil {
+public final class NodeUtil {
public static <T> T getNodeProperty(final Node node, final String name, final Class<T> clazz) {
final Object nodeProperty = node.getNodeProperty(name);
Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingAddSelectorsAttrProcessor.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingAddSelectorsAttrProcessor.java?rev=1659251&r1=1659250&r2=1659251&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingAddSelectorsAttrProcessor.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingAddSelectorsAttrProcessor.java Thu Feb 12 13:41:41 2015
@@ -18,7 +18,7 @@
*/
package org.apache.sling.scripting.thymeleaf.internal.processor.attr;
-public class SlingAddSelectorsAttrProcessor extends SlingNodePropertyAttrProcessor {
+public final class SlingAddSelectorsAttrProcessor extends SlingNodePropertyAttrProcessor {
public static final int ATTR_PRECEDENCE = 99;
Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingIncludeAttrProcessor.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingIncludeAttrProcessor.java?rev=1659251&r1=1659250&r2=1659251&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingIncludeAttrProcessor.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingIncludeAttrProcessor.java Thu Feb 12 13:41:41 2015
@@ -127,7 +127,7 @@ public class SlingIncludeAttrProcessor e
try {
// create a dispatcher for the resource or path
- RequestDispatcher dispatcher;
+ final RequestDispatcher dispatcher;
if (resource != null) {
dispatcher = slingHttpServletRequest.getRequestDispatcher(resource, options);
} else {
Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingPathAttrProcessor.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingPathAttrProcessor.java?rev=1659251&r1=1659250&r2=1659251&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingPathAttrProcessor.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingPathAttrProcessor.java Thu Feb 12 13:41:41 2015
@@ -18,7 +18,7 @@
*/
package org.apache.sling.scripting.thymeleaf.internal.processor.attr;
-public class SlingPathAttrProcessor extends SlingNodePropertyAttrProcessor {
+public final class SlingPathAttrProcessor extends SlingNodePropertyAttrProcessor {
public static final int ATTR_PRECEDENCE = 99;
Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingReplaceSelectorsAttrProcessor.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingReplaceSelectorsAttrProcessor.java?rev=1659251&r1=1659250&r2=1659251&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingReplaceSelectorsAttrProcessor.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingReplaceSelectorsAttrProcessor.java Thu Feb 12 13:41:41 2015
@@ -18,7 +18,7 @@
*/
package org.apache.sling.scripting.thymeleaf.internal.processor.attr;
-public class SlingReplaceSelectorsAttrProcessor extends SlingNodePropertyAttrProcessor {
+public final class SlingReplaceSelectorsAttrProcessor extends SlingNodePropertyAttrProcessor {
public static final int ATTR_PRECEDENCE = 99;
Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingReplaceSuffixAttrProcessor.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingReplaceSuffixAttrProcessor.java?rev=1659251&r1=1659250&r2=1659251&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingReplaceSuffixAttrProcessor.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingReplaceSuffixAttrProcessor.java Thu Feb 12 13:41:41 2015
@@ -18,7 +18,7 @@
*/
package org.apache.sling.scripting.thymeleaf.internal.processor.attr;
-public class SlingReplaceSuffixAttrProcessor extends SlingNodePropertyAttrProcessor {
+public final class SlingReplaceSuffixAttrProcessor extends SlingNodePropertyAttrProcessor {
public static final int ATTR_PRECEDENCE = 99;
Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingResourceAttrProcessor.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingResourceAttrProcessor.java?rev=1659251&r1=1659250&r2=1659251&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingResourceAttrProcessor.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingResourceAttrProcessor.java Thu Feb 12 13:41:41 2015
@@ -18,7 +18,7 @@
*/
package org.apache.sling.scripting.thymeleaf.internal.processor.attr;
-public class SlingResourceAttrProcessor extends SlingNodePropertyAttrProcessor {
+public final class SlingResourceAttrProcessor extends SlingNodePropertyAttrProcessor {
public static final int ATTR_PRECEDENCE = 99;
Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingResourceTypeAttrProcessor.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingResourceTypeAttrProcessor.java?rev=1659251&r1=1659250&r2=1659251&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingResourceTypeAttrProcessor.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingResourceTypeAttrProcessor.java Thu Feb 12 13:41:41 2015
@@ -18,7 +18,7 @@
*/
package org.apache.sling.scripting.thymeleaf.internal.processor.attr;
-public class SlingResourceTypeAttrProcessor extends SlingNodePropertyAttrProcessor {
+public final class SlingResourceTypeAttrProcessor extends SlingNodePropertyAttrProcessor {
public static final int ATTR_PRECEDENCE = 99;
Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingUnwrapAttrProcessor.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingUnwrapAttrProcessor.java?rev=1659251&r1=1659250&r2=1659251&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingUnwrapAttrProcessor.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/processor/attr/SlingUnwrapAttrProcessor.java Thu Feb 12 13:41:41 2015
@@ -18,7 +18,7 @@
*/
package org.apache.sling.scripting.thymeleaf.internal.processor.attr;
-public class SlingUnwrapAttrProcessor extends SlingNodePropertyAttrProcessor {
+public final class SlingUnwrapAttrProcessor extends SlingNodePropertyAttrProcessor {
public static final int ATTR_PRECEDENCE = 99;