svn commit: r599438 - in /incubator/sling/trunk/microsling/microsling-core/src: main/java/org/apache/sling/microsling/scripting/ main/java/org/apache/sling/microsling/slingservlets/ main/webapp/ test/java/org/apache/sling/microsling/request/helpers/ te...

[fmeschbe]

Author: fmeschbe
Date: Thu Nov 29 05:23:38 2007
New Revision: 599438

URL: http://svn.apache.org/viewvc?rev=599438&view=rev
Log:
SLING-109 Adapt to new Resource and provider interfaces
  - Fix migration errors
  - Also adapt the tests and test scripts

Modified:
    
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/scripting/MicroslingScriptResolver.java
    
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/DefaultSlingServlet.java
    
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/MicrojaxPostServlet.java
    
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/erb-scripts.html
    
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/freemarker-scripts.html
    
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/server-side-javascript.html
    
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/velocity-scripts.html
    
incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/request/helpers/MicroslingRequestPathInfoTest.java
    
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/include-test.esp
    
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.erb
    
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.esp
    
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.ftl
    
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.js
    
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.vlt

Modified: 
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/scripting/MicroslingScriptResolver.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/scripting/MicroslingScriptResolver.java?rev=599438&r1=599437&r2=599438&view=diff
==============================================================================
--- 
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/scripting/MicroslingScriptResolver.java
 (original)
+++ 
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/scripting/MicroslingScriptResolver.java
 Thu Nov 29 05:23:38 2007
@@ -163,7 +163,7 @@
         final Resource r = request.getResource();
 
         // ensure repository access
-        if (r instanceof NodeProvider) {
+        if (!(r instanceof NodeProvider)) {
             return null;
         }
 

Modified: 
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/DefaultSlingServlet.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/DefaultSlingServlet.java?rev=599438&r1=599437&r2=599438&view=diff
==============================================================================
--- 
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/DefaultSlingServlet.java
 (original)
+++ 
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/DefaultSlingServlet.java
 Thu Nov 29 05:23:38 2007
@@ -58,7 +58,7 @@
 
         microjaxGetServlet = new MicrojaxGetServlet();
         microjaxGetServlet.init(new MicroslingServletConfig("Microjax GET 
servlet",getServletContext()));
-        
+
         String contentType = null;
         final String ctSuffix = "; charset=UTF-8";
 
@@ -85,12 +85,12 @@
             if (path.startsWith(MicrojaxGetServlet.URI_PREFIX)) {
                 microjaxGetServlet.service(req, resp);
                 return;
-                
+
             } else if (path.startsWith("/WEB-INF") || 
path.startsWith("/META-INF")) {
                 throw new 
HttpStatusCodeException(HttpServletResponse.SC_FORBIDDEN,
                         "Access to " + path + " denied");
             }
-            
+
             URL url = getServletContext().getResource(path);
             if (url != null) {
                 spool(url, resp);
@@ -98,10 +98,9 @@
                 throw new 
HttpStatusCodeException(HttpServletResponse.SC_NOT_FOUND,
                         "Resource not found: " + r.getURI());
             }
-        }
+        } else if(r instanceof NodeProvider) {
 
-        // make sure we have an Item, and render it via one of our 
renderingServlets
-        if(r instanceof NodeProvider) {
+            // make sure we have an Item, and render it via one of our 
renderingServlets
             final String suffix = req.getRequestPathInfo().getSuffix();
             if(suffix != null && suffix.length() > 0) {
                 // accept exact addressing only for default rendering:

Modified: 
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/MicrojaxPostServlet.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/MicrojaxPostServlet.java?rev=599438&r1=599437&r2=599438&view=diff
==============================================================================
--- 
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/MicrojaxPostServlet.java
 (original)
+++ 
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/slingservlets/MicrojaxPostServlet.java
 Thu Nov 29 05:23:38 2007
@@ -91,7 +91,9 @@
 
             // select the Resource to process
             Resource currentResource = request.getResource();
-            Node currentNode = ((NodeProvider)currentResource).getNode();
+            Node currentNode = (currentResource instanceof NodeProvider)
+                    ? ((NodeProvider) currentResource).getNode()
+                    : null;
 
             // need a Node, path and Session
             String currentPath = null;

Modified: 
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/erb-scripts.html
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/webapp/erb-scripts.html?rev=599438&r1=599437&r2=599438&view=diff
==============================================================================
--- 
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/erb-scripts.html
 (original)
+++ 
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/erb-scripts.html
 Thu Nov 29 05:23:38 2007
@@ -24,7 +24,7 @@
 <html>
   <body>
     <p><span>This is an example Erb template <%= Time.now 
%></span></p>
-    <p><span><%= 
resource.getRawData().getProperty("text").getString() %></span></p>
+    <p><span><%= resource.getNode().getProperty("text").getString() 
%></span></p>
     <% unless props.nil? or props.empty? %>
       <table>
         <% for prop, val in props %>

Modified: 
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/freemarker-scripts.html
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/webapp/freemarker-scripts.html?rev=599438&r1=599437&r2=599438&view=diff
==============================================================================
--- 
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/freemarker-scripts.html
 (original)
+++ 
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/freemarker-scripts.html
 Thu Nov 29 05:23:38 2007
@@ -27,9 +27,9 @@
   The current resource URI is <b>${resource.URI}</b>
 </p>
 
-<h2>${resource.getRawData().getProperty("title").getString()}</h2>
+<h2>${resource.getNode().getProperty("title").getString()}</h2>
 <p>
-  ${resource.getRawData().getProperty("text").getString()}
+  ${resource.getNode().getProperty("text").getString()}
 </p>
 
 &lt;/body></pre>  

Modified: 
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/server-side-javascript.html
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/webapp/server-side-javascript.html?rev=599438&r1=599437&r2=599438&view=diff
==============================================================================
--- 
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/server-side-javascript.html
 (original)
+++ 
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/server-side-javascript.html
 Thu Nov 29 05:23:38 2007
@@ -76,10 +76,10 @@
 &lt;p>This page is generated from an ESP template!&lt;/p>
 &lt;h1>&lt;%= resource.getURI() %>&lt;/h1>
 &lt;%
-  for (var prop in resource.rawData) {
+  for (var prop in resource.node) {
     %>
       &lt;p>
-        &lt;%= resource.rawData[prop] %>
+        &lt;%= resource.node[prop] %>
       &lt;/p>
     &lt;%
   }
@@ -98,8 +98,8 @@
 out.println("&lt;html>&lt;body>");
 out.println("&lt;p>This page is generated from a rhino script&lt;/p>");
 out.println("&lt;h1>" + resource.getURI() + "&lt;/h1>");
-out.println("&lt;p>Title: " + 
resource.getRawData().getProperty('title').getString() + "&lt;/p>");
-out.println("&lt;p>Text: " + 
resource.getRawData().getProperty('text').getString() + "&lt;/p>");
+out.println("&lt;p>Title: " + 
resource.getNode().getProperty('title').getString() + "&lt;/p>");
+out.println("&lt;p>Text: " + 
resource.getNode().getProperty('text').getString() + "&lt;/p>");
 out.println("&lt;/body>&lt;/html>");</pre>
   </p>
   </div>
@@ -119,9 +119,9 @@
 &lt;h1>&lt;%= resource.uri %>&lt;/h1>
 &lt;ol>
 &lt;%
-for (var prop in resource.rawData) {
-    if (resource.rawData[prop]["text"]) {
-        %>&lt;li>&lt;a href="/microsling&lt;%= resource.rawData[prop] 
%>.html">&lt;%= resource.rawData[prop] %>&lt;/a>&lt;/li>&lt;%
+for (var prop in resource.node) {
+    if (resource.node[prop]["text"]) {
+        %>&lt;li>&lt;a href="/microsling&lt;%= resource.node[prop] 
%>.html">&lt;%= resource.node[prop] %>&lt;/a>&lt;/li>&lt;%
     }
 }
 %>

Modified: 
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/velocity-scripts.html
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/webapp/velocity-scripts.html?rev=599438&r1=599437&r2=599438&view=diff
==============================================================================
--- 
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/velocity-scripts.html
 (original)
+++ 
incubator/sling/trunk/microsling/microsling-core/src/main/webapp/velocity-scripts.html
 Thu Nov 29 05:23:38 2007
@@ -50,9 +50,9 @@
   The current resource URI is &lt;b>$resource.URI&lt;/b>
 &lt;/p>
 
-&lt;h2>$resource.getRawData().getProperty("title").getString()&lt;/h2>
+&lt;h2>$resource.getNode().getProperty("title").getString()&lt;/h2>
 &lt;p>
-  $resource.getRawData().getProperty("text").getString()
+  $resource.getNode().getProperty("text").getString()
 &lt;/p>
 
 &lt;/body>

Modified: 
incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/request/helpers/MicroslingRequestPathInfoTest.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/request/helpers/MicroslingRequestPathInfoTest.java?rev=599438&r1=599437&r2=599438&view=diff
==============================================================================
--- 
incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/request/helpers/MicroslingRequestPathInfoTest.java
 (original)
+++ 
incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/request/helpers/MicroslingRequestPathInfoTest.java
 Thu Nov 29 05:23:38 2007
@@ -16,8 +16,6 @@
  */
 package org.apache.sling.microsling.request.helpers;
 
-import java.io.InputStream;
-
 import junit.framework.TestCase;
 
 import org.apache.sling.api.request.RequestPathInfo;
@@ -252,14 +250,6 @@
             metadata.put(ResourceMetadata.RESOLUTION_PATH, resolutionPath);
         }
 
-        public Object getObject() {
-            throw new Error("MockResource does not implement this method");
-        }
-
-        public Object getRawData() {
-            throw new Error("MockResource does not implement this method");
-        }
-
         public String getResourceType() {
             throw new Error("MockResource does not implement this method");
         }
@@ -272,9 +262,6 @@
             return metadata;
         }
 
-        public InputStream getInputStream() {
-            return null;
-        }
     }
 
 }

Modified: 
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/include-test.esp
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/include-test.esp?rev=599438&r1=599437&r2=599438&view=diff
==============================================================================
--- 
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/include-test.esp
 (original)
+++ 
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/include-test.esp
 Thu Nov 29 05:23:38 2007
@@ -2,22 +2,22 @@
 <html>
        <body>
                <h1>ESP template</h1>
-               <p class="main"><%= resource.item.text %></p>
+               <p class="main"><%= resource.node.text %></p>
                
                <%
-                       if(resource.item.pathToInclude) {
+                       if(resource.node.pathToInclude) {
                          %>
-                         <p>pathToInclude = <%= resource.item.pathToInclude 
%></p>
-                         <p>Including <%= resource.item.pathToInclude %></p>
+                         <p>pathToInclude = <%= resource.node.pathToInclude 
%></p>
+                         <p>Including <%= resource.node.pathToInclude %></p>
                          <%
-                         sling.include(resource.item.pathToInclude + ".html");
+                         sling.include(resource.node.pathToInclude + ".html");
                        }
                %>
                
                <%
-                       if(resource.item.testInfiniteLoop) {
+                       if(resource.node.testInfiniteLoop) {
                          %>
-                         <p>testInfiniteLoop = <%= 
resource.item.testInfiniteLoop %></p>
+                         <p>testInfiniteLoop = <%= 
resource.node.testInfiniteLoop %></p>
                          <%
                          // try to include the item itself, to cause an 
infinite loop
                          sling.include(resource.getURI() + ".html");

Modified: 
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.erb
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.erb?rev=599438&r1=599437&r2=599438&view=diff
==============================================================================
--- 
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.erb
 (original)
+++ 
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.erb
 Thu Nov 29 05:23:38 2007
@@ -2,7 +2,7 @@
 <html>
   <body>
     <p><span>Ruby template <%= Time.now %></span></p>
-               <p><span><%= 
resource.getRawData().getProperty("text").getString() %></span></p>
+               <p><span><%= resource.getNode().getProperty("text").getString() 
%></span></p>
     <% unless props.nil? or props.empty? %>
       <table>
         <% for prop, val in props %>

Modified: 
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.esp
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.esp?rev=599438&r1=599437&r2=599438&view=diff
==============================================================================
--- 
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.esp
 (original)
+++ 
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.esp
 Thu Nov 29 05:23:38 2007
@@ -2,6 +2,6 @@
 <html>
        <body>
                ESP template
-               <p><%= resource.item.text %></p>
+               <p><%= resource.node.text %></p>
        </body>
 </html>

Modified: 
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.ftl
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.ftl?rev=599438&r1=599437&r2=599438&view=diff
==============================================================================
--- 
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.ftl
 (original)
+++ 
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.ftl
 Thu Nov 29 05:23:38 2007
@@ -2,6 +2,6 @@
 <html>
        <body>
                FreeMarker template
-               
<p><span>${resource.getRawData().getProperty("text").getString()}</span></p>
+               
<p><span>${resource.getNode().getProperty("text").getString()}</span></p>
        </body>
 </html>

Modified: 
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.js
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.js?rev=599438&r1=599437&r2=599438&view=diff
==============================================================================
--- 
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.js
 (original)
+++ 
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.js
 Thu Nov 29 05:23:38 2007
@@ -1,5 +1,5 @@
 // Used by ScriptedRenderingTest
 out.println("<html><body>");
 out.println("Raw javascript template");
-out.println("<p><em>" + resource.item.text + "</em></p>");
+out.println("<p><em>" + resource.node.text + "</em></p>");
 out.print("</body></html>");

Modified: 
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.vlt
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.vlt?rev=599438&r1=599437&r2=599438&view=diff
==============================================================================
--- 
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.vlt
 (original)
+++ 
incubator/sling/trunk/microsling/microsling-core/src/test/resources/integration-test/rendering-test.vlt
 Thu Nov 29 05:23:38 2007
@@ -2,6 +2,6 @@
 <html>
        <body>
                Velocity template
-               
<p><b>$resource.getRawData().getProperty("text").getString()</b></p>
+               
<p><b>$resource.getNode().getProperty("text").getString()</b></p>
        </body>
 </html>