incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1347924 - /sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingWebDavServlet.java
Date Fri, 08 Jun 2012 08:05:10 GMT
Author: cziegeler
Date: Fri Jun  8 08:05:09 2012
New Revision: 1347924

URL: http://svn.apache.org/viewvc?rev=1347924&view=rev
Log:
Correct metatype information

Modified:
    sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingWebDavServlet.java

Modified: sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingWebDavServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingWebDavServlet.java?rev=1347924&r1=1347923&r2=1347924&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingWebDavServlet.java
(original)
+++ sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingWebDavServlet.java
Fri Jun  8 08:05:09 2012
@@ -61,17 +61,10 @@ import org.osgi.service.http.NamespaceEx
  * 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 
     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 
         if (error != null) {
             response.getWriter().write(error.getStatusPhrase());
             response.getWriter().write("\n");
-        } 
+        }
         response.getWriter().flush();
     }
 }



Mime
View raw message