Author: olamy
Date: Tue Oct 30 14:46:23 2012
New Revision: 1403724
URL: http://svn.apache.org/viewvc?rev=1403724&view=rev
Log:
add spring aliases to prevent hackish code
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/resources/META-INF/spring-context.xml
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=1403724&r1=1403723&r2=1403724&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:46:23 2012
@@ -729,12 +729,7 @@ public class ArchivaDavResourceFactory
if ( artifact != null )
{
String repositoryLayout =
managedRepository.getRepository().getLayout();
- // FIXME we could prevent that with renaming bean
repositoryStorage#maven2 to repositoryStorage#default
- if ( StringUtils.equalsIgnoreCase( "default", repositoryLayout
) || StringUtils.equalsIgnoreCase(
- "legacy", repositoryLayout ) )
- {
- repositoryLayout = "maven2";
- }
+
RepositoryStorage repositoryStorage =
this.applicationContext.getBean( "repositoryStorage#" +
repositoryLayout, RepositoryStorage.class );
repositoryStorage.applyServerSideRelocation(
managedRepository, artifact );
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/resources/META-INF/spring-context.xml?rev=1403724&r1=1403723&r2=1403724&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/resources/META-INF/spring-context.xml
Tue Oct 30 14:46:23 2012
@@ -38,4 +38,7 @@
</constructor-arg>
</bean>
+ <alias name="repositoryStorage#maven2" alias="repositoryStorage#default"/>
+ <alias name="repositoryStorage#maven2" alias="repositoryStorage#legacy"/>
+
</beans>
\ No newline at end of file
