http://git-wip-us.apache.org/repos/asf/archiva/blob/d6120d6c/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java index dbfbc1d..ba1fdeb 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java @@ -34,8 +34,10 @@ import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.RepositoryGroupConfiguration; import org.apache.archiva.proxy.DefaultRepositoryProxyConnectors; import org.apache.archiva.proxy.model.ProxyFetchResult; +import org.apache.archiva.repository.EditableManagedRepository; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RepositoryContentFactory; +import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.repository.content.maven2.ManagedDefaultRepositoryContent; import org.apache.archiva.repository.content.maven2.RepositoryRequest; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; @@ -44,12 +46,15 @@ import org.apache.jackrabbit.webdav.DavException; import org.apache.jackrabbit.webdav.DavResourceLocator; import org.apache.jackrabbit.webdav.DavServletRequest; import org.apache.jackrabbit.webdav.DavServletResponse; +import org.easymock.EasyMock; import org.easymock.IMocksControl; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ApplicationContext; +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.test.context.ContextConfiguration; import javax.inject.Inject; @@ -58,6 +63,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import static org.easymock.EasyMock.*; @@ -113,6 +119,9 @@ public class ArchivaDavResourceFactoryTest DefaultManagedRepositoryAdmin defaultManagedRepositoryAdmin; @Inject + RepositoryRegistry repositoryRegistry; + + @Inject RemoteRepositoryAdmin remoteRepositoryAdmin; @@ -138,13 +147,18 @@ public class ArchivaDavResourceFactoryTest archivaConfiguration = archivaConfigurationControl.createMock( ArchivaConfiguration.class ); config = new Configuration(); - expect( archivaConfiguration.getConfiguration() ).andReturn( config ).times( 5, 20 ); + expect( archivaConfiguration.getConfiguration() ).andReturn( config ).times( 2, 20 ); + expect (archivaConfiguration.getDefaultLocale()).andReturn( Locale.getDefault() ).anyTimes(); + archivaConfiguration.addListener( EasyMock.anyObject( ) ); + expectLastCall().times(0, 4); archivaConfiguration.save( config ); - expectLastCall().times( 1, 4 ); + expectLastCall().times( 0, 4 ); archivaConfigurationControl.replay(); defaultManagedRepositoryAdmin.setArchivaConfiguration( archivaConfiguration ); + repositoryRegistry.setArchivaConfiguration( archivaConfiguration ); + repositoryRegistry.reload(); ( (DefaultRepositoryCommonValidator) defaultManagedRepositoryAdmin.getRepositoryCommonValidator() ).setArchivaConfiguration( archivaConfiguration ); if ( defaultManagedRepositoryAdmin.getManagedRepository( RELEASES_REPO ) == null ) @@ -184,11 +198,12 @@ public class ArchivaDavResourceFactoryTest resourceFactory.setConnectors( new OverridingRepositoryProxyConnectors() ); resourceFactory.setRemoteRepositoryAdmin( remoteRepositoryAdmin ); resourceFactory.setManagedRepositoryAdmin( defaultManagedRepositoryAdmin ); + resourceFactory.setRepositoryRegistry( repositoryRegistry ); } private ManagedRepository createManagedRepository( String id, String location, String layout ) { - ManagedRepository repoConfig = new ManagedRepository(); + ManagedRepository repoConfig = new ManagedRepository( Locale.getDefault()); repoConfig.setId( id ); repoConfig.setName( id ); repoConfig.setLocation( location ); @@ -201,8 +216,12 @@ public class ArchivaDavResourceFactoryTest throws RepositoryAdminException { ManagedRepositoryContent repoContent = new ManagedDefaultRepositoryContent(); - repoContent.setRepository( defaultManagedRepositoryAdmin.getManagedRepository( repoId ) ); - + org.apache.archiva.repository.ManagedRepository repo = repositoryRegistry.getManagedRepository( repoId ); + repoContent.setRepository( repo ); + if (repo!=null && repo instanceof EditableManagedRepository) + { + ( (EditableManagedRepository) repo ).setContent( repoContent ); + } return repoContent; } @@ -466,9 +485,7 @@ public class ArchivaDavResourceFactoryTest { archivaConfigurationControl.reset(); - expect( archivaConfiguration.getConfiguration() ).andReturn( config ).times( 2 ); - - expect( repoFactory.getManagedRepositoryContent( INTERNAL_REPO ) ).andReturn( internalRepo ); + expect( archivaConfiguration.getConfiguration() ).andReturn( config ).times( 1 ); expect( request.getMethod() ).andReturn( "GET" ).times( 4 ); @@ -561,6 +578,9 @@ public class ArchivaDavResourceFactoryTest public void testRequestMetadataRepoIsLegacy() throws Exception { + ManagedRepositoryContent legacyRepo = createManagedRepositoryContent( LEGACY_REPO ); + ConfigurableListableBeanFactory beanFactory = ((ConfigurableApplicationContext) applicationContext).getBeanFactory(); + beanFactory.registerSingleton("managedRepositoryContent#legacy", legacyRepo); defaultManagedRepositoryAdmin.addManagedRepository( createManagedRepository( LEGACY_REPO, Paths.get( "target/test-classes/" + LEGACY_REPO ).toString(), "legacy" ), false, null ); @@ -568,7 +588,6 @@ public class ArchivaDavResourceFactoryTest new ArchivaDavResourceLocator( "", "/repository/" + LEGACY_REPO + "/eclipse/maven-metadata.xml", LEGACY_REPO, new ArchivaDavLocatorFactory() ); - ManagedRepositoryContent legacyRepo = createManagedRepositoryContent( LEGACY_REPO ); // use actual object (this performs the isMetadata, isDefault and isSupportFile check!) RepositoryRequest repoRequest = new RepositoryRequest( );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d6120d6c/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java index 0559f64..4802776 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java @@ -20,13 +20,24 @@ package org.apache.archiva.webdav; */ import junit.framework.TestCase; -import org.apache.archiva.admin.model.beans.ManagedRepository; import org.apache.archiva.common.filelock.FileLockManager; import org.apache.archiva.repository.events.AuditListener; +import org.apache.archiva.repository.maven2.MavenManagedRepository; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.archiva.webdav.util.MimeTypes; -import org.apache.jackrabbit.webdav.*; -import org.apache.jackrabbit.webdav.lock.*; +import org.apache.jackrabbit.webdav.DavException; +import org.apache.jackrabbit.webdav.DavResource; +import org.apache.jackrabbit.webdav.DavResourceFactory; +import org.apache.jackrabbit.webdav.DavResourceLocator; +import org.apache.jackrabbit.webdav.DavServletRequest; +import org.apache.jackrabbit.webdav.DavServletResponse; +import org.apache.jackrabbit.webdav.DavSession; +import org.apache.jackrabbit.webdav.lock.ActiveLock; +import org.apache.jackrabbit.webdav.lock.LockInfo; +import org.apache.jackrabbit.webdav.lock.LockManager; +import org.apache.jackrabbit.webdav.lock.Scope; +import org.apache.jackrabbit.webdav.lock.SimpleLockManager; +import org.apache.jackrabbit.webdav.lock.Type; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -66,7 +77,7 @@ public class DavResourceTest private LockManager lockManager; - private ManagedRepository repository = new ManagedRepository(); + private MavenManagedRepository repository = new MavenManagedRepository( "repo001", "repo001"); @Override @Before http://git-wip-us.apache.org/repos/asf/archiva/blob/d6120d6c/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java index 3ee62a1..c07ce0d 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java @@ -125,6 +125,7 @@ public class RepositoryServletRepositoryGroupTest configuration.removeManagedRepository( managedRepositoryConfiguration ); org.apache.archiva.common.utils.FileUtils.deleteDirectory( repoRootInvalid ); + repositoryRegistry.reload(); saveConfiguration( archivaConfiguration ); startRepository(); http://git-wip-us.apache.org/repos/asf/archiva/blob/d6120d6c/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java index aabd74c..f6d6f26 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java @@ -33,6 +33,7 @@ import org.apache.archiva.redback.system.DefaultSecuritySession; import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.memory.SimpleUser; +import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.repository.audit.TestAuditListener; import org.apache.archiva.security.ServletAuthenticator; import org.apache.archiva.security.common.ArchivaRoleConstants; @@ -86,6 +87,9 @@ public class RepositoryServletSecurityTest @Inject protected ArchivaConfiguration archivaConfiguration; + @Inject + protected RepositoryRegistry repositoryRegistry; + private DavSessionProvider davSessionProvider; private IMocksControl servletAuthControl; @@ -188,6 +192,7 @@ public class RepositoryServletSecurityTest protected void saveConfiguration( ArchivaConfiguration archivaConfiguration ) throws Exception { + repositoryRegistry.reload(); archivaConfiguration.save( archivaConfiguration.getConfiguration() ); } http://git-wip-us.apache.org/repos/asf/archiva/blob/d6120d6c/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-archiva.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-archiva.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-archiva.xml index 997d62b..d3b9733 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-archiva.xml +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-archiva.xml @@ -20,7 +20,7 @@ <configuration> - <version>2</version> + <version>3.0.0</version> <repositoryScanning> <fileTypes> http://git-wip-us.apache.org/repos/asf/archiva/blob/d6120d6c/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml index 9f38b82..6938160 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml @@ -31,7 +31,10 @@ <context:annotation-config/> <context:component-scan - base-package="org.apache.archiva.redback.keys,org.apache.archiva.webdav,org.apache.archiva.metadata.repository,org.apache.archiva.webdav.util,org.apache.archiva.common.plexusbridge"/> + base-package="org.apache.archiva.redback.keys,org.apache.archiva.webdav,org.apache.archiva.metadata.repository,org.apache.archiva.webdav.util,org.apache.archiva.common.plexusbridge,org.apache.archiva.repository.content.maven2,org.apache.archiva.repository"/> + + <alias name="managedRepositoryContent#maven" alias="managedRepositoryContent#default" /> + <alias name="remoteRepositoryContent#maven" alias="remoteRepositoryContent#default" /> <bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> <property name="properties"> http://git-wip-us.apache.org/repos/asf/archiva/blob/d6120d6c/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml ---------------------------------------------------------------------- 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 5601082..28f59f7 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 @@ -30,7 +30,10 @@ <context:property-placeholder system-properties-mode="OVERRIDE"/> <context:annotation-config/> - <context:component-scan base-package="org.apache.archiva.redback.keys,org.apache.archiva.webdav,org.apache.archiva.metadata.repository"/> + <context:component-scan base-package="org.apache.archiva.redback.keys,org.apache.archiva.webdav,org.apache.archiva.metadata.repository,org.apache.archiva.repository,org.apache.archiva.repository.content.maven2"/> + + <alias name="managedRepositoryContent#maven" alias="managedRepositoryContent#default" /> + <alias name="remoteRepositoryContent#maven" alias="remoteRepositoryContent#default" /> <bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> <property name="properties">
