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 2016/05/16 20:57:11 UTC

svn commit: r1744135 - /sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingTemplateResource.java

Author: olli
Date: Mon May 16 20:57:11 2016
New Revision: 1744135

URL: http://svn.apache.org/viewvc?rev=1744135&view=rev
Log:
SLING-5075 Upgrade Thymeleaf to 3.0

fix getBaseName():String and implement relative(String):ITemplateResource

Modified:
    sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingTemplateResource.java

Modified: sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingTemplateResource.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingTemplateResource.java?rev=1744135&r1=1744134&r2=1744135&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingTemplateResource.java (original)
+++ sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingTemplateResource.java Mon May 16 20:57:11 2016
@@ -23,8 +23,11 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 
+import org.apache.commons.io.FilenameUtils;
 import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ResourceUtil;
+import org.apache.sling.api.resource.path.PathBuilder;
 import org.thymeleaf.templateresource.ITemplateResource;
 
 public class SlingTemplateResource implements ITemplateResource {
@@ -44,7 +47,7 @@ public class SlingTemplateResource imple
 
     @Override
     public String getBaseName() {
-        return resource.getName();
+        return FilenameUtils.getBaseName(resource.getName());
     }
 
     @Override
@@ -63,7 +66,12 @@ public class SlingTemplateResource imple
 
     @Override
     public ITemplateResource relative(final String relativeLocation) {
-        throw new UnsupportedOperationException("not yet implemented"); // TODO
+        final PathBuilder pathBuilder = new PathBuilder(resource.getPath());
+        final String path = pathBuilder.append("..").append(relativeLocation).toString();
+        final ResourceResolver resourceResolver = resource.getResourceResolver();
+        final Resource relative = resourceResolver.getResource(path);
+        // final Resource relative = resource.getParent().getChild(relativeLocation);
+        return new SlingTemplateResource(relative);
     }
 
 }