svn commit: r1403721 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webdav: pom.xml src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java

[olamy]

Author: olamy
Date: Tue Oct 30 14:41:09 2012
New Revision: 1403721

URL: http://svn.apache.org/viewvc?rev=1403721&view=rev
Log:
fix bean name for legacy repo

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

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=1403721&r1=1403720&r2=1403721&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml Tue Oct 30 
14:41:09 2012
@@ -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)",

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=1403721&r1=1403720&r2=1403721&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
 Tue Oct 30 14:41:09 2012
@@ -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";
                 }