Author: fmeschbe
Date: Thu Nov 29 13:10:15 2007
New Revision: 599579
URL: http://svn.apache.org/viewvc?rev=599579&view=rev
Log:
SLING-109 Adapt to new Resource and provider interfaces
Modified:
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FileServlet.java
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FolderServlet.java
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ReferenceServlet.java
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ResourceServlet.java
Modified:
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FileServlet.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FileServlet.java?rev=599579&r1=599578&r2=599579&view=diff
==============================================================================
---
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FileServlet.java
(original)
+++
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FileServlet.java
Thu Nov 29 13:10:15 2007
@@ -24,6 +24,7 @@
import org.apache.sling.api.SlingException;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.resource.ObjectProvider;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
@@ -45,7 +46,7 @@
IOException {
Resource resource = request.getResource();
- FileObject file = (FileObject) resource.getObject();
+ FileObject file = (FileObject) ((ObjectProvider) resource).getObject();
if (file == null) {
throw new SlingException("Missing mapped object for file "
+ resource.getURI());
Modified:
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FolderServlet.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FolderServlet.java?rev=599579&r1=599578&r2=599579&view=diff
==============================================================================
---
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FolderServlet.java
(original)
+++
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/FolderServlet.java
Thu Nov 29 13:10:15 2007
@@ -25,6 +25,7 @@
import org.apache.sling.api.SlingException;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.resource.ObjectProvider;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
@@ -46,7 +47,7 @@
IOException {
Resource resource = request.getResource();
- FolderObject content = (FolderObject) resource.getObject();
+ FolderObject content = (FolderObject) ((ObjectProvider)
resource).getObject();
if (content == null) {
throw new SlingException("Missing mapped object for folder "
+ resource.getURI());
Modified:
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ReferenceServlet.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ReferenceServlet.java?rev=599579&r1=599578&r2=599579&view=diff
==============================================================================
---
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ReferenceServlet.java
(original)
+++
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ReferenceServlet.java
Thu Nov 29 13:10:15 2007
@@ -24,6 +24,7 @@
import org.apache.sling.api.SlingException;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.resource.ObjectProvider;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
@@ -45,7 +46,7 @@
IOException {
final Resource resource = request.getResource();
- final ReferenceObject content = (ReferenceObject) resource.getObject();
+ final ReferenceObject content = (ReferenceObject) ((ObjectProvider)
resource).getObject();
final String path = content.getReference();
// just forward to the referenced content
Modified:
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ResourceServlet.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ResourceServlet.java?rev=599579&r1=599578&r2=599579&view=diff
==============================================================================
---
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ResourceServlet.java
(original)
+++
incubator/sling/trunk/sling/servlets-standard/src/main/java/org/apache/sling/servlets/standard/ResourceServlet.java
Thu Nov 29 13:10:15 2007
@@ -28,6 +28,7 @@
import org.apache.commons.io.IOUtils;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.resource.ObjectProvider;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
@@ -48,7 +49,7 @@
SlingHttpServletResponse response) throws IOException {
Resource resource = request.getResource();
- ResourceObject content = (ResourceObject) resource.getObject();
+ ResourceObject content = (ResourceObject) ((ObjectProvider)
resource).getObject();
// check the last modification time and If-Modified-Since header
long modifTime = content.getLastModificationTime();
