Author: fmeschbe
Date: Tue Dec 18 03:51:43 2007
New Revision: 605192
URL: http://svn.apache.org/viewvc?rev=605192&view=rev
Log:
SLING-134 Use ResourceResolver instead of ResourceManager, which has
been removed.
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/RequestData.java
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java?rev=605192&r1=605191&r2=605192&view=diff
==============================================================================
---
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java
(original)
+++
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java
Tue Dec 18 03:51:43 2007
@@ -77,7 +77,7 @@
}
public ResourceResolver getResourceResolver() {
- return getRequestData().getResourceManager();
+ return getRequestData().getResourceResolver();
}
public ServiceLocator getServiceLocator() {
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java?rev=605192&r1=605191&r2=605192&view=diff
==============================================================================
---
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java
(original)
+++
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java
Tue Dec 18 03:51:43 2007
@@ -159,7 +159,7 @@
url = makeAbsolutePath(url);
// resolve the url to as if it would be a resource path
- url = getPathResolver().pathToURL(url);
+ url = pathToURL(url);
// have the servlet container to further encodings
return super.encodeURL(url);
@@ -171,7 +171,7 @@
url = makeAbsolutePath(url);
// resolve the url to as if it would be a resource path
- url = getPathResolver().pathToURL(url);
+ url = pathToURL(url);
// have the servlet container to further encodings
return super.encodeRedirectURL(url);
@@ -228,7 +228,9 @@
return path;
}
- private PathResolver getPathResolver() {
- return (PathResolver) getRequestData().getResourceManager();
+
+ private String pathToURL(String url) {
+ PathResolver pr =
getRequestData().getResourceResolver().adaptTo(PathResolver.class);
+ return (pr != null) ? pr.pathToURL(url) : url;
}
}
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java?rev=605192&r1=605191&r2=605192&view=diff
==============================================================================
---
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java
(original)
+++
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java
Tue Dec 18 03:51:43 2007
@@ -61,7 +61,7 @@
import org.apache.sling.core.impl.services.ServiceLocatorImpl;
import org.apache.sling.core.impl.servlets.ErrorHandler;
import org.apache.sling.core.impl.servlets.SlingServletResolver;
-import org.apache.sling.jcr.resource.JcrResourceManagerFactory;
+import org.apache.sling.jcr.resource.JcrResourceResolverFactory;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
@@ -121,7 +121,7 @@
private HttpService httpService;
/** @scr.reference cardinality="0..1" policy="dynamic" */
- private JcrResourceManagerFactory resourceManagerFactory;
+ private JcrResourceResolverFactory resourceManagerFactory;
/** @scr.reference cardinality="0..1" policy="dynamic" */
private MimeTypeService mimeTypeService;
@@ -291,7 +291,7 @@
return slingAuthenticator;
}
- public JcrResourceManagerFactory getResourceManagerFactory() {
+ public JcrResourceResolverFactory getResourceResolverFactory() {
return resourceManagerFactory;
}
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/RequestData.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/RequestData.java?rev=605192&r1=605191&r2=605192&view=diff
==============================================================================
---
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/RequestData.java
(original)
+++
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/RequestData.java
Tue Dec 18 03:51:43 2007
@@ -47,7 +47,7 @@
import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.api.request.RequestProgressTracker;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceManager;
+import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.services.ServiceLocator;
import org.apache.sling.api.servlets.ServletResolver;
import org.apache.sling.api.wrappers.SlingHttpServletRequestWrapper;
@@ -59,7 +59,7 @@
import org.apache.sling.core.impl.output.BufferProvider;
import org.apache.sling.core.impl.parameters.ParameterSupport;
import org.apache.sling.core.theme.Theme;
-import org.apache.sling.jcr.resource.JcrResourceManagerFactory;
+import org.apache.sling.jcr.resource.JcrResourceResolverFactory;
import org.osgi.service.component.ComponentException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -94,7 +94,7 @@
/** The parameter support class */
private ParameterSupport parameterSupport;
- private ResourceManager resourceManager;
+ private ResourceResolver resourceResolver;
private RequestProgressTracker requestProgressTracker;
@@ -122,18 +122,18 @@
this.requestProgressTracker = new SlingRequestProgressTracker();
// the resource manager factory may be missing
- JcrResourceManagerFactory rmf =
slingMainServlet.getResourceManagerFactory();
+ JcrResourceResolverFactory rmf =
slingMainServlet.getResourceResolverFactory();
if (rmf == null) {
- log.error("RequestData: Missing JcrResourceManagerFactory");
+ log.error("RequestData: Missing JcrResourceResolverFactory");
throw new HttpStatusCodeException(HttpServletResponse.SC_NOT_FOUND,
"No resource can be found");
}
// officially, getting the manager may fail, but not i this
implementation
- this.resourceManager = rmf.getResourceManager(session);
+ this.resourceResolver = rmf.getResourceResolver(session);
// resolve the resource and the request path info, will never be null
- Resource resource = resourceManager.resolve(request);
+ Resource resource = resourceResolver.resolve(request);
RequestPathInfo requestPathInfo = new SlingRequestPathInfo(resource,
request.getPathInfo());
ContentData contentData = pushContent(resource, requestPathInfo);
@@ -167,7 +167,7 @@
currentContentData = null;
servletRequest = null;
servletResponse = null;
- resourceManager = null;
+ resourceResolver = null;
}
public SlingMainServlet getSlingMainServlet() {
@@ -423,8 +423,8 @@
this.locale = locale;
}
- public ResourceManager getResourceManager() {
- return resourceManager;
+ public ResourceResolver getResourceResolver() {
+ return resourceResolver;
}
public RequestProgressTracker getRequestProgressTracker() {
