Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bean name for legacy repo 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1403721 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-10-30 14:41:09 +00:00
parent 3c5f484ee7
commit 3685b508cb
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archiva-modules/archiva-web/archiva-webdav/pom.xml
View File

@ -256,6 +256,7 @@
org.apache.archiva.scheduler*;version=${project.version}, org.apache.archiva.scheduler*;version=${project.version},
org.apache.archiva.security;version=${project.version}, org.apache.archiva.security;version=${project.version},
org.apache.archiva.proxy.model;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.io;version="[1.4,2)",
org.apache.commons.lang;version="[2.4,3)", org.apache.commons.lang;version="[2.4,3)",
org.apache.jackrabbit.util;version="[1,3)", org.apache.jackrabbit.util;version="[1,3)",

11
archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
View File

@ -109,7 +109,7 @@ import java.util.Set;
/** /**
* *
*/ */
@Service ( "davResourceFactory#archiva" ) @Service ("davResourceFactory#archiva")
public class ArchivaDavResourceFactory public class ArchivaDavResourceFactory
implements DavResourceFactory, Auditable implements DavResourceFactory, Auditable
{ {
@ -142,7 +142,7 @@ public class ArchivaDavResourceFactory
* *
*/ */
@Inject @Inject
@Named ( value = "repositoryProxyConnectors#default" ) @Named (value = "repositoryProxyConnectors#default")
private RepositoryProxyConnectors connectors; private RepositoryProxyConnectors connectors;
/** /**
@ -172,7 +172,7 @@ public class ArchivaDavResourceFactory
* *
*/ */
@Inject @Inject
@Named ( value = "httpAuthenticator#basic" ) @Named (value = "httpAuthenticator#basic")
private HttpAuthenticator httpAuth; private HttpAuthenticator httpAuth;
@Inject @Inject
@ -208,7 +208,7 @@ public class ArchivaDavResourceFactory
* *
*/ */
@Inject @Inject
@Named ( value = "archivaTaskScheduler#repository" ) @Named (value = "archivaTaskScheduler#repository")
private RepositoryArchivaTaskScheduler scheduler; private RepositoryArchivaTaskScheduler scheduler;
private ApplicationContext applicationContext; private ApplicationContext applicationContext;
@ -729,7 +729,8 @@ public class ArchivaDavResourceFactory
if ( artifact != null ) if ( artifact != null )
{ {
String repositoryLayout = managedRepository.getRepository().getLayout(); String repositoryLayout = managedRepository.getRepository().getLayout();
if ( StringUtils.equalsIgnoreCase( "default", repositoryLayout ) ) if ( StringUtils.equalsIgnoreCase( "default", repositoryLayout ) || StringUtils.equalsIgnoreCase(
"legacy", repositoryLayout ) )
{ {
repositoryLayout = "maven2"; repositoryLayout = "maven2";
} }