svn commit: r630665 - in /maven/archiva/branches/springy/archiva-base/archiva-policies: ./ src/test/java/org/apache/maven/archiva/policies/ src/test/resources/ src/test/resources/org/apache/maven/archiva/policies/

[nicolas]

Author: nicolas
Date: Sun Feb 24 11:54:13 2008
New Revision: 630665

URL: http://svn.apache.org/viewvc?rev=630665&view=rev
Log:
use plexus-spring

Modified:
    maven/archiva/branches/springy/archiva-base/archiva-policies/pom.xml
    
maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java
    
maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/resources/log4j.xml
    
maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/resources/org/apache/maven/archiva/policies/CachedFailuresPolicyTest-context.xml

Modified: maven/archiva/branches/springy/archiva-base/archiva-policies/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-base/archiva-policies/pom.xml?rev=630665&r1=630664&r2=630665&view=diff
==============================================================================
--- maven/archiva/branches/springy/archiva-base/archiva-policies/pom.xml 
(original)
+++ maven/archiva/branches/springy/archiva-base/archiva-policies/pom.xml Sun 
Feb 24 11:54:13 2008
@@ -33,6 +33,11 @@
       <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>
     </dependency>

Modified: 
maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java?rev=630665&r1=630664&r2=630665&view=diff
==============================================================================
--- 
maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java
 (original)
+++ 
maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java
 Sun Feb 24 11:54:13 2008
@@ -22,7 +22,7 @@
 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 @@
     private DownloadPolicy lookupPolicy()
         throws Exception
     {
-        return (DownloadPolicy) factory.getBean( 
PreDownloadPolicy.class.getName() + "#cache-failures" );
+        return (DownloadPolicy) factory.getBean( 
"preDownloadPolicy#cache-failures" );
     }
 
     private File getFile()

Modified: 
maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/resources/log4j.xml
URL: 
http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/resources/log4j.xml?rev=630665&r1=630664&r2=630665&view=diff
==============================================================================
--- 
maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/resources/log4j.xml
 (original)
+++ 
maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/resources/log4j.xml
 Sun Feb 24 11:54:13 2008
@@ -39,6 +39,10 @@
     <level value="error"/>
   </logger>
 
+  <logger name="org.springframewrok">
+    <level value="DEBUG"/>
+  </logger>
+  
   <root>
     <priority value ="info" />
     <appender-ref ref="console" />

Modified: 
maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/resources/org/apache/maven/archiva/policies/CachedFailuresPolicyTest-context.xml
URL: 
http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/resources/org/apache/maven/archiva/policies/CachedFailuresPolicyTest-context.xml?rev=630665&r1=630664&r2=630665&view=diff
==============================================================================
--- 
maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/resources/org/apache/maven/archiva/policies/CachedFailuresPolicyTest-context.xml
 (original)
+++ 
maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/resources/org/apache/maven/archiva/policies/CachedFailuresPolicyTest-context.xml
 Sun Feb 24 11:54:13 2008
@@ -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"/>