Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java Tue Sep 13 12:12:39 2011 @@ -20,6 +20,8 @@ package org.apache.maven.archiva.web.act */ import com.opensymphony.xwork2.Action; +import org.apache.archiva.admin.model.RepositoryAdminException; +import org.apache.archiva.admin.model.group.RepositoryGroup; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.RepositoryGroupConfiguration; @@ -58,7 +60,7 @@ public class DeleteRepositoryGroupAction } public void testSecureActionBundle() - throws SecureActionException + throws SecureActionException, RepositoryAdminException { archivaConfiguration.getConfiguration(); archivaConfigurationControl.setReturnValue( new Configuration() ); @@ -84,7 +86,7 @@ public class DeleteRepositoryGroupAction action.prepare(); assertEquals( REPO_GROUP_ID, action.getRepoGroupId() ); - RepositoryGroupConfiguration repoGroup = action.getRepositoryGroup(); + RepositoryGroup repoGroup = action.getRepositoryGroup(); assertNotNull( repoGroup ); assertEquals( repoGroup.getId(), action.getRepoGroupId() ); assertEquals( Collections.singletonList( origRepoGroup ), configuration.getRepositoryGroups() ); @@ -104,7 +106,7 @@ public class DeleteRepositoryGroupAction action.prepare(); assertEquals( REPO_GROUP_ID, action.getRepoGroupId() ); - RepositoryGroupConfiguration repoGroup = action.getRepositoryGroup(); + RepositoryGroup repoGroup = action.getRepositoryGroup(); assertNotNull( repoGroup ); assertEquals( Collections.singletonList( repoGroup ), configuration.getRepositoryGroups() ); @@ -129,7 +131,7 @@ public class DeleteRepositoryGroupAction action.prepare(); assertEquals( REPO_GROUP_ID, action.getRepoGroupId() ); - RepositoryGroupConfiguration repoGroup = action.getRepositoryGroup(); + RepositoryGroup repoGroup = action.getRepositoryGroup(); assertNotNull( repoGroup ); String status = action.execute();
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java Tue Sep 13 12:12:39 2011 @@ -20,10 +20,10 @@ package org.apache.maven.archiva.web.act */ import com.opensymphony.xwork2.Action; -import org.apache.archiva.admin.repository.RepositoryAdminException; +import org.apache.archiva.admin.model.RepositoryAdminException; +import org.apache.archiva.admin.model.managed.ManagedRepository; import org.apache.archiva.admin.repository.RepositoryCommonValidator; import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin; -import org.apache.archiva.admin.repository.managed.ManagedRepository; import org.apache.archiva.audit.AuditListener; import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.RepositorySession; @@ -31,12 +31,12 @@ import org.apache.archiva.metadata.repos import org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager; import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler; import org.apache.archiva.scheduler.repository.RepositoryTask; +import org.apache.archiva.security.ArchivaRoleConstants; +import org.apache.archiva.web.validator.utils.ValidatorUtil; import org.apache.commons.io.FileUtils; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.security.ArchivaRoleConstants; -import org.apache.archiva.web.validator.utils.ValidatorUtil; import org.codehaus.plexus.redback.role.RoleManager; import org.codehaus.plexus.registry.Registry; import org.codehaus.redback.integration.interceptor.SecureActionBundle; Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java Tue Sep 13 12:12:39 2011 @@ -20,9 +20,9 @@ package org.apache.maven.archiva.web.act */ import com.opensymphony.xwork2.Action; -import org.apache.archiva.admin.repository.RepositoryAdminException; +import org.apache.archiva.admin.model.RepositoryAdminException; +import org.apache.archiva.admin.model.remote.RemoteRepository; import org.apache.archiva.admin.repository.remote.DefaultRemoteRepositoryAdmin; -import org.apache.archiva.admin.repository.remote.RemoteRepository; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration; Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java Tue Sep 13 12:12:39 2011 @@ -22,9 +22,9 @@ package org.apache.maven.archiva.web.act import com.meterware.servletunit.ServletRunner; import com.meterware.servletunit.ServletUnitClient; import com.opensymphony.xwork2.Action; -import org.apache.archiva.admin.repository.RepositoryAdminException; +import org.apache.archiva.admin.model.RepositoryAdminException; +import org.apache.archiva.admin.model.group.RepositoryGroup; import org.apache.archiva.admin.repository.group.DefaultRepositoryGroupAdmin; -import org.apache.archiva.admin.repository.group.RepositoryGroup; import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml Tue Sep 13 12:12:39 2011 @@ -52,7 +52,7 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-admin</artifactId> + <artifactId>archiva-repository-admin-api</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -160,6 +160,11 @@ <artifactId>httpunit</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-admin-default</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java Tue Sep 13 12:12:39 2011 @@ -19,6 +19,7 @@ package org.apache.maven.archiva.webdav; * under the License. */ +import org.apache.archiva.admin.model.managed.ManagedRepository; import org.apache.archiva.audit.AuditEvent; import org.apache.archiva.audit.AuditListener; import org.apache.archiva.scheduler.ArchivaTaskScheduler; @@ -90,7 +91,7 @@ public class ArchivaDavResource private String remoteAddr; - private final ManagedRepositoryConfiguration repository; + private final ManagedRepository repository; private final MimeTypes mimeTypes; @@ -104,7 +105,7 @@ public class ArchivaDavResource private Logger log = LoggerFactory.getLogger( ArchivaDavResource.class ); - public ArchivaDavResource( String localResource, String logicalResource, ManagedRepositoryConfiguration repository, + public ArchivaDavResource( String localResource, String logicalResource, ManagedRepository repository, DavSession session, ArchivaDavResourceLocator locator, DavResourceFactory factory, MimeTypes mimeTypes, List<AuditListener> auditListeners, RepositoryArchivaTaskScheduler scheduler ) @@ -124,7 +125,7 @@ public class ArchivaDavResource this.scheduler = scheduler; } - public ArchivaDavResource( String localResource, String logicalResource, ManagedRepositoryConfiguration repository, + public ArchivaDavResource( String localResource, String logicalResource, ManagedRepository repository, String remoteAddr, String principal, DavSession session, ArchivaDavResourceLocator locator, DavResourceFactory factory, MimeTypes mimeTypes, List<AuditListener> auditListeners, RepositoryArchivaTaskScheduler scheduler ) Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/RepositoryServlet.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/RepositoryServlet.java?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/RepositoryServlet.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/RepositoryServlet.java Tue Sep 13 12:12:39 2011 @@ -19,9 +19,9 @@ package org.apache.maven.archiva.webdav; * under the License. */ -import org.apache.archiva.admin.repository.RepositoryAdminException; -import org.apache.archiva.admin.repository.managed.ManagedRepository; -import org.apache.archiva.admin.repository.managed.ManagedRepositoryAdmin; +import org.apache.archiva.admin.model.RepositoryAdminException; +import org.apache.archiva.admin.model.managed.ManagedRepository; +import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; import org.apache.archiva.security.ServletAuthenticator; import org.apache.jackrabbit.webdav.DavException; import org.apache.jackrabbit.webdav.DavLocatorFactory; Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java Tue Sep 13 12:12:39 2011 @@ -36,67 +36,66 @@ public class TestMetadataRepository { public ProjectMetadata getProject( String repoId, String namespace, String projectId ) { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } public ProjectVersionMetadata getProjectVersion( String repoId, String namespace, String projectId, String projectVersion ) { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } public Collection<String> getArtifactVersions( String repoId, String namespace, String projectId, String projectVersion ) { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } public Collection<ProjectVersionReference> getProjectReferences( String repoId, String namespace, String projectId, String projectVersion ) { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } public Collection<String> getRootNamespaces( String repoId ) { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } public Collection<String> getNamespaces( String repoId, String namespace ) { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } public Collection<String> getProjects( String repoId, String namespace ) { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } public Collection<String> getProjectVersions( String repoId, String namespace, String projectId ) { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } public void updateProject( String repoId, ProjectMetadata project ) { - //To change body of implemented methods use File | Settings | File Templates. } public void updateArtifact( String repoId, String namespace, String projectId, String projectVersion, ArtifactMetadata artifactMeta ) { - //To change body of implemented methods use File | Settings | File Templates. + } public void updateProjectVersion( String repoId, String namespace, String projectId, ProjectVersionMetadata versionMetadata ) { - //To change body of implemented methods use File | Settings | File Templates. + } public void updateNamespace( String repoId, String namespace ) { - //To change body of implemented methods use File | Settings | File Templates. + } public List<String> getMetadataFacets( String repodId, String facetId ) @@ -106,78 +105,78 @@ public class TestMetadataRepository public MetadataFacet getMetadataFacet( String repositoryId, String facetId, String name ) { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } public void addMetadataFacet( String repositoryId, MetadataFacet metadataFacet ) { - //To change body of implemented methods use File | Settings | File Templates. + } public void removeMetadataFacets( String repositoryId, String facetId ) { - //To change body of implemented methods use File | Settings | File Templates. + } public void removeMetadataFacet( String repoId, String facetId, String name ) { - //To change body of implemented methods use File | Settings | File Templates. + } public List<ArtifactMetadata> getArtifactsByDateRange( String repoId, Date startTime, Date endTime ) { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } public Collection<String> getRepositories() { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } public List<ArtifactMetadata> getArtifactsByChecksum( String repoId, String checksum ) { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } public void removeArtifact( String repositoryId, String namespace, String project, String version, String id ) { - //To change body of implemented methods use File | Settings | File Templates. + } public void removeRepository( String repoId ) { - //To change body of implemented methods use File | Settings | File Templates. + } public Collection<ArtifactMetadata> getArtifacts( String repoId, String namespace, String projectId, String projectVersion ) { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } public void save() { - //To change body of implemented methods use File | Settings | File Templates. + } public void close() { - //To change body of implemented methods use File | Settings | File Templates. + } public void revert() { - //To change body of implemented methods use File | Settings | File Templates. + } public boolean canObtainAccess( Class<?> aClass ) { - return false; //To change body of implemented methods use File | Settings | File Templates. + return false; } public Object obtainAccess( Class<?> aClass ) { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } public List<ArtifactMetadata> getArtifacts( String repositoryId ) Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletTestCase.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletTestCase.java?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletTestCase.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletTestCase.java Tue Sep 13 12:12:39 2011 @@ -26,7 +26,7 @@ import com.meterware.servletunit.Servlet import junit.framework.Assert; import junit.framework.TestCase; import net.sf.ehcache.CacheManager; -import org.apache.archiva.admin.repository.managed.ManagedRepository; +import org.apache.archiva.admin.model.managed.ManagedRepository; import org.apache.commons.io.FileUtils; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactoryTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactoryTest.java?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactoryTest.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactoryTest.java Tue Sep 13 12:12:39 2011 @@ -20,6 +20,11 @@ package org.apache.maven.archiva.webdav; */ import junit.framework.TestCase; +import org.apache.archiva.admin.model.RepositoryAdminException; +import org.apache.archiva.admin.model.group.RepositoryGroup; +import org.apache.archiva.admin.model.managed.ManagedRepository; +import org.apache.archiva.admin.repository.group.DefaultRepositoryGroupAdmin; +import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin; import org.apache.archiva.common.plexusbridge.PlexusSisuBridge; import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException; import org.apache.commons.io.FileUtils; @@ -29,7 +34,6 @@ import org.apache.jackrabbit.webdav.DavS import org.apache.jackrabbit.webdav.DavServletResponse; 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.configuration.RepositoryGroupConfiguration; import org.apache.maven.archiva.proxy.DefaultRepositoryProxyConnectors; import org.apache.maven.archiva.repository.ManagedRepositoryContent; @@ -101,6 +105,13 @@ public class ArchivaDavResourceFactoryTe @Inject PlexusSisuBridge plexusSisuBridge; + @Inject + DefaultManagedRepositoryAdmin defaultManagedRepositoryAdmin; + + @Inject + DefaultRepositoryGroupAdmin defaultRepositoryGroupAdmin; + + @Before public void setUp() throws Exception @@ -118,19 +129,36 @@ public class ArchivaDavResourceFactoryTe archivaConfiguration = (ArchivaConfiguration) archivaConfigurationControl.getMock(); config = new Configuration(); - config.addManagedRepository( - createManagedRepository( RELEASES_REPO, new File( "target/test-classes/" + RELEASES_REPO ).getPath(), - "default" ) ); - config.addManagedRepository( - createManagedRepository( INTERNAL_REPO, new File( "target/test-classes/" + INTERNAL_REPO ).getPath(), - "default" ) ); - - RepositoryGroupConfiguration repoGroupConfig = new RepositoryGroupConfiguration(); + archivaConfiguration.getConfiguration(); + archivaConfigurationControl.setReturnValue( config, 5, 20 ); + archivaConfiguration.save( config ); + archivaConfigurationControl.setVoidCallable( 1, 4 ); + archivaConfigurationControl.replay(); + + defaultManagedRepositoryAdmin.setArchivaConfiguration( archivaConfiguration ); + defaultManagedRepositoryAdmin.getRepositoryCommonValidator().setArchivaConfiguration( archivaConfiguration ); + if ( defaultManagedRepositoryAdmin.getManagedRepository( RELEASES_REPO ) == null ) + { + defaultManagedRepositoryAdmin.addManagedRepository( + createManagedRepository( RELEASES_REPO, new File( "target/test-classes/" + RELEASES_REPO ).getPath(), + "default" ), false, null ); + } + if ( defaultManagedRepositoryAdmin.getManagedRepository( INTERNAL_REPO ) == null ) + { + defaultManagedRepositoryAdmin.addManagedRepository( + createManagedRepository( INTERNAL_REPO, new File( "target/test-classes/" + INTERNAL_REPO ).getPath(), + "default" ), false, null ); + } + RepositoryGroup repoGroupConfig = new RepositoryGroup(); repoGroupConfig.setId( LOCAL_REPO_GROUP ); repoGroupConfig.addRepository( RELEASES_REPO ); repoGroupConfig.addRepository( INTERNAL_REPO ); - config.addRepositoryGroup( repoGroupConfig ); + defaultRepositoryGroupAdmin.setArchivaConfiguration( archivaConfiguration ); + if ( defaultManagedRepositoryAdmin.getManagedRepository( LOCAL_REPO_GROUP ) == null ) + { + defaultRepositoryGroupAdmin.addRepositoryGroup( repoGroupConfig, null ); + } repoContentFactoryControl = MockClassControl.createControl( RepositoryContentFactory.class ); repoFactory = (RepositoryContentFactory) repoContentFactoryControl.getMock(); @@ -146,9 +174,9 @@ public class ArchivaDavResourceFactoryTe resourceFactory.setConnectors( new OverridingRepositoryProxyConnectors() ); } - private ManagedRepositoryConfiguration createManagedRepository( String id, String location, String layout ) + private ManagedRepository createManagedRepository( String id, String location, String layout ) { - ManagedRepositoryConfiguration repoConfig = new ManagedRepositoryConfiguration(); + ManagedRepository repoConfig = new ManagedRepository(); repoConfig.setId( id ); repoConfig.setName( id ); repoConfig.setLocation( location ); @@ -158,9 +186,10 @@ public class ArchivaDavResourceFactoryTe } private ManagedRepositoryContent createManagedRepositoryContent( String repoId ) + throws RepositoryAdminException { ManagedRepositoryContent repoContent = new ManagedDefaultRepositoryContent(); - repoContent.setRepository( config.findManagedRepositoryById( repoId ) ); + repoContent.setRepository( defaultManagedRepositoryAdmin.getManagedRepository( repoId ) ); return repoContent; } @@ -182,13 +211,15 @@ public class ArchivaDavResourceFactoryTe new ArchivaDavLocatorFactory() ); ManagedRepositoryContent internalRepo = createManagedRepositoryContent( INTERNAL_REPO ); + ManagedRepositoryContent releasesRepo = createManagedRepositoryContent( RELEASES_REPO ); try { + archivaConfigurationControl.reset(); archivaConfigurationControl.expectAndReturn( archivaConfiguration.getConfiguration(), config ); requestControl.expectAndReturn( request.getMethod(), "GET", 2 ); repoContentFactoryControl.expectAndReturn( repoFactory.getManagedRepositoryContent( RELEASES_REPO ), - createManagedRepositoryContent( RELEASES_REPO ) ); + releasesRepo ); requestControl.expectAndReturn( request.getRemoteAddr(), "http://localhost:8080";, 2 ); requestControl.expectAndReturn( request.getDavSession(), new ArchivaDavSession(), 2 ); repoRequestControl.expectAndReturn( @@ -247,14 +278,17 @@ public class ArchivaDavResourceFactoryTe ManagedRepositoryContent internalRepo = createManagedRepositoryContent( INTERNAL_REPO ); + ManagedRepositoryContent releasesRepo = createManagedRepositoryContent( RELEASES_REPO ); + try { + archivaConfigurationControl.reset(); archivaConfigurationControl.expectAndReturn( archivaConfiguration.getConfiguration(), config ); requestControl.expectAndReturn( request.getMethod(), "GET", 2 ); repoContentFactoryControl.expectAndReturn( repoFactory.getManagedRepositoryContent( INTERNAL_REPO ), internalRepo ); repoContentFactoryControl.expectAndReturn( repoFactory.getManagedRepositoryContent( RELEASES_REPO ), - createManagedRepositoryContent( RELEASES_REPO ) ); + releasesRepo ); requestControl.expectAndReturn( request.getRemoteAddr(), "http://localhost:8080";, 2 ); requestControl.expectAndReturn( request.getDavSession(), new ArchivaDavSession(), 2 ); repoRequestControl.expectAndReturn( @@ -299,9 +333,9 @@ public class ArchivaDavResourceFactoryTe + "/org/apache/archiva/archiva/1.2-SNAPSHOT/archiva-1.2-SNAPSHOT.jar", LOCAL_REPO_GROUP, new ArchivaDavLocatorFactory() ); - config.addManagedRepository( + defaultManagedRepositoryAdmin.addManagedRepository( createManagedRepository( LOCAL_MIRROR_REPO, new File( "target/test-classes/local-mirror" ).getPath(), - "default" ) ); + "default" ), false, null ); List<RepositoryGroupConfiguration> repoGroups = new ArrayList<RepositoryGroupConfiguration>(); RepositoryGroupConfiguration repoGroup = new RepositoryGroupConfiguration(); @@ -318,6 +352,7 @@ public class ArchivaDavResourceFactoryTe try { + archivaConfigurationControl.reset(); archivaConfigurationControl.expectAndReturn( archivaConfiguration.getConfiguration(), config ); requestControl.expectAndReturn( request.getMethod(), "GET", 4 ); repoContentFactoryControl.expectAndReturn( repoFactory.getManagedRepositoryContent( INTERNAL_REPO ), @@ -384,6 +419,7 @@ public class ArchivaDavResourceFactoryTe try { + archivaConfigurationControl.reset(); archivaConfigurationControl.expectAndReturn( archivaConfiguration.getConfiguration(), config ); repoContentFactoryControl.expectAndReturn( repoFactory.getManagedRepositoryContent( INTERNAL_REPO ), internalRepo ); @@ -438,6 +474,7 @@ public class ArchivaDavResourceFactoryTe try { + archivaConfigurationControl.reset(); archivaConfigurationControl.expectAndReturn( archivaConfiguration.getConfiguration(), config ); repoContentFactoryControl.expectAndReturn( repoFactory.getManagedRepositoryContent( INTERNAL_REPO ), internalRepo ); @@ -467,9 +504,9 @@ public class ArchivaDavResourceFactoryTe public void testRequestMetadataRepoIsLegacy() throws Exception { - config.addManagedRepository( + defaultManagedRepositoryAdmin.addManagedRepository( createManagedRepository( LEGACY_REPO, new File( "target/test-classes/" + LEGACY_REPO ).getPath(), - "legacy" ) ); + "legacy" ), false, null ); DavResourceLocator locator = new ArchivaDavResourceLocator( "", "/repository/" + LEGACY_REPO + "/eclipse/maven-metadata.xml", LEGACY_REPO, new ArchivaDavLocatorFactory() ); @@ -482,6 +519,7 @@ public class ArchivaDavResourceFactoryTe try { + archivaConfigurationControl.reset(); archivaConfigurationControl.expectAndReturn( archivaConfiguration.getConfiguration(), config ); repoContentFactoryControl.expectAndReturn( repoFactory.getManagedRepositoryContent( LEGACY_REPO ), legacyRepo ); Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java Tue Sep 13 12:12:39 2011 @@ -20,6 +20,7 @@ package org.apache.maven.archiva.webdav; */ import junit.framework.TestCase; +import org.apache.archiva.admin.model.managed.ManagedRepository; import org.apache.archiva.audit.AuditListener; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.webdav.DavException; @@ -72,7 +73,7 @@ public class DavResourceTest private LockManager lockManager; - private ManagedRepositoryConfiguration repository = new ManagedRepositoryConfiguration(); + private ManagedRepository repository = new ManagedRepository(); @Override @Before Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletTest.java?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletTest.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletTest.java Tue Sep 13 12:12:39 2011 @@ -19,15 +19,13 @@ package org.apache.maven.archiva.webdav; * under the License. */ -import org.apache.archiva.admin.repository.managed.ManagedRepository; -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.webdav.RepositoryServlet; - import com.meterware.httpunit.GetMethodWebRequest; import com.meterware.httpunit.WebRequest; import com.meterware.httpunit.WebResponse; +import org.apache.archiva.admin.model.managed.ManagedRepository; +import org.apache.maven.archiva.configuration.ArchivaConfiguration; +import org.apache.maven.archiva.configuration.Configuration; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.junit.Test; import java.io.File; Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/StubRepositoryContentConsumers.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/StubRepositoryContentConsumers.java?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/StubRepositoryContentConsumers.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/StubRepositoryContentConsumers.java Tue Sep 13 12:12:39 2011 @@ -19,19 +19,19 @@ package org.apache.maven.archiva.webdav; * under the License. */ -import java.util.List; - +import org.apache.archiva.admin.model.admin.ArchivaAdministration; import org.apache.archiva.repository.scanner.RepositoryContentConsumers; -import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer; import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer; +import java.util.List; + public class StubRepositoryContentConsumers extends RepositoryContentConsumers { - public StubRepositoryContentConsumers(ArchivaConfiguration configuration) + public StubRepositoryContentConsumers( ArchivaAdministration archivaAdministration ) { - super(configuration); + super( archivaAdministration ); } @Override Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/UnauthenticatedRepositoryServlet.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/UnauthenticatedRepositoryServlet.java?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/UnauthenticatedRepositoryServlet.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/UnauthenticatedRepositoryServlet.java Tue Sep 13 12:12:39 2011 @@ -19,7 +19,7 @@ package org.apache.maven.archiva.webdav; * under the License. */ -import org.apache.archiva.admin.repository.RepositoryAdminException; +import org.apache.archiva.admin.model.RepositoryAdminException; import javax.servlet.ServletConfig; Modified: archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml Tue Sep 13 12:12:39 2011 @@ -37,7 +37,7 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-admin</artifactId> + <artifactId>archiva-repository-admin-api</artifactId> </dependency> <dependency> <groupId>com.atlassian.xmlrpc</groupId> Modified: archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java Tue Sep 13 12:12:39 2011 @@ -20,7 +20,7 @@ package org.apache.archiva.web.xmlrpc.ap */ import com.atlassian.xmlrpc.ServiceObject; -import org.apache.archiva.admin.repository.RepositoryAdminException; +import org.apache.archiva.admin.model.RepositoryAdminException; import org.apache.archiva.web.xmlrpc.api.beans.ManagedRepository; import org.apache.archiva.web.xmlrpc.api.beans.RemoteRepository; Modified: archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml Tue Sep 13 12:12:39 2011 @@ -41,7 +41,7 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-admin</artifactId> + <artifactId>archiva-repository-admin-api</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -97,6 +97,11 @@ <artifactId>mockito-all</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-admin-default</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <pluginManagement> Modified: archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java Tue Sep 13 12:12:39 2011 @@ -19,10 +19,10 @@ package org.apache.archiva.web.xmlrpc.se * under the License. */ -import org.apache.archiva.admin.AuditInformation; -import org.apache.archiva.admin.repository.RepositoryAdminException; -import org.apache.archiva.admin.repository.managed.ManagedRepositoryAdmin; -import org.apache.archiva.admin.repository.remote.RemoteRepositoryAdmin; +import org.apache.archiva.admin.model.AuditInformation; +import org.apache.archiva.admin.model.RepositoryAdminException; +import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; +import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin; import org.apache.archiva.audit.AuditEvent; import org.apache.archiva.audit.AuditListener; import org.apache.archiva.metadata.model.ArtifactMetadata; @@ -315,7 +315,7 @@ public class AdministrationServiceImpl { List<ManagedRepository> managedRepos = new ArrayList<ManagedRepository>(); - for ( org.apache.archiva.admin.repository.managed.ManagedRepository repoConfig : managedRepositoryAdmin.getManagedRepositories() ) + for ( org.apache.archiva.admin.model.managed.ManagedRepository repoConfig : managedRepositoryAdmin.getManagedRepositories() ) { ManagedRepository repo = new ManagedRepository( repoConfig.getId(), repoConfig.getName(), repoConfig.getLocation(), @@ -334,7 +334,7 @@ public class AdministrationServiceImpl { List<RemoteRepository> remoteRepos = new ArrayList<RemoteRepository>(); - for ( org.apache.archiva.admin.repository.remote.RemoteRepository repoConfig : remoteRepositoryAdmin.getRemoteRepositories() ) + for ( org.apache.archiva.admin.model.remote.RemoteRepository repoConfig : remoteRepositoryAdmin.getRemoteRepositories() ) { RemoteRepository repo = new RemoteRepository( repoConfig.getId(), repoConfig.getName(), repoConfig.getUrl(), repoConfig.getLayout() ); @@ -368,8 +368,8 @@ public class AdministrationServiceImpl throws Exception { - org.apache.archiva.admin.repository.managed.ManagedRepository repository = - new org.apache.archiva.admin.repository.managed.ManagedRepository( repoId, name, location, layout, + org.apache.archiva.admin.model.managed.ManagedRepository repository = + new org.apache.archiva.admin.model.managed.ManagedRepository( repoId, name, location, layout, snapshotsIncluded, releasesIncluded, blockRedeployments, cronExpression, null, false, daysOlder, retentionCount, Modified: archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java Tue Sep 13 12:12:39 2011 @@ -20,6 +20,7 @@ package org.apache.archiva.web.xmlrpc.se */ import junit.framework.TestCase; +import net.sf.beanlib.provider.replicator.BeanReplicator; import org.apache.archiva.admin.repository.RepositoryCommonValidator; import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin; import org.apache.archiva.admin.repository.remote.DefaultRemoteRepositoryAdmin; @@ -399,7 +400,8 @@ public class AdministrationServiceImplTe configControl.expectAndReturn( config.findManagedRepositoryById( "internal" ), managedRepo ); ManagedDefaultRepositoryContent repoContent = new ManagedDefaultRepositoryContent(); - repoContent.setRepository( managedRepo ); + repoContent.setRepository( new BeanReplicator().replicateBean( managedRepo, + org.apache.archiva.admin.model.managed.ManagedRepository.class ) ); repoFactoryControl.expectAndReturn( repositoryFactory.getManagedRepositoryContent( "internal" ), repoContent ); @@ -451,7 +453,8 @@ public class AdministrationServiceImplTe configControl.expectAndReturn( config.findManagedRepositoryById( "internal" ), managedRepo ); ManagedLegacyRepositoryContent repoContent = new ManagedLegacyRepositoryContent(); - repoContent.setRepository( managedRepo ); + repoContent.setRepository( new BeanReplicator().replicateBean( managedRepo, + org.apache.archiva.admin.model.managed.ManagedRepository.class ) ); repoContent.setFileTypes( fileTypes ); repoContent.setLegacyPathParser( parser ); @@ -511,7 +514,8 @@ public class AdministrationServiceImplTe configControl.expectAndReturn( config.findManagedRepositoryById( "internal" ), managedRepo ); ManagedDefaultRepositoryContent repoContent = new ManagedDefaultRepositoryContent(); - repoContent.setRepository( managedRepo ); + repoContent.setRepository( new BeanReplicator().replicateBean( managedRepo, + org.apache.archiva.admin.model.managed.ManagedRepository.class ) ); repoFactoryControl.expectAndReturn( repositoryFactory.getManagedRepositoryContent( "internal" ), repoContent ); Modified: archiva/trunk/archiva-modules/plugins/problem-reports/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/problem-reports/pom.xml?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/plugins/problem-reports/pom.xml (original) +++ archiva/trunk/archiva-modules/plugins/problem-reports/pom.xml Tue Sep 13 12:12:39 2011 @@ -32,6 +32,15 @@ <groupId>org.apache.archiva</groupId> <artifactId>metadata-repository-api</artifactId> </dependency> + <!-- FIXME this deps must be removed --> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-configuration</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-admin-api</artifactId> + </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-checksum</artifactId> Modified: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java (original) +++ archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java Tue Sep 13 12:12:39 2011 @@ -19,6 +19,7 @@ package org.apache.archiva.reports.consu * under the License. */ +import org.apache.archiva.admin.model.managed.ManagedRepository; import org.apache.archiva.checksum.ChecksumAlgorithm; import org.apache.archiva.checksum.ChecksummedFile; import org.apache.archiva.metadata.model.ArtifactMetadata; @@ -32,7 +33,6 @@ import org.apache.commons.collections.Co import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.ConfigurationNames; import org.apache.maven.archiva.configuration.FileTypes; -import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer; import org.apache.maven.archiva.consumers.ConsumerException; import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer; @@ -138,7 +138,7 @@ public class DuplicateArtifactsConsumer return Collections.emptyList(); } - public void beginScan( ManagedRepositoryConfiguration repo, Date whenGathered ) + public void beginScan( ManagedRepository repo, Date whenGathered ) throws ConsumerException { repoId = repo.getId(); @@ -146,7 +146,7 @@ public class DuplicateArtifactsConsumer repositorySession = repositorySessionFactory.createSession(); } - public void beginScan( ManagedRepositoryConfiguration repo, Date whenGathered, boolean executeOnEntireRepo ) + public void beginScan( ManagedRepository repo, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { beginScan( repo, whenGathered ); Modified: archiva/trunk/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java (original) +++ archiva/trunk/archiva-modules/plugins/problem-reports/src/test/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumerTest.java Tue Sep 13 12:12:39 2011 @@ -20,6 +20,7 @@ package org.apache.archiva.reports.consu */ import junit.framework.TestCase; +import org.apache.archiva.admin.model.managed.ManagedRepository; import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.model.MetadataFacet; import org.apache.archiva.metadata.repository.MetadataRepository; @@ -57,7 +58,7 @@ public class DuplicateArtifactsConsumerT @Named( value = "knownRepositoryContentConsumer#duplicate-artifacts" ) private DuplicateArtifactsConsumer consumer; - private ManagedRepositoryConfiguration config; + private ManagedRepository config; private MetadataRepository metadataRepository; @@ -92,7 +93,7 @@ public class DuplicateArtifactsConsumerT assertNotNull( consumer ); - config = new ManagedRepositoryConfiguration(); + config = new ManagedRepository(); config.setId( TEST_REPO ); config.setLocation( new File( "target/test-repository" ).getAbsolutePath() ); Modified: archiva/trunk/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1170135&r1=1170134&r2=1170135&view=diff ============================================================================== --- archiva/trunk/pom.xml (original) +++ archiva/trunk/pom.xml Tue Sep 13 12:12:39 2011 @@ -117,7 +117,12 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-admin</artifactId> + <artifactId>archiva-repository-admin-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-admin-default</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -748,6 +753,11 @@ </dependency> <!-- redback --> + <dependency> + <groupId>org.codehaus.redback</groupId> + <artifactId>redback-users-api</artifactId> + <version>${redback.version}</version> + </dependency> <dependency> <groupId>org.codehaus.redback</groupId> @@ -852,6 +862,17 @@ </dependency> <dependency> <groupId>org.codehaus.redback</groupId> + <artifactId>redback-rbac-cached</artifactId> + <version>${redback.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.codehaus.redback</groupId> <artifactId>redback-struts2-content</artifactId> <version>${redback.version}</version> <type>war</type>
