This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.6-incubator in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 334525b751c9bf25c935d72d9f1c057bfc1bc860 Author: Felix Meschberger <[email protected]> AuthorDate: Thu Jan 8 09:22:49 2009 +0000 SLING-816 Use the MimeTypeService directly for MIME type resolution instead of relying on the ServletContext service registered by the SlingServlet git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/webdav@732658 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 5 +++++ .../sling/jcr/webdav/impl/helper/SlingMimeResolver.java | 11 +++++------ .../sling/jcr/webdav/impl/helper/SlingResourceConfig.java | 6 +++--- .../sling/jcr/webdav/impl/servlets/SlingWebDavServlet.java | 6 +++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 03e4e1f..54542a9 100644 --- a/pom.xml +++ b/pom.xml @@ -108,6 +108,11 @@ <artifactId>org.apache.sling.commons.osgi</artifactId> <version>2.0.3-incubator-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.commons.mime</artifactId> + <version>2.0.2-incubator</version> + </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingMimeResolver.java b/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingMimeResolver.java index 749a6a9..8b35233 100644 --- a/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingMimeResolver.java +++ b/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingMimeResolver.java @@ -14,21 +14,20 @@ */ package org.apache.sling.jcr.webdav.impl.helper; -import javax.servlet.ServletContext; - import org.apache.jackrabbit.server.io.MimeResolver; +import org.apache.sling.commons.mime.MimeTypeService; public class SlingMimeResolver extends MimeResolver { - private final ServletContext servletContext; + private final MimeTypeService mimeTypeService; - public SlingMimeResolver(ServletContext servletContext) { - this.servletContext = servletContext; + public SlingMimeResolver(MimeTypeService mimeTypeService) { + this.mimeTypeService = mimeTypeService; } @Override public String getMimeType(String filename) { - String type = servletContext.getMimeType(filename); + String type = mimeTypeService.getMimeType(filename); if (type == null) { type = getDefaultMimeType(); } diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java b/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java index a85404b..b60e5ba 100644 --- a/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java +++ b/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java @@ -21,7 +21,6 @@ import java.util.Hashtable; import javax.jcr.Item; import javax.jcr.Node; import javax.jcr.RepositoryException; -import javax.servlet.ServletContext; import org.apache.jackrabbit.server.io.DefaultHandler; import org.apache.jackrabbit.server.io.DirListingExportHandler; @@ -34,6 +33,7 @@ import org.apache.jackrabbit.webdav.simple.DefaultItemFilter; import org.apache.jackrabbit.webdav.simple.ItemFilter; import org.apache.jackrabbit.webdav.simple.ResourceConfig; import org.apache.jackrabbit.webdav.simple.SimpleWebdavServlet; +import org.apache.sling.commons.mime.MimeTypeService; import org.apache.sling.commons.osgi.OsgiUtil; import org.apache.sling.jcr.webdav.impl.servlets.SlingWebDavServlet; @@ -53,9 +53,9 @@ public class SlingResourceConfig extends ResourceConfig { private final Dictionary<String, String> servletInitParams; - public SlingResourceConfig(ServletContext servletContext, + public SlingResourceConfig(MimeTypeService mimetypService, Dictionary<?, ?> config) { - mimeResolver = new SlingMimeResolver(servletContext); + mimeResolver = new SlingMimeResolver(mimetypService); collectionTypes = OsgiUtil.toStringArray( config.get(SlingWebDavServlet.COLLECTION_TYPES), SlingWebDavServlet.COLLECTION_TYPES_DEFAULT); diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingWebDavServlet.java b/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingWebDavServlet.java index fdfe431..b995cc3 100644 --- a/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingWebDavServlet.java +++ b/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingWebDavServlet.java @@ -21,12 +21,12 @@ package org.apache.sling.jcr.webdav.impl.servlets; import javax.jcr.Repository; import javax.jcr.Session; import javax.servlet.Servlet; -import javax.servlet.ServletContext; import javax.servlet.ServletException; import org.apache.jackrabbit.server.SessionProvider; import org.apache.jackrabbit.webdav.DavLocatorFactory; import org.apache.jackrabbit.webdav.simple.SimpleWebdavServlet; +import org.apache.sling.commons.mime.MimeTypeService; import org.apache.sling.jcr.api.SlingRepository; import org.apache.sling.jcr.webdav.impl.helper.SlingLocatorFactory; import org.apache.sling.jcr.webdav.impl.helper.SlingResourceConfig; @@ -103,7 +103,7 @@ public class SlingWebDavServlet extends SimpleWebdavServlet { private HttpService httpService; /** @scr.reference */ - private ServletContext servletContext; + private MimeTypeService mimeTypeService; private SlingResourceConfig resourceConfig; @@ -169,7 +169,7 @@ public class SlingWebDavServlet extends SimpleWebdavServlet { protected void activate(ComponentContext context) throws NamespaceException, ServletException { - resourceConfig = new SlingResourceConfig(servletContext, + resourceConfig = new SlingResourceConfig(mimeTypeService, context.getProperties()); // Register servlet, and set the contextPath field to signal successful -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
