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:52:02 UTC
[sling-org-apache-sling-jcr-webdav] annotated tag
org.apache.sling.jcr.webdav-2.3.2 created (now f299a96)
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.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git.
at f299a96 (tag)
tagging ebcfa459501496f95d35bdd7af37454832fdbf8a (commit)
by Robert Munteanu
on Wed Oct 7 11:40:28 2015 +0000
- Log -----------------------------------------------------------------
org.apache.sling.jcr.webdav-2.3.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 76bda1c [maven-release-plugin] prepare for next development iteration
new 646a8c3 Use latest releases and update to new parent pom
new dc73d32 Update to latest parent pom and use latest releases in launchpad
new 8f37580 Correct reactor pom and update to parent pom 16
new c7d2fe5 SLING-2825 : sling webdav servlet should support config property "createAbsoluteURI" . Apply patch from Julian Reschke
new d30ae80 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.2.0
new a5e3281 [maven-release-plugin] prepare for next development iteration
new 35efe06 Update to latest parent pom
new 769a601 Update to parent pom 18
new d138848 SLING-3262 Update Jackrabbit WebDAV and JCR Server dependencies to 2.6.4 (latest production version)
new 0fd065c SLING-3262 Need to include all classes from the org.apache.jackrabbit.webdav.jcr.lock package to prevent a ClassNotFoundException on the LockTokenMapper.
new 490ceea [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.2.2
new 1bfef22 [maven-release-plugin] prepare for next development iteration
new dbd32e9 Update to parent pom v19
new 115e1d2 Updated to parent version 20
new 03bc282 Update to Sling Parent POM 22 with baselining enabled
new 2f7f491 SLING-4698 - Set parent.relativePath to empty for all modules
new b4bf67c Update to Sling Parent 23
new 01aa708 set parent version to 24 and add empty relativePath where missing
new e383a0e SLING-4919 : Require configuration for webdav related services
new c0fbb58 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.3.0
new 4576766 [maven-release-plugin] prepare for next development iteration
new f82f58f SLING-4825 - support Jackrabbit DeleteHandler - contributed by Satya Deep Maheshwari, thanks!
new 29e04d3 Update the main reactor to parent 25
new a9b12f3 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.3.2
new ebcfa45 [maven-release-plugin] copy for tag org.apache.sling.jcr.webdav-2.3.2
The 143 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] 02/05: SLING-4825 - support
Jackrabbit DeleteHandler - contributed by Satya Deep Maheshwari, 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.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit f82f58f1aab04321e6f946d4730bcd6c72aa5ecd
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Sep 14 12:50:16 2015 +0000
SLING-4825 - support Jackrabbit DeleteHandler - contributed by Satya Deep Maheshwari, thanks!
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1702935 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 +-
.../webdav/impl/handler/DefaultHandlerService.java | 15 +++++-
.../webdav/impl/handler/SlingDeleteManager.java | 63 ++++++++++++++++++++++
.../webdav/impl/helper/SlingResourceConfig.java | 12 ++++-
.../webdav/impl/servlets/SlingWebDavServlet.java | 23 +++++++-
5 files changed, 111 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index d34c785..134f1dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
<instructions>
<Bundle-Category>sling,jcr</Bundle-Category>
<Export-Package>
- org.apache.jackrabbit.server.io;version=2.3;provide:=true
+ org.apache.jackrabbit.server.io;version=2.4;provide:=true
</Export-Package>
<Private-Package>
org.apache.jackrabbit.server,
@@ -115,7 +115,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
- <version>2.6.4</version>
+ <version>2.11.0</version>
<scope>compile</scope>
</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
index 4575ba5..3021e6b 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
@@ -26,6 +26,8 @@ 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.DeleteContext;
+import org.apache.jackrabbit.server.io.DeleteHandler;
import org.apache.jackrabbit.server.io.ExportContext;
import org.apache.jackrabbit.server.io.IOHandler;
import org.apache.jackrabbit.server.io.IOManager;
@@ -58,7 +60,8 @@ 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, CopyMoveHandler {
+public class DefaultHandlerService implements IOHandler, PropertyHandler, CopyMoveHandler,
+ DeleteHandler {
private DefaultHandler delegatee;
@@ -168,4 +171,14 @@ public class DefaultHandlerService implements IOHandler, PropertyHandler, CopyMo
public boolean move(CopyMoveContext context, DavResource source, DavResource destination) throws DavException {
return delegatee.move(context, source, destination);
}
+
+ public boolean delete(DeleteContext deleteContext, DavResource davResource)
+ throws DavException {
+ return delegatee.delete(deleteContext, davResource);
+ }
+
+ public boolean canDelete(DeleteContext deleteContext,
+ DavResource davResource) {
+ return delegatee.canDelete(deleteContext, davResource);
+ }
}
diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingDeleteManager.java b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingDeleteManager.java
new file mode 100644
index 0000000..156a720
--- /dev/null
+++ b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingDeleteManager.java
@@ -0,0 +1,63 @@
+/*
+ * 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.DeleteHandler;
+import org.apache.jackrabbit.server.io.DeleteManagerImpl;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.component.ComponentContext;
+
+/**
+ * DeleteManager service that uses a ServiceTracker to find available
+ * DeleteHandler.
+ */
+public class SlingDeleteManager extends DeleteManagerImpl {
+
+ private static final DeleteHandler[] DELETEHANDLERS_PROTOTYPE = new DeleteHandler[0];
+ private final SlingHandlerManager<DeleteHandler> handlerManager;
+
+ public SlingDeleteManager(final String referenceName) {
+ handlerManager = new SlingHandlerManager<DeleteHandler>(referenceName);
+ }
+
+ @Override
+ public void addDeleteHandler(DeleteHandler propertyHandler) {
+ throw new UnsupportedOperationException(
+ "This DeleteManager only supports registered DeleteHandler services");
+ }
+
+ @Override
+ public DeleteHandler[] getDeleteHandlers() {
+ return this.handlerManager.getHandlers(DELETEHANDLERS_PROTOTYPE);
+ }
+
+ public void setComponentContext(ComponentContext componentContext) {
+ this.handlerManager.setComponentContext(componentContext);
+ }
+
+ public void bindDeleteHandler(final ServiceReference deleteHandlerReference) {
+ this.handlerManager.bindHandler(deleteHandlerReference);
+ }
+
+ public void unbindDeleteHandler(final ServiceReference deleteHandlerReference) {
+ this.handlerManager.unbindHandler(deleteHandlerReference);
+ }
+
+}
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 b0e16da..8f94274 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
@@ -19,6 +19,7 @@
package org.apache.sling.jcr.webdav.impl.helper;
import org.apache.jackrabbit.server.io.CopyMoveManager;
+import org.apache.jackrabbit.server.io.DeleteManager;
import org.apache.jackrabbit.server.io.IOManager;
import org.apache.jackrabbit.server.io.PropertyManager;
import org.apache.jackrabbit.webdav.simple.DefaultItemFilter;
@@ -48,6 +49,8 @@ public class SlingResourceConfig extends ResourceConfig {
private final CopyMoveManager copyMoveManager;
+ private final DeleteManager deleteManager;
+
private final String servletContextPath;
private final Dictionary<String, String> servletInitParams;
@@ -56,11 +59,13 @@ public class SlingResourceConfig extends ResourceConfig {
Dictionary<?, ?> config,
IOManager ioManager,
PropertyManager propertyManager,
- CopyMoveManager copyMoveManager) {
+ CopyMoveManager copyMoveManager,
+ DeleteManager deleteManager) {
super(new SlingTikaDetector(mimeTypeService));
this.ioManager = ioManager;
this.propertyManager = propertyManager;
this.copyMoveManager = copyMoveManager;
+ this.deleteManager = deleteManager;
collectionTypes = OsgiUtil.toStringArray(
config.get(SlingWebDavServlet.COLLECTION_TYPES),
SlingWebDavServlet.COLLECTION_TYPES_DEFAULT);
@@ -126,6 +131,11 @@ public class SlingResourceConfig extends ResourceConfig {
}
@Override
+ public DeleteManager getDeleteManager() {
+ return deleteManager;
+ }
+
+ @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 c031a98..cdd488e 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
@@ -37,6 +37,7 @@ 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.DeleteHandler;
import org.apache.jackrabbit.server.io.IOHandler;
import org.apache.jackrabbit.server.io.PropertyHandler;
import org.apache.jackrabbit.webdav.DavException;
@@ -47,6 +48,7 @@ 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.SlingDeleteManager;
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;
@@ -76,7 +78,8 @@ import org.osgi.service.http.NamespaceException;
@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.COPYMOVEHANDLER_REF_NAME, referenceInterface = CopyMoveHandler.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC)
+ @Reference(name = SlingWebDavServlet.COPYMOVEHANDLER_REF_NAME, referenceInterface = CopyMoveHandler.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC),
+ @Reference(name = SlingWebDavServlet.DELETEHANDLER_REF_NAME, referenceInterface = DeleteHandler.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC)
})
public class SlingWebDavServlet extends SimpleWebdavServlet {
@@ -136,6 +139,8 @@ public class SlingWebDavServlet extends SimpleWebdavServlet {
static final String COPYMOVEHANDLER_REF_NAME = "CopyMoveHandler";
+ static final String DELETEHANDLER_REF_NAME = "DeleteHandler";
+
@Reference
private SlingRepository repository;
@@ -154,6 +159,9 @@ public class SlingWebDavServlet extends SimpleWebdavServlet {
private final SlingCopyMoveManager copyMoveManager = new SlingCopyMoveManager(
COPYMOVEHANDLER_REF_NAME);
+ private final SlingDeleteManager deleteManager = new SlingDeleteManager(
+ DELETEHANDLER_REF_NAME);
+
private SlingResourceConfig resourceConfig;
private DavLocatorFactory locatorFactory;
@@ -221,12 +229,14 @@ public class SlingWebDavServlet extends SimpleWebdavServlet {
this.ioManager.setComponentContext(context);
this.propertyManager.setComponentContext(context);
this.copyMoveManager.setComponentContext(context);
+ this.deleteManager.setComponentContext(context);
resourceConfig = new SlingResourceConfig(mimeTypeService,
context.getProperties(),
ioManager,
propertyManager,
- copyMoveManager);
+ copyMoveManager,
+ deleteManager);
// Register servlet, and set the contextPath field to signal successful
// registration
@@ -267,6 +277,7 @@ public class SlingWebDavServlet extends SimpleWebdavServlet {
}
public void bindCopyMoveHandler(final ServiceReference copyMoveHandlerReference) {
+
this.copyMoveManager.bindCopyMoveHandler(copyMoveHandlerReference);
}
@@ -274,6 +285,14 @@ public class SlingWebDavServlet extends SimpleWebdavServlet {
this.copyMoveManager.unbindCopyMoveHandler(copyMoveHandlerReference);
}
+ public void bindDeleteHandler(final ServiceReference deleteHandlerReference) {
+ this.deleteManager.bindDeleteHandler(deleteHandlerReference);
+ }
+
+ public void unbindDeleteHandler(final ServiceReference deleteHandlerReference) {
+ this.deleteManager.unbindDeleteHandler(deleteHandlerReference);
+ }
+
/** 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 {
--
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/05: [maven-release-plugin]
prepare release org.apache.sling.jcr.webdav-2.3.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.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit a9b12f30e16658d849c3dd6c68a91468b34c10a6
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed Oct 7 11:40:15 2015 +0000
[maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.3.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1707265 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 397c76a..77dd475 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.jcr.webdav</artifactId>
<packaging>bundle</packaging>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.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.3.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.3.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.webdav-2.3.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] 03/05: Update the main reactor
to parent 25
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.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 29e04d3ac7e01609c9c20d382680b822d732bd49
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Oct 5 10:03:45 2015 +0000
Update the main reactor to parent 25
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1706780 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 134f1dc..397c76a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>24</version>
+ <version>25</version>
<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] 01/05: [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.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 4576766687bb1de6f21b4e25d8485aa549a7a2fe
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Aug 12 09:14:52 2015 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1695453 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9f63f81..d34c785 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.jcr.webdav</artifactId>
<packaging>bundle</packaging>
- <version>2.3.0</version>
+ <version>2.3.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.3.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.3.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.webdav-2.3.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] 05/05: [maven-release-plugin]
copy for tag org.apache.sling.jcr.webdav-2.3.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.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit ebcfa459501496f95d35bdd7af37454832fdbf8a
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed Oct 7 11:40:28 2015 +0000
[maven-release-plugin] copy for tag org.apache.sling.jcr.webdav-2.3.2
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.3.2@1707266 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.