Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8223DD6EB for ; Mon, 29 Oct 2012 21:08:46 +0000 (UTC) Received: (qmail 34168 invoked by uid 500); 29 Oct 2012 21:08:46 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 34134 invoked by uid 500); 29 Oct 2012 21:08:46 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 34127 invoked by uid 99); 29 Oct 2012 21:08:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Oct 2012 21:08:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Oct 2012 21:08:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2560723888CD for ; Mon, 29 Oct 2012 21:08:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1403531 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webdav: pom.xml src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java Date: Mon, 29 Oct 2012 21:08:01 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121029210802.2560723888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Mon Oct 29 21:08:01 2012 New Revision: 1403531 URL: http://svn.apache.org/viewvc?rev=1403531&view=rev Log: [MRM-1704] Refactor to remove maven specific part from various repository/metadata apis fix webdav module. Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml?rev=1403531&r1=1403530&r2=1403531&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml Mon Oct 29 21:08:01 2012 @@ -255,6 +255,7 @@ org.apache.archiva.repository*;version=${project.version}, org.apache.archiva.scheduler*;version=${project.version}, org.apache.archiva.security;version=${project.version}, + org.apache.archiva.proxy.model;version=${project.version}, org.apache.commons.io;version="[1.4,2)", org.apache.commons.lang;version="[2.4,3)", org.apache.jackrabbit.util;version="[1,3)", Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java?rev=1403531&r1=1403530&r2=1403531&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java Mon Oct 29 21:08:01 2012 @@ -54,6 +54,7 @@ import org.apache.archiva.repository.Man import org.apache.archiva.repository.RepositoryContentFactory; import org.apache.archiva.repository.RepositoryException; import org.apache.archiva.repository.RepositoryNotFoundException; +import org.apache.archiva.repository.content.legacy.LegacyPathParser; import org.apache.archiva.repository.content.maven2.RepositoryRequest; import org.apache.archiva.repository.layout.LayoutException; import org.apache.archiva.repository.metadata.MetadataTools; @@ -229,6 +230,7 @@ public class ArchivaDavResourceFactory this.digestMd5 = plexusSisuBridge.lookup( Digester.class, "md5" ); this.digestSha1 = plexusSisuBridge.lookup( Digester.class, "sha1" ); + // TODO remove this hard dependency on maven !! repositoryRequest = new RepositoryRequest( new LegacyPathParser( archivaConfiguration ) ); } Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java?rev=1403531&r1=1403530&r2=1403531&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java Mon Oct 29 21:08:01 2012 @@ -35,6 +35,9 @@ import org.apache.archiva.configuration. import org.apache.archiva.proxy.DefaultRepositoryProxyConnectors; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RepositoryContentFactory; +import org.apache.archiva.repository.content.legacy.LegacyPathParser; +import org.apache.archiva.repository.content.maven2.ManagedDefaultRepositoryContent; +import org.apache.archiva.repository.content.maven2.RepositoryRequest; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.webdav.DavException;