[sling-org-apache-sling-jcr-webdav] 21/31: SLING-907 - Rename SimpleWebDavServlet to avoid confusion with Jackrabbit's

[ro...@apache.org]

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 eed6167b70eb86d562a003dc3a53a505ad7ace43
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed Apr 1 12:49:09 2009 +0000

    SLING-907 - Rename SimpleWebDavServlet to avoid confusion with Jackrabbit's
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/jcr/webdav@760869 13f79535-47bb-0310-9956-ffa450edef68
---
 .../{SimpleWebDavServlet.java => SlingSimpleWebDavServlet.java}   | 8 +++++---
 .../apache/sling/jcr/webdav/impl/servlets/SlingWebDavServlet.java | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SimpleWebDavServlet.java b/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java
similarity index 91%
rename from src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SimpleWebDavServlet.java
rename to src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java
index 6ecb49c..57f5f5a 100644
--- a/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SimpleWebDavServlet.java
+++ b/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java
@@ -30,15 +30,17 @@ import org.apache.sling.jcr.api.SlingRepository;
 import org.apache.sling.jcr.webdav.impl.helper.SlingResourceConfig;
 
 /**
- * The <code>SimpleWebDavServlet</code>
+ * The <code>SlingSimpleWebDavServlet</code> extends the
+ * JCR <code>SimpleWebdavServlet</code> with some
+ * Sling-specific features
  */
-public class SimpleWebDavServlet extends SimpleWebdavServlet {
+public class SlingSimpleWebDavServlet extends SimpleWebdavServlet {
 
     private final SlingResourceConfig resourceConfig;
 
     private final Repository repository;
 
-    /* package */SimpleWebDavServlet(SlingResourceConfig resourceConfig,
+    /* package */ SlingSimpleWebDavServlet(SlingResourceConfig resourceConfig,
             Repository repository) {
         this.resourceConfig = resourceConfig;
         this.repository = repository;
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 b995cc3..6585a36 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
@@ -174,7 +174,7 @@ public class SlingWebDavServlet extends SimpleWebdavServlet {
 
         // Register servlet, and set the contextPath field to signal successful
         // registration
-        Servlet simpleServlet = new SimpleWebDavServlet(resourceConfig,
+        Servlet simpleServlet = new SlingSimpleWebDavServlet(resourceConfig,
             getRepository());
         httpService.registerServlet(resourceConfig.getServletContextPath(),
             simpleServlet, resourceConfig.getServletInitParams(), null);

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.