From 8a68012d12f6e61fabc65f90e143e7c505bed221 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Tue, 31 May 2011 17:01:09 +0000
Subject: [PATCH] fix more spring test configuration

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1129801 13f79535-47bb-0310-9956-ffa450edef68
---
 .../maven/archiva/proxy/DefaultRepositoryProxyConnectors.java | 1 +
 .../org/apache/maven/archiva/proxy/HttpProxyTransferTest.java | 3 +--
 .../org/apache/maven/archiva/proxy/MetadataTransferTest.java  | 2 ++
 .../archiva-proxy/src/test/resources/spring-context.xml       | 4 ++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
index 1fd51ef9d..6e9861dc5 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
@@ -110,6 +110,7 @@ public class DefaultRepositoryProxyConnectors
      * plexus.requirement
      */
     @Inject
+    @Named(value="metadataTools#default")
     private MetadataTools metadataTools;
 
     @Inject
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/HttpProxyTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/HttpProxyTransferTest.java
index 555c7d9a3..92068ad4b 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/HttpProxyTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/HttpProxyTransferTest.java
@@ -47,7 +47,6 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import javax.inject.Inject;
-import javax.inject.Named;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -89,7 +88,7 @@ public class HttpProxyTransferTest
     {
         super.setUp();
 
-        proxyHandler = applicationContext.getBean( RepositoryProxyConnectors.class );
+        proxyHandler = applicationContext.getBean( "repositoryProxyConnectors#test", RepositoryProxyConnectors.class );
 
         config =
             (MockConfiguration) applicationContext.getBean( "archivaConfiguration#mock", ArchivaConfiguration.class );
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java
index 7c56b61d4..d0166d1e8 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java
@@ -42,6 +42,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 import java.io.File;
 import java.io.StringWriter;
 import java.util.ArrayList;
@@ -97,6 +98,7 @@ public class MetadataTransferTest
 {
 
     @Inject
+    @Named(value = "metadataTools#mocked")
     private MetadataTools metadataTools;
 
     @Before
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml
index bb4256003..2476e698d 100755
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml
@@ -53,12 +53,16 @@
   <bean name="repositoryProxyConnectors#test" class="org.apache.maven.archiva.proxy.DefaultRepositoryProxyConnectors">
     <property name="archivaConfiguration" ref="archivaConfiguration#mock"/>
     <property name="repositoryFactory" ref="repositoryContentFactory#mocked"/>
+    <property name="metadataTools" ref="metadataTools#mocked"/>
   </bean>
 
   <bean name="metadataTools#default" class="org.apache.maven.archiva.repository.metadata.MetadataTools">
     <property name="configuration" ref="archivaConfiguration#mock"/>
   </bean>
 
+  <bean name="metadataTools#mocked" class="org.apache.maven.archiva.repository.metadata.MetadataTools">
+    <property name="configuration" ref="archivaConfiguration#mock"/>
+  </bean>
 
 
 </beans>
\ No newline at end of file
-- 
2.39.5