Bläddra i källkod

fix use of applicationContext.getBeansOfType instead of the old lookupMap.

The key is now interface#hint whereas was only hint with plexus



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1130206 13f79535-47bb-0310-9956-ffa450edef68
tags/archiva-1.4-M1
Olivier Lamy 13 år sedan
förälder
incheckning
b84ecb96f7

+ 4
- 1
archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java Visa fil

@@ -918,7 +918,10 @@ public class DefaultRepositoryProxyConnectors
boolean process = true;
for ( Entry<String, ? extends DownloadErrorPolicy> entry : policies.entrySet() )
{
String key = entry.getKey();

// olamy with spring rolehint is now downloadPolicy#hint
// so substring after last # to get the hint as with plexus
String key = StringUtils.substringAfterLast( entry.getKey(), "#" );
DownloadErrorPolicy policy = entry.getValue();
String defaultSetting = policy.getDefaultOption();
String setting = StringUtils.defaultString( settings.get( key ), defaultSetting );

+ 4
- 1
archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java Visa fil

@@ -157,7 +157,10 @@ public abstract class AbstractProxyTestCase

// Setup source repository (using legacy layout)
repoLocation = new File( REPOPATH_LEGACY_MANAGED_TARGET );
FileUtils.deleteDirectory( repoLocation );
if (repoLocation.exists())
{
FileUtils.deleteDirectory( repoLocation );
}
copyDirectoryStructure( new File( REPOPATH_LEGACY_MANAGED ), repoLocation );

managedLegacyRepository =

Laddar…
Avbryt
Spara