svn commit: r1199684 - in /sling/trunk/bundles/jcr/davex/src/main: java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java resources/OSGI-INF/metatype/metatype.properties

[fm...@apache.org]

Author: fmeschbe
Date: Wed Nov  9 10:16:35 2011
New Revision: 1199684

URL: http://svn.apache.org/viewvc?rev=1199684&view=rev
Log:
SLING-2275 Reverting the property name consolidation. This breaks configuration compatibility with release 1.0 !

Modified:
    sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java
    sling/trunk/bundles/jcr/davex/src/main/resources/OSGI-INF/metatype/metatype.properties

Modified: sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java?rev=1199684&r1=1199683&r2=1199684&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java (original)
+++ sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java Wed Nov  9 10:16:35 2011
@@ -68,7 +68,7 @@ public class SlingDavExServlet extends J
      * registration. Default for the property is {@link #DEFAULT_DAV_ROOT}.
      */
     @Property(value=DEFAULT_DAV_ROOT)
-    private static final String PROP_DAV_ROOT = "dav.root";
+    private static final String PROP_DAV_ROOT = "alias";
 
     /**
      * The name of the service property of the registered dummy service to cause

Modified: sling/trunk/bundles/jcr/davex/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/davex/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1199684&r1=1199683&r2=1199684&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/davex/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ sling/trunk/bundles/jcr/davex/src/main/resources/OSGI-INF/metatype/metatype.properties Wed Nov  9 10:16:35 2011
@@ -33,6 +33,6 @@ dav.description = The DavEx Servlet allo
  requests to this servlet do not pass by the Sling Main Servlet and request \
  processing.
 
-dav.root.name = Root Path
-dav.root.description = The root path at which the DavEx Servlet is \
+alias.name = Root Path
+alias.description = The root path at which the DavEx Servlet is \
  accessible. The default value is "/server".