You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:51:05 UTC
[sling-org-apache-sling-jcr-webdav] annotated tag
org.apache.sling.jcr.webdav-2.1.2 created (now 3c1123b)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change 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.
at 3c1123b (tag)
tagging 7403809db4f5e8dd521d0f878c91793c031c988e (commit)
by Carsten Ziegeler
on Tue Nov 27 10:27:07 2012 +0000
- Log -----------------------------------------------------------------
org.apache.sling.jcr.webdav-2.1.2
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new cf5d7e6 SLING-150 Add support for Jackrabbit Simple WebDAV
new e73a751 SLING-150 LICENSE and NOTICE file for the new bundle
new ed9ac9c SLING-150 webdav module should be in trunk not whiteboard
new 98a70e6 SLING-150 Exclude the WebDAV client code from the bundle and thus remove the dependency on HttpClient.
new 840140e SLING-170 Redirect to the default workspace when accessing the servlet directly.
new 276d804 Added webdav-resource-config.xml to map nt:file and related nodetypes in the usual way
new 0d2bc66 SLING-176 Include jcr-commons packages in the bundle
new 6075e5a Use OSGi core and cmpendium jars from Felix project.
new 97ce3de SLING-204 - add svn ignore patterns for intellij
new 82e5c38 SLING-256 - Use null for the workspace name in JCR calls if configured name is empty
new 602518d SLING-342 Register SLingWebDavServlet as a global default servlet. This allows supporting WebDAV requests inside Sling requests. For normal request processing this should not interfere.
new 2f19dc1 Move licence and notice to top level dir.
new ea1807f Add incubator disclaimer.
new 32aee69 Write first element in pom in one line (to avoid problems with the maven release plugin) and minor pom fixes.
new 5084dea Update notice files.
new f7b71f5 Eclude maven-eclipse.xml generated by the maven eclipse plugin.
new 694868d SLING-430 Handle empty/missing sling.servlet.methods property as if it would be set to [ "GET", "HEAD" ] and support "*" to mean "all methods". Add sling.servlet.methods="*" setting to SlingWebDavServlet
new 5aa0b54 SLING-442: Clean up exports, imports, dependencies and used plugins.
new 6d6a706 SLING-479 Fix @scr.tags: - normalize metadata attribute settings to "no" - ensure proper metadata and ds attributes are set - create metatype.properties files where required - fix metatype.properties files
new ab2e11f SLING-483: Add excludes for javadocs (WiP)
new 443e2a3 SLING-495 - NOTICE files generated using mknotice script
new ef70d6c SLING-495 - NOTICE files updated according to changes in revision 662927
new 2a112d7 SLING-495 - NOTICE files regenerated with revision 663097 changes
new a5898b0 Use released version of parent pom.
new 9613fba Use released versions (or soon to be released versions).
new ac9a4d3 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.0-incubator
new adf1a67 [maven-release-plugin] prepare for next development iteration
new 8d649af Set version to next development version.
new b60df5a Fix reference to parent pom.
new ffb8853 Remove unused imports and fix some javadoc errors.
new e037bca SLING-521: Restore more notice files.
new c7878f3 SLING-521: Separate between notice files for bin and src dists.
new cdee843 SLING-521: Separate between notice files for bin and src dists.
new ea26b87 SLING-537 - disable WebDAV iohandlers for zip and XML files
new 25b287a SLING-539: Merge LICENSE.* information to LICENSE files - Xerces notices should be included
new fbdc0e3 Update to released versions.
new 6dc4721 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.2-incubator
new d081bbe [maven-release-plugin] prepare for next development iteration
new 6eee069 Use latest snapshots again to make project buildable.
new 4099ee4 Use released versions.
new f058c71 Use released parent pom where possible.
new de6d75e SLING-555 : Update all poms to use the latest parent pom; update parent pom to include the incubator repo for plugins and use latest plugins.
new e401896 SLING-639 Don't call the base class service method if a redirect or error has already been sent. Thanks Marc Speck for reporting.
new a0ed9b8 SLING-767 Integrate MIME Type resolution with Sling functionliaty and provide better configurability of the WebDAV servlets
new 4762d9c SLING-769 Explicit Jackrabbit Dependency Versions, adapt to new OCM data and new commons/testing
new c3d766d SLING-769 WebDAV 1.5 has a new package, which must be included
new 9d1edc6 SLING-800 Simplify bundle manifest declaration and ensure completeness
new d11b97e SLING-808 : Increase version to 5-incubator-SNAPSHOT
new f1c1b5d Update notice files to include 2009 in copyright statement.
new 334525b SLING-816 Use the MimeTypeService directly for MIME type resolution instead of relying on the ServletContext service registered by the SlingServlet
new 60d042c SLING-829 Cosmetics to the bundle/project names
new 6019091 SLING-829 Ensure Apache Sling prefix on all configuration names
new d8ee925 SLING-865 : Move to bundles
new a61946c SLING-865 : Adjust reactor pom and svn information in each module.
new 3ae2780 SLING-865 : Adjust path to parent pom and add profiles for samples and contrib
new eed6167 SLING-907 - Rename SimpleWebDavServlet to avoid confusion with Jackrabbit's
new f4bbe69 SLING-941: Lots of svn:eol-style settings missing
new 43f3618 Use release parent pom
new ddbd9ed Use released version as dependencies.
new 7ac20ae [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.4-incubator
new ce6cbdf [maven-release-plugin] prepare for next development iteration
new 97fb4c3 Use next dev version of parent pom
new b475f6b Fix license header
new a56f19a Prepare new release.
new b6d0449 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.6-incubator
new ca23691 [maven-release-plugin] prepare for next development iteration
new ce85ab9 Use next parent pom for development.
new b913dcb Set parent pom to released version.
new a9cdc12 Move Sling to new TLP location
new 2855f1d SLING-1011 : Remove disclaimer file.
new c57f60a SLING-1011 : Adjust svn location
new 544ced7 SLING-1011 : Remove disclaimer from readme's, adjust links to webite, fix versions in poms.
new 7a09c4c SLING-1033 Upgrade to Sling parent POM 6 (and ensure web app has the leglize stuff, too)
new 654d64e SLING-1205 Upgrade all projects to parent POM 8 and use OSGi provided OSGi libraries
new 060762a SLING-1211 Streamline service method and add support for direct reply to the OPTIONS request on the Dav root.
new 9cc4307 Use latest jcr api to decouple modules from jcr 1.0 (contained in older jcr api releases)
new 45464ff Update notice files.
new 12aed93 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.8
new c6838e2 [maven-release-plugin] prepare for next development iteration
new c5338ab SLING-1212 - upgrading to Jackrabbit 2. Also includes re-revert of SLING-1363 and implementation of SLING-1330. Thanks to Felix for getting this started.
new 1d688a6 SLING-1405 - fixing duplicate dependencies
new fc3d7d3 Use released parent pom.
new d7c0d97 SLING-1531 - upgrading to jackrabbit 2.1
new a91b185 SLING-1654 - using ResourceResolver.adaptTo(Session.class) to get the Session instead of getting the session directly as a request attribute
new 15b6190 SLING-1660 - upgrading to JR 2.1.1
new 1a0b68a Use released version of auth/core dependency
new e09e66f updating all modules to parent 10-SNAPSHOT in anticipation of emma additions to parent
new 2f167e1 updating pom files pre-release
new 5eb1043 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.1.0
new 2431c57 [maven-release-plugin] prepare for next development iteration
new 6c38700 using latest parent
new e649904 Update to recent snapshots
new dfa2d0a Use latest releases.
new 827bdb0 Catch and log uncaught exceptions
new cdc5112 SLING-2044 Upgrade to jackrabbit 2.2.5
new b2bb239 SLING-2133 : Sling WebDAV response is not sending realm correctly
new 7d00e51 Remove unused variable
new 30bf704 SLING-2150 : Update plugins to use the latest available versions
new b24bcb7 Update to recent snapshot
new 6a51994 Using latest released parent pom
new 75c5741 SLING-2187 - adding new module to contain our custom notice file; adding remote-resources plugin configuration to parent pom and removing all existing appended-resources NOTICE files
new a2bbfd3 temporarily using snapshots during release vote
new 6d1be1e SLING-2185 Support IOHandler and PropertyHandler services to extend the Jackrabbit WebDAV functionality (thanks Timothee Maret for the patch)
new ee3c035 using latest releases
new 36a21a2 SLING-2233 Apply patch providing support for CopyMoveManager supplied by Sameer Charles (Thanks)
new ca6bfbd SLING-2272 - upgrade Jackrabbit version to 2.2.9 (except for WebDAV, which needs 2.3.x, so upgraded to 2.3.2) and Tika to 1.0
new b5d9a11 SLING-2302 Update to Jackrabbit 2.3.4 dependencies and import WebDAV (instead of embedding)
new b900dfb Add scope provided to dependencies
new e6ce118 SLING-2443 - WWW-Authenticate header was missing on OPTIONS request on /
new a8c3db6 SLING-2480 : Add config for maven-sling-plugin to m2e configuration
new a7b9e4b Correct metatype information
new b948d6e SLING-2503 : Update to new Jackrabbit version to fix JCR-3329
new 488a9f9 Update to latest parent pom
new 7c55761 Use released versions
new f90cc4b SLING-2559 - avoiding the setValue() call by queueing updates to the handler map and then using putAll()
new 95e310e Prepare for release
new 8bb2f4a [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.1.2
new 7403809 [maven-release-plugin] copy for tag org.apache.sling.jcr.webdav-2.1.2
The 118 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-jcr-webdav] 01/29: [maven-release-plugin]
prepare for next development iteration
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 2431c570e247d48a2964140470236bec6ce60cda
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Nov 3 18:12:15 2010 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1030583 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5713c19..6a83e72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.jcr.webdav</artifactId>
<packaging>bundle</packaging>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<name>Apache Sling Simple WebDAV Access to repositories</name>
<description>
@@ -37,9 +37,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.1.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.1.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.webdav-2.1.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webdav</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 12/29: SLING-2187 - adding new
module to contain our custom notice file;
adding remote-resources plugin configuration to parent pom and removing all
existing appended-resources NOTICE files
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 75c57411c344d4eb7db10927874f05a5f9b8c0e7
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Aug 31 19:23:49 2011 +0000
SLING-2187 - adding new module to contain our custom notice file; adding remote-resources plugin configuration to parent pom and removing all existing appended-resources NOTICE files
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1163752 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4c8bfad..c08115f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>11</version>
+ <version>12-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 18/29: SLING-2302 Update to
Jackrabbit 2.3.4 dependencies and import WebDAV (instead of embedding)
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit b5d9a118c70b0b7ffa368071aad3fc1ad631046c
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Tue Dec 6 10:28:53 2011 +0000
SLING-2302 Update to Jackrabbit 2.3.4 dependencies and import WebDAV (instead of embedding)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1210851 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 38 +++++++++++++++-----------------------
1 file changed, 15 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index c52e266..3affc27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,37 +51,29 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.4</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-Category>sling,jcr</Bundle-Category>
- <_exportcontents>
- org.apache.jackrabbit.server.io; version=2.3,
- org.apache.jackrabbit.webdav;
- org.apache.jackrabbit.webdav.property; version=2.3
- </_exportcontents>
+ <Export-Package>
+ org.apache.jackrabbit.server.io;version=2.3;provide:=true
+ </Export-Package>
<Private-Package>
+ org.apache.jackrabbit.server,
+ org.apache.jackrabbit.webdav.simple,
org.apache.sling.jcr.webdav.impl.*
</Private-Package>
- <Import-Package>
- <!-- ignore HTTP client methods of webdav -->
- !org.apache.commons.httpclient.*,
-
- <!-- ignore XML resolver of xerces -->
- !org.apache.xml.resolver.*,
-
- <!-- don't import any sun stuff -->
- !sun.*,
-
- <!-- import the rest -->
- *
- </Import-Package>
<Embed-Dependency>
- jackrabbit-jcr-server,
- jackrabbit-webdav,
- jackrabbit-jcr-commons
+ jackrabbit-jcr-server;inline=
+ org/apache/jackrabbit/webdav/jcr/DavLocatorFactoryImpl*.class|
+ org/apache/jackrabbit/webdav/jcr/ItemResourceConstants*.class|
+ org/apache/jackrabbit/webdav/jcr/JcrDavException*.class|
+ org/apache/jackrabbit/webdav/jcr/JcrDavSession*.class|
+ org/apache/jackrabbit/webdav/jcr/JcrValueType*.class|
+ org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock*.class|
+ META-INF/maven/**
</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
@@ -121,7 +113,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
- <version>2.3.2</version>
+ <version>2.3.4</version>
<scope>compile</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 19/29: Add scope provided to
dependencies
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit b900dfbb187fd55f7b2e3ee0e75c0fdcb4fc48af
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Dec 8 10:27:25 2011 +0000
Add scope provided to dependencies
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1211803 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pom.xml b/pom.xml
index 3affc27..5aecdc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,16 +98,19 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.api</artifactId>
<version>2.0.6</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.osgi</artifactId>
<version>2.0.4-incubator</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.mime</artifactId>
<version>2.0.2-incubator</version>
+ <scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 08/29: Remove unused variable
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 7d00e51c4f1ec620d2d186b2b7859cc22ceeb47c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Jul 13 09:36:50 2011 +0000
Remove unused variable
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1145931 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/jcr/webdav/impl/helper/SlingSessionProvider.java | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingSessionProvider.java b/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingSessionProvider.java
index aacefa0..c2c8558 100644
--- a/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingSessionProvider.java
+++ b/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingSessionProvider.java
@@ -43,12 +43,6 @@ import org.apache.sling.auth.core.AuthenticationSupport;
public class SlingSessionProvider implements SessionProvider {
/**
- * The name of the request attribute providing the JCR session (value is
- * "javax.jcr.Session").
- */
- private static final String ATTR_SESSION_NAME = Session.class.getName();
-
- /**
* Returns the value of the <code>javax.jcr.Session</code> request
* attribute or <code>null</code> if the request attribute is not set. If
* the request is not authenticated, that is the authentication type is
@@ -64,9 +58,9 @@ public class SlingSessionProvider implements SessionProvider {
}
// otherwise return the session from the request attribute
- ResourceResolver resourceResolver = (ResourceResolver)
+ ResourceResolver resourceResolver = (ResourceResolver)
request.getAttribute(AuthenticationSupport.REQUEST_ATTRIBUTE_RESOLVER);
-
+
if (resourceResolver == null) {
return null;
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 28/29: [maven-release-plugin]
prepare release org.apache.sling.jcr.webdav-2.1.2
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 8bb2f4ab3dd23d03a051b0d16bed26ae970ec878
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Nov 27 10:26:51 2012 +0000
[maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.1.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1414088 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index cf949b3..878b97a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.jcr.webdav</artifactId>
<packaging>bundle</packaging>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2</version>
<name>Apache Sling Simple WebDAV Access to repositories</name>
<description>
@@ -37,9 +37,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webdav</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.1.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.1.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.webdav-2.1.2</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 02/29: using latest parent
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 6c387004ac7b3bb9a9834734065ad57771cfcf75
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Nov 10 14:36:33 2010 +0000
using latest parent
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1033492 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6a83e72..1f9d110 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>9</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 21/29: SLING-2480 : Add config
for maven-sling-plugin to m2e configuration
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit a8c3db6d6b7f330fd51b45555dfc208f29541bd8
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed May 16 07:39:13 2012 +0000
SLING-2480 : Add config for maven-sling-plugin to m2e configuration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1339038 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5aecdc5..c71c33c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>12</version>
+ <version>13-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 27/29: Prepare for release
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 95e310e2db1b35064b427d8523f5c9ff0fed783c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Nov 27 09:21:13 2012 +0000
Prepare for release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1414028 13f79535-47bb-0310-9956-ffa450edef68
---
LICENSE | 202 ------------------------------------
NOTICE | 9 --
src/main/resources/META-INF/LICENSE | 202 ------------------------------------
src/main/resources/META-INF/NOTICE | 16 ---
4 files changed, 429 deletions(-)
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index 72b2446..0000000
--- a/NOTICE
+++ /dev/null
@@ -1,9 +0,0 @@
-Apache Sling WebDAV
-Copyright 2008-2010 The Apache Software Foundation
-
-Apache Sling is based on source code originally developed
-by Day Software (http://www.day.com/).
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/src/main/resources/META-INF/LICENSE b/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/src/main/resources/META-INF/NOTICE b/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 1b92d4c..0000000
--- a/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,16 +0,0 @@
-Apache Sling WebDAV
-Copyright 2008-2010 The Apache Software Foundation
-
-Apache Sling is based on source code originally developed
-by Day Software (http://www.day.com/).
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes Apache Xerces, portions of which were
-originally based on the following:
-- software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
-- software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
-- voluntary contributions made by Paul Eng on behalf of the
- Apache Software Foundation that were originally developed at iClick, Inc.,
- software copyright (c) 1999.
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 22/29: Correct metatype
information
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit a7b9e4bf144ac2869f2624f96e44cdeb2befadf3
Author: Carsten Ziegeler <cz...@apache.org>
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
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 14/29: SLING-2185 Support
IOHandler and PropertyHandler services to extend the Jackrabbit WebDAV
functionality (thanks Timothee Maret for the patch)
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 6d1be1eb5b7e9ae5928cc504b5da48a33e4787bd
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Thu Sep 1 11:33:31 2011 +0000
SLING-2185 Support IOHandler and PropertyHandler services to extend the Jackrabbit WebDAV functionality (thanks Timothee Maret for the patch)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1164020 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 12 +-
.../webdav/impl/handler/DefaultHandlerService.java | 152 +++++++++++++++++++++
.../handler/DirListingExportHandlerService.java | 37 +++++
.../webdav/impl/handler/SlingHandlerManager.java | 93 +++++++++++++
.../jcr/webdav/impl/handler/SlingIOManager.java | 61 +++++++++
.../webdav/impl/handler/SlingPropertyManager.java | 62 +++++++++
.../webdav/impl/helper/SlingResourceConfig.java | 48 ++-----
.../webdav/impl/servlets/SlingWebDavServlet.java | 128 ++++++++++++-----
.../OSGI-INF/metatype/metatype.properties | 20 +++
9 files changed, 540 insertions(+), 73 deletions(-)
diff --git a/pom.xml b/pom.xml
index 985ae3b..2e89086 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,11 @@
<configuration>
<instructions>
<Bundle-Category>sling,jcr</Bundle-Category>
+ <_exportcontents>
+ org.apache.jackrabbit.server.io; version=2.3,
+ org.apache.jackrabbit.webdav;
+ org.apache.jackrabbit.webdav.property; version=2.3
+ </_exportcontents>
<Private-Package>
org.apache.sling.jcr.webdav.impl.*
</Private-Package>
@@ -74,7 +79,6 @@
<Embed-Dependency>
jackrabbit-jcr-server,
jackrabbit-webdav,
- xercesImpl,
jackrabbit-jcr-commons
</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
@@ -117,7 +121,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
- <version>2.2.5</version>
+ <version>2.3-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
@@ -138,6 +142,10 @@
<!-- OSGi Libraries -->
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/handler/DefaultHandlerService.java b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/DefaultHandlerService.java
new file mode 100644
index 0000000..f25d050
--- /dev/null
+++ b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/DefaultHandlerService.java
@@ -0,0 +1,152 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.jcr.webdav.impl.handler;
+
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Modified;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.jackrabbit.server.io.DefaultHandler;
+import org.apache.jackrabbit.server.io.ExportContext;
+import org.apache.jackrabbit.server.io.IOHandler;
+import org.apache.jackrabbit.server.io.IOManager;
+import org.apache.jackrabbit.server.io.ImportContext;
+import org.apache.jackrabbit.server.io.PropertyExportContext;
+import org.apache.jackrabbit.server.io.PropertyHandler;
+import org.apache.jackrabbit.server.io.PropertyImportContext;
+import org.apache.jackrabbit.webdav.DavResource;
+import org.apache.jackrabbit.webdav.property.PropEntry;
+import org.apache.sling.commons.osgi.OsgiUtil;
+import org.apache.sling.jcr.webdav.impl.servlets.SlingWebDavServlet;
+import org.osgi.framework.Constants;
+
+import java.io.IOException;
+import java.util.Map;
+
+import javax.jcr.RepositoryException;
+
+/**
+ * Wraps {@link org.apache.jackrabbit.server.io.DefaultHandler} in order to run
+ * it as a service.
+ */
+@Component(metatype = true, label = "%defaulthandler.name", description = "%defaulthandler.description")
+@Properties({
+ @Property(name = Constants.SERVICE_RANKING, intValue = 1000, propertyPrivate = false),
+ @Property(name = SlingWebDavServlet.TYPE_COLLECTIONS, value = SlingWebDavServlet.TYPE_COLLECTIONS_DEFAULT, propertyPrivate = false),
+ @Property(name = SlingWebDavServlet.TYPE_NONCOLLECTIONS, value = SlingWebDavServlet.TYPE_NONCOLLECTIONS_DEFAULT, propertyPrivate = false),
+ @Property(name = SlingWebDavServlet.TYPE_CONTENT, value = SlingWebDavServlet.TYPE_CONTENT_DEFAULT, propertyPrivate = false) })
+@Service
+public class DefaultHandlerService implements IOHandler, PropertyHandler {
+
+ private DefaultHandler delegatee;
+
+ @Activate
+ @Modified
+ @SuppressWarnings("unused")
+ private void activate(final Map<String, Object> properties) {
+ final String collectionType = OsgiUtil.toString(
+ properties.get(SlingWebDavServlet.TYPE_COLLECTIONS),
+ SlingWebDavServlet.TYPE_COLLECTIONS_DEFAULT);
+ final String nonCollectionType = OsgiUtil.toString(
+ properties.get(SlingWebDavServlet.TYPE_NONCOLLECTIONS),
+ SlingWebDavServlet.TYPE_NONCOLLECTIONS_DEFAULT);
+ final String contentType = OsgiUtil.toString(
+ properties.get(SlingWebDavServlet.TYPE_CONTENT),
+ SlingWebDavServlet.TYPE_CONTENT_DEFAULT);
+
+ this.delegatee = new DefaultHandler(null, collectionType,
+ nonCollectionType, contentType);
+ }
+
+ @Deactivate
+ @SuppressWarnings("unused")
+ private void deactivate() {
+ this.delegatee = null;
+ }
+
+ public IOManager getIOManager() {
+ return delegatee.getIOManager();
+ }
+
+ public void setIOManager(IOManager ioManager) {
+ delegatee.setIOManager(ioManager);
+ }
+
+ public String getName() {
+ return delegatee.getName();
+ }
+
+ public boolean canImport(ImportContext context, boolean isCollection) {
+ return delegatee.canImport(context, isCollection);
+ }
+
+ public boolean canImport(ImportContext context, DavResource resource) {
+ return delegatee.canImport(context, resource);
+ }
+
+ public boolean importContent(ImportContext context, boolean isCollection)
+ throws IOException {
+ return delegatee.importContent(context, isCollection);
+ }
+
+ public boolean importContent(ImportContext context, DavResource resource)
+ throws IOException {
+ return delegatee.importContent(context, resource);
+ }
+
+ public boolean canExport(ExportContext context, boolean isCollection) {
+ return delegatee.canExport(context, isCollection);
+ }
+
+ public boolean canExport(ExportContext context, DavResource resource) {
+ return delegatee.canExport(context, resource);
+ }
+
+ public boolean exportContent(ExportContext context, boolean isCollection)
+ throws IOException {
+ return delegatee.exportContent(context, isCollection);
+ }
+
+ public boolean exportContent(ExportContext context, DavResource resource)
+ throws IOException {
+ return delegatee.exportContent(context, resource);
+ }
+
+ public boolean canExport(PropertyExportContext context, boolean isCollection) {
+ return delegatee.canExport(context, isCollection);
+ }
+
+ public boolean exportProperties(PropertyExportContext exportContext,
+ boolean isCollection) throws RepositoryException {
+ return delegatee.exportProperties(exportContext, isCollection);
+ }
+
+ public boolean canImport(PropertyImportContext context, boolean isCollection) {
+ return delegatee.canImport(context, isCollection);
+ }
+
+ public Map<? extends PropEntry, ?> importProperties(
+ PropertyImportContext importContext, boolean isCollection)
+ throws RepositoryException {
+ return delegatee.importProperties(importContext, isCollection);
+ }
+}
diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/handler/DirListingExportHandlerService.java b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/DirListingExportHandlerService.java
new file mode 100644
index 0000000..6aaa989
--- /dev/null
+++ b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/DirListingExportHandlerService.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.jcr.webdav.impl.handler;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.jackrabbit.server.io.DirListingExportHandler;
+import org.apache.jackrabbit.server.io.IOHandler;
+import org.apache.jackrabbit.server.io.PropertyHandler;
+import org.osgi.framework.Constants;
+
+/**
+ * Wraps {@link org.apache.jackrabbit.server.io.DirListingExportHandler} in order to run it as a service.
+ */
+@Component(metatype = true, label = "%dirlistingexporthandler.name", description = "%dirlistingexporthandler.description")
+@Property(name = Constants.SERVICE_RANKING, intValue = 100, propertyPrivate = false)
+@Service(value = {IOHandler.class, PropertyHandler.class})
+public class DirListingExportHandlerService extends DirListingExportHandler {
+
+}
diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingHandlerManager.java b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingHandlerManager.java
new file mode 100644
index 0000000..356eb81
--- /dev/null
+++ b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingHandlerManager.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.jcr.webdav.impl.handler;
+
+import java.util.ArrayList;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.component.ComponentContext;
+
+/**
+ * IOManager service that uses a ServiceTracker to find available IOHandlers.
+ */
+public class SlingHandlerManager<ManagedType> {
+
+ private final TreeMap<ServiceReference, ManagedType> handlerServices = new TreeMap<ServiceReference, ManagedType>();
+
+ private ComponentContext componentContext;
+
+ private final String referenceName;
+
+ private ManagedType[] handlers;
+
+ protected SlingHandlerManager(final String referenceName) {
+ this.referenceName = referenceName;
+ }
+
+ public void setComponentContext(ComponentContext componentContext) {
+ this.componentContext = componentContext;
+ }
+
+ @SuppressWarnings("unchecked")
+ protected ManagedType[] getHandlers(ManagedType[] type) {
+ if (this.handlers == null) {
+
+ final Set<Entry<ServiceReference, ManagedType>> entries;
+ synchronized (this.handlerServices) {
+ entries = this.handlerServices.entrySet();
+ }
+
+ final ArrayList<ManagedType> ioHandlers = new ArrayList<ManagedType>(
+ entries.size());
+ for (Entry<ServiceReference, ManagedType> entry : entries) {
+ final ManagedType ioHandler;
+ if (entry.getValue() == null) {
+ // unckecked cast
+ ioHandler = (ManagedType) this.componentContext.locateService(
+ referenceName, entry.getKey());
+ entry.setValue(ioHandler);
+ } else {
+ ioHandler = entry.getValue();
+ }
+ ioHandlers.add(ioHandler);
+ }
+
+ // unckecked cast
+ this.handlers = ioHandlers.toArray(type);
+ }
+ return this.handlers;
+ }
+
+ protected void bindHandler(final ServiceReference ref) {
+ synchronized (this.handlerServices) {
+ this.handlerServices.put(ref, null);
+ this.handlers = null;
+ }
+ }
+
+ protected void unbindHandler(final ServiceReference ref) {
+ synchronized (this.handlerServices) {
+ this.handlerServices.remove(ref);
+ this.handlers = null;
+ }
+ }
+}
diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingIOManager.java b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingIOManager.java
new file mode 100644
index 0000000..ed1c9be
--- /dev/null
+++ b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingIOManager.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.jcr.webdav.impl.handler;
+
+import org.apache.jackrabbit.server.io.IOHandler;
+import org.apache.jackrabbit.server.io.IOManagerImpl;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.component.ComponentContext;
+
+/**
+ * IOManager service that uses a ServiceTracker to find available IOHandlers.
+ */
+public class SlingIOManager extends IOManagerImpl {
+
+ private static final IOHandler[] IOHANDLERS_PROTOTYPE = new IOHandler[0];
+
+ private final SlingHandlerManager<IOHandler> handlerManager;
+
+ public SlingIOManager(final String referenceName) {
+ handlerManager = new SlingHandlerManager<IOHandler>(referenceName);
+ }
+
+ @Override
+ public void addIOHandler(IOHandler ioHandler) {
+ throw new UnsupportedOperationException(
+ "This IOManager only supports registered IOHandler services");
+ }
+
+ @Override
+ public IOHandler[] getIOHandlers() {
+ return this.handlerManager.getHandlers(IOHANDLERS_PROTOTYPE);
+ }
+
+ public void setComponentContext(ComponentContext componentContext) {
+ this.handlerManager.setComponentContext(componentContext);
+ }
+
+ public void bindIOHandler(final ServiceReference ioHandlerReference) {
+ this.handlerManager.bindHandler(ioHandlerReference);
+ }
+
+ public void unbindIOHandler(final ServiceReference ioHandlerReference) {
+ this.handlerManager.unbindHandler(ioHandlerReference);
+ }
+}
diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingPropertyManager.java b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingPropertyManager.java
new file mode 100644
index 0000000..30f3d90
--- /dev/null
+++ b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingPropertyManager.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.jcr.webdav.impl.handler;
+
+import org.apache.jackrabbit.server.io.PropertyHandler;
+import org.apache.jackrabbit.server.io.PropertyManagerImpl;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.component.ComponentContext;
+
+/**
+ * PropertyManager service that uses a ServiceTracker to find available
+ * PropertyHandler.
+ */
+public class SlingPropertyManager extends PropertyManagerImpl {
+
+ private static final PropertyHandler[] PROPERTYHANDLERS_PROTOTYPE = new PropertyHandler[0];
+
+ private final SlingHandlerManager<PropertyHandler> handlerManager;
+
+ public SlingPropertyManager(final String referenceName) {
+ handlerManager = new SlingHandlerManager<PropertyHandler>(referenceName);
+ }
+
+ @Override
+ public void addPropertyHandler(PropertyHandler propertyHandler) {
+ throw new UnsupportedOperationException(
+ "This PropertyManager only supports registered PropertyHandler services");
+ }
+
+ @Override
+ public PropertyHandler[] getPropertyHandlers() {
+ return this.handlerManager.getHandlers(PROPERTYHANDLERS_PROTOTYPE);
+ }
+
+ public void setComponentContext(ComponentContext componentContext) {
+ this.handlerManager.setComponentContext(componentContext);
+ }
+
+ public void bindPropertyHandler(final ServiceReference propertyHandlerReference) {
+ this.handlerManager.bindHandler(propertyHandlerReference);
+ }
+
+ public void unbindPropertyHandler(final ServiceReference propertyHandlerReference) {
+ this.handlerManager.unbindHandler(propertyHandlerReference);
+ }
+}
diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java b/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java
index ea519bf..42bec88 100644
--- a/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java
+++ b/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java
@@ -18,20 +18,8 @@
*/
package org.apache.sling.jcr.webdav.impl.helper;
-import java.net.URL;
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import javax.jcr.Item;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-
-import org.apache.jackrabbit.server.io.DefaultHandler;
-import org.apache.jackrabbit.server.io.DirListingExportHandler;
import org.apache.jackrabbit.server.io.IOManager;
-import org.apache.jackrabbit.server.io.IOManagerImpl;
import org.apache.jackrabbit.server.io.PropertyManager;
-import org.apache.jackrabbit.server.io.PropertyManagerImpl;
import org.apache.jackrabbit.webdav.simple.DefaultItemFilter;
import org.apache.jackrabbit.webdav.simple.ItemFilter;
import org.apache.jackrabbit.webdav.simple.ResourceConfig;
@@ -40,6 +28,13 @@ import org.apache.sling.commons.mime.MimeTypeService;
import org.apache.sling.commons.osgi.OsgiUtil;
import org.apache.sling.jcr.webdav.impl.servlets.SlingWebDavServlet;
+import javax.jcr.Item;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import java.net.URL;
+import java.util.Dictionary;
+import java.util.Hashtable;
+
public class SlingResourceConfig extends ResourceConfig {
private final String[] collectionTypes;
@@ -55,8 +50,12 @@ public class SlingResourceConfig extends ResourceConfig {
private final Dictionary<String, String> servletInitParams;
public SlingResourceConfig(MimeTypeService mimeTypeService,
- Dictionary<?, ?> config) {
+ Dictionary<?, ?> config,
+ IOManager ioManager,
+ PropertyManager propertyManager) {
super(new SlingTikaDetector(mimeTypeService));
+ this.ioManager = ioManager;
+ this.propertyManager = propertyManager;
collectionTypes = OsgiUtil.toStringArray(
config.get(SlingWebDavServlet.COLLECTION_TYPES),
SlingWebDavServlet.COLLECTION_TYPES_DEFAULT);
@@ -76,29 +75,6 @@ public class SlingResourceConfig extends ResourceConfig {
itemFilter.setFilteredURIs(filterURIs);
itemFilter.setFilteredNodetypes(filterNodeTypes);
- String collectionType = OsgiUtil.toString(
- config.get(SlingWebDavServlet.TYPE_COLLECTIONS),
- SlingWebDavServlet.TYPE_COLLECTIONS_DEFAULT);
- String nonCollectionType = OsgiUtil.toString(
- config.get(SlingWebDavServlet.TYPE_NONCOLLECTIONS),
- SlingWebDavServlet.TYPE_NONCOLLECTIONS_DEFAULT);
- String contentType = OsgiUtil.toString(
- config.get(SlingWebDavServlet.TYPE_CONTENT),
- SlingWebDavServlet.TYPE_CONTENT_DEFAULT);
-
- // share these handlers between the IOManager and the PropertyManager
- DirListingExportHandler dirHandler = new DirListingExportHandler();
- DefaultHandler defaultHandler = new DefaultHandler(null, collectionType,
- nonCollectionType, contentType);
-
- ioManager = new IOManagerImpl();
- ioManager.addIOHandler(dirHandler);
- ioManager.addIOHandler(defaultHandler);
-
- propertyManager = new PropertyManagerImpl();
- propertyManager.addPropertyHandler(dirHandler);
- propertyManager.addPropertyHandler(defaultHandler);
-
servletContextPath = OsgiUtil.toString(
config.get(SlingWebDavServlet.PROP_CONTEXT),
SlingWebDavServlet.DEFAULT_CONTEXT);
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 6585a36..47be098 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
@@ -23,14 +23,28 @@ import javax.jcr.Session;
import javax.servlet.Servlet;
import javax.servlet.ServletException;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.apache.felix.scr.annotations.ReferencePolicy;
+import org.apache.felix.scr.annotations.References;
+import org.apache.felix.scr.annotations.Service;
import org.apache.jackrabbit.server.SessionProvider;
+import org.apache.jackrabbit.server.io.IOHandler;
+import org.apache.jackrabbit.server.io.PropertyHandler;
import org.apache.jackrabbit.webdav.DavLocatorFactory;
import org.apache.jackrabbit.webdav.simple.SimpleWebdavServlet;
import org.apache.sling.commons.mime.MimeTypeService;
import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.jcr.webdav.impl.handler.SlingIOManager;
+import org.apache.sling.jcr.webdav.impl.handler.SlingPropertyManager;
import org.apache.sling.jcr.webdav.impl.helper.SlingLocatorFactory;
import org.apache.sling.jcr.webdav.impl.helper.SlingResourceConfig;
import org.apache.sling.jcr.webdav.impl.helper.SlingSessionProvider;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.http.HttpService;
import org.osgi.service.http.NamespaceException;
@@ -38,7 +52,7 @@ 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"
@@ -49,68 +63,89 @@ import org.osgi.service.http.NamespaceException;
* 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)
+@Service(Servlet.class)
+@Properties({
+ @Property(name = Constants.SERVICE_DESCRIPTION, value = "Sling WebDAV Servlet"),
+ @Property(name = Constants.SERVICE_VENDOR, value = "The Apache Software Foundation"),
+ @Property(name = "sling.servlet.resourceTypes", value = "sling/servlet/default", propertyPrivate = true),
+ @Property(name = "sling.servlet.methods", value = "*", propertyPrivate = true) })
+ @References({
+ @Reference(name = SlingWebDavServlet.IOHANDLER_REF_NAME, referenceInterface = IOHandler.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC),
+ @Reference(name = SlingWebDavServlet.PROPERTYHANDLER_REF_NAME, referenceInterface = PropertyHandler.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC)
+})
public class SlingWebDavServlet extends SimpleWebdavServlet {
- /** @scr.property valueRef="DEFAULT_CONTEXT" */
+ public static final String DEFAULT_CONTEXT = "/dav";
+
+ @Property(DEFAULT_CONTEXT)
public static final String PROP_CONTEXT = "dav.root";
- /** @scr.property valueRef="DEFAULT_REALM" */
+ public static final String DEFAULT_REALM = "Sling WebDAV";
+
+ @Property(DEFAULT_REALM)
public static final String PROP_REALM = "dav.realm";
- /** @scr.property valueRef="COLLECTION_TYPES_DEFAULT" */
public static final String COLLECTION_TYPES = "collection.types";
- /** @scr.property valueRef="FILTER_PREFIXES_DEFAULT" */
- public static final String FILTER_PREFIXES = "filter.prefixes";
+ public static final String TYPE_NONCOLLECTIONS_DEFAULT = "nt:file";
- /** @scr.property valueRef="EMPTY_DEFAULT" */
- public static final String FILTER_TYPES = "filter.types";
+ public static final String TYPE_CONTENT_DEFAULT = "nt:resource";
- /** @scr.property valueRef="EMPTY_DEFAULT" */
- public static final String FILTER_URIS = "filter.uris";
+ @Property(name = COLLECTION_TYPES)
+ public static final String[] COLLECTION_TYPES_DEFAULT = new String[] {
+ TYPE_NONCOLLECTIONS_DEFAULT, TYPE_CONTENT_DEFAULT };
- /** @scr.property valueRef="TYPE_COLLECTIONS_DEFAULT" */
- public static final String TYPE_COLLECTIONS = "type.collections";
+ public static final String FILTER_PREFIXES = "filter.prefixes";
- /** @scr.property valueRef="TYPE_NONCOLLECTIONS_DEFAULT" */
- public static final String TYPE_NONCOLLECTIONS = "type.noncollections";
+ @Property(name = FILTER_PREFIXES)
+ public static final String[] FILTER_PREFIXES_DEFAULT = new String[] {
+ "rep", "jcr" };
- /** @scr.property valueRef="TYPE_CONTENT_DEFAULT" */
- public static final String TYPE_CONTENT = "type.content";
+ public static final String[] EMPTY_DEFAULT = new String[0];
- public static final String DEFAULT_CONTEXT = "/dav";
+ @Property({})
+ public static final String FILTER_TYPES = "filter.types";
- public static final String DEFAULT_REALM = "Sling WebDAV";
+ @Property({})
+ public static final String FILTER_URIS = "filter.uris";
- public static final String[] EMPTY_DEFAULT = new String[0];
+ public static final String TYPE_COLLECTIONS_DEFAULT = "sling:Folder";
- public static final String[] FILTER_PREFIXES_DEFAULT = new String[] {
- "rep", "jcr" };
+ @Property(TYPE_COLLECTIONS_DEFAULT)
+ public static final String TYPE_COLLECTIONS = "type.collections";
- public static final String TYPE_COLLECTIONS_DEFAULT = "sling:Folder";
+ @Property(TYPE_NONCOLLECTIONS_DEFAULT)
+ public static final String TYPE_NONCOLLECTIONS = "type.noncollections";
- public static final String TYPE_NONCOLLECTIONS_DEFAULT = "nt:file";
+ @Property(TYPE_CONTENT_DEFAULT)
+ public static final String TYPE_CONTENT = "type.content";
- public static final String TYPE_CONTENT_DEFAULT = "nt:resource";
+ static final String IOHANDLER_REF_NAME = "IOHandler";
- public static final String[] COLLECTION_TYPES_DEFAULT = new String[] {
- TYPE_NONCOLLECTIONS_DEFAULT, TYPE_CONTENT_DEFAULT };
+ static final String PROPERTYHANDLER_REF_NAME = "PropertyHandler";
- /** @scr.reference */
+ @Reference
private SlingRepository repository;
- /** @scr.reference */
+ @Reference
private HttpService httpService;
- /** @scr.reference */
+ @Reference
private MimeTypeService mimeTypeService;
+ private final SlingIOManager ioManager = new SlingIOManager(
+ IOHANDLER_REF_NAME);
+
+ private final SlingPropertyManager propertyManager = new SlingPropertyManager(
+ PROPERTYHANDLER_REF_NAME);
+
private SlingResourceConfig resourceConfig;
private DavLocatorFactory locatorFactory;
private SessionProvider sessionProvider;
-
+
private boolean simpleWebDavServletRegistered;
// ---------- SimpleWebdavServlet overwrites -------------------------------
@@ -118,10 +153,10 @@ public class SlingWebDavServlet extends SimpleWebdavServlet {
@Override
public void init() throws ServletException {
super.init();
-
+
setResourceConfig(resourceConfig);
}
-
+
@Override
public Repository getRepository() {
return repository;
@@ -169,8 +204,13 @@ public class SlingWebDavServlet extends SimpleWebdavServlet {
protected void activate(ComponentContext context)
throws NamespaceException, ServletException {
+ this.ioManager.setComponentContext(context);
+ this.propertyManager.setComponentContext(context);
+
resourceConfig = new SlingResourceConfig(mimeTypeService,
- context.getProperties());
+ context.getProperties(),
+ ioManager,
+ propertyManager);
// Register servlet, and set the contextPath field to signal successful
// registration
@@ -182,12 +222,30 @@ public class SlingWebDavServlet extends SimpleWebdavServlet {
}
protected void deactivate(ComponentContext context) {
-
+
if (simpleWebDavServletRegistered) {
httpService.unregister(resourceConfig.getServletContextPath());
simpleWebDavServletRegistered = false;
}
- resourceConfig = null;
+ this.resourceConfig = null;
+ this.ioManager.setComponentContext(null);
+ this.propertyManager.setComponentContext(null);
+ }
+
+ public void bindIOHandler(final ServiceReference ioHandlerReference) {
+ this.ioManager.bindIOHandler(ioHandlerReference);
+ }
+
+ public void unbindIOHandler(final ServiceReference ioHandlerReference) {
+ this.ioManager.unbindIOHandler(ioHandlerReference);
+ }
+
+ public void bindPropertyHandler(final ServiceReference propertyHandlerReference) {
+ this.propertyManager.bindPropertyHandler(propertyHandlerReference);
+ }
+
+ public void unbindPropertyHandler(final ServiceReference propertyHandlerReference) {
+ this.propertyManager.unbindPropertyHandler(propertyHandlerReference);
}
}
diff --git a/src/main/resources/OSGI-INF/metatype/metatype.properties b/src/main/resources/OSGI-INF/metatype/metatype.properties
index a90afa5..78b4793 100644
--- a/src/main/resources/OSGI-INF/metatype/metatype.properties
+++ b/src/main/resources/OSGI-INF/metatype/metatype.properties
@@ -27,6 +27,26 @@
# SimpleWebDavServlet
# (This servlet is directly registered with the HttpService besides the
# SlingMainServlet. Requests to this servlet do not pass by Sling)
+iomanager.name = Apache Sling IOManager Service
+iomanager.description = The Sling IOManager service tracks all \
+ IOHandler services running on the framework and allows to access them \
+ as a sorted list (based on the service.ranking property).
+
+propertymanager.name = Apache Sling PropertyManager Service
+propertymanager.description = The Sling PropertyManager service tracks all \
+ PropertyManager services running on the framework and allows to access them \
+ as a sorted list (based on the service.ranking property).
+
+dirlistingexporthandler.name = Apache Sling Directory Listing Exporter Service
+dirlistingexporthandler.description = The Sling Directory Listing Exporter Service \
+ wraps a org.apache.jackrabbit.server.io.DirListingExportHandler instance in order to \
+ run it as a service.
+
+defaulthandler.name = Apache Sling Default Handler Service
+defaulthandler.description = The Apache Sling Default Handler Service \
+ wraps a org.apache.jackrabbit.server.io.DefaultHandler instance in order to \
+ run it as a service.
+
dav.name = Apache Sling Simple WebDAV Servlet
dav.description = The Simple WebDAV Servlet allows direct access to the \
complete Repository. It is directly accessible in its own URL space and \
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 05/29: Catch and log uncaught
exceptions
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 827bdb0672d1c42d9b22eca5f0431c013652a138
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Fri Jan 28 11:17:06 2011 +0000
Catch and log uncaught exceptions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1064628 13f79535-47bb-0310-9956-ffa450edef68
---
.../webdav/impl/servlets/SlingSimpleWebDavServlet.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java b/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java
index 30e999e..01ec634 100644
--- a/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java
+++ b/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java
@@ -28,6 +28,8 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.jackrabbit.webdav.simple.SimpleWebdavServlet;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.jcr.webdav.impl.helper.SlingResourceConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The <code>SlingSimpleWebDavServlet</code> extends the
@@ -36,6 +38,9 @@ import org.apache.sling.jcr.webdav.impl.helper.SlingResourceConfig;
*/
public class SlingSimpleWebDavServlet extends SimpleWebdavServlet {
+ /** default log */
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
private final SlingResourceConfig resourceConfig;
private final Repository repository;
@@ -58,6 +63,19 @@ public class SlingSimpleWebDavServlet extends SimpleWebdavServlet {
@Override
protected void service(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException {
+ try {
+ doService(request, response);
+ } catch (RuntimeException re) {
+ log.error("service: Uncaught RuntimeException", re);
+ throw new ServletException("Uncaught RuntimeException: " + re);
+ } catch (Error e) {
+ log.error("service: Uncaught Error", e);
+ throw new ServletException("Uncaught Error: " + e);
+ }
+ }
+
+ protected void doService(HttpServletRequest request,
+ HttpServletResponse response) throws ServletException, IOException {
// According to the spec the path info is either null or
// a string starting with a slash. Thus a string of length 1
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 13/29: temporarily using
snapshots during release vote
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit a2bbfd330c960626398839040f37dc6ef5dbd3f6
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Aug 31 20:10:55 2011 +0000
temporarily using snapshots during release vote
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1163785 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c08115f..985ae3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>12-SNAPSHOT</version>
+ <version>13-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 25/29: Use released versions
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 7c55761e9661c2160c4817a77b883647c93cdae4
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jul 10 11:07:18 2012 +0000
Use released versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1359601 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 06c7863..cf949b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>14-SNAPSHOT</version>
+ <version>13</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 16/29: SLING-2233 Apply patch
providing support for CopyMoveManager supplied by Sameer Charles (Thanks)
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 36a21a232ee0e6d8cba0d4abdb8b9e6c75ef3db9
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Wed Sep 28 06:15:26 2011 +0000
SLING-2233 Apply patch providing support for CopyMoveManager supplied by Sameer Charles (Thanks)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1176743 13f79535-47bb-0310-9956-ffa450edef68
---
.../webdav/impl/handler/DefaultHandlerService.java | 21 +++++++-
.../webdav/impl/handler/SlingCopyMoveManager.java | 62 ++++++++++++++++++++++
.../webdav/impl/helper/SlingResourceConfig.java | 12 ++++-
.../webdav/impl/servlets/SlingWebDavServlet.java | 23 +++++++-
4 files changed, 114 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/handler/DefaultHandlerService.java b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/DefaultHandlerService.java
index f25d050..4575ba5 100644
--- a/src/main/java/org/apache/sling/jcr/webdav/impl/handler/DefaultHandlerService.java
+++ b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/DefaultHandlerService.java
@@ -33,6 +33,9 @@ import org.apache.jackrabbit.server.io.ImportContext;
import org.apache.jackrabbit.server.io.PropertyExportContext;
import org.apache.jackrabbit.server.io.PropertyHandler;
import org.apache.jackrabbit.server.io.PropertyImportContext;
+import org.apache.jackrabbit.server.io.CopyMoveHandler;
+import org.apache.jackrabbit.server.io.CopyMoveContext;
+import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavResource;
import org.apache.jackrabbit.webdav.property.PropEntry;
import org.apache.sling.commons.osgi.OsgiUtil;
@@ -55,7 +58,7 @@ import javax.jcr.RepositoryException;
@Property(name = SlingWebDavServlet.TYPE_NONCOLLECTIONS, value = SlingWebDavServlet.TYPE_NONCOLLECTIONS_DEFAULT, propertyPrivate = false),
@Property(name = SlingWebDavServlet.TYPE_CONTENT, value = SlingWebDavServlet.TYPE_CONTENT_DEFAULT, propertyPrivate = false) })
@Service
-public class DefaultHandlerService implements IOHandler, PropertyHandler {
+public class DefaultHandlerService implements IOHandler, PropertyHandler, CopyMoveHandler {
private DefaultHandler delegatee;
@@ -149,4 +152,20 @@ public class DefaultHandlerService implements IOHandler, PropertyHandler {
throws RepositoryException {
return delegatee.importProperties(importContext, isCollection);
}
+
+ public boolean canCopy(CopyMoveContext context, DavResource source, DavResource destination) {
+ return delegatee.canCopy(context, source, destination);
+ }
+
+ public boolean copy(CopyMoveContext context, DavResource source, DavResource destination) throws DavException {
+ return delegatee.copy(context, source, destination);
+ }
+
+ public boolean canMove(CopyMoveContext context, DavResource source, DavResource destination) {
+ return delegatee.canMove(context, source, destination);
+ }
+
+ public boolean move(CopyMoveContext context, DavResource source, DavResource destination) throws DavException {
+ return delegatee.move(context, source, destination);
+ }
}
diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingCopyMoveManager.java b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingCopyMoveManager.java
new file mode 100644
index 0000000..312e031
--- /dev/null
+++ b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingCopyMoveManager.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.jcr.webdav.impl.handler;
+
+import org.apache.jackrabbit.server.io.CopyMoveHandler;
+import org.apache.jackrabbit.server.io.CopyMoveManagerImpl;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.component.ComponentContext;
+
+/**
+ * CopyMoveManager service that uses a ServiceTracker to find available
+ * CopyMoveHandler.
+ */
+public class SlingCopyMoveManager extends CopyMoveManagerImpl {
+
+ private static final CopyMoveHandler[] COPYMOVEHANDLERS_PROTOTYPE = new CopyMoveHandler[0];
+
+ private final SlingHandlerManager<CopyMoveHandler> handlerManager;
+
+ public SlingCopyMoveManager(final String referenceName) {
+ handlerManager = new SlingHandlerManager<CopyMoveHandler>(referenceName);
+ }
+
+ @Override
+ public void addCopyMoveHandler(CopyMoveHandler propertyHandler) {
+ throw new UnsupportedOperationException(
+ "This CopyMoveManager only supports registered CopyMoveHandler services");
+ }
+
+ @Override
+ public CopyMoveHandler[] getCopyMoveHandlers() {
+ return this.handlerManager.getHandlers(COPYMOVEHANDLERS_PROTOTYPE);
+ }
+
+ public void setComponentContext(ComponentContext componentContext) {
+ this.handlerManager.setComponentContext(componentContext);
+ }
+
+ public void bindCopyMoveHandler(final ServiceReference copyMoveHandlerReference) {
+ this.handlerManager.bindHandler(copyMoveHandlerReference);
+ }
+
+ public void unbindCopyMoveHandler(final ServiceReference copyMoveHandlerReference) {
+ this.handlerManager.unbindHandler(copyMoveHandlerReference);
+ }
+}
diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java b/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java
index 42bec88..eab6da0 100644
--- a/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java
+++ b/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java
@@ -18,6 +18,7 @@
*/
package org.apache.sling.jcr.webdav.impl.helper;
+import org.apache.jackrabbit.server.io.CopyMoveManager;
import org.apache.jackrabbit.server.io.IOManager;
import org.apache.jackrabbit.server.io.PropertyManager;
import org.apache.jackrabbit.webdav.simple.DefaultItemFilter;
@@ -45,6 +46,8 @@ public class SlingResourceConfig extends ResourceConfig {
private final PropertyManager propertyManager;
+ private final CopyMoveManager copyMoveManager;
+
private final String servletContextPath;
private final Dictionary<String, String> servletInitParams;
@@ -52,10 +55,12 @@ public class SlingResourceConfig extends ResourceConfig {
public SlingResourceConfig(MimeTypeService mimeTypeService,
Dictionary<?, ?> config,
IOManager ioManager,
- PropertyManager propertyManager) {
+ PropertyManager propertyManager,
+ CopyMoveManager copyMoveManager) {
super(new SlingTikaDetector(mimeTypeService));
this.ioManager = ioManager;
this.propertyManager = propertyManager;
+ this.copyMoveManager = copyMoveManager;
collectionTypes = OsgiUtil.toStringArray(
config.get(SlingWebDavServlet.COLLECTION_TYPES),
SlingWebDavServlet.COLLECTION_TYPES_DEFAULT);
@@ -109,6 +114,11 @@ public class SlingResourceConfig extends ResourceConfig {
}
@Override
+ public CopyMoveManager getCopyMoveManager() {
+ return copyMoveManager;
+ }
+
+ @Override
public boolean isCollectionResource(Item item) {
if (item.isNode()) {
Node node = (Node) item;
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 47be098..ccf7a38 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
@@ -32,12 +32,14 @@ import org.apache.felix.scr.annotations.ReferencePolicy;
import org.apache.felix.scr.annotations.References;
import org.apache.felix.scr.annotations.Service;
import org.apache.jackrabbit.server.SessionProvider;
+import org.apache.jackrabbit.server.io.CopyMoveHandler;
import org.apache.jackrabbit.server.io.IOHandler;
import org.apache.jackrabbit.server.io.PropertyHandler;
import org.apache.jackrabbit.webdav.DavLocatorFactory;
import org.apache.jackrabbit.webdav.simple.SimpleWebdavServlet;
import org.apache.sling.commons.mime.MimeTypeService;
import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.jcr.webdav.impl.handler.SlingCopyMoveManager;
import org.apache.sling.jcr.webdav.impl.handler.SlingIOManager;
import org.apache.sling.jcr.webdav.impl.handler.SlingPropertyManager;
import org.apache.sling.jcr.webdav.impl.helper.SlingLocatorFactory;
@@ -72,7 +74,8 @@ import org.osgi.service.http.NamespaceException;
@Property(name = "sling.servlet.methods", value = "*", propertyPrivate = true) })
@References({
@Reference(name = SlingWebDavServlet.IOHANDLER_REF_NAME, referenceInterface = IOHandler.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC),
- @Reference(name = SlingWebDavServlet.PROPERTYHANDLER_REF_NAME, referenceInterface = PropertyHandler.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC)
+ @Reference(name = SlingWebDavServlet.PROPERTYHANDLER_REF_NAME, referenceInterface = PropertyHandler.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC),
+ @Reference(name = SlingWebDavServlet.COPYMOVEHANDLER_REF_NAME, referenceInterface = CopyMoveHandler.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC)
})
public class SlingWebDavServlet extends SimpleWebdavServlet {
@@ -125,6 +128,8 @@ public class SlingWebDavServlet extends SimpleWebdavServlet {
static final String PROPERTYHANDLER_REF_NAME = "PropertyHandler";
+ static final String COPYMOVEHANDLER_REF_NAME = "CopyMoveHandler";
+
@Reference
private SlingRepository repository;
@@ -140,6 +145,9 @@ public class SlingWebDavServlet extends SimpleWebdavServlet {
private final SlingPropertyManager propertyManager = new SlingPropertyManager(
PROPERTYHANDLER_REF_NAME);
+ private final SlingCopyMoveManager copyMoveManager = new SlingCopyMoveManager(
+ COPYMOVEHANDLER_REF_NAME);
+
private SlingResourceConfig resourceConfig;
private DavLocatorFactory locatorFactory;
@@ -206,11 +214,13 @@ public class SlingWebDavServlet extends SimpleWebdavServlet {
this.ioManager.setComponentContext(context);
this.propertyManager.setComponentContext(context);
+ this.copyMoveManager.setComponentContext(context);
resourceConfig = new SlingResourceConfig(mimeTypeService,
context.getProperties(),
ioManager,
- propertyManager);
+ propertyManager,
+ copyMoveManager);
// Register servlet, and set the contextPath field to signal successful
// registration
@@ -231,6 +241,7 @@ public class SlingWebDavServlet extends SimpleWebdavServlet {
this.resourceConfig = null;
this.ioManager.setComponentContext(null);
this.propertyManager.setComponentContext(null);
+ this.copyMoveManager.setComponentContext(null);
}
public void bindIOHandler(final ServiceReference ioHandlerReference) {
@@ -248,4 +259,12 @@ public class SlingWebDavServlet extends SimpleWebdavServlet {
public void unbindPropertyHandler(final ServiceReference propertyHandlerReference) {
this.propertyManager.unbindPropertyHandler(propertyHandlerReference);
}
+
+ public void bindCopyMoveHandler(final ServiceReference copyMoveHandlerReference) {
+ this.copyMoveManager.bindCopyMoveHandler(copyMoveHandlerReference);
+ }
+
+ public void unbindCopyMoveHandler(final ServiceReference copyMoveHandlerReference) {
+ this.copyMoveManager.unbindCopyMoveHandler(copyMoveHandlerReference);
+ }
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 11/29: Using latest released
parent pom
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 6a5199481f33c3a5d6986890f1ef8cef90bbce53
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Aug 8 11:31:38 2011 +0000
Using latest released parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1154924 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c08115f..4c8bfad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>12-SNAPSHOT</version>
+ <version>11</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 10/29: Update to recent snapshot
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit b24bcb7bf10e2ad4456e9786f6a1ca91e4c799e9
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Aug 3 09:01:37 2011 +0000
Update to recent snapshot
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1153397 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index bc3ea14..c08115f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>11-SNAPSHOT</version>
+ <version>12-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 03/29: Update to recent
snapshots
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit e649904503f9a6d2c709bc356b0f371cd95a8912
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Dec 8 16:37:27 2010 +0000
Update to recent snapshots
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1043504 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1f9d110..c646c7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>10-SNAPSHOT</version>
+ <version>11-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 26/29: SLING-2559 - avoiding
the setValue() call by queueing updates to the handler map and then using
putAll()
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit f90cc4b3c8fce7210613f0a6b89425726f9a39eb
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Mon Aug 13 18:32:45 2012 +0000
SLING-2559 - avoiding the setValue() call by queueing updates to the handler map and then using putAll()
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1372539 13f79535-47bb-0310-9956-ffa450edef68
---
.../jcr/webdav/impl/handler/SlingHandlerManager.java | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingHandlerManager.java b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingHandlerManager.java
index 356eb81..6660095 100644
--- a/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingHandlerManager.java
+++ b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingHandlerManager.java
@@ -19,6 +19,8 @@
package org.apache.sling.jcr.webdav.impl.handler;
import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
@@ -58,19 +60,31 @@ public class SlingHandlerManager<ManagedType> {
final ArrayList<ManagedType> ioHandlers = new ArrayList<ManagedType>(
entries.size());
+ final Map<ServiceReference, ManagedType> updates = new HashMap<ServiceReference, ManagedType>();
for (Entry<ServiceReference, ManagedType> entry : entries) {
final ManagedType ioHandler;
if (entry.getValue() == null) {
+ final ServiceReference key = entry.getKey();
// unckecked cast
ioHandler = (ManagedType) this.componentContext.locateService(
- referenceName, entry.getKey());
- entry.setValue(ioHandler);
+ referenceName, key);
+ // since we're inside the entries iterator, we can't update the map
+ // defer updating the map until this loop is finished
+ if (ioHandler != null) {
+ updates.put(key, ioHandler);
+ }
} else {
ioHandler = entry.getValue();
}
ioHandlers.add(ioHandler);
}
+ if (!updates.isEmpty()) {
+ synchronized (this.handlerServices) {
+ this.handlerServices.putAll(updates);
+ }
+ }
+
// unckecked cast
this.handlers = ioHandlers.toArray(type);
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 24/29: Update to latest parent
pom
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 488a9f951a3805fd79f04aebbb2722afdb37eefc
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jul 5 09:29:47 2012 +0000
Update to latest parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1357521 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5edfb16..06c7863 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>13-SNAPSHOT</version>
+ <version>14-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 15/29: using latest releases
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit ee3c035ea55f7de17ffa68e2f39fa94d9d85f5ba
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Sep 7 14:35:51 2011 +0000
using latest releases
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1166199 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2e89086..8d65361 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>13-SNAPSHOT</version>
+ <version>12</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 07/29: SLING-2133 : Sling
WebDAV response is not sending realm correctly
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit b2bb239fce73bcacbb24ac7cf580f4c8294edd89
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Jul 11 10:39:08 2011 +0000
SLING-2133 : Sling WebDAV response is not sending realm correctly
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1145114 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java b/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java
index 0612a7f..ea519bf 100644
--- a/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java
+++ b/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java
@@ -112,7 +112,7 @@ public class SlingResourceConfig extends ResourceConfig {
SlingWebDavServlet.DEFAULT_REALM);
servletInitParams.put(
SimpleWebdavServlet.INIT_PARAM_AUTHENTICATE_HEADER,
- "Basic Realm=\"" + value + "\"");
+ "Basic realm=\"" + value + "\"");
}
// ---------- ResourceConfig overwrites
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 09/29: SLING-2150 : Update
plugins to use the latest available versions
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 30bf704aa5dd20d2d446c177bda580ec1c5ebf8f
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Jul 20 12:21:40 2011 +0000
SLING-2150 : Update plugins to use the latest available versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1148722 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index def5287..bc3ea14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>10</version>
+ <version>11-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 23/29: SLING-2503 : Update to
new Jackrabbit version to fix JCR-3329
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit b948d6e92d8c113027c17451664f9271cd3a2312
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Jun 11 07:22:15 2012 +0000
SLING-2503 : Update to new Jackrabbit version to fix JCR-3329
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1348728 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c71c33c..5edfb16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
- <version>2.3.4</version>
+ <version>2.4.2</version>
<scope>compile</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 04/29: Use latest releases.
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit dfa2d0a4b86294a332e0f993c5d933fbd1ffc211
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Dec 13 08:55:35 2010 +0000
Use latest releases.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1045037 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c646c7f..ed1a801 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>11-SNAPSHOT</version>
+ <version>10</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 29/29: [maven-release-plugin]
copy for tag org.apache.sling.jcr.webdav-2.1.2
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 7403809db4f5e8dd521d0f878c91793c031c988e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Nov 27 10:27:07 2012 +0000
[maven-release-plugin] copy for tag org.apache.sling.jcr.webdav-2.1.2
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.1.2@1414089 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 06/29: SLING-2044 Upgrade to
jackrabbit 2.2.5
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit cdc511251795a872c99b5dd3e5beca8fc011c7bd
Author: Eric Norman <en...@apache.org>
AuthorDate: Sat Apr 2 18:15:02 2011 +0000
SLING-2044 Upgrade to jackrabbit 2.2.5
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1088070 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ed1a801..def5287 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
- <version>2.1.1</version>
+ <version>2.2.5</version>
<scope>compile</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 20/29: SLING-2443 -
WWW-Authenticate header was missing on OPTIONS request on /
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit e6ce118f9a72b836f562678e290dfbca3ab2d684
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Apr 2 13:28:31 2012 +0000
SLING-2443 - WWW-Authenticate header was missing on OPTIONS request on /
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1308347 13f79535-47bb-0310-9956-ffa450edef68
---
.../jcr/webdav/impl/servlets/SlingWebDavServlet.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
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 ccf7a38..2b97d9d 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
@@ -18,10 +18,13 @@
*/
package org.apache.sling.jcr.webdav.impl.servlets;
+import java.io.IOException;
+
import javax.jcr.Repository;
import javax.jcr.Session;
import javax.servlet.Servlet;
import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Properties;
@@ -35,7 +38,10 @@ import org.apache.jackrabbit.server.SessionProvider;
import org.apache.jackrabbit.server.io.CopyMoveHandler;
import org.apache.jackrabbit.server.io.IOHandler;
import org.apache.jackrabbit.server.io.PropertyHandler;
+import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavLocatorFactory;
+import org.apache.jackrabbit.webdav.WebdavRequest;
+import org.apache.jackrabbit.webdav.WebdavResponse;
import org.apache.jackrabbit.webdav.simple.SimpleWebdavServlet;
import org.apache.sling.commons.mime.MimeTypeService;
import org.apache.sling.jcr.api.SlingRepository;
@@ -267,4 +273,16 @@ 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 {
+ response.setHeader("WWW-Authenticate", getAuthenticateHeaderValue());
+ response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+ 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
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 17/29: SLING-2272 - upgrade
Jackrabbit version to 2.2.9 (except for WebDAV, which needs 2.3.x,
so upgraded to 2.3.2) and Tika to 1.0
Posted by 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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit ca6bfbdc934ce3defc8912037976c306b3c52cb4
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Tue Nov 8 23:43:22 2011 +0000
SLING-2272 - upgrade Jackrabbit version to 2.2.9 (except for WebDAV, which needs 2.3.x, so upgraded to 2.3.2) and Tika to 1.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1199537 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8d65361..c52e266 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.3.2</version>
<scope>compile</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.