use plexus-spring

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches@630665 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/springy/archiva-base/archiva-policies/pom.xml b/springy/archiva-base/archiva-policies/pom.xml
index 852a4689c5bf461c2a2673ef2733fec888dfb5f0..64ed1af39985c4b93a458911f17680910f0a6edb 100644 (file)
--- a/springy/archiva-base/archiva-policies/pom.xml
+++ b/springy/archiva-base/archiva-policies/pom.xml
@@ -32,6 +32,11 @@
       <groupId>org.apache.maven.archiva</groupId>
       <artifactId>archiva-common</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-spring</artifactId>
+         <version>1.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>

diff --git a/springy/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java b/springy/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java
index 954a99e5784fa98109bba27644f1ad64947baa9f..2fa695f478299c5f4d275f3b84dd7d13b0f1c77d 100644 (file)
--- a/springy/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java
+++ b/springy/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java
@@ -22,7 +22,7 @@ package org.apache.maven.archiva.policies;
 import java.io.File;
 import java.util.Properties;
 
-import org.apache.maven.archiva.common.spring.PlexusClassPathXmlApplicationContext;
+import org.codehaus.plexus.spring.PlexusClassPathXmlApplicationContext;
 import org.apache.maven.archiva.policies.urlcache.UrlFailureCache;
 import org.codehaus.plexus.PlexusTestCase;
 import org.springframework.context.ApplicationContext;
@@ -41,7 +41,7 @@ public class CachedFailuresPolicyTest
     private DownloadPolicy lookupPolicy()
         throws Exception
     {
-        return (DownloadPolicy) factory.getBean( PreDownloadPolicy.class.getName() + "#cache-failures" );
+        return (DownloadPolicy) factory.getBean( "preDownloadPolicy#cache-failures" );
     }
 
     private File getFile()

diff --git a/springy/archiva-base/archiva-policies/src/test/resources/log4j.xml b/springy/archiva-base/archiva-policies/src/test/resources/log4j.xml
index 901c99f3386ed7b5dc0df70c98efeb3ecfec1ae6..e068ecabd1aeee61bc20c3b00dd17b6def1da6d2 100644 (file)
--- a/springy/archiva-base/archiva-policies/src/test/resources/log4j.xml
+++ b/springy/archiva-base/archiva-policies/src/test/resources/log4j.xml
@@ -39,6 +39,10 @@
     <level value="error"/>
   </logger>
 
+  <logger name="org.springframewrok">
+    <level value="DEBUG"/>
+  </logger>
+  
   <root>
     <priority value ="info" />
     <appender-ref ref="console" />

diff --git a/springy/archiva-base/archiva-policies/src/test/resources/org/apache/maven/archiva/policies/CachedFailuresPolicyTest-context.xml b/springy/archiva-base/archiva-policies/src/test/resources/org/apache/maven/archiva/policies/CachedFailuresPolicyTest-context.xml
index b054113c4b456a0a25ea2672b6eeb630c3be9548..c7cd821c742a8f31cc15eb069baa981cd7c131ec 100644 (file)
--- a/springy/archiva-base/archiva-policies/src/test/resources/org/apache/maven/archiva/policies/CachedFailuresPolicyTest-context.xml
+++ b/springy/archiva-base/archiva-policies/src/test/resources/org/apache/maven/archiva/policies/CachedFailuresPolicyTest-context.xml
@@ -4,6 +4,9 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
+  <bean id="loggerManager" class="org.codehaus.plexus.logging.console.ConsoleLoggerManager"
+       init-method="initialize"/>
+
   <bean id="urlFailureCache" class="org.apache.maven.archiva.policies.urlcache.DefaultUrlFailureCache">
     <!-- collaborators and configuration for this bean go here -->
     <constructor-arg ref="cache#url-failures-cache" type="org.codehaus.plexus.cache.Cache"/>