Author: fmeschbe
Date: Mon Jan 7 05:09:48 2008
New Revision: 609590
URL: http://svn.apache.org/viewvc?rev=609590&view=rev
Log:
Object Content Mapping moved to its own project
Modified:
incubator/sling/whiteboard/fmeschbe/resource/sling/core/pom.xml
incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java
incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java
incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/objects/AbstractSelectableMappedObject.java
incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/objects/SelectableDefaultMappedObject.java
Modified: incubator/sling/whiteboard/fmeschbe/resource/sling/core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/whiteboard/fmeschbe/resource/sling/core/pom.xml?rev=609590&r1=609589&r2=609590&view=diff
==============================================================================
--- incubator/sling/whiteboard/fmeschbe/resource/sling/core/pom.xml (original)
+++ incubator/sling/whiteboard/fmeschbe/resource/sling/core/pom.xml Mon Jan 7
05:09:48 2008
@@ -114,6 +114,11 @@
<version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.ocm</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
Modified:
incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java
URL:
http://svn.apache.org/viewvc/incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java?rev=609590&r1=609589&r2=609590&view=diff
==============================================================================
---
incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java
(original)
+++
incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java
Mon Jan 7 05:09:48 2008
@@ -28,10 +28,12 @@
import javax.servlet.http.HttpServletResponseWrapper;
import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.resource.Resource;
import org.apache.sling.core.RequestUtil;
import org.apache.sling.core.impl.request.RequestData;
import org.apache.sling.core.servlets.ErrorHandler;
import org.apache.sling.jcr.resource.PathResolver;
+import org.apache.sling.jcr.resource.SyntheticResource;
/**
* The <code>SlingHttpServletResponseImpl</code> TODO
@@ -231,6 +233,11 @@
private String pathToURL(String url) {
PathResolver pr =
getRequestData().getResourceResolver().adaptTo(PathResolver.class);
- return (pr != null) ? pr.pathToURL(url) : url;
+ if (pr != null) {
+ Resource r = new SyntheticResource(url, null);
+ return pr.pathToURL(r);
+ }
+
+ return url;
}
}
Modified:
incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java
URL:
http://svn.apache.org/viewvc/incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java?rev=609590&r1=609589&r2=609590&view=diff
==============================================================================
---
incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java
(original)
+++
incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java
Mon Jan 7 05:09:48 2008
@@ -29,6 +29,7 @@
import org.apache.sling.api.request.RequestDispatcherOptions;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceMetadata;
+import org.apache.sling.api.resource.ResourceProvider;
import org.apache.sling.api.resource.ResourceResolver;
public class SlingRequestDispatcher implements RequestDispatcher {
@@ -133,6 +134,10 @@
return delegatee.getResourceMetadata();
}
+ public ResourceProvider getResourceProvider() {
+ return delegatee.getResourceProvider();
+ }
+
public String getURI() {
return delegatee.getURI();
}
Modified:
incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/objects/AbstractSelectableMappedObject.java
URL:
http://svn.apache.org/viewvc/incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/objects/AbstractSelectableMappedObject.java?rev=609590&r1=609589&r2=609590&view=diff
==============================================================================
---
incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/objects/AbstractSelectableMappedObject.java
(original)
+++
incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/objects/AbstractSelectableMappedObject.java
Mon Jan 7 05:09:48 2008
@@ -18,7 +18,7 @@
*/
package org.apache.sling.core.objects;
-import org.apache.sling.jcr.resource.AbstractMappedObject;
+import org.apache.sling.jcr.ocm.AbstractMappedObject;
/**
* The <code>AbstractSelectableMappedObject</code> class extends the
Modified:
incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/objects/SelectableDefaultMappedObject.java
URL:
http://svn.apache.org/viewvc/incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/objects/SelectableDefaultMappedObject.java?rev=609590&r1=609589&r2=609590&view=diff
==============================================================================
---
incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/objects/SelectableDefaultMappedObject.java
(original)
+++
incubator/sling/whiteboard/fmeschbe/resource/sling/core/src/main/java/org/apache/sling/core/objects/SelectableDefaultMappedObject.java
Mon Jan 7 05:09:48 2008
@@ -18,7 +18,7 @@
*/
package org.apache.sling.core.objects;
-import org.apache.sling.jcr.resource.DefaultMappedObject;
+import org.apache.sling.jcr.ocm.DefaultMappedObject;
/**
* The <code>SelectableDefaultMappedObject</code> class extends the
