From: Olivier Lamy <olamy@apache.org>
Date: Mon, 13 Jun 2011 08:24:17 +0000 (+0000)
Subject: fix junit spring configuration
X-Git-Tag: archiva-1.4-M1~666
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b55ef5058a06f06cd30a2ace781a0cee29693682;p=archiva.git

fix junit spring configuration

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

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/UnauthenticatedDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/UnauthenticatedDavResourceFactory.java
index f6e8a6e44..b9e130624 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/UnauthenticatedDavResourceFactory.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/UnauthenticatedDavResourceFactory.java
@@ -25,16 +25,21 @@ import org.apache.jackrabbit.webdav.DavException;
 import org.apache.jackrabbit.webdav.DavServletRequest;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Service;
+
+import javax.inject.Inject;
 
 /**
  * UnauthenticatedDavResourceFactory
  *
  * @version $Id:
  */
+@Service("archivaDavResourceFactory#unauthenticated")
 public class UnauthenticatedDavResourceFactory
     extends ArchivaDavResourceFactory
 {
 
+    @Inject
     public UnauthenticatedDavResourceFactory( ApplicationContext applicationContext, PlexusSisuBridge plexusSisuBridge,
                                               ArchivaConfiguration archivaConfiguration )
         throws PlexusSisuBridgeException
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
index faaedbe28..a9c88bc26 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
@@ -67,4 +67,11 @@
     </property>
   </bean>
 
+  <alias name="archivaDavResourceFactory#unauthenticated" alias="davResourceFactory#archiva"/>
+  <!--
+  <bean name="davResourceFactory#archiva" class="org.apache.maven.archiva.webdav.UnauthenticatedDavResourceFactory">
+    <property name="servletAuth" ref="servletAuthenticator"/>
+  </bean>
+  -->
+
 </beans>
\ No newline at end of file