From: Olivier Lamy <olamy@apache.org>
Date: Tue, 30 Oct 2012 14:41:09 +0000 (+0000)
Subject: fix bean name for legacy repo
X-Git-Tag: archiva-1.4-M4~655
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3685b508cba776472f25050981583d547c1155dd;p=archiva.git

fix bean name for legacy repo

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1403721 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 7c949713b..8477ed45c 100644
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -256,6 +256,7 @@
               org.apache.archiva.scheduler*;version=${project.version},
               org.apache.archiva.security;version=${project.version},
               org.apache.archiva.proxy.model;version=${project.version},
+              org.apache.archiva.metadata.repository.storage;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 0ae3c03fa..430a85a1a 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
@@ -109,7 +109,7 @@ import java.util.Set;
 /**
  *
  */
-@Service ( "davResourceFactory#archiva" )
+@Service ("davResourceFactory#archiva")
 public class ArchivaDavResourceFactory
     implements DavResourceFactory, Auditable
 {
@@ -142,7 +142,7 @@ public class ArchivaDavResourceFactory
      *
      */
     @Inject
-    @Named ( value = "repositoryProxyConnectors#default" )
+    @Named (value = "repositoryProxyConnectors#default")
     private RepositoryProxyConnectors connectors;
 
     /**
@@ -172,7 +172,7 @@ public class ArchivaDavResourceFactory
      *
      */
     @Inject
-    @Named ( value = "httpAuthenticator#basic" )
+    @Named (value = "httpAuthenticator#basic")
     private HttpAuthenticator httpAuth;
 
     @Inject
@@ -208,7 +208,7 @@ public class ArchivaDavResourceFactory
      *
      */
     @Inject
-    @Named ( value = "archivaTaskScheduler#repository" )
+    @Named (value = "archivaTaskScheduler#repository")
     private RepositoryArchivaTaskScheduler scheduler;
 
     private ApplicationContext applicationContext;
@@ -729,7 +729,8 @@ public class ArchivaDavResourceFactory
             if ( artifact != null )
             {
                 String repositoryLayout = managedRepository.getRepository().getLayout();
-                if ( StringUtils.equalsIgnoreCase( "default", repositoryLayout ) )
+                if ( StringUtils.equalsIgnoreCase( "default", repositoryLayout ) || StringUtils.equalsIgnoreCase(
+                    "legacy", repositoryLayout ) )
                 {
                     repositoryLayout = "maven2";
                 }