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.1.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit a7b9e4bf144ac2869f2624f96e44cdeb2befadf3 Author: Carsten Ziegeler <[email protected]> AuthorDate: Fri Jun 8 08:05:09 2012 +0000 Correct metatype information git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1347924 13f79535-47bb-0310-9956-ffa450edef68 --- .../jcr/webdav/impl/servlets/SlingWebDavServlet.java | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) 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 2b97d9d..2e70cb6 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 @@ -61,17 +61,10 @@ import org.osgi.service.http.NamespaceException; * The <code>SlingWebDavServlet</code> implements the WebDAV protocol as a * default servlet for Sling handling all WebDAV methods. * - * @scr.component name="org.apache.sling.jcr.webdav.impl.servlets.SimpleWebDavServlet" - * label="%dav.name" description="%dav.description" - * immediate="true" - * @scr.service interface="javax.servlet.Servlet" - * @scr.property name="service.description" value="Sling WebDAV Servlet" - * @scr.property name="service.vendor" value="The Apache Software Foundation" - * @scr.property name="sling.servlet.resourceTypes" - * value="sling/servlet/default" private="true" - * @scr.property name="sling.servlet.methods" value="*" private="true" */ -@Component(name = "org.apache.sling.jcr.webdav.impl.servlets.SimpleWebDavServlet", label = "%dav.name", description = "%dav.description", immediate = true) +@Component(name = "org.apache.sling.jcr.webdav.impl.servlets.SimpleWebDavServlet", + label = "%dav.name", description = "%dav.description", + metatype = true, immediate = true) @Service(Servlet.class) @Properties({ @Property(name = Constants.SERVICE_DESCRIPTION, value = "Sling WebDAV Servlet"), @@ -273,7 +266,7 @@ public class SlingWebDavServlet extends SimpleWebdavServlet { public void unbindCopyMoveHandler(final ServiceReference copyMoveHandlerReference) { this.copyMoveManager.unbindCopyMoveHandler(copyMoveHandlerReference); } - + /** Overridden as the base class uses sendError that we don't want (SLING-2443) */ @Override protected void sendUnauthorized(WebdavRequest request, WebdavResponse response, DavException error) throws IOException { @@ -282,7 +275,7 @@ public class SlingWebDavServlet extends SimpleWebdavServlet { if (error != null) { response.getWriter().write(error.getStatusPhrase()); response.getWriter().write("\n"); - } + } response.getWriter().flush(); } } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
