From: Olivier Lamy <olamy@apache.org>
Date: Mon, 29 Oct 2012 21:08:01 +0000 (+0000)
Subject: [MRM-1704] Refactor to remove maven specific part from various repository/metadata... 
X-Git-Tag: archiva-1.4-M4~668
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fdfa6f2b016187a21a3462465035dc656e2645b5;p=archiva.git

[MRM-1704] Refactor to remove maven specific part from various repository/metadata apis
fix webdav module.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1403531 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index ddd26a1bc..7c949713b 100644
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -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)",
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
index b0b40471f..5c200275e 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
@@ -54,6 +54,7 @@ import org.apache.archiva.repository.ManagedRepositoryContent;
 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 ) );
     }
 
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java
index 913ae5976..2190c195c 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java
@@ -35,6 +35,9 @@ import org.apache.archiva.configuration.RepositoryGroupConfiguration;
 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;