You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2013/05/16 09:50:56 UTC
svn commit: r1483223 - in /sling/trunk/bundles/jcr/webdav: ./
src/main/java/org/apache/sling/jcr/webdav/impl/helper/
src/main/java/org/apache/sling/jcr/webdav/impl/servlets/
src/main/resources/OSGI-INF/metatype/
Author: cziegeler
Date: Thu May 16 07:50:56 2013
New Revision: 1483223
URL: http://svn.apache.org/r1483223
Log:
SLING-2825 : sling webdav servlet should support config property "createAbsoluteURI" . Apply patch from Julian Reschke
Modified:
sling/trunk/bundles/jcr/webdav/pom.xml
sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java
sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingWebDavServlet.java
sling/trunk/bundles/jcr/webdav/src/main/resources/OSGI-INF/metatype/metatype.properties
Modified: sling/trunk/bundles/jcr/webdav/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webdav/pom.xml?rev=1483223&r1=1483222&r2=1483223&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/webdav/pom.xml (original)
+++ sling/trunk/bundles/jcr/webdav/pom.xml Thu May 16 07:50:56 2013
@@ -51,7 +51,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -116,7 +115,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
- <version>2.4.2</version>
+ <version>2.4.4</version>
<scope>compile</scope>
</dependency>
Modified: sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java?rev=1483223&r1=1483222&r2=1483223&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java (original)
+++ sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java Thu May 16 07:50:56 2013
@@ -92,8 +92,15 @@ public class SlingResourceConfig extends
config.get(SlingWebDavServlet.PROP_REALM),
SlingWebDavServlet.DEFAULT_REALM);
servletInitParams.put(
- SimpleWebdavServlet.INIT_PARAM_AUTHENTICATE_HEADER,
- "Basic realm=\"" + value + "\"");
+ SimpleWebdavServlet.INIT_PARAM_AUTHENTICATE_HEADER,
+ "Basic realm=\"" + value + "\"");
+
+ boolean createAbsoluteUri = OsgiUtil.toBoolean(
+ config.get(SlingWebDavServlet.PROP_CREATE_ABSOLUTE_URI),
+ SlingWebDavServlet.DEFAULT_CREATE_ABSOLUTE_URI);
+ servletInitParams.put(
+ SimpleWebdavServlet.INIT_PARAM_CREATE_ABSOLUTE_URI,
+ Boolean.toString(createAbsoluteUri));
}
// ---------- ResourceConfig overwrites
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=1483223&r1=1483222&r2=1483223&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 Thu May 16 07:50:56 2013
@@ -83,6 +83,11 @@ public class SlingWebDavServlet extends
@Property(DEFAULT_CONTEXT)
public static final String PROP_CONTEXT = "dav.root";
+ public static final boolean DEFAULT_CREATE_ABSOLUTE_URI = true;
+
+ @Property(boolValue=DEFAULT_CREATE_ABSOLUTE_URI)
+ public static final String PROP_CREATE_ABSOLUTE_URI = "dav.create-absolute-uri";
+
public static final String DEFAULT_REALM = "Sling WebDAV";
@Property(DEFAULT_REALM)
Modified: sling/trunk/bundles/jcr/webdav/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webdav/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1483223&r1=1483222&r2=1483223&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/webdav/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ sling/trunk/bundles/jcr/webdav/src/main/resources/OSGI-INF/metatype/metatype.properties Thu May 16 07:50:56 2013
@@ -69,6 +69,10 @@ dav.realm.description = The name of the
presented to the client to ask for authentication credentials to access the \
repository.
+dav.create-absolute-uri.name = Use absolute URIs
+dav.create-absolute-uri.description = When set to true, create absolute URIs \
+ in WebDAV responses. Otherwise, use absolute paths. (See RFC 4918, Section 8.3)
+
collection.types.name = Non Collection Node Types
collection.types.description = The JCR Node Types considered being \
non-collection resouces by WebDAV. Any node replying true to Node.isNodeType() \