svn commit: r1740944 - in /sling/trunk/contrib/scripting/freemarker: ./ src/main/java/org/apache/sling/scripting/freemarker/internal/ src/main/java/org/apache/sling/scripting/freemarker/wrapper/ src/test/java/org/apache/sling/scripting/freemarker/ src/...

[ol...@apache.org]

Author: olli
Date: Tue Apr 26 04:21:01 2016
New Revision: 1740944

URL: http://svn.apache.org/viewvc?rev=1740944&view=rev
Log:
SLING-5690 Remove use of JCR API (Node and Property models)

Removed:
    sling/trunk/contrib/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/wrapper/
    sling/trunk/contrib/scripting/freemarker/src/test/java/org/apache/sling/scripting/freemarker/FreemarkerEngineHelper.java
    sling/trunk/contrib/scripting/freemarker/src/test/java/org/apache/sling/scripting/freemarker/FreemarkerTestBase.java
    sling/trunk/contrib/scripting/freemarker/src/test/java/org/apache/sling/scripting/freemarker/wrapper/
Modified:
    sling/trunk/contrib/scripting/freemarker/pom.xml
    sling/trunk/contrib/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngine.java

Modified: sling/trunk/contrib/scripting/freemarker/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/freemarker/pom.xml?rev=1740944&r1=1740943&r2=1740944&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/freemarker/pom.xml (original)
+++ sling/trunk/contrib/scripting/freemarker/pom.xml Tue Apr 26 04:21:01 2016
@@ -53,9 +53,6 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Private-Package>
-              org.apache.sling.scripting.freemarker.*
-            </Private-Package>
             <Embed-Dependency>freemarker;inline=true</Embed-Dependency>
             <!--
             A few notes on the lines below:
@@ -147,30 +144,10 @@
       <version>2.1.4</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.jcr.resource</artifactId>
-      <version>2.2.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.jackrabbit</groupId>
-          <artifactId>jackrabbit-jcr-commons</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.jackrabbit</groupId>
-          <artifactId>jackrabbit-classloader</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.jcr</groupId>
-      <artifactId>jcr</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
       <groupId>org.freemarker</groupId>
       <artifactId>freemarker</artifactId>
       <version>2.3.24-incubating</version>

Modified: sling/trunk/contrib/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngine.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngine.java?rev=1740944&r1=1740943&r2=1740944&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngine.java (original)
+++ sling/trunk/contrib/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngine.java Tue Apr 26 04:21:01 2016
@@ -22,7 +22,6 @@ import javax.script.Bindings;
 import javax.script.ScriptContext;
 import javax.script.ScriptEngineFactory;
 import javax.script.ScriptException;
-import javax.jcr.Node;
 
 import freemarker.ext.beans.BeansWrapper;
 import freemarker.log.Logger;
@@ -31,7 +30,6 @@ import freemarker.template.Version;
 import org.apache.sling.api.scripting.SlingBindings;
 import org.apache.sling.api.scripting.SlingScriptHelper;
 import org.apache.sling.scripting.api.AbstractSlingScriptEngine;
-import org.apache.sling.scripting.freemarker.wrapper.NodeModel;
 
 import freemarker.template.Configuration;
 import freemarker.template.Template;
@@ -76,7 +74,6 @@ public class FreemarkerScriptEngine exte
 
         try {
             Template tmpl = new Template(scriptName, reader, configuration);
-            bindings.put("currentNode", new NodeModel((Node) bindings.get("currentNode")));
             bindings.put("statics", statics);
             tmpl.process(bindings, scriptContext.getWriter());
         } catch (Throwable t) {