Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 29551 invoked from network); 20 Nov 2007 15:46:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Nov 2007 15:46:18 -0000 Received: (qmail 56978 invoked by uid 500); 20 Nov 2007 15:46:05 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 56943 invoked by uid 500); 20 Nov 2007 15:46:05 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 56929 invoked by uid 99); 20 Nov 2007 15:46:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Nov 2007 07:46:05 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Nov 2007 15:46:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1A44A1A983A; Tue, 20 Nov 2007 07:45:55 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r596722 - in /jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee: JCRWebdavServerServlet.java SimpleWebdavServlet.java Date: Tue, 20 Nov 2007 15:45:54 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071120154555.1A44A1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Tue Nov 20 07:45:54 2007 New Revision: 596722 URL: http://svn.apache.org/viewvc?rev=596722&view=rev Log: JCR-1210 WebDAV: pack AbstractWebdavServlet with the jackrabbit-webdav project Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/JCRWebdavServerServlet.java jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/SimpleWebdavServlet.java Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/JCRWebdavServerServlet.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/JCRWebdavServerServlet.java?rev=596722&r1=596721&r2=596722&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/JCRWebdavServerServlet.java (original) +++ jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/JCRWebdavServerServlet.java Tue Nov 20 07:45:54 2007 @@ -16,11 +16,9 @@ */ package org.apache.jackrabbit.j2ee; -import org.apache.jackrabbit.server.AbstractWebdavServlet; import org.apache.jackrabbit.server.BasicCredentialsProvider; import org.apache.jackrabbit.server.SessionProviderImpl; import org.apache.jackrabbit.server.jcr.JCRWebdavServer; -import org.apache.jackrabbit.webdav.DavConstants; import org.apache.jackrabbit.webdav.DavException; import org.apache.jackrabbit.webdav.DavLocatorFactory; import org.apache.jackrabbit.webdav.DavResource; @@ -33,6 +31,7 @@ import org.apache.jackrabbit.webdav.jcr.observation.SubscriptionManagerImpl; import org.apache.jackrabbit.webdav.jcr.transaction.TxLockManagerImpl; import org.apache.jackrabbit.webdav.observation.SubscriptionManager; +import org.apache.jackrabbit.webdav.server.AbstractWebdavServlet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +43,7 @@ /** * JCRWebdavServerServlet provides request/response handling for the JCRWebdavServer. */ -public class JCRWebdavServerServlet extends AbstractWebdavServlet implements DavConstants { +public class JCRWebdavServerServlet extends AbstractWebdavServlet { /** * the default logger Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/SimpleWebdavServlet.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/SimpleWebdavServlet.java?rev=596722&r1=596721&r2=596722&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/SimpleWebdavServlet.java (original) +++ jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/SimpleWebdavServlet.java Tue Nov 20 07:45:54 2007 @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.j2ee; -import org.apache.jackrabbit.server.AbstractWebdavServlet; import org.apache.jackrabbit.server.BasicCredentialsProvider; import org.apache.jackrabbit.server.CredentialsProvider; import org.apache.jackrabbit.server.SessionProvider; @@ -28,6 +27,7 @@ import org.apache.jackrabbit.webdav.WebdavRequest; import org.apache.jackrabbit.webdav.lock.LockManager; import org.apache.jackrabbit.webdav.lock.SimpleLockManager; +import org.apache.jackrabbit.webdav.server.AbstractWebdavServlet; import org.apache.jackrabbit.webdav.simple.DavSessionProviderImpl; import org.apache.jackrabbit.webdav.simple.LocatorFactoryImplEx; import org.apache.jackrabbit.webdav.simple.ResourceConfig;