git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@756564 13f79535-47bb-0310-9956-ffa450edef68tags/archiva-1.2
@@ -23,7 +23,6 @@ import org.apache.jackrabbit.webdav.DavException; | |||
import org.apache.jackrabbit.webdav.DavServletRequest; | |||
import org.apache.jackrabbit.webdav.DavSessionProvider; | |||
import org.apache.jackrabbit.webdav.WebdavRequest; | |||
import org.apache.maven.archiva.security.ArchivaXworkUser; | |||
import org.apache.maven.archiva.security.ServletAuthenticator; | |||
import org.apache.maven.archiva.webdav.util.RepositoryPathUtil; | |||
import org.apache.maven.archiva.webdav.util.WebdavMethodUtil; | |||
@@ -44,7 +43,7 @@ public class ArchivaDavSessionProvider | |||
private HttpAuthenticator httpAuth; | |||
public ArchivaDavSessionProvider( ServletAuthenticator servletAuth, HttpAuthenticator httpAuth, ArchivaXworkUser archivaXworkUser ) | |||
public ArchivaDavSessionProvider( ServletAuthenticator servletAuth, HttpAuthenticator httpAuth ) | |||
{ | |||
this.servletAuth = servletAuth; | |||
this.httpAuth = httpAuth; |
@@ -44,7 +44,6 @@ import org.apache.maven.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.maven.archiva.configuration.ConfigurationEvent; | |||
import org.apache.maven.archiva.configuration.ConfigurationListener; | |||
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; | |||
import org.apache.maven.archiva.security.ArchivaXworkUser; | |||
import org.apache.maven.archiva.security.ServletAuthenticator; | |||
import org.codehaus.plexus.spring.PlexusToSpringUtils; | |||
import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; | |||
@@ -195,9 +194,7 @@ public class RepositoryServlet | |||
HttpAuthenticator httpAuth = | |||
(HttpAuthenticator) wac.getBean( PlexusToSpringUtils.buildSpringId( HttpAuthenticator.ROLE, "basic" ) ); | |||
ArchivaXworkUser archivaXworkUser = | |||
(ArchivaXworkUser) wac.getBean( PlexusToSpringUtils.buildSpringId( ArchivaXworkUser.class.getName() ) ); | |||
sessionProvider = new ArchivaDavSessionProvider( servletAuth, httpAuth, archivaXworkUser ); | |||
sessionProvider = new ArchivaDavSessionProvider( servletAuth, httpAuth ); | |||
} | |||
public void configurationEvent( ConfigurationEvent event ) |
@@ -62,7 +62,7 @@ public class ArchivaDavSessionProviderTest extends TestCase | |||
throws Exception | |||
{ | |||
super.setUp(); | |||
sessionProvider = new ArchivaDavSessionProvider(new ServletAuthenticatorMock(), new HttpAuthenticatorMock(), null); | |||
sessionProvider = new ArchivaDavSessionProvider( new ServletAuthenticatorMock(), new HttpAuthenticatorMock() ); | |||
request = new WebdavRequestImpl(new HttpServletRequestMock(), null); | |||
} | |||
@@ -33,7 +33,6 @@ import org.apache.maven.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.maven.archiva.configuration.Configuration; | |||
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; | |||
import org.apache.maven.archiva.security.ArchivaRoleConstants; | |||
import org.apache.maven.archiva.security.ArchivaXworkUser; | |||
import org.apache.maven.archiva.security.ServletAuthenticator; | |||
import org.codehaus.plexus.redback.authentication.AuthenticationException; | |||
import org.codehaus.plexus.redback.authentication.AuthenticationResult; | |||
@@ -123,9 +122,7 @@ public class RepositoryServletSecurityTest | |||
httpAuthControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER ); | |||
httpAuth = (HttpAuthenticator) httpAuthControl.getMock(); | |||
ArchivaXworkUser archivaXworkUser = (ArchivaXworkUser) lookup( ArchivaXworkUser.class ); | |||
davSessionProvider = new ArchivaDavSessionProvider( servletAuth, httpAuth, archivaXworkUser ); | |||
davSessionProvider = new ArchivaDavSessionProvider( servletAuth, httpAuth ); | |||
} | |||
protected ManagedRepositoryConfiguration createManagedRepository( String id, String name, File location ) |
@@ -28,7 +28,7 @@ public class UnauthenticatedDavSessionProvider extends ArchivaDavSessionProvider | |||
{ | |||
public UnauthenticatedDavSessionProvider() | |||
{ | |||
super(null, null, null); | |||
super( null, null ); | |||
} | |||
@Override |